diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 10550c835..f5472c8e8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - master
+    tags:
+      - v*
   pull_request:
 
 jobs:
@@ -13,10 +15,10 @@ jobs:
       COVERALLS_REPO_TOKEN: "kVPcGJfehOArEQnHb8BT3KS72xbUQCoxI"
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
     steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "16.20.2"
           architecture: 'x64' # fix for macos-latest
@@ -26,4 +28,47 @@ jobs:
       - run: npm run test
       - run: npm run publish-coverage
       # this is stalling out for some reason, so disable it for now
-      #- run: npm run test-related-projects
\ No newline at end of file
+      #- run: npm run test-related-projects
+  npm-release:
+    #only run this task if a tag starting with 'v' was used to trigger this (i.e. a tagged release)
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: ci
+    runs-on: ubuntu-latest
+    env:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "14.18.1"
+          architecture: 'x64' # fix for macos-latest
+      - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ./.npmrc
+      - run: npm ci
+      - run: npm run build
+      #create npm package
+      - run: npm pack
+
+      #create GitHub release
+      - name: Create GitHub Release
+        id: create_release
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: false
+          prerelease: false #contains(github.ref, '-beta.') == true
+
+      #upload package to GitHub release
+      - name: Upload GitHub Release Assets
+        uses: alexellis/upload-assets@0.2.3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          asset_paths: '["./*.tgz"]'
+
+      #If there's a dash followed by an alpha character, this is a prerelease and should be tagged "next". Otherwise tag as "latest"
+      - run: if [[ "${{ github.ref }}" =~ -[a-zA-Z] ]]; then echo "DIST_TAG=next" >> $GITHUB_ENV; else echo "DIST_TAG=latest" >> $GITHUB_ENV; fi
+      #upload to npm
+      - run: npm publish --tag ${{env.DIST_TAG}}
diff --git a/.github/workflows/create-package.yml b/.github/workflows/create-package.yml
index 6efe73d66..bc976ee95 100644
--- a/.github/workflows/create-package.yml
+++ b/.github/workflows/create-package.yml
@@ -9,8 +9,8 @@ jobs:
     env:
       GH_TOKEN: ${{ github.token }}
     steps:
-      - uses: actions/checkout@master
-      - uses: actions/setup-node@master
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: "16.20.2"
       # Get a bot token so the bot's name shows up on all our actions
diff --git a/.gitignore b/.gitignore
index e4c42bc59..a11b07c92 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,4 +14,5 @@ graph.svg
 benchmarks/*.brs
 isolate-*
 v8*.log
-*.cpuprofile
\ No newline at end of file
+*.cpuprofile
+.cache.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
index bb8474537..23c2de663 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -20,5 +20,5 @@
     "js/ts.format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": true,
     "js/ts.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
     "files.trimTrailingWhitespace": true,
-    "js/ts.tsdk.path": "node_modules\\typescript\\lib"
-}
+    "js/ts.tsdk.path": "node_modules/typescript/lib"
+}
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f569a143..aa704f8f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,488 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
+## [1.0.0-alpha.50](https://github.com/rokucommunity/brighterscript/compare/1.0.0-alpha.49...v1.0.0-alpha.50) - 2026-01-28
+### Added
+ - Adds ability to declare type on "For Each" loop item ([#1614](https://github.com/rokucommunity/brighterscript/pull/1614))
+ - Intersection Type ([#1603](https://github.com/rokucommunity/brighterscript/pull/1603))
+### Changed
+ - Re-ran docs scraper ([#1609](https://github.com/rokucommunity/brighterscript/pull/1609))
+ - Align event names ([#1557](https://github.com/rokucommunity/brighterscript/pull/1557))
+ - upgrade to [roku-deploy@3.16.1](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#3161---2025-12-05). Notable changes since 3.14.4:
+### Fixed
+ - Fix bug with `stagingDir` fallback not working ([#1606](https://github.com/rokucommunity/brighterscript/pull/1606))
+ - Fix bug with normalizing `virtual:/` path scheme ([#1607](https://github.com/rokucommunity/brighterscript/pull/1607))
+ - Fixes getting types from pocket tables in try/catch ([#1602](https://github.com/rokucommunity/brighterscript/pull/1602))
+
+
+
+## [1.0.0-alpha.49](https://github.com/rokucommunity/brighterscript/compare/1.0.0-alpha.48...v1.0.0-alpha.49) - 2025-12-10
+### Added
+ - Adds `TypeStatement` for declaring new types ([#1597](https://github.com/rokucommunity/brighterscript/pull/1597))
+ - Adds Inline interfaces ([#1591](https://github.com/rokucommunity/brighterscript/pull/1591))
+### Changed
+ - Make Invalid compatible with typed arrays ([#1596](https://github.com/rokucommunity/brighterscript/pull/1596))
+ - Limit scope Validation ([#1586](https://github.com/rokucommunity/brighterscript/pull/1586))
+ - Interface extending node includes callfuncs ([#1585](https://github.com/rokucommunity/brighterscript/pull/1585))
+ - Remove zip and sideload ([#1562](https://github.com/rokucommunity/brighterscript/pull/1562))
+ - upgrade to [roku-deploy@3.14.4](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#3144---2025-10-30)
+### Fixed
+ - Fix validation exception when calling `roFunction` ([#1588](https://github.com/rokucommunity/brighterscript/pull/1588))
+ - Fix `MaskGroup.maskUri` type ([#1559](https://github.com/rokucommunity/brighterscript/pull/1559))
+### Removed
+ - Remove unused util functions ([#1565](https://github.com/rokucommunity/brighterscript/pull/1565))
+
+
+
+## [1.0.0-alpha.48](https://github.com/rokucommunity/brighterscript/compare/1.0.0-alpha.47...v1.0.0-alpha.48) - 2025-07-16
+### Changed
+ - Union Return type consistency ([#1508](https://github.com/rokucommunity/brighterscript/pull/1508))
+ - `Dynamic` and `Function` do not need semantic tokens in Type expressions ([#1500](https://github.com/rokucommunity/brighterscript/pull/1500))
+ - upgrade to [roku-deploy@3.12.6](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#3126---2025-06-03). Notable changes since 3.12.5:
+### Fixed
+ - Fix issues with undefined/null trivia items ([#1531](https://github.com/rokucommunity/brighterscript/pull/1531))
+ - Fix ForEach variable typing issues ([#1498](https://github.com/rokucommunity/brighterscript/pull/1498))
+
+
+
+## [1.0.0-alpha.47](https://github.com/rokucommunity/brighterscript/compare/1.0.0-alpha.46...v1.0.0-alpha.47) - 2025-05-22
+### Changed
+ - Type Tracking within a Function ([#1468](https://github.com/rokucommunity/brighterscript/pull/1468))
+ - Better Support for Union of Functions and CallFuncs ([#1485](https://github.com/rokucommunity/brighterscript/pull/1485))
+ - Better diagnostic null location handling ([#1491](https://github.com/rokucommunity/brighterscript/pull/1491))
+ - `bsc1` cli binary ([#1492](https://github.com/rokucommunity/brighterscript/pull/1492))
+ - upgrade to [@rokucommunity/logger@0.3.11](https://github.com/rokucommunity/logger/blob/master/CHANGELOG.md#0311---2025-05-05). Notable changes since 0.3.10:
+     - Merge pull request #12 from rokucommunity/migrate-to-shared-ci ([f43e5a4](https://github.com/rokucommunity/brighterscript/commit/f43e5a4))
+ - upgrade to [roku-deploy@3.12.5](https://github.com/rokucommunity/roku-deploy/blob/master/CHANGELOG.md#3125---2025-05-05). Notable changes since 3.12.4:
+     - Add missing template workflows for shared ci ([#189](https://github.com/rokucommunity/brighterscript/pull/189))
+     - Shared CI Support Prerelease ([#185](https://github.com/rokucommunity/brighterscript/pull/185))
+
+
+
+## [1.0.0-alpha.46](https://github.com/rokucommunity/brighterscript/compare/1.0.0-alpha.45...v1.0.0-alpha.46) - 2025-04-24
+### Added
+ - Add missing content node fields ([#1481](https://github.com/rokucommunity/brighterscript/pull/1481))
+ - Add `DialogBase` to types ([#1470](https://github.com/rokucommunity/brighterscript/pull/1470))
+### Changed
+ - Do not validate typedef files for return type mismatch ([#1459](https://github.com/rokucommunity/brighterscript/pull/1459))
+ - Dedupe hover results ([#1480](https://github.com/rokucommunity/brighterscript/pull/1480))
+ - Do not provide semantic tokens for primitive types ([#1460](https://github.com/rokucommunity/brighterscript/pull/1460))
+### Fixed
+ - Fix erroneous diagnostic for component name on first validation ([#1477](https://github.com/rokucommunity/brighterscript/pull/1477))
+ - Fix ScopeValidator crash ([#1465](https://github.com/rokucommunity/brighterscript/pull/1465))
+ - Import `performance` from `perf_hooks` to work on node <16 ([#1462](https://github.com/rokucommunity/brighterscript/pull/1462))
+ - Fixes transpilation bug with enums and nested namespaces ([#1454](https://github.com/rokucommunity/brighterscript/pull/1454))
+ - Change type of 'version' parameter from String to Integer in the Type ([#1453](https://github.com/rokucommunity/brighterscript/pull/1453))
+
+
+
+## [1.0.0-alpha.45](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.44...v1.0.0-alpha.45) - 2025-04-04
+### Added
+ - new `diagnosticFiltersV0Compatibility` bsconfig.json option ([#1424](https://github.com/rokucommunity/brighterscript/pull/1424))
+### Changed
+ - Re-scraped Roku Docs (March 31 2025) ([#1439](https://github.com/rokucommunity/brighterscript/pull/1439))
+ - Merge latest `master` which includes the language server rewrite ([#1428](https://github.com/rokucommunity/brighterscript/pull/1428))
+ - more scope validation timing metrics ([#1420](https://github.com/rokucommunity/brighterscript/pull/1420))
+ - reduce `BscType` creation ([#1417](https://github.com/rokucommunity/brighterscript/pull/1417))
+ - add lookup tables to `DiagnosticsManager` to speed up diagnostic clearing ([#1411](https://github.com/rokucommunity/brighterscript/pull/1411))
+### Fixed
+ - Fixes Code Completion Issues ([#1442](https://github.com/rokucommunity/brighterscript/pull/1442))
+
+
+
+## [1.0.0-alpha.44](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.43...v1.0.0-alpha.44) - 2025-02-06
+### Fixed
+- Fixes `onDidChangeWatchedFiles` flow in LanguageServer ([#1410](https://github.com/rokucommunity/brighterscript/pull/1410))
+
+
+
+## [1.0.0-alpha.43](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.42...v1.0.0-alpha.43) - 2025-02-03
+### Fixed
+ - Fixes getting the default type of an array of AAs with reference type members ([#140](https://github.com/rokucommunity/brighterscript/pull/1402))
+ - Doc Fixes - Re-ran Scraper, and added some undocumented fields ([#1405](https://github.com/rokucommunity/brighterscript/pull/1405))
+ - Fix issues with boxed types ([#1404](https://github.com/rokucommunity/brighterscript/pull/1404))
+ - Recognize literal strings as Associative Array members ([#1408](https://github.com/rokucommunity/brighterscript/pull/1408))
+
+
+
+## [1.0.0-alpha.42](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.41...v1.0.0-alpha.42) - 2025-01-17
+### Added
+ - Parser error when custom type encountered in brs file ([#1336](https://github.com/rokucommunity/brighterscript/pull/1336))
+ - Add diagnostic on using parent function var in inner func ([#1369](https://github.com/rokucommunity/brighterscript/pull/1369))
+ - Added more unit tests for namespace as variable ([#1385](https://github.com/rokucommunity/brighterscript/pull/1385))
+ - Adds Callfunc Completion and Validation ([#1352](https://github.com/rokucommunity/brighterscript/pull/1352))
+### Changed
+ - Allows more missing tokens in Transpile ([#1340](https://github.com/rokucommunity/brighterscript/pull/1340))
+ - Refine Diagnostic Filters and adds human-readable diagnostic names ([#1241](https://github.com/rokucommunity/brighterscript/pull/1241))
+ - Changes `expectedReturnStatement` to `returnTypeCoercionMismatch` ([#1370](https://github.com/rokucommunity/brighterscript/pull/1370))
+ - Properly types `invalid` as `InvalidType` ([#1378](https://github.com/rokucommunity/brighterscript/pull/1378))
+ - Eliminates unnecessary import and fractional hex diagnostics ([#1377](https://github.com/rokucommunity/brighterscript/pull/1377))
+ - Refactors `PrintStatement` so that `.values` array is all expressions ([#1296](https://github.com/rokucommunity/brighterscript/pull/1296))
+ - Augments handling of void returns ([#1380](https://github.com/rokucommunity/brighterscript/pull/1380))
+ - Assign invalid types as dynamic ([#1389](https://github.com/rokucommunity/brighterscript/pull/1389))
+### Fixed
+ - Fix Vector2DFieldInterpolator.keyValue type ([#1339](https://github.com/rokucommunity/brighterscript/pull/1339))
+ - Fix an issue with doc scraper and re-scraped docs ([#1368](https://github.com/rokucommunity/brighterscript/pull/1368))
+ - Fix type chain for looking up params with type defs from @param ([#1374](https://github.com/rokucommunity/brighterscript/pull/1374))
+ - Fix default type for ArrayLIteral with enum member inner types ([#1373](https://github.com/rokucommunity/brighterscript/pull/1373))
+ - Fix crash when unraveling complex `BinaryReferenceType` ([#1398](https://github.com/rokucommunity/brighterscript/pull/1398))
+ - Fixes How `BinaryOperators` work on Unions ([#1400](https://github.com/rokucommunity/brighterscript/pull/1400))
+
+
+
+## [1.0.0-alpha.41](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.40...v1.0.0-alpha.41) - 2024-10-20
+### Fixed
+ - allow any node members in brs files ([#1299](https://github.com/rokucommunity/brighterscript/pull/1333))
+
+
+
+## [1.0.0-alpha.40](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.39...v1.0.0-alpha.40) - 2024-10-19
+### Added
+ - diagnostic if no return statement found in function ([#1299](https://github.com/rokucommunity/brighterscript/pull/1299))
+### Fixed
+ - hide annoying log messages ([#1332](https://github.com/rokucommunity/brighterscript/pull/1332))
+ - flag using outer namespaced function indirectly ([#1319)](https://github.com/rokucommunity/brighterscript/pull/1319))
+
+
+
+## [1.0.0-alpha.39](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.38...v1.0.0-alpha.39) - 2024-10-03
+### Fixed
+ - bslib prefix transpile bug  ([#1317](https://github.com/rokucommunity/brighterscript/pull/1317))
+
+
+
+## [1.0.0-alpha.38](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.37...v1.0.0-alpha.38) - 2024-10-01
+### Added
+ - ability to omit the exception variable in bs files and convert exception var to an `Expression` ([#1305](https://github.com/rokucommunity/brighterscript/pull/1305))
+### Fixed
+ - transpile issue with global functions ([#1314](https://github.com/rokucommunity/brighterscript/pull/1314))
+ - semantic tokens for components and interfaces and `m` ([#1313](https://github.com/rokucommunity/brighterscript/pull/1313))
+ - prevent a crash when `ClassType.name` is `undefined` ([#1312](https://github.com/rokucommunity/brighterscript/pull/1312))
+
+
+
+## [1.0.0-alpha.37](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.36...v1.0.0-alpha.37) - 2024-09-25
+### Added
+ - Support for types declared in comments ([#1293](https://github.com/rokucommunity/brighterscript/pull/1293))
+### Changed
+ - Eliminate `FunctionExpression.functionStatement` ([#1287](https://github.com/rokucommunity/brighterscript/pull/1287))
+ - Merges `ExitForStatement` and `ExitWhileStatement` ([#1289](https://github.com/rokucommunity/brighterscript/pull/1289))
+### Fixed
+ - Include missing transpiled comments ([#1278](https://github.com/rokucommunity/brighterscript/pull/1278))
+ - Tests and issues around transpiling variables that shadow stuff ([#1282](https://github.com/rokucommunity/brighterscript/pull/1282))
+ - Handles diagnostic with invalid location, and semantic tokens for unscoped file ([#1286](https://github.com/rokucommunity/brighterscript/pull/1286))
+ - Fix some null crashes ([#1304](https://github.com/rokucommunity/brighterscript/pull/1304))
+
+
+
+## [1.0.0-alpha.36](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.35...v1.0.0-alpha.36) - 2024-08-09
+### Fixed
+ - `m` should be typed as roAssociativeArray for all inline functions ([#1272](https://github.com/rokucommunity/brighterscript/pull/1272))
+ - Fixes namespace transpiling bug by linking scopes during transpile ([#1271](https://github.com/rokucommunity/brighterscript/pull/1271))
+
+
+
+## [1.0.0-alpha.35](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.34...v1.0.0-alpha.35) - 2024-07-31
+### Changed
+ - Remove `file` prop from `BsDiagnostic` ([#1248](https://github.com/rokucommunity/brighterscript/pull/1248))
+### Fixed
+ - Ensures conditional compiltion blocks have proper validation segments ([#1267](https://github.com/rokucommunity/brighterscript/pull/1267))
+ - Allow variables and parameters to shadow namespaces ([#1263](https://github.com/rokucommunity/brighterscript/pull/1263))
+ - Ensure methods leading comments are transpiled above instance function def ([#1257](https://github.com/rokucommunity/brighterscript/pull/1257))
+ - Make absolute import completions use original extension ([#1266](https://github.com/rokucommunity/brighterscript/pull/1266))
+
+
+
+## [1.0.0-alpha.34](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.33...v1.0.0-alpha.34) - 2024-07-24
+### Changed
+ - Export `Location` so it can be used directly in plugins ([#1236](https://github.com/rokucommunity/brighterscript/pull/1236))
+ - Removes `Parser.statements` ([#1239](https://github.com/rokucommunity/brighterscript/pull/1239))
+ - Sets a hard limit of number of scopes to check for completions ([#1244](https://github.com/rokucommunity/brighterscript/pull/1244))
+### Fixed
+ - Fixes completions when file is used in multiple scopes ([#1238](https://github.com/rokucommunity/brighterscript/pull/1238))
+ - Fixes ifSystemLog and ifArraySlice docs ([#1250](https://github.com/rokucommunity/brighterscript/pull/1250))
+
+
+
+## [1.0.0-alpha.33](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.32...v1.0.0-alpha.33) - 2024-06-14
+### Added
+ - Adds messagePort methods to ifSocketAsync and MultiStyleLabel.drawing Styles ([#1220](https://github.com/rokucommunity/brighterscript/pull/1220))
+ - Allow updating leading trivia ([#1225](https://github.com/rokucommunity/brighterscript/pull/1225))
+### Changed
+ - Remove block starting range ([#1224](https://github.com/rokucommunity/brighterscript/pull/1224))
+ - Removed isInline property from IfStatement ([#1227](https://github.com/rokucommunity/brighterscript/pull/1227))
+ - Made AstNode.getLeadingTrivia() a getter ([#1233](https://github.com/rokucommunity/brighterscript/pull/1233))
+ - Removed expectRangeToBe helper ([#1226](https://github.com/rokucommunity/brighterscript/pull/1226))
+ - Convert .range to .location ([#1231](https://github.com/rokucommunity/brighterscript/pull/1231))
+### Fixed
+ - Fixes issue with setting roSGNodeTargetSet.targetRects ([#1223](https://github.com/rokucommunity/brighterscript/pull/1223))
+
+
+
+## [1.0.0-alpha.32](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.31...v1.0.0-alpha.32) - 2024-06-05
+### Fixed
+ - Elevate `thenby` to a prod dependency ([#1217](https://github.com/rokucommunity/brighterscript/pull/1217))
+
+
+
+## [1.0.0-alpha.31](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.30...v1.0.0-alpha.31) - 2024-06-04
+### Added
+ - Adds AugmentedAssignmentStatement ([#1196](https://github.com/rokucommunity/brighterscript/pull/1196))
+ - Visualize deprecated items in editor ([#1213](https://github.com/rokucommunity/brighterscript/pull/1213))
+### Changed
+ - Temporarily disable test-related-projects until they support v1 ([#1202](https://github.com/rokucommunity/brighterscript/pull/1202))
+ - Validate single scope ([#1123](https://github.com/rokucommunity/brighterscript/pull/1123))
+ - Removes 'duplicate enum' diagnostic and makes 'duplicate function' diagnostics better ([#1212](https://github.com/rokucommunity/brighterscript/pull/1212))
+### Fixed
+ - Fixes some issues with comments and transpilation ([#1192](https://github.com/rokucommunity/brighterscript/pull/1192))
+ - Component field can be set with strings ([#1195](https://github.com/rokucommunity/brighterscript/pull/1195))
+ - Fix semantic token crash ([#1197](https://github.com/rokucommunity/brighterscript/pull/1197))
+ - Fix namespace crash ([#1201](https://github.com/rokucommunity/brighterscript/pull/1201))
+ - Document the deprecated ifMessagePort.setPort() method. ([#1210](https://github.com/rokucommunity/brighterscript/pull/1210))
+ - Refines ScopeValidator Diagnostics to use more specific Diagnostic tags ([#1211](https://github.com/rokucommunity/brighterscript/pull/1211))
+ - Fixes issue with enums in namespaces ([#1216](https://github.com/rokucommunity/brighterscript/pull/1216))
+
+
+
+## [1.0.0-alpha.30](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.29...v1.0.0-alpha.30) - 2024-05-16
+### Added
+ - alias completions ([#1188](https://github.com/rokucommunity/brighterscript/pull/1188))
+ - the isInstance flag on symbol extra data for when a symbol represents an instance of a type ([#1187](https://github.com/rokucommunity/brighterscript/pull/1187))
+ - Conditional Compilation Statements to the AST ([#1149](https://github.com/rokucommunity/brighterscript/pull/1149))
+ - extra DiagnosticManager.register() overload ([#1185](https://github.com/rokucommunity/brighterscript/pull/1185))
+ - AstNode.getEndTrivia ([#1184](https://github.com/rokucommunity/brighterscript/pull/1184))
+ - `roSGNode` `Update()` overload ([#1173](https://github.com/rokucommunity/brighterscript/pull/1173))
+ - `roSgNodeContentNode` fields ([#1159](https://github.com/rokucommunity/brighterscript/pull/1159))
+ - AstNode visitor function for createVisitor ([#1138](https://github.com/rokucommunity/brighterscript/pull/1138))
+ - `Alias` Statement ([#1151](https://github.com/rokucommunity/brighterscript/pull/1151))
+ - `typecast m as <Type>` statement ([#1140](https://github.com/rokucommunity/brighterscript/pull/1140))
+###  Fixed
+ - allows numbers to be passed to a function that takes a bool ([#1179](https://github.com/rokucommunity/brighterscript/pull/1179))
+ - several lsp crashes for v1 ([#1175](https://github.com/rokucommunity/brighterscript/pull/1175))
+ - crash when diagnostic is missing range ([#1174](https://github.com/rokucommunity/brighterscript/pull/1174))
+ - union type issues with unknown members ([#1170](https://github.com/rokucommunity/brighterscript/pull/1170))
+ - formatting with logger output ([#1171](https://github.com/rokucommunity/brighterscript/pull/1171))
+ - hovers on LHS of assignments do symbol type lookups ([#1165](https://github.com/rokucommunity/brighterscript/pull/1165))
+ - includes in self closing components ([#1150](https://github.com/rokucommunity/brighterscript/pull/1150))
+### Changed
+ - move function calls to separate diagnostic ([#1169](https://github.com/rokucommunity/brighterscript/pull/1169))
+ - all overloaded methods in interfaces from Scraped Roku docs ([#1163](https://github.com/rokucommunity/brighterscript/pull/1163))
+ - Fixes issue with defualt params referencing previous ones ([#1161](https://github.com/rokucommunity/brighterscript/pull/1161))
+ - fix: resolve the stagingDir option relative to the bsconfig.json file ([#1148](https://github.com/rokucommunity/brighterscript/pull/1148))
+ - `CreateObject` function call implies correct return type ([#1154](https://github.com/rokucommunity/brighterscript/pull/1154))
+ - diagnostics refactor: DiagnosticManager ([#1136](https://github.com/rokucommunity/brighterscript/pull/1136))
+ - revert range and column caching ([#1147](https://github.com/rokucommunity/brighterscript/pull/1147))
+ - Fixes CompletionItemKinds for typed variables ([#1145](https://github.com/rokucommunity/brighterscript/pull/1145))
+ - typecast symbols are not merged to other namespaces ([#1144](https://github.com/rokucommunity/brighterscript/pull/1144))
+ - removes diagnostic on accessing unknown member of roAssociativeArray ([#1143](https://github.com/rokucommunity/brighterscript/pull/1143))
+ - upgrade to @rokucommunity/logger ([#1137](https://github.com/rokucommunity/brighterscript/pull/1137))
+
+
+
+## [1.0.0-alpha.29](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.28...v1.0.0-alpha.29) - 2024-03-28
+### Fixed
+ - transpile crash when token has no text ([#1109](https://github.com/rokucommunity/brighterscript/pull/1109))
+ - array type in const ([#1111](https://github.com/rokucommunity/brighterscript/pull/1111))
+ - more validation performance ([#1110](https://github.com/rokucommunity/brighterscript/pull/1110))
+ - significant validation improvement ([#1119](https://github.com/rokucommunity/brighterscript/pull/1119))
+ - fix bug in range and position caching ([#1126](https://github.com/rokucommunity/brighterscript/pull/1126))
+
+
+
+## [1.0.0-alpha.28](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.27...v1.0.0-alpha.28) - 2024-03-13
+### Added
+- type to const hovers and adds hover for for-each loop vars ([#1092](https://github.com/rokucommunity/brighterscript/pull/1092))
+### Changed
+- formal support for various variable and name shadowing rules ([#1089](https://github.com/rokucommunity/brighterscript/pull/1089))
+- improve message for empty throw statements ([#1099](https://github.com/rokucommunity/brighterscript/pull/1099))
+- move scope.validate() into BscPlugin ([#1105](https://github.com/rokucommunity/brighterscript/pull/1105))
+- remove `CommentStatement` and all comment tokens from Lexer output ([#1083](https://github.com/rokucommunity/brighterscript/pull/1083))
+### Fixed
+- 'm' type is now AssocArray in function in AALiteral ([#1097](https://github.com/rokucommunity/brighterscript/pull/1097))
+- ensure SymbolTypeFlag is exported from ./index.ts ([#1094](https://github.com/rokucommunity/brighterscript/pull/1094))
+- diagnostic when using variable declared with unknown type ([#1098](https://github.com/rokucommunity/brighterscript/pull/1098))
+- issue with bitwise binary operators ([#1107](https://github.com/rokucommunity/brighterscript/pull/1107))
+- issue with AA overriding built-in properties ([#1106](https://github.com/rokucommunity/brighterscript/pull/1106))
+- classname as variable for completions and validations ([#1096](https://github.com/rokucommunity/brighterscript/pull/1096))
+
+
+
+## [1.0.0-alpha.27](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.26...v1.0.0-alpha.27) - 2024-02-27
+### Added
+ - Validation when trying to access a class member directly on a class name ([#1073](https://github.com/rokucommunity/brighterscript/pull/1073))
+### Changed
+ - Make All AST Props Readonly ([#1069](https://github.com/rokucommunity/brighterscript/pull/1069))
+ - Modifies all SG AST constructors to use named properties in objects ([#1070](https://github.com/rokucommunity/brighterscript/pull/1070))
+### Fixed
+ - If a namespace shadows a function, still allow processing to continue ([#1063](https://github.com/rokucommunity/brighterscript/pull/1063))
+ - Simplify the plugin method signatures. ([#1067](https://github.com/rokucommunity/brighterscript/pull/1067))
+ - Add rsgpalette to scraped docs ([#1065](https://github.com/rokucommunity/brighterscript/pull/1065))
+ - Member hovers for classes, interfaces and enums ([#1071](https://github.com/rokucommunity/brighterscript/pull/1071))
+ - Calling `new` on a non-class constructor ([#1075](https://github.com/rokucommunity/brighterscript/pull/1075))
+ - Bad diagnostic on using class name as field name ([#1076](https://github.com/rokucommunity/brighterscript/pull/1076))
+
+
+
+## [1.0.0-alpha.26](https://github.com/rokucommunity/brighterscript/compare/v1.0.0-alpha.25...v1.0.0-alpha.26) - 2024-02-01
+### Changed
+ - Built-in Objects have their interfaces as members ([#1039](https://github.com/rokucommunity/brighterscript/pull/1039))
+ - Do not do validation on dotted sets of AAs ([#1040](https://github.com/rokucommunity/brighterscript/pull/1040))
+ - Changed adding invalid as arg to empty callfunc invocations by default ([#1043](https://github.com/rokucommunity/brighterscript/pull/1043))
+ - Standardize AST Constructors ([#1025)](https://github.com/rokucommunity/brighterscript/pull/1025))
+ - Change Dotted Get/Set to single .indexes prop ([#1054](https://github.com/rokucommunity/brighterscript/pull/1054))
+
+
+
+## [1.0.0-alpha.25](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.11...v1.0.0-alpha.25) - 2024-01-25
+### Changed
+ - renamed these releases to `v1.0.0-alpha.*`, which means we are now targeting a `v1.0.0` release
+ - Remove `Parser.references` ([#1021](https://github.com/rokucommunity/brighterscript/pull/1021))
+ - Fixes Compatibility checks for types defined recursively. ([#1015](https://github.com/rokucommunity/brighterscript/pull/1015))
+ - Renamed File interface to BscFile #1013
+ - Fix cross namespace collision detection ([#1008](https://github.com/rokucommunity/brighterscript/pull/1008))
+ - XML fields of type color can accept strings or integers ([#1016](https://github.com/rokucommunity/brighterscript/pull/1016))
+ - Updates the Member types for Component Fields ([#1014](https://github.com/rokucommunity/brighterscript/pull/1014))
+ - Adds missing Completion Items ([#1009](https://github.com/rokucommunity/brighterscript/pull/1009))
+ - Adds missing Completion Items ([#1009](https://github.com/rokucommunity/brighterscript/pull/1009))
+ - Adds a findChildren function on AstNode ([#1010](https://github.com/rokucommunity/brighterscript/pull/1010))
+ - Adds Diagnostics for Member Accessibility ([#1004](https://github.com/rokucommunity/brighterscript/pull/1004))
+ - Fixes transpiles of Typecasts wrapped in parens ([#998](https://github.com/rokucommunity/brighterscript/pull/998))
+
+
+
+## [0.66.0-alpha.11](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.10...v0.66.0-alpha.11) - 2023-12-21
+### Changed
+ - Make `roSGNode` and `roSGNodeNode` the same ([#984](https://github.com/rokucommunity/brighterscript/pull/984))
+### Fixed
+ - Scope validation crash ([#991](https://github.com/rokucommunity/brighterscript/pull/991))
+ - Namespace validation crash ([#989](https://github.com/rokucommunity/brighterscript/pull/989))
+
+
+
+## [0.66.0-alpha.10](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.9...v0.66.0-alpha.10) - 2023-12-07
+### Fixed
+ - class constructor used as function transpilation and validation ([#972](https://github.com/rokucommunity/brighterscript/pull/972))
+ - exception when given unknown type ([#983](https://github.com/rokucommunity/brighterscript/pull/983))
+### Changed
+ - classes do not include AA members ([#970](https://github.com/rokucommunity/brighterscript/pull/970))
+ - remove post-transpiled symbols from .bs code completion ([#979](https://github.com/rokucommunity/brighterscript/pull/979))
+ - general purpose name collision diagnostic ([#982](https://github.com/rokucommunity/brighterscript/pull/982))
+
+
+
+## [0.66.0-alpha.9](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.8...v0.66.0-alpha.9) - 2023-11-28
+### Fixed
+ - removed `v8-profiler-next` package as a dependency (it'll be installed on-demand) ([#1287a5d](https://github.com/rokucommunity/brighterscript/commits/1287a5d7628c0e3ae3154697dfa4d12df5d7e96a))
+
+
+
+## [0.66.0-alpha.8](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.7...v0.66.0-alpha.8) - 2023-11-27
+### Added
+- Interface optional properties ([#946](https://github.com/rokucommunity/brighterscript/pull/946))
+- ifDraw2d to reRegion interface ([#960](https://github.com/rokucommunity/brighterscript/pull/960))
+### Changed
+- cache `range` and `position` to improve performance ([#940](https://github.com/rokucommunity/brighterscript/pull/940))
+- changes to make use with Plugins easier ([#959](https://github.com/rokucommunity/brighterscript/pull/959))
+### Fixed
+- parsing order for `not` keyword ([#932](https://github.com/rokucommunity/brighterscript/pull/932))
+- class fields using constructors not transpiling correctly ([#933](https://github.com/rokucommunity/brighterscript/pull/933))
+- performance fixes ([#936](https://github.com/rokucommunity/brighterscript/pull/936))
+- validation Performance: File level providedSymbols and `requiredSymbols` ([#944](https://github.com/rokucommunity/brighterscript/pull/944))
+- interface & class support for go-to-definition ([#948](https://github.com/rokucommunity/brighterscript/pull/948))
+- fixes using Enums directly in namespaced situations ([#949](https://github.com/rokucommunity/brighterscript/pull/949))
+- completion performance ([#958](https://github.com/rokucommunity/brighterscript/pull/958))
+- param order for AST class constructors for interface/class members ([#954](https://github.com/rokucommunity/brighterscript/pull/954))
+
+
+
+## [0.66.0-alpha.7](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.6...v0.66.0-alpha.7) - 2023-10-16
+### Changed
+ - all changes from [v0.65.6](https://github.com/rokucommunity/brighterscript/compare/v0.65.5...v0.65.6) and [v0.65.7](https://github.com/rokucommunity/brighterscript/compare/v0.65.6...v0.65.7)
+ - Better multi-scope messages ([#904](https://github.com/rokucommunity/brighterscript/pull/904))
+ - Refine type compatibility message ([#908](https://github.com/rokucommunity/brighterscript/pull/908))
+ - Allow classes and native components in Typed Arrays ([#919](https://github.com/rokucommunity/brighterscript/pull/919))
+ - Fixes some enum validation stuff ([#920](https://github.com/rokucommunity/brighterscript/pull/920))
+ - Fixes compatibility of built in types (roArray -> typed arrays) ([#925](https://github.com/rokucommunity/brighterscript/pull/925))
+ - Semantic Tokes for Native Components and Type completion in Type Expressions ([#927](https://github.com/rokucommunity/brighterscript/pull/927))
+ - Adds callFunc as member method to Custom Components ([#929](https://github.com/rokucommunity/brighterscript/pull/929))
+ - Allows scrape-roku-docs to consolidate overloaded methods ([#930](https://github.com/rokucommunity/brighterscript/pull/930))
+ - File api ([#408](https://github.com/rokucommunity/brighterscript/pull/408))
+
+
+
+## [0.66.0-alpha.6](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.5...v0.66.0-alpha.6) - 2023-09-20
+### Changed
+ - Validates DottedSetStatements for type compatibility ([#894](https://github.com/rokucommunity/brighterscript/pull/894))
+ - Adds Native Brightscript Component Types and Custom Components (Nodes) to Type System ([#891](https://github.com/rokucommunity/brighterscript/pull/891))
+ - Adds validation for binary operators ([#896](https://github.com/rokucommunity/brighterscript/pull/896))
+ - Fix union type unary operations and Array.sort(by) optional params ([#897](https://github.com/rokucommunity/brighterscript/pull/897))
+ - Interface param support ([#900](https://github.com/rokucommunity/brighterscript/pull/900))
+ - Fixes issues with Interface validations, and adds extra details about missing or mismatches members ([#901](https://github.com/rokucommunity/brighterscript/pull/901))
+ - Fix isLiteralInvalid ([#902](https://github.com/rokucommunity/brighterscript/pull/902))
+
+
+
+## [0.66.0-alpha.5](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.4...v0.66.0-alpha.5) - 2023-09-14
+### Changed
+ - all changes from [v0.65.5](https://github.com/rokucommunity/brighterscript/compare/v0.65.4...v0.65.5)
+ - Type casts are not allowed in BrightScript ([#859](https://github.com/rokucommunity/brighterscript/pull/859))
+ - Fixes small hover issues ([#860](https://github.com/rokucommunity/brighterscript/pull/860))
+ - Fixes ReferenceTypes in Binary Operations & UnionTypes as args ([#858](https://github.com/rokucommunity/brighterscript/pull/858))
+ - Refactor completion logic ([#864](https://github.com/rokucommunity/brighterscript/pull/864))
+ - Fix built in methods parameter types ([#866](https://github.com/rokucommunity/brighterscript/pull/866))
+ - Fixes types on call expression info class ([#877](https://github.com/rokucommunity/brighterscript/pull/877))
+ - Adds Return type validation ([#876](https://github.com/rokucommunity/brighterscript/pull/876))
+ - Adds Typed Arrays ([#875](https://github.com/rokucommunity/brighterscript/pull/875))
+ - Use Symbol Tables for Completions ([#874](https://github.com/rokucommunity/brighterscript/pull/874))
+ - Adds Leading Trivia to all tokens ([#885](https://github.com/rokucommunity/brighterscript/pull/885))
+ - Adds built in Interfaces to primitive types & Validates class method calls ([#856](https://github.com/rokucommunity/brighterscript/pull/856))
+
+
+
+## [0.66.0-alpha.4](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.3...v0.66.0-alpha.4) - 2023-07-26
+### Changed
+ - all changes from [v0.65.4](https://github.com/rokucommunity/brighterscript/compare/v0.65.3...v0.65.4)
+### Fixes
+ - assignment from return of member functions of primitive types ([#855](https://github.com/rokucommunity/brighterscript/pull/855))
+ - using invalid as a default param value (now sets type to dynamic) ([#855](https://github.com/rokucommunity/brighterscript/pull/855))
+ - missing `Roku_Event_Dispatcher()` global callable (from library `Roku_Event_Dispatcher.brs`) ([#855](https://github.com/rokucommunity/brighterscript/pull/855))
+ - `FormatJson()` function signature ([#855](https://github.com/rokucommunity/brighterscript/pull/855))
+
+
+
+## [0.66.0-alpha.3](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.2...v0.66.0-alpha.3) - 2023-07-24
+## Fixed
+- performance fixes ([#834](https://github.com/rokucommunity/brighterscript/pull/834))
+- remove enable type validation option ([#846](https://github.com/rokucommunity/brighterscript/pull/846))
+- BinaryExpression and UnaryExpression infer resultant types ([#827](https://github.com/rokucommunity/brighterscript/pull/827))
+- improve hover to use symbol tables ([#828](https://github.com/rokucommunity/brighterscript/pull/828))
+- fix issue with enums not being properly treated as their underlying types when passed to functions ([#849](https://github.com/rokucommunity/brighterscript/pull/849))
+- object type wider support ([#850](https://github.com/rokucommunity/brighterscript/pull/850))
+- functions as params ([#853](https://github.com/rokucommunity/brighterscript/pull/853))
+
+
+
+## [0.66.0-alpha.2](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.1...v0.66.0-alpha.2) - 2023-06-14
+### Fixed
+- Fixes some issues related to Classes as Properties and Consts validation ([#826](https://github.com/rokucommunity/brighterscript/pull/826))
+  - Fixes when a Class is a Property of another class, and being unable to resolve it
+  - Fixes issue with Consts value looking at a typetime value of the RHS
+  - Does a better job of caching symbol lookups on memberTables
+
+
+
+## [0.66.0-alpha.1](https://github.com/rokucommunity/brighterscript/compare/v0.66.0-alpha.0...v0.66.0-alpha.1) - 2023-06-11
+### Changed
+ - plugin event structures (all events now take a single event object instead of ordered params)
+### Fixed
+ - bugs with namespaces across files having their members missing during validation
+
+
+
+## [0.66.0-alpha.0](https://github.com/rokucommunity/brighterscript/compare/v0.65.1...v0.66.0-alpha.0) - 2023-06-09
+### Changed
+ - all the type tracking stuff!
+
 ## [0.72.0](https://github.com/rokucommunity/brighterscript/compare/0.71.1...v0.72.0) - 2026-04-30
 ### Added
  - Add `relativeSourceMaps` option for portable sourcemaps ([#1624](https://github.com/rokucommunity/brighterscript/pull/1624))
@@ -338,7 +820,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 ## 0.66.0
-This release was skipped because we decided to change from the v0.66 alphas to move those breaking changes into v1. 
+This release was skipped because we decided to change from the v0.66 alphas to move those breaking changes into v1.
 
 
 
diff --git a/README.md b/README.md
index 66696a143..4e16dd504 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ A superset of Roku's BrightScript language. Compiles to standard BrightScript.
 
 ## Overview
 
+**WARNING: this is the `v1` branch with experimental features**
+
 The BrighterScript language provides new features and syntax enhancements to Roku's BrightScript language. Because the language is a superset of BrightScript, the parser and associated tools (VSCode integration, cli, etc...) work with standard BrightScript (.brs) files. This means you will get benefits (as described in the following section) from using the BrighterScript compiler, whether your project contains BrighterScript (.bs) files or not. The BrighterScript language transpiles to standard BrightScript, so your code is fully compatible with all roku devices.
 
 ## Help!
@@ -153,7 +155,7 @@ If you need to configure `bsc`, you can do so in two ways:
 1. Your project resides in a subdirectory of your workspace folder.
 
     ```bash
-    bsc --root-dir ./rokuSourceFiles
+    bsc --rootDir ./rokuSourceFiles
     ```
 2. Run the compiler in watch mode
 
@@ -161,16 +163,12 @@ If you need to configure `bsc`, you can do so in two ways:
     bsc --watch
     ```
 
-3. Run the compiler in watch mode, and redeploy to the roku on every change
-    ```bash
-    bsc --watch --deploy --host 192.168.1.10 --password secret_password
-    ```
-4. Use a bsconfig.json file not located at cwd
+3. Use a bsconfig.json file not located at cwd
     ```bash
     bsc --project ./some_folder/bsconfig.json
     ```
 
-5. Run the compiler as a **linter** only (watch mode supported)
+4. Run the compiler as a **linter** only (watch mode supported)
     ```bash
     bsc --create-package false --copy-to-staging false
     ```
@@ -186,8 +184,7 @@ The presence of a `bsconfig.json` file in a directory indicates that the directo
     "files": [
         "**/*"
     ],
-    "stagingFolderPath": "dist",
-    "retainStagingFolder": true,
+    "outDir": "out",
     //this flag tells BrighterScript that for every xml file, try to import a .bs file with the same name and location
     "autoImportComponentScript": true,
     "sourceMap": true
diff --git a/benchmarks/index.ts b/benchmarks/index.ts
index fdb24ecfe..12c8d00a1 100644
--- a/benchmarks/index.ts
+++ b/benchmarks/index.ts
@@ -22,6 +22,7 @@ interface RunnerOptions {
     quick: boolean;
     profile: boolean;
     tar: boolean;
+    config: string;
 }
 class Runner {
     constructor(
@@ -144,8 +145,9 @@ class Runner {
                     cwd: cwd
                 });
 
-                execSync(`npx ts-node target-runner.ts "${version}" "${maxVersionLength}" "${target}" "${maxTargetLength}" "${alias}" "${this.options.project}" "${this.options.quick}" "${this.options.profile}"`, {
+                execSync(`npx ts-node target-runner.ts "${version}" "${maxVersionLength}" "${target}" "${maxTargetLength}" "${alias}" "${this.options.project}" "${this.options.quick}" "${this.options.profile}" "${(this.options.config ?? '{}').replaceAll('\"', '\\"')}"`, {
                     env: {
+                        ...process.env,
                         'NODE_OPTIONS': `--max-old-space-size=${MAX_OLD_SPACE}`
                     }
                 });
@@ -205,6 +207,11 @@ let options = yargs
         description: 'use a npm-packed tarball for local files instead of using the files directly',
         default: true
     })
+    .option('config', {
+        type: 'string',
+        description: 'add additional BsConfig settings as JSON - eg. \'{"removeParameterTypes":true}\'',
+        default: '{}'
+    })
     .strict()
     .check(argv => {
         const idx = argv.versions.indexOf('latest');
diff --git a/benchmarks/package-lock.json b/benchmarks/package-lock.json
index a1f74c2ed..632809730 100644
--- a/benchmarks/package-lock.json
+++ b/benchmarks/package-lock.json
@@ -1,7 +1,7 @@
 {
     "name": "bsc-benchmark-tester",
     "version": "1.0.0",
-    "lockfileVersion": 2,
+    "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
@@ -25,6 +25,7 @@
             "version": "0.8.1",
             "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
             "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+            "license": "MIT",
             "dependencies": {
                 "@jridgewell/trace-mapping": "0.3.9"
             },
@@ -35,12 +36,14 @@
         "node_modules/@gar/promisify": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
-            "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
+            "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+            "license": "MIT"
         },
         "node_modules/@isaacs/cliui": {
             "version": "8.0.2",
             "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
             "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+            "license": "ISC",
             "dependencies": {
                 "string-width": "^5.1.2",
                 "string-width-cjs": "npm:string-width@^4.2.0",
@@ -53,96 +56,26 @@
                 "node": ">=12"
             }
         },
-        "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-            "version": "6.2.2",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-            "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-            }
-        },
-        "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
-            "version": "6.2.3",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-            "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-        },
-        "node_modules/@isaacs/cliui/node_modules/string-width": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-            "dependencies": {
-                "eastasianwidth": "^0.2.0",
-                "emoji-regex": "^9.2.2",
-                "strip-ansi": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-            "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
-            "dependencies": {
-                "ansi-regex": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-            }
-        },
-        "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-            "dependencies": {
-                "ansi-styles": "^6.1.0",
-                "string-width": "^5.0.1",
-                "strip-ansi": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
         "node_modules/@jridgewell/resolve-uri": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-            "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+            "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+            "license": "MIT",
             "engines": {
                 "node": ">=6.0.0"
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.4.15",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+            "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
             "version": "0.3.9",
             "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
             "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+            "license": "MIT",
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.0.3",
                 "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -152,6 +85,7 @@
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
             "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "2.0.5",
                 "run-parallel": "^1.1.9"
@@ -164,6 +98,7 @@
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
             "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 8"
             }
@@ -172,6 +107,7 @@
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
             "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.scandir": "2.1.5",
                 "fastq": "^1.6.0"
@@ -184,6 +120,7 @@
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
             "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
+            "license": "ISC",
             "dependencies": {
                 "@gar/promisify": "^1.1.3",
                 "semver": "^7.3.5"
@@ -197,6 +134,7 @@
             "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz",
             "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
             "deprecated": "This functionality has been moved to @npmcli/fs",
+            "license": "MIT",
             "dependencies": {
                 "mkdirp": "^1.0.4",
                 "rimraf": "^3.0.2"
@@ -206,9 +144,10 @@
             }
         },
         "node_modules/@npmcli/move-file/node_modules/brace-expansion": {
-            "version": "1.1.13",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-            "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -218,6 +157,8 @@
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -237,6 +178,7 @@
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
             "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -248,6 +190,8 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
+            "license": "ISC",
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -262,55 +206,66 @@
             "version": "0.11.0",
             "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
             "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+            "license": "MIT",
             "optional": true,
             "engines": {
                 "node": ">=14"
             }
         },
         "node_modules/@tootallnate/once": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-            "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.1.tgz",
+            "integrity": "sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 10"
             }
         },
         "node_modules/@tsconfig/node10": {
-            "version": "1.0.9",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-            "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA=="
+            "version": "1.0.12",
+            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz",
+            "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==",
+            "license": "MIT"
         },
         "node_modules/@tsconfig/node12": {
             "version": "1.0.11",
             "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-            "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="
+            "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+            "license": "MIT"
         },
         "node_modules/@tsconfig/node14": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-            "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="
+            "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+            "license": "MIT"
         },
         "node_modules/@tsconfig/node16": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-            "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+            "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+            "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "18.15.12",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz",
-            "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==",
-            "peer": true
+            "version": "25.6.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz",
+            "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==",
+            "license": "MIT",
+            "peer": true,
+            "dependencies": {
+                "undici-types": "~7.19.0"
+            }
         },
         "node_modules/@xprofiler/node-pre-gyp": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/@xprofiler/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
-            "integrity": "sha512-dJSwF3UXDWRUIrqI+FTWyzwo+dxqDrKMIPD9hTHNvqotlu7Bsk8qqsGGMtNUgNV7QK0QwBozROJiW7iFkO9EHQ==",
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/@xprofiler/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+            "integrity": "sha512-kNFT4XscrA+Hjh+jSHs49PiG/YGf08a6eNDo16qjSnCaT4B5ngrKDcNtEJ6CnS0sDP/1oZmHCBYECB6wGKP7lg==",
+            "license": "BSD-3-Clause",
             "dependencies": {
                 "detect-libc": "^1.0.3",
                 "https-proxy-agent": "^5.0.0",
                 "make-dir": "^3.1.0",
                 "node-fetch": "^2.6.5",
-                "node-gyp": "^9.3.1",
+                "node-gyp": "9.3.1",
                 "nopt": "^5.0.0",
                 "npmlog": "^5.0.1",
                 "rimraf": "^3.0.2",
@@ -322,9 +277,10 @@
             }
         },
         "node_modules/@xprofiler/node-pre-gyp/node_modules/brace-expansion": {
-            "version": "1.1.13",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-            "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -334,6 +290,8 @@
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -353,6 +311,7 @@
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
             "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -364,6 +323,8 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
+            "license": "ISC",
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -377,12 +338,14 @@
         "node_modules/abbrev": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
+            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+            "license": "ISC"
         },
         "node_modules/acorn": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+            "version": "8.16.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+            "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+            "license": "MIT",
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -391,9 +354,13 @@
             }
         },
         "node_modules/acorn-walk": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
+            "version": "8.3.5",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
+            "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
+            "license": "MIT",
+            "dependencies": {
+                "acorn": "^8.11.0"
+            },
             "engines": {
                 "node": ">=0.4.0"
             }
@@ -402,6 +369,7 @@
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
             "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "license": "MIT",
             "dependencies": {
                 "debug": "4"
             },
@@ -410,12 +378,11 @@
             }
         },
         "node_modules/agentkeepalive": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
-            "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
+            "version": "4.6.0",
+            "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
+            "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==",
+            "license": "MIT",
             "dependencies": {
-                "debug": "^4.1.0",
-                "depd": "^2.0.0",
                 "humanize-ms": "^1.2.1"
             },
             "engines": {
@@ -426,6 +393,7 @@
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
             "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+            "license": "MIT",
             "dependencies": {
                 "clean-stack": "^2.0.0",
                 "indent-string": "^4.0.0"
@@ -435,17 +403,22 @@
             }
         },
         "node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+            "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
+            "license": "MIT",
             "engines": {
-                "node": ">=8"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
             }
         },
         "node_modules/ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
             },
@@ -457,14 +430,17 @@
             }
         },
         "node_modules/aproba": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-            "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz",
+            "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==",
+            "license": "ISC"
         },
         "node_modules/are-we-there-yet": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
             "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
             "dependencies": {
                 "delegates": "^1.0.0",
                 "readable-stream": "^3.6.0"
@@ -476,26 +452,30 @@
         "node_modules/arg": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-            "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
+            "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+            "license": "MIT"
         },
         "node_modules/balanced-match": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "license": "MIT"
         },
         "node_modules/benchmark": {
             "version": "2.1.4",
             "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz",
             "integrity": "sha512-l9MlfN4M1K/H2fbhfMy3B7vJd6AGKJVQn2h6Sg/Yx+KckoUA7ewS5Vv6TjSq18ooE1kS9hhAlQRH3AkXIh/aOQ==",
+            "license": "MIT",
             "dependencies": {
                 "lodash": "^4.17.4",
                 "platform": "^1.3.3"
             }
         },
         "node_modules/brace-expansion": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-            "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.0.tgz",
+            "integrity": "sha512-TN1kCZAgdgweJhWWpgKYrQaMNHcDULHkWwQIspdtjV4Y5aurRdZpjAqn6yX3FPqTA9ngHCc4hJxMAMgGfve85w==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
             }
@@ -504,6 +484,7 @@
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
             "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "license": "MIT",
             "dependencies": {
                 "fill-range": "^7.1.1"
             },
@@ -514,12 +495,14 @@
         "node_modules/buffer-from": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
+            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+            "license": "MIT"
         },
         "node_modules/cacache": {
             "version": "16.1.3",
             "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz",
             "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==",
+            "license": "ISC",
             "dependencies": {
                 "@npmcli/fs": "^2.1.0",
                 "@npmcli/move-file": "^2.0.0",
@@ -548,6 +531,8 @@
             "version": "8.1.0",
             "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
             "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -566,6 +551,7 @@
             "version": "7.18.3",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
             "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+            "license": "ISC",
             "engines": {
                 "node": ">=12"
             }
@@ -574,6 +560,7 @@
             "version": "5.1.9",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
             "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             },
@@ -585,6 +572,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -596,6 +584,8 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
+            "license": "ISC",
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -607,9 +597,10 @@
             }
         },
         "node_modules/cacache/node_modules/rimraf/node_modules/brace-expansion": {
-            "version": "1.1.13",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-            "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -619,6 +610,8 @@
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -638,6 +631,7 @@
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
             "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -649,6 +643,7 @@
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
             "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.1.0",
                 "supports-color": "^7.1.0"
@@ -660,29 +655,11 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/chalk/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/chalk/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/chownr": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
             "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+            "license": "ISC",
             "engines": {
                 "node": ">=10"
             }
@@ -691,14 +668,88 @@
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
             "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
         },
+        "node_modules/cliui": {
+            "version": "8.0.1",
+            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^4.2.0",
+                "strip-ansi": "^6.0.1",
+                "wrap-ansi": "^7.0.0"
+            },
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/cliui/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
+        "node_modules/cliui/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/cliui/node_modules/wrap-ansi": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-styles": "^4.0.0",
+                "string-width": "^4.1.0",
+                "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+            }
+        },
         "node_modules/color-convert": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "license": "MIT",
             "dependencies": {
                 "color-name": "~1.1.4"
             },
@@ -709,12 +760,14 @@
         "node_modules/color-name": {
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "license": "MIT"
         },
         "node_modules/color-support": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
             "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+            "license": "ISC",
             "bin": {
                 "color-support": "bin.js"
             }
@@ -722,22 +775,26 @@
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+            "license": "MIT"
         },
         "node_modules/console-control-strings": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
+            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+            "license": "ISC"
         },
         "node_modules/create-require": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-            "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
+            "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+            "license": "MIT"
         },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
             "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -748,11 +805,12 @@
             }
         },
         "node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+            "license": "MIT",
             "dependencies": {
-                "ms": "2.1.2"
+                "ms": "^2.1.3"
             },
             "engines": {
                 "node": ">=6.0"
@@ -766,20 +824,14 @@
         "node_modules/delegates": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
-        },
-        "node_modules/depd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-            "engines": {
-                "node": ">= 0.8"
-            }
+            "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+            "license": "MIT"
         },
         "node_modules/detect-libc": {
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
             "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+            "license": "Apache-2.0",
             "bin": {
                 "detect-libc": "bin/detect-libc.js"
             },
@@ -791,6 +843,7 @@
             "version": "4.0.4",
             "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
             "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==",
+            "license": "BSD-3-Clause",
             "engines": {
                 "node": ">=0.3.1"
             }
@@ -798,17 +851,20 @@
         "node_modules/eastasianwidth": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+            "license": "MIT"
         },
         "node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+            "version": "9.2.2",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "license": "MIT"
         },
         "node_modules/encoding": {
             "version": "0.1.13",
             "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
             "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+            "license": "MIT",
             "optional": true,
             "dependencies": {
                 "iconv-lite": "^0.6.2"
@@ -818,6 +874,7 @@
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
             "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
@@ -825,35 +882,39 @@
         "node_modules/err-code": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-            "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+            "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==",
+            "license": "MIT"
         },
         "node_modules/escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+            "license": "MIT",
             "engines": {
                 "node": ">=6"
             }
         },
         "node_modules/fast-glob": {
-            "version": "3.2.12",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-            "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
+            "version": "3.3.3",
+            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+            "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+            "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
                 "@nodelib/fs.walk": "^1.2.3",
                 "glob-parent": "^5.1.2",
                 "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
+                "micromatch": "^4.0.8"
             },
             "engines": {
                 "node": ">=8.6.0"
             }
         },
         "node_modules/fastq": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-            "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
+            "version": "1.20.1",
+            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
+            "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
+            "license": "ISC",
             "dependencies": {
                 "reusify": "^1.0.4"
             }
@@ -862,6 +923,7 @@
             "version": "7.1.1",
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
             "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "license": "MIT",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
             },
@@ -870,11 +932,12 @@
             }
         },
         "node_modules/foreground-child": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-            "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+            "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+            "license": "ISC",
             "dependencies": {
-                "cross-spawn": "^7.0.0",
+                "cross-spawn": "^7.0.6",
                 "signal-exit": "^4.0.1"
             },
             "engines": {
@@ -885,9 +948,10 @@
             }
         },
         "node_modules/fs-extra": {
-            "version": "11.1.1",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-            "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+            "version": "11.3.4",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.4.tgz",
+            "integrity": "sha512-CTXd6rk/M3/ULNQj8FBqBWHYBVYybQ3VPBw0xGKFe3tuH7ytT6ACnvzpIQ3UZtB8yvUKC2cXn1a+x+5EVQLovA==",
+            "license": "MIT",
             "dependencies": {
                 "graceful-fs": "^4.2.0",
                 "jsonfile": "^6.0.1",
@@ -901,6 +965,7 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
             "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+            "license": "ISC",
             "dependencies": {
                 "minipass": "^3.0.0"
             },
@@ -912,6 +977,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -922,12 +988,15 @@
         "node_modules/fs.realpath": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+            "license": "ISC"
         },
         "node_modules/gauge": {
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
             "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
             "dependencies": {
                 "aproba": "^1.0.3 || ^2.0.0",
                 "color-support": "^1.1.2",
@@ -943,15 +1012,58 @@
                 "node": ">=10"
             }
         },
+        "node_modules/gauge/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/gauge/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
         "node_modules/gauge/node_modules/signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "license": "ISC"
+        },
+        "node_modules/gauge/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/gauge/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
         },
         "node_modules/get-caller-file": {
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
             "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+            "license": "ISC",
             "engines": {
                 "node": "6.* || 8.* || >= 10.*"
             }
@@ -960,6 +1072,8 @@
             "version": "10.5.0",
             "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
             "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
             "dependencies": {
                 "foreground-child": "^3.1.0",
                 "jackspeak": "^3.1.2",
@@ -979,6 +1093,7 @@
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
             "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "license": "ISC",
             "dependencies": {
                 "is-glob": "^4.0.1"
             },
@@ -986,33 +1101,38 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/glob/node_modules/minipass": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            }
-        },
         "node_modules/graceful-fs": {
             "version": "4.2.11",
             "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "license": "ISC"
         },
-        "node_modules/has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
+        "node_modules/has-flag": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/has-unicode": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+            "license": "ISC"
         },
         "node_modules/http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+            "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
+            "license": "BSD-2-Clause"
         },
         "node_modules/http-proxy-agent": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
             "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+            "license": "MIT",
             "dependencies": {
                 "@tootallnate/once": "2",
                 "agent-base": "6",
@@ -1026,6 +1146,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
             "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "license": "MIT",
             "dependencies": {
                 "agent-base": "6",
                 "debug": "4"
@@ -1038,6 +1159,7 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
             "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
+            "license": "MIT",
             "dependencies": {
                 "ms": "^2.0.0"
             }
@@ -1046,6 +1168,7 @@
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
             "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+            "license": "MIT",
             "optional": true,
             "dependencies": {
                 "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -1058,6 +1181,7 @@
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
             "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+            "license": "MIT",
             "engines": {
                 "node": ">=0.8.19"
             }
@@ -1066,6 +1190,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
             "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -1073,12 +1198,15 @@
         "node_modules/infer-owner": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
+            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+            "license": "ISC"
         },
         "node_modules/inflight": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
             "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+            "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+            "license": "ISC",
             "dependencies": {
                 "once": "^1.3.0",
                 "wrappy": "1"
@@ -1087,17 +1215,23 @@
         "node_modules/inherits": {
             "version": "2.0.4",
             "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+            "license": "ISC"
         },
-        "node_modules/ip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
-            "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
+        "node_modules/ip-address": {
+            "version": "10.2.0",
+            "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz",
+            "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 12"
+            }
         },
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
             "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1106,6 +1240,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -1114,6 +1249,7 @@
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
             "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "license": "MIT",
             "dependencies": {
                 "is-extglob": "^2.1.1"
             },
@@ -1124,12 +1260,14 @@
         "node_modules/is-lambda": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-            "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="
+            "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
+            "license": "MIT"
         },
         "node_modules/is-number": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
             }
@@ -1137,12 +1275,14 @@
         "node_modules/isexe": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "license": "ISC"
         },
         "node_modules/jackspeak": {
             "version": "3.4.3",
             "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
             "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+            "license": "BlueOak-1.0.0",
             "dependencies": {
                 "@isaacs/cliui": "^8.0.2"
             },
@@ -1154,9 +1294,10 @@
             }
         },
         "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "version": "6.2.1",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.1.tgz",
+            "integrity": "sha512-zwOTdL3rFQ/lRdBnntKVOX6k5cKJwEc1HdilT71BWEu7J41gXIB2MRp+vxduPSwZJPWBxEzv4yH1wYLJGUHX4Q==",
+            "license": "MIT",
             "dependencies": {
                 "universalify": "^2.0.0"
             },
@@ -1167,17 +1308,20 @@
         "node_modules/lodash": {
             "version": "4.18.1",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
-            "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q=="
+            "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==",
+            "license": "MIT"
         },
         "node_modules/lru-cache": {
             "version": "10.4.3",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+            "license": "ISC"
         },
         "node_modules/make-dir": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
             "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "license": "MIT",
             "dependencies": {
                 "semver": "^6.0.0"
             },
@@ -1192,6 +1336,7 @@
             "version": "6.3.1",
             "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
             "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -1199,12 +1344,14 @@
         "node_modules/make-error": {
             "version": "1.3.6",
             "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-            "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
+            "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+            "license": "ISC"
         },
         "node_modules/make-fetch-happen": {
             "version": "10.2.1",
             "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
             "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
+            "license": "ISC",
             "dependencies": {
                 "agentkeepalive": "^4.2.1",
                 "cacache": "^16.1.0",
@@ -1231,6 +1378,7 @@
             "version": "7.18.3",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
             "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+            "license": "ISC",
             "engines": {
                 "node": ">=12"
             }
@@ -1239,6 +1387,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -1250,6 +1399,7 @@
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
             "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 8"
             }
@@ -1258,6 +1408,7 @@
             "version": "4.0.8",
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
             "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+            "license": "MIT",
             "dependencies": {
                 "braces": "^3.0.3",
                 "picomatch": "^2.3.1"
@@ -1270,6 +1421,7 @@
             "version": "9.0.9",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
             "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^2.0.2"
             },
@@ -1281,17 +1433,19 @@
             }
         },
         "node_modules/minipass": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-            "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
+            "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+            "license": "BlueOak-1.0.0",
             "engines": {
-                "node": ">=8"
+                "node": ">=16 || 14 >=14.17"
             }
         },
         "node_modules/minipass-collect": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
             "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+            "license": "ISC",
             "dependencies": {
                 "minipass": "^3.0.0"
             },
@@ -1303,6 +1457,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -1314,6 +1469,7 @@
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
             "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
+            "license": "MIT",
             "dependencies": {
                 "minipass": "^3.1.6",
                 "minipass-sized": "^1.0.3",
@@ -1330,6 +1486,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -1338,9 +1495,10 @@
             }
         },
         "node_modules/minipass-flush": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-            "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+            "version": "1.0.7",
+            "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.7.tgz",
+            "integrity": "sha512-TbqTz9cUwWyHS2Dy89P3ocAGUGxKjjLuR9z8w4WUTGAVgEj17/4nhgo2Du56i0Fm3Pm30g4iA8Lcqctc76jCzA==",
+            "license": "BlueOak-1.0.0",
             "dependencies": {
                 "minipass": "^3.0.0"
             },
@@ -1352,6 +1510,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -1363,6 +1522,7 @@
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
             "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+            "license": "ISC",
             "dependencies": {
                 "minipass": "^3.0.0"
             },
@@ -1374,6 +1534,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -1385,6 +1546,7 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
             "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
+            "license": "ISC",
             "dependencies": {
                 "minipass": "^3.0.0"
             },
@@ -1396,6 +1558,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -1407,6 +1570,7 @@
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
             "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+            "license": "MIT",
             "dependencies": {
                 "minipass": "^3.0.0",
                 "yallist": "^4.0.0"
@@ -1419,6 +1583,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -1430,6 +1595,7 @@
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
             "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+            "license": "MIT",
             "bin": {
                 "mkdirp": "bin/cmd.js"
             },
@@ -1438,27 +1604,31 @@
             }
         },
         "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+            "version": "2.1.3",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+            "license": "MIT"
         },
         "node_modules/nan": {
-            "version": "2.17.0",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-            "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
+            "version": "2.26.2",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz",
+            "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==",
+            "license": "MIT"
         },
         "node_modules/negotiator": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+            "version": "0.6.4",
+            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+            "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 0.6"
             }
         },
         "node_modules/node-fetch": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-            "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+            "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+            "license": "MIT",
             "dependencies": {
                 "whatwg-url": "^5.0.0"
             },
@@ -1478,6 +1648,7 @@
             "version": "9.3.1",
             "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz",
             "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==",
+            "license": "MIT",
             "dependencies": {
                 "env-paths": "^2.2.0",
                 "glob": "^7.1.4",
@@ -1497,10 +1668,21 @@
                 "node": "^12.13 || ^14.13 || >=16"
             }
         },
+        "node_modules/node-gyp/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/node-gyp/node_modules/are-we-there-yet": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
             "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
             "dependencies": {
                 "delegates": "^1.0.0",
                 "readable-stream": "^3.6.0"
@@ -1510,18 +1692,27 @@
             }
         },
         "node_modules/node-gyp/node_modules/brace-expansion": {
-            "version": "1.1.13",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-            "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+            "version": "1.1.14",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz",
+            "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==",
+            "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
             }
         },
+        "node_modules/node-gyp/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
         "node_modules/node-gyp/node_modules/gauge": {
             "version": "4.0.4",
             "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
             "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
             "dependencies": {
                 "aproba": "^1.0.3 || ^2.0.0",
                 "color-support": "^1.1.3",
@@ -1540,6 +1731,8 @@
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
                 "inflight": "^1.0.4",
@@ -1559,6 +1752,7 @@
             "version": "3.1.5",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
             "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+            "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
             },
@@ -1570,6 +1764,7 @@
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
             "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
+            "license": "ISC",
             "dependencies": {
                 "abbrev": "^1.0.0"
             },
@@ -1584,6 +1779,8 @@
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
             "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
             "dependencies": {
                 "are-we-there-yet": "^3.0.0",
                 "console-control-strings": "^1.1.0",
@@ -1598,6 +1795,8 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
+            "license": "ISC",
             "dependencies": {
                 "glob": "^7.1.3"
             },
@@ -1611,12 +1810,40 @@
         "node_modules/node-gyp/node_modules/signal-exit": {
             "version": "3.0.7",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "license": "ISC"
+        },
+        "node_modules/node-gyp/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/node-gyp/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
         },
         "node_modules/nopt": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
             "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+            "license": "ISC",
             "dependencies": {
                 "abbrev": "1"
             },
@@ -1631,6 +1858,8 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
             "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
             "dependencies": {
                 "are-we-there-yet": "^2.0.0",
                 "console-control-strings": "^1.1.0",
@@ -1642,6 +1871,7 @@
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
             "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1650,6 +1880,7 @@
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+            "license": "ISC",
             "dependencies": {
                 "wrappy": "1"
             }
@@ -1658,6 +1889,7 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
             "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+            "license": "MIT",
             "dependencies": {
                 "aggregate-error": "^3.0.0"
             },
@@ -1671,12 +1903,14 @@
         "node_modules/package-json-from-dist": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
+            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+            "license": "BlueOak-1.0.0"
         },
         "node_modules/path-is-absolute": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
             "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1685,6 +1919,7 @@
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
@@ -1693,6 +1928,7 @@
             "version": "1.11.1",
             "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
             "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+            "license": "BlueOak-1.0.0",
             "dependencies": {
                 "lru-cache": "^10.2.0",
                 "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
@@ -1708,6 +1944,7 @@
             "version": "2.3.2",
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
             "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
+            "license": "MIT",
             "engines": {
                 "node": ">=8.6"
             },
@@ -1718,17 +1955,20 @@
         "node_modules/platform": {
             "version": "1.3.6",
             "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
-            "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
+            "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
+            "license": "MIT"
         },
         "node_modules/promise-inflight": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-            "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
+            "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+            "license": "ISC"
         },
         "node_modules/promise-retry": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
             "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
+            "license": "MIT",
             "dependencies": {
                 "err-code": "^2.0.2",
                 "retry": "^0.12.0"
@@ -1754,12 +1994,14 @@
                     "type": "consulting",
                     "url": "https://feross.org/support"
                 }
-            ]
+            ],
+            "license": "MIT"
         },
         "node_modules/readable-stream": {
             "version": "3.6.2",
             "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
             "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "license": "MIT",
             "dependencies": {
                 "inherits": "^2.0.3",
                 "string_decoder": "^1.1.1",
@@ -1772,12 +2014,14 @@
         "node_modules/readline": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
-            "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
+            "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==",
+            "license": "BSD"
         },
         "node_modules/require-directory": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
             "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+            "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1786,31 +2030,31 @@
             "version": "0.12.0",
             "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
             "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 4"
             }
         },
         "node_modules/reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+            "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+            "license": "MIT",
             "engines": {
                 "iojs": ">=1.0.0",
                 "node": ">=0.10.0"
             }
         },
         "node_modules/rimraf": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.0.tgz",
-            "integrity": "sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==",
+            "version": "5.0.10",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+            "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+            "license": "ISC",
             "dependencies": {
-                "glob": "^10.0.0"
+                "glob": "^10.3.7"
             },
             "bin": {
-                "rimraf": "dist/cjs/src/bin.js"
-            },
-            "engines": {
-                "node": ">=14"
+                "rimraf": "dist/esm/bin.mjs"
             },
             "funding": {
                 "url": "https://github.com/sponsors/isaacs"
@@ -1834,6 +2078,7 @@
                     "url": "https://feross.org/support"
                 }
             ],
+            "license": "MIT",
             "dependencies": {
                 "queue-microtask": "^1.2.2"
             }
@@ -1855,21 +2100,21 @@
                     "type": "consulting",
                     "url": "https://feross.org/support"
                 }
-            ]
+            ],
+            "license": "MIT"
         },
         "node_modules/safer-buffer": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+            "license": "MIT",
             "optional": true
         },
         "node_modules/semver": {
-            "version": "7.5.4",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
+            "version": "7.7.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
+            "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+            "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
             },
@@ -1877,26 +2122,17 @@
                 "node": ">=10"
             }
         },
-        "node_modules/semver/node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/set-blocking": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+            "license": "ISC"
         },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "license": "MIT",
             "dependencies": {
                 "shebang-regex": "^3.0.0"
             },
@@ -1908,14 +2144,16 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
         "node_modules/signal-exit": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.1.tgz",
-            "integrity": "sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+            "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+            "license": "ISC",
             "engines": {
                 "node": ">=14"
             },
@@ -1927,21 +2165,23 @@
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
             "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 6.0.0",
                 "npm": ">= 3.0.0"
             }
         },
         "node_modules/socks": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-            "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
+            "version": "2.8.8",
+            "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.8.tgz",
+            "integrity": "sha512-NlGELfPrgX2f1TAAcz0WawlLn+0r3FyhhCRpFFK2CemXenPYvzMWWZINv3eDNo9ucdwme7oCHRY0Jnbs4aIkog==",
+            "license": "MIT",
             "dependencies": {
-                "ip": "^2.0.0",
+                "ip-address": "^10.1.1",
                 "smart-buffer": "^4.2.0"
             },
             "engines": {
-                "node": ">= 10.13.0",
+                "node": ">= 10.0.0",
                 "npm": ">= 3.0.0"
             }
         },
@@ -1949,6 +2189,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
             "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
+            "license": "MIT",
             "dependencies": {
                 "agent-base": "^6.0.2",
                 "debug": "^4.3.3",
@@ -1962,6 +2203,7 @@
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+            "license": "BSD-3-Clause",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -1970,6 +2212,7 @@
             "version": "0.5.21",
             "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
             "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+            "license": "MIT",
             "dependencies": {
                 "buffer-from": "^1.0.0",
                 "source-map": "^0.6.0"
@@ -1979,6 +2222,7 @@
             "version": "9.0.1",
             "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
             "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
+            "license": "ISC",
             "dependencies": {
                 "minipass": "^3.1.1"
             },
@@ -1990,6 +2234,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+            "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
             },
@@ -2001,21 +2246,26 @@
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
             "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+            "license": "MIT",
             "dependencies": {
                 "safe-buffer": "~5.2.0"
             }
         },
         "node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "license": "MIT",
             "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
+                "eastasianwidth": "^0.2.0",
+                "emoji-regex": "^9.2.2",
+                "strip-ansi": "^7.0.1"
             },
             "engines": {
-                "node": ">=8"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/string-width-cjs": {
@@ -2023,6 +2273,7 @@
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
                 "is-fullwidth-code-point": "^3.0.0",
@@ -2032,10 +2283,26 @@
                 "node": ">=8"
             }
         },
-        "node_modules/strip-ansi": {
+        "node_modules/string-width-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/string-width-cjs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
+        "node_modules/string-width-cjs/node_modules/strip-ansi": {
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -2043,11 +2310,27 @@
                 "node": ">=8"
             }
         },
+        "node_modules/strip-ansi": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz",
+            "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^6.2.2"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+            }
+        },
         "node_modules/strip-ansi-cjs": {
             "name": "strip-ansi",
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
             },
@@ -2055,10 +2338,33 @@
                 "node": ">=8"
             }
         },
+        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/tar": {
             "version": "6.2.1",
             "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
             "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+            "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me",
+            "license": "ISC",
             "dependencies": {
                 "chownr": "^2.0.0",
                 "fs-minipass": "^2.0.0",
@@ -2071,10 +2377,20 @@
                 "node": ">=10"
             }
         },
+        "node_modules/tar/node_modules/minipass": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+            "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+            "license": "ISC",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "license": "MIT",
             "dependencies": {
                 "is-number": "^7.0.0"
             },
@@ -2085,12 +2401,14 @@
         "node_modules/tr46": {
             "version": "0.0.3",
             "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+            "license": "MIT"
         },
         "node_modules/ts-node": {
-            "version": "10.9.1",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-            "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
+            "version": "10.9.2",
+            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+            "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+            "license": "MIT",
             "dependencies": {
                 "@cspotcode/source-map-support": "^0.8.0",
                 "@tsconfig/node10": "^1.0.7",
@@ -2130,22 +2448,31 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-            "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+            "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
+            "license": "Apache-2.0",
             "peer": true,
             "bin": {
                 "tsc": "bin/tsc",
                 "tsserver": "bin/tsserver"
             },
             "engines": {
-                "node": ">=12.20"
+                "node": ">=14.17"
             }
         },
+        "node_modules/undici-types": {
+            "version": "7.19.2",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz",
+            "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==",
+            "license": "MIT",
+            "peer": true
+        },
         "node_modules/unique-filename": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
             "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
+            "license": "ISC",
             "dependencies": {
                 "unique-slug": "^3.0.0"
             },
@@ -2157,6 +2484,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz",
             "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
+            "license": "ISC",
             "dependencies": {
                 "imurmurhash": "^0.1.4"
             },
@@ -2165,9 +2493,10 @@
             }
         },
         "node_modules/universalify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+            "license": "MIT",
             "engines": {
                 "node": ">= 10.0.0"
             }
@@ -2175,32 +2504,37 @@
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
+            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+            "license": "MIT"
         },
         "node_modules/v8-compile-cache-lib": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-            "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
+            "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+            "license": "MIT"
         },
         "node_modules/v8-profiler-next": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/v8-profiler-next/-/v8-profiler-next-1.9.0.tgz",
-            "integrity": "sha512-+k2Lb0c9lEDsGNT1GfrrlV4evR2KsF3LljW8PUfRaM1OQmr+F3lXGxVIffa+LNXaw3CnwdsSdqI2zaYEhDdu5Q==",
+            "version": "1.10.0",
+            "resolved": "https://registry.npmjs.org/v8-profiler-next/-/v8-profiler-next-1.10.0.tgz",
+            "integrity": "sha512-HME7CR3V8gkBEAutcMyGS0vK0XH2hFQhF5SvSdrF/mdjWIGoaiY+WH3RpY7ePY7J7vNDbQfP+Ikefdi1z/mJXg==",
             "hasInstallScript": true,
+            "license": "MIT",
             "dependencies": {
                 "@xprofiler/node-pre-gyp": "^1.0.9",
-                "nan": "^2.16.0"
+                "nan": "^2.18.0"
             }
         },
         "node_modules/webidl-conversions": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+            "license": "BSD-2-Clause"
         },
         "node_modules/whatwg-url": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
             "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+            "license": "MIT",
             "dependencies": {
                 "tr46": "~0.0.3",
                 "webidl-conversions": "^3.0.0"
@@ -2210,6 +2544,7 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
             },
@@ -2224,21 +2559,64 @@
             "version": "1.1.5",
             "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
             "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+            "license": "ISC",
             "dependencies": {
                 "string-width": "^1.0.2 || 2 || 3 || 4"
             }
         },
+        "node_modules/wide-align/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wide-align/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
+        "node_modules/wide-align/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wide-align/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "license": "MIT",
             "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
+                "ansi-styles": "^6.1.0",
+                "string-width": "^5.0.1",
+                "strip-ansi": "^7.0.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=12"
             },
             "funding": {
                 "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
@@ -2249,6 +2627,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
@@ -2261,15 +2640,70 @@
                 "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "node_modules/wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-        },
-        "node_modules/y18n": {
-            "version": "5.0.8",
+        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
+            "dependencies": {
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wrap-ansi/node_modules/ansi-styles": {
+            "version": "6.2.3",
+            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+            "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+            }
+        },
+        "node_modules/wrappy": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+            "license": "ISC"
+        },
+        "node_modules/y18n": {
+            "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
             "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+            "license": "ISC",
             "engines": {
                 "node": ">=10"
             }
@@ -2277,12 +2711,14 @@
         "node_modules/yallist": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+            "license": "ISC"
         },
         "node_modules/yargs": {
-            "version": "17.7.1",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-            "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
+            "version": "17.7.2",
+            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+            "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+            "license": "MIT",
             "dependencies": {
                 "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
@@ -2300,1731 +2736,60 @@
             "version": "21.1.1",
             "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
             "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+            "license": "ISC",
             "engines": {
                 "node": ">=12"
             }
         },
-        "node_modules/yargs/node_modules/cliui": {
-            "version": "8.0.1",
-            "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-            "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-            "dependencies": {
-                "string-width": "^4.2.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/yn": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-            "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+        "node_modules/yargs/node_modules/ansi-regex": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "license": "MIT",
             "engines": {
-                "node": ">=6"
-            }
-        }
-    },
-    "dependencies": {
-        "@cspotcode/source-map-support": {
-            "version": "0.8.1",
-            "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-            "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-            "requires": {
-                "@jridgewell/trace-mapping": "0.3.9"
+                "node": ">=8"
             }
         },
-        "@gar/promisify": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
-            "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="
+        "node_modules/yargs/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT"
         },
-        "@isaacs/cliui": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-            "requires": {
-                "string-width": "^5.1.2",
-                "string-width-cjs": "npm:string-width@^4.2.0",
-                "strip-ansi": "^7.0.1",
-                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-                "wrap-ansi": "^8.1.0",
-                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-            },
+        "node_modules/yargs/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
             "dependencies": {
-                "ansi-regex": {
-                    "version": "6.2.2",
-                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-                    "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="
-                },
-                "ansi-styles": {
-                    "version": "6.2.3",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-                    "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg=="
-                },
-                "emoji-regex": {
-                    "version": "9.2.2",
-                    "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-                    "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-                },
-                "string-width": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-                    "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-                    "requires": {
-                        "eastasianwidth": "^0.2.0",
-                        "emoji-regex": "^9.2.2",
-                        "strip-ansi": "^7.0.1"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "7.1.2",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-                    "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
-                    "requires": {
-                        "ansi-regex": "^6.0.1"
-                    }
-                },
-                "wrap-ansi": {
-                    "version": "8.1.0",
-                    "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-                    "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-                    "requires": {
-                        "ansi-styles": "^6.1.0",
-                        "string-width": "^5.0.1",
-                        "strip-ansi": "^7.0.1"
-                    }
-                }
-            }
-        },
-        "@jridgewell/resolve-uri": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
-            "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="
-        },
-        "@jridgewell/sourcemap-codec": {
-            "version": "1.4.15",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-            "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
-        },
-        "@jridgewell/trace-mapping": {
-            "version": "0.3.9",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-            "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-            "requires": {
-                "@jridgewell/resolve-uri": "^3.0.3",
-                "@jridgewell/sourcemap-codec": "^1.4.10"
-            }
-        },
-        "@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "requires": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            }
-        },
-        "@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
-        },
-        "@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "requires": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            }
-        },
-        "@npmcli/fs": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
-            "integrity": "sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==",
-            "requires": {
-                "@gar/promisify": "^1.1.3",
-                "semver": "^7.3.5"
-            }
-        },
-        "@npmcli/move-file": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz",
-            "integrity": "sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==",
-            "requires": {
-                "mkdirp": "^1.0.4",
-                "rimraf": "^3.0.2"
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
             },
-            "dependencies": {
-                "brace-expansion": {
-                    "version": "1.1.13",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-                    "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
-                    "requires": {
-                        "balanced-match": "^1.0.0",
-                        "concat-map": "0.0.1"
-                    }
-                },
-                "glob": {
-                    "version": "7.2.3",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.1.1",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "3.1.5",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-                    "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-                    "requires": {
-                        "brace-expansion": "^1.1.7"
-                    }
-                },
-                "rimraf": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
+            "engines": {
+                "node": ">=8"
             }
         },
-        "@pkgjs/parseargs": {
-            "version": "0.11.0",
-            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-            "optional": true
-        },
-        "@tootallnate/once": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-            "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="
-        },
-        "@tsconfig/node10": {
-            "version": "1.0.9",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-            "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA=="
-        },
-        "@tsconfig/node12": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-            "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="
-        },
-        "@tsconfig/node14": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-            "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="
-        },
-        "@tsconfig/node16": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-            "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="
-        },
-        "@types/node": {
-            "version": "18.15.12",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.12.tgz",
-            "integrity": "sha512-Wha1UwsB3CYdqUm2PPzh/1gujGCNtWVUYF0mB00fJFoR4gTyWTDPjSm+zBF787Ahw8vSGgBja90MkgFwvB86Dg==",
-            "peer": true
-        },
-        "@xprofiler/node-pre-gyp": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/@xprofiler/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz",
-            "integrity": "sha512-dJSwF3UXDWRUIrqI+FTWyzwo+dxqDrKMIPD9hTHNvqotlu7Bsk8qqsGGMtNUgNV7QK0QwBozROJiW7iFkO9EHQ==",
-            "requires": {
-                "detect-libc": "^1.0.3",
-                "https-proxy-agent": "^5.0.0",
-                "make-dir": "^3.1.0",
-                "node-fetch": "^2.6.5",
-                "node-gyp": "^9.3.1",
-                "nopt": "^5.0.0",
-                "npmlog": "^5.0.1",
-                "rimraf": "^3.0.2",
-                "semver": "^7.3.5",
-                "tar": "^6.1.11"
-            },
+        "node_modules/yargs/node_modules/strip-ansi": {
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "license": "MIT",
             "dependencies": {
-                "brace-expansion": {
-                    "version": "1.1.13",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-                    "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
-                    "requires": {
-                        "balanced-match": "^1.0.0",
-                        "concat-map": "0.0.1"
-                    }
-                },
-                "glob": {
-                    "version": "7.2.3",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.1.1",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "3.1.5",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-                    "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-                    "requires": {
-                        "brace-expansion": "^1.1.7"
-                    }
-                },
-                "rimraf": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                }
-            }
-        },
-        "abbrev": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="
-        },
-        "acorn": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="
-        },
-        "acorn-walk": {
-            "version": "8.2.0",
-            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-            "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="
-        },
-        "agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-            "requires": {
-                "debug": "4"
-            }
-        },
-        "agentkeepalive": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz",
-            "integrity": "sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==",
-            "requires": {
-                "debug": "^4.1.0",
-                "depd": "^2.0.0",
-                "humanize-ms": "^1.2.1"
-            }
-        },
-        "aggregate-error": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-            "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-            "requires": {
-                "clean-stack": "^2.0.0",
-                "indent-string": "^4.0.0"
-            }
-        },
-        "ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-        },
-        "ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "requires": {
-                "color-convert": "^2.0.1"
-            }
-        },
-        "aproba": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-            "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="
-        },
-        "are-we-there-yet": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
-            "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
-            "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^3.6.0"
+                "ansi-regex": "^5.0.1"
+            },
+            "engines": {
+                "node": ">=8"
             }
         },
-        "arg": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-            "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
-        },
-        "balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
-        },
-        "benchmark": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz",
-            "integrity": "sha512-l9MlfN4M1K/H2fbhfMy3B7vJd6AGKJVQn2h6Sg/Yx+KckoUA7ewS5Vv6TjSq18ooE1kS9hhAlQRH3AkXIh/aOQ==",
-            "requires": {
-                "lodash": "^4.17.4",
-                "platform": "^1.3.3"
+        "node_modules/yn": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+            "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
             }
-        },
-        "brace-expansion": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.3.tgz",
-            "integrity": "sha512-MCV/fYJEbqx68aE58kv2cA/kiky1G8vux3OR6/jbS+jIMe/6fJWa0DTzJU7dqijOWYwHi1t29FlfYI9uytqlpA==",
-            "requires": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "braces": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-            "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-            "requires": {
-                "fill-range": "^7.1.1"
-            }
-        },
-        "buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-        },
-        "cacache": {
-            "version": "16.1.3",
-            "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz",
-            "integrity": "sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==",
-            "requires": {
-                "@npmcli/fs": "^2.1.0",
-                "@npmcli/move-file": "^2.0.0",
-                "chownr": "^2.0.0",
-                "fs-minipass": "^2.1.0",
-                "glob": "^8.0.1",
-                "infer-owner": "^1.0.4",
-                "lru-cache": "^7.7.1",
-                "minipass": "^3.1.6",
-                "minipass-collect": "^1.0.2",
-                "minipass-flush": "^1.0.5",
-                "minipass-pipeline": "^1.2.4",
-                "mkdirp": "^1.0.4",
-                "p-map": "^4.0.0",
-                "promise-inflight": "^1.0.1",
-                "rimraf": "^3.0.2",
-                "ssri": "^9.0.0",
-                "tar": "^6.1.11",
-                "unique-filename": "^2.0.0"
-            },
-            "dependencies": {
-                "glob": {
-                    "version": "8.1.0",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
-                    "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^5.0.1",
-                        "once": "^1.3.0"
-                    }
-                },
-                "lru-cache": {
-                    "version": "7.18.3",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-                    "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
-                },
-                "minimatch": {
-                    "version": "5.1.9",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
-                    "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
-                    "requires": {
-                        "brace-expansion": "^2.0.1"
-                    }
-                },
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                },
-                "rimraf": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                    "requires": {
-                        "glob": "^7.1.3"
-                    },
-                    "dependencies": {
-                        "brace-expansion": {
-                            "version": "1.1.13",
-                            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-                            "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
-                            "requires": {
-                                "balanced-match": "^1.0.0",
-                                "concat-map": "0.0.1"
-                            }
-                        },
-                        "glob": {
-                            "version": "7.2.3",
-                            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-                            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-                            "requires": {
-                                "fs.realpath": "^1.0.0",
-                                "inflight": "^1.0.4",
-                                "inherits": "2",
-                                "minimatch": "^3.1.1",
-                                "once": "^1.3.0",
-                                "path-is-absolute": "^1.0.0"
-                            }
-                        },
-                        "minimatch": {
-                            "version": "3.1.5",
-                            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-                            "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-                            "requires": {
-                                "brace-expansion": "^1.1.7"
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "requires": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "dependencies": {
-                "has-flag": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-                    "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-                },
-                "supports-color": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-                    "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-                    "requires": {
-                        "has-flag": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "chownr": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
-            "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="
-        },
-        "clean-stack": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="
-        },
-        "color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "requires": {
-                "color-name": "~1.1.4"
-            }
-        },
-        "color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "color-support": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="
-        },
-        "concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
-        },
-        "console-control-strings": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="
-        },
-        "create-require": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-            "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="
-        },
-        "cross-spawn": {
-            "version": "7.0.6",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-            "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-            "requires": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            }
-        },
-        "debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "requires": {
-                "ms": "2.1.2"
-            }
-        },
-        "delegates": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-            "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="
-        },
-        "depd": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-            "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="
-        },
-        "detect-libc": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-            "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="
-        },
-        "diff": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
-            "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ=="
-        },
-        "eastasianwidth": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
-        },
-        "emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-        },
-        "encoding": {
-            "version": "0.1.13",
-            "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
-            "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-            "optional": true,
-            "requires": {
-                "iconv-lite": "^0.6.2"
-            }
-        },
-        "env-paths": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
-        },
-        "err-code": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-            "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-        },
-        "escalade": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-            "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-        },
-        "fast-glob": {
-            "version": "3.2.12",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
-            "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
-            "requires": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
-            }
-        },
-        "fastq": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-            "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-            "requires": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "fill-range": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-            "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-            "requires": {
-                "to-regex-range": "^5.0.1"
-            }
-        },
-        "foreground-child": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
-            "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
-            "requires": {
-                "cross-spawn": "^7.0.0",
-                "signal-exit": "^4.0.1"
-            }
-        },
-        "fs-extra": {
-            "version": "11.1.1",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-            "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
-            "requires": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            }
-        },
-        "fs-minipass": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-            "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-            "requires": {
-                "minipass": "^3.0.0"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-        },
-        "gauge": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
-            "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
-            "requires": {
-                "aproba": "^1.0.3 || ^2.0.0",
-                "color-support": "^1.1.2",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.1",
-                "object-assign": "^4.1.1",
-                "signal-exit": "^3.0.0",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1",
-                "wide-align": "^1.1.2"
-            },
-            "dependencies": {
-                "signal-exit": {
-                    "version": "3.0.7",
-                    "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-                    "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-                }
-            }
-        },
-        "get-caller-file": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-            "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-        },
-        "glob": {
-            "version": "10.5.0",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
-            "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
-            "requires": {
-                "foreground-child": "^3.1.0",
-                "jackspeak": "^3.1.2",
-                "minimatch": "^9.0.4",
-                "minipass": "^7.1.2",
-                "package-json-from-dist": "^1.0.0",
-                "path-scurry": "^1.11.1"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "7.1.2",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-                    "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="
-                }
-            }
-        },
-        "glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "requires": {
-                "is-glob": "^4.0.1"
-            }
-        },
-        "graceful-fs": {
-            "version": "4.2.11",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-        },
-        "has-unicode": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="
-        },
-        "http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="
-        },
-        "http-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-            "requires": {
-                "@tootallnate/once": "2",
-                "agent-base": "6",
-                "debug": "4"
-            }
-        },
-        "https-proxy-agent": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-            "requires": {
-                "agent-base": "6",
-                "debug": "4"
-            }
-        },
-        "humanize-ms": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-            "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-            "requires": {
-                "ms": "^2.0.0"
-            }
-        },
-        "iconv-lite": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-            "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "optional": true,
-            "requires": {
-                "safer-buffer": ">= 2.1.2 < 3.0.0"
-            }
-        },
-        "imurmurhash": {
-            "version": "0.1.4",
-            "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-            "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
-        },
-        "indent-string": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
-        },
-        "infer-owner": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-            "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="
-        },
-        "inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-            "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        },
-        "ip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
-            "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
-        },
-        "is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="
-        },
-        "is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "requires": {
-                "is-extglob": "^2.1.1"
-            }
-        },
-        "is-lambda": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-            "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="
-        },
-        "is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-        },
-        "isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-        },
-        "jackspeak": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-            "requires": {
-                "@isaacs/cliui": "^8.0.2",
-                "@pkgjs/parseargs": "^0.11.0"
-            }
-        },
-        "jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "requires": {
-                "graceful-fs": "^4.1.6",
-                "universalify": "^2.0.0"
-            }
-        },
-        "lodash": {
-            "version": "4.18.1",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
-            "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q=="
-        },
-        "lru-cache": {
-            "version": "10.4.3",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
-        },
-        "make-dir": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-            "requires": {
-                "semver": "^6.0.0"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "6.3.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
-                }
-            }
-        },
-        "make-error": {
-            "version": "1.3.6",
-            "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-            "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="
-        },
-        "make-fetch-happen": {
-            "version": "10.2.1",
-            "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz",
-            "integrity": "sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==",
-            "requires": {
-                "agentkeepalive": "^4.2.1",
-                "cacache": "^16.1.0",
-                "http-cache-semantics": "^4.1.0",
-                "http-proxy-agent": "^5.0.0",
-                "https-proxy-agent": "^5.0.0",
-                "is-lambda": "^1.0.1",
-                "lru-cache": "^7.7.1",
-                "minipass": "^3.1.6",
-                "minipass-collect": "^1.0.2",
-                "minipass-fetch": "^2.0.3",
-                "minipass-flush": "^1.0.5",
-                "minipass-pipeline": "^1.2.4",
-                "negotiator": "^0.6.3",
-                "promise-retry": "^2.0.1",
-                "socks-proxy-agent": "^7.0.0",
-                "ssri": "^9.0.0"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "7.18.3",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
-                    "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA=="
-                },
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
-        },
-        "micromatch": {
-            "version": "4.0.8",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-            "requires": {
-                "braces": "^3.0.3",
-                "picomatch": "^2.3.1"
-            }
-        },
-        "minimatch": {
-            "version": "9.0.9",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-            "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
-            "requires": {
-                "brace-expansion": "^2.0.2"
-            }
-        },
-        "minipass": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
-            "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ=="
-        },
-        "minipass-collect": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-            "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-            "requires": {
-                "minipass": "^3.0.0"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "minipass-fetch": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz",
-            "integrity": "sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==",
-            "requires": {
-                "encoding": "^0.1.13",
-                "minipass": "^3.1.6",
-                "minipass-sized": "^1.0.3",
-                "minizlib": "^2.1.2"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "minipass-flush": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-            "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
-            "requires": {
-                "minipass": "^3.0.0"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "minipass-pipeline": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-            "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-            "requires": {
-                "minipass": "^3.0.0"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "minipass-sized": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz",
-            "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==",
-            "requires": {
-                "minipass": "^3.0.0"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "minizlib": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-            "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-            "requires": {
-                "minipass": "^3.0.0",
-                "yallist": "^4.0.0"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "mkdirp": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-            "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
-        },
-        "ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-        "nan": {
-            "version": "2.17.0",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-            "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
-        },
-        "negotiator": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
-        },
-        "node-fetch": {
-            "version": "2.6.9",
-            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz",
-            "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==",
-            "requires": {
-                "whatwg-url": "^5.0.0"
-            }
-        },
-        "node-gyp": {
-            "version": "9.3.1",
-            "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz",
-            "integrity": "sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==",
-            "requires": {
-                "env-paths": "^2.2.0",
-                "glob": "^7.1.4",
-                "graceful-fs": "^4.2.6",
-                "make-fetch-happen": "^10.0.3",
-                "nopt": "^6.0.0",
-                "npmlog": "^6.0.0",
-                "rimraf": "^3.0.2",
-                "semver": "^7.3.5",
-                "tar": "^6.1.2",
-                "which": "^2.0.2"
-            },
-            "dependencies": {
-                "are-we-there-yet": {
-                    "version": "3.0.1",
-                    "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
-                    "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
-                    "requires": {
-                        "delegates": "^1.0.0",
-                        "readable-stream": "^3.6.0"
-                    }
-                },
-                "brace-expansion": {
-                    "version": "1.1.13",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
-                    "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
-                    "requires": {
-                        "balanced-match": "^1.0.0",
-                        "concat-map": "0.0.1"
-                    }
-                },
-                "gauge": {
-                    "version": "4.0.4",
-                    "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
-                    "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
-                    "requires": {
-                        "aproba": "^1.0.3 || ^2.0.0",
-                        "color-support": "^1.1.3",
-                        "console-control-strings": "^1.1.0",
-                        "has-unicode": "^2.0.1",
-                        "signal-exit": "^3.0.7",
-                        "string-width": "^4.2.3",
-                        "strip-ansi": "^6.0.1",
-                        "wide-align": "^1.1.5"
-                    }
-                },
-                "glob": {
-                    "version": "7.2.3",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-                    "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-                    "requires": {
-                        "fs.realpath": "^1.0.0",
-                        "inflight": "^1.0.4",
-                        "inherits": "2",
-                        "minimatch": "^3.1.1",
-                        "once": "^1.3.0",
-                        "path-is-absolute": "^1.0.0"
-                    }
-                },
-                "minimatch": {
-                    "version": "3.1.5",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-                    "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-                    "requires": {
-                        "brace-expansion": "^1.1.7"
-                    }
-                },
-                "nopt": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
-                    "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
-                    "requires": {
-                        "abbrev": "^1.0.0"
-                    }
-                },
-                "npmlog": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
-                    "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
-                    "requires": {
-                        "are-we-there-yet": "^3.0.0",
-                        "console-control-strings": "^1.1.0",
-                        "gauge": "^4.0.3",
-                        "set-blocking": "^2.0.0"
-                    }
-                },
-                "rimraf": {
-                    "version": "3.0.2",
-                    "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-                    "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-                    "requires": {
-                        "glob": "^7.1.3"
-                    }
-                },
-                "signal-exit": {
-                    "version": "3.0.7",
-                    "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-                    "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-                }
-            }
-        },
-        "nopt": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
-            "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
-            "requires": {
-                "abbrev": "1"
-            }
-        },
-        "npmlog": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
-            "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
-            "requires": {
-                "are-we-there-yet": "^2.0.0",
-                "console-control-strings": "^1.1.0",
-                "gauge": "^3.0.0",
-                "set-blocking": "^2.0.0"
-            }
-        },
-        "object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
-        },
-        "once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "requires": {
-                "wrappy": "1"
-            }
-        },
-        "p-map": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-            "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-            "requires": {
-                "aggregate-error": "^3.0.0"
-            }
-        },
-        "package-json-from-dist": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
-        },
-        "path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="
-        },
-        "path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
-        },
-        "path-scurry": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-            "requires": {
-                "lru-cache": "^10.2.0",
-                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-            }
-        },
-        "picomatch": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-            "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="
-        },
-        "platform": {
-            "version": "1.3.6",
-            "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
-            "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg=="
-        },
-        "promise-inflight": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-            "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="
-        },
-        "promise-retry": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-            "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-            "requires": {
-                "err-code": "^2.0.2",
-                "retry": "^0.12.0"
-            }
-        },
-        "queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
-        },
-        "readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-            "requires": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            }
-        },
-        "readline": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
-            "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
-        },
-        "require-directory": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-            "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
-        },
-        "retry": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-            "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="
-        },
-        "reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
-        },
-        "rimraf": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.0.tgz",
-            "integrity": "sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==",
-            "requires": {
-                "glob": "^10.0.0"
-            }
-        },
-        "run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "requires": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "optional": true
-        },
-        "semver": {
-            "version": "7.5.4",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-            "requires": {
-                "lru-cache": "^6.0.0"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-                    "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "set-blocking": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
-        },
-        "shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "requires": {
-                "shebang-regex": "^3.0.0"
-            }
-        },
-        "shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
-        },
-        "signal-exit": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.1.tgz",
-            "integrity": "sha512-uUWsN4aOxJAS8KOuf3QMyFtgm1pkb6I+KRZbRF/ghdf5T7sM+B1lLLzPDxswUjkmHyxQAVzEgG35E3NzDM9GVw=="
-        },
-        "smart-buffer": {
-            "version": "4.2.0",
-            "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
-            "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="
-        },
-        "socks": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz",
-            "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==",
-            "requires": {
-                "ip": "^2.0.0",
-                "smart-buffer": "^4.2.0"
-            }
-        },
-        "socks-proxy-agent": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-            "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-            "requires": {
-                "agent-base": "^6.0.2",
-                "debug": "^4.3.3",
-                "socks": "^2.6.2"
-            }
-        },
-        "source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "requires": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "ssri": {
-            "version": "9.0.1",
-            "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
-            "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
-            "requires": {
-                "minipass": "^3.1.1"
-            },
-            "dependencies": {
-                "minipass": {
-                    "version": "3.3.6",
-                    "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-                    "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
-        },
-        "string_decoder": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-            "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-            "requires": {
-                "safe-buffer": "~5.2.0"
-            }
-        },
-        "string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            }
-        },
-        "string-width-cjs": {
-            "version": "npm:string-width@4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "requires": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            }
-        },
-        "strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "requires": {
-                "ansi-regex": "^5.0.1"
-            }
-        },
-        "strip-ansi-cjs": {
-            "version": "npm:strip-ansi@6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "requires": {
-                "ansi-regex": "^5.0.1"
-            }
-        },
-        "tar": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-            "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-            "requires": {
-                "chownr": "^2.0.0",
-                "fs-minipass": "^2.0.0",
-                "minipass": "^5.0.0",
-                "minizlib": "^2.1.1",
-                "mkdirp": "^1.0.3",
-                "yallist": "^4.0.0"
-            }
-        },
-        "to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "requires": {
-                "is-number": "^7.0.0"
-            }
-        },
-        "tr46": {
-            "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-        },
-        "ts-node": {
-            "version": "10.9.1",
-            "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-            "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-            "requires": {
-                "@cspotcode/source-map-support": "^0.8.0",
-                "@tsconfig/node10": "^1.0.7",
-                "@tsconfig/node12": "^1.0.7",
-                "@tsconfig/node14": "^1.0.0",
-                "@tsconfig/node16": "^1.0.2",
-                "acorn": "^8.4.1",
-                "acorn-walk": "^8.1.1",
-                "arg": "^4.1.0",
-                "create-require": "^1.1.0",
-                "diff": "^4.0.1",
-                "make-error": "^1.1.1",
-                "v8-compile-cache-lib": "^3.0.1",
-                "yn": "3.1.1"
-            }
-        },
-        "typescript": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.0.4.tgz",
-            "integrity": "sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==",
-            "peer": true
-        },
-        "unique-filename": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
-            "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
-            "requires": {
-                "unique-slug": "^3.0.0"
-            }
-        },
-        "unique-slug": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz",
-            "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
-            "requires": {
-                "imurmurhash": "^0.1.4"
-            }
-        },
-        "universalify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
-        },
-        "util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-        },
-        "v8-compile-cache-lib": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-            "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="
-        },
-        "v8-profiler-next": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/v8-profiler-next/-/v8-profiler-next-1.9.0.tgz",
-            "integrity": "sha512-+k2Lb0c9lEDsGNT1GfrrlV4evR2KsF3LljW8PUfRaM1OQmr+F3lXGxVIffa+LNXaw3CnwdsSdqI2zaYEhDdu5Q==",
-            "requires": {
-                "@xprofiler/node-pre-gyp": "^1.0.9",
-                "nan": "^2.16.0"
-            }
-        },
-        "webidl-conversions": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
-        },
-        "whatwg-url": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-            "requires": {
-                "tr46": "~0.0.3",
-                "webidl-conversions": "^3.0.0"
-            }
-        },
-        "which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "requires": {
-                "isexe": "^2.0.0"
-            }
-        },
-        "wide-align": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
-            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
-            "requires": {
-                "string-width": "^1.0.2 || 2 || 3 || 4"
-            }
-        },
-        "wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            }
-        },
-        "wrap-ansi-cjs": {
-            "version": "npm:wrap-ansi@7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "requires": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            }
-        },
-        "wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
-        },
-        "y18n": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-            "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
-        },
-        "yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-        },
-        "yargs": {
-            "version": "17.7.1",
-            "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
-            "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
-            "requires": {
-                "cliui": "^8.0.1",
-                "escalade": "^3.1.1",
-                "get-caller-file": "^2.0.5",
-                "require-directory": "^2.1.1",
-                "string-width": "^4.2.3",
-                "y18n": "^5.0.5",
-                "yargs-parser": "^21.1.1"
-            },
-            "dependencies": {
-                "cliui": {
-                    "version": "8.0.1",
-                    "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-                    "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-                    "requires": {
-                        "string-width": "^4.2.0",
-                        "strip-ansi": "^6.0.1",
-                        "wrap-ansi": "^7.0.0"
-                    }
-                }
-            }
-        },
-        "yargs-parser": {
-            "version": "21.1.1",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="
-        },
-        "yn": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-            "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="
         }
     }
 }
diff --git a/benchmarks/results.json b/benchmarks/results.json
new file mode 100644
index 000000000..99dd812eb
--- /dev/null
+++ b/benchmarks/results.json
@@ -0,0 +1,9 @@
+{
+    "lexer": {
+        "current": [
+            12645.727126865311,
+            13072.590947406612,
+            11663.650306847825
+        ]
+    }
+}
\ No newline at end of file
diff --git a/benchmarks/target-runner.ts b/benchmarks/target-runner.ts
index 633da369b..52fc4d3a0 100644
--- a/benchmarks/target-runner.ts
+++ b/benchmarks/target-runner.ts
@@ -7,6 +7,7 @@ import * as chalk from 'chalk';
 const v8Profiler = require('v8-profiler-next');
 
 let idx = 2;
+const extraNamePadding = 20;
 
 const version = process.argv[idx++];
 const maxVersionLength = parseInt(process.argv[idx++]);
@@ -16,6 +17,7 @@ const bscAlias = process.argv[idx++];
 const projectPath = process.argv[idx++];
 const quick = JSON.parse(process.argv[idx++]);
 const profile = JSON.parse(process.argv[idx++]);
+const config = JSON.parse(process.argv[idx++]);
 
 const profileTitle = `${target}@${version}`;
 
@@ -63,7 +65,7 @@ const addTargetTestFunction = require(path.join(__dirname, 'targets', target));
                 const formattedHz = formatNumber(result.hz.toFixed(3));
                 let [name] = result.name.split('@');
                 console.log(
-                    `${name.padStart(maxTargetLength + 8, ' ')}@${version.padEnd(maxVersionLength, ' ')}`,
+                    `${name.padStart(maxTargetLength + extraNamePadding, ' ')}@${version.padEnd(maxVersionLength, ' ')}`,
                     '-'.repeat(' ###,###,###.###'.length - formattedHz.length),
                     chalk.yellow(formattedHz), 'ops/sec'
                 );
@@ -88,7 +90,8 @@ const addTargetTestFunction = require(path.join(__dirname, 'targets', target));
             projectPath: projectPath,
             suiteOptions: {
                 // minTime: quick ? undefined : 3.5
-            }
+            },
+            additionalConfig: config
         })
     );
 
@@ -104,4 +107,5 @@ export interface TargetOptions {
     brighterscript: typeof import('../src');
     projectPath: string;
     suiteOptions: Benchmark.Options;
+    additionalConfig: Record<string, unknown>;
 }
diff --git a/benchmarks/targets/lex-parse-validate.ts b/benchmarks/targets/lex-parse-validate.ts
index 91d01e134..36da4624f 100644
--- a/benchmarks/targets/lex-parse-validate.ts
+++ b/benchmarks/targets/lex-parse-validate.ts
@@ -1,3 +1,4 @@
+import type { BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 import * as fsExtra from 'fs-extra';
 
@@ -26,11 +27,13 @@ module.exports = (options: TargetOptions) => {
             cwd: projectPath,
             createPackage: false,
             copyToStaging: false,
+            noEmit: true,
             //disable diagnostic reporting (they still get collected)
             diagnosticFilters: ['**/*'],
-            logLevel: 'error'
-        }).then(() => {
-            if (Object.keys(builder.program.files).length === 0) {
+            logLevel: 'error',
+            ...options.additionalConfig
+        } as BsConfig & Record<string, any>).then(() => {
+            if (Object.keys(builder.program!.files).length === 0) {
                 throw new Error('No files found in program');
             } else {
                 deferred.resolve();
diff --git a/benchmarks/targets/lex.ts b/benchmarks/targets/lex.ts
index fbd9ffe16..a6fbcc02d 100644
--- a/benchmarks/targets/lex.ts
+++ b/benchmarks/targets/lex.ts
@@ -1,3 +1,5 @@
+import type { BsConfig } from '../../src';
+import type { BrsFile } from '../../src/files/BrsFile';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -10,12 +12,14 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    });
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
     //collect all the brighterscript files
-    const brsFiles = Object.values(builder.program.files).filter(x => x.extension === '.brs' || x.extension === '.bs');
+    const brsFiles = Object.values(builder.program!.files as Record<string, BrsFile>).filter(x => x.extension === '.brs' || x.extension === '.bs');
     if (brsFiles.length === 0) {
         throw new Error('No files found in program');
     }
diff --git a/benchmarks/targets/parse-brs.ts b/benchmarks/targets/parse-brs.ts
index 21a423dd2..08bdd449e 100644
--- a/benchmarks/targets/parse-brs.ts
+++ b/benchmarks/targets/parse-brs.ts
@@ -1,3 +1,4 @@
+import type { BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -10,27 +11,29 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    });
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
     //collect all the brs file contents
-    const files = Object.values(builder.program.files).filter(x => ['.brs', '.bs', '.d.bs'].includes(x.extension)).map(x => ({
-        pkgPath: x.pkgPath,
-        fileContents: x.fileContents
+    const files = Object.values(builder.program!.files).filter(x => ['.brs', '.bs', '.d.bs'].includes(brighterscript.util.getExtension(x.srcPath)!)).map(x => ({
+        destPath: x.destPath ?? x.pkgPath,
+        fileContents: (x as any).fileContents
     }));
     if (files.length === 0) {
         console.log('[parse-brs] No brs files found in program');
         return;
     }
 
-    const setFileFuncName = builder.program['setFile'] ? 'setFile' : 'addOrReplaceFile';
+    const setFileFuncName = builder.program!['setFile'] ? 'setFile' : 'addOrReplaceFile';
 
     suite.add(fullName, (deferred) => {
-        const promises = [];
+        const promises: unknown[] = [];
         for (const file of files) {
             promises.push(
-                builder.program[setFileFuncName](file.pkgPath, file.fileContents)
+                builder.program![setFileFuncName](file.destPath, file.fileContents)
             );
         }
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
diff --git a/benchmarks/targets/parse-xml.ts b/benchmarks/targets/parse-xml.ts
index 6547f2201..5d1a4b9ad 100644
--- a/benchmarks/targets/parse-xml.ts
+++ b/benchmarks/targets/parse-xml.ts
@@ -1,3 +1,4 @@
+import type { BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -10,15 +11,17 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    });
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
     //collect all the XML file contents
-    const xmlFiles = Object.values(builder.program.files).filter(x => x.extension === '.xml').map(x => ({
-        srcPath: x.srcPath ?? x.pathAbsolute,
+    const xmlFiles = Object.values(builder.program!.files).filter(x => (x as any)?.extension === '.xml').map(x => ({
+        srcPath: x.srcPath ?? (x as any).pathAbsolute,
         pkgPath: x.pkgPath,
-        fileContents: x.fileContents
+        fileContents: (x as any).fileContents
     }));
     if (xmlFiles.length === 0) {
         console.log('[xml-parser] No XML files found in program');
@@ -27,7 +30,11 @@ module.exports = async (options: TargetOptions) => {
     suite.add(fullName, (deferred) => {
         const wait: Promise<any>[] = [];
         for (const x of xmlFiles) {
-            const xmlFile = new XmlFile(x.srcPath, x.pkgPath, builder.program);
+            let xmlFile = new XmlFile({ srcPath: x.srcPath, destPath: (x as any)?.destPath ?? x.pkgPath, program: builder.program as any });
+            if (typeof xmlFile.srcPath !== 'string') {
+                //fallback to legacy constructor signature
+                xmlFile = (XmlFile as any)(x.srcPath, x.pkgPath, builder.program);
+            }
             //handle async and sync parsing
             const prom = xmlFile.parse(x.fileContents);
             if (prom as any) {
diff --git a/benchmarks/targets/parse.ts b/benchmarks/targets/parse.ts
index ee278a9a3..7776cadbd 100644
--- a/benchmarks/targets/parse.ts
+++ b/benchmarks/targets/parse.ts
@@ -1,4 +1,4 @@
-import type { BrsFile } from '../../src/files/BrsFile';
+import type { BrsFile, BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -11,12 +11,14 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    });
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
     //collect all the brighterscript files
-    const brsFiles = Object.values(builder.program.files).filter(x => x.extension === '.brs' || x.extension === '.bs') as Array<BrsFile>;
+    const brsFiles = Object.values(builder.program!.files as Record<string, BrsFile>).filter(x => x.extension === '.brs' || x.extension === '.bs') as Array<BrsFile>;
     if (brsFiles.length === 0) {
         throw new Error('No files found in program');
     }
diff --git a/benchmarks/targets/run.js b/benchmarks/targets/run.js
new file mode 100644
index 000000000..41adc23af
--- /dev/null
+++ b/benchmarks/targets/run.js
@@ -0,0 +1,21 @@
+module.exports = async (suite, name, brighterscript, projectPath, options) => {
+    const { ProgramBuilder } = brighterscript;
+
+    let builder;
+    suite.add(name, (deferred) => {
+        builder = new ProgramBuilder();
+        builder.run({
+            cwd: projectPath,
+            createPackage: false,
+            copyToStaging: false,
+            //disable diagnostic reporting (they still get collected)
+            diagnosticFilters: ['**/*'],
+            logLevel: 'error'
+        }).finally(() => {
+            deferred.resolve();
+        });
+    }, {
+        ...options,
+        'defer': true
+    });
+};
diff --git a/benchmarks/targets/transpile-brs.ts b/benchmarks/targets/transpile-brs.ts
index d33163bbe..52f703178 100644
--- a/benchmarks/targets/transpile-brs.ts
+++ b/benchmarks/targets/transpile-brs.ts
@@ -1,3 +1,4 @@
+import type { BrsFile, BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -10,12 +11,14 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    });
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
     //collect all the brs files
-    const files = Object.values(builder.program.files).filter(x => ['.brs', '.bs'].includes(x.extension));
+    const files = Object.values(builder.program!.files as Record<string, BrsFile>).filter(x => ['.brs', '.bs'].includes(x.extension));
 
     //flag every file for transpilation
     for (const file of files) {
diff --git a/benchmarks/targets/transpile-xml.ts b/benchmarks/targets/transpile-xml.ts
index cc41d3125..0a8fc8b05 100644
--- a/benchmarks/targets/transpile-xml.ts
+++ b/benchmarks/targets/transpile-xml.ts
@@ -1,3 +1,4 @@
+import type { BrsFile, BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -10,12 +11,14 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    });
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
     //collect all the XML files
-    const files = Object.values(builder.program.files).filter(x => x.extension === '.xml');
+    const files = Object.values(builder.program!.files as Record<string, BrsFile>).filter(x => x.extension === '.xml');
     //flag every file for transpilation
     for (const file of files) {
         file.needsTranspiled = true;
diff --git a/benchmarks/targets/transpile.ts b/benchmarks/targets/transpile.ts
index 80f70dbef..f5dcc155e 100644
--- a/benchmarks/targets/transpile.ts
+++ b/benchmarks/targets/transpile.ts
@@ -1,3 +1,4 @@
+import type { BrsFile, BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -10,15 +11,17 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    });
-    if (Object.keys(builder.program.files).length === 0) {
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
+    if (Object.keys(builder.program!.files).length === 0) {
         throw new Error('No files found in program');
     }
 
-    const files = Object.values(builder.program.files);
+    const files = Object.values(builder.program!.files) as Array<BrsFile>;
 
     //force transpile for every file
     for (const file of files) {
diff --git a/benchmarks/targets/validate.ts b/benchmarks/targets/validate.ts
index 90ff6df30..b24e11402 100644
--- a/benchmarks/targets/validate.ts
+++ b/benchmarks/targets/validate.ts
@@ -1,3 +1,4 @@
+import type { BsConfig } from '../../src';
 import type { TargetOptions } from '../target-runner';
 
 module.exports = async (options: TargetOptions) => {
@@ -10,23 +11,24 @@ module.exports = async (options: TargetOptions) => {
         cwd: projectPath,
         createPackage: false,
         copyToStaging: false,
-        enableTypeValidation: true,
+        noEmit: true,
         //disable diagnostic reporting (they still get collected)
         diagnosticFilters: ['**/*'],
-        logLevel: 'error'
-    } as any);
-    if (Object.keys(builder.program.files).length === 0) {
+        logLevel: 'error',
+        ...options.additionalConfig
+    } as BsConfig & Record<string, any>);
+    if (Object.keys(builder.program!.files).length === 0) {
         throw new Error('No files found in program');
     }
 
     suite.add(fullName, (deferred) => {
-        const scopes = Object.values(builder.program['scopes']);
+        const scopes = Object.values(builder.program!['scopes']);
         //mark all scopes as invalid so they'll re-validate
         for (let scope of scopes) {
             scope.invalidate();
         }
         Promise.resolve(
-            builder.program.validate()
+            builder.program!.validate()
         ).finally(() => deferred.resolve());
     }, {
         ...suiteOptions,
diff --git a/bsconfig.schema.json b/bsconfig.schema.json
index 7c421a0d5..0d449f766 100644
--- a/bsconfig.schema.json
+++ b/bsconfig.schema.json
@@ -88,11 +88,15 @@
         },
         "outFile": {
             "description": "The path where the output zip or package should be placed. This includes the filename. Defaults to \"./out/package\"",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated in v1",
             "type": "string"
         },
         "createPackage": {
             "description": "Creates a zip package. Defaults to true. This setting is ignored when deploy is enabled.",
-            "type": "boolean"
+            "type": "boolean",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1"
         },
         "sourceMap": {
             "description": "Enables generating sourcemap files, which allow debugging tools to show the original source code while running the emitted files.",
@@ -106,6 +110,12 @@
         },
         "copyToStaging": {
             "description": "If true, the files are copied to staging. This setting is ignored when deploy is enabled or if createPackage is enabled",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. Use `noEmit` instead.",
+            "type": "boolean"
+        },
+        "noEmit": {
+            "description": "If true, then no files are copied to outDir.",
             "type": "boolean"
         },
         "watch": {
@@ -115,39 +125,56 @@
         },
         "deploy": {
             "description": "If true, after a successful buld, the project will be deployed to the roku specified in host",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. No longer supporting deployment in this tool.",
             "type": "boolean"
         },
         "host": {
-            "description": "The host of the Roku that the package will be deploy to",
+            "description": "host of the Roku that the package will be deploy to",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. No longer supporting deployment in this tool.",
             "type": "string"
         },
         "username": {
             "description": "The username to use when deploying to a Roku device",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. No longer supporting deployment in this tool.",
             "type": "string"
         },
         "password": {
-            "description": " The password to use when deploying to a Roku device",
+            "description": "The password to use when deploying to a Roku device",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. No longer supporting deployment in this tool.",
             "type": "string"
         },
         "retainStagingDir": {
             "type": "boolean",
             "description": "Prevent the staging folder from being deleted after the deployment package is created.  This is helpful for troubleshooting why your package isn't being created the way you expected.",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. No longer supporting package zipping in this tool.",
             "default": false
         },
         "retainStagingFolder": {
             "type": "boolean",
-            "deprecated": true,
             "description": "Prevent the staging folder from being deleted after the deployment package is created.  This is helpful for troubleshooting why your package isn't being created the way you expected.",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. No longer supporting package zipping in this tool.",
             "default": false
         },
         "stagingDir": {
             "type": "string",
+            "deprecated": true,
+            "deprecationMessage": "Deprecated starting in v1. Use `outDir` instead.",
             "description": "The path to the staging folder (where all files are copied before creating the zip package)"
         },
+        "outDir": {
+            "type": "string",
+            "description": "TODO better description: The path to the output directory (where all files are copied before creating the zip package)"
+        },
         "stagingFolderPath": {
             "type": "string",
             "deprecated": true,
-            "deprecationMessage": "Deprecated. Use `stagingDir` instead.",
+            "deprecationMessage": "Deprecated starting in v1. Use `outDir` instead.",
             "description": "The path to the staging folder (where all files are copied before creating the zip package)"
         },
         "ignoreErrorCodes": {
@@ -238,6 +265,11 @@
                 ]
             }
         },
+        "diagnosticFiltersV0Compatibility": {
+            "description": "Use the deprecated diagnosticFilters format from v0. This is useful for backwards compatibility.",
+            "type": "boolean",
+            "default": false
+        },
         "plugins": {
             "description": "A list of node scripts or npm modules to add extra diagnostics or transform the AST.",
             "type": "array",
@@ -305,6 +337,11 @@
             "type": "boolean",
             "default": false
         },
+        "legacyCallfuncHandling": {
+            "description": "Legacy RokuOS versions required at least one argument in callfunc() invocations. Previous brighterscript versions handled this by inserting invalid as an argument when no other args are present. This is not necessary in modern RokuOS versions.",
+            "type": "boolean",
+            "default": false
+        },
         "minFirmwareVersion": {
             "description": "The minimum Roku firmware version required to run this project. When set, BrightScript (.brs) files will be validated to ensure they only use language features available in that firmware version or earlier. BrighterScript (.bs) files are always allowed to use all features since they are transpiled. Should be a semver-compatible string (e.g. \"11.0.0\").",
             "type": "string",
@@ -314,4 +351,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/docs/assignments.md b/docs/assignments.md
new file mode 100644
index 000000000..a1156344f
--- /dev/null
+++ b/docs/assignments.md
@@ -0,0 +1,79 @@
+# Assignments
+
+Brighterscript allows you to declare the type of variables in the assignment, with using the `as <type>` syntax on the left hand side of the `=` (equals).
+
+Keep in mind that this is the type as BrighterScript understands it to be. The actual type during runtime may be different. Even with this caveat, by declaring types in assignments, the risk of runtime errors because of invalid type usage is lessened.
+
+## Example
+
+In the following example, `data` is `dynamic` type, but we declare that `name` is of `string` type:
+
+```brighterscript
+function getUCaseName(data) as string
+    name as string = data.name
+
+    return ucase(name)
+end function
+```
+
+## Validation
+
+By declaring the type on the left hand side of the assignment, if the inferred type of the right hand side is not compatible, an error message is raised:
+
+```brighterscript
+sub assignmentValidation()
+    pi as float = 3.14 ' no error: 3.14 is a float
+
+    twoPi as integer = pi * 2 ' no error: numbers are always compatible
+
+    boolTest as bool = "true" ' error: strings are not compatible with boolean
+
+    data as {id as string} = {id: 1234} ' error: "id" member not compatible
+
+    deviceInfo as string = createObject("roDeviceInfo") ' error: types not compatible
+end sub
+```
+
+## Declared Type vs. Typecast
+
+Declaring a type in an assignment is very similar to using a [typecast](./typecasts.md) on the right hand side, with one major difference: typecasts are not validated. Therefore it is safer to use declared types if possible.
+
+Example:
+
+```brighterscript
+sub exampleTypecast()
+    name = 1234 as string ' No BrighterScript error
+    print ucase(name) ' Runtime error: name is an integer
+end sub
+
+sub exampleDeclaredType()
+    name as string = 1234 ' BrighterScript error - types not compatible
+    print ucase(name) ' Would be runtime error, but previous line caught during compilation
+end sub
+```
+
+## For each loop variables
+
+The type of a `for each` loop item can be declared as well:
+
+```brighterscript
+function sumWidthArray(widthArray) as integer
+    total = 0
+    for each width as integer in widthArray
+       total += width ' width is an integer
+    end for
+    return total
+end function
+```
+
+If the declared type is not compatible with the inferred type, an error will be raised. In this example, the declared item type is `integer`, but iterating over a `roAssociativeArray` will give the `string` values of the keys of the associative array:
+
+```brighterscript
+function sumWidthMap(widthMap as roAssociativeArray) as integer
+    total = 0
+    for each width as integer in widthMap ' error
+       total += width
+    end for
+    return total
+end function
+```
diff --git a/docs/bsconfig.md b/docs/bsconfig.md
index 13a2c12d9..538204c14 100644
--- a/docs/bsconfig.md
+++ b/docs/bsconfig.md
@@ -5,9 +5,7 @@ While a minimal `bsconfig.json` file is sufficient for getting started, `bsc` su
 - [allowBrighterScriptInBrightScript](#allowBrighterScriptInBrightScript)
 - [autoImportComponentScript](#autoImportComponentScript)
 - [bslibDestinationDir](#bslibDestinationDir)
-- [createPackage](#createPackage)
 - [cwd](#cwd)
-- [deploy](#deploy)
 - [diagnosticFilters](#diagnosticFilters)
 - [diagnosticLevel](#diagnosticLevel)
 - [diagnosticSeverityOverrides](#diagnosticSeverityOverrides)
@@ -24,13 +22,11 @@ While a minimal `bsconfig.json` file is sufficient for getting started, `bsc` su
 - [pruneEmptyCodeFiles](#pruneEmptyCodeFiles)
 - [removeParameterTypes](#removeParameterTypes)
 - [require](#require)
-- [retainStagingDir](#retainStagingDir)
 - [rootDir](#rootDir)
 - [sourceMap](#sourceMap)
 - [relativeSourceMaps](#relativeSourceMaps)
 - [sourceRoot](#sourceRoot)
-- [stagingDir](#stagingDir)
-- [username](#username)
+- [outDir](#outDir)
 - [watch](#watch)
 
 ## `allowBrighterScriptInBrightScript`
@@ -49,58 +45,72 @@ BrighterScript only: will automatically import a script at transpile-time for a
 
 Type: `string`
 
-Override the destination directory for the bslib.brs file.  Use this if you want to customize where the bslib.brs file is located in the staging directory.  Note that using a location outside of `source` will break scripts inside `source` that depend on bslib.brs.
+Override the destination directory for the bslib.brs file. Use this if you want to customize where the bslib.brs file is located in the staging directory. Note that using a location outside of `source` will break scripts inside `source` that depend on bslib.brs.
 
 Defaults to `source`.
 
-## `createPackage`
-
-Type: `boolean`
-
-Causes the build to create a zip package. Defaults to `true`. This setting is ignored when [`deploy`](#deploy) is enabled.
-
 ## `cwd`
 
 Type: `string`
 
 If present, overrides the current working directory when invoking `bsc`. Defaults to `process.cwd()`.
 
-## `deploy`
+## `diagnosticFilters`
 
-Type: `boolean`
+Type: `Array<string | number | {files: string | Array<string | {src: string} | {dest: string}>; codes?: Array<number | string>}`
 
-If `true`, after a successful build, the project will be deployed to the Roku specified in host. Defaults to `false`. If this field is set to `true`, then the [`host`](#host) and [`password`](#password) fields must be set as well.
+A list of filters used to hide diagnostics.
 
-## `diagnosticFilters`
+- A `string` value should be a diagnostic code. This will supress all diagnostics with that code for the whole project. For example:
 
-Type: `Array<string | number | {src: string; codes: number[]}`
+  ```jsonc
+  "diagnosticFilters": [
+      "cannot-find-name",
+      "local-var-function-shadow",
+      "mismatch-argument-count"
+  ]
+  ```
 
-A list of filters used to hide diagnostics.
+- An object can also be provided to filter specific diagnostic codes for a file pattern. If no `files` property is included, any diagnostic that matches the values in the `codes` will b e suppressed. If a `string` if given for the `files` property, it is treated as a relative-to-root-dir or absolute file path or glob pattern of the files that should be excluded. These file paths refer to the location of the source files pre-compilation and are relative to [`rootDir`](#rootdir). Absolute file paths may be used as well. For example,
+
+  ```jsonc
+  "diagnosticFilters": [{
+      "files": "vendor/**/*",
+      "codes": ["cannot-find-name", "mismatch-argument-count"] //ignore these specific codes from vendor libraries
+  }]
+  ```
 
-- A `string` value should be a relative-to-root-dir or absolute file path or glob pattern of the files that should be excluded. Any file matching this pattern will have all diagnostics supressed. These file paths refer to the location of the source files pre-compilation and are relative to [`rootDir`](#rootdir). Absolute file paths may be used as well.
-    - A file glob may be prefixed with `!` to make it a negative pattern which "un-ignores" the files it matches. (See examples below).
-- A `number` value should be a diagnostic code. This will supress all diagnostics with that code for the whole project.
-- An object can also be provided to filter specific diagnostic codes for a file pattern. For example,
+- If an object is provided, the `files` property could also be an array, providing either a series of globs, or a specific set of files that match _either_ their `src` or `dest` paths. For example,
 
-    ```jsonc
-    "diagnosticFilters": [{
-        "src": "vendor/**/*",
-        "codes": [1000, 1011] //ignore these specific codes from vendor libraries
-    }]
-    ```
+  ```jsonc
+  "diagnosticFilters": [{
+      "files": [
+          "vendor/**/*", // all vendor files will be suppressed
+          { "src": "themes/theme1/**/*"}, // all files coming from `themes/theme1/` will be suppressed
+          { "dest": "source/common/**/*"}, // all files from `source/common/` will be suppressed
+      ]
+      "codes": ["cannot-find-name", "mismatch-argument-count"] //ignore these specific codes
+  }]
+  ```
+
+- A file glob may be prefixed with `!` to make it a negative pattern which "un-ignores" the files it matches. (See examples below).
 
 Defaults to `undefined`.
 
 If a child bsconfig extends from a parent bsconfig, and both bsconfigs specify `diagnosticFilters`, the parent bsconfig's `diagnosticFilters` field will be completely overwritten.
 
+
+**Note:** In Brighterscript v0, all diagnostics used a numerical code. Using those legacy codes will still work, but is *deprecated*. Therefore, it is possible to use `number` values instead of string codes. Using a number (or a string representation of a number) matches all diagnostic codes that have that legacy code. For example, an entry of `1234` (or `"1234"`) would suppress any diagnostic with legacy code `1234`.
+
+
 ### Negative patterns in `diagnosticFilters`
 
 A negative pattern can be used to un-ignore some files or codes which were previously ignored. For example,
 
 ```jsonc
 "diagnosticFilters": [
-    { "src": "vendor/**/*" }, //ignore all codes from vendor libraries
-    { "src": "!vendor/unreliable/**/*" } //EXCEPT do show errors from this one specific library
+    { "files": "vendor/**/*" }, //ignore all codes from vendor libraries
+    { "files": "!vendor/unreliable/**/*" } //EXCEPT do show errors from this one specific library
 ]
 ```
 
@@ -108,8 +118,8 @@ A specific error code can be unignored in multiple places by using a pattern whi
 
 ```jsonc
 "diagnosticFilters": [
-    { "src": "vendor/**/*" }, //ignore all errors from vendor libraries
-    { "src": "!*/**/*", "codes": [1000] } //EXCEPT do show this particular code everywhere
+    { "files": "vendor/**/*" }, //ignore all errors from vendor libraries
+    { "files": "!*/**/*", "codes": ["name-collision"] } //EXCEPT do show this particular code everywhere
 ]
 ```
 
@@ -129,7 +139,7 @@ A map of error codes and severity levels that will override diagnostics' severit
 
 ```jsonc
 "diagnosticSeverityOverrides": {
-    "1011": "error",   //raise a warning to an error
+    "local-var-function-shadow": "error",   //raise a warning to an error
     "LINT1001": "warn" //oops we have lots of those to fix... later
 }
 ```
@@ -159,47 +169,51 @@ Child config properties completely replace parent config properties. For example
 All relative paths found in the configuration file will be resolved relative to the configuration file they originated in.
 
 ### Optional `extends` and `project`
+
 There are situations where you want to store some compiler settings in a config file, but not fail if that config file doesn't exist. To do this, you can denote that your [`extends`](#extends) or [`project`](#project) path is optional by prefixing it with a question mark (`?`). For example:
 
 - **bsconfig.json** `extends`
-    ```json
-    {
-      "extends": "?path/to/optional/bsconfig.json"
-    }
-    ```
+  ```json
+  {
+    "extends": "?path/to/optional/bsconfig.json"
+  }
+  ```
 - CLI "extends"
-    ```
-    bsc --extends "?path/to/optional/bsconfig.json"
-    ```
+
+  ```
+  bsc --extends "?path/to/optional/bsconfig.json"
+  ```
 
 - CLI `project` argument
-    ```
-    bsc --project "?path/to/optional/bsconfig.json"
-    ```
+  ```
+  bsc --project "?path/to/optional/bsconfig.json"
+  ```
 - Node.js API `extends`
-    ```
-    var programBuilder = new ProgramBuilder({
-        "extends": "?path/to/optional/bsconfig.json"
-    });
-    ```
+  ```
+  var programBuilder = new ProgramBuilder({
+      "extends": "?path/to/optional/bsconfig.json"
+  });
+  ```
 - Node.js API `project`
-    ```
-    var programBuilder = new ProgramBuilder({
-        "project": "?path/to/optional/bsconfig.json"
-    });
-    ```
+  ```
+  var programBuilder = new ProgramBuilder({
+      "project": "?path/to/optional/bsconfig.json"
+  });
+  ```
 
 ## `files`
 
 Type:
+
 ```typescript
 Array<
-  string |
-  string[] |
-  {
-    src: string | string[],
-    dest: string
-  }>
+  | string
+  | string[]
+  | {
+      src: string | string[];
+      dest: string;
+    }
+>;
 ```
 
 The files array is how you specify what files are included in your project. Any strings found in the files array must be relative to rootDir, and are used as include filters, meaning that if a file matches the pattern, it is included.
@@ -208,12 +222,7 @@ For most standard projects, the default files array should work just fine:
 
 ```jsonc
 {
-    "files": [
-        "source/**/*",
-        "components/**/*",
-        "images/**/*",
-        "manifest"
-    ]
+  "files": ["source/**/*", "components/**/*", "images/**/*", "manifest"]
 }
 ```
 
@@ -242,10 +251,7 @@ You can exclude files from the output by prefixing your file patterns with "!".
 
 ```jsonc
 {
-    "files": [
-        "source/**/*",
-        "!source/some/unwanted/file.brs"
-    ]
+  "files": ["source/**/*", "!source/some/unwanted/file.brs"]
 }
 ```
 
@@ -259,13 +265,13 @@ Patterns may not reference files outside of [`rootDir`](#rootdir) unless the `{
 
 ```jsonc
 {
-    "rootDir": "C:/projects/CatVideoPlayer",
-    "files": [
-        "source/main.brs",
+  "rootDir": "C:/projects/CatVideoPlayer",
+  "files": [
+    "source/main.brs",
 
-        //NOT allowed because it navigates outside the rootDir
-        "../common/promise.brs"
-    ]
+    //NOT allowed because it navigates outside the rootDir
+    "../common/promise.brs"
+  ]
 }
 ```
 
@@ -283,17 +289,17 @@ The object structure is as follows:
 
 ```typescript
 {
-    /**
-     * A glob pattern string or file path, or an array of glob pattern strings and/or file paths.
-     * These can be relative paths or absolute paths.
-     * All non-absolute paths are resolved relative to the rootDir
-     */
-    src: Array<string | string[]>;
-    /**
-     * The relative path to the location in the output folder where the files should be placed,
-     * relative to the root of the output folder
-     */
-    dest: string | undefined
+  /**
+   * A glob pattern string or file path, or an array of glob pattern strings and/or file paths.
+   * These can be relative paths or absolute paths.
+   * All non-absolute paths are resolved relative to the rootDir
+   */
+  src: Array<string | string[]>;
+  /**
+   * The relative path to the location in the output folder where the files should be placed,
+   * relative to the root of the output folder
+   */
+  dest: string | undefined;
 }
 ```
 
@@ -321,14 +327,14 @@ An example of combining regular and advanced file patterns:
 
 ```jsonc
 {
-    "rootDir": "C:/projects/CatVideoPlayer",
-    "files": [
-        "source/main.brs",
-        {
-          "src": "../common/promise.brs",
-          "dest": "source/common"
-        }
-    ]
+  "rootDir": "C:/projects/CatVideoPlayer",
+  "files": [
+    "source/main.brs",
+    {
+      "src": "../common/promise.brs",
+      "dest": "source/common"
+    }
+  ]
 }
 ```
 
@@ -340,15 +346,15 @@ For example, if you have a base project and a child project that wants to overri
 
 ```jsonc
 {
-    "files": [
-        {
-            //copy all files from the base project
-            "src": "../BaseProject/**/*"
-        },
-        // Override "../BaseProject/themes/theme.brs"
-        // with "${rootDir}/themes/theme.brs"
-        "themes/theme.brs"
-    ]
+  "files": [
+    {
+      //copy all files from the base project
+      "src": "../BaseProject/**/*"
+    },
+    // Override "../BaseProject/themes/theme.brs"
+    // with "${rootDir}/themes/theme.brs"
+    "themes/theme.brs"
+  ]
 }
 ```
 
@@ -452,12 +458,6 @@ List of node scripts or npm modules to load during the startup sequence. Useful
 
 If a child bsconfig extends from a parent bsconfig, and both bsconfigs specify a `require` field, the child's `require` field will completely overwrite the parent's `require` field.
 
-## `retainStagingDir`
-
-Type: `boolean`
-
-Prevent the staging folder from being deleted after creating the package. Defaults to `false`, meaning that the folder is deleted every time.
-
 ## `rootDir`
 
 Type: `string`
@@ -521,17 +521,10 @@ The exact behavior depends on whether [`relativeSourceMaps`](#relativesourcemaps
 
 In both cases, `SOURCE_FILE_PATH` and `SOURCE_LOCATION` source literals embedded in the transpiled output will reflect the `sourceRoot`-substituted path at runtime.
 
-## `stagingDir`
-
-Type: `string`
-
-The folder where the transpiled files are placed. This folder will be created automatically if it does not exist, and will be deleted after transpilation completes unless [`retainStagingDir`](#retainstagingdir) is set to `true`. Defaults to `./out/.roku-deploy-staging`.
-
-## `username`
-
+## `outDir`
 Type: `string`
 
-The username that will be used to deploy to the Roku device when the [`deploy`](#deploy) field is set to `true`. Defaults to `undefined`.
+The folder where the transpiled files are placed. This folder will be created automatically if it does not exist. Defaults to `./out/.roku-deploy-staging`.
 
 ## `watch`
 
diff --git a/docs/callfunc-operator.md b/docs/callfunc-operator.md
index 3586aeb5b..0ef8ced1b 100644
--- a/docs/callfunc-operator.md
+++ b/docs/callfunc-operator.md
@@ -26,7 +26,7 @@ node@.doSomething()
 
 will be transpiled into this:
 ```brightscript
-node.callfunc("doSomething", invalid)
+node.callfunc("doSomething")
 ```
 
 It is the developer's responsiblity to ensure that the target function has at least one parameter, and that the type is dynamic, otherwise a type mismatch runtime error will occur.
diff --git a/docs/classes.md b/docs/classes.md
index c157f0d36..622baec84 100644
--- a/docs/classes.md
+++ b/docs/classes.md
@@ -3,6 +3,7 @@
 Traditional BrightScript supports object creation (see [roAssociativeArray](https://developer.roku.com/docs/references/brightscript/components/roassociativearray.md)), but these can get a bit complicated at times, are generally created in a factory function. These objects are also difficult to track from a type-checking perspective, as their shape can morph over time. In BrighterScript, you can declare actual classes, and compile them into pure BrightScript which can be used on any Roku device.
 
 ## Classes
+
 Here's an example of a simple BrighterScript class
 
 ```vb
@@ -43,7 +44,9 @@ Notice that there are four functions created in the transpiled code for the `Ani
 
 
 ## Inheritance
+
 In BrighterScript, we can use patterns common to other object-oriented languages such as using inheritance to create a new class based off of an existing class.
+
 ```BrighterScript
 class Animal
     sub new(name as string)
@@ -85,6 +88,7 @@ sub Main()
     '> Waddling...\nDewey moved 2 meters\nFell over...I'm new at this
 end sub
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -152,18 +156,21 @@ sub Main()
     smokey = Animal("Smokey")
     smokey.move(1)
     '> Bear moved 1 meters
+
     donald = Duck("Donald")
     donald.move(2)
     '> Waddling...\nDonald moved 2 meters
+
     dewey = BabyDuck("Dewey")
     dewey.move(3)
     '> Waddling...\nDewey moved 2 meters\nFell over...I'm new at this
 end sub
 ```
-</details>
 
+</details>
 
 ## Constructor function
+
 The constructor function for a class is called `new`.
 
 ```vb
@@ -196,9 +203,11 @@ function Duck(name as string)
     return instance
 end function
 ```
+
 </details>
 
 ### Constructor function with inheritance
+
 When constructing a child that inherits from a base class, the first call in the child's constructor must be a call to the parent's constructor
 
 ```vb
@@ -256,9 +265,11 @@ function BabyDuck(name as string, age as integer)
     return instance
 end function
 ```
+
 </details>
 
 ## Overrides
+
 Child classes can override methods on parent classes. In this example, the `BabyDuck.Eat()` method completely overrides the parent method. Note: the `override` keyword is mandatory, and you will get a compile error if it is not included in the child class and there is a matching method on the base class. Also, you will get a compile error if the override keyword is present in a child class, but that method doesn't exist in the parent class.
 
 ```vb
@@ -314,9 +325,11 @@ function BabyDuck()
     return instance
 end function
 ```
+
 </details>
 
 ### Calling parent method from child
+
 You can also call the original methods on the base class from within an overridden method on a child class.
 
 ```vb
@@ -334,6 +347,7 @@ class BabyDuck extends Duck
 end class
 
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -375,9 +389,11 @@ function BabyDuck()
     return instance
 end function
 ```
+
 </details>
 
 ## Public by default
+
 Class fields and methods are public by default, which aligns with the general BrightScript approach that "everything is public".
 
 ```vb
@@ -399,6 +415,7 @@ class Person
     end sub
 end class
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -430,11 +447,13 @@ function Person()
     return instance
 end function
 ```
+
 </details>
 
 You will get compile-time errors whenever you access private members of a class from outside the class. However, be aware that this is only a compile-time restriction. At runtime, all members are public.
 
 ## Dynamic type by default
+
 You can specify a type for class fields and a return type for methods. However, this is entirely optional. All fields and methods have a default type of `dynamic`. However, BrighterScript will attempt to infer the type from usage. Take this for example:
 
 ```BrighterScript
@@ -451,6 +470,7 @@ class Person
     end function
 end class
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -477,9 +497,11 @@ function Person()
     return instance
 end function
 ```
+
 </details>
 
 ## Property initialization
+
 Like most other object-oriented classes, you can initialze a property with a default value.
 
 ```BrighterScript
@@ -488,6 +510,7 @@ class Duck
     hasChildren = true
 end class
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -507,16 +530,18 @@ function Duck()
     return instance
 end function
 ```
-</details>
 
+</details>
 
 ## Usage
+
 In order to use a class, you need to construct one. Based on our person class above, you can create a new person like this:
 
 ```vb
 donald = new Person("Donald")
 daisy = new Person("Daisy")
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -524,10 +549,11 @@ daisy = new Person("Daisy")
 donald = Person("Donald")
 daisy = Person("Daisy")
 ```
-</details>
 
+</details>
 
 ## Namespaces
+
 Classes can also be contained within a namespace. At runtime, all namespace periods are replaced with underscores.
 
 ```BrighterScript
@@ -539,6 +565,7 @@ namespace Vertibrates.Birds
     end class
 end namespace
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -570,10 +597,11 @@ function Vertibrates_Birds_Duck()
     return instance
 end function
 ```
-</details>
 
+</details>
 
 ## Instance binding
+
 As you would expect, methods attached to a class will have their `m` assigned to that class instance whenever they are invoked through the object. (i.e. `someClassInstance.doSomething()`. However, keep in mind that functions themselves retain no direct knowledge of what object they are bound to.
 
 This is no different than the way plain BrightScript functions and objects interact, but it was worth mentioning that classes cannot mitigate this fundamental runtime limitation.
@@ -604,6 +632,7 @@ sub main()
     sayHello() ' prints "Main method"
 end sub
 ```
+
 <details>
   <summary>View the transpiled BrightScript code</summary>
 
@@ -637,8 +666,8 @@ sub main()
     sayHello() ' prints "Main method"
 end sub
 ```
-</details>
 
+</details>
 
 ## Optional fields
 
@@ -650,7 +679,7 @@ class Video
     length as float
     optional subtitleUrl as string
     optional rating as string
-    optional genre as string
+    optional genre as string[]
 end class
 ```
 
diff --git a/docs/exceptions.md b/docs/exceptions.md
new file mode 100644
index 000000000..1a9bb5655
--- /dev/null
+++ b/docs/exceptions.md
@@ -0,0 +1,51 @@
+# Exceptions
+## Omitting the exception variable
+### Standard use case
+There are times where you don't need to use the exception variable in a try/catch. BrighterScript allows you to omit the variable. At transpile time, we'll inject a variable so that your output is still valid brightscript
+
+```BrighterScript
+function init()
+    try
+        somethingDangerous()
+    catch
+        print "I live on the edge"
+    end try
+end function
+```
+
+transpiles to
+
+```BrighterScript
+function init()
+    try
+        somethingDangerous()
+    catch e
+        print "I live on the edge"
+    end try
+end function
+```
+
+### Exception variable name collision
+By default, bsc will name the omitted variable `e`. However, if you've already got a variable named `e` in your function body, we'll get out of your way and name it `__bsc_error` instead.
+
+```BrighterScript
+function init()
+    try
+        somethingDangerous()
+    catch
+        print "I live on the edge"
+    end try
+end function
+```
+
+transpiles to
+
+```BrighterScript
+function init()
+    try
+        somethingDangerous()
+    catch __bsc_error
+        print "I live on the edge"
+    end try
+end function
+```
diff --git a/docs/function-types.md b/docs/function-types.md
new file mode 100644
index 000000000..7926035a3
--- /dev/null
+++ b/docs/function-types.md
@@ -0,0 +1,73 @@
+# Function Types
+
+BrighterScript allows specific definitions of functions that are passed as parameters. This enables code with callbacks to fully type-checked, and for any return types of callbacks to be propagated through the code.
+
+## Syntax
+
+Function types support the same syntax as anonymous function definitions: parameter names, optional parameters, and parameter and return types.
+
+```brighterscript
+sub useCallBack(callback as function(name as string, num as integer) as string)
+    print "Result is: " + callback("hello", 7)
+end sub
+```
+
+transpiles to
+
+```BrightScript
+sub useCallBack(callback as function)
+    print "Result is: " + callback("hello", 7)
+end sub
+```
+
+## Use with Type Statements
+
+Including full function signatures inside another function signature can be a bit verbose. Function types can be used in type statements to make a shorthand for easier reading.
+
+```brighterscript
+type TextChangeHandler = function(oldName as string, newName as string) as boolean
+
+sub checkText(callback as TextChangeHandler)
+    if callback(m.oldName, m.newName)
+        print "Text Change OK"
+    end if
+end sub
+```
+
+transpiles to
+
+```BrightScript
+sub checkText(callback as function)
+    if callback(m.oldName, m.newName)
+        print "Text Change OK"
+    end if
+end sub
+```
+
+## Validation
+
+Both the function type itself and the arguments when it is called and return values are validated.
+
+Validating the function type:
+
+```brighterscript
+sub useCallback(callback as sub(input as string))
+    callback("hello")
+end sub
+
+sub testCallback()
+    ' This is a validation error: "sub(input as integer)" is NOT compatible with "sub(input as string)"
+    useCallback(sub(input as integer)
+        print input + 1
+    end sub)
+end sub
+```
+
+Validating the function call:
+
+```brighterscript
+sub useCallback(callback as sub(input as string))
+    ' This is a validation error: "integer" is NOT compatible with "string"
+    callback(123)
+end sub
+```
diff --git a/docs/interfaces.md b/docs/interfaces.md
index c480ba09b..aadfb9b6d 100644
--- a/docs/interfaces.md
+++ b/docs/interfaces.md
@@ -1,7 +1,9 @@
 # Interfaces
+
 Interfaces are a way to describe properties and methods on an object.
 
 ## Simple example
+
 Interfaces can have both properties and methods.
 
 ```BrighterScript
@@ -18,13 +20,15 @@ end sub
 transpiles to
 
 ```BrightScript
-sub test(bob as object)
+sub test(bob as dynamic)
     print bob.name, bob.getName()
 end sub
 ```
 
 ## Use in functions
+
 Interfaces can be used as function parameter types and return types. These types will be converted into `dynamic` when the project is transpiled.
+
 ```brighterscript
 interface Dog
     name as string
@@ -41,14 +45,16 @@ end sub
   <summary>View the transpiled BrightScript code</summary>
 
 ```BrightScript
-sub walkThePuppy(puppy as object) as object
+sub walkThePuppy(puppy as dynamic) as dynamic
     puppy.walk()
     return puppy
 end sub
 ```
+
 </details>
 
 ## Namespaces
+
 Interfaces can also be defined inside namespaces
 
 ```BrighterScript
@@ -67,13 +73,15 @@ end sub
 transpiles to
 
 ```BrightScript
-sub test(bob as object)
+sub test(bob as dynamic)
     print bob.name, bob.getName()
 end sub
 ```
 
 ## Advanced types
+
 Interface member types can be defined as any valid brighterscript type, and even reference themselves.
+
 ```brighterscript
 interface Dog
     owner as Human
@@ -91,12 +99,15 @@ end interface
 ```BrightScript
 
 ```
+
 </details>
 
 </details>
 
 ## Methods
+
 Interfaces can describe complex methods as well
+
 ```brighterscript
 interface Dog
     sub barkAt(nemesis as Cat)
@@ -109,6 +120,7 @@ end interface
 ```BrightScript
 
 ```
+
 </details>
 
 ## Optional members
@@ -121,7 +133,7 @@ interface Video
     length as float
     optional subtitleUrl as string
     optional rating as string
-    optional genre as string
+    optional genres as string[]
 end interface
 ```
 
@@ -133,3 +145,28 @@ end interface
 ```
 
 </details>
+
+## Inline Interfaces
+
+Interfaces can be declared inline in any type expression. This provides a quick way to declare the members of an object without having to specify the name of the object or interface.
+
+```brighterscript
+
+function getId(obj as {id as string}) as string
+    return obj.id ' obj.id must exist, and it must be a string
+end function
+
+```
+
+<details>
+  <summary>View the transpiled BrightScript code</summary>
+
+```BrightScript
+
+function getId(obj as dynamic) as string
+    return obj.id ' obj.id must exist, and it must be a string
+end function
+
+```
+
+</details>
diff --git a/docs/intersection-types.md b/docs/intersection-types.md
new file mode 100644
index 000000000..7caec5244
--- /dev/null
+++ b/docs/intersection-types.md
@@ -0,0 +1,86 @@
+# Intersection Types
+
+BrighterScript Intersection Types are a way to define a type that combines the members of multiple types. They are similar to Intersection Types found in other languages, such as [TypeScript](https://www.typescriptlang.org/docs/handbook/2/objects.html#intersection-types).
+
+## Syntax
+
+Intersection types can be declared with the following syntax: `<type> and <type>`. For example, the parameter to the function below could be meets both the interfaces `HasId` and `HasUrl`:
+
+```BrighterScript
+interface HasId
+    id as string
+end interface
+
+interface HasUrl
+    url as string
+end interface
+
+function getUrlWithQueryId(value as HasId and HasUrl) as string
+    return value.url + "?id=" + value.id
+end function
+```
+
+Any number of inner types, including classes or interfaces, could be part of an intersection:
+
+```BrighterScript
+interface HasId
+    id as string
+end interface
+
+interface HasUrl
+    url as string
+end interface
+
+interface HasSize
+    width as integer
+    height as integer
+end interface
+
+
+function getUrlWithQuerySize(value as HasUrl and HasId and HasSize) as string
+    return value.url + `?id=${value.id}&w=${value.width}&h=${value.height}`
+end function
+```
+
+## Members and Validation
+
+A diagnostic error will be raised when a member is accessed that is not a member of any of the types of a union. Note also that if a member is not the same type in each of the types in the union, it will itself be considered an intersection.
+
+```BrighterScript
+sub testIntersection(value as {id as string} and {id as integer})
+    ' This is an error - "value.id" is of type "string AND integer"
+    printInteger(value.id)
+end sub
+
+sub printInteger(x as integer)
+    print x
+end sub
+```
+
+## Transpilation
+
+Since Brightscript does not have intersection types natively, intersection types will be transpiled as `dynamic`.
+
+```BrighterScript
+
+interface HasRadius
+    radius as float
+end interface
+
+interface Point
+    x as float
+    y as float
+end interface
+
+function getCircleDetails(circle as HasRadius and Point) as string
+    return "Circle: radius=" + circle.radius.toStr() + ", center=" + circle.x.toStr() + "," + circle.y.toStr()
+end function
+```
+
+transpiles to
+
+```BrightScript
+function getCircleDetails(circle as dynamic) as string
+    return "Circle: radius=" + circle.radius.ToStr() + ", center=" + circle.x.toStr() + "," + circle.y.toStr()
+end function
+```
diff --git a/docs/namespaces.md b/docs/namespaces.md
index 229450da5..bd7fa2edf 100644
--- a/docs/namespaces.md
+++ b/docs/namespaces.md
@@ -110,14 +110,18 @@ end sub
 ```
 </details>
 
-## Sharing name of namespaced item and non-namespaced item is prohibited
-The compiler will throw an error whenever it encounters a namespaced function with the same name as a global function. The same rule applies to classes.
+## Sharing name of namespaced item and non-namespaced items
+The compiler allows a namespaced function with the same name as a global function. As per the [name-shadowing](./variable-shadowing.md) rules, the function inside the namespace will be used in the transpiled code. The same rule applies to classes.
 
 ```BrighterScript
 sub Quack()
 end sub
 namespace Vertibrates.Birds
-    sub Quack() ' this will result in a compile error.
+    sub Quack()
+    end sub
+
+    sub Speak()
+        Quack() ' calls the function Vertibrates.Birds.Quack()
     end sub
 end namespace
 ```
@@ -128,7 +132,11 @@ end namespace
 ```BrightScript
 sub Quack()
 end sub
-sub Vertibrates_Birds_Quack() ' this will result in a compile error.
+sub Vertibrates_Birds_Quack()
+end sub
+
+sub Vertibrates_Birds_Speak()
+    Vertibrates_Birds_Quack() ' calls the function Vertibrates.Birds.Quack()
 end sub
 ```
 </details>
@@ -162,6 +170,36 @@ end sub
 ```
 </details>
 
+## Calling parent namespace functions
+
+Brighterscript does not support accessing a function (or other entity) of a parent namespace without fully qualifying the name of the function.
+
+```BrighterScript
+namespace Vertibrates
+    sub Move()
+    end sub
+
+    namespace Birds
+        sub Fly()
+            Move() ' this is an error - no global Move() function
+            Vertibrates.Move() ' this is allowed
+        end sub
+    end namespace
+end namespace
+```
+
+<details>
+  <summary>View the transpiled BrightScript code</summary>
+
+```BrightScript
+sub Vertibrates_Move()
+end sub
+sub Vertibrates_Birds_Fly()
+     Move() ' this is an error - no global Move() function
+     Vertibrates_Move() ' this is allowed
+end sub
+```
+</details>
 
 ## Caveats
 ### ObserveField and ObserveFieldScoped
diff --git a/docs/plugins.md b/docs/plugins.md
index 662ae87ec..4f7ae06c7 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -50,33 +50,37 @@ While there are no restrictions on plugin names, it helps others to find your pl
 
 Full compiler lifecycle:
 
-- `beforeProgramCreate`
-- `afterProgramCreate`
-    - `afterScopeCreate` ("source" scope)
+- `beforeProvideProgram`
+- `afterProvideProgram`
+    - `afterProvideScope` ("source" scope)
+    - For each physical file:
+        - `beforeProvideFile`
+        - `onProvideFile`
+        - `afterProvideFile`
+    - For each physical and virtual file
+        - `beforeAddFile`
+        - `afterAddFile`
+        - `afterProvideScope` (component scope)
+    - `beforeValidateProgram`
     - For each file:
-        - `beforeFileParse`
-        - `afterFileParse`
-        - `afterScopeCreate` (component scope)
-    - `beforeProgramValidate`
-    - For each file:
-        - `beforeFileValidate`
-        - `onFileValidate`
-        - `afterFileValidate`
+        - `beforeValidateFile`
+        - `validateFile`
+        - `afterValidateFile`
     - For each scope:
-        - `beforeScopeValidate`
-        - `onScopeValidate`
-        - `afterScopeValidate`
-    - `afterProgramValidate`
+        - `beforeValidateScope`
+        - `validateScope`
+        - `afterValidateScope`
+    - `afterValidateProgram`
 - `beforePrepublish`
 - `afterPrepublish`
-- `beforePublish`
-    - `beforeProgramTranspile`
+- `beforeSerializeProgram`
+    - `beforeBuildProgram`
     - For each file:
-        - `beforeFileTranspile`
-        - `afterFileTranspile`
-    - `afterProgramTranspile`
-- `afterPublish`
-- `beforeProgramDispose`
+        - `beforePrepareFile`
+        - `afterPrepareFile`
+    - `afterBuildProgram`
+- `afterSerializeProgram`
+- `beforeRemoveProgram`
 
 ### Language server
 
@@ -84,17 +88,17 @@ Once the program has been validated, the language server runs a special loop - i
 
 When a file is removed:
 
-- `beforeFileDispose`
-- `beforeScopeDispose` (component scope)
-- `afterScopeDispose` (component scope)
-- `afterFileDispose`
+- `beforeRemoveFile`
+- `beforeRemoveScope` (component scope)
+- `afterRemoveScope` (component scope)
+- `afterRemoveFile`
 
 When a file is added:
 
-- `beforeFileParse`
-- `afterFileParse`
-- `afterScopeCreate` (component scope)
-- `afterFileValidate`
+- `beforeProvideFile`
+- `afterProvideFile`
+- `afterProvideScope` (component scope)
+- `afterValidateFile`
 
 When any file is modified:
 
@@ -103,18 +107,18 @@ When any file is modified:
 
 After file addition/removal (note: throttled/debounced):
 
-- `beforeProgramValidate`
+- `beforeValidateProgram`
 - For each invalidated/not-yet-validated file
-    - `beforeFileValidate`
-    - `onFileValidate`
-    - `afterFileValidate`
+    - `beforeValidateFile`
+    - `validateFile`
+    - `afterValidateFile`
 - For each invalidated scope:
-    - `beforeScopeValidate`
-    - `afterScopeValidate`
-- `afterProgramValidate`
+    - `beforeValidateScope`
+    - `afterValidateScope`
+- `afterValidateProgram`
 
 Code Actions
- - `onGetCodeActions`
+ - `provideCodeActions`
 
 Completions
  - `beforeProvideCompletions`
@@ -127,7 +131,7 @@ Hovers
  - `afterProvideHover`
 
 Semantic Tokens
- - `onGetSemanticTokens`
+ - `provideSemanticTokens`
 
 
 ## Compiler API
@@ -155,45 +159,85 @@ export type CompilerPluginFactory = (options?: PluginFactoryOptions) => Compilie
 
 export interface CompilerPlugin {
     name: string;
-    //program events
-    beforeProgramCreate?: (builder: ProgramBuilder) => void;
-    beforePrepublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    afterPrepublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    beforePublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    afterPublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    afterProgramCreate?: (program: Program) => void;
-    beforeProgramValidate?: (program: Program) => void;
-    afterProgramValidate?: (program: Program) => void;
-    beforeProgramTranspile?: (program: Program, entries: TranspileObj[], editor: AstEditor) => void;
-    afterProgramTranspile?: (program: Program, entries: TranspileObj[], editor: AstEditor) => void;
-    beforeProgramDispose?: PluginHandler<BeforeProgramDisposeEvent>;
-    onGetCodeActions?: PluginHandler<OnGetCodeActionsEvent>;
+    /**
+     * Called before a new program is created
+     */
+    beforeProvideProgram?(event: BeforeProvideProgramEvent): any;
+    /**
+     * Called after a new program is created
+     */
+    afterProvideProgram?(event: AfterProvideProgramEvent): any;
+
+
+    /**
+     * Called before the program gets prepared for building
+     */
+    beforePrepareProgram?(event: BeforePrepareProgramEvent): any;
+    /**
+     * Called when the program gets prepared for building
+     */
+    prepareProgram?(event: PrepareProgramEvent): any;
+    /**
+     * Called after the program gets prepared for building
+     */
+    afterPrepareProgram?(event: AfterPrepareProgramEvent): any;
+
+
+    /**
+     * Called before the entire program is validated
+     */
+    beforeValidateProgram?(event: BeforeValidateProgramEvent): any;
+    /**
+     * Called before the entire program is validated
+     */
+    validateProgram?(event: ValidateProgramEvent): any;
+    /**
+     * Called after the program has been validated
+     */
+    afterValidateProgram?(event: AfterValidateProgramEvent): any;
+
+    /**
+     * Called right before the program is disposed/destroyed
+     */
+    beforeRemoveProgram?(event: BeforeRemoveProgramEvent): any;
 
     /**
      * Emitted before the program starts collecting completions
      */
-    beforeProvideCompletions?: PluginHandler<BeforeProvideCompletionsEvent>;
+    beforeProvideCompletions?(event: BeforeProvideCompletionsEvent): any;
     /**
      * Use this event to contribute completions
      */
-    provideCompletions?: PluginHandler<ProvideCompletionsEvent>;
+    provideCompletions?(event: ProvideCompletionsEvent): any;
     /**
      * Emitted after the program has finished collecting completions, but before they are sent to the client
      */
-    afterProvideCompletions?: PluginHandler<AfterProvideCompletionsEvent>;
+    afterProvideCompletions?(event: AfterProvideCompletionsEvent): any;
+
 
     /**
      * Called before the `provideHover` hook. Use this if you need to prepare any of the in-memory objects before the `provideHover` gets called
      */
-    beforeProvideHover?: PluginHandler<BeforeProvideHoverEvent>;
+    beforeProvideHover?(event: BeforeProvideHoverEvent): any;
     /**
      * Called when bsc looks for hover information. Use this if your plugin wants to contribute hover information.
      */
-    provideHover?: PluginHandler<ProvideHoverEvent>;
+    provideHover?(event: ProvideHoverEvent): any;
     /**
      * Called after the `provideHover` hook. Use this if you want to intercept or sanitize the hover data (even from other plugins) before it gets sent to the client.
      */
-    afterProvideHover?: PluginHandler<AfterProvideHoverEvent>;
+    afterProvideHover?(event: AfterProvideHoverEvent): any;
+
+    /**
+     * Called after a scope was created
+     */
+    afterProvideScope?(event: AfterProvideScopeEvent): any;
+
+    beforeRemoveScope?(event: BeforeRemoveProgramEvent): any;
+    removeScope?(event: RemoveScopeEvent): any;
+    afterRemoveScope?(event: AfterRemoveScopeEvent): any;
+
+    beforeValidateScope?(event: BeforeValidateScopeEvent): any;
 
     /**
      * Called before the `provideDefinition` hook
@@ -259,33 +303,140 @@ export interface CompilerPlugin {
     afterProvideWorkspaceSymbols?(event: AfterProvideWorkspaceSymbolsEvent): any;
 
 
-    onGetSemanticTokens?: PluginHandler<OnGetSemanticTokensEvent>;
+    provideSemanticTokens?: PluginHandler<ProvideSemanticTokensEvent>;
     //scope events
-    afterScopeCreate?: (scope: Scope) => void;
-    beforeScopeDispose?: (scope: Scope) => void;
-    afterScopeDispose?: (scope: Scope) => void;
-    beforeScopeValidate?: ValidateHandler;
-    onScopeValidate?: PluginHandler<OnScopeValidateEvent>;
-    afterScopeValidate?: ValidateHandler;
-    //file events
-    beforeFileParse?: (source: SourceObj) => void;
-    afterFileParse?: (file: BscFile) => void;
+    validateScope?(event: ValidateScopeEvent): any;
+    afterValidateScope?(event: BeforeValidateScopeEvent): any;
+
+    provideCodeActions?(event: ProvideCodeActionsEvent): any;
+    provideSemanticTokens?(event: ProvideSemanticTokensEvent): any;
+
+
+    /**
+     * Called before plugins are asked to provide files to the program. (excludes virtual files produced by `provideFile` events).
+     * Call the `setFileData()` method to override the file contents.
+     */
+    beforeProvideFile?(event: BeforeProvideFileEvent): any;
+    /**
+     * Give plugins the opportunity to handle processing a file. (excludes virtual files produced by `provideFile` events)
+     */
+    provideFile?(event: ProvideFileEvent): any;
+    /**
+     * Called after a file was added to the program. (excludes virtual files produced by `provideFile` events)
+     */
+    afterProvideFile?(event: AfterProvideFileEvent): any;
+
+
+    /**
+     * Called before a file is added to the program.
+     * Includes physical files as well as any virtual files produced by `provideFile` events
+     */
+    beforeAddFile?(event: BeforeAddFileEvent): any;
+    /**
+     * Called after a file has been added to the program.
+     * Includes physical files as well as any virtual files produced by `provideFile` events
+     */
+    afterAddFile?(event: AfterAddFileEvent): any;
+
+    /**
+     * Called before a file is removed from the program. This includes physical and virtual files
+     */
+    beforeRemoveFile?(event: BeforeRemoveFileEvent): any;
+    /**
+     * Called after a file has been removed from the program. This includes physical and virtual files
+     */
+    afterRemoveFile?(event: AfterRemoveFileEvent): any;
+
+
     /**
      * Called before each file is validated
      */
-    beforeFileValidate?: PluginHandler<BeforeFileValidateEvent>;
+    beforeValidateFile?(event: BeforeValidateFileEvent): any;
     /**
      * Called during the file validation process. If your plugin contributes file validations, this is a good place to contribute them.
      */
-    onFileValidate?: PluginHandler<OnFileValidateEvent>;
+    validateFile?(event: ValidateFileEvent): any;
     /**
      * Called after each file is validated
      */
-    afterFileValidate?: (file: BscFile) => void;
-    beforeFileTranspile?: PluginHandler<BeforeFileTranspileEvent>;
-    afterFileTranspile?: PluginHandler<AfterFileTranspileEvent>;
-    beforeFileDispose?: (file: BscFile) => void;
-    afterFileDispose?: (file: BscFile) => void;
+    afterValidateFile?(event: AfterValidateFileEvent): any;
+
+
+    /**
+     * Called right before the program builds (i.e. generates the code and puts it in the outDir
+     */
+    beforeBuildProgram?(event: BeforeBuildProgramEvent): any;
+    /**
+     * Called right after the program builds (i.e. generates the code and puts it in the outDir
+     */
+    afterBuildProgram?(event: AfterBuildProgramEvent): any;
+
+
+    /**
+     * Before preparing the file for building
+     */
+    beforePrepareFile?(event: BeforePrepareFileEvent): any;
+    /**
+     * Prepare the file for building
+     */
+    prepareFile?(event: PrepareFileEvent): any;
+    /**
+     * After preparing the file for building
+     */
+    afterPrepareFile?(event: AfterPrepareFileEvent): any;
+
+
+    /**
+     * Before the program turns all file objects into their final buffers
+     */
+    beforeSerializeProgram?(event: BeforeSerializeProgramEvent): any;
+    /**
+     * Emitted right at the start of the program turning all file objects into their final buffers
+     */
+    serializeProgram?(event: SerializeProgramEvent): any;
+    /**
+     * After the program turns all file objects into their final buffers
+     */
+    afterSerializeProgram?(event: AfterSerializeProgramEvent): any;
+
+
+    /**
+     * Before turning the file into its final contents
+     */
+    beforeSerializeFile?(event: BeforeSerializeFileEvent): any;
+    /**
+     * Turn the file into its final contents (i.e. transpile a bs file, compress a jpeg, etc)
+     */
+    serializeFile?(event: SerializeFileEvent): any;
+    /**
+     * After turning the file into its final contents
+     */
+    afterSerializeFile?(event: AfterSerializeFileEvent): any;
+
+
+    /**
+     * Called before any files are written
+     */
+    beforeWriteProgram?(event: BeforeWriteProgramEvent): any;
+    /**
+     * Called after all files are written
+     */
+    afterWriteProgram?(event: AfterWriteProgramEvent): any;
+
+
+    /**
+     * Before a file is written to disk. These are raw files that contain the final output. One `File` may produce several of these
+     */
+    beforeWriteFile?(event: BeforeWriteFileEvent): any;
+    /**
+     * Called when a file should be persisted (usually writing to storage). These are raw files that contain the final output. One `File` may produce several of these.
+     * When a plugin has handled a file, it should be pushed to the `handledFiles` set so future plugins don't write the file multiple times
+     */
+    writeFile?(event: WriteFileEvent): any;
+    /**
+     * Before a file is written to disk. These are raw files that contain the final output. One `File` may produce several of these
+     */
+    afterWriteFile?(event: AfterWriteFileEvent): any;
 }
 
 // related types:
@@ -294,17 +445,12 @@ interface FileObj {
     dest: string;
 }
 
-interface SourceObj {
-    pathAbsolute: string;
-    source: string;
-}
-
 interface TranspileObj {
-    file: (BscFile);
+    file: File;
     outputPath: string;
 }
 
-type ValidateHandler = (scope: Scope, files: BscFile[], callables: CallableContainerMap) => void;
+type ValidateHandler = (scope: Scope, files: File[], callables: CallableContainerMap) => void;
 interface CallableContainerMap {
     [name: string]: CallableContainer[];
 }
@@ -325,8 +471,8 @@ export default function () {
 }
 ```
 
-### BrighterScript v1 compatability
-There is currently a v1 rewrite of BrighterScript which includes some significant breaking changes. This has caused challenges with brighterscript plugins, as you need to maintain separate versions for v0 and v1. You can utilize the `pluginOptions.version` property in your factory to determine what brighterscript version is running your plugin, and adjust accordingly.
+### BrighterScript v0 compatability
+v1 is a rewrite of BrighterScript which includes some significant breaking changes. This has caused challenges with brighterscript plugins, as you need to maintain separate versions for v0 and v1. You can utilize the `pluginOptions.version` property in your factory to determine what brighterscript version is running your plugin, and adjust accordingly.
 
 This options object is only available starting with brighterscript `v0.69.4` and `v1.0.0-alpha.45`. It's important to support backwards compatibility that an `undefined` `version` value be treated as a v0 plugin.
 
@@ -394,32 +540,41 @@ npx tsc myPlugin.ts -m commonjs --sourceMap --watch
 
 Diagnostics must run every time it is relevant:
 
-- Files have one out-of-context validation step (`afterFileValidate`),
-- Scopes are validated once all the the files have been collected (`before/afterScopeValidate`).
+- Files have one out-of-context validation step (`afterValidateFile`),
+- Scopes are validated once all the the files have been collected (`before/afterValidateScope`).
 
 Note: in a language-server context, Scope validation happens every time a file changes.
 
+To add a diagnostic, register it with the `DiagnosticManager`, available from the `program` property of any event.
+
 ```typescript
 // bsc-plugin-no-underscores.ts
-import { CompilerPlugin, BscFile, isBrsFile } from 'brighterscript';
+import { CompilerPlugin, File, isBrsFile } from 'brighterscript';
 
 // plugin factory
 export default function () {
     return {
         name: 'no-underscores',
         // post-parsing validation
-        afterFileValidate: (file: BscFile) => {
-            if (isBrsFile(file)) {
+        afterValidateFile: (event: AfterValidateFileEvent) => {
+            if (isBrsFile(event.file)) {
+                // clear existing diagnostics
+                event.program.diagnosticManager.clearByContext({file: file, tag: 'no-underscores-plugin'});
+
                 // visit function statements and validate their name
-                file.parser.references.functionStatements.forEach((fun) => {
-                    if (fun.name.text.includes('_')) {
-                        file.addDiagnostics([{
-                            code: 9000,
-                            message: 'Do not use underscores in function names',
-                            range: fun.name.range,
-                            file
-                        }]);
+                event.file.ast.walk(createVisitor({
+                    FunctionStatement: (funcStmt) => {
+                        if (funcStmt.tokens.name.text.includes('_')) {
+                            event.program.diagnostics.register([{
+                                code: 9000,
+                                message: 'Do not use underscores in function names',
+                                range: funcStmt.tokens.name.range,
+                                file
+                            }]);
+                        }
                     }
+                }, {
+                    walkMode: WalkMode.visitStatements
                 });
             }
         }
@@ -430,7 +585,7 @@ export default function () {
 ## Modifying code
 Sometimes plugins will want to modify code before the project is transpiled. While you can technically edit the AST directly at any point in the file's lifecycle, this is not recommended as those changes will remain changed as long as that file exists in memory and could cause issues with file validation if the plugin is used in a language-server context (i.e. inside vscode).
 
-Instead, we provide an instace of an `AstEditor` class in the `beforeFileTranspile` event that allows you to modify AST before the file is transpiled, and then those modifications are undone `afterFileTranspile`.
+Instead, we provide an instace of an `Editor` class in the `beforePrepareFile` event that allows you to modify AST before the file is transpiled, and then those modifications are undone `afterPrepareFile`.
 
 For example, consider the following brightscript code:
 ```brightscript
@@ -449,7 +604,7 @@ export default function () {
     return {
         name: 'replacePlaceholders',
         // transform AST before transpilation
-        beforeFileTranspile: (event: BeforeFileTranspileEvent) => {
+        beforePrepareFile: (event: BeforeFileTranspileEvent) => {
             if (isBrsFile(event.file)) {
                 event.file.ast.walk(createVisitor({
                     LiteralExpression: (literal) => {
@@ -472,43 +627,55 @@ This plugin will search through every LiteralExpression in the entire project, a
 ## Remove Comment and Print Statements
 
 Another common use case is to remove print statements and comments. Here's a plugin to do that:
+
+Note: Comments are not regular nodes in the AST. They're considered "trivia". To access them, you need to ask each AstNode for its trivia. to help with this, we've included the `AstNode` visitor method. Here's how you'd do that:
+
 ```typescript
-import { isBrsFile, createVisitor, WalkMode, BeforeFileTranspileEvent, CompilerPlugin } from 'brighterscript';
+import { Plugin, BeforePrepareFileEvent, isBrsFile, WalkMode, createVisitor, TokenKind, AstNode, EmptyStatement } from 'brighterscript';
 
-export default function plugin() {
+export default function (): Plugin {
     return {
         name: 'removeCommentAndPrintStatements',
-        beforeFileTranspile: (event: BeforeFileTranspileEvent) => {
-            if (isBrsFile(event.file)) {
-                // visit functions bodies and replace `PrintStatement` nodes with `EmptyStatement`
-                for (const func of event.file.parser.references.functionExpressions) {
-                    func.body.walk(createVisitor({
-                        PrintStatement: (statement) => {
-                            event.editor.overrideTranspileResult(statement, '');
-                        },
-                        CommentStatement: (statement) => {
-                            event.editor.overrideTranspileResult(statement, '');
+        beforePrepareFile: (event: BeforePrepareFileEvent) => {
+            if (!isBrsFile(event.file)) {
+                return;
+            }
+            //delete comments from the EOF token
+            event.editor.arraySplice(event.file.parser.eofToken.leadingTrivia, 0, Number.MAX_SAFE_INTEGER);
+
+            event.file.ast.walk(createVisitor({
+                PrintStatement: (node: AstNode, _parent, owner, key) => {
+                    return new EmptyStatement();
+                },
+                AstNode: (node: AstNode, _parent, owner, key) => {
+                    const trivia = node.leadingTrivia;
+                    for (let i = 0; i < trivia.length; i++) {
+                        if (trivia[i]?.kind === TokenKind.Comment) {
+                            //remove this token
+                            event.editor.arraySplice(trivia, i, 1);
+                            //replay this index again for the new item that took our spot since we deleted from the array
+                            i--;
                         }
-                    }), {
-                        walkMode: WalkMode.visitStatements
-                    });
+                    }
                 }
-            }
+            }), {
+                walkMode: WalkMode.visitAllRecursive
+            });
         }
-    } as CompilerPlugin;
+    };
 }
 ```
 
 ## Modifying `bsconfig.json` via a plugin
 
-In some cases you may want to modify the project's configuration via a plugin, such as to change settings based on environment variables or to dynamically modify the project's `files` array. Plugins may do so in the `beforeProgramCreate` step. For example, here's a plugin which adds an additional file to the build:
+In some cases you may want to modify the project's configuration via a plugin, such as to change settings based on environment variables or to dynamically modify the project's `files` array. Plugins may do so in the `beforeProvideProgram` step. For example, here's a plugin which adds an additional file to the build:
 ```typescript
 import { CompilerPlugin, ProgramBuilder } from 'brighterscript';
 
 export default function plugin() {
     return {
         name: 'addFilesDynamically',
-        beforeProgramCreate: (builder: ProgramBuilder) => {
+        beforeProvideProgram: (builder: ProgramBuilder) => {
             if (!builder.options.files) {
                 builder.options.files = [];
             }
@@ -521,3 +688,144 @@ export default function plugin() {
     } as CompilerPlugin;
 }
 ```
+
+## File API
+By default, BrighterScript only parses files that it knows how to handle. Generally this includes `.xml` files in the compontents folder, `.brs`, `.bs` and `.d.bs` files. Other files may be handled in the future, such as `manifest`, `.ts` and possibly more. All other files are loaded into the program as `AssetFile` types and have no special handling or processing.
+
+Plugins can provide files by contributing a `provideFile` function. BrighterScript will perform all of its file providing (like for `.xml` or `.brs` files) at the end of `provideFile` once every plugin had a chance to provide their own files. If you need to handle files before brighterscript does (like if you wanted to parse the .brs file instead of letting BrighterScript do it), you should do this in the `provideFile` event.
+
+Your plugin may want to add enhanced features for file types (such as parsing javascript and converting it to BrightScript). BrighterScript supports this by asking plugins to "`provide`" file objects for a given file path.
+
+Here's a sample plugin showing how to handle this:
+
+```typescript
+import { ProvideFileEvent, CompilerPlugin, BrsFile } from 'brighterscript';
+
+export default function plugin() {
+    return {
+        name: 'removeCommentAndPrintStatements',
+        provideFile: (event: ProvideFileEvent) => {
+            //convert all javascript files into .brs files (magically!)
+            if (event.srcExtension === '.js') {
+                //get the file contents as a string
+                const jsCode = event.getFileData().toString();
+
+                //somehow magically convert javascript code to brightscript code
+                const brsCode = convertJsToBrsUsingMagic(jsCode);
+
+                //create a new BrsFile which will hold the final brs code after the js file was parsed
+                const file = event.fileFactory.BrsFile({
+                    srcPath: event.srcPath,
+                    //rename the .js extension to .brs
+                    destPath: event.destPath.replace(/\.js$/, '.brs')
+                });
+                //parse the generated brs code
+                file.parse(brsCode);
+
+                //add this brs file to the event, which is how you "provide" the file
+                event.files.push(file);
+            }
+        }
+    } as CompilerPlugin;
+}
+```
+
+### Multiple files
+Plugins can also provide _multiple_ files from a single physical file. Consider this example:
+```typescript
+
+
+import { BeforeProvideFileEvent, CompilerPlugin, BrsFile, XmlFile, trim } from 'brighterscript';
+
+export default function plugin() {
+    return {
+        name: 'componentPlugin',
+        beforeProvideFile: (event: BeforeProvideFileEvent) => {
+            // source/buttons.component.bs
+
+            event.files
+            //split a .component file into a .brs and a .xml file
+            if (event.srcExtension === '.component') {
+                //get the filename (we will use this as the component name)
+                const componentName = path.basename(event.srcPath);
+                //get the file contents as a string
+                const code = event.getFileData().toString();
+
+                //create a new BrsFile to act as the primary .brs script for this file
+                const brsFile = event.factory.BrsFile({
+                    srcPath: event.srcPath.replace(/\.component$/, '.brs'),
+                    destPath: event.destPath.replace(/\.component$/, '.brs')
+                });
+                //parse the generated brs code
+                brsFile.parse(code);
+                //add this brs file to the event, which is how you "provide" the file
+                event.files.push(brsFile);
+
+                //create an XmlFile which will serve as the SceneGraph component for this file
+                const xmlFile = event.fileFactory.XmlFile({
+                    srcPath: event.srcPath.replace(/\.component$/, '.xml'),
+                    destPath: event.destPath.replace(/\.component$/, '.xml')
+                });
+                xmlFile.parse(`
+                    <component name="${componentName}">
+                        <script uri="${event.destPath}" />
+                    </component>
+                `);
+                //add this file to the event, which is how you "provide" the file
+                event.files.push(xmlFile);
+            }
+        }
+    } as CompilerPlugin;
+}
+```
+
+### File Factory
+Your plugin will be written against a specific version of BrighterScript. However, your plugin may be loaded by a different version of brighterscript (either by the brighterscript cli or through an editor like vscode). Running different versions of BrighterScript could cause issues in the file api.
+
+To mitigate this, the `provideFile` events supply a `fileFactory`, which exposes the file classes from the runner's brighterscript version. When possible, use the file factories found in `event.fileFactory` instead of direct class constructors. (i.e. use `event.fileFactory.BrsFile` instead of `new BrsFile()`). By using the file factories, this ensures better interoperability between plugins and a wide range of brighterscript versions.
+
+You can see examples of this in the previous code snippets above.
+
+### Program changes
+Historically, only `.brs`, `.bs`, and `.xml` files would be present in the `Program`. As a result of the File API being introduced, now all files included as a result of the bsconfig.json `files` array will be present in the program. Unhandled files will be loaded as generic `AssetFile` instances. This may impact plugins that aren't properly guarding against specific file types. Consider this plugin code:
+```typescript
+validateFile(event){
+    if (isXmlFile(event.file)) {
+        // do XmlFile work
+    } else {
+        // assume it's a BrsFile (bad!)
+        // it could now be a .jpeg or .png
+    }
+}
+```
+
+If a plugin has code like this, it may start failing due to receiving an `AssetFile` or some plugin-contributed custom file type that it didn't expect. We recommend that plugin authors always guard their code with file-specific conditional checks.
+
+### srcPath, destPath, and pkgPath
+The file api introduces a breaking change related to file paths. Previously there were only `srcPath` and `pkgPath`. `pkgPath` historically contained the file path as you would reference it in your project, such as `source/main.bs`. However, there was no property to represent its final path on device (i.e. `source/main.brs`).
+
+To mitigate this, and since the file api is already causing a few breaking changes, we decided to change the way file paths work. `srcPath` remains the same. However, `pkgPath` has been renamed to `destPath` to represent the path to the file as it exists in your brighterscript project _before_ transpilation. `pkgPath` will now represent the final path where the file will reside on-device.
+
+Plugin authors need to refactor their plugins to use `file.destPath` instead of `file.pkgPath`. While `destPath` and `pkgPath` sometimes have the same value, plugin authors should always assume that the paths are different.
+
+Here's a description of each path property in BrighterScript now that the file api has been released.
+
+- **srcPath** - the absolute path to the source file. For example:<br/>
+`C:\projects\YourRokuApp\source\main.bs"` or `"/usr/projects/YourRokuApp/source/main.bs"`
+- **destPath** - the path where the file exists within the context of a brightscript project, relative to the root of the package/zip.
+ This the path that brightscript engineers will use in their channel code. This should _not_ containing a leading slash or `pkg:/` scheme. For example:<br/>
+ `"source/main.bs"`
+- **pkgPath** - the final path where the file will reside on-device. For example:<br/>
+ `"source/main.brs"`
+
+Here's an example file showing all three paths:
+```js
+{
+    //location in source project
+    srcPath: "C:/projects/YourRokuApp/source/main.bs",
+    //location in brighterscript program
+    destPath: "source/main.bs"
+    //location on device
+    pkgPath: "source/main.brs"
+}
+```
diff --git a/docs/readme.md b/docs/readme.md
index 6bb8e9961..d07e6cec4 100644
--- a/docs/readme.md
+++ b/docs/readme.md
@@ -1,24 +1,41 @@
 # BrighterScript
+
 BrighterScript is a superset of Roku's BrightScript language. Its goal is to provide new functionality and enhanced syntax support to enhance the Roku channel developer experience.
 
 See the following pages for more information:
 
 ## [Annotations](annotations.md)
+
 ```brighterscript
-'mostly useful for plugins that change code based on annotations
+' mostly useful for plugins that change code based on annotations
 @logOnException()
 sub doSomething()
     '...
-end
+end sub
+```
+
+## [Assignments](assigments.md)
+
+```brighterscript
+' declare the type of variables
+sub showTypedAssignments()
+    name as string = getData()
+
+    for each item as integer in getDurationSeconds(name)
+        print "Time in MS:"; item / 1000
+    end for
+end sub
 ```
 
 ## [Callfunc Operator](callfunc-operator.md)
+
 ```brighterscript
-'instead of `node.callfunc("someMethod", 1, 2, 3)`, you can do this:
+' instead of `node.callfunc("someMethod", 1, 2, 3)`, you can do this:
 node@.someMethod(1, 2, 3)
 ```
 
 ## [Classes](classes.md)
+
 ```brighterscript
 class Movie
     public title as string
@@ -33,6 +50,7 @@ end class
 ```
 
 ## [Constants](constants.md)
+
 ```brighterscript
 const API_URL = "https://api.acme.com/v1/"
 sub main()
@@ -41,6 +59,7 @@ end sub
 ```
 
 ## [Enums](enums.md)
+
 ```brighterscript
 enum RemoteButton
     up = "up"
@@ -50,7 +69,58 @@ enum RemoteButton
 end enum
 ```
 
+## [Exceptions](exceptions.md)
+
+```brighterscript
+try
+    somethingDangerous()
+catch ' look, no exception variable!
+    print "Living on the edge!"
+end try
+```
+
+## [Function Types](function-types.md)
+
+```brighterscript
+function useCallback(callback as function(input as string) as integer) as integer
+    return callback("test")
+end function
+```
+
+## [Imports](imports.md)
+
+```brighterscript
+import "pkg:/source/util.bs"
+sub main()
+    print util_toUpper("hello world")
+end sub
+```
+
+## [Interfaces](interfaces.md)
+
+```brighterscript
+interface IMyComponent
+   top as roSGNodeMyComponent
+
+   isSelected as boolean
+   selectedIndex as integer
+
+   data as {id as string, isEpisode as boolean}
+end interface
+```
+
+## [Intersection Types](intersection-types.md)
+
+```brighterscript
+type MyClassAA = MyClass and roAssociativeArray
+
+sub addData(klass as MyClass and roAssociativeArray, data as roAssociativeArray)
+    return klass.append(data)
+end sub
+```
+
 ## [Namespaces](namespaces.md)
+
 ```brighterscript
 namespace util
     function toUpper(value as string)
@@ -63,28 +133,24 @@ sub main()
 end sub
 ```
 
-## [Imports](imports.md)
-```brighterscript
-import "pkg:/source/util.bs"
-sub main()
-    print util_toUpper("hello world")
-end sub
-```
-
 ## [Null-coalescing operator](null-coalescing-operator.md)
+
 ```brighterscript
 userSettings = getSettingsFromRegistry() ?? {}
 ```
 
 ## [Plugins](plugins.md)
+
 Plugins can be used to manipulate code at any point during the program lifecycle.
 
 ## [Regular Expression Literals](regex-literals.md)
+
 ```brighterscript
 print /hello world/ig
 ```
 
 ## [Source Literals](source-literals.md)
+
 ```brighterscript
 print SOURCE_FILE_PATH
 print SOURCE_LINE_NUM
@@ -94,7 +160,9 @@ print SOURCE_LOCATION
 print PKG_PATH
 print PKG_LOCATION
 ```
+
 ## [Template Strings (Template Literals)](template-strings.md)
+
 ```brighterscript
 name = `John Smith`
 
@@ -105,6 +173,47 @@ second line text`
 ```
 
 ## [Ternary (Conditional) Operator](ternary-operator.md)
+
 ```brighterscript
 authStatus = user <> invalid ? "logged in" : "not logged in"
 ```
+
+## [Typecasts](typecasts.md)
+
+```BrighterScript
+nodeId = (node as roSgNode).id
+```
+
+## [Typed Arrays](typed-arrays.md)
+
+```brighterscript
+function getY(translation as float[]) as float
+    yValue = -1
+    if translation.count() > 1
+        yValue = translation[1] ' yValue is known to be of type float
+    end if
+    yValue
+end function
+```
+
+## [Type Statements](type-statements.md)
+
+```brighterscript
+type number = integer or float or double
+
+function sum(x as number, y as number) as number
+    return x + y
+end function
+```
+
+## [Union Types](union-types.md)
+
+```brighterscript
+sub logData(data as string or number)
+    print data.toStr()
+end sub
+```
+
+## [Variable Shadowing](variable-shadowing.md)
+
+Name resolution rules for various types of shadowing.
diff --git a/docs/type-checking-without-transpile.md b/docs/type-checking-without-transpile.md
new file mode 100644
index 000000000..613045843
--- /dev/null
+++ b/docs/type-checking-without-transpile.md
@@ -0,0 +1,50 @@
+# Typechecking without transpiling
+If you want the benefits of BrighterScript's type system but don't want to use the transpiler, you can use comments to declare variable types to get much richer editor experience and type validation.
+
+## Params
+Declare the type of a specific parameter:
+
+```brighterscript
+'@param {roSGNodeRectangle} node
+function resize(node, width as integer, height as string)
+    'yay, we know that `node` is a `roSGNodeRectangle` type
+    node.width = width
+    node.height = height
+end function
+```
+
+## Return type
+
+Declare the return type of a function
+
+```brighterscript
+'@return {roSGNodeRectangle}
+function createRectangle()
+    return createObject("roSGNode", "Rectangle")
+end function
+
+function test()
+    'yay, we know that `rectangle` is a `roSGNodeRectangle` type
+    rectangle = createRectangle()
+end function
+```
+
+## Inline variable type
+You can override the type of a variable in brs files by starting a comment with `@type` . This will cast the variable below with the given type.
+
+```brighterscript
+' @type {integer}
+runtime = getRuntimeFromServer()
+```
+
+## TODO: Function-level variable type 
+Sometimes you need to declare a variable at more than one location in your code. In this situation, you can declare the variable type in the body of the function before the variable usage, and that variable will then be treated as that type.
+
+```brighterscript
+' @type {integer} runtime
+if m.top.hasRuntime
+    runtime = m.top.runtime
+else
+    runtime = 12345
+end if
+```
diff --git a/docs/type-statements.md b/docs/type-statements.md
new file mode 100644
index 000000000..63fff4890
--- /dev/null
+++ b/docs/type-statements.md
@@ -0,0 +1,71 @@
+## Type Statements
+
+BrighterScript supports declaring custom named types using the `type` keyword. In this way, new types can be created as wrappers, or aliases for other types. This is useful to create custom names for advanced types like unions, so they can be more easily used throughout the code.
+
+## Syntax
+
+To create a new custom named types, use the syntax `type <customName> = <existingType>` at either the top level of a file, or within a namespace.
+
+For example, if you wanted to create a shorthand for the union type `integer or float or double`, you could do the following:
+
+```BrighterScript
+type number = integer or float or double
+
+function sum(x as number, y as number) as number
+    return x + y
+end function
+
+function product(x as number, y as number) as number
+    return x * y
+end function
+```
+
+<details>
+  <summary>View the transpiled BrightScript code</summary>
+
+```BrightScript
+function sum(x as dynamic, y as dynamic) as dynamic
+    return x + y
+end function
+
+function product(x as dynamic, y as dynamic) as dynamic
+    return x * y
+end function
+```
+
+</details>
+
+## Importing
+
+Types created with the `type` keyword are available through importing the file they are declared in.
+
+For example:
+
+**src/components/Widget.bs**
+
+```BrighterScript
+namespace Widgets
+
+    type widget = Button or Checkbox
+
+    interface Button
+        text as string
+        action as function
+    end interface
+
+    interface Checkbox
+        text as string
+        checked as boolean
+    end interface
+end namespace
+```
+
+**src/components/UI.bs**
+
+```BrighterScript
+import "pkg:/components/Widget.bs" ' provides the "Widgets.widget" type
+
+function getName(w as Widgets.widget) as string
+    return w.text
+end function
+```
diff --git a/docs/typecasts.md b/docs/typecasts.md
new file mode 100644
index 000000000..454c49793
--- /dev/null
+++ b/docs/typecasts.md
@@ -0,0 +1,127 @@
+# BrighterScript Typecasts
+
+In BrighterScript, the inferred types of expressions can be explicitly changed through typecasts.
+
+There are two ways of doing this - through inline typecasts, or through typecast statements.
+
+Any expressions that has been typecast will be assumed to be that type.
+
+## Inline typecasts
+
+To invoke an inline typecast, use the `as <type>` syntax after an expression. The whole typecast can also be enclosed in parentheses as well.
+
+In this example, the `node` parameter is `dynamic`, but is cast to the built-in type `roSgNode`. `roSgNode` has an `id` property that is a `string`.
+Due to the assignment, `nodeId` is also known to be a string.
+
+Because of the typecast, the intellisense code completion also knows the type, so at the `.` after the typecast, members of `roSgNode` will be suggested.
+
+Example:
+
+```BrighterScript
+function getPrefixedId(node, prefix as string) as string
+    nodeId = (node as roSgNode).id
+    return prefix + nodeId
+end function
+```
+
+## Typecast Statements
+
+In order to specify all usages of an expression are explicitly set to a certain type, you can use a `typecast` statement.
+
+Syntax:
+
+`typecast m as <type>`
+
+Rules:
+
+- `Typecast` statements are only allowed at the top of files (along with `import` and `library` statements), and as the first statement in a block (eg. function or if statement "then" block) or namespace.
+- There can be a maximum of one `typecast` statement per variable per block
+- Only runtime variables can be typecast
+- Outside a function, only typecasting `m` is supported
+- When used in a namespace, only the current namespace statement is affected - other namespace statements that contribute to the same namespaces do not have the typecast applied
+
+This is very useful for components, so that the actual type of Associative Array `m` can narrowed to provide better validation.
+
+**pkg:/components/Widget.xml**
+
+```xml
+<?xml version="1.0" encoding="utf-8" ?>
+<component name="Widget" extends="Group">
+    <script uri="Widget.bs" />
+    <script uri="Widget.interface.bs" />
+    <interface>
+        <field id="enabled" type="boolean" value="false" />
+        <field id="state" type="string" />
+    </interface>
+    <children>
+        <label id="myLabel" />
+    </children>
+</component>
+```
+
+**pkg:/components/Widget.interface.xml**
+
+```BrighterScript
+interface WidgetObject
+    top as roSgNodeWidget
+    label as roSgNodeLabel
+    value as string
+end interface
+```
+
+**pkg:/components/Widget.bs**
+
+```BrighterScript
+typecast m as WidgetObject
+
+sub init
+    m.label = m.top.findNode("myLabel")
+    m.value = "Test"
+    m.top.state = "ok"
+    printDetails()
+end sub
+
+sub printDetails()
+    ' all members of `m` are known
+    print m.top.subtype()
+    print m.label.text
+    print m.top.state
+end sub
+```
+
+`Typecast` statements are also useful in inline functions to explicitly set the type of `m`:
+
+```BrighterScript
+interface Greeter
+    greeting as string
+    name as string
+    function doGreeting() as string
+end interface
+
+function createGreater(name as string) as Greeter
+    myGreeter = {
+        greeting: "Hello"
+        name: name
+        doGreeting: function () as string
+            typecast m as Greeter
+            return `${m.greeting} ${m.name} ' m is explicity set to be of type Greeter
+        end function
+    }
+    return myGreeter
+end function
+```
+
+`Typecast` statements can be used for type narrowing as well:
+
+```brighterscript
+function addOne(x) as integer
+    if isString(x)
+        typecast x as string
+        return x.toInt() + 1
+    else if isInteger(x)
+        typecast x as integer
+        return x + 1
+    end if
+    return 0
+end function
+```
diff --git a/docs/typed-arrays.md b/docs/typed-arrays.md
new file mode 100644
index 000000000..76236d16e
--- /dev/null
+++ b/docs/typed-arrays.md
@@ -0,0 +1,68 @@
+# Typed Arrays
+
+BrighterScript supports declaring parameters (and typecasting) to a typed array. Typed arrays can be used to specifically declare that the elements of an array are a certain type.
+
+## Syntax
+
+Typed arrays can be declared with the following syntax: `<type>[]`. For example, the parameter to the function below is an array of integers
+
+```BrighterScript
+function sum(values as integer[]) as integer
+    total = 0
+    for each value in values
+        total += value
+    end for
+    return total
+end function
+```
+
+Multidimensional arrays are supported:
+
+```BrighterScript
+function get3x3IdentityMatrix() as float[][]
+    row1 = [1, 0, 0]
+    row2 = [0, 1, 0]
+    row3 = [0, 0, 1]
+    return [row1, row, row3]
+end function
+```
+
+## Member Methods and Validation
+
+The type of the array changes some of the validation on built-in array member methods, such as `push()` and `pop()` so they will expect the array's type as argument, in the case of `push()`, or will return the array's type, for methods such as `pop()`.
+
+For example, this code will cause some validation errors:
+
+```BrighterScript
+sub doWork(values as integer[])
+    print lcase(values.pop()) ' Validation error: lcase() expects a string, but values.pop() returns an integer
+    result = "Hello world"
+    values.push(result) ' Validation error: values.push() expects an integer argument
+end sub
+```
+
+## Transpilation
+
+Since Brightscript does not have typed arrays, typed arrays will be transpiled as `object`, since they are programatically the same as `roArray.`
+
+```BrighterScript
+function sum(values as integer[]) as integer
+    total = 0
+    for each value in values
+        total += value
+    end for
+    return total
+end function
+```
+
+transpiles to
+
+```BrighterScript
+function sum(values as object) as integer
+    total = 0
+    for each value in values
+        total += value
+    end for
+    return total
+end function
+```
diff --git a/docs/union-types.md b/docs/union-types.md
new file mode 100644
index 000000000..3452b670f
--- /dev/null
+++ b/docs/union-types.md
@@ -0,0 +1,64 @@
+# Union Types
+
+BrighterScript Union Types are a way to define a type of a variable that could be any of a set of types. They are similar to Union Types found in other languages, such as [TypeScript](https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#union-types).
+
+## Syntax
+
+Union types can be declared with the following syntax: `<type> or <type>`. For example, the parameter to the function below could be either an `integer` or a `string`:
+
+```BrighterScript
+function makePriceString(value as string or integer)
+    return "$" + value.toStr()
+end function
+```
+
+Any number of inner types, including classes or interfaces, could be part of a union:
+
+```BrighterScript
+interface DataResponse
+  status as number
+  data as string
+end interface
+
+interface ValueResponse
+  status as number
+  data as number
+end interface
+
+interface Error
+  status as number
+  data as string
+end interface
+
+
+function getStatusString(response as DataResponse or ValueResponse or Error) as string
+    if response.status >= 200 and response.status < 300
+        return "Success"
+    end if
+    return "Error"
+end function
+```
+
+## Validation
+
+A diagnostic error will be raised when a member is accessed that is not a member of ALL of the types of a union.
+
+In the example above, accessing `response.status` is fine, because it is in all of the types of the union. Accessing `response.data` would raise an error, because it's not in the `Error` interface.
+
+## Transpilation
+
+Since Brightscript does not have union types natively, union types will be transpiled as `dynamic`.
+
+```BrighterScript
+function makePriceString(value as string or integer)
+    return "$" + value.toStr()
+end function
+```
+
+transpiles to
+
+```BrightScript
+function makePriceString(value as dynamic)
+    return "$" + value.toStr()
+end function
+```
diff --git a/docs/variable-shadowing.md b/docs/variable-shadowing.md
new file mode 100644
index 000000000..bb648b486
--- /dev/null
+++ b/docs/variable-shadowing.md
@@ -0,0 +1,145 @@
+# Variable Shadowing and Name Collisions in BrighterScript
+
+BrighterScript allows various kinds of [variable name shadowing](https://en.wikipedia.org/wiki/Variable_shadowing). In general, variables and types refer to items defined in the current scope/namespace if available.
+
+However, due to the limitations of BrightScript, there are some name collisions that lead to unpredictable behavior, and so they cause diagnostic errors.
+
+## Name Resolution Rules
+
+**1. Local variables CAN shadow names of global functions.**
+
+✅
+
+```brighterscipt
+sub test()
+    log = "value" ' identifier shadows global function log() - no error
+    upTime = 0 ' identifier shadows global function Uptime() - no error
+end sub
+```
+
+**2. Local variables CANNOT shadow names of functions or classes defined at the same scope.**
+
+❌
+
+```brighterscipt
+sub test()
+    pi = "Apple" ' identifier shadows function pi() - causes validation error
+    data = 1234 ' identifier shadows class Data - causes validation error
+end sub
+
+function pi() as float
+    return 3.14
+function
+
+class Data
+    value = {}
+end class
+```
+
+**3. Custom types and definitions (enums, classes, interfaces, functions, consts) CANNOT have the same name if they are in the same namespace.**
+
+❌
+
+```brighterscipt
+function someName()
+end function
+
+class SomeName  ' class shadows local function - causes validation error
+    sub foo()
+    end sub
+end class
+
+namespace alpha
+    class OtherName  ' class in namespace shadows function in same namespace - causes validation error
+        sub foo()
+        end sub
+    end class
+
+    function otherName()
+    end function
+end namespace
+```
+
+**4. Functions and classes outside of namespaces CANNOT shadow standard global functions (eg. `ParseJson`, `LCase`, etc.)**
+
+❌
+
+```brighterscipt
+class log  ' class shadows global function - causes validation error
+    sub foo()
+    end sub
+end class
+
+
+```
+
+**5. Definitions inside namespaces CAN shadow standard global functions, or functions at a difference namespace-level. In this way, the outer item is unavailable, and only the item defined at the current scope is accessible.**
+
+✅
+
+```brighterscipt
+class SomeName()
+end class
+
+namespace alpha
+    class SomeName  ' class in namespace shadows function in upper scope
+        sub foo()
+            print "foo"
+        end sub
+    end class
+
+    sub test()
+        myKlass = new SomeName() ' refers to alpha.SomeName
+        myKlass.foo() ' will print "foo"
+    end sub
+
+    sub log(data) ' function defined as alpha.log - this is ok
+        print "LOG: ";data
+    end sub
+
+    sub foo()
+        log("Hello world") ' refers to alpha.log - will print "LOG: Hello world"
+    end sub
+end namespace
+```
+
+## Aliasing Shadowed Names
+
+If there is a need to reference a shadowed name, you can `alias` the name at the beginning of the file, thus providing a different name to use.
+
+For example, in the following, the namespace `get` is shadowed by the function `http.get`.
+To work around that, an alias is used to create a new name that can be used to reference the `get` namespace.
+
+```BrighterScript
+alias get2 = get
+
+namespace http
+    'Do an HTTP request
+    sub get()
+        print get2.aa().data 'using `get2` aliased symbol here. it's now clear which item we intended to use
+    end sub
+end namespace
+
+namespace get
+    function aa()
+        return {
+            data: "abc"
+        }
+    end function
+end namespace
+```
+
+transpiles to
+
+```BrightScript
+'alias get2 = get
+'Do an HTTP request
+sub http_get()
+    print get_aa().data 'using `get2` aliased symbol here. it's now clear which item we intended to use
+end sub
+function get_aa()
+    return {
+        data: "abc"
+    }
+end function
+```
diff --git a/manifest b/manifest
new file mode 100644
index 000000000..0b8b188bb
--- /dev/null
+++ b/manifest
@@ -0,0 +1 @@
+bs_const=DEBUG=true
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 4be7cbbdc..c604e7022 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "brighterscript",
-  "version": "0.72.0",
-  "lockfileVersion": 2,
+  "version": "1.0.0-alpha.50",
+  "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "brighterscript",
-      "version": "0.72.0",
+      "version": "1.0.0-alpha.50",
       "license": "MIT",
       "dependencies": {
         "@rokucommunity/bslib": "^0.1.1",
@@ -17,6 +17,7 @@
         "chevrotain": "^7.0.1",
         "chokidar": "^3.6.0",
         "clear": "^0.1.0",
+        "coveralls-next": "^4.2.0",
         "cross-platform-clear-console": "^2.3.0",
         "debounce-promise": "^3.1.0",
         "eventemitter3": "^4.0.0",
@@ -41,6 +42,7 @@
         "serialize-error": "^7.0.1",
         "source-map": "^0.7.4",
         "thenby": "^1.3.4",
+        "uuid": "^9.0.0",
         "vscode-languageserver": "^9.0.1",
         "vscode-languageserver-protocol": "^3.17.5",
         "vscode-languageserver-textdocument": "^1.0.11",
@@ -51,7 +53,7 @@
       },
       "bin": {
         "bsc": "dist/cli.js",
-        "bsc0": "dist/cli.js"
+        "bsc1": "dist/cli.js"
       },
       "devDependencies": {
         "@guyplusplus/turndown-plugin-gfm": "^1.0.7",
@@ -5668,6 +5670,17 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/istanbul-lib-processinfo/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
@@ -9075,13 +9088,17 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "dev": true,
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "deprecated": "uuid@10 and below is no longer supported.  For ESM codebases, update to uuid@latest.  For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
       "bin": {
-        "uuid": "bin/uuid"
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache": {
@@ -9443,6953 +9460,5 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     }
-  },
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
-      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.24.2",
-        "picocolors": "^1.0.0"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.22.20",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-          "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-          "dev": true
-        },
-        "@babel/highlight": {
-          "version": "7.24.2",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-          "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.22.20",
-            "chalk": "^2.4.2",
-            "js-tokens": "^4.0.0",
-            "picocolors": "^1.0.0"
-          }
-        }
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
-      "integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.14.tgz",
-      "integrity": "sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.9",
-        "@babel/helper-compilation-targets": "^7.13.13",
-        "@babel/helper-module-transforms": "^7.13.14",
-        "@babel/helpers": "^7.13.10",
-        "@babel/parser": "^7.13.13",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.13",
-        "@babel/types": "^7.13.14",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.13.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.13.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz",
-      "integrity": "sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.12",
-        "@babel/helper-validator-option": "^7.12.17",
-        "browserslist": "^4.14.5",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
-      "dev": true
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
-      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.22.5"
-      },
-      "dependencies": {
-        "@babel/helper-validator-identifier": {
-          "version": "7.22.20",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-          "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.24.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-          "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-string-parser": "^7.23.4",
-            "@babel/helper-validator-identifier": "^7.22.20",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-member-expression-to-functions": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
-      "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.13.12"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
-      "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.13.12"
-      }
-    },
-    "@babel/helper-module-transforms": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz",
-      "integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-module-imports": "^7.13.12",
-        "@babel/helper-replace-supers": "^7.13.12",
-        "@babel/helper-simple-access": "^7.13.12",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.13",
-        "@babel/types": "^7.13.14"
-      }
-    },
-    "@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "@babel/helper-replace-supers": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
-      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.13.12",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.12"
-      }
-    },
-    "@babel/helper-simple-access": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
-      "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.13.12"
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "@babel/helper-string-parser": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz",
-      "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==",
-      "dev": true
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==",
-      "dev": true
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
-      "dev": true
-    },
-    "@babel/helpers": {
-      "version": "7.13.10",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
-      "integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.13.13",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz",
-      "integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==",
-      "dev": true
-    },
-    "@babel/runtime": {
-      "version": "7.26.10",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
-      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
-      "requires": {
-        "regenerator-runtime": "^0.14.0"
-      }
-    },
-    "@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.24.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz",
-          "integrity": "sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.24.0",
-            "@jridgewell/gen-mapping": "^0.3.5",
-            "@jridgewell/trace-mapping": "^0.3.25",
-            "jsesc": "^2.5.1"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.23.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz",
-          "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==",
-          "dev": true,
-          "requires": {
-            "@babel/template": "^7.22.15",
-            "@babel/types": "^7.23.0"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.22.6",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-          "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.22.5"
-          }
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.22.20",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-          "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-          "dev": true
-        },
-        "@babel/parser": {
-          "version": "7.24.4",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz",
-          "integrity": "sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.24.0",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-          "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.23.5",
-            "@babel/parser": "^7.24.0",
-            "@babel/types": "^7.24.0"
-          }
-        },
-        "@babel/types": {
-          "version": "7.24.0",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-          "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-string-parser": "^7.23.4",
-            "@babel/helper-validator-identifier": "^7.22.20",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "globals": {
-          "version": "11.12.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-          "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/types": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz",
-      "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "dependencies": {
-        "@jridgewell/trace-mapping": {
-          "version": "0.3.9",
-          "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-          "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/resolve-uri": "^3.0.3",
-            "@jridgewell/sourcemap-codec": "^1.4.10"
-          }
-        }
-      }
-    },
-    "@es-joy/jsdoccomment": {
-      "version": "0.31.0",
-      "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.31.0.tgz",
-      "integrity": "sha512-tc1/iuQcnaiSIUVad72PBierDFpsxdUHtEF/OrfqvM1CBAsIoMP51j52jTMb3dXriwhieTo289InzZj72jL3EQ==",
-      "dev": true,
-      "requires": {
-        "comment-parser": "1.3.1",
-        "esquery": "^1.4.0",
-        "jsdoc-type-pratt-parser": "~3.1.0"
-      }
-    },
-    "@eslint/eslintrc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz",
-      "integrity": "sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.3.2",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        }
-      }
-    },
-    "@guyplusplus/turndown-plugin-gfm": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@guyplusplus/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.7.tgz",
-      "integrity": "sha512-k2KATk491JIeq1KNsjOwaD88cdknQeTpKVXh9OuZfHdjFuSEtEVVDCfCbxzmRvJxeKDPbZQl8DGP5o7SaIvWBw==",
-      "dev": true,
-      "requires": {
-        "turndown": "^7.1.1"
-      }
-    },
-    "@humanwhocodes/config-array": {
-      "version": "0.9.5",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz",
-      "integrity": "sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==",
-      "dev": true,
-      "requires": {
-        "@humanwhocodes/object-schema": "^1.2.1",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "@humanwhocodes/object-schema": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
-      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
-      "dev": true
-    },
-    "@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-          "dev": true
-        }
-      }
-    },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true
-    },
-    "@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true
-    },
-    "@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "dev": true
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
-      "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==",
-      "requires": {
-        "@nodelib/fs.stat": "2.0.3",
-        "run-parallel": "^1.1.9"
-      }
-    },
-    "@nodelib/fs.stat": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz",
-      "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz",
-      "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==",
-      "requires": {
-        "@nodelib/fs.scandir": "2.1.3",
-        "fastq": "^1.6.0"
-      }
-    },
-    "@postman/form-data": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.1.tgz",
-      "integrity": "sha512-vjh8Q2a8S6UCm/KKs31XFJqEEgmbjBmpPNVV2eVav6905wyFAwaUOBGA1NPBI4ERH9MMZc6w0umFgM6WbEPMdg==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "@postman/tough-cookie": {
-      "version": "4.1.3-postman.1",
-      "resolved": "https://registry.npmjs.org/@postman/tough-cookie/-/tough-cookie-4.1.3-postman.1.tgz",
-      "integrity": "sha512-txpgUqZOnWYnUHZpHjkfb0IwVH4qJmyq77pPnJLlfhMtdCLMFTEeQHlzQiK906aaNCe4NEB5fGJHo9uzGbFMeA==",
-      "requires": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="
-        }
-      }
-    },
-    "@postman/tunnel-agent": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/@postman/tunnel-agent/-/tunnel-agent-0.6.4.tgz",
-      "integrity": "sha512-CJJlq8V7rNKhAw4sBfjixKpJW00SHqebqNUQKxMoepgeWZIbdPcD+rguRcivGhS4N12PymDcKgUgSD4rVC+RjQ==",
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "@rokucommunity/bslib": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@rokucommunity/bslib/-/bslib-0.1.1.tgz",
-      "integrity": "sha512-2ox6EUL+UTtccTbD4dbVjZK3QHa0PHCqpoKMF8lZz9ayzzEP3iVPF8KZR6hOi6bxsIcbGXVjqmtCVkpC4P9SrA=="
-    },
-    "@rokucommunity/logger": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/@rokucommunity/logger/-/logger-0.3.11.tgz",
-      "integrity": "sha512-yQWa+rRVYkZeEYFePHzNtB6/DL+wPjjL/xt9wM0gQPDugSl8kJZ3ywyUtrFS+y/wzY0Nc2M+1704GVx0vdOO9A==",
-      "requires": {
-        "chalk": "^4.1.2",
-        "date-fns": "^2.30.0",
-        "fs-extra": "^10.0.0",
-        "parse-ms": "^2.1.0",
-        "safe-json-stringify": "^1.2.0",
-        "serialize-error": "^8.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "fs-extra": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
-          "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^6.0.1",
-            "universalify": "^2.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "jsonfile": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-          "requires": {
-            "graceful-fs": "^4.1.6",
-            "universalify": "^2.0.0"
-          }
-        },
-        "serialize-error": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-8.1.0.tgz",
-          "integrity": "sha512-3NnuWfM6vBYoy5gZFvHiYsVbafvI9vZv/+jlIigFn4oP4zjNPK3LhcY0xSCgeb1a5L8jO71Mit9LlNoi2UfDDQ==",
-          "requires": {
-            "type-fest": "^0.20.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
-        },
-        "universalify": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-          "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="
-        }
-      }
-    },
-    "@sinonjs/commons": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz",
-      "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "4.0.8"
-      }
-    },
-    "@sinonjs/fake-timers": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
-      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1.7.0"
-      }
-    },
-    "@sinonjs/formatio": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-5.0.1.tgz",
-      "integrity": "sha512-KaiQ5pBf1MpS09MuA0kp6KBQt2JUOQycqVG1NZXvzeaXe5LGFqAKueIS0bw4w0P9r7KuBSVdUk5QjXsUdu2CxQ==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1",
-        "@sinonjs/samsam": "^5.0.2"
-      }
-    },
-    "@sinonjs/samsam": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-5.2.0.tgz",
-      "integrity": "sha512-CaIcyX5cDsjcW/ab7HposFWzV1kC++4HNsfnEdFJa7cP1QIuILAKV+BgfeqRXhcnSAc76r/Rh/O5C+300BwUIw==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1.6.0",
-        "lodash.get": "^4.4.2",
-        "type-detect": "^4.0.8"
-      }
-    },
-    "@sinonjs/text-encoding": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz",
-      "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==",
-      "dev": true
-    },
-    "@tsconfig/node10": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
-      "integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-      "dev": true
-    },
-    "@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
-    },
-    "@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
-    },
-    "@tsconfig/node16": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-      "dev": true
-    },
-    "@types/ajv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/ajv/-/ajv-1.0.0.tgz",
-      "integrity": "sha512-yGSqw9/QKd5FXbTNrSANcJ6IHWeNhA+gokXqmlPquJgLDC87d4g2FGPs+AlCeGG0GuZXmPq42hOFA2hnPymCLw==",
-      "dev": true,
-      "requires": {
-        "ajv": "*"
-      }
-    },
-    "@types/benchmark": {
-      "version": "1.0.33",
-      "resolved": "https://registry.npmjs.org/@types/benchmark/-/benchmark-1.0.33.tgz",
-      "integrity": "sha512-rG7Ieasa9UfZJnL72qiFvY9ivhEIYjCGgfcLLb5tJ/EL9+Mcxernj6W3HVCv/cOfJYuwNUwvVVhnrKl8iT8aqA==",
-      "dev": true
-    },
-    "@types/braces": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@types/braces/-/braces-3.0.5.tgz",
-      "integrity": "sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w==",
-      "dev": true
-    },
-    "@types/caseless": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz",
-      "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg=="
-    },
-    "@types/chai": {
-      "version": "4.2.13",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.13.tgz",
-      "integrity": "sha512-o3SGYRlOpvLFpwJA6Sl1UPOwKFEvE4FxTEB/c9XHI2whdnd4kmPVkNLL8gY4vWGBxWWDumzLbKsAhEH5SKn37Q==",
-      "dev": true
-    },
-    "@types/clone": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@types/clone/-/clone-2.1.4.tgz",
-      "integrity": "sha512-NKRWaEGaVGVLnGLB2GazvDaZnyweW9FJLLFL5LhywGJB3aqGMT9R/EUoJoSRP4nzofYnZysuDmrEJtJdAqUOtQ==",
-      "dev": true
-    },
-    "@types/command-line-args": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@types/command-line-args/-/command-line-args-5.0.0.tgz",
-      "integrity": "sha512-4eOPXyn5DmP64MCMF8ePDvdlvlzt2a+F8ZaVjqmh2yFCpGjc1kI3kGnCFYX9SCsGTjQcWIyVZ86IHCEyjy/MNg==",
-      "dev": true
-    },
-    "@types/command-line-usage": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@types/command-line-usage/-/command-line-usage-5.0.1.tgz",
-      "integrity": "sha512-/xUgezxxYePeXhg5S04hUjxG9JZi+rJTs1+4NwpYPfSaS7BeDa6tVJkH6lN9Cb6rl8d24Fi2uX0s0Ngg2JT6gg==",
-      "dev": true
-    },
-    "@types/concat-stream": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz",
-      "integrity": "sha1-OU2+C7X+5Gs42JZzXoto7yOQ0A0=",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/debounce-promise": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@types/debounce-promise/-/debounce-promise-3.1.3.tgz",
-      "integrity": "sha512-mjcCf//DAUQ6YLQMhqYJAv/+a4BsE1GQFmy1el5K62wLJJmQwGi3TsnshhOFynPpuBF9Gh2Vvb+5ImPi47KaZw==",
-      "dev": true
-    },
-    "@types/form-data": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz",
-      "integrity": "sha1-yayFsqX9GENbjIXZ7LUObWyJP/g=",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/fs-extra": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.0.0.tgz",
-      "integrity": "sha512-bCtL5v9zdbQW86yexOlXWTEGvLNqWxMFyi7gQA7Gcthbezr2cPSOb8SkESVKA937QD5cIwOFLDFt0MQoXOEr9Q==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
-      "dev": true
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
-      "dev": true
-    },
-    "@types/lodash": {
-      "version": "4.17.10",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.10.tgz",
-      "integrity": "sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==",
-      "dev": true
-    },
-    "@types/lodash.isequal": {
-      "version": "4.5.8",
-      "resolved": "https://registry.npmjs.org/@types/lodash.isequal/-/lodash.isequal-4.5.8.tgz",
-      "integrity": "sha512-uput6pg4E/tj2LGxCZo9+y27JNyB2OZuuI/T5F+ylVDYuqICLG2/ktjxx0v6GvVntAf8TvEzeQLcV0ffRirXuA==",
-      "dev": true,
-      "requires": {
-        "@types/lodash": "*"
-      }
-    },
-    "@types/marked": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/marked/-/marked-4.0.3.tgz",
-      "integrity": "sha512-HnMWQkLJEf/PnxZIfbm0yGJRRZYYMhb++O9M36UCTA9z53uPvVoSlAwJr3XOpDEryb7Hwl1qAx/MV6YIW1RXxg==",
-      "dev": true
-    },
-    "@types/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-C/FMQ8HJAZhTsDpl4wDKZdMeeW5USjgzOczUwTGbRc1ZopPgOhIEnxY2ZgUrsuyy4DwK1JVOJZKFakv3TbCKiA==",
-      "dev": true,
-      "requires": {
-        "@types/braces": "*"
-      }
-    },
-    "@types/mocha": {
-      "version": "5.2.7",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz",
-      "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "16.18.126",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.126.tgz",
-      "integrity": "sha512-OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw=="
-    },
-    "@types/qs": {
-      "version": "6.9.5",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz",
-      "integrity": "sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==",
-      "dev": true
-    },
-    "@types/request": {
-      "version": "2.48.12",
-      "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.12.tgz",
-      "integrity": "sha512-G3sY+NpsA9jnwm0ixhAFQSJ3Q9JkpLZpJbI3GMv0mIAT0y3mRabYeINzal5WOChIiaTEGQYlHOKgkaM9EisWHw==",
-      "requires": {
-        "@types/caseless": "*",
-        "@types/node": "*",
-        "@types/tough-cookie": "*",
-        "form-data": "^2.5.0"
-      }
-    },
-    "@types/require-relative": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/@types/require-relative/-/require-relative-0.8.0.tgz",
-      "integrity": "sha512-3xDLWkeSGvkRmTWOhJS+WjqT7QT8oacisRorMQypA9Y3BSRnpzu0J0+YJUcNY4Kmg8vY+A4vAwc8qwM82k3cMA==",
-      "dev": true
-    },
-    "@types/safe-json-stringify": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@types/safe-json-stringify/-/safe-json-stringify-1.1.5.tgz",
-      "integrity": "sha512-wQ1unJoajjDOP7bkg7FHOYelVp6BSsuBIFSvifNKeiMHegXWa6vddoqM/dHTVkX8bn9fJcor4Hukff9AtFybcA==",
-      "dev": true
-    },
-    "@types/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==",
-      "dev": true
-    },
-    "@types/sinon": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-9.0.8.tgz",
-      "integrity": "sha512-IVnI820FZFMGI+u1R+2VdRaD/82YIQTdqLYC9DLPszZuynAJDtCvCtCs3bmyL66s7FqRM3+LPX7DhHnVTaagDw==",
-      "dev": true,
-      "requires": {
-        "@types/sinonjs__fake-timers": "*"
-      }
-    },
-    "@types/sinonjs__fake-timers": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz",
-      "integrity": "sha512-dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg==",
-      "dev": true
-    },
-    "@types/tough-cookie": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
-    },
-    "@types/turndown": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@types/turndown/-/turndown-5.0.1.tgz",
-      "integrity": "sha512-N8Ad4e3oJxh9n9BiZx9cbe/0M3kqDpOTm2wzj13wdDUxDPjfjloWIJaquZzWE1cYTAHpjOH3rcTnXQdpEfS/SQ==",
-      "dev": true
-    },
-    "@types/yargs": {
-      "version": "15.0.8",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.8.tgz",
-      "integrity": "sha512-b0BYzFUzBpOhPjpl1wtAHU994jBeKF4TKVlT7ssFv44T617XNcPdRoG4AzHLVshLzlrF7i3lTelH7UbuNYV58Q==",
-      "dev": true,
-      "requires": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "@types/yargs-parser": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
-      "dev": true
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.27.0.tgz",
-      "integrity": "sha512-DDrIA7GXtmHXr1VCcx9HivA39eprYBIFxbQEHI6NyraRDxCGpxAFiYQAT/1Y0vh1C+o2vfBiy4IuPoXxtTZCAQ==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.27.0",
-        "@typescript-eslint/type-utils": "5.27.0",
-        "@typescript-eslint/utils": "5.27.0",
-        "debug": "^4.3.4",
-        "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.2.0",
-        "regexpp": "^3.2.0",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz",
-      "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/scope-manager": "5.27.0",
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/typescript-estree": "5.27.0",
-        "debug": "^4.3.4"
-      },
-      "dependencies": {
-        "@typescript-eslint/types": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
-          "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
-          "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "@typescript-eslint/visitor-keys": "5.27.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
-          "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/scope-manager": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz",
-      "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/visitor-keys": "5.27.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/types": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
-          "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
-          "dev": true
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
-          "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/type-utils": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.27.0.tgz",
-      "integrity": "sha512-vpTvRRchaf628Hb/Xzfek+85o//zEUotr1SmexKvTfs7czXfYjXVT/a5yDbpzLBX1rhbqxjDdr1Gyo0x1Fc64g==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/utils": "5.27.0",
-        "debug": "^4.3.4",
-        "tsutils": "^3.21.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
-    "@typescript-eslint/types": {
-      "version": "4.33.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.33.0.tgz",
-      "integrity": "sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ==",
-      "dev": true
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "4.33.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.33.0.tgz",
-      "integrity": "sha512-rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "4.33.0",
-        "@typescript-eslint/visitor-keys": "4.33.0",
-        "debug": "^4.3.1",
-        "globby": "^11.0.3",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
-      }
-    },
-    "@typescript-eslint/utils": {
-      "version": "5.27.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.27.0.tgz",
-      "integrity": "sha512-nZvCrkIJppym7cIbP3pOwIkAefXOmfGPnCM0LQfzNaKxJHI6VjI8NC662uoiPlaf5f6ymkTy9C3NQXev2mdXmA==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.9",
-        "@typescript-eslint/scope-manager": "5.27.0",
-        "@typescript-eslint/types": "5.27.0",
-        "@typescript-eslint/typescript-estree": "5.27.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "@typescript-eslint/types": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz",
-          "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==",
-          "dev": true
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz",
-          "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "@typescript-eslint/visitor-keys": "5.27.0",
-            "debug": "^4.3.4",
-            "globby": "^11.1.0",
-            "is-glob": "^4.0.3",
-            "semver": "^7.3.7",
-            "tsutils": "^3.21.0"
-          }
-        },
-        "@typescript-eslint/visitor-keys": {
-          "version": "5.27.0",
-          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz",
-          "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/types": "5.27.0",
-            "eslint-visitor-keys": "^3.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "eslint-scope": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-          "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.3.0",
-            "estraverse": "^4.1.1"
-          }
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-          "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-          "dev": true
-        }
-      }
-    },
-    "@typescript-eslint/visitor-keys": {
-      "version": "4.33.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.33.0.tgz",
-      "integrity": "sha512-uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "4.33.0",
-        "eslint-visitor-keys": "^2.0.0"
-      }
-    },
-    "@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
-    "@xml-tools/parser": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@xml-tools/parser/-/parser-1.0.7.tgz",
-      "integrity": "sha512-mdjG4dWj4zaubxWAgr0YMNkZr182aHek5xrpDqgITNnGf+E8FhvAmCU95QiL9+pGjqK8Qfd+qnuer9f8KELRyQ==",
-      "requires": {
-        "chevrotain": "7.0.1"
-      }
-    },
-    "acorn": {
-      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
-      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true,
-      "requires": {}
-    },
-    "acorn-walk": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
-      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
-      "dev": true
-    },
-    "aggregate-error": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-      "dev": true,
-      "requires": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
-      }
-    },
-    "ajv": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz",
-      "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^3.1.3",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.4.1"
-      }
-    },
-    "ansi-colors": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "requires": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      }
-    },
-    "app-module-path": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/app-module-path/-/app-module-path-2.2.0.tgz",
-      "integrity": "sha1-ZBqlXft9am8KgUHEucCqULbCTdU=",
-      "dev": true
-    },
-    "append-transform": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
-      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
-      "dev": true,
-      "requires": {
-        "default-require-extensions": "^3.0.0"
-      }
-    },
-    "arch": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
-      "dev": true
-    },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
-      }
-    },
-    "array-flat-polyfill": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz",
-      "integrity": "sha512-hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw=="
-    },
-    "array-includes": {
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
-      "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.4",
-        "is-string": "^1.0.7"
-      }
-    },
-    "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
-    },
-    "array.prototype.findlastindex": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz",
-      "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-shim-unscopables": "^1.0.2"
-      }
-    },
-    "array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
-    "arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
-      }
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-      "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="
-    },
-    "assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
-      "dev": true
-    },
-    "ast-module-types": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.7.1.tgz",
-      "integrity": "sha512-Rnnx/4Dus6fn7fTqdeLEAn5vUll5w7/vts0RN608yFa6si/rDOUonlIIiwugHBFWjylHjxm9owoSZn71KwG4gw==",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
-    },
-    "available-typed-arrays": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
-      "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-      "dev": true,
-      "requires": {
-        "possible-typed-array-names": "^1.0.0"
-      }
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="
-    },
-    "aws4": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.2.tgz",
-      "integrity": "sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw=="
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "benchmark": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-2.1.4.tgz",
-      "integrity": "sha512-l9MlfN4M1K/H2fbhfMy3B7vJd6AGKJVQn2h6Sg/Yx+KckoUA7ewS5Vv6TjSq18ooE1kS9hhAlQRH3AkXIh/aOQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.4",
-        "platform": "^1.3.3"
-      }
-    },
-    "binary-extensions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="
-    },
-    "bluebird": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz",
-      "integrity": "sha512-UfFSr22dmHPQqPP9XWHRhq+gWnHCYguQGkXQlbyPtW5qTnhFWA8/iXg765tH0cAjy7l/zPJ1aBTO0g5XgA7kvQ=="
-    },
-    "boolbase": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-      "dev": true
-    },
-    "brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "requires": {
-        "fill-range": "^7.1.1"
-      }
-    },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
-    "browserslist": {
-      "version": "4.16.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz",
-      "integrity": "sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==",
-      "dev": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001219",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.723",
-        "escalade": "^3.1.1",
-        "node-releases": "^1.1.71"
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dev": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "caching-transform": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
-      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
-      "dev": true,
-      "requires": {
-        "hasha": "^5.0.0",
-        "make-dir": "^3.0.0",
-        "package-hash": "^4.0.0",
-        "write-file-atomic": "^3.0.0"
-      }
-    },
-    "call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
-      "dev": true,
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
-    },
-    "caniuse-lite": {
-      "version": "1.0.30001791",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001791.tgz",
-      "integrity": "sha512-yk0l/YSrOnFZk3UROpDLQD9+kC1l4meK/wed583AXrzoarMGJcbRi2Q4RaUYbKxYAsZ8sWmaSa/DsLmdBeI1vQ==",
-      "dev": true
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
-    },
-    "centra": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/centra/-/centra-2.7.0.tgz",
-      "integrity": "sha512-PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg==",
-      "dev": true,
-      "requires": {
-        "follow-redirects": "^1.15.6"
-      }
-    },
-    "chai": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.2",
-        "deep-eql": "^3.0.1",
-        "get-func-name": "^2.0.0",
-        "pathval": "^1.1.0",
-        "type-detect": "^4.0.5"
-      }
-    },
-    "chai-files": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/chai-files/-/chai-files-1.4.0.tgz",
-      "integrity": "sha1-DiVhD63FUbHq55wvTuefry+EIpY=",
-      "dev": true,
-      "requires": {
-        "assertion-error": "^1.0.1"
-      }
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "check-eol": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/check-eol/-/check-eol-0.2.0.tgz",
-      "integrity": "sha512-xzrjvr8lmIAUiQ7AkeIMdjmvaZ63SWV7pbYOiVddrPVHzpOpuoCi4SbG1JRLiOz+Tx51TeY/GpfKL8GIc6JbMA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "fast-glob": "^3.3.3",
-        "picomatch": "^2.2.3",
-        "yargs": "^16.2.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "check-error": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
-      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
-      "dev": true
-    },
-    "chevrotain": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-7.0.1.tgz",
-      "integrity": "sha512-B/44jrdw5GAzy483LEeVSgXSX0qOYM8lUd3l5+yf6Vl6OQjEUCm2BUiYbHRCIK6xCEvCLAFe1kj8uyV6+zdaVw==",
-      "requires": {
-        "regexp-to-ast": "0.5.0"
-      }
-    },
-    "chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "requires": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "fsevents": "~2.3.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      }
-    },
-    "clean-stack": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-      "dev": true
-    },
-    "clear": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/clear/-/clear-0.1.0.tgz",
-      "integrity": "sha512-qMjRnoL+JDPJHeLePZJuao6+8orzHMGP04A8CdwCNsKhRbOnKRjefxONR7bwILT3MHecxKBjHkKL/tkZ8r4Uzw=="
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-spinners": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
-      "dev": true
-    },
-    "clipboardy": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
-      "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==",
-      "dev": true,
-      "requires": {
-        "arch": "^2.1.1",
-        "execa": "^1.0.0",
-        "is-wsl": "^2.1.1"
-      }
-    },
-    "cliui": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "dev": true
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-      "dev": true
-    },
-    "commandpost": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
-      "integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
-      "dev": true
-    },
-    "comment-parser": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz",
-      "integrity": "sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==",
-      "dev": true
-    },
-    "commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
-      }
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "coveralls-next": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/coveralls-next/-/coveralls-next-4.2.0.tgz",
-      "integrity": "sha512-zg41a/4QDSASPtlV6gp+6owoU43U5CguxuPZR3nPZ26M5ZYdEK3MdUe7HwE+AnCZPkucudfhqqJZehCNkz2rYg==",
-      "dev": true,
-      "requires": {
-        "form-data": "4.0.0",
-        "js-yaml": "4.1.0",
-        "lcov-parse": "1.0.0",
-        "log-driver": "1.2.7",
-        "minimist": "1.2.7"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-          "dev": true,
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        }
-      }
-    },
-    "create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "cross-platform-clear-console": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cross-platform-clear-console/-/cross-platform-clear-console-2.3.0.tgz",
-      "integrity": "sha512-To+sJ6plHHC6k5DfdvSVn6F1GRGJh/R6p76bCpLbyMyHEmbqFyuMAeGwDcz/nGDWH3HUcjFTTX9iUSCzCg9Eiw=="
-    },
-    "cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      }
-    },
-    "css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      }
-    },
-    "css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "dev": true
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      }
-    },
-    "data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      }
-    },
-    "data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      }
-    },
-    "date-fns": {
-      "version": "2.30.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-      "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-      "requires": {
-        "@babel/runtime": "^7.21.0"
-      }
-    },
-    "dateformat": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="
-    },
-    "dayjs": {
-      "version": "1.11.13",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
-    },
-    "debounce-promise": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/debounce-promise/-/debounce-promise-3.1.2.tgz",
-      "integrity": "sha512-rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg=="
-    },
-    "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "deep-eql": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
-      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
-      "dev": true,
-      "requires": {
-        "type-detect": "^4.0.0"
-      }
-    },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "deepmerge": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-      "dev": true
-    },
-    "default-require-extensions": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.0.tgz",
-      "integrity": "sha512-ek6DpXq/SCpvjhpFsLFRVtIxJCRw6fUR42lYMVZuUMK7n8eMz4Uh5clckdBjEpLhn/gEBZo7hDJnJcwdKLKQjg==",
-      "dev": true,
-      "requires": {
-        "strip-bom": "^4.0.0"
-      }
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dev": true,
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
-      "requires": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      }
-    },
-    "define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
-      "requires": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
-    },
-    "dependency-tree": {
-      "version": "8.1.2",
-      "resolved": "https://registry.npmjs.org/dependency-tree/-/dependency-tree-8.1.2.tgz",
-      "integrity": "sha512-c4CL1IKxkKng0oT5xrg4uNiiMVFqTGOXqHSFx7XEFdgSsp6nw3AGGruICppzJUrfad/r7GLqt26rmWU4h4j39A==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.3",
-        "debug": "^4.3.1",
-        "filing-cabinet": "^3.0.1",
-        "precinct": "^8.0.0",
-        "typescript": "^3.9.7"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "precinct": {
-          "version": "8.3.1",
-          "resolved": "https://registry.npmjs.org/precinct/-/precinct-8.3.1.tgz",
-          "integrity": "sha512-pVppfMWLp2wF68rwHqBIpPBYY8Kd12lDhk8LVQzOwqllifVR15qNFyod43YLyFpurKRZQKnE7E4pofAagDOm2Q==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.3",
-            "debug": "^4.3.3",
-            "detective-amd": "^3.1.0",
-            "detective-cjs": "^3.1.1",
-            "detective-es6": "^2.2.1",
-            "detective-less": "^1.0.2",
-            "detective-postcss": "^4.0.0",
-            "detective-sass": "^3.0.1",
-            "detective-scss": "^2.0.1",
-            "detective-stylus": "^1.0.0",
-            "detective-typescript": "^7.0.0",
-            "module-definition": "^3.3.1",
-            "node-source-walk": "^4.2.0"
-          }
-        },
-        "typescript": {
-          "version": "3.9.10",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-          "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-          "dev": true
-        }
-      }
-    },
-    "detective-amd": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detective-amd/-/detective-amd-3.1.0.tgz",
-      "integrity": "sha512-G7wGWT6f0VErjUkE2utCm7IUshT7nBh7aBBH2VBOiY9Dqy2DMens5iiOvYCuhstoIxRKLrnOvVAz4/EyPIAjnw==",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "^2.7.0",
-        "escodegen": "^2.0.0",
-        "get-amd-module-type": "^3.0.0",
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "detective-cjs": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz",
-      "integrity": "sha512-JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg==",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "^2.4.0",
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "detective-es6": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/detective-es6/-/detective-es6-2.2.2.tgz",
-      "integrity": "sha512-eZUKCUsbHm8xoeoCM0z6JFwvDfJ5Ww5HANo+jPR7AzkFpW9Mun3t/TqIF2jjeWa2TFbAiGaWESykf2OQp3oeMw==",
-      "dev": true,
-      "requires": {
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "detective-less": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz",
-      "integrity": "sha512-Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.0.0",
-        "gonzales-pe": "^4.2.3",
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "detective-postcss": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detective-postcss/-/detective-postcss-4.0.0.tgz",
-      "integrity": "sha512-Fwc/g9VcrowODIAeKRWZfVA/EufxYL7XfuqJQFroBKGikKX83d2G7NFw6kDlSYGG3LNQIyVa+eWv1mqre+v4+A==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "is-url": "^1.2.4",
-        "postcss": "^8.1.7",
-        "postcss-values-parser": "^2.0.1"
-      }
-    },
-    "detective-sass": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz",
-      "integrity": "sha512-oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "gonzales-pe": "^4.2.3",
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "detective-scss": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz",
-      "integrity": "sha512-VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "gonzales-pe": "^4.2.3",
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "detective-stylus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz",
-      "integrity": "sha1-UK7n24uruZA4HwEMY/q7pbWOVM0=",
-      "dev": true
-    },
-    "detective-typescript": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-7.0.0.tgz",
-      "integrity": "sha512-y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/typescript-estree": "^4.8.2",
-        "ast-module-types": "^2.7.1",
-        "node-source-walk": "^4.2.0",
-        "typescript": "^3.9.7"
-      },
-      "dependencies": {
-        "typescript": {
-          "version": "3.9.10",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-          "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-          "dev": true
-        }
-      }
-    },
-    "diff": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz",
-      "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==",
-      "dev": true
-    },
-    "dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "requires": {
-        "path-type": "^4.0.0"
-      }
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "entities": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.2.0"
-      }
-    },
-    "domino": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz",
-      "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==",
-      "dev": true
-    },
-    "domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "editorconfig": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
-      "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.19.0",
-        "lru-cache": "^4.1.5",
-        "semver": "^5.6.0",
-        "sigmund": "^1.0.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
-        }
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.3.741",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.741.tgz",
-      "integrity": "sha512-4i3T0cwnHo1O4Mnp9JniEco8bZiXoqbm3PhW5hv7uu8YLg35iajYrRnNyKFaN8/8SSTskU2hYqVTeYVPceSpUA==",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "enhanced-resolve": {
-      "version": "5.17.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz",
-      "integrity": "sha512-dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      }
-    },
-    "es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
-      "dev": true,
-      "requires": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
-      }
-    },
-    "es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.4"
-      }
-    },
-    "es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "dev": true
-    },
-    "es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
-      "dev": true,
-      "requires": {
-        "es-errors": "^1.3.0"
-      }
-    },
-    "es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.2.4",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
-      }
-    },
-    "es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
-      "dev": true,
-      "requires": {
-        "hasown": "^2.0.0"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "es6-error": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-      "dev": true
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "escodegen": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
-      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "levn": {
-          "version": "0.3.0",
-          "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-          "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2"
-          }
-        },
-        "optionator": {
-          "version": "0.8.3",
-          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-          "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-          "dev": true,
-          "requires": {
-            "deep-is": "~0.1.3",
-            "fast-levenshtein": "~2.0.6",
-            "levn": "~0.3.0",
-            "prelude-ls": "~1.1.2",
-            "type-check": "~0.3.2",
-            "word-wrap": "~1.2.3"
-          }
-        },
-        "prelude-ls": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-          "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
-        },
-        "type-check": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-          "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-          "dev": true,
-          "requires": {
-            "prelude-ls": "~1.1.2"
-          }
-        }
-      }
-    },
-    "eslint": {
-      "version": "8.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.16.0.tgz",
-      "integrity": "sha512-MBndsoXY/PeVTDJeWsYj7kLZ5hQpJOfMYLsF6LicLHQWbRDG19lK5jOix4DPl8yY4SUFcE3txy86OzFLWT+yoA==",
-      "dev": true,
-      "requires": {
-        "@eslint/eslintrc": "^1.3.0",
-        "@humanwhocodes/config-array": "^0.9.2",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.1.1",
-        "eslint-utils": "^3.0.0",
-        "eslint-visitor-keys": "^3.3.0",
-        "espree": "^9.3.2",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^6.0.1",
-        "globals": "^13.15.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^4.1.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "regexpp": "^3.2.0",
-        "strip-ansi": "^6.0.1",
-        "strip-json-comments": "^3.1.0",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        },
-        "glob-parent": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-          "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.3"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-import-resolver-typescript": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz",
-      "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.3.4",
-        "enhanced-resolve": "^5.12.0",
-        "eslint-module-utils": "^2.7.4",
-        "fast-glob": "^3.3.1",
-        "get-tsconfig": "^4.5.0",
-        "is-core-module": "^2.11.0",
-        "is-glob": "^4.0.3"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.5",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-          "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz",
-      "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.7"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
-      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.15.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "doctrine": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-          "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2"
-          }
-        },
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-jsdoc": {
-      "version": "39.3.6",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-39.3.6.tgz",
-      "integrity": "sha512-R6dZ4t83qPdMhIOGr7g2QII2pwCjYyKP+z0tPOfO1bbAbQyKC20Y2Rd6z1te86Lq3T7uM8bNo+VD9YFpE8HU/g==",
-      "dev": true,
-      "requires": {
-        "@es-joy/jsdoccomment": "~0.31.0",
-        "comment-parser": "1.3.1",
-        "debug": "^4.3.4",
-        "escape-string-regexp": "^4.0.0",
-        "esquery": "^1.4.0",
-        "semver": "^7.3.7",
-        "spdx-expression-parse": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-          "dev": true,
-          "requires": {
-            "ms": "2.1.2"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-no-only-tests": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-2.6.0.tgz",
-      "integrity": "sha512-T9SmE/g6UV1uZo1oHAqOvL86XWl7Pl2EpRpnLI8g/bkJu+h7XBCB+1LnubRZ2CUQXj805vh4/CYZdnqtVaEo2Q==",
-      "dev": true
-    },
-    "eslint-scope": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
-      "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
-      }
-    },
-    "eslint-utils": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
-      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^2.0.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
-      "dev": true
-    },
-    "espree": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.3.2.tgz",
-      "integrity": "sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==",
-      "dev": true,
-      "requires": {
-        "acorn": "^8.7.1",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "dependencies": {
-        "eslint-visitor-keys": {
-          "version": "3.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz",
-          "integrity": "sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==",
-          "dev": true
-        }
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.1.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^5.2.0"
-      }
-    },
-    "estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-          "dev": true
-        },
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.2",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-          "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^1.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-          "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-          "dev": true
-        },
-        "which": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="
-    },
-    "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-      "requires": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
-      }
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fastq": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
-      "requires": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^3.0.4"
-      }
-    },
-    "file-url": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/file-url/-/file-url-3.0.0.tgz",
-      "integrity": "sha512-g872QGsHexznxkIAdK8UiZRe7SkE6kvylShU4Nsj8NvfvZag7S0QuQ4IgvPDkk75HxgjIVDwycFTDAgIiO4nDA=="
-    },
-    "filing-cabinet": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/filing-cabinet/-/filing-cabinet-3.3.1.tgz",
-      "integrity": "sha512-renEK4Hh6DUl9Vl22Y3cxBq1yh8oNvbAdXnhih0wVpmea+uyKjC9K4QeRjUaybIiIewdzfum+Fg15ZqJ/GyCaA==",
-      "dev": true,
-      "requires": {
-        "app-module-path": "^2.2.0",
-        "commander": "^2.20.3",
-        "debug": "^4.3.3",
-        "enhanced-resolve": "^5.8.3",
-        "is-relative-path": "^1.0.2",
-        "module-definition": "^3.3.1",
-        "module-lookup-amd": "^7.0.1",
-        "resolve": "^1.21.0",
-        "resolve-dependency-path": "^2.0.0",
-        "sass-lookup": "^3.0.0",
-        "stylus-lookup": "^3.0.1",
-        "tsconfig-paths": "^3.10.1",
-        "typescript": "^3.9.7"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "typescript": {
-          "version": "3.9.10",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-          "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-          "dev": true
-        }
-      }
-    },
-    "fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "requires": {
-        "to-regex-range": "^5.0.1"
-      }
-    },
-    "find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      }
-    },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "flat": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz",
-      "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==",
-      "dev": true
-    },
-    "flat-cache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
-      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
-      "requires": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatted": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz",
-      "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==",
-      "dev": true
-    },
-    "flatten": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
-      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
-      "dev": true
-    },
-    "follow-redirects": {
-      "version": "1.16.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
-      "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==",
-      "dev": true
-    },
-    "for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.3"
-      }
-    },
-    "foreground-child": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
-      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="
-    },
-    "form-data": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.2.tgz",
-      "integrity": "sha512-GgwY0PS7DbXqajuGf4OYlsrIu3zgxD6Vvql43IBhm6MahqA5SK/7mwhtNj2AdH2z35YR34ujJ7BN+3fFC3jP5Q==",
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12",
-        "safe-buffer": "^5.2.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        }
-      }
-    },
-    "fromentries": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
-      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
-      "dev": true
-    },
-    "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "requires": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "optional": true
-    },
-    "function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true
-    },
-    "function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
-      }
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true
-    },
-    "gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
-    },
-    "get-amd-module-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz",
-      "integrity": "sha512-99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw==",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "^2.3.2",
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
-    },
-    "get-func-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
-      "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
-      "dev": true
-    },
-    "get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
-      "dev": true,
-      "requires": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
-      }
-    },
-    "get-own-enumerable-property-symbols": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
-      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
-      "dev": true
-    },
-    "get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true
-    },
-    "get-port": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.5",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
-      }
-    },
-    "get-tsconfig": {
-      "version": "4.7.5",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz",
-      "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==",
-      "dev": true,
-      "requires": {
-        "resolve-pkg-maps": "^1.0.0"
-      }
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "globals": {
-      "version": "13.15.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz",
-      "integrity": "sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.20.2"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.20.2",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
-        }
-      }
-    },
-    "globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      }
-    },
-    "globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "requires": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      }
-    },
-    "gonzales-pe": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
-      "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dev": true,
-      "requires": {
-        "get-intrinsic": "^1.1.3"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "graphviz": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/graphviz/-/graphviz-0.0.9.tgz",
-      "integrity": "sha512-SmoY2pOtcikmMCqCSy2NO1YsRfu9OO0wpTlOYW++giGjfX1a6gax/m1Fo8IdUd0/3H15cTOfR1SMKwohj4LKsg==",
-      "dev": true,
-      "requires": {
-        "temp": "~0.4.0"
-      }
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-    },
-    "has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dev": true,
-      "requires": {
-        "es-define-property": "^1.0.0"
-      }
-    },
-    "has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-      "dev": true
-    },
-    "has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.3"
-      }
-    },
-    "hasha": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
-      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
-      "dev": true,
-      "requires": {
-        "is-stream": "^2.0.0",
-        "type-fest": "^0.8.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-          "dev": true
-        }
-      }
-    },
-    "hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.2"
-      }
-    },
-    "he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "dev": true
-    },
-    "html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
-    },
-    "http-basic": {
-      "version": "8.1.3",
-      "resolved": "https://registry.npmjs.org/http-basic/-/http-basic-8.1.3.tgz",
-      "integrity": "sha512-/EcDMwJZh3mABI2NhGfHOGOeOZITqfkEO4p/xK+l3NpyncIHUQBoMvCSF/b5GqvKtySC2srL/GGG3+EtlqlmCw==",
-      "dev": true,
-      "requires": {
-        "caseless": "^0.12.0",
-        "concat-stream": "^1.6.2",
-        "http-response-object": "^3.0.1",
-        "parse-cache-control": "^1.0.1"
-      }
-    },
-    "http-response-object": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz",
-      "integrity": "sha512-bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA==",
-      "dev": true,
-      "requires": {
-        "@types/node": "^10.0.3"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "10.17.40",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.40.tgz",
-          "integrity": "sha512-3hZT2z2/531A5pc8hYhn1gU5Qb1SIRSgMLQ6zuHA5xtt16lWAxUGprtr8lJuc9zNJMXEIIBWfSnzqBP/4mglpA==",
-          "dev": true
-        }
-      }
-    },
-    "http-signature": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz",
-      "integrity": "sha512-G5akfn7eKbpDN+8nPS/cb57YeA1jLTVxjpCj7tmm3QKPdyDy7T+qSC40e9ptydSWvkwjSXw1VbkpyEm39ukeAg==",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^2.0.2",
-        "sshpk": "^1.18.0"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true
-    },
-    "ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw=="
-    },
-    "immediate": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
-    },
-    "import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
-      "dev": true,
-      "requires": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
-      }
-    },
-    "is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
-      }
-    },
-    "is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
-      "dev": true,
-      "requires": {
-        "has-bigints": "^1.0.1"
-      }
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true
-    },
-    "is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-      "dev": true,
-      "requires": {
-        "hasown": "^2.0.0"
-      }
-    },
-    "is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
-      "dev": true,
-      "requires": {
-        "is-typed-array": "^1.1.13"
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true
-    },
-    "is-negative-zero": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
-    },
-    "is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
-      "dev": true
-    },
-    "is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
-      "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=",
-      "dev": true
-    },
-    "is-relative-path": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-relative-path/-/is-relative-path-1.0.2.tgz",
-      "integrity": "sha1-CRtGoNZ8HtD+hfH4z93gBrslHUY=",
-      "dev": true
-    },
-    "is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7"
-      }
-    },
-    "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
-      "dev": true,
-      "requires": {
-        "has-tostringtag": "^1.0.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.2"
-      }
-    },
-    "is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
-      "dev": true,
-      "requires": {
-        "which-typed-array": "^1.1.14"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
-    },
-    "is-url": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
-      "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==",
-      "dev": true
-    },
-    "is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2"
-      }
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="
-    },
-    "istanbul-lib-coverage": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-      "dev": true
-    },
-    "istanbul-lib-hook": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
-      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
-      "dev": true,
-      "requires": {
-        "append-transform": "^2.0.0"
-      }
-    },
-    "istanbul-lib-instrument": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.7.5",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.0.0",
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-lib-processinfo": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.2.tgz",
-      "integrity": "sha512-kOwpa7z9hme+IBPZMzQ5vdQj8srYgAtaRqeI48NGmAQ+/5yKiHLV0QbYqQpxsdEF0+w14SoB8YbnHKcXE2KnYw==",
-      "dev": true,
-      "requires": {
-        "archy": "^1.0.0",
-        "cross-spawn": "^7.0.0",
-        "istanbul-lib-coverage": "^3.0.0-alpha.1",
-        "make-dir": "^3.0.0",
-        "p-map": "^3.0.0",
-        "rimraf": "^3.0.0",
-        "uuid": "^3.3.3"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
-      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
-      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
-      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
-      "dev": true,
-      "requires": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-      "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="
-    },
-    "jsdoc-type-pratt-parser": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-3.1.0.tgz",
-      "integrity": "sha512-MgtD0ZiCDk9B+eI73BextfRrVQl0oyzRG8B2BjORts6jbunj4ScKPcyXGTbB6eXL4y9TzxCm6hyeLq/2ASzNdw==",
-      "dev": true
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="
-    },
-    "json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
-    },
-    "jsonc-parser": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-2.3.1.tgz",
-      "integrity": "sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg=="
-    },
-    "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsprim": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
-      "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.4.0",
-        "verror": "1.10.0"
-      }
-    },
-    "jszip": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz",
-      "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==",
-      "requires": {
-        "lie": "~3.3.0",
-        "pako": "~1.0.2",
-        "readable-stream": "~2.3.6",
-        "setimmediate": "^1.0.5"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.8",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        }
-      }
-    },
-    "just-extend": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-4.1.1.tgz",
-      "integrity": "sha512-aWgeGFW67BP3e5181Ep1Fv2v8z//iBJfrvyTnq8wG86vEESwmonn1zPBJ0VfmT9CJq2FIT0VsETtrNFm2a+SHA==",
-      "dev": true
-    },
-    "lcov-parse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-1.0.0.tgz",
-      "integrity": "sha1-6w1GtUER68VhrLTECO+TY73I9+A=",
-      "dev": true
-    },
-    "levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      }
-    },
-    "lie": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
-      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
-      "requires": {
-        "immediate": "~3.0.5"
-      }
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "lodash": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz",
-      "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q=="
-    },
-    "lodash.flattendeep": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=",
-      "dev": true
-    },
-    "lodash.get": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
-    },
-    "lodash.isequal": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
-    },
-    "lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "log-driver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
-      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "long": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-3.2.0.tgz",
-      "integrity": "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s="
-    },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "luxon": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz",
-      "integrity": "sha512-Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA=="
-    },
-    "madge": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/madge/-/madge-4.0.2.tgz",
-      "integrity": "sha512-l5bnA2dvyk0azLKDbOTCI+wDZ6nB007PhvPdmiYlPmqwVi49JPbhQrH/t4u8E6Akp3gwji1GZuA+v/F5q6yoWQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "commander": "^6.2.1",
-        "commondir": "^1.0.1",
-        "debug": "^4.0.1",
-        "dependency-tree": "^8.0.0",
-        "detective-amd": "^3.0.1",
-        "detective-cjs": "^3.1.1",
-        "detective-es6": "^2.1.0",
-        "detective-less": "^1.0.2",
-        "detective-postcss": "^4.0.0",
-        "detective-sass": "^3.0.1",
-        "detective-scss": "^2.0.1",
-        "detective-stylus": "^1.0.0",
-        "detective-typescript": "^7.0.0",
-        "graphviz": "0.0.9",
-        "ora": "^5.1.0",
-        "pluralize": "^8.0.0",
-        "precinct": "^7.0.0",
-        "pretty-ms": "^7.0.0",
-        "rc": "^1.2.7",
-        "typescript": "^3.9.5",
-        "walkdir": "^0.4.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "typescript": {
-          "version": "3.9.10",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-          "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-          "dev": true
-        }
-      }
-    },
-    "make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "marked": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz",
-      "integrity": "sha512-hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ==",
-      "dev": true
-    },
-    "merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
-    },
-    "micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "requires": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      }
-    },
-    "mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
-    },
-    "mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "requires": {
-        "mime-db": "1.52.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
-      "dev": true
-    },
-    "mocha": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
-      "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
-      "dev": true,
-      "requires": {
-        "@ungap/promise-all-settled": "1.1.2",
-        "ansi-colors": "4.1.1",
-        "browser-stdout": "1.3.1",
-        "chokidar": "3.5.3",
-        "debug": "4.3.3",
-        "diff": "5.0.0",
-        "escape-string-regexp": "4.0.0",
-        "find-up": "5.0.0",
-        "glob": "7.2.0",
-        "growl": "1.10.5",
-        "he": "1.2.0",
-        "js-yaml": "4.1.0",
-        "log-symbols": "4.1.0",
-        "minimatch": "4.2.1",
-        "ms": "2.1.3",
-        "nanoid": "3.3.1",
-        "serialize-javascript": "6.0.0",
-        "strip-json-comments": "3.1.1",
-        "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.2.0",
-        "yargs": "16.2.0",
-        "yargs-parser": "20.2.4",
-        "yargs-unparser": "2.0.0"
-      },
-      "dependencies": {
-        "argparse": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-          "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-          "dev": true
-        },
-        "chokidar": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
-          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.2",
-            "braces": "~3.0.2",
-            "fsevents": "~2.3.2",
-            "glob-parent": "~5.1.2",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.6.0"
-          }
-        },
-        "escape-string-regexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-          "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^6.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "js-yaml": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-          "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-          "dev": true,
-          "requires": {
-            "argparse": "^2.0.1"
-          }
-        },
-        "locate-path": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-          "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^5.0.0"
-          }
-        },
-        "minimatch": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
-          "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-          "dev": true,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-          "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^3.0.2"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.4",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
-          "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
-          "dev": true
-        }
-      }
-    },
-    "module-definition": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/module-definition/-/module-definition-3.3.1.tgz",
-      "integrity": "sha512-kLidGPwQ2yq484nSD+D3JoJp4Etc0Ox9P0L34Pu/cU4X4HcG7k7p62XI5BBuvURWMRX3RPyuhOcBHbKus+UH4A==",
-      "dev": true,
-      "requires": {
-        "ast-module-types": "^2.7.1",
-        "node-source-walk": "^4.0.0"
-      }
-    },
-    "module-lookup-amd": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/module-lookup-amd/-/module-lookup-amd-7.0.1.tgz",
-      "integrity": "sha512-w9mCNlj0S8qviuHzpakaLVc+/7q50jl9a/kmJ/n8bmXQZgDPkQHnPBb8MUOYh3WpAYkXuNc2c+khsozhIp/amQ==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.8.1",
-        "debug": "^4.1.0",
-        "glob": "^7.1.6",
-        "requirejs": "^2.3.5",
-        "requirejs-config-file": "^4.0.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        }
-      }
-    },
-    "moment": {
-      "version": "2.29.4",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz",
-      "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
-      "dev": true
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "nise": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/nise/-/nise-4.0.4.tgz",
-      "integrity": "sha512-bTTRUNlemx6deJa+ZyoCUTRvH3liK5+N6VQZ4NIw90AgDXY6iPnsqplNFf6STcj+ePk0H/xqxnP75Lr0J0Fq3A==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1.7.0",
-        "@sinonjs/fake-timers": "^6.0.0",
-        "@sinonjs/text-encoding": "^0.7.1",
-        "just-extend": "^4.0.2",
-        "path-to-regexp": "^1.7.0"
-      }
-    },
-    "node-html-markdown": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/node-html-markdown/-/node-html-markdown-1.2.0.tgz",
-      "integrity": "sha512-mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A==",
-      "dev": true,
-      "requires": {
-        "node-html-parser": "^5.3.3"
-      }
-    },
-    "node-html-parser": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz",
-      "integrity": "sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==",
-      "dev": true,
-      "requires": {
-        "css-select": "^4.2.1",
-        "he": "1.2.0"
-      }
-    },
-    "node-preload": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
-      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
-      "dev": true,
-      "requires": {
-        "process-on-spawn": "^1.0.0"
-      }
-    },
-    "node-releases": {
-      "version": "1.1.72",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.72.tgz",
-      "integrity": "sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==",
-      "dev": true
-    },
-    "node-run-cmd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/node-run-cmd/-/node-run-cmd-1.0.1.tgz",
-      "integrity": "sha1-F1XBJiS9/5INj0UkLWZC4hSj1AA=",
-      "dev": true
-    },
-    "node-source-walk": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz",
-      "integrity": "sha512-hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.0.0"
-      }
-    },
-    "normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
-      "dev": true,
-      "requires": {
-        "path-key": "^2.0.0"
-      },
-      "dependencies": {
-        "path-key": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-          "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-          "dev": true
-        }
-      }
-    },
-    "nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0"
-      }
-    },
-    "nyc": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
-      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
-      "dev": true,
-      "requires": {
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "caching-transform": "^4.0.0",
-        "convert-source-map": "^1.7.0",
-        "decamelize": "^1.2.0",
-        "find-cache-dir": "^3.2.0",
-        "find-up": "^4.1.0",
-        "foreground-child": "^2.0.0",
-        "get-package-type": "^0.1.0",
-        "glob": "^7.1.6",
-        "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-hook": "^3.0.0",
-        "istanbul-lib-instrument": "^4.0.0",
-        "istanbul-lib-processinfo": "^2.0.2",
-        "istanbul-lib-report": "^3.0.0",
-        "istanbul-lib-source-maps": "^4.0.0",
-        "istanbul-reports": "^3.0.2",
-        "make-dir": "^3.0.0",
-        "node-preload": "^0.2.1",
-        "p-map": "^3.0.0",
-        "process-on-spawn": "^1.0.0",
-        "resolve-from": "^5.0.0",
-        "rimraf": "^3.0.0",
-        "signal-exit": "^3.0.2",
-        "spawn-wrap": "^2.0.0",
-        "test-exclude": "^6.0.0",
-        "yargs": "^15.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "resolve-from": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "y18n": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-          "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "15.4.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-          "dev": true,
-          "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
-    },
-    "object-inspect": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz",
-      "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.5",
-        "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
-      }
-    },
-    "object.fromentries": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
-      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      }
-    },
-    "object.groupby": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz",
-      "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "object.values": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
-      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "optionator": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
-      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
-      "requires": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.3"
-      }
-    },
-    "ora": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz",
-      "integrity": "sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==",
-      "dev": true,
-      "requires": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "bl": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-          "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-          "dev": true,
-          "requires": {
-            "buffer": "^5.5.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-      "requires": {
-        "p-try": "^1.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.2.0"
-      },
-      "dependencies": {
-        "p-limit": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        }
-      }
-    },
-    "p-map": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
-      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
-      "dev": true,
-      "requires": {
-        "aggregate-error": "^3.0.0"
-      }
-    },
-    "p-reflect": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-reflect/-/p-reflect-1.0.0.tgz",
-      "integrity": "sha1-9Poe4btUbY6z7AMhFI3+CnkTe7g="
-    },
-    "p-settle": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-settle/-/p-settle-2.1.0.tgz",
-      "integrity": "sha512-NHFIUYc+fQTFRrzzAugq0l1drwi57PB522smetcY8C/EoTYs6cU/fC6TJj0N3rq5NhhJJbhf0VGWziL3jZDnjA==",
-      "requires": {
-        "p-limit": "^1.2.0",
-        "p-reflect": "^1.0.0"
-      }
-    },
-    "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
-    },
-    "package-hash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
-      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.15",
-        "hasha": "^5.0.0",
-        "lodash.flattendeep": "^4.4.0",
-        "release-zalgo": "^1.0.0"
-      }
-    },
-    "pako": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-cache-control": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz",
-      "integrity": "sha1-juqz5U+laSD+Fro493+iGqzC104=",
-      "dev": true
-    },
-    "parse-ms": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="
-    },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
-    },
-    "path-to-regexp": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.9.0.tgz",
-      "integrity": "sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==",
-      "dev": true,
-      "requires": {
-        "isarray": "0.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        }
-      }
-    },
-    "path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
-    },
-    "pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
-      "dev": true
-    },
-    "phin": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/phin/-/phin-3.7.1.tgz",
-      "integrity": "sha512-GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ==",
-      "dev": true,
-      "requires": {
-        "centra": "^2.7.0"
-      }
-    },
-    "picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="
-    },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      }
-    },
-    "platform": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz",
-      "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==",
-      "dev": true
-    },
-    "pluralize": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
-      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-      "dev": true
-    },
-    "possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
-      "dev": true
-    },
-    "postcss": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.10.tgz",
-      "integrity": "sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==",
-      "dev": true,
-      "requires": {
-        "nanoid": "^3.3.11",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "dependencies": {
-        "nanoid": {
-          "version": "3.3.11",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-          "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-values-parser": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
-      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
-      "dev": true,
-      "requires": {
-        "flatten": "^1.0.2",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1"
-      }
-    },
-    "postman-request": {
-      "version": "2.88.1-postman.42",
-      "resolved": "https://registry.npmjs.org/postman-request/-/postman-request-2.88.1-postman.42.tgz",
-      "integrity": "sha512-lepCE8QU0izagxxA31O/MHj8IUguwLlpqeVK7A8vHK401FPvN/PTIzWHm29c/L3j3kTUE7dhZbq8vvbyQ7S2Bw==",
-      "requires": {
-        "@postman/form-data": "~3.1.1",
-        "@postman/tough-cookie": "~4.1.3-postman.1",
-        "@postman/tunnel-agent": "^0.6.4",
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.12.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "http-signature": "~1.4.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "^2.1.35",
-        "oauth-sign": "~0.9.0",
-        "qs": "~6.5.3",
-        "safe-buffer": "^5.1.2",
-        "stream-length": "^1.0.2",
-        "uuid": "^8.3.2"
-      },
-      "dependencies": {
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
-        }
-      }
-    },
-    "precinct": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/precinct/-/precinct-7.1.0.tgz",
-      "integrity": "sha512-I1RkW5PX51/q6Xl39//D7x9NgaKNGHpR5DCNaoxP/b2+KbzzXDNhauJUMV17KSYkJA41CSpwYUPRtRoNxbshWA==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.3",
-        "debug": "^4.3.1",
-        "detective-amd": "^3.0.1",
-        "detective-cjs": "^3.1.1",
-        "detective-es6": "^2.2.0",
-        "detective-less": "^1.0.2",
-        "detective-postcss": "^4.0.0",
-        "detective-sass": "^3.0.1",
-        "detective-scss": "^2.0.1",
-        "detective-stylus": "^1.0.0",
-        "detective-typescript": "^6.0.0",
-        "module-definition": "^3.3.1",
-        "node-source-walk": "^4.2.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        },
-        "detective-typescript": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/detective-typescript/-/detective-typescript-6.0.0.tgz",
-          "integrity": "sha512-vTidcSDK3QostdbrH2Rwf9FhvrgJ4oIaVw5jbolgruTejexk6nNa9DShGpuS8CFVDb1IP86jct5BaZt1wSxpkA==",
-          "dev": true,
-          "requires": {
-            "@typescript-eslint/typescript-estree": "^4.8.2",
-            "ast-module-types": "^2.7.1",
-            "node-source-walk": "^4.2.0",
-            "typescript": "^3.9.7"
-          },
-          "dependencies": {
-            "typescript": {
-              "version": "3.9.10",
-              "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-              "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
-    "prelude-ls": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
-    },
-    "pretty-ms": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
-      "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
-      "dev": true,
-      "requires": {
-        "parse-ms": "^2.1.0"
-      }
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
-    "process-on-spawn": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
-      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
-      "dev": true,
-      "requires": {
-        "fromentries": "^1.2.0"
-      }
-    },
-    "promise": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
-      "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
-      "dev": true,
-      "requires": {
-        "asap": "~2.0.6"
-      }
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
-      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
-      "requires": {
-        "punycode": "^2.3.1"
-      }
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="
-    },
-    "qs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
-      "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="
-    },
-    "quibble": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/quibble/-/quibble-0.6.4.tgz",
-      "integrity": "sha512-hZXvHTiBcpCJ4cQ0FvR7tZJuyAF6k5Q1EZMExjTTY6eKng5wSMMWbithU8hNDQjV8vqYWqxasnf79QUDwX8WlQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14",
-        "resolve": "^1.11.1"
-      }
-    },
-    "randombytes": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "dependencies": {
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-          "dev": true
-        }
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "requires": {
-        "picomatch": "^2.2.1"
-      }
-    },
-    "readline": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
-      "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
-    },
-    "regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
-    },
-    "regexp-to-ast": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.5.0.tgz",
-      "integrity": "sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw=="
-    },
-    "regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.6",
-        "define-properties": "^1.2.1",
-        "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
-      }
-    },
-    "regexpp": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
-    },
-    "release-zalgo": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
-      "integrity": "sha1-CXALflB0Mpc5Mw5TXFqQ+2eFFzA=",
-      "dev": true,
-      "requires": {
-        "es6-error": "^4.0.1"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
-    },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "require-relative": {
-      "version": "0.8.7",
-      "resolved": "https://registry.npmjs.org/require-relative/-/require-relative-0.8.7.tgz",
-      "integrity": "sha512-AKGr4qvHiryxRb19m3PsLRGuKVAbJLUD7E6eOaHkfKhwc+vSgVOCY5xNvm9EkolBKTOf0GrQAZKLimOCz81Khg=="
-    },
-    "requirejs": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz",
-      "integrity": "sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==",
-      "dev": true
-    },
-    "requirejs-config-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/requirejs-config-file/-/requirejs-config-file-4.0.0.tgz",
-      "integrity": "sha512-jnIre8cbWOyvr8a5F2KuqBnY+SDA4NXr/hzEZJG79Mxm2WiFQz2dzhC8ibtPJS7zkmBEl1mxSwp5HhC1W4qpxw==",
-      "dev": true,
-      "requires": {
-        "esprima": "^4.0.0",
-        "stringify-object": "^3.2.1"
-      }
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
-    },
-    "resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
-      "dev": true,
-      "requires": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      }
-    },
-    "resolve-dependency-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-dependency-path/-/resolve-dependency-path-2.0.0.tgz",
-      "integrity": "sha512-DIgu+0Dv+6v2XwRaNWnumKu7GPufBBOr5I1gRPJHkvghrfCGOooJODFvgFimX/KRxk9j0whD2MnKHzM1jYvk9w==",
-      "dev": true
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "resolve-pkg-maps": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
-      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
-    },
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "roku-deploy": {
-      "version": "3.17.1",
-      "resolved": "https://registry.npmjs.org/roku-deploy/-/roku-deploy-3.17.1.tgz",
-      "integrity": "sha512-D0IEkdrnrh9Pfsw1cH1DVEqbApv94k52W7NLElC8+R4KQ1lGVlGE4LktpSlN9gaazTNycTyIEHHY+sX6EtlKEw==",
-      "requires": {
-        "@types/request": "^2.47.0",
-        "chalk": "^2.4.2",
-        "dateformat": "^3.0.3",
-        "dayjs": "^1.11.0",
-        "fast-glob": "^3.2.12",
-        "fs-extra": "^7.0.1",
-        "is-glob": "^4.0.3",
-        "jsonc-parser": "^2.3.0",
-        "jszip": "^3.6.0",
-        "lodash": "^4.17.21",
-        "micromatch": "^4.0.4",
-        "moment": "^2.29.1",
-        "parse-ms": "^2.1.0",
-        "postman-request": "^2.88.1-postman.40",
-        "semver": "^7.7.3",
-        "temp-dir": "^2.0.0",
-        "xml2js": "^0.5.0"
-      },
-      "dependencies": {
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        }
-      }
-    },
-    "run-parallel": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-      "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="
-    },
-    "safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
-        "isarray": "^2.0.5"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-          "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-          "dev": true
-        }
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "safe-json-stringify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
-      "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg=="
-    },
-    "safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.6",
-        "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "sass-lookup": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/sass-lookup/-/sass-lookup-3.0.0.tgz",
-      "integrity": "sha512-TTsus8CfFRn1N44bvdEai1no6PqdmDiQUiqW5DlpmtT+tYnIt1tXtDIph5KA1efC+LmioJXSnCtUVpcK9gaKIg==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.16.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        }
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-    },
-    "semver": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
-      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="
-    },
-    "semver-extra": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/semver-extra/-/semver-extra-3.0.0.tgz",
-      "integrity": "sha512-v0ukVTyrD5BSlQeKZShjED51gRWI551YlsjAbmrXZLM+dkfiHeLu+5NJoMPepQ1XvfWWXZcEjaGmpX9uzfUWuQ==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-          "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-          "dev": true
-        }
-      }
-    },
-    "serialize-error": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-      "requires": {
-        "type-fest": "^0.13.1"
-      }
-    },
-    "serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.1.0"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-function-length": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
-      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
-      "requires": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.4",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.2"
-      }
-    },
-    "set-function-name": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
-      "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-      "dev": true,
-      "requires": {
-        "define-data-property": "^1.1.4",
-        "es-errors": "^1.3.0",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.2"
-      }
-    },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
-    },
-    "shebang-command": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^3.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-      "dev": true
-    },
-    "side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
-      }
-    },
-    "sigmund": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
-      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
-    },
-    "sinon": {
-      "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.0.tgz",
-      "integrity": "sha512-eSNXz1XMcGEMHw08NJXSyTHIu6qTCOiN8x9ODACmZpNQpr0aXTBXBnI4xTzQzR+TEpOmLiKowGf9flCuKIzsbw==",
-      "dev": true,
-      "requires": {
-        "@sinonjs/commons": "^1.8.1",
-        "@sinonjs/fake-timers": "^6.0.1",
-        "@sinonjs/formatio": "^5.0.1",
-        "@sinonjs/samsam": "^5.2.0",
-        "diff": "^4.0.2",
-        "nise": "^4.0.4",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
-    },
-    "source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="
-    },
-    "source-map-js": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true
-    },
-    "source-map-support": {
-      "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "spawn-wrap": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
-      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
-      "dev": true,
-      "requires": {
-        "foreground-child": "^2.0.0",
-        "is-windows": "^1.0.2",
-        "make-dir": "^3.0.0",
-        "rimraf": "^3.0.0",
-        "signal-exit": "^3.0.2",
-        "which": "^2.0.1"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
-      "dev": true
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
-      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "stream-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz",
-      "integrity": "sha512-aI+qKFiwoDV4rsXiS7WRoCt+v2RX1nUj17+KJC5r2gfh5xoSJIfP6Y3Do/HtvesFcTSWthIuJ3l1cvKQY/+nZg==",
-      "requires": {
-        "bluebird": "^2.6.2"
-      }
-    },
-    "string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "requires": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
-      }
-    },
-    "string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      }
-    },
-    "string.prototype.trimstart": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
-      "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      }
-    },
-    "stringify-object": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
-      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
-      "dev": true,
-      "requires": {
-        "get-own-enumerable-property-symbols": "^3.0.0",
-        "is-obj": "^1.0.1",
-        "is-regexp": "^1.0.0"
-      }
-    },
-    "stringify-object-es5": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/stringify-object-es5/-/stringify-object-es5-2.5.0.tgz",
-      "integrity": "sha1-BXw8mpChJzObudFwSikLt70KHsU=",
-      "dev": true,
-      "requires": {
-        "is-plain-obj": "^1.0.0",
-        "is-regexp": "^1.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "strip-bom": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-      "dev": true
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
-    },
-    "stylus-lookup": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/stylus-lookup/-/stylus-lookup-3.0.2.tgz",
-      "integrity": "sha512-oEQGHSjg/AMaWlKe7gqsnYzan8DLcGIHe0dUaFkucZZ14z4zjENRlQMCHT4FNsiWnJf17YN9OvrCfCoi7VvOyg==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.8.1",
-        "debug": "^4.1.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        }
-      }
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-preserve-symlinks-flag": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "dev": true
-    },
-    "sync-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/sync-request/-/sync-request-6.1.0.tgz",
-      "integrity": "sha512-8fjNkrNlNCrVc/av+Jn+xxqfCjYaBoHqCsDz6mt030UMxJGr+GSfCV1dQt2gRtlL63+VPidwDVLr7V2OcTSdRw==",
-      "dev": true,
-      "requires": {
-        "http-response-object": "^3.0.1",
-        "sync-rpc": "^1.2.1",
-        "then-request": "^6.0.0"
-      }
-    },
-    "sync-rpc": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz",
-      "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==",
-      "dev": true,
-      "requires": {
-        "get-port": "^3.1.0"
-      },
-      "dependencies": {
-        "get-port": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-          "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
-          "dev": true
-        }
-      }
-    },
-    "tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
-      "dev": true
-    },
-    "temp": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.4.0.tgz",
-      "integrity": "sha1-ZxrWPVe+D+nXKUZks/xABjZnimA=",
-      "dev": true
-    },
-    "temp-dir": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz",
-      "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="
-    },
-    "test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "requires": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "testdouble": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/testdouble/-/testdouble-3.16.1.tgz",
-      "integrity": "sha512-diaNYjFfR8bdMhtwJ9c2KxHa7M8Al7YciU+kteutWIIendmCC61ZyqQBtprsFkb6Cd/rjBr2sEoUJ8bWIVHm6w==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15",
-        "quibble": "^0.6.4",
-        "stringify-object-es5": "^2.5.0",
-        "theredoc": "^1.0.0"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "then-request": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/then-request/-/then-request-6.0.2.tgz",
-      "integrity": "sha512-3ZBiG7JvP3wbDzA9iNY5zJQcHL4jn/0BWtXIkagfz7QgOL/LqjCEOBQuJNZfu0XYnv5JhKh+cDxCPM4ILrqruA==",
-      "dev": true,
-      "requires": {
-        "@types/concat-stream": "^1.6.0",
-        "@types/form-data": "0.0.33",
-        "@types/node": "^8.0.0",
-        "@types/qs": "^6.2.31",
-        "caseless": "~0.12.0",
-        "concat-stream": "^1.6.0",
-        "form-data": "^2.2.0",
-        "http-basic": "^8.1.1",
-        "http-response-object": "^3.0.1",
-        "promise": "^8.0.0",
-        "qs": "^6.4.0"
-      },
-      "dependencies": {
-        "@types/node": {
-          "version": "8.10.65",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.65.tgz",
-          "integrity": "sha512-xdcqtQl1g3p/49kmcj7ZixPWOcNHA1tYNz+uN0PJEcgtN6zywK74aacTnd3eFGPuBpD7kK8vowmMRkUt6jHU/Q==",
-          "dev": true
-        }
-      }
-    },
-    "thenby": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz",
-      "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==",
-      "dev": true
-    },
-    "theredoc": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/theredoc/-/theredoc-1.0.0.tgz",
-      "integrity": "sha512-KU3SA3TjRRM932jpNfD3u4Ec3bSvedyo5ITPI7zgWYnKep7BwQQaxlhI9qbO+lKJoRnoAbEVfMcAHRuKVYikDA==",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "requires": {
-        "is-number": "^7.0.0"
-      }
-    },
-    "ts-node": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
-      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
-      "dev": true,
-      "requires": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "dependencies": {
-        "diff": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-          "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-          "dev": true
-        }
-      }
-    },
-    "tsconfig-paths": {
-      "version": "3.15.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz",
-      "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-          "dev": true
-        }
-      }
-    },
-    "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "dev": true
-    },
-    "tsutils": {
-      "version": "3.21.0",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
-      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "turndown": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/turndown/-/turndown-7.1.1.tgz",
-      "integrity": "sha512-BEkXaWH7Wh7e9bd2QumhfAXk5g34+6QUmmWx+0q6ThaVOLuLUqsnkq35HQ5SBHSaxjSfSM7US5o4lhJNH7B9MA==",
-      "dev": true,
-      "requires": {
-        "domino": "^2.1.6"
-      }
-    },
-    "turndown-plugin-gfm": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.2.tgz",
-      "integrity": "sha512-vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg==",
-      "dev": true
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="
-    },
-    "type-check": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
-      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "^1.2.1"
-      }
-    },
-    "type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true
-    },
-    "type-fest": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="
-    },
-    "typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
-      }
-    },
-    "typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
-      }
-    },
-    "typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
-      }
-    },
-    "typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "typedarray-to-buffer": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
-      "requires": {
-        "is-typedarray": "^1.0.0"
-      }
-    },
-    "typescript": {
-      "version": "4.7.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz",
-      "integrity": "sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==",
-      "dev": true
-    },
-    "typescript-formatter": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
-      "integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
-      "dev": true,
-      "requires": {
-        "commandpost": "^1.0.0",
-        "editorconfig": "^0.15.0"
-      }
-    },
-    "unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.2",
-        "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
-      }
-    },
-    "undent": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/undent/-/undent-0.1.0.tgz",
-      "integrity": "sha512-vohX7ywgBjRxDNw+f3wHclSXmO0z9HsEfmGObOuG7G0yi7kZ6OtCG8kAxtDSNklmua5KR6ev2drTFqMGqpYEbg==",
-      "dev": true
-    },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-    },
-    "uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "dev": true
-    },
-    "v8-compile-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
-    },
-    "v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vscode-jsonrpc": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.1.tgz",
-      "integrity": "sha512-JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A==",
-      "dev": true
-    },
-    "vscode-languageserver": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
-      "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
-      "requires": {
-        "vscode-languageserver-protocol": "3.17.5"
-      }
-    },
-    "vscode-languageserver-protocol": {
-      "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
-      "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
-      "requires": {
-        "vscode-jsonrpc": "8.2.0",
-        "vscode-languageserver-types": "3.17.5"
-      },
-      "dependencies": {
-        "vscode-jsonrpc": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
-          "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA=="
-        }
-      }
-    },
-    "vscode-languageserver-textdocument": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz",
-      "integrity": "sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA=="
-    },
-    "vscode-languageserver-types": {
-      "version": "3.17.5",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
-      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
-    },
-    "vscode-uri": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
-      "integrity": "sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="
-    },
-    "walkdir": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/walkdir/-/walkdir-0.4.1.tgz",
-      "integrity": "sha512-3eBwRyEln6E1MSzcxcVpQIhRG8Q1jLvEqRmCZqS3dsfXEDR/AhOF4d+jHg1qvDCpYaVRZjENPQyrVxAkQqxPgQ==",
-      "dev": true
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
-      "dev": true,
-      "requires": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
-      "dev": true,
-      "requires": {
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.2"
-      }
-    },
-    "word-wrap": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
-      "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
-      "dev": true
-    },
-    "workerpool": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
-      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "requires": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
-    "xml2js": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-      "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
-      "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      }
-    },
-    "xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
-    },
-    "y18n": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
-      "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
-    "yargs": {
-      "version": "16.2.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-      "requires": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      }
-    },
-    "yargs-parser": {
-      "version": "20.2.7",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
-    },
-    "yargs-unparser": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz",
-      "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^6.0.0",
-        "decamelize": "^4.0.0",
-        "flat": "^5.0.2",
-        "is-plain-obj": "^2.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
-          "dev": true
-        },
-        "decamelize": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz",
-          "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==",
-          "dev": true
-        },
-        "is-plain-obj": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-          "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-          "dev": true
-        }
-      }
-    },
-    "yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true
-    },
-    "yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true
-    }
   }
 }
diff --git a/package.json b/package.json
index aa3e96a0c..a60a7b03d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "brighterscript",
-  "version": "0.72.0",
+  "version": "1.0.0-alpha.50",
   "description": "A superset of Roku's BrightScript language.",
   "scripts": {
     "preversion": "npm run build && npm run lint && npm run test",
@@ -19,7 +19,7 @@
     "docs": "ts-node scripts/compile-doc-examples.ts",
     "benchmark": "cd ./benchmarks && ts-node ./index.ts",
     "scrape-roku-docs": "ts-node scripts/scrape-roku-docs.ts",
-    "rescrape-roku-docs": "rm scripts/.cache.json && ts-node scripts/scrape-roku-docs.ts",
+    "rescrape-roku-docs": "rm scripts/.cache.json && npm run scrape-roku-docs",
     "null-check": "tsc -p tsconfig-null-safe.json",
     "create-test-package": "ts-node scripts/create-test-package.ts",
     "package": "npm run build && npm pack"
@@ -36,7 +36,7 @@
   "typings": "dist/index.d.ts",
   "bin": {
     "bsc": "dist/cli.js",
-    "bsc0": "dist/cli.js"
+    "bsc1": "dist/cli.js"
   },
   "repository": {
     "type": "git",
@@ -138,6 +138,7 @@
     "chevrotain": "^7.0.1",
     "chokidar": "^3.6.0",
     "clear": "^0.1.0",
+    "coveralls-next": "^4.2.0",
     "cross-platform-clear-console": "^2.3.0",
     "debounce-promise": "^3.1.0",
     "eventemitter3": "^4.0.0",
@@ -162,6 +163,7 @@
     "serialize-error": "^7.0.1",
     "source-map": "^0.7.4",
     "thenby": "^1.3.4",
+    "uuid": "^9.0.0",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-protocol": "^3.17.5",
     "vscode-languageserver-textdocument": "^1.0.11",
diff --git a/scripts/scrape-roku-docs.ts b/scripts/scrape-roku-docs.ts
index 912942281..bb04983de 100644
--- a/scripts/scrape-roku-docs.ts
+++ b/scripts/scrape-roku-docs.ts
@@ -18,6 +18,9 @@ import * as deepmerge from 'deepmerge';
 import { NodeHtmlMarkdown } from 'node-html-markdown';
 import { isVariableExpression } from '../src/astUtils/reflection';
 import { SymbolTable } from '../src/SymbolTable';
+import { SymbolTypeFlag } from '../src/SymbolTypeFlag';
+import { referenceTypeFactory } from '../src/types/ReferenceType';
+import { unionTypeFactory } from '../src/types/UnionType';
 
 
 type Token = marked.Token;
@@ -28,7 +31,9 @@ const foundTypesTranslation = {
     'object (string array)': 'object',
     'robytearray object': 'roByteArray',
     'rolist of roassociativearray items': 'roList',
-    'roassociative array': 'roAssociativeArray'
+    'roassociative array': 'roAssociativeArray',
+    'uri string': 'uri',
+    'oassociativearray': 'roAssociativeArray'
 };
 
 const turndownService = new TurndownService({
@@ -51,6 +56,8 @@ class Runner {
     public async run() {
         const outPath = s`${__dirname}/../src/roku-types/data.json`;
 
+        SymbolTable.referenceTypeFactory = referenceTypeFactory;
+        SymbolTable.unionTypeFactory = unionTypeFactory;
         loadCache();
         //load the base level roku docs data
         await this.loadReferences();
@@ -319,7 +326,7 @@ class Runner {
                         } as Signature;
                         const call = (statements[0] as ExpressionStatement).expression as CallExpression;
                         //only scan createObject calls for our own name
-                        if ((call.args[0] as LiteralExpression)?.token?.text === `"${component.name}"`) {
+                        if ((call.args[0] as LiteralExpression)?.tokens?.value.text === `"${component.name}"`) {
                             //skip the first arg because that's the name of the component
                             for (let i = 1; i < call.args.length; i++) {
                                 const arg = call.args[i];
@@ -882,6 +889,9 @@ class Runner {
         if (!opts?.allowSpaces) {
             result = result?.split(' ')?.[0];
         }
+        if (foundTypesTranslation[result.toLowerCase()]) {
+            result = foundTypesTranslation[result.toLowerCase()];
+        }
         return result;
     }
 
@@ -916,9 +926,9 @@ class Runner {
         if (statements.length > 0) {
             const func = statements[0] as FunctionStatement;
             const signature = {
-                name: func.name?.text,
+                name: func.tokens.name?.text,
                 params: [],
-                returnType: func.func.returnTypeToken?.text ?? 'Void'
+                returnType: func.func.returnTypeExpression?.getType({ flags: SymbolTypeFlag.typetime })?.toTypeString() ?? returnTypeString ?? 'Void'
             } as Func;
 
             if (variadicMatch) {
@@ -1721,10 +1731,11 @@ function fixOverloadedMethod(iface: RokuInterface, funcName: string) {
         if (!returnDescriptions.includes(originalOverload.returnDescription)) {
             returnDescriptions.push(originalOverload.returnDescription);
         }
-        if (!returnTypes.includes(originalOverload.returnType)) {
+        if (!returnTypes.map(rt => rt.toLowerCase()).includes(originalOverload.returnType.toLowerCase())) {
             returnTypes.push(originalOverload.returnType);
         }
     }
+
     const mergedFunc: Func = {
         name: originalOverloads[0].name,
         params: [],
diff --git a/src/ActionPipeline.ts b/src/ActionPipeline.ts
new file mode 100644
index 000000000..5f50807fe
--- /dev/null
+++ b/src/ActionPipeline.ts
@@ -0,0 +1,44 @@
+import { Deferred } from './deferred';
+
+/**
+ * Enforces that a single action can be running at a time
+ */
+export class ActionPipeline {
+    private workQueue: Array<Work<any>> = [];
+
+    public run<T extends Action<any>, R extends Awaited<PromiseLike<ReturnType<T>>>>(action: T): Promise<R> {
+        const work = {
+            action: action,
+            deferred: new Deferred<any>()
+        };
+        this.workQueue.push(work);
+        this.process();
+        return work.deferred.promise;
+    }
+
+    private process() {
+        //if we're already processing,
+        if (this.isProcessing) {
+            return;
+        }
+        while (this.workQueue.length > 0) {
+            const work = this.workQueue.shift();
+            try {
+                const result = Promise.resolve(
+                    work.action()
+                );
+                work.deferred.resolve(result);
+            } catch (e) {
+                work.deferred.reject(e);
+            }
+        }
+    }
+    private isProcessing = false;
+}
+
+interface Work<T> {
+    action: Action<T>;
+    deferred: Deferred<T>;
+}
+
+export type Action<T> = () => T | PromiseLike<T>;
diff --git a/src/AstValidationSegmenter.ts b/src/AstValidationSegmenter.ts
new file mode 100644
index 000000000..c05f02ac2
--- /dev/null
+++ b/src/AstValidationSegmenter.ts
@@ -0,0 +1,371 @@
+import type { DottedGetExpression, TypeExpression, VariableExpression } from './parser/Expression';
+import { isAliasStatement, isArrayType, isBinaryExpression, isBlock, isBody, isClassStatement, isConditionalCompileStatement, isDottedGetExpression, isInterfaceStatement, isNamespaceStatement, isTypecastStatement, isTypeExpression, isTypeStatement, isVariableExpression } from './astUtils/reflection';
+import { ChildrenSkipper, WalkMode, createVisitor } from './astUtils/visitors';
+import type { ExtraSymbolData, GetTypeOptions, TypeChainEntry } from './interfaces';
+import type { AstNode, Expression } from './parser/AstNode';
+import { util } from './util';
+import type { ClassStatement, NamespaceStatement } from './parser/Statement';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { Token } from './lexer/Token';
+import type { BrsFile } from './files/BrsFile';
+import { TokenKind } from './lexer/TokenKind';
+import type { BscSymbol } from './SymbolTable';
+
+// eslint-disable-next-line no-bitwise
+export const InsideSegmentWalkMode = WalkMode.visitStatements |
+    WalkMode.visitExpressions |
+    WalkMode.recurseChildFunctions;
+
+export interface UnresolvedSymbol {
+    typeChain: TypeChainEntry[];
+    flags: SymbolTypeFlag;
+    endChainFlags: SymbolTypeFlag;
+    containingNamespaces: string[];
+    file: BrsFile;
+    lookups: string[];
+}
+
+export interface AssignedSymbol {
+    token: Token;
+    node: AstNode;
+}
+
+export class AstValidationSegmenter {
+
+    public validatedSegments = new Map<AstNode, boolean>();
+    public segmentsForValidation = new Array<AstNode>();
+    public singleValidationSegments = new Set<AstNode>();
+    public unresolvedSegmentsSymbols = new Map<AstNode, Set<UnresolvedSymbol>>();
+    public assignedTokensInSegment = new Map<AstNode, Set<AssignedSymbol>>();
+    public ast: AstNode;
+
+    constructor(public file: BrsFile) { }
+
+    reset() {
+        this.validatedSegments.clear();
+        this.singleValidationSegments.clear();
+        this.unresolvedSegmentsSymbols.clear();
+        this.segmentsForValidation = [];
+    }
+
+    processTree(ast: AstNode) {
+        this.reset();
+
+        ast?.walk((segment) => {
+            this.checkSegmentWalk(segment);
+        }, {
+            walkMode: WalkMode.visitStatements
+        });
+    }
+
+    checkExpressionForUnresolved(segment: AstNode, expression: VariableExpression | DottedGetExpression | TypeExpression, assignedSymbolsNames?: Set<string>) {
+        if (!expression) {
+            return false;
+        }
+        let startOfDottedGet = expression as Expression;
+        while (isDottedGetExpression(startOfDottedGet)) {
+            startOfDottedGet = startOfDottedGet.obj;
+        }
+        if (isVariableExpression(startOfDottedGet)) {
+            const firstTokenTextLower = startOfDottedGet.tokens.name.text.toLowerCase();
+            if (firstTokenTextLower === 'm' || (this.currentClassStatement && firstTokenTextLower === 'super')) {
+                return false;
+            }
+        }
+        if (isTypeExpression(expression) && isBinaryExpression(expression.expression)) {
+            return this.checkExpressionForUnresolved(segment, expression.expression.left as VariableExpression, assignedSymbolsNames) ||
+                this.checkExpressionForUnresolved(segment, expression.expression.right as VariableExpression, assignedSymbolsNames);
+        }
+        if (isTypeExpression(expression)) {
+            let typeInTypeExpression = expression.getType({ flags: SymbolTypeFlag.typetime });
+            if (isArrayType(typeInTypeExpression)) {
+                typeInTypeExpression = typeInTypeExpression.defaultType;
+            }
+            if (typeInTypeExpression?.isResolvable()) {
+                return this.handleTypeCastTypeExpression(segment, expression);
+            }
+        }
+        return this.addUnresolvedSymbol(segment, expression, assignedSymbolsNames);
+    }
+
+    private addUnresolvedSymbol(segment: AstNode, expression: Expression, assignedSymbolsNames?: Set<string>) {
+        const flag = util.isInTypeExpression(expression) ? SymbolTypeFlag.typetime : SymbolTypeFlag.runtime;
+        let typeChain: TypeChainEntry[] = [];
+        const extraData = {} as ExtraSymbolData;
+        const options: GetTypeOptions = { flags: flag, onlyCacheResolvedTypes: true, typeChain: typeChain, data: extraData };
+        let nodeType = expression.getType(options);
+        if (isArrayType(nodeType)) {
+            nodeType = nodeType.defaultType;
+        }
+        if (!nodeType?.isResolvable()) {
+            let symbolsSet: Set<UnresolvedSymbol>;
+            if (!assignedSymbolsNames?.has(typeChain[0].name.toLowerCase())) {
+                if (!this.unresolvedSegmentsSymbols.has(segment)) {
+                    symbolsSet = new Set<UnresolvedSymbol>();
+                    this.unresolvedSegmentsSymbols.set(segment, symbolsSet);
+                } else {
+                    symbolsSet = this.unresolvedSegmentsSymbols.get(segment);
+                }
+                this.validatedSegments.set(segment, false);
+
+                if (extraData.isAlias && isAliasStatement(extraData.definingNode)) {
+                    //set the non-aliased version of this symbol as required.
+                    const aliasTypeChain = [];
+                    // eslint-disable-next-line no-bitwise
+                    extraData.definingNode.value.getType({ ...options, flags: SymbolTypeFlag.runtime | SymbolTypeFlag.typetime, typeChain: aliasTypeChain });
+                    typeChain = [...aliasTypeChain, ...typeChain.slice(1)];
+                }
+                if (extraData.isFromTypeStatement && isTypeStatement(extraData.definingNode)) {
+                    //set the unwrapped version of this symbol as required.
+                    const wrappedTypeChain = [];
+                    // eslint-disable-next-line no-bitwise
+                    extraData.definingNode.getType({ ...options, flags: SymbolTypeFlag.typetime, typeChain: wrappedTypeChain });
+                    typeChain = [...wrappedTypeChain, ...typeChain.slice(1)];
+                }
+                const possibleNamespace = this.currentNamespaceStatement?.getNameParts()?.map(t => t.text)?.join('.').toLowerCase() ?? '';
+                const fullChainName = util.processTypeChain(typeChain).fullChainName?.toLowerCase();
+                const possibleNamesLower = [] as string[];
+                let lastSymbol = '';
+                for (const chainPart of fullChainName.split('.')) {
+                    lastSymbol += (lastSymbol ? `.${chainPart}` : chainPart);
+                    possibleNamesLower.push(lastSymbol);
+                    if (possibleNamespace) {
+                        possibleNamesLower.push(possibleNamespace + '.' + lastSymbol);
+                    }
+                }
+
+                symbolsSet.add({
+                    typeChain: typeChain,
+                    flags: typeChain[0].data.flags,
+                    endChainFlags: flag,
+                    containingNamespaces: this.currentNamespaceStatement?.getNameParts()?.map(t => t.text),
+                    file: this.file,
+                    lookups: possibleNamesLower
+                });
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private currentNamespaceStatement: NamespaceStatement;
+    private currentClassStatement: ClassStatement;
+    private unresolvedTypeCastTypeExpressions: TypeExpression[] = [];
+
+
+    checkSegmentWalk(segment: AstNode) {
+        if (isNamespaceStatement(segment) || isBody(segment)) {
+            // skip namespaces and namespace bodies - no symbols to verify in those
+            return;
+        }
+        if (isConditionalCompileStatement(segment) || isBlock(segment)) {
+            // skip conditional compile statements and blocks - no symbols to verify in those
+            return;
+        }
+        this.currentNamespaceStatement = segment.findAncestor(isNamespaceStatement);
+
+        if (isClassStatement(segment)) {
+            if (segment.parentClassName) {
+                this.segmentsForValidation.push(segment.parentClassName);
+                this.validatedSegments.set(segment.parentClassName, false);
+                let foundUnresolvedInSegment = this.checkExpressionForUnresolved(segment.parentClassName, segment.parentClassName);
+                if (!foundUnresolvedInSegment) {
+                    this.singleValidationSegments.add(segment.parentClassName);
+                }
+            }
+            return;
+        }
+        if (isInterfaceStatement(segment)) {
+            if (segment.parentInterfaceName) {
+                this.segmentsForValidation.push(segment.parentInterfaceName);
+                this.validatedSegments.set(segment.parentInterfaceName, false);
+                let foundUnresolvedInSegment = this.checkExpressionForUnresolved(segment.parentInterfaceName, segment.parentInterfaceName);
+                if (!foundUnresolvedInSegment) {
+                    this.singleValidationSegments.add(segment.parentInterfaceName);
+                }
+            }
+            return;
+        }
+
+        this.segmentsForValidation.push(segment);
+        this.validatedSegments.set(segment, false);
+        let foundUnresolvedInSegment = false;
+        const skipper = new ChildrenSkipper();
+        const assignedSymbols = new Set<AssignedSymbol>();
+        const assignedSymbolsNames = new Set<string>();
+        this.currentClassStatement = segment.findAncestor(isClassStatement);
+
+        if (isTypecastStatement(segment)) {
+            if (this.checkExpressionForUnresolved(segment, segment.typecastExpression.typeExpression)) {
+                this.unresolvedTypeCastTypeExpressions.push(segment.typecastExpression.typeExpression);
+            }
+        }
+        let unresolvedTypeCastTypeExpression: TypeExpression;
+        if (this.unresolvedTypeCastTypeExpressions.length > 0) {
+            unresolvedTypeCastTypeExpression = this.unresolvedTypeCastTypeExpressions[this.unresolvedTypeCastTypeExpressions.length - 1];
+        }
+
+        if (isTypeStatement(segment)) {
+            // this is a straight assignment,
+            assignedSymbols.add({ token: segment.tokens.name, node: segment });
+            assignedSymbolsNames.add(segment.tokens.name.text.toLowerCase());
+        }
+
+        segment.walk(createVisitor({
+            AssignmentStatement: (stmt) => {
+                if (stmt.tokens.equals.kind === TokenKind.Equal) {
+                    // this is a straight assignment, not a compound assignment
+                    assignedSymbols.add({ token: stmt.tokens.name, node: stmt });
+                    assignedSymbolsNames.add(stmt.tokens.name.text.toLowerCase());
+                }
+            },
+            FunctionParameterExpression: (expr) => {
+                assignedSymbols.add({ token: expr.tokens.name, node: expr });
+                assignedSymbolsNames.add(expr.tokens.name.text.toLowerCase());
+            },
+            ForEachStatement: (stmt) => {
+                assignedSymbols.add({ token: stmt.tokens.item, node: stmt });
+                assignedSymbolsNames.add(stmt.tokens.item.text.toLowerCase());
+            },
+            VariableExpression: (expr) => {
+                const hasUnresolvedTypecastedM = unresolvedTypeCastTypeExpression && expr.tokens.name.text.toLowerCase() === 'm';
+                if (hasUnresolvedTypecastedM) {
+                    this.addUnresolvedSymbol(segment, unresolvedTypeCastTypeExpression);
+
+                } else if (!assignedSymbolsNames.has(expr.tokens.name.text.toLowerCase())) {
+                    const expressionIsUnresolved = this.checkExpressionForUnresolved(segment, expr, assignedSymbolsNames);
+                    foundUnresolvedInSegment = expressionIsUnresolved || foundUnresolvedInSegment;
+                }
+                skipper.skip();
+            },
+            DottedGetExpression: (expr) => {
+                const expressionIsUnresolved = this.checkExpressionForUnresolved(segment, expr, assignedSymbolsNames);
+                foundUnresolvedInSegment = expressionIsUnresolved || foundUnresolvedInSegment;
+                if (!foundUnresolvedInSegment && unresolvedTypeCastTypeExpression) {
+                    let startOfDottedGet: Expression = expr;
+                    while (isDottedGetExpression(startOfDottedGet)) {
+                        startOfDottedGet = startOfDottedGet.obj;
+                    }
+                    if (isVariableExpression(startOfDottedGet)) {
+                        const hasUnresolvedTypeCastedM = unresolvedTypeCastTypeExpression && startOfDottedGet.tokens.name.text.toLowerCase() === 'm';
+                        if (hasUnresolvedTypeCastedM) {
+                            this.handleTypeCastTypeExpression(segment, unresolvedTypeCastTypeExpression);
+                        }
+                    }
+                }
+                skipper.skip();
+            },
+            TypeExpression: (expr) => {
+                const expressionIsUnresolved = this.checkExpressionForUnresolved(segment, expr, assignedSymbolsNames);
+                foundUnresolvedInSegment = expressionIsUnresolved || foundUnresolvedInSegment;
+                skipper.skip();
+            }
+        }), {
+            walkMode: InsideSegmentWalkMode,
+            skipChildren: skipper
+        });
+        this.assignedTokensInSegment.set(segment, assignedSymbols);
+        if (!foundUnresolvedInSegment) {
+            this.singleValidationSegments.add(segment);
+        }
+        this.currentClassStatement = undefined;
+        this.currentClassStatement = undefined;
+    }
+
+
+    private handleTypeCastTypeExpression(segment: AstNode, typecastTypeExpression: TypeExpression) {
+        const expression = typecastTypeExpression;
+        if (isTypeExpression(expression)) {
+            const typeIntypeExpression = expression.getType({ flags: SymbolTypeFlag.typetime });
+
+            if (typeIntypeExpression.isResolvable()) {
+                const memberSymbols = typeIntypeExpression.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+                const unresolvedMembers: BscSymbol[] = [];
+                for (const memberSymbol of memberSymbols) {
+                    if (!memberSymbol.type.isResolvable()) {
+                        unresolvedMembers.push(memberSymbol);
+                    }
+                }
+                let addedSymbol = false;
+                for (const unresolvedMember of unresolvedMembers) {
+                    if (unresolvedMember?.data?.definingNode) {
+                        addedSymbol = this.addUnresolvedSymbol(segment, unresolvedMember.data.definingNode) || addedSymbol;
+                    }
+
+                }
+                return addedSymbol;
+            }
+            return this.addUnresolvedSymbol(segment, expression);
+        }
+        return false;
+    }
+
+    getAllUnvalidatedSegments() {
+        const segmentsToWalkForValidation: AstNode[] = [];
+        for (const segment of this.segmentsForValidation) {
+            if (this.validatedSegments.get(segment)) {
+                continue;
+            }
+            segmentsToWalkForValidation.push(segment);
+        }
+        return segmentsToWalkForValidation;
+    }
+
+    getSegmentsWithChangedSymbols(changedSymbols: Map<SymbolTypeFlag, Set<string>>): AstNode[] {
+        const segmentsToWalkForValidation: AstNode[] = [];
+
+        for (const segment of this.segmentsForValidation) {
+            if (this.validatedSegments.get(segment)) {
+                continue;
+            }
+            const symbolsRequired = this.unresolvedSegmentsSymbols.get(segment);
+            if (symbolsRequired) {
+                if (util.hasAnyRequiredSymbolChanged([...symbolsRequired], changedSymbols)) {
+                    segmentsToWalkForValidation.push(segment);
+                    continue;
+                }
+            }
+        }
+        return segmentsToWalkForValidation;
+    }
+
+    markSegmentAsValidated(segment: AstNode) {
+        this.validatedSegments.set(segment, true);
+    }
+
+    unValidateAllSegments() {
+        for (const segment of this.validatedSegments.keys()) {
+            this.validatedSegments.set(segment, false);
+        }
+    }
+
+
+    hasUnvalidatedSegments() {
+        for (const validated of this.validatedSegments.values()) {
+            if (!validated) {
+                return true;
+            }
+
+        }
+        return false;
+    }
+
+
+    checkIfSegmentNeedsRevalidation(segment: AstNode, changedSymbols: Map<SymbolTypeFlag, Set<string>>) {
+        if (!this.validatedSegments.get(segment)) {
+            return true;
+        }
+        return false;
+    }
+
+    markSegmentsInvalidatedBySymbol(symbolName: string, flag: SymbolTypeFlag) {
+        for (let [segment, unresolvedSet] of this.unresolvedSegmentsSymbols) {
+            for (let unresolvedSymbol of unresolvedSet.values()) {
+                if (unresolvedSymbol.typeChain.join('.').toLowerCase() === symbolName) {
+                    this.validatedSegments.set(segment, false);
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/src/BsConfig.ts b/src/BsConfig.ts
index 8cb8811b2..836eb89b0 100644
--- a/src/BsConfig.ts
+++ b/src/BsConfig.ts
@@ -46,20 +46,9 @@ export interface BsConfig {
     files?: Array<string | { src: string | string[]; dest?: string }>;
 
     /**
-     * The path where the output zip file should be placed.
-     * @default "./out/package.zip"
+     * If true, the files are not copied to outDir.
      */
-    outFile?: string;
-
-    /**
-     * Creates a zip package. Defaults to true. This setting is ignored when deploy is enabled.
-     */
-    createPackage?: boolean;
-
-    /**
-     * If true, the files are copied to staging. This setting is ignored when deploy is enabled or if createPackage is enabled
-     */
-    copyToStaging?: boolean;
+    noEmit?: boolean;
 
     /**
      * If true, the server will keep running and will watch and recompile on every file change
@@ -68,46 +57,18 @@ export interface BsConfig {
     watch?: boolean;
 
     /**
-     * If true, after a successful buld, the project will be deployed to the roku specified in host
-     */
-    deploy?: boolean;
-
-    /**
-     * The host of the Roku that this project will deploy to
-     */
-    host?: string;
-
-    /**
-     * The username to use when deploying to a Roku device
-     */
-    username?: string;
-
-    /**
-     * The password to use when deploying to a Roku device
+     * The path to the out folder
+     * @default "./out"
      */
-    password?: string;
+    outDir?: string;
 
     /**
-     * Prevent the staging folder from being deleted after creating the package
-     * @default false
-     */
-    retainStagingDir?: boolean;
-
-    /**
-     * Prevent the staging folder from being deleted after creating the package
-     * @default false
-     * @deprecated use `retainStagingDir` instead
-     */
-    retainStagingFolder?: boolean;
-
-    /**
-     * The path to the staging directory (wehre the output files are copied immediately before creating the zip)
+     * @deprecated use `outDir` instead
      */
     stagingDir?: string;
 
     /**
-     * The path to the staging folder (where all files are copied to right before creating the zip package)
-     * @deprecated use `stagingDir` instead
+     * @deprecated use `outDir` instead
      */
     stagingFolderPath?: string;
 
@@ -141,7 +102,12 @@ export interface BsConfig {
     /**
      * A list of filters used to exclude diagnostics from the output
      */
-    diagnosticFilters?: Array<number | string | { src: string; codes: (number | string)[] } | { src: string } | { codes: (number | string)[] }>;
+    diagnosticFilters?: Array<string | number | { files?: string | Array<string | { src: string } | { dest: string }>; codes?: Array<number | string> }>;
+
+    /**
+     * Use the deprecated diagnosticFilters format from v0. This is useful for backwards compatibility.
+     */
+    diagnosticFiltersV0Compatibility?: boolean;
 
     /**
      * Specify what diagnostic types should be printed to the console. Defaults to 'warn'
@@ -234,6 +200,12 @@ export interface BsConfig {
      */
     bslibDestinationDir?: string;
 
+    /* Legacy RokuOS versions required at least one argument in callfunc() invocations.
+     * Previous brighterscript versions handled this by inserting invalid as an argument when no other args are present.
+     * This is not necessary in modern RokuOS versions.
+     */
+    legacyCallfuncHandling?: boolean;
+
     /**
      * The minimum Roku firmware version required to run this project.
      * When set, BrightScript (.brs) files are always validated against the version restriction.
@@ -262,13 +234,12 @@ type OptionalBsConfigFields =
     | 'manifest'
     | 'noProject'
     | 'extends'
-    | 'host'
-    | 'password'
     | 'require'
-    | 'stagingFolderPath'
+    | 'outDir'
     | 'diagnosticLevel'
     | 'rootDir'
     | 'stagingDir'
+    | 'stagingFolderPath'
     | 'minFirmwareVersion';
 
 export type FinalizedBsConfig =
diff --git a/src/Cache.ts b/src/Cache.ts
index b6f652018..dd4a520a7 100644
--- a/src/Cache.ts
+++ b/src/Cache.ts
@@ -8,19 +8,12 @@ export class Cache<TKey = any, TValue = any> extends Map<TKey, TValue> {
      * otherwise call the factory function to create the value, add it to the cache, and return it.
      */
     public getOrAdd<R extends TValue = TValue>(key: TKey, factory: (key: TKey) => R): R {
-        if (!this.has(key)) {
+        if (!super.has(key)) {
             const value = factory(key);
-            this.set(key, value);
+            super.set(key, value);
             return value;
         } else {
-            return this.get(key);
+            return super.get(key) as R;
         }
     }
-
-    /**
-     * Get the item with the specified key.
-     */
-    public get<R extends TValue = TValue>(key: TKey) {
-        return super.get(key) as R;
-    }
 }
diff --git a/src/CacheVerifier.ts b/src/CacheVerifier.ts
new file mode 100644
index 000000000..b250cd8de
--- /dev/null
+++ b/src/CacheVerifier.ts
@@ -0,0 +1,22 @@
+import { v4 as uuid } from 'uuid';
+
+export class CacheVerifier {
+
+    private currentToken: string;
+
+    constructor() {
+        this.generateToken();
+    }
+
+    generateToken() {
+        this.currentToken = uuid();
+    }
+
+    getToken(): string {
+        return this.currentToken;
+    }
+
+    checkToken(token: string): boolean {
+        return token === this.currentToken;
+    }
+}
diff --git a/src/CodeActionUtil.ts b/src/CodeActionUtil.ts
index 6b69a8b7a..4fdc153df 100644
--- a/src/CodeActionUtil.ts
+++ b/src/CodeActionUtil.ts
@@ -1,6 +1,7 @@
 import type { Diagnostic, Position, Range, WorkspaceEdit } from 'vscode-languageserver';
 import { CodeActionKind, CodeAction, TextEdit } from 'vscode-languageserver';
-import { URI } from 'vscode-uri';
+import type { BsDiagnostic } from './interfaces';
+import util from './util';
 
 export class CodeActionUtil {
 
@@ -9,7 +10,7 @@ export class CodeActionUtil {
             changes: {}
         } as WorkspaceEdit;
         for (const change of obj.changes) {
-            const uri = URI.file(change.filePath).toString();
+            const uri = util.pathToUri(change.filePath);
 
             //create the edit changes array for this uri
             if (!edit.changes![uri]) {
@@ -35,9 +36,9 @@ export class CodeActionUtil {
         return action;
     }
 
-    public serializableDiagnostics(diagnostics: Diagnostic[] | undefined) {
-        return diagnostics?.map(({ range, severity, code, source, message, relatedInformation }) => ({
-            range: range,
+    public serializableDiagnostics(diagnostics: BsDiagnostic[] | undefined): Diagnostic[] {
+        return diagnostics?.map(({ location, severity, code, source, message, relatedInformation }) => ({
+            range: location?.range,
             severity: severity,
             source: source,
             code: code,
@@ -51,7 +52,7 @@ export { CodeActionKind };
 
 export interface CodeActionShorthand {
     title: string;
-    diagnostics?: Diagnostic[];
+    diagnostics?: BsDiagnostic[];
     kind?: CodeActionKind;
     isPreferred?: boolean;
     changes: Array<InsertChange | ReplaceChange | DeleteChange>;
diff --git a/src/CommentFlagProcessor.spec.ts b/src/CommentFlagProcessor.spec.ts
index 7105a0f49..c134dd95e 100644
--- a/src/CommentFlagProcessor.spec.ts
+++ b/src/CommentFlagProcessor.spec.ts
@@ -2,7 +2,7 @@ import { expect } from './chai-config.spec';
 import { Range } from 'vscode-languageserver';
 import { CommentFlagProcessor } from './CommentFlagProcessor';
 import { Lexer } from './lexer/Lexer';
-import type { BscFile } from '.';
+import type { BscFile } from './files/BscFile';
 
 describe('CommentFlagProcessor', () => {
     let processor: CommentFlagProcessor;
@@ -89,9 +89,10 @@ describe('CommentFlagProcessor', () => {
         });
 
         it('works for special case', () => {
-            const token = Lexer.scan(`print "hi" 'bs:disable-line: 123456 999999   aaaab`).tokens[2];
+            const tokens = Lexer.scan(`print "hi" 'bs:disable-line: 123456 999999   aaaab`).tokens;
+            const token = tokens[2].leadingTrivia[1];
             expect(
-                processor['tokenize'](token.text, token.range)
+                processor['tokenize'](token.text, token.location.range)
             ).to.eql({
                 commentTokenText: `'`,
                 disableType: 'line',
@@ -109,9 +110,9 @@ describe('CommentFlagProcessor', () => {
         });
 
         it('tokenizes bs:disable-line comment with codes', () => {
-            const token = Lexer.scan(`'bs:disable-line:1 2 3`).tokens[0];
+            const token = Lexer.scan(`'bs:disable-line:1 2 3`).tokens[0].leadingTrivia[0];
             expect(
-                processor['tokenize'](token.text, token.range)
+                processor['tokenize'](token.text, token.location?.range)
             ).to.eql({
                 commentTokenText: `'`,
                 disableType: 'line',
@@ -129,9 +130,10 @@ describe('CommentFlagProcessor', () => {
         });
 
         it('tokenizes bs:disable-line comment with leading space', () => {
-            const token = Lexer.scan(`' bs:disable-line:1`).tokens[0];
+            const tokens = Lexer.scan(`' bs:disable-line:1`).tokens;
+            const token = tokens[0].leadingTrivia[0];
             expect(
-                processor['tokenize'](token.text, token.range)
+                processor['tokenize'](token.text, token.location?.range)
             ).to.eql({
                 commentTokenText: `'`,
                 disableType: 'line',
@@ -143,9 +145,10 @@ describe('CommentFlagProcessor', () => {
         });
 
         it('tokenizes bs:disable-line comment with leading tab', () => {
-            const token = Lexer.scan(`'\tbs:disable-line:1`).tokens[0];
+            const tokens = Lexer.scan(`'\tbs:disable-line:1`).tokens;
+            const token = tokens[0].leadingTrivia[0];
             expect(
-                processor['tokenize'](token.text, token.range)
+                processor['tokenize'](token.text, token.location?.range)
             ).to.eql({
                 commentTokenText: `'`,
                 disableType: 'line',
diff --git a/src/CommentFlagProcessor.ts b/src/CommentFlagProcessor.ts
index 27b07ac81..1344a83e3 100644
--- a/src/CommentFlagProcessor.ts
+++ b/src/CommentFlagProcessor.ts
@@ -1,6 +1,7 @@
 import type { Range } from 'vscode-languageserver';
 import { DiagnosticMessages } from './DiagnosticMessages';
-import type { BscFile, BsDiagnostic, CommentFlag, DiagnosticCode } from './interfaces';
+import type { BscFile } from './files/BscFile';
+import type { BsDiagnostic, CommentFlag, DiagnosticCode } from './interfaces';
 import { util } from './util';
 
 export class CommentFlagProcessor {
@@ -85,8 +86,7 @@ export class CommentFlagProcessor {
                 } else {
                     this.diagnostics.push({
                         ...DiagnosticMessages.unknownDiagnosticCode(codeInt),
-                        file: this.file,
-                        range: codeToken.range
+                        location: util.createLocationFromFileRange(this.file, codeToken.range)
                     });
                 }
             }
diff --git a/src/CrossScopeValidator.spec.ts b/src/CrossScopeValidator.spec.ts
new file mode 100644
index 000000000..21535b432
--- /dev/null
+++ b/src/CrossScopeValidator.spec.ts
@@ -0,0 +1,1999 @@
+import * as sinonImport from 'sinon';
+import { DiagnosticMessages } from './DiagnosticMessages';
+import { Program } from './Program';
+import * as path from 'path';
+import type { BrsFile } from './files/BrsFile';
+import { trim, expectZeroDiagnostics, expectDiagnostics, expectDiagnosticsIncludes } from './testHelpers.spec';
+import { expect } from 'chai';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import util from './util';
+import { CancellationTokenSource } from 'vscode-languageserver';
+import type { Plugin } from './interfaces';
+
+describe('CrossScopeValidator', () => {
+    let sinon = sinonImport.createSandbox();
+    let rootDir = process.cwd();
+    let program: Program;
+    beforeEach(() => {
+        program = new Program({
+            rootDir: rootDir
+        });
+        program.createSourceScope();
+    });
+    afterEach(() => {
+        sinon.restore();
+        program.dispose();
+    });
+
+    it('handles prop access from component interface when inside a typecast', () => {
+        program.options.autoImportComponentScript = true;
+        program.setFile('components/CustomButton.xml', trim`
+            <component name="CustomButton" extends="Group">
+                <interface>
+                    <field id="buttonProp" type="string" />
+                </interface>
+            </component>
+        `);
+        program.setFile('components/CustomButton.bs', `
+            sub test()
+                thing = (m.button as roSGNodeCustomButton).buttonProp
+            end sub
+        `);
+        program.validate();
+        expectZeroDiagnostics(program);
+    });
+
+    describe('providedNodes', () => {
+        it('builds a tree', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                sub callOutsideFunc()
+                    outsideFunc()
+                end sub
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                sub outsideFunc()
+                    print "hello"
+                end sub
+
+                class Klass
+                    x as integer
+                end class
+
+                interface IFace
+                    x as float
+                    y as float
+                end interface
+            `);
+            program.validate();
+            const sourceScope = program.getScopeByName('source');
+            const results = program.crossScopeValidation.getProvidedTree(sourceScope);
+            const tree = results.providedTree;
+            expect(tree.getSymbol('callOutsideFunc')).to.exist;
+            expect(tree.getSymbol('outsideFunc')).to.exist;
+            expect(tree.getSymbol('Klass')).to.exist;
+            expect(tree.getSymbol('IFace')).to.exist;
+        });
+
+        it('finds duplicates', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha.beta
+                    sub thing()
+                       alpha.outsideFunc()
+                    end sub
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace alpha
+                    sub outsideFunc()
+                        print "hello"
+                    end sub
+
+                    namespace beta
+                        class Thing
+                            x as integer
+                        end class
+                end namespace
+            `);
+            program.validate();
+            const sourceScope = program.getScopeByName('source');
+            const results = program.crossScopeValidation.getProvidedTree(sourceScope);
+            const tree = results.providedTree;
+            expect(tree.getSymbol('alpha.beta.Thing')).to.exist;
+            expect(results.duplicatesMap.has('alpha.beta.thing')).to.true;
+        });
+
+        it('builds a tree from namespaces', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha.beta
+                    sub callOutsideFunc()
+                       alpha.outsideFunc()
+                    end sub
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                sub outsideFunc()
+                end sub
+
+                namespace alpha
+                    sub outsideFunc()
+                        print "hello"
+                    end sub
+
+                    namespace beta
+                        class Klass
+                            x as integer
+                        end class
+
+                        interface IFace
+                            x as float
+                            y as float
+                        end interface
+                    end namespace
+                end namespace
+            `);
+            program.validate();
+            const sourceScope = program.getScopeByName('source');
+            const results = program.crossScopeValidation.getProvidedTree(sourceScope);
+            const tree = results.providedTree;
+            expect(tree.getSymbol('alpha.beta.callOutsideFunc')).to.exist;
+            expect(tree.getSymbol('outsideFunc')).to.exist;
+            expect(tree.getSymbol('alpha.outsideFunc')).to.exist;
+            expect(tree.getSymbol('alpha.beta.Klass')).to.exist;
+            expect(tree.getSymbol('alpha.beta.IFace')).to.exist;
+        });
+    });
+
+    describe('provides & requires', () => {
+        it('finds a required symbol in another file', () => {
+            let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                sub callOutsideFunc()
+                    outsideFunc()
+                end sub
+            `);
+            let file2 = program.setFile<BrsFile>('source/file2.bs', `
+                sub outsideFunc()
+                    print "hello"
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(file1.requiredSymbols.length).to.eq(1);
+            expect(file2.requiredSymbols.length).to.eq(0);
+            const sourceScopeIssues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName('source'));
+            expect(sourceScopeIssues.missingSymbols.size).to.eq(0);
+        });
+
+        it('finds a required symbol in another file for each scope', () => {
+            let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                sub callOutsideFunc()
+                    outsideFunc()
+                end sub
+            `);
+            let file2 = program.setFile<BrsFile>('source/file2.bs', `
+                sub outsideFunc()
+                    print "hello from source"
+                end sub
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            let widgetBs = program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    callOutsideFunc()
+                end sub
+
+                sub outsideFunc()
+                    print "hello from widget"
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(file1.requiredSymbols.length).to.eq(1);
+            expect(file2.requiredSymbols.length).to.eq(0);
+            expect(widgetBs.requiredSymbols.length).to.eq(1);
+            const sourceScopeIssues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName('source'));
+            expect(sourceScopeIssues.missingSymbols.size).to.eq(0);
+            const widgetScopeIssues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName(`components${path.sep}Widget.xml`));
+            expect(widgetScopeIssues.missingSymbols.size).to.eq(0);
+        });
+
+        it('finds a required symbol in a namespace in another file', () => {
+            let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha
+                    sub callOutsideFunc()
+                        outsideFunc()
+                    end sub
+                end namespace
+            `);
+            let file2 = program.setFile<BrsFile>('source/file2.bs', `
+                namespace alpha
+                    sub outsideFunc()
+                        print "hello from source"
+                    end sub
+                end namespace
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(file1.requiredSymbols.length).to.eq(1);
+            expect(file2.requiredSymbols.length).to.eq(0);
+            const sourceScopeIssues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName('source'));
+            expect(sourceScopeIssues.missingSymbols.size).to.eq(0);
+        });
+
+
+        it('finds if a required symbol is defined different in different scopes', () => {
+            let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                sub callOutsideFunc()
+                    print outsideFunc()
+                end sub
+            `);
+            let file2 = program.setFile<BrsFile>('source/file2.bs', `
+                function outsideFunc() as string
+                    return "hello from source"
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            let widgetBs = program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    print callOutsideFunc()
+                end sub
+
+                function outsideFunc() as integer
+                    return 123
+                end function
+            `);
+            program.validate();
+            //expectZeroDiagnostics(program);
+            expect(file1.requiredSymbols.length).to.eq(1);
+            expect(file2.requiredSymbols.length).to.eq(0);
+            expect(widgetBs.requiredSymbols.length).to.eq(1);
+            const incompatibleResolutions = program.crossScopeValidation.getIncompatibleSymbolResolutions();
+            expect(incompatibleResolutions.length).to.eq(1);
+            expect(incompatibleResolutions[0].incompatibleScopes.size).to.eq(2);
+        });
+
+        it('finds types defined in different file', () => {
+            let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                function takesIface(z as MyInterface) as string
+                    return z.name
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                interface MyInterface
+                    name as string
+                end interface
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(file1.requiredSymbols.length).to.eq(1);
+            expect(file1.requiredSymbols[0].flags).to.eq(SymbolTypeFlag.typetime);
+            expect(file1.requiredSymbols[0].typeChain[0].name).to.eq('MyInterface');
+            const sourceScopeIssues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName('source'));
+            expect(sourceScopeIssues.missingSymbols.size).to.eq(0);
+        });
+
+        it('finds members of typecasts of types defined in different file', () => {
+            let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                function takesIface(z) as string
+                    return (z as MyInterface).name
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                interface MyInterface
+                    name as string
+                end interface
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(file1.requiredSymbols.length).to.eq(1);
+            expect(file1.requiredSymbols[0].flags).to.eq(SymbolTypeFlag.typetime);
+            expect(file1.requiredSymbols[0].typeChain[0].name).to.eq('MyInterface');
+            const sourceScopeIssues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName('source'));
+            expect(sourceScopeIssues.missingSymbols.size).to.eq(0);
+        });
+    });
+
+    describe('incompatibleSymbolDefinition', () => {
+        it('allows different symbols that are compatible across scopes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                function callsOther() as string
+                    return otherFunc()
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                function otherFunc() as string
+                    return "hello"
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    callsOther()
+                end sub
+
+                function otherFunc() as string ' same function signature as in file2.bs
+                    return "goodbye"
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('finds symbols inconsistent across scopes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                function callsOther() as string
+                     otherFunc()
+                     return "test"
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                function otherFunc() as string
+                    return "hello"
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    callsOther()
+                end sub
+
+                function otherFunc() as integer
+                    return 42
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.incompatibleSymbolDefinition('otherFunc', { scopes: ['source', `components${path.sep}Widget.xml`] }).message
+            ]);
+        });
+
+        it('finds namespaced symbols inconsistent across scopes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                function callsAlphaBetaOther() as string
+                     alpha.beta.otherFunc()
+                     return "test"
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace alpha.beta
+                    function otherFunc() as string
+                        return "hello"
+                    end function
+                end namespace
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    callsAlphaBetaOther()
+                end sub
+
+                namespace alpha.beta
+                    function otherFunc() as integer
+                        return 42
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.incompatibleSymbolDefinition('alpha.beta.otherFunc', { scopes: ['source', `components${path.sep}Widget.xml`] }).message
+            ]);
+        });
+
+        it('finds relative namespaced symbols inconsistent across scopes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha.beta
+                    function callsOther() as string
+                        otherFunc()
+                        return "test"
+                    end function
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace alpha.beta
+                    function otherFunc() as string
+                        return "hello"
+                    end function
+                end namespace
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    alpha.beta.callsOther()
+                end sub
+
+                namespace alpha.beta
+                    function otherFunc() as integer
+                        return 42
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.incompatibleSymbolDefinition('otherFunc', { scopes: ['source', `components${path.sep}Widget.xml`] }).message
+            ]);
+        });
+
+        it('adds a diagnostic when a file import changes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                interface iface1
+                    name as string
+                    otherIface as iface2
+                end interface
+
+                function useIface1(x as iface1) as integer
+                    out = x.otherIface.data + 2
+                    return out
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                interface iface2
+                    data as integer
+                end interface
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/widget.bs', `
+                import "pkg:/source/file2.bs"
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            program.setFile<BrsFile>('components/file3.bs', `
+                interface iface2
+                    data as string
+                end interface
+            `);
+            program.setFile<BrsFile>('components/widget.bs', `
+                import "file3.bs"
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.incompatibleSymbolDefinition('iface2', { scopes: ['source', `components${path.sep}Widget.xml`] }).message
+            ]);
+        });
+    });
+
+    describe('cannotFindName', () => {
+        it('should not complain when all non-namespaced symbols are found', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                function callsOther() as string
+                    return otherFunc()
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                function otherFunc() as string
+                    return "hello"
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    callsOther()
+                end sub
+
+                function otherFunc() as string
+                    return "goodbye"
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should not have scope specific error if symbol not found in any scope', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                function callsOther() as string
+                    return otherFunc()
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    callsOther()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindFunction('otherFunc').message
+            ]);
+        });
+
+        it('should allow namespaced symbols to match a require in a namespace', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha.beta
+                    function callsOther() as string
+                        return otherFunc()
+                    end function
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                function otherFunc() as string ' non-namespaced - matches for scope source
+                    return "hello"
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    alpha.beta.callsOther()
+                end sub
+
+                namespace alpha.beta
+                    function otherFunc() as string ' namespaced - matches for scope Widget
+                        return "goodbye"
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should find when a non-namespaced symbols are not in a second scope', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                function callsOther() as string
+                    otherFunc()
+                    return "test"
+                end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                function otherFunc() as string
+                    return "hello"
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            // "otherFunc" is in Widget
+            program.setFile<BrsFile>('components/Widget.bs', `
+                sub init()
+                    callsOther()
+                end sub
+
+                function otherFunc() as string
+                    return "goodbye"
+                end function
+            `);
+
+            program.setFile<BrsFile>('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            // "otherFunc" is NOT in Widget2
+            program.setFile<BrsFile>('components/Widget2.bs', `
+                sub init()
+                    callsOther()
+                end sub
+            `);
+            program.validate();
+
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindFunction('otherFunc', `components${path.sep}Widget2.xml`).message
+            ]);
+        });
+
+        it('should validate when type is not available in a second scope', () => {
+            program.setFile<BrsFile>('components/file1.bs', `
+                interface iface1 ' this file is in components - it is not in source scope
+                    data as iface2
+                end interface
+            `);
+            program.setFile<BrsFile>('components/file2.bs', `
+                interface iface2
+                    name as string
+                end interface
+            `);
+
+            program.setFile<BrsFile>('components/common.bs', `
+                sub printData(x as iface1)
+                    print x.data.name
+                end sub
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                </component>
+            `);
+            // "iface2" is in Widget
+            program.setFile<BrsFile>('components/Widget.bs', `
+                import "pkg:/components/file1.bs"
+                import "pkg:/components/file2.bs"
+                import "pkg:/components/common.bs"
+            `);
+
+            program.setFile<BrsFile>('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                </component>
+            `);
+            // "iface2" is NOT in Widget2
+            program.setFile<BrsFile>('components/Widget2.bs', `
+                import "pkg:/components/file1.bs"
+                import "pkg:/components/common.bs"
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, [
+                DiagnosticMessages.cannotFindName('iface2', `components${path.sep}Widget2.xml`).message
+            ]);
+        });
+
+        it('should validate when type is not available in an new scope', () => {
+            program.setFile<BrsFile>('components/file1.bs', `
+                interface iface1 ' this file is in components - it is not in source scope
+                    data as iface2
+                end interface
+            `);
+            program.setFile<BrsFile>('components/file2.bs', `
+                interface iface2
+                    name as string
+                end interface
+            `);
+
+            program.setFile<BrsFile>('components/common.bs', `
+                sub printData(x as iface1)
+                    print x.data.name
+                end sub
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                </component>
+            `);
+            // "iface2" is in Widget
+            program.setFile<BrsFile>('components/Widget.bs', `
+                import "pkg:/components/file1.bs"
+                import "pkg:/components/file2.bs"
+                import "pkg:/components/common.bs"
+            `);
+
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            program.setFile<BrsFile>('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                </component>
+            `);
+            // "iface2" is NOT in Widget2
+            program.setFile<BrsFile>('components/Widget2.bs', `
+                import "pkg:/components/file1.bs"
+                import "pkg:/components/common.bs"
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, [
+                DiagnosticMessages.cannotFindName('iface2', `components${path.sep}Widget2.xml`).message
+            ]);
+        });
+
+        it('should validate when namespaced symbol in second scope is missing because of file change', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha
+                    namespace beta
+                        function someFunc() as string
+                            return "hello"
+                        end function
+                    end namespace
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                sub otherFunc()
+                    print alpha.beta.someFunc() + " world"
+                end sub
+            `);
+
+            program.setFile<BrsFile>('source/file3.bs', `
+                import "file1.bs"
+                import "file2.bs"
+            `);
+
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                </component>
+            `);
+
+            program.setFile<BrsFile>('components/Widget.bs', `
+                import "pkg:/source/file3.bs"
+
+                sub init()
+                    alpha.beta.someFunc()
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            // change file3 so  alpha.beta.someFunc is not available
+            program.setFile<BrsFile>('pkg:/source/file3.bs', `
+                namespace alpha.beta ' need to define the namespace, but not someFunc()
+                    const pi = 3.14
+                end namespace
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindFunction('someFunc', 'alpha.beta.someFunc', 'alpha.beta', 'namespace').message
+            ]);
+        });
+
+        it('should find relative namespace items defined in another file', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha.beta
+                    enum Direction
+                        up
+                        down
+                    end enum
+
+                    class Foo
+                        x as integer
+                        dir as Direction
+                    end class
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace alpha.beta
+                    interface Data
+                        name as string
+                        id as integer
+                    end interface
+                end namespace
+            `);
+
+            program.setFile<BrsFile>('source/file3.bs', `
+                namespace Alpha.Beta
+                    class Bar extends Foo
+                        function getData() as Data
+                            return {name: m.dir.toStr(), id: m.x}
+                        end function
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('should find member symbols in other file when editing', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace alpha.beta
+                    enum Direction
+                        up
+                        down
+                    end enum
+
+                    class Foo
+                         dir as Direction
+                    end class
+                end namespace
+            `);
+
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace Alpha.Beta
+                    class Bar extends Foo
+                        sub goDown()
+                            m.dir = Direction.down
+                        end sub
+                    end class
+                end namespace
+            `);
+
+            const file3Text = `
+                namespace Alpha.Beta
+                    class Other
+                        function getPi() as float
+                            return 3.14
+                        end function
+                    end class
+                end namespace
+            `;
+
+            program.setFile<BrsFile>('source/file3.bs', file3Text);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            program.setFile<BrsFile>('source/file3.bs', file3Text); // NO CHANGE!!
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('const values', () => {
+            it('should allow const values to be composed of other const values from namespaces', () => {
+                program.setFile('source/constants.bs', `
+                    const top_pi = alpha.beta.pi
+                    const top_two = alpha.gamma.two
+                    const top_twoPi = top_two * top_pi
+                `);
+                program.setFile('source/ns.bs', `
+                    namespace alpha.beta
+                        const pi = 3.14
+                    end namespace
+
+                    namespace alpha.gamma
+                        const two = 2
+                    end namespace
+                `);
+
+                program.setFile('components/widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="pkg:/components/widget.bs"/>
+                    </component>
+                `);
+
+                program.setFile('components/widget.bs', `
+                    import "pkg:/source/constants.bs"
+                    import "pkg:/source/ns.bs"
+
+                    sub init()
+                        print top_twoPi
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+
+        it('allows union types from imports', () => {
+            program.setFile('components/namespaces.bs', `
+                namespace alpha
+                    namespace beta
+                        interface BaseCase
+                            name as string
+                        end interface
+                    end namespace
+                end namespace
+
+            `);
+            program.setFile('components/utils.bs', `
+                namespace alpha
+                    namespace beta
+                        interface OtherCase
+                            name as string
+                        end interface
+                    end namespace
+                end namespace
+
+            `);
+            program.setFile('components/widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="pkg:/components/widget.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/widget.bs', `
+                import "pkg:/components/utils.bs"
+                import "pkg:/components/namespaces.bs"
+
+                sub foo(input as alpha.beta.BaseCase or alpha.beta.OtherCase)
+                    print input.name
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('finds custom components', () => {
+            program.setFile('components/utils.bs', `
+                function printWidgetName(widg as roSGNodeWidget)
+                    print widg.name
+                end function
+
+                function getWidget(name as string) as roSGNodeWidget
+                    widge = createObject("roSgNode", "Widget")
+                    widge.name = name
+                    return widge
+                end function
+            `);
+            program.setFile('components/widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="pkg:/components/widget.bs"/>
+                    <interface>
+                        <field id="name" type="string" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/widget.bs', `
+                import "pkg:/components/utils.bs"
+
+                sub init()
+                    stuff(m.top as roSGNodeWidget)
+                end sub
+
+                sub stuff(w as roSgNodeWidget)
+                    printWidgetName(w)
+                end sub
+            `);
+
+            program.setFile('components/other.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Other" extends="Group">
+                    <script uri="pkg:/components/other.bs"/>
+                    <interface>
+                        <field id="name" type="string" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/other.bs', `
+                import "pkg:/components/utils.bs"
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+    });
+
+    describe('alias statements', () => {
+        it('allows alias namespace and referencing it', () => {
+            program.setFile('components/utils.bs', `
+                namespace get
+                    function hello() as string
+                        return "hello"
+                    end function
+                end namespace
+            `);
+
+            program.setFile('components/widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="pkg:/components/widget.bs"/>
+                    <script uri="pkg:/components/utils.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/widget.bs', `
+                alias get2 = get
+
+                sub foo()
+                    print get2.hello()
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('gracefully handles circular reference', () => {
+            program.setFile('components/utils.bs', `
+                namespace get
+                    function aa()
+                        return {}
+                    end function
+                end namespace
+
+            `);
+
+            program.setFile('components/widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="pkg:/components/widget.bs"/>
+                    <script uri="pkg:/components/utils.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/widget.bs', `
+                alias get2 = get2
+
+                sub foo()
+                    print "hello"
+                end sub
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.circularReferenceDetected('get2')
+            ]);
+            program.setFile('components/widget.bs', `
+                alias get2 = get 'no more circular reference
+
+                sub foo()
+                    print "hello"
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('revalidates when source namespace changes', () => {
+            program.setFile('components/utils.bs', `
+                namespace alpha
+                    function passThru(val as integer) as string
+                        return val.toStr()
+                    end function
+                end namespace
+
+            `);
+
+            program.setFile('components/widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="pkg:/components/widget.bs"/>
+                    <script uri="pkg:/components/utils.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/widget.bs', `
+                alias beta = alpha
+
+                sub foo()
+                    print beta.passThru(1)
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            // now alpha.passthru takes a string
+            program.setFile('components/utils.bs', `
+                namespace alpha
+                    function passThru(val as string) as string
+                        return val.toStr()
+                    end function
+                end namespace
+
+            `);
+            program.validate();
+
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message
+            ]);
+        });
+    });
+
+    describe('revalidation', () => {
+        it('works for multi-scope usage, when variable is passed as function param', () => {
+            program.options.autoImportComponentScript = true;
+            //set a baseline where everyone is happy
+            program.setFile('components/TextOptions.bs', `
+                interface TextOptions
+                    fontName as string
+                end interface
+            `);
+
+            const button1 = program.setFile('components/Button1.bs', `
+                import "pkg:/components/TextOptions.bs"
+                function configure(options as TextOptions)
+                    m.fontName = options.fontName
+                end function
+            `);
+            program.setFile('components/Button1.xml', `
+                <component name="Button1" extends="Group">
+                </component>
+            `);
+
+            const button2 = program.setFile('components/Button2.bs', `
+                import "pkg:/components/TextOptions.bs"
+                function configure(options as TextOptions)
+                    m.fontName = options.fontName
+                end function
+            `);
+
+            program.setFile('components/Button2.xml', `
+                <component name="Button2" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //now rename the interface property and verify both files have an error
+            program.setFile('components/TextOptions.bs', `
+                interface TextOptions
+                    fontFileName as string 'renamed from "fontName" to "fontFileName"
+                end interface
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    message: DiagnosticMessages.cannotFindName('fontName', 'TextOptions.fontName', 'TextOptions').message,
+                    location: { uri: util.pathToUri(button1.srcPath) }
+                },
+                {
+                    message: DiagnosticMessages.cannotFindName('fontName', 'TextOptions.fontName', 'TextOptions').message,
+                    location: { uri: util.pathToUri(button2.srcPath) }
+                }
+            ]);
+        });
+
+        it('works for multi-scope usage, with namespaced functions', () => {
+            program.options.autoImportComponentScript = true;
+            //set a baseline where everyone is happy
+            program.setFile('components/namespace.bs', `
+                namespace alpha
+                    namespace beta
+                        function getValue() as string
+                            return "value"
+                        end function
+                    end namespace
+                end namespace
+            `);
+
+            const button1 = program.setFile('components/Button1.bs', `
+                import "pkg:/components/namespace.bs"
+                function configure()
+                    m.label.text = alpha.beta.getValue()
+                end function
+            `);
+            program.setFile('components/Button1.xml', `
+                <component name="Button1" extends="Group">
+                </component>
+            `);
+
+            const button2 = program.setFile('components/Button2.bs', `
+                import "pkg:/components/namespace.bs"
+                namespace alpha.beta
+                    function configure()
+                        m.label.text = getValue()
+                    end function
+                end namespace
+            `);
+
+            program.setFile('components/Button2.xml', `
+                <component name="Button2" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //now rename the interface property and verify both files have an error
+            program.setFile('components/namespace.bs', `
+                namespace alpha
+                    namespace beta
+                        function getValue(text as string) as string
+                            return text
+                        end function
+                    end namespace
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    message: DiagnosticMessages.mismatchArgumentCount(1, 0).message,
+                    location: { uri: util.pathToUri(button1.srcPath) }
+                },
+                {
+                    message: DiagnosticMessages.mismatchArgumentCount(1, 0).message,
+                    location: { uri: util.pathToUri(button2.srcPath) }
+                }
+            ]);
+        });
+
+        it('works for multi-scope usage, with namespaced consts', () => {
+            program.options.autoImportComponentScript = true;
+            //set a baseline where everyone is happy
+            program.setFile('source/test.bs', `
+                namespace alpha.beta
+                   const PI = 3.14
+                end namespace
+            `);
+
+            program.setFile('components/Button1.bs', `
+                import "pkg:/source/test.bs"
+                function configure()
+                    m.label.text = alpha.beta.PI.toStr()
+                end function
+            `);
+            program.setFile('components/Button1.xml', `
+                <component name="Button1" extends="Group">
+                </component>
+            `);
+
+            program.setFile('components/Button2.bs', `
+                import "pkg:/source/test.bs"
+                namespace alpha.beta
+                    sub configure()
+                        m.label.text = alpha.beta.PI.toStr()
+                    end sub
+
+                    sub noop()
+                        print "hello"
+                    end sub
+                end namespace
+            `);
+
+            program.setFile('components/Button2.xml', `
+                <component name="Button2" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //now rename the interface property and verify both files have an error
+            program.setFile('source/test.bs', `
+                namespace alpha.beta
+                    const PI = 3.14159
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('works for multi-scope usage, with namespaced consts name changes', () => {
+            program.options.autoImportComponentScript = true;
+            program.logger.logLevel = 'info';
+            //set a baseline where everyone is happy
+            program.setFile('source/test.bs', `
+                namespace alpha.beta
+                   const PI = 3.14
+                end namespace
+            `);
+
+            for (let i = 0; i < 100; i++) {
+
+                program.setFile(`components/Button${i}.bs`, `
+                    import "pkg:/source/test.bs"
+                    namespace alpha.beta
+                        sub configure(x = alpha.beta.PI)
+                            print x
+                        end sub
+                    end namespace
+                `);
+
+                program.setFile(`components/Button${i}.xml`, `
+                    <component name="Button${i}" extends="Group">
+                    </component>
+                `);
+            }
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //now rename the interface property and verify both files have an error
+            program.setFile('source/test.bs', `
+                namespace alpha.beta
+                    const PIE = 3.14159
+                end namespace
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, [
+                DiagnosticMessages.cannotFindName('PI', 'alpha.beta.PI', 'alpha.beta', 'namespace').message
+            ]);
+        });
+
+        it('works for multi-scope usage, when changing imported namespace members', () => {
+            program.options.autoImportComponentScript = true;
+            //set a baseline where everyone is happy
+            program.setFile('source/test.bs', `
+                namespace alpha.beta
+                   function getValue()
+                        return 1
+                    end function
+
+                    namespace charlie
+                        const hello = "hello"
+                    end namespace
+                end namespace
+            `);
+
+            const button1 = program.setFile('components/Button1.bs', `
+                import "pkg:/source/test.bs"
+                function configure()
+                    m.label.text = alpha.beta.getValue.toStr()
+                end function
+
+                sub noop()
+                    print alpha.beta.charlie.hello
+                end sub
+            `);
+            program.setFile('components/Button1.xml', `
+                <component name="Button1" extends="Group">
+                </component>
+            `);
+
+            const button2 = program.setFile('components/Button2.bs', `
+                import "pkg:/source/test.bs"
+                namespace alpha.beta
+                    sub configure()
+                        m.label.text = getValue.toStr()
+                    end sub
+
+                    sub noop()
+                        print "hello"
+                    end sub
+
+                    sub noop2()
+                        print alpha.beta.charlie.hello
+                    end sub
+                end namespace
+            `);
+
+            program.setFile('components/Button2.xml', `
+                <component name="Button2" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //now rename the interface property and verify both files have an error
+            program.setFile('source/test.bs', `
+                namespace alpha.beta
+                    function getOtherValue()
+                        return 1
+                    end function
+
+                    namespace charlie
+                        const hello = "hello"
+                    end namespace
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    message: DiagnosticMessages.cannotFindName('getValue', 'alpha.beta.getValue', 'alpha.beta', 'namespace').message,
+                    location: { uri: util.pathToUri(button1.srcPath) }
+                },
+                {
+                    message: DiagnosticMessages.cannotFindName('getValue').message,
+                    location: { uri: util.pathToUri(button2.srcPath) }
+                }
+            ]);
+        });
+
+        it('works when changing file multiple times', () => {
+            program.options.autoImportComponentScript = true;
+            //set a baseline where everyone is happy
+            program.setFile('source/test.bs', `
+                namespace alpha.beta
+                    function someFunc()
+                        return "test"
+                    end function
+                end namespace
+            `);
+
+            const widgetFile = program.setFile('components/Widget.bs', `
+                import "pkg:/source/test.bs"
+                sub init()
+                    alpha.beta.someFunc()
+                end sub
+            `);
+            program.setFile('components/Widget.xml', `
+                <component name="Widget" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            let testCount = 4;
+            while (testCount > 0) {
+                testCount--;
+
+                //now rename the interface property and verify both files have an error
+                program.setFile('source/test.bs', `
+                    namespace alpha.beta
+                        function notSomeFunc()
+                            return "test"
+                        end function
+                    end namespace
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    {
+                        message: DiagnosticMessages.cannotFindFunction('someFunc', 'alpha.beta.someFunc', 'alpha.beta', 'namespace').message,
+                        location: { uri: util.pathToUri(widgetFile.srcPath) }
+                    }
+                ]);
+
+                //reset file:
+                program.setFile('source/test.bs', `
+                    namespace alpha.beta
+                        function someFunc()
+                            return "test"
+                        end function
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            }
+        });
+    });
+
+    describe('duplicate symbols / name collisions', () => {
+        it('finds duplicates', () => {
+            program.options.autoImportComponentScript = true;
+
+            program.setFile('source/utils.bs', `
+                interface Test
+                    name as string
+                end interface
+            `);
+
+            program.setFile('components/Button1.bs', `
+                import "pkg:/source/utils.bs"
+                const Test = "test"
+            `);
+            program.setFile('components/Button1.xml', `
+                <component name="Button1" extends="Group">
+                </component>
+            `);
+
+            program.setFile('components/Button2.bs', `
+                import "pkg:/source/utils.bs"
+                function test()
+                end function
+            `);
+
+            program.setFile('components/Button2.xml', `
+                <component name="Button2" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Const', 'Interface', 'Test'),
+                DiagnosticMessages.nameCollision('Interface', 'Const', 'Test'),
+                DiagnosticMessages.nameCollision('Function', 'Interface', 'Test'),
+                DiagnosticMessages.nameCollision('Interface', 'Function', 'test')
+            ]);
+        });
+
+        it('finds duplicates inside a namespace', () => {
+            program.options.autoImportComponentScript = true;
+
+            program.setFile('source/utils.bs', `
+                namespace alpha.beta
+                    interface Test
+                        name as string
+                    end interface
+                end namespace
+            `);
+
+            program.setFile('components/Button1.bs', `
+                import "pkg:/source/utils.bs"
+                namespace alpha.beta
+                    const Test = "test"
+                end namespace
+            `);
+            program.setFile('components/Button1.xml', `
+                <component name="Button1" extends="Group">
+                </component>
+            `);
+
+            program.setFile('components/Button2.bs', `
+                import "pkg:/source/utils.bs"
+                namespace alpha.beta
+                    function test()
+                    end function
+                end namespace
+            `);
+
+            program.setFile('components/Button2.xml', `
+                <component name="Button2" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Const', 'Interface', 'alpha.beta.Test'),
+                DiagnosticMessages.nameCollision('Interface', 'Const', 'alpha.beta.Test'),
+                DiagnosticMessages.nameCollision('Function', 'Interface', 'alpha.beta.Test'),
+                DiagnosticMessages.nameCollision('Interface', 'Function', 'alpha.beta.test')
+            ]);
+        });
+
+        it('does not have diagnostic if items are namespaced', () => {
+            program.options.autoImportComponentScript = true;
+
+            program.setFile('source/utils.bs', `
+                interface Test
+                    name as string
+                end interface
+            `);
+
+            program.setFile('components/Button1.bs', `
+                import "pkg:/source/utils.bs"
+                namespace alpha.beta
+                    const Test = "test"
+                end namespace
+            `);
+            program.setFile('components/Button1.xml', `
+                <component name="Button1" extends="Group">
+                </component>
+            `);
+
+            program.setFile('components/Button2.bs', `
+                import "pkg:/source/utils.bs"
+                namespace alpha.beta
+                    function test()
+                    end function
+                end namespace
+            `);
+
+            program.setFile('components/Button2.xml', `
+                <component name="Button2" extends="Group">
+                </component>
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('finds duplicates in same file', () => {
+            program.options.autoImportComponentScript = true;
+
+            program.setFile('source/utils.bs', `
+                interface Test
+                    name as string
+                end interface
+
+                const Test = 89
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Const', 'Interface', 'Test'),
+                DiagnosticMessages.nameCollision('Interface', 'Const', 'Test')
+            ]);
+        });
+
+        it('finds namespaced duplicates in same file', () => {
+            program.options.autoImportComponentScript = true;
+
+            program.setFile('source/utils.bs', `
+                namespace alpha
+                    namespace beta
+                        interface Test
+                            name as string
+                        end interface
+
+                        const Test = 89
+                    end namespace
+                end namespace
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Const', 'Interface', 'alpha.beta.Test'),
+                DiagnosticMessages.nameCollision('Interface', 'Const', 'alpha.beta.Test')
+            ]);
+        });
+
+        it('finds duplicates when using type statements', () => {
+            program.setFile('source/utils.bs', `
+                namespace alpha
+                    type myInt = integer
+
+
+                    interface myInt
+                        value as string
+                    end interface
+                end namespace
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Type', 'Interface', 'alpha.myInt'),
+                DiagnosticMessages.nameCollision('Interface', 'Type', 'alpha.myInt')
+            ]);
+        });
+    });
+
+    describe('common file change propagation across scopes', () => {
+        function setupCommonFileWithTwoWidgets(commonContents: string) {
+            program.setFile('source/common.bs', commonContents);
+            program.setFile('components/Widget1.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget1" extends="Group">
+                    <script uri="Widget1.bs"/>
+                    <script uri="pkg:/source/common.bs"/>
+                </component>
+            `);
+            program.setFile('components/Widget1.bs', `
+                sub init()
+                    commonFunc()
+                end sub
+            `);
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <script uri="pkg:/source/common.bs"/>
+                </component>
+            `);
+            program.setFile('components/Widget2.bs', `
+                sub init()
+                    commonFunc()
+                end sub
+            `);
+        }
+
+        it('renaming a function in a common file propagates errors to all consuming scopes', () => {
+            setupCommonFileWithTwoWidgets(`
+                sub commonFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            program.setFile('source/common.bs', `
+                sub commonFuncRenamed()
+                end sub
+            `);
+            program.validate();
+
+            const widget1Issues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName(`components${path.sep}Widget1.xml`));
+            const widget2Issues = program.crossScopeValidation.getIssuesForScope(program.getScopeByName(`components${path.sep}Widget2.xml`));
+            expect(widget1Issues.missingSymbols.size, 'Widget1 should report missing-symbol after rename').to.be.greaterThan(0);
+            expect(widget2Issues.missingSymbols.size, 'Widget2 should report missing-symbol after rename').to.be.greaterThan(0);
+        });
+
+        it('adding a new function to a common file resolves missing-symbol errors in all scopes', () => {
+            setupCommonFileWithTwoWidgets(`
+                sub somethingElse()
+                end sub
+            `);
+            program.validate();
+            //both widgets should already be reporting missing commonFunc
+            const widget1Before = program.crossScopeValidation.getIssuesForScope(program.getScopeByName(`components${path.sep}Widget1.xml`));
+            const widget2Before = program.crossScopeValidation.getIssuesForScope(program.getScopeByName(`components${path.sep}Widget2.xml`));
+            expect(widget1Before.missingSymbols.size).to.be.greaterThan(0);
+            expect(widget2Before.missingSymbols.size).to.be.greaterThan(0);
+
+            program.setFile('source/common.bs', `
+                sub somethingElse()
+                end sub
+
+                sub commonFunc()
+                end sub
+            `);
+            program.validate();
+
+            const widget1After = program.crossScopeValidation.getIssuesForScope(program.getScopeByName(`components${path.sep}Widget1.xml`));
+            const widget2After = program.crossScopeValidation.getIssuesForScope(program.getScopeByName(`components${path.sep}Widget2.xml`));
+            expect(widget1After.missingSymbols.size, 'Widget1 should resolve commonFunc after add').to.eq(0);
+            expect(widget2After.missingSymbols.size, 'Widget2 should resolve commonFunc after add').to.eq(0);
+            expectZeroDiagnostics(program);
+        });
+
+        it('renaming a function in a common file and reverting clears the diagnostics in all scopes', () => {
+            //this is the bug the tester reported: rename → diagnostics fire (good),
+            //rename back → diagnostics should clear, but they were sticking around
+            setupCommonFileWithTwoWidgets(`
+                sub commonFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //rename - should produce missing-symbol diagnostics
+            program.setFile('source/common.bs', `
+                sub commonFuncRenamed()
+                end sub
+            `);
+            program.validate();
+            const afterRename = program.getDiagnostics().filter(d => d.message.toLowerCase().includes('commonfunc'));
+            expect(afterRename.length, 'after rename, both widgets should report missing commonFunc').to.be.gte(2);
+
+            //rename back - diagnostics should clear
+            program.setFile('source/common.bs', `
+                sub commonFunc()
+                end sub
+            `);
+            program.validate();
+            const afterRevert = program.getDiagnostics().filter(d => d.message.toLowerCase().includes('commonfunc'));
+            expect(afterRevert.length, 'after reverting the name, all commonFunc diagnostics should clear').to.eq(0);
+            expectZeroDiagnostics(program);
+        });
+
+        it('adding then removing a method on a class in a common file is reflected in consuming scopes', () => {
+            program.setFile('source/common.bs', `
+                class Klass
+                    name as string
+                end class
+            `);
+            program.setFile('components/Widget1.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget1" extends="Group">
+                    <script uri="Widget1.bs"/>
+                    <script uri="pkg:/source/common.bs"/>
+                </component>
+            `);
+            program.setFile('components/Widget1.bs', `
+                sub init()
+                    k = new Klass()
+                    k.greet()
+                end sub
+            `);
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <script uri="pkg:/source/common.bs"/>
+                </component>
+            `);
+            program.setFile('components/Widget2.bs', `
+                sub init()
+                    k = new Klass()
+                    k.greet()
+                end sub
+            `);
+            program.validate();
+            //before: greet doesn't exist - both scopes should report it
+            expect(program.getDiagnostics().filter(d => d.message.includes('greet')).length).to.be.gte(2);
+
+            //add the method - errors should clear
+            program.setFile('source/common.bs', `
+                class Klass
+                    name as string
+                    sub greet()
+                    end sub
+                end class
+            `);
+            program.validate();
+            expect(program.getDiagnostics().filter(d => d.message.includes('greet')).length, 'after adding method, no greet errors').to.eq(0);
+
+            //remove the method - errors should come back
+            program.setFile('source/common.bs', `
+                class Klass
+                    name as string
+                end class
+            `);
+            program.validate();
+            expect(program.getDiagnostics().filter(d => d.message.includes('greet')).length, 'after removing method again, errors return').to.be.gte(2);
+        });
+
+        it('changing a function signature in a common file is reflected in consuming scopes', () => {
+            setupCommonFileWithTwoWidgets(`
+                sub commonFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //change signature to require an argument
+            program.setFile('source/common.bs', `
+                sub commonFunc(name as string)
+                end sub
+            `);
+            program.validate();
+            const afterSigChange = program.getDiagnostics().filter(d => d.message.toLowerCase().includes('argument'));
+            expect(afterSigChange.length, 'both widgets should report argument-count errors').to.be.gte(2);
+
+            //change signature back
+            program.setFile('source/common.bs', `
+                sub commonFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('rename then revert in common.bs clears diagnostics in all scopes (with cancellation between)', async () => {
+            //simulates the LSP path: each edit triggers an async validate that may be
+            //cancelled by the next edit. A cancelled cycle in between rename and revert
+            //must not leave stale "missing symbol" diagnostics in consuming scopes.
+            type EventName = 'beforeValidateFile' | 'validateFile' | 'afterValidateFile' | 'beforeValidateScope' | 'validateScope' | 'afterValidateScope';
+            function getCancellationPlugin(cancelOn: EventName[], tokenSource: CancellationTokenSource): Plugin {
+                const trip = (event: EventName) => {
+                    if (cancelOn.includes(event)) {
+                        tokenSource.cancel();
+                    }
+                };
+                return {
+                    name: 'cancelPlugin',
+                    beforeValidateFile: () => trip('beforeValidateFile'),
+                    validateFile: () => trip('validateFile'),
+                    afterValidateFile: () => trip('afterValidateFile'),
+                    beforeValidateScope: () => trip('beforeValidateScope'),
+                    validateScope: () => trip('validateScope'),
+                    afterValidateScope: () => trip('afterValidateScope')
+                };
+            }
+
+            setupCommonFileWithTwoWidgets(`
+                sub commonFunc()
+                end sub
+            `);
+            await program.validate({ async: true });
+            expectZeroDiagnostics(program);
+
+            //rename - cancel the validation mid-validateScope to simulate a follow-up edit
+            //arriving before validation finished
+            program.setFile('source/common.bs', `
+                sub commonFuncRenamed()
+                end sub
+            `);
+            const renameCancelToken = new CancellationTokenSource();
+            const cancelPlugin = getCancellationPlugin(['validateScope'], renameCancelToken);
+            program.plugins.add(cancelPlugin);
+            await program.validate({ async: true, cancellationToken: renameCancelToken.token });
+            program.plugins.remove(cancelPlugin);
+
+            //revert - this validation runs to completion
+            program.setFile('source/common.bs', `
+                sub commonFunc()
+                end sub
+            `);
+            await program.validate({ async: true });
+
+            const remaining = program.getDiagnostics().filter(d => d.message.toLowerCase().includes('commonfunc'));
+            expect(remaining.length, `commonFunc diagnostics should clear after revert; got: ${remaining.map(d => d.message).join(' | ')}`).to.eq(0);
+        });
+
+        it('rapid edit cycles with overlapping cancellations leave no stale diagnostics', async () => {
+            //simulates a user typing fast: each setFile starts a new async validate that
+            //cancels the previous one. After the dust settles, diagnostics should reflect
+            //the LAST committed state, not any intermediate.
+            setupCommonFileWithTwoWidgets(`
+                sub commonFunc()
+                end sub
+            `);
+            await program.validate({ async: true });
+            expectZeroDiagnostics(program);
+
+            //fire off 6 overlapping validations: rename, revert, rename, revert, rename, revert
+            //each starts before the previous one completes
+            const states = [
+                'sub commonFuncRenamed()\nend sub',
+                'sub commonFunc()\nend sub',
+                'sub commonFuncRenamed()\nend sub',
+                'sub commonFunc()\nend sub',
+                'sub commonFuncRenamed()\nend sub',
+                'sub commonFunc()\nend sub'
+            ];
+            const tokenSources: CancellationTokenSource[] = [];
+            const promises: Promise<void>[] = [];
+            for (const state of states) {
+                program.setFile('source/common.bs', `\n${state}\n`);
+                //cancel the previous run (mimicking LSP behavior)
+                tokenSources[tokenSources.length - 1]?.cancel();
+                const tokenSource = new CancellationTokenSource();
+                tokenSources.push(tokenSource);
+                promises.push(program.validate({ async: true, cancellationToken: tokenSource.token }) as Promise<void>);
+            }
+            await Promise.all(promises);
+
+            //final state is `commonFunc` (the last entry), so widgets should resolve cleanly
+            const remaining = program.getDiagnostics().filter(d => d.message.toLowerCase().includes('commonfunc'));
+            expect(remaining.length, `after rapid edit cycles ending on the original name, no commonFunc diagnostics; got: ${remaining.map(d => d.message).join(' | ')}`).to.eq(0);
+        });
+
+        it('rename-revert of a namespace function in common.bs clears diagnostics across scopes', () => {
+            program.setFile('source/common.bs', `
+                namespace alpha
+                    sub commonFunc()
+                    end sub
+                end namespace
+            `);
+            program.setFile('components/Widget1.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget1" extends="Group">
+                    <script uri="Widget1.bs"/>
+                    <script uri="pkg:/source/common.bs"/>
+                </component>
+            `);
+            program.setFile('components/Widget1.bs', `
+                sub init()
+                    alpha.commonFunc()
+                end sub
+            `);
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <script uri="pkg:/source/common.bs"/>
+                </component>
+            `);
+            program.setFile('components/Widget2.bs', `
+                sub init()
+                    alpha.commonFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            //rename inside the namespace
+            program.setFile('source/common.bs', `
+                namespace alpha
+                    sub commonFuncRenamed()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            const afterRename = program.getDiagnostics().filter(d => d.message.toLowerCase().includes('commonfunc'));
+            expect(afterRename.length, 'after rename, both widgets should report missing namespaced commonFunc').to.be.gte(2);
+
+            //revert
+            program.setFile('source/common.bs', `
+                namespace alpha
+                    sub commonFunc()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            const afterRevert = program.getDiagnostics().filter(d => d.message.toLowerCase().includes('commonfunc'));
+            expect(afterRevert.length, `after reverting namespaced fn name, all commonFunc diagnostics should clear; got: ${afterRevert.map(d => d.message).join(' | ')}`).to.eq(0);
+            expectZeroDiagnostics(program);
+        });
+    });
+});
diff --git a/src/CrossScopeValidator.ts b/src/CrossScopeValidator.ts
new file mode 100644
index 000000000..4aaf0efb2
--- /dev/null
+++ b/src/CrossScopeValidator.ts
@@ -0,0 +1,736 @@
+import type { UnresolvedSymbol } from './AstValidationSegmenter';
+import type { Scope } from './Scope';
+import type { BrsFile, ProvidedSymbol } from './files/BrsFile';
+import { DiagnosticMessages } from './DiagnosticMessages';
+import type { Program } from './Program';
+import { util } from './util';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { BscSymbol } from './SymbolTable';
+import { isCallExpression, isConstStatement, isEnumStatement, isEnumType, isFunctionStatement, isInheritableType, isInterfaceStatement, isNamespaceStatement, isNamespaceType, isReferenceType, isTypedFunctionType, isUnionType } from './astUtils/reflection';
+import type { ReferenceType } from './types/ReferenceType';
+import { getAllRequiredSymbolNames } from './types/ReferenceType';
+import type { TypeChainEntry, TypeChainProcessResult } from './interfaces';
+import { BscTypeKind } from './types/BscTypeKind';
+import { getAllTypesFromCompoundType } from './types/helpers';
+import type { BscType } from './types/BscType';
+import type { BscFile } from './files/BscFile';
+import type { ClassStatement, ConstStatement, EnumMemberStatement, EnumStatement, InterfaceStatement, NamespaceStatement } from './parser/Statement';
+import { ParseMode } from './parser/Parser';
+import { globalFile } from './globalCallables';
+import type { DottedGetExpression, VariableExpression } from './parser/Expression';
+import type { InheritableType } from './types';
+
+
+interface FileSymbolPair {
+    file: BscFile;
+    symbol: BscSymbol;
+}
+
+interface SymbolLookupKeys {
+    potentialTypeKey: string;
+    key: string;
+    namespacedKey: string;
+    namespacedPotentialTypeKey: string;
+}
+
+const CrossScopeValidatorDiagnosticTag = 'CrossScopeValidator';
+
+export class ProvidedNode {
+
+    namespaces = new Map<string, ProvidedNode>();
+    symbols = new Map<string, FileSymbolPair>();
+
+    constructor(public key: string = '', private componentsMap?: Map<string, FileSymbolPair>) { }
+
+
+    getSymbolByKey(symbolKeys: SymbolLookupKeys): FileSymbolPair {
+        return this.getSymbol(symbolKeys.namespacedKey) ??
+            this.getSymbol(symbolKeys.key) ??
+            this.getSymbol(symbolKeys.namespacedPotentialTypeKey) ??
+            this.getSymbol(symbolKeys.potentialTypeKey);
+    }
+
+    getSymbol(symbolName: string): FileSymbolPair {
+        if (!symbolName) {
+            return;
+        }
+        const lowerSymbolName = symbolName.toLowerCase();
+        if (this.componentsMap?.has(lowerSymbolName)) {
+            return this.componentsMap.get(lowerSymbolName);
+        }
+        let lowerSymbolNameParts = lowerSymbolName.split('.');
+        return this.getSymbolByNameParts(lowerSymbolNameParts, this);
+    }
+
+    getNamespace(namespaceName: string): ProvidedNode {
+        let lowerSymbolNameParts = namespaceName.toLowerCase().split('.');
+        return this.getNamespaceByNameParts(lowerSymbolNameParts);
+    }
+
+    getSymbolByNameParts(lowerSymbolNameParts: string[], root: ProvidedNode): FileSymbolPair {
+        const first = lowerSymbolNameParts?.[0];
+        const rest = lowerSymbolNameParts.slice(1);
+        if (!first) {
+            return;
+        }
+        if (this.symbols.has(first)) {
+            let result = this.symbols.get(first);
+            let currentType = result.symbol.type;
+
+            for (const namePart of rest) {
+                if (isTypedFunctionType(currentType)) {
+                    const returnType = currentType.returnType;
+                    if (returnType.isResolvable()) {
+                        currentType = returnType;
+                    } else if (isReferenceType(returnType)) {
+                        const fullName = returnType.fullName;
+                        if (fullName.includes('.')) {
+                            currentType = root.getSymbol(fullName)?.symbol?.type;
+                        } else {
+                            currentType = this.getSymbol(fullName)?.symbol?.type ??
+                                root.getSymbol(fullName)?.symbol?.type;
+                        }
+                    }
+                }
+                let typesToTry = [currentType];
+                if (isEnumType(currentType)) {
+                    typesToTry.push(currentType.defaultMemberType);
+                }
+                if (isInheritableType(currentType)) {
+                    let inheritableType = currentType;
+                    while (inheritableType?.parentType) {
+                        let parentType = inheritableType.parentType as BscType;
+                        if (isReferenceType(inheritableType.parentType)) {
+                            const fullName = inheritableType.parentType.fullName;
+                            if (fullName.includes('.')) {
+                                parentType = root.getSymbol(fullName)?.symbol?.type;
+                            } else {
+                                parentType = this.getSymbol(fullName)?.symbol?.type ??
+                                    root.getSymbol(fullName)?.symbol?.type;
+                            }
+                        }
+                        typesToTry.push(parentType);
+                        inheritableType = parentType as InheritableType;
+                    }
+
+                }
+                const extraData = {};
+
+                for (const curType of typesToTry) {
+                    currentType = curType?.getMemberType(namePart, { flags: SymbolTypeFlag.runtime, data: extraData });
+                    if (isReferenceType(currentType)) {
+                        const memberLookup = currentType.fullName;
+                        currentType = this.getSymbol(memberLookup.toLowerCase())?.symbol?.type ?? root.getSymbol(memberLookup.toLowerCase())?.symbol?.type;
+                    }
+                    if (currentType) {
+                        break;
+                    }
+                }
+
+                if (!currentType) {
+                    return;
+                }
+                // get specific member
+                result = {
+                    ...result, symbol: { name: namePart, type: currentType, data: extraData, flags: SymbolTypeFlag.runtime }
+                };
+            }
+            return result;
+
+        } else if (rest && this.namespaces.has(first)) {
+            const node = this.namespaces.get(first);
+            const parts = node.getSymbolByNameParts(rest, root);
+
+            return parts;
+        }
+    }
+
+    getNamespaceByNameParts(lowerSymbolNameParts: string[]): ProvidedNode {
+        const first = lowerSymbolNameParts?.[0]?.toLowerCase();
+        const rest = lowerSymbolNameParts.slice(1);
+        if (!first) {
+            return;
+        }
+        if (this.namespaces.has(first)) {
+            const node = this.namespaces.get(first);
+            const result = rest?.length > 0 ? node.getNamespaceByNameParts(rest) : node;
+            return result;
+        }
+    }
+
+    addSymbol(symbolName: string, symbolPair: FileSymbolPair) {
+        let lowerSymbolNameParts = symbolName.toLowerCase().split('.');
+        return this.addSymbolByNameParts(lowerSymbolNameParts, symbolPair);
+    }
+
+    private addSymbolByNameParts(lowerSymbolNameParts: string[], symbolPair: FileSymbolPair) {
+        const first = lowerSymbolNameParts?.[0];
+        const rest = lowerSymbolNameParts?.slice(1);
+        let isDuplicate = false;
+        if (!first) {
+            return;
+        }
+        if (rest?.length > 0) {
+            // first must be a namespace
+            let namespaceNode = this.namespaces.get(first);
+            if (!namespaceNode) {
+                namespaceNode = new ProvidedNode(first);
+                this.namespaces.set(first, namespaceNode);
+            }
+            return namespaceNode.addSymbolByNameParts(rest, symbolPair);
+        } else {
+            if (this.namespaces.get(first)) {
+                // trying to add a symbol that already exists as a namespace - this is a duplicate
+                return true;
+            }
+
+            // just add it to the symbols
+            const existingSymbolPair = this.symbols.get(first);
+            if (!existingSymbolPair) {
+                this.symbols.set(first, symbolPair);
+            } else {
+                isDuplicate = existingSymbolPair.symbol.data?.definingNode !== symbolPair.symbol.data?.definingNode;
+            }
+        }
+        return isDuplicate;
+    }
+}
+
+
+export class CrossScopeValidator {
+
+    constructor(public program: Program) { }
+
+    private symbolMapKeys(symbol: UnresolvedSymbol): SymbolLookupKeys[] {
+        let keysArray = new Array<SymbolLookupKeys>();
+        let unnamespacedNameLowers: string[] = [];
+
+        function joinTypeChainForKey(typeChain: TypeChainEntry[], firstType?: BscType) {
+            firstType ||= typeChain[0].type;
+            const unnamespacedNameLower = typeChain.map((tce, i) => {
+                if (i === 0) {
+                    if (isReferenceType(firstType)) {
+                        return firstType.fullName;
+                    } else if (isInheritableType(firstType)) {
+                        return tce.type.toString();
+                    }
+                    return tce.name;
+                }
+                return tce.name;
+            }).join('.').toLowerCase();
+            return unnamespacedNameLower;
+        }
+
+        if (isUnionType(symbol.typeChain[0].type) && symbol.typeChain[0].data.isInstance) {
+            const allUnifiedTypes = getAllTypesFromCompoundType(symbol.typeChain[0].type);
+            for (const unifiedType of allUnifiedTypes) {
+                unnamespacedNameLowers.push(joinTypeChainForKey(symbol.typeChain, unifiedType));
+            }
+
+        } else {
+            unnamespacedNameLowers.push(joinTypeChainForKey(symbol.typeChain));
+        }
+
+        for (const unnamespacedNameLower of unnamespacedNameLowers) {
+            const lowerFirst = symbol.typeChain[0]?.name?.toLowerCase() ?? '';
+            let namespacedName = '';
+            let lowerNamespacePrefix = '';
+            let namespacedPotentialTypeKey = '';
+            if (symbol.containingNamespaces?.length > 0 && symbol.typeChain[0]?.name.toLowerCase() !== symbol.containingNamespaces[0].toLowerCase()) {
+                lowerNamespacePrefix = `${(symbol.containingNamespaces ?? []).join('.')}`.toLowerCase();
+            }
+            if (lowerNamespacePrefix) {
+                namespacedName = `${lowerNamespacePrefix}.${unnamespacedNameLower}`;
+                namespacedPotentialTypeKey = `${lowerNamespacePrefix}.${lowerFirst}`;
+            }
+
+            keysArray.push({
+                potentialTypeKey: lowerFirst, // first entry in type chain (useful for enum types, typecasts, etc.)
+                key: unnamespacedNameLower, //full name used in code (useful for namespaced symbols)
+                namespacedKey: namespacedName, // full name including namespaces (useful for relative symbols in a namespace)
+                namespacedPotentialTypeKey: namespacedPotentialTypeKey //first entry in chain, prefixed with current namespace
+            });
+        }
+        return keysArray;
+    }
+
+    resolutionsMap = new Map<UnresolvedSymbol, Set<{ scope: Scope; sourceFile: BscFile; providedSymbol: BscSymbol }>>();
+    providedTreeMap = new Map<string, { duplicatesMap: Map<string, Set<FileSymbolPair>>; providedTree: ProvidedNode }>();
+
+
+    private componentsMap = new Map<string, FileSymbolPair>();
+
+    getRequiredMap(scope: Scope) {
+        const map = new Map<SymbolLookupKeys, UnresolvedSymbol>();
+        scope.enumerateBrsFiles((file) => {
+            for (const symbol of file.requiredSymbols) {
+                const symbolKeysArray = this.symbolMapKeys(symbol);
+                for (const symbolKeys of symbolKeysArray) {
+                    map.set(symbolKeys, symbol);
+                }
+            }
+        });
+        return map;
+    }
+
+    getProvidedTree(scope: Scope) {
+        if (this.providedTreeMap.has(scope.name)) {
+            return this.providedTreeMap.get(scope.name);
+        }
+        const providedTree = new ProvidedNode('', this.componentsMap);
+        const duplicatesMap = new Map<string, Set<FileSymbolPair>>();
+
+        const referenceTypesMap = new Map<{ symbolName: string; file: BscFile; symbolObj: ProvidedSymbol }, Array<{ name: string; namespacedName?: string }>>();
+
+
+        const addSymbolWithDuplicates = (symbolName: string, file: BscFile, symbolObj: ProvidedSymbol) => {
+            // eslint-disable-next-line no-bitwise
+            const globalSymbol = this.program.globalScope.symbolTable.getSymbol(symbolName, SymbolTypeFlag.typetime | SymbolTypeFlag.runtime);
+            const symbolIsNamespace = providedTree.getNamespace(symbolName);
+            const isDupe = providedTree.addSymbol(symbolName, { file: file, symbol: symbolObj.symbol });
+            if (symbolIsNamespace || globalSymbol || isDupe || symbolObj.duplicates.length > 0) {
+                let dupesSet = duplicatesMap.get(symbolName);
+                if (!dupesSet) {
+                    dupesSet = new Set<{ file: BrsFile; symbol: BscSymbol }>();
+                    duplicatesMap.set(symbolName, dupesSet);
+                    const existing = providedTree.getSymbol(symbolName);
+                    if (existing) {
+                        dupesSet.add(existing);
+                    }
+                }
+                if (!dupesSet.has({ file: file, symbol: symbolObj.symbol })) {
+                    dupesSet.add({ file: file, symbol: symbolObj.symbol });
+                }
+                if (symbolIsNamespace) {
+                    const namespaceContainer = scope.getNamespace(symbolName);
+                    const nsNode = namespaceContainer?.namespaceStatements?.[0];
+                    if (nsNode) {
+                        const nsFile = namespaceContainer.file;
+                        const nsType = nsNode.getType({ flags: SymbolTypeFlag.typetime });
+                        let nsSymbol: BscSymbol = {
+                            name: nsNode.getName(ParseMode.BrighterScript),
+                            type: nsType,
+                            data: { definingNode: nsNode },
+                            flags: SymbolTypeFlag.typetime
+                        };
+                        if (nsSymbol && !dupesSet.has({ file: nsFile, symbol: nsSymbol })) {
+                            dupesSet.add({ file: nsFile, symbol: nsSymbol });
+                        }
+                    }
+                }
+                for (const providedDupeSymbol of symbolObj.duplicates) {
+                    if (!dupesSet.has({ file: file, symbol: providedDupeSymbol })) {
+                        dupesSet.add({ file: file, symbol: providedDupeSymbol });
+                    }
+                }
+                if (globalSymbol) {
+                    dupesSet.add({ file: globalFile, symbol: globalSymbol[0] });
+                }
+            }
+        };
+
+        scope.enumerateBrsFiles((file) => {
+            for (const [_, nameMap] of file.providedSymbols.symbolMap.entries()) {
+
+                for (const [symbolName, symbolObj] of nameMap.entries()) {
+                    if (isNamespaceType(symbolObj.symbol.type)) {
+                        continue;
+                    }
+                    addSymbolWithDuplicates(symbolName, file, symbolObj);
+                }
+            }
+
+            // find all "provided symbols" that are reference types
+            for (const [_, nameMap] of file.providedSymbols.referenceSymbolMap.entries()) {
+                for (const [symbolName, symbolObj] of nameMap.entries()) {
+                    const symbolType = symbolObj.symbol.type;
+                    const namespaceLower = symbolObj.symbol.data?.definingNode?.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript).toLowerCase();
+                    const allNames = getAllRequiredSymbolNames(symbolType, namespaceLower);
+
+                    referenceTypesMap.set({ symbolName: symbolName, file: file, symbolObj: symbolObj }, allNames);
+                }
+            }
+        });
+
+        // check provided reference types to see if they exist yet!
+        while (referenceTypesMap.size > 0) {
+            let addedSymbol = false;
+            for (const [refTypeDetails, neededNames] of referenceTypesMap.entries()) {
+                let foundNames = 0;
+                for (const neededName of neededNames) {
+                    // check if name exists or namespaced version exists
+                    if (providedTree.getSymbol(neededName.name) ?? providedTree.getSymbol(neededName.namespacedName)) {
+                        foundNames++;
+                    }
+                }
+                if (neededNames.length === foundNames) {
+                    //found all that were needed
+                    addSymbolWithDuplicates(refTypeDetails.symbolName, refTypeDetails.file, refTypeDetails.symbolObj);
+                    referenceTypesMap.delete(refTypeDetails);
+                    addedSymbol = true;
+                }
+            }
+            if (!addedSymbol) {
+                break;
+            }
+        }
+
+        const result = { duplicatesMap: duplicatesMap, providedTree: providedTree };
+        this.providedTreeMap.set(scope.name, result);
+        return result;
+    }
+
+    getIssuesForScope(scope: Scope) {
+        const requiredMap = this.getRequiredMap(scope);
+        const { providedTree, duplicatesMap } = this.getProvidedTree(scope);
+
+        const missingSymbols = new Set<UnresolvedSymbol>();
+
+        for (const [symbolKeys, unresolvedSymbol] of requiredMap.entries()) {
+
+            // check global scope for components
+            if (unresolvedSymbol.typeChain.length === 1 && this.program.globalScope.symbolTable.getSymbol(unresolvedSymbol.typeChain[0].name, unresolvedSymbol.flags)) {
+                //symbol is available in global scope. ignore it
+                continue;
+            }
+            let foundSymbol = providedTree.getSymbolByKey(symbolKeys);
+
+            if (foundSymbol) {
+                if (!unresolvedSymbol.typeChain[0].data?.isInstance) {
+                    let resolvedListForSymbol = this.resolutionsMap.get(unresolvedSymbol);
+                    if (!resolvedListForSymbol) {
+                        resolvedListForSymbol = new Set<{ scope: Scope; sourceFile: BrsFile; providedSymbol: BscSymbol }>();
+                        this.resolutionsMap.set(unresolvedSymbol, resolvedListForSymbol);
+                    }
+                    resolvedListForSymbol.add({
+                        scope: scope,
+                        sourceFile: foundSymbol.file,
+                        providedSymbol: foundSymbol.symbol
+                    });
+                }
+            } else {
+                let foundNamespace = providedTree.getNamespace(symbolKeys.key);
+
+                if (foundNamespace) {
+                    // this symbol turned out to be a namespace. This is allowed for alias statements
+                    // TODO: add check to make sure this usage is from an alias statement
+                } else {
+                    // did not find symbol!
+                    const missing = { ...unresolvedSymbol };
+                    let namespaceNode = providedTree;
+                    let currentKnownType;
+                    for (const chainEntry of missing.typeChain) {
+                        if (!chainEntry.isResolved) {
+                            // for each unresolved part of a chain, see if we can resolve it with stuff from the provided tree
+                            // and if so, mark it as resolved
+                            const lookupName = (chainEntry.type as ReferenceType)?.fullName ?? chainEntry.name;
+                            if (!currentKnownType) {
+                                namespaceNode = namespaceNode?.getNamespaceByNameParts([chainEntry.name]);
+
+                            }
+                            if (namespaceNode) {
+                                chainEntry.isResolved = true;
+                            } else {
+                                if (currentKnownType) {
+                                    currentKnownType = currentKnownType.getMemberType(chainEntry.name, { flags: SymbolTypeFlag.runtime });
+                                } else {
+                                    currentKnownType = providedTree.getSymbol(lookupName.toLowerCase())?.symbol?.type;
+                                }
+
+                                if (currentKnownType?.isResolvable()) {
+                                    chainEntry.isResolved = true;
+                                } else {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    missingSymbols.add(unresolvedSymbol);
+                }
+            }
+        }
+        return { missingSymbols: missingSymbols, duplicatesMap: duplicatesMap };
+    }
+
+    clearResolutionsForFile(file: BrsFile) {
+        for (const symbol of this.resolutionsMap.keys()) {
+            if (symbol.file === file) {
+                this.resolutionsMap.delete(symbol);
+            }
+        }
+    }
+
+    clearResolutionsForScopes(scopes: Scope[]) {
+        const lowerScopeNames = new Set(scopes.map(scope => scope.name.toLowerCase()));
+        for (const [symbol, resolutionInfos] of this.resolutionsMap.entries()) {
+            for (const info of resolutionInfos.values()) {
+                if (lowerScopeNames.has(info.scope.name.toLowerCase())) {
+                    resolutionInfos.delete(info);
+                }
+            }
+            if (resolutionInfos.size === 0) {
+                this.resolutionsMap.delete(symbol);
+            }
+        }
+    }
+
+    getFilesRequiringChangedSymbol(scopes: Scope[], changedSymbols: Map<SymbolTypeFlag, Set<string>>) {
+        const filesThatNeedRevalidation = new Set<BscFile>();
+        const filesThatDoNotNeedRevalidation = new Set<BscFile>();
+
+        for (const scope of scopes) {
+            scope.enumerateBrsFiles((file) => {
+                if (filesThatNeedRevalidation.has(file) || filesThatDoNotNeedRevalidation.has(file)) {
+                    return;
+                }
+                if (util.hasAnyRequiredSymbolChanged(file.requiredSymbols, changedSymbols)) {
+                    filesThatNeedRevalidation.add(file);
+                    return;
+                }
+                filesThatDoNotNeedRevalidation.add(file);
+            });
+        }
+        return filesThatNeedRevalidation;
+    }
+
+    getScopesRequiringChangedSymbol(scopes: Scope[], changedSymbols: Map<SymbolTypeFlag, Set<string>>) {
+        const scopesThatNeedRevalidation = new Set<Scope>();
+        const filesAlreadyChecked = new Set<BrsFile>();
+
+        for (const scope of scopes) {
+            scope.enumerateBrsFiles((file) => {
+                if (filesAlreadyChecked.has(file) || scopesThatNeedRevalidation.has(scope)) {
+                    return;
+                }
+                filesAlreadyChecked.add(file);
+
+                if (util.hasAnyRequiredSymbolChanged(file.requiredSymbols, changedSymbols)) {
+                    scopesThatNeedRevalidation.add(scope);
+                }
+            });
+        }
+        return scopesThatNeedRevalidation;
+    }
+
+    buildComponentsMap() {
+        this.componentsMap.clear();
+        // Add custom components
+        for (let componentName of this.program.getSortedComponentNames()) {
+            const typeName = 'rosgnode' + componentName;
+            const component = this.program.getComponent(componentName);
+            const componentSymbol = this.program.globalScope.symbolTable.getSymbol(typeName, SymbolTypeFlag.typetime)?.[0];
+            if (componentSymbol && component) {
+                this.componentsMap.set(typeName, { file: component.file, symbol: componentSymbol });
+            }
+        }
+    }
+
+    addDiagnosticsForScopes(scopes: Scope[]) { //, changedFiles: BrsFile[]) {
+        const addDuplicateSymbolDiagnostics = true;
+        const missingSymbolInScope = new Map<UnresolvedSymbol, Set<Scope>>();
+        this.providedTreeMap.clear();
+        this.clearResolutionsForScopes(scopes);
+
+        // Check scope for duplicates and missing symbols
+        for (const scope of scopes) {
+            this.program.diagnostics.clearByFilter({
+                scope: scope,
+                tag: CrossScopeValidatorDiagnosticTag
+            });
+
+            const { missingSymbols, duplicatesMap } = this.getIssuesForScope(scope);
+            if (addDuplicateSymbolDiagnostics) {
+                for (const [_flag, dupeSet] of duplicatesMap.entries()) {
+                    if (dupeSet.size > 1) {
+
+                        const dupesArray = [...dupeSet.values()];
+
+                        for (let i = 0; i < dupesArray.length; i++) {
+                            const dupe = dupesArray[i];
+
+                            const dupeNode = dupe?.symbol?.data?.definingNode;
+                            if (!dupeNode) {
+                                continue;
+                            }
+                            let thisName = dupe.symbol?.name;
+                            const wrappingNameSpace = dupeNode?.findAncestor<NamespaceStatement>(isNamespaceStatement);
+
+                            if (wrappingNameSpace) {
+                                thisName = `${wrappingNameSpace.getName(ParseMode.BrighterScript)}.` + thisName;
+                            }
+
+                            const thisNodeKindName = util.getAstNodeFriendlyName(dupeNode) ?? 'Item';
+
+                            for (let j = 0; j < dupesArray.length; j++) {
+                                if (i === j) {
+                                    continue;
+                                }
+                                const otherDupe = dupesArray[j];
+                                if (!otherDupe || dupe.symbol === otherDupe.symbol) {
+                                    continue;
+                                }
+
+                                const otherDupeNode = otherDupe.symbol.data?.definingNode;
+                                const otherIsGlobal = otherDupe.file.srcPath === 'global';
+
+                                if (isFunctionStatement(dupeNode) && isFunctionStatement(otherDupeNode)) {
+                                    // duplicate functions are handled in ScopeValidator
+                                    continue;
+                                }
+                                if (otherIsGlobal &&
+                                    (isInterfaceStatement(dupeNode) ||
+                                        isEnumStatement(dupeNode) ||
+                                        isConstStatement(dupeNode))) {
+                                    // these are allowed to shadow global functions
+                                    continue;
+                                }
+                                let thatName = otherDupe.symbol?.name;
+
+                                if (otherDupeNode) {
+                                    const otherWrappingNameSpace = otherDupeNode?.findAncestor<NamespaceStatement>(isNamespaceStatement);
+                                    if (otherWrappingNameSpace) {
+                                        thatName = `${otherWrappingNameSpace.getName(ParseMode.BrighterScript)}.` + thatName;
+                                    }
+                                }
+
+                                type AstNodeWithName = VariableExpression | DottedGetExpression | EnumStatement | ClassStatement | ConstStatement | EnumMemberStatement | InterfaceStatement;
+
+                                const thatNodeKindName = otherIsGlobal ? 'Global Function' : util.getAstNodeFriendlyName(otherDupeNode) ?? 'Item';
+                                let thisNameRange = (dupeNode as AstNodeWithName)?.tokens?.name?.location?.range ?? dupeNode.location?.range;
+                                let thatNameRange = (otherDupeNode as AstNodeWithName)?.tokens?.name?.location?.range ?? otherDupeNode?.location?.range;
+
+                                const relatedInformation = thatNameRange ? [{
+                                    message: `${thatNodeKindName} declared here`,
+                                    location: util.createLocationFromFileRange(otherDupe.file, thatNameRange)
+                                }] : undefined;
+                                this.program.diagnostics.register({
+                                    ...DiagnosticMessages.nameCollision(thisNodeKindName, thatNodeKindName, thatName),
+                                    location: util.createLocationFromFileRange(dupe.file, thisNameRange),
+                                    relatedInformation: relatedInformation
+                                }, {
+                                    scope: scope,
+                                    tags: [CrossScopeValidatorDiagnosticTag]
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+            // build map of the symbols and scopes where the symbols are missing per file
+            for (const missingSymbol of missingSymbols) {
+
+                let scopesWithMissingSymbol = missingSymbolInScope.get(missingSymbol);
+                if (!scopesWithMissingSymbol) {
+                    scopesWithMissingSymbol = new Set<Scope>();
+                    missingSymbolInScope.set(missingSymbol, scopesWithMissingSymbol);
+                }
+                scopesWithMissingSymbol.add(scope);
+            }
+        }
+
+        // If symbols are missing in SOME scopes, add diagnostic
+        for (const [symbol, scopeList] of missingSymbolInScope.entries()) {
+            const typeChainResult = util.processTypeChain(symbol.typeChain);
+
+            //roku built-in type names (rosgnode*, etc.) aren't tracked in any symbol table;
+            //skip cannot-find-name when the symbol's name is one of those built-ins.
+            if (typeChainResult.itemName && util.isBuiltInType(typeChainResult.itemName)) {
+                continue;
+            }
+
+            for (const scope of scopeList) {
+                this.program.diagnostics.register({
+                    ...this.getCannotFindDiagnostic(scope, symbol, typeChainResult),
+                    location: typeChainResult.location
+                }, {
+                    scope: scope,
+                    tags: [CrossScopeValidatorDiagnosticTag]
+                });
+            }
+        }
+
+        for (const resolution of this.getIncompatibleSymbolResolutions()) {
+            const symbol = resolution.symbol;
+            const incompatibleScopes = resolution.incompatibleScopes;
+            if (incompatibleScopes.size > 1) {
+                const typeChainResult = util.processTypeChain(symbol.typeChain);
+                const scopeList = [...incompatibleScopes.values()].map(s => s.name);
+                this.program.diagnostics.register({
+                    ...DiagnosticMessages.incompatibleSymbolDefinition(typeChainResult.fullChainName, { scopes: scopeList }),
+                    location: typeChainResult.location
+                }, {
+                    tags: [CrossScopeValidatorDiagnosticTag]
+                });
+            }
+        }
+    }
+
+    getIncompatibleSymbolResolutions() {
+        const incompatibleResolutions = new Array<{ symbol: UnresolvedSymbol; incompatibleScopes: Set<Scope> }>();
+        // check all resolutions and check if there are resolutions that are not compatible across scopes
+        for (const [symbol, resolutionDetails] of this.resolutionsMap.entries()) {
+            if (resolutionDetails.size < 2) {
+                // there is only one resolution... no worries
+                continue;
+            }
+            const resolutionsList = [...resolutionDetails];
+            const prime = resolutionsList[0];
+            let incompatibleScopes = new Set<Scope>();
+            let addedPrime = false;
+            for (let i = 1; i < resolutionsList.length; i++) {
+                let providedSymbolType = prime.providedSymbol.type;
+                const symbolInThisScope = resolutionsList[i].providedSymbol;
+
+                //get more general type
+                if (providedSymbolType.isEqual(symbolInThisScope.type)) {
+                    //type in this scope is the same as one we're already checking
+                } else if (providedSymbolType.isTypeCompatible(symbolInThisScope.type)) {
+                    //type in this scope is compatible with one we're storing. use most generic
+                    providedSymbolType = symbolInThisScope.type;
+                } else if (symbolInThisScope.type.isTypeCompatible(providedSymbolType)) {
+                    // type we're storing is more generic that the type in this scope
+                } else {
+                    // type in this scope is not compatible with other types for this symbol
+                    if (!addedPrime) {
+                        incompatibleScopes.add(prime.scope);
+                        addedPrime = true;
+                    }
+                    incompatibleScopes.add(resolutionsList[i].scope);
+                }
+            }
+
+            if (incompatibleScopes.size > 1) {
+                incompatibleResolutions.push({
+                    symbol: symbol,
+                    incompatibleScopes: incompatibleScopes
+                });
+            }
+        }
+        return incompatibleResolutions;
+    }
+
+    private getCannotFindDiagnostic(scope: Scope, unresolvedSymbol: UnresolvedSymbol, typeChainResult: TypeChainProcessResult) {
+        const parentDescriptor = this.getParentTypeDescriptor(this.getProvidedTree(scope)?.providedTree, typeChainResult);
+        const symbolType = typeChainResult.astNode?.getType({ flags: unresolvedSymbol.flags });
+        if (isReferenceType(symbolType)) {
+            const circularReferenceInfo = symbolType.getCircularReferenceInfo();
+            if (circularReferenceInfo.isCircularReference) {
+                let diagnosticDetail = util.getCircularReferenceDiagnosticDetail(circularReferenceInfo, typeChainResult.fullNameOfItem);
+                return DiagnosticMessages.circularReferenceDetected(diagnosticDetail);
+            }
+        }
+
+        if (isCallExpression(typeChainResult.astNode?.parent) && typeChainResult.astNode?.parent.callee === typeChainResult.astNode) {
+            return DiagnosticMessages.cannotFindFunction(typeChainResult.itemName, typeChainResult.fullNameOfItem, typeChainResult.itemParentTypeName, parentDescriptor);
+        }
+        return DiagnosticMessages.cannotFindName(typeChainResult.itemName, typeChainResult.fullNameOfItem, typeChainResult.itemParentTypeName, parentDescriptor);
+    }
+
+    private getParentTypeDescriptor(provided: ProvidedNode, typeChainResult: TypeChainProcessResult) {
+        if (typeChainResult.itemParentTypeKind === BscTypeKind.NamespaceType || provided?.getNamespace(typeChainResult.itemParentTypeName)) {
+            return 'namespace';
+        }
+        return 'type';
+    }
+
+}
diff --git a/src/DependencyGraph.ts b/src/DependencyGraph.ts
index fd7742b86..5fb0123a9 100644
--- a/src/DependencyGraph.ts
+++ b/src/DependencyGraph.ts
@@ -77,6 +77,24 @@ export class DependencyGraph {
         }
     }
 
+    /**
+     * Get a list of the immediate dependencies for the given key.
+     */
+    public getImmediateDependencies(keys: string | string[], exclude?: string[]) {
+        if (typeof keys === 'string') {
+            return this.nodes[keys]?.dependencies ?? [];
+        } else {
+            const set = new Set<string>();
+            for (const key of keys) {
+                const dependencies = this.getImmediateDependencies(key, exclude);
+                for (const dependency of dependencies) {
+                    set.add(dependency);
+                }
+            }
+            return [...set];
+        }
+    }
+
     /**
      * Remove the item. This will emit an onchange event for all dependent nodes
      */
diff --git a/src/DiagnosticCollection.spec.ts b/src/DiagnosticCollection.spec.ts
index 18571bb45..91651cc92 100644
--- a/src/DiagnosticCollection.spec.ts
+++ b/src/DiagnosticCollection.spec.ts
@@ -6,7 +6,6 @@ import { URI } from 'vscode-uri';
 import { rootDir } from './testHelpers.spec';
 import * as path from 'path';
 import { standardizePath } from './util';
-import { interpolatedRange } from './astUtils/creators';
 
 describe('DiagnosticCollection', () => {
     let collection: DiagnosticCollection;
@@ -206,7 +205,6 @@ describe('DiagnosticCollection', () => {
             diagnosticsByFile: {
                 'file1.brs': [{
                     message: 'message1',
-                    range: interpolatedRange,
                     uri: undefined,
                     projects: [projectId]
                 } as any]
diff --git a/src/DiagnosticFilterer.spec.ts b/src/DiagnosticFilterer.spec.ts
index 7b50657ad..3936439b7 100644
--- a/src/DiagnosticFilterer.spec.ts
+++ b/src/DiagnosticFilterer.spec.ts
@@ -1,7 +1,8 @@
 import { expect } from './chai-config.spec';
 import { DiagnosticFilterer } from './DiagnosticFilterer';
 import type { BsDiagnostic } from './interfaces';
-import { standardizePath as s } from './util';
+import { Program } from './Program';
+import util, { standardizePath as s } from './util';
 import { createSandbox } from 'sinon';
 const sinon = createSandbox();
 let rootDir = s`${process.cwd()}/rootDir`;
@@ -12,14 +13,15 @@ describe('DiagnosticFilterer', () => {
     let options = {
         rootDir: rootDir,
         diagnosticFilters: [
+            'codename',
             //ignore these codes globally
             { codes: [1, 2, 3, 'X4'] },
             //ignore all codes from lib
-            { src: 'lib/**/*.brs' },
+            { files: 'lib/**/*.brs' },
             //ignore all codes from `packages` with absolute path
-            { src: `${rootDir}/packages/**/*.brs` },
+            { files: `${rootDir}/packages/**/*.brs` },
             //ignore specific codes for main.brs
-            { src: 'source/main.brs', codes: [4] }
+            { files: 'source/main.brs', codes: [4] }
         ]
     };
 
@@ -86,24 +88,34 @@ describe('DiagnosticFilterer', () => {
             ).to.eql([11, 12, 13, 'X14']);
         });
 
+
+        it('works with single file src glob', () => {
+            expect(
+                filterer.filter(options, [
+                    getDiagnostic('codename', `${rootDir}/source/main.brs`) //remove
+                ]).map(x => x.code)
+            ).to.eql([]);
+        });
+
         describe('with negative globs', () => {
             let optionsWithNegatives = {
                 rootDir: rootDir,
                 diagnosticFilters: [
                     //ignore these codes globally
-                    { codes: [1, 2] },
+                    { codes: [1, 2, 'codename'] },
                     3,
                     4,
+                    'codename',
                     //ignore all codes from lib
-                    { src: 'lib/**/*.brs' },
+                    { files: 'lib/**/*.brs' },
                     //un-ignore specific errors from lib/special
-                    { src: '!lib/special/**/*.brs', codes: [1, 2, 3] },
+                    { files: '!lib/special/**/*.brs', codes: [1, 2, 3, 'codename'] },
                     //re-ignore errors from one extra special file
-                    { src: 'lib/special/all-reignored.brs' },
+                    { files: 'lib/special/all-reignored.brs' },
                     //un-ignore all codes from third special file
-                    { src: '!lib/special/all-unignored.brs' },
+                    { files: '!lib/special/all-unignored.brs' },
                     //un-ignore code 5 globally
-                    { src: '!*/**/*', codes: [5] },
+                    { files: '!*/**/*', codes: [5] },
                     //re-ignore code 10 globally, overriding previous unignores
                     { codes: [10] }
                 ]
@@ -180,7 +192,7 @@ describe('DiagnosticFilterer', () => {
         it('handles standard diagnostic filters', () => {
             expect(
                 filterer.getDiagnosticFilters({
-                    diagnosticFilters: [{ src: 'file.brs', codes: [1, 2, 'X3'] }]
+                    diagnosticFilters: [{ files: 'file.brs', codes: [1, 2, 'X3'] }]
                 })
             ).to.eql([{ src: 'file.brs', codes: [1, 2, 'X3'], isNegative: false }]);
         });
@@ -188,7 +200,7 @@ describe('DiagnosticFilterer', () => {
         it('handles string-only diagnostic filter object', () => {
             expect(
                 filterer.getDiagnosticFilters({
-                    diagnosticFilters: [{ src: 'file.brs' }]
+                    diagnosticFilters: [{ files: 'file.brs' }]
                 })
             ).to.eql([{ src: 'file.brs', isNegative: false }]);
         });
@@ -204,9 +216,9 @@ describe('DiagnosticFilterer', () => {
         it('handles string diagnostic filter', () => {
             expect(
                 filterer.getDiagnosticFilters({
-                    diagnosticFilters: ['file.brs']
+                    diagnosticFilters: ['cannot-find-name']
                 })
-            ).to.eql([{ src: 'file.brs', isNegative: false }]);
+            ).to.eql([{ codes: ['cannot-find-name'], isNegative: false }]);
         });
 
         it('converts ignoreErrorCodes to diagnosticFilters', () => {
@@ -217,19 +229,11 @@ describe('DiagnosticFilterer', () => {
             ]);
         });
 
-        it('handles negative globs in bare strings', () => {
-            expect(filterer.getDiagnosticFilters({
-                diagnosticFilters: ['!file.brs']
-            })).to.eql([
-                { src: 'file.brs', isNegative: true }
-            ]);
-        });
-
         it('handles negative globs in objects', () => {
             expect(filterer.getDiagnosticFilters({
                 diagnosticFilters: [
                     {
-                        src: '!file.brs'
+                        files: '!file.brs'
                     }
                 ]
             })).to.eql([
@@ -241,7 +245,7 @@ describe('DiagnosticFilterer', () => {
             expect(filterer.getDiagnosticFilters({
                 diagnosticFilters: [
                     {
-                        src: '!file.brs',
+                        files: '!file.brs',
                         codes: [1, 2, 3]
                     }
                 ]
@@ -251,6 +255,54 @@ describe('DiagnosticFilterer', () => {
         });
     });
 
+    describe('filtering by dest', () => {
+        it('will filter by a files destPath', () => {
+            const program = new Program({ rootDir: rootDir });
+            program.setFile('source/common.brs', '');
+            program.setFile({ src: `${rootDir}/source/utils.brs`, dest: `source/remove/utils.brs` }, '');
+            program.setFile({ src: `${rootDir}/components/utils.brs`, dest: `source/remove/utils2.brs` }, '');
+
+            const resultDiagnostics = filterer.filter({
+                rootDir: rootDir,
+                diagnosticFilters: [
+                    {
+                        files: [
+                            { dest: 'source/remove/**/*.*' }
+                        ],
+                        codes: ['diagCode']
+                    }
+                ]
+            }, [
+                getDiagnostic('diagCode', `${rootDir}/source/common.brs`), //keep
+                getDiagnostic('diagCode', `${rootDir}/source/utils.brs`, `${rootDir}/source/remove/utils.brs`), //remove
+                getDiagnostic('diagCode', `${rootDir}/components/utils.brs`, `${rootDir}/source/remove/utils2.brs`) //remove
+            ], program);
+            expect(resultDiagnostics.map(x => x.code)).to.eql(['diagCode']);
+            expect(resultDiagnostics.map(x => x.location.uri)).to.eql([util.pathToUri(s`${rootDir}/source/common.brs`)]);
+        });
+
+        it('respects order of ignores with negative globs', () => {
+            const resultDiagnostics = filterer.filter({
+                rootDir: rootDir,
+                diagnosticFilters: [{
+                    files: [
+                        { dest: 'source/**/*.*' } //ignore diagCode in files with destPath in /source/remove
+                    ],
+                    codes: ['diagCode']
+                }, {
+                    files: '!**/*.*', //unignore diagCode everywhere
+                    codes: ['diagCode']
+                }
+                ]
+            }, [
+                getDiagnostic('diagCode', `${rootDir}/source/common.brs`), //keep
+                getDiagnostic('diagCode', `${rootDir}/source/utils.brs`, `${rootDir}/source/remove/utils.brs`), //remove
+                getDiagnostic('diagCode', `${rootDir}/components/utils.brs`, `${rootDir}/source/remove/utils2.brs`) //remove
+            ]);
+            expect(resultDiagnostics.map(x => x.code)).to.eql(['diagCode', 'diagCode', 'diagCode']);
+        });
+    });
+
     it('only filters by file once per unique file (case-insensitive)', () => {
         const stub = sinon.stub(filterer as any, 'filterFile').returns(null);
         filterer.filter(options, [
@@ -259,19 +311,335 @@ describe('DiagnosticFilterer', () => {
             getDiagnostic(3, s`${rootDir}/source/common2.brs`),
             getDiagnostic(4, s`${rootDir}/source/Common2.brs`)
         ]);
-        expect(stub.callCount).to.eql(2);
-        expect(stub.getCalls().map(x => x.args[1])).to.eql([
-            s`${rootDir.toLowerCase()}/source/common1.brs`,
-            s`${rootDir.toLowerCase()}/source/common2.brs`
+        const expectedCallCount = options.diagnosticFilters.reduce((acc, filter) => {
+            if (typeof filter === 'object' && 'files' in (filter as any)) {
+                return acc;
+            }
+            return acc + 1;
+        }, 0);
+        expect(stub.callCount).to.eql(expectedCallCount * 2); // 2 times for 'codename', 2 times for { codes: [1, 2, 3, 'X4'] }
+        expect(stub.getCalls().map(x => x.args[1].toLowerCase())).to.eql([
+            util.pathToUri(s`${rootDir.toLowerCase()}/source/common1.brs`).toLowerCase(),
+            util.pathToUri(s`${rootDir.toLowerCase()}/source/common2.brs`).toLowerCase(),
+            util.pathToUri(s`${rootDir.toLowerCase()}/source/common1.brs`).toLowerCase(),
+            util.pathToUri(s`${rootDir.toLowerCase()}/source/common2.brs`).toLowerCase()
         ]);
     });
 
+    describe('isFileFiltered', () => {
+        it('should find files that are completely filtered by src', () => {
+            filterer.options = options;
+            expect(filterer.isFileFiltered({ srcPath: `${rootDir}/lib/some/file.brs`, destPath: `source/some/file.brs` })).true;
+            expect(filterer.isFileFiltered({ srcPath: `${rootDir}/notlib/other/file.brs`, destPath: `source/other/file.brs` })).false;
+        });
+
+        it('should find files that are completely filtered by dest', () => {
+            filterer.options = {
+                rootDir: rootDir,
+                diagnosticFilters: [
+                    { files: [{ dest: 'source/remove/**/*.*' }] }
+                ]
+            };
+            expect(filterer.isFileFiltered({ srcPath: `${rootDir}/source/some/file.brs`, destPath: `source/remove/some/file.brs` })).true;
+            expect(filterer.isFileFiltered({ srcPath: `${rootDir}/source/other/file.brs`, destPath: `source/keep/other/file.brs` })).false;
+        });
+
+        it('should find files that are completely filtered by src, with negative filtering', () => {
+            filterer.options = {
+                rootDir: rootDir,
+                diagnosticFilters: [
+                    //ignore all codes from lib
+                    { files: 'lib/**/*.brs' },
+                    //un-ignore specific errors from lib/special
+                    { files: '!lib/special/**/*.brs' }
+                ]
+            };
+            expect(filterer.isFileFiltered({ srcPath: `${rootDir}/lib/some/file.brs`, destPath: `source/some/file.brs` })).true;
+            expect(filterer.isFileFiltered({ srcPath: `${rootDir}/lib/special/file.brs`, destPath: `source/special/file.brs` })).false;
+        });
+    });
+
+    describe('v0 compatibility', () => {
+        let filterer: DiagnosticFilterer;
+        let options = {
+            rootDir: rootDir,
+            diagnosticFiltersV0Compatibility: true,
+            diagnosticFilters: [
+                //ignore these codes globally
+                { codes: [1, 2, 3, 'X4'] },
+                //ignore all codes from lib
+                { src: 'lib/**/*.brs' },
+                //ignore all codes from `packages` with absolute path
+                { src: `${rootDir}/packages/**/*.brs` },
+                //ignore specific codes for main.brs
+                { src: 'source/main.brs', codes: [4] }
+            ]
+        };
+
+        afterEach(() => {
+            sinon.restore();
+        });
+
+        beforeEach(() => {
+            filterer = new DiagnosticFilterer();
+        });
+
+        describe('filter', () => {
+
+            it('removes duplicates', () => {
+                let diagnostic = getDiagnostic(100, `${rootDir}/source/common.brs`);
+                expect(
+                    filterer.filter(options, [diagnostic, diagnostic])
+                ).to.eql([diagnostic]);
+            });
+
+            it('uses global code filter', () => {
+                expect(
+                    filterer.filter(options, [
+                        getDiagnostic(1, `${rootDir}/source/common.brs`),
+                        getDiagnostic(2, `${rootDir}/source/common.brs`),
+                        getDiagnostic(4, `${rootDir}/source/common.brs`),
+                        getDiagnostic('X4', `${rootDir}/source/common.brs`)
+                    ]).map(x => x.code)
+                ).to.eql([4]);
+            });
+
+            it('works with relative src globs', () => {
+                expect(
+                    filterer.filter(options, [
+                        getDiagnostic(10, `${rootDir}/source/common.brs`), //keep
+                        getDiagnostic(11, `${rootDir}/lib/a.brs`), //remove
+                        getDiagnostic(12, `${rootDir}/lib/a/b/b.brs`), //remove
+                        getDiagnostic(13, `${rootDir}/lib/a/b/c/c.brs`) //remove
+                    ]).map(x => x.code)
+                ).to.eql([10]);
+            });
+
+            it('works with absolute src globs', () => {
+                expect(
+                    filterer.filter(options, [
+                        getDiagnostic(10, `${rootDir}/source/common.brs`), //keep
+                        getDiagnostic(11, `${rootDir}/packages/a.brs`), //remove
+                        getDiagnostic(12, `${rootDir}/packages/a/b/b.brs`), //remove
+                        getDiagnostic(13, `${rootDir}/packages/a/b/c/c.brs`), //remove
+                        getDiagnostic('X14', `${rootDir}/packages/a/b/c/c.brs`) //remove
+                    ]).map(x => x.code)
+                ).to.eql([10]);
+            });
+
+            it('works with single file src glob', () => {
+                expect(
+                    filterer.filter(options, [
+                        getDiagnostic(4, `${rootDir}/source/main.brs`), //remove
+                        getDiagnostic(11, `${rootDir}/common/a.brs`), //keep
+                        getDiagnostic(12, `${rootDir}/common/a/b/b.brs`), //keep
+                        getDiagnostic(13, `${rootDir}/common/a/b/c/c.brs`), //keep
+                        getDiagnostic('X14', `${rootDir}/common/a/b/c/c.brs`) //keep
+                    ]).map(x => x.code)
+                ).to.eql([11, 12, 13, 'X14']);
+            });
+
+            describe('with negative globs', () => {
+                let optionsWithNegatives = {
+                    rootDir: rootDir,
+                    diagnosticFiltersV0Compatibility: true,
+                    diagnosticFilters: [
+                        //ignore these codes globally
+                        { codes: [1, 2] },
+                        3,
+                        4,
+                        //ignore all codes from lib
+                        { src: 'lib/**/*.brs' },
+                        //un-ignore specific errors from lib/special
+                        { src: '!lib/special/**/*.brs', codes: [1, 2, 3] },
+                        //re-ignore errors from one extra special file
+                        { src: 'lib/special/all-reignored.brs' },
+                        //un-ignore all codes from third special file
+                        { src: '!lib/special/all-unignored.brs' },
+                        //un-ignore code 5 globally
+                        { src: '!*/**/*', codes: [5] },
+                        //re-ignore code 10 globally, overriding previous unignores
+                        { codes: [10] }
+                    ]
+                };
+
+                it('should unignore specific error codes for specific files', () => {
+                    expect(
+                        filterer.filter(optionsWithNegatives, [
+                            getDiagnostic(1, `${rootDir}/lib/special/a.brs`), //keep
+                            getDiagnostic(3, `${rootDir}/lib/special/a.brs`), //keep
+                            getDiagnostic(7, `${rootDir}/lib/special/a.brs`) //remove
+                        ]).map(x => x.code)
+                    ).to.eql([1, 3]);
+                });
+
+                it('should unignore all codes from specific file', () => {
+                    expect(
+                        filterer.filter(optionsWithNegatives, [
+                            getDiagnostic(1, `${rootDir}/lib/special/all-unignored.brs`), //keep
+                            getDiagnostic(2, `${rootDir}/lib/special/all-unignored.brs`), //keep
+                            getDiagnostic(3, `${rootDir}/lib/special/all-unignored.brs`), //keep
+                            getDiagnostic(4, `${rootDir}/lib/special/all-unignored.brs`) //keep
+                        ]).map(x => x.code)
+                    ).to.eql([1, 2, 3, 4]);
+                });
+
+                it('should re-ignore errors', () => {
+                    expect(
+                        filterer.filter(optionsWithNegatives, [
+                            getDiagnostic(1, `${rootDir}/lib/special/all-reignored.brs`), //remove
+                            getDiagnostic(10, `${rootDir}/lib/special/a.brs`) //remove
+                        ]).map(x => x.code)
+                    ).to.eql([]);
+                });
+
+                it('should unignore errors globally by using "*/**/*" glob', () => {
+                    expect(
+                        filterer.filter(optionsWithNegatives, [
+                            getDiagnostic(5, `${rootDir}/lib/a/b/c.brs`) //keep
+                        ]).map(x => x.code)
+                    ).to.eql([5]);
+                });
+            });
+        });
+        describe('standardizeDiagnosticFilters', () => {
+            it('handles null and falsey diagnostic filters', () => {
+                expect(
+                    filterer.getDiagnosticFilters({
+                        diagnosticFiltersV0Compatibility: true,
+                        diagnosticFilters: <any>[null, undefined, false, true]
+                    })
+                ).to.eql([]);
+            });
+
+            it('handles a completely empty diagnostic filter', () => {
+                expect(
+                    filterer.getDiagnosticFilters({
+                        diagnosticFiltersV0Compatibility: true,
+                        diagnosticFilters: <any>[{}]
+                    })
+                ).to.eql([]);
+            });
+
+            it('handles number diagnostic filters', () => {
+                expect(
+                    filterer.getDiagnosticFilters({
+                        diagnosticFiltersV0Compatibility: true,
+                        diagnosticFilters: [1, 2, 3]
+                    })
+                ).to.eql([
+                    { codes: [1], isNegative: false },
+                    { codes: [2], isNegative: false },
+                    { codes: [3], isNegative: false }
+                ]);
+            });
+
+            it('handles standard diagnostic filters', () => {
+                expect(
+                    filterer.getDiagnosticFilters({
+                        diagnosticFiltersV0Compatibility: true,
+                        diagnosticFilters: [{ src: 'file.brs', codes: [1, 2, 'X3'] }] as any
+                    })
+                ).to.eql([{ src: 'file.brs', codes: [1, 2, 'X3'], isNegative: false }]);
+            });
+
+            it('handles string-only diagnostic filter object', () => {
+                expect(
+                    filterer.getDiagnosticFilters({
+                        diagnosticFiltersV0Compatibility: true,
+                        diagnosticFilters: [{ src: 'file.brs' }] as any
+                    })
+                ).to.eql([{ src: 'file.brs', isNegative: false }]);
+            });
+
+            it('handles code-only diagnostic filter object', () => {
+                expect(filterer.getDiagnosticFilters({
+                    diagnosticFiltersV0Compatibility: true,
+                    diagnosticFilters: [{ codes: [1, 2, 'X3'] }]
+                })).to.eql([
+                    { codes: [1, 2, 'X3'], isNegative: false }
+                ]);
+            });
+
+            it('handles string diagnostic filter', () => {
+                expect(
+                    filterer.getDiagnosticFilters({
+                        diagnosticFiltersV0Compatibility: true,
+                        diagnosticFilters: ['file.brs']
+                    })
+                ).to.eql([{ src: 'file.brs', isNegative: false }]);
+            });
+
+            it('converts ignoreErrorCodes to diagnosticFilters', () => {
+                expect(filterer.getDiagnosticFilters({
+                    diagnosticFiltersV0Compatibility: true,
+                    ignoreErrorCodes: [1, 2, 'X3']
+                })).to.eql([
+                    { codes: [1, 2, 'X3'], isNegative: false }
+                ]);
+            });
+
+            it('handles negative globs in bare strings', () => {
+                expect(filterer.getDiagnosticFilters({
+                    diagnosticFiltersV0Compatibility: true,
+                    diagnosticFilters: ['!file.brs']
+                })).to.eql([
+                    { src: 'file.brs', isNegative: true }
+                ]);
+            });
+
+            it('handles negative globs in objects', () => {
+                expect(filterer.getDiagnosticFilters({
+                    diagnosticFiltersV0Compatibility: true,
+                    diagnosticFilters: [
+                        {
+                            src: '!file.brs'
+                        }
+                    ] as any
+                })).to.eql([
+                    { src: 'file.brs', isNegative: true }
+                ]);
+            });
+
+            it('handles negative globs with codes', () => {
+                expect(filterer.getDiagnosticFilters({
+                    diagnosticFiltersV0Compatibility: true,
+                    diagnosticFilters: [
+                        {
+                            src: '!file.brs',
+                            codes: [1, 2, 3]
+                        }
+                    ] as any
+                })).to.eql([
+                    { src: 'file.brs', codes: [1, 2, 3], isNegative: true }
+                ]);
+            });
+        });
+
+        it('only filters by file once per unique file (case-insensitive)', () => {
+            const stub = sinon.stub(filterer as any, 'filterFile').returns(null);
+            filterer.filter(options, [
+                getDiagnostic(1, s`${rootDir}/source/common1.brs`),
+                getDiagnostic(2, s`${rootDir}/source/Common1.brs`),
+                getDiagnostic(3, s`${rootDir}/source/common2.brs`),
+                getDiagnostic(4, s`${rootDir}/source/Common2.brs`)
+            ]);
+            expect(stub.callCount).to.eql(2);
+            const fileList = stub.getCalls().map(x => x.args[1]);
+            expect(fileList).to.eql([
+                util.pathToUri(s`${rootDir.toLowerCase()}/source/common1.brs`).toLowerCase(),
+                util.pathToUri(s`${rootDir.toLowerCase()}/source/common2.brs`).toLowerCase()
+            ]);
+        });
+    });
+
 });
 
-function getDiagnostic(code: number | string, srcPath: string) {
+function getDiagnostic(code: number | string, srcPath: string, destPath?: string) {
+    destPath = destPath ?? srcPath;
     return {
-        file: {
-            srcPath: s`${srcPath}`
+        location: {
+            uri: util.pathToUri(s`${srcPath}`)
         },
         code: code
     } as BsDiagnostic;
diff --git a/src/DiagnosticFilterer.ts b/src/DiagnosticFilterer.ts
index a2f726389..1c80559c0 100644
--- a/src/DiagnosticFilterer.ts
+++ b/src/DiagnosticFilterer.ts
@@ -2,7 +2,9 @@ import type { BsDiagnostic } from './interfaces';
 import * as path from 'path';
 import * as minimatch from 'minimatch';
 import type { BsConfig } from './BsConfig';
-import { standardizePath as s } from './util';
+import util, { standardizePath as s } from './util';
+import { URI } from 'vscode-uri';
+import type { Program } from './Program';
 
 interface DiagnosticWithSuppression {
     diagnostic: BsDiagnostic;
@@ -11,28 +13,47 @@ interface DiagnosticWithSuppression {
 
 interface NormalizedFilter {
     src?: string;
+    dest?: string;
     codes?: (number | string)[];
     isNegative: boolean;
 }
 
 export class DiagnosticFilterer {
     private byFile: Record<string, DiagnosticWithSuppression[]>;
-    private filters: NormalizedFilter[] | undefined;
+    private fileDestSrcUriMap: Record<string, string>;
+    private _filters: NormalizedFilter[] | undefined;
     private rootDir: string | undefined;
 
+    public options: BsConfig | undefined;
+
 
     constructor() {
         this.byFile = {};
+        this.fileDestSrcUriMap = {};
     }
 
+    get filters() {
+        if (!this.options) {
+            return null;
+        }
+        if (!this._filters) {
+            this._filters = this.getDiagnosticFilters(this.options);
+        }
+        return this._filters;
+    }
+
+
     /**
      * Filter a list of diagnostics based on the provided filters
      */
-    public filter(options: BsConfig, diagnostics: BsDiagnostic[]) {
-        this.filters = this.getDiagnosticFilters(options);
-        this.rootDir = options.rootDir;
+    public filter(options: BsConfig, diagnostics: BsDiagnostic[], program?: Program) {
+        this.options = options;
+
+        delete this._filters;
 
-        this.groupByFile(diagnostics);
+        this.rootDir = this.options.rootDir;
+
+        this.groupByFile(diagnostics, program);
 
         for (let filter of this.filters) {
             this.filterAllFiles(filter);
@@ -41,12 +62,48 @@ export class DiagnosticFilterer {
 
         //clean up
         this.byFile = {};
-        delete this.rootDir;
-        delete this.filters;
+        this.fileDestSrcUriMap = {};
 
         return result;
     }
 
+    /**
+     * Should this file be completely ignored?
+     * If the file diagnostics are ignored, we do not need to validate this file
+     */
+    public isFileFiltered(file: { srcPath: string; destPath: string }) {
+        if (!this.options || !this.filters) {
+            return false;
+        }
+        this.rootDir = this.options.rootDir;
+        let isMatch = false;
+        //filter each matched file
+        for (let filter of this.filters) {
+            if (filter.codes?.length > 0) {
+                continue;
+            }
+            let srcMatch = false;
+            if (filter.src) {
+                const srcUri = util.pathToUri(file.srcPath);
+                const srcFsPath = URI.parse(srcUri).fsPath;
+                srcMatch = !!(filter.src && this.matchFileSrcUris(filter, [srcFsPath])?.length > 0);
+            }
+            let destMatch = false;
+            if (filter.dest) {
+                destMatch = !!(filter.dest && this.matchFileDestUris(filter, [file.destPath])?.length > 0);
+            }
+
+            if (!filter.isNegative) {
+                isMatch = isMatch || srcMatch || destMatch;
+            } else {
+                if (srcMatch || destMatch) {
+                    isMatch = false;
+                }
+            }
+        }
+        return isMatch;
+    }
+
     /**
      * Iterate over all remaining diagnostics from the byFile map.
      * Also removes duplicates
@@ -69,68 +126,103 @@ export class DiagnosticFilterer {
     /**
      * group the diagnostics by file
      */
-    private groupByFile(diagnostics: BsDiagnostic[]) {
+    private groupByFile(diagnostics: BsDiagnostic[], program?: Program) {
         this.byFile = {};
-
+        this.fileDestSrcUriMap = {};
         for (let diagnostic of diagnostics) {
-            const srcPath = diagnostic?.file?.srcPath ?? diagnostic?.file?.srcPath;
+            const fileUri = diagnostic?.location?.uri ?? 'invalid-uri';
             //skip diagnostics that have issues
-            if (!srcPath) {
+            if (!fileUri) {
                 continue;
             }
-            const lowerSrcPath = srcPath.toLowerCase();
+            const lowerFileUri = fileUri.toLowerCase();
             //make a new array for this file if one does not yet exist
-            if (!this.byFile[lowerSrcPath]) {
-                this.byFile[lowerSrcPath] = [];
+            if (!this.byFile[lowerFileUri]) {
+                this.byFile[lowerFileUri] = [];
             }
-            this.byFile[lowerSrcPath].push({
+            this.byFile[lowerFileUri].push({
                 diagnostic: diagnostic,
                 isSuppressed: false
             });
+
+            if (program) {
+                const fileForDiagnostic = program.getFile(diagnostic.location?.uri);
+                if (fileForDiagnostic) {
+                    const lowerDestPath = fileForDiagnostic.destPath.toLowerCase();
+                    this.fileDestSrcUriMap[lowerDestPath] = diagnostic.location?.uri;
+                }
+            }
         }
     }
 
+
+    private matchFileSrcUris(filter: NormalizedFilter, fileUris: string[]): string[] {
+        //prepend rootDir to src if the filter is not a relative path
+        let src = s(
+            path.isAbsolute(filter.src) ? filter.src : `${this.rootDir}/${filter.src}`
+        );
+
+        let matchedFileUris = minimatch.match(fileUris, src, {
+            nocase: true
+        }).map(src => util.pathToUri(src).toLowerCase());
+
+        return matchedFileUris;
+    }
+
+    private matchFileDestUris(filter: NormalizedFilter, fileUris: string[]): string[] {
+        let matchedFileUris = minimatch.match(fileUris, filter.dest, {
+            nocase: true
+        });
+        return matchedFileUris;
+    }
+
+
     private filterAllFiles(filter: NormalizedFilter) {
-        let matchedFilePaths: string[];
+        let matchedFileUris: string[];
 
-        //if there's a src, match against all files
         if (filter.src) {
-            //prepend rootDir to src if the filter is a relative path
-            let src = s(
-                path.isAbsolute(filter.src) ? filter.src : `${this.rootDir}/${filter.src}`
-            );
-
-            matchedFilePaths = minimatch.match(Object.keys(this.byFile), src, {
-                nocase: true
+            //if there's a src, match against all files
+            const byFileSrcs = Object.keys(this.byFile).map(uri => URI.parse(uri).fsPath);
+            matchedFileUris = this.matchFileSrcUris(filter, byFileSrcs);
+        } else if (filter.dest) {
+            // applies to file dest location
+            // search against the set of file destinations
+            const byFileDests = Object.keys(this.fileDestSrcUriMap);
+            matchedFileUris = this.matchFileDestUris(filter, byFileDests).map((destPath) => {
+                return this.fileDestSrcUriMap[destPath]?.toLowerCase();
             });
-
-            //there is no src; this applies to all files
         } else {
-            matchedFilePaths = Object.keys(this.byFile);
+            matchedFileUris = Object.keys(this.byFile);
         }
 
         //filter each matched file
-        for (let filePath of matchedFilePaths) {
-            this.filterFile(filter, filePath);
+        for (let fileUri of matchedFileUris) {
+            this.filterFile(filter, fileUri);
         }
     }
 
-    private filterFile(filter: NormalizedFilter, filePath: string) {
+    private filterFile(filter: NormalizedFilter, fileUri: string) {
+        if (!fileUri) {
+            return;
+        }
         //if the filter is negative, we're turning diagnostics on
         //if the filter is not negative we're turning diagnostics off
         const isSuppressing = !filter.isNegative;
-
+        const lowerFileUri = fileUri.toLowerCase();
         //if there is no code, set isSuppressed on every diagnostic in this file
         if (!filter.codes) {
-            this.byFile[filePath].forEach(diagnostic => {
+            this.byFile[lowerFileUri].forEach(diagnostic => {
                 diagnostic.isSuppressed = isSuppressing;
             });
 
             //set isSuppressed for any diagnostics with matching codes
         } else {
-            let fileDiagnostics = this.byFile[filePath];
+            let fileDiagnostics = this.byFile[lowerFileUri];
             for (const diagnostic of fileDiagnostics) {
-                if (filter.codes.includes(diagnostic.diagnostic.code!)) {
+                if (filter.codes.includes(diagnostic.diagnostic.code!) ||
+                    (diagnostic.diagnostic.legacyCode &&
+                        (filter.codes.includes(diagnostic.diagnostic.legacyCode) ||
+                            filter.codes.includes(diagnostic.diagnostic.legacyCode.toString())))) {
                     diagnostic.isSuppressed = isSuppressing;
                 }
             }
@@ -138,6 +230,10 @@ export class DiagnosticFilterer {
     }
 
     public getDiagnosticFilters(config: BsConfig) {
+        if (config.diagnosticFiltersV0Compatibility) {
+            return this.getDiagnosticFiltersV0(config);
+        }
+
         let globalIgnoreCodes: (number | string)[] = [...config.ignoreErrorCodes ?? []];
         let diagnosticFilters = [...config.diagnosticFilters ?? []];
 
@@ -153,6 +249,73 @@ export class DiagnosticFilterer {
         }
 
         for (let filter of diagnosticFilters) {
+            if (typeof filter === 'number' || typeof filter === 'string') {
+                result.push({
+                    codes: [filter],
+                    isNegative: false
+                });
+                continue;
+            }
+
+            //filter out bad inputs
+            if (!filter || typeof filter !== 'object') {
+                continue;
+            }
+
+            //code-only filter
+            if ('codes' in filter && !('files' in filter) && Array.isArray(filter.codes)) {
+                result.push({
+                    codes: filter.codes,
+                    isNegative: false
+                });
+                continue;
+            }
+
+            if ('files' in filter) {
+                if (typeof filter.files === 'string') {
+                    result.push(this.getNormalizedFilter(filter.files, filter));
+                    continue;
+                }
+
+                if (Array.isArray(filter.files)) {
+                    for (const fileIdentifier of filter.files) {
+                        if (typeof fileIdentifier === 'string') {
+                            result.push(this.getNormalizedFilter(fileIdentifier, filter));
+                            continue;
+                        }
+                        if (typeof fileIdentifier === 'object') {
+                            if ('src' in fileIdentifier) {
+                                result.push(this.getNormalizedFilter(fileIdentifier.src, filter));
+                                continue;
+                            }
+                            if ('dest' in fileIdentifier) {
+                                result.push(this.getNormalizedFilter(fileIdentifier.dest, filter, 'dest'));
+                                continue;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
+    private getDiagnosticFiltersV0(config: BsConfig) {
+        let globalIgnoreCodes: (number | string)[] = [...config.ignoreErrorCodes ?? []];
+        let diagnosticFilters = [...config.diagnosticFilters ?? []];
+
+        let result: NormalizedFilter[] = [];
+
+        //include a filter for all global ignore codes
+        //this comes first, because negative patterns will override ignoreErrorCodes
+        if (globalIgnoreCodes.length > 0) {
+            result.push({
+                codes: globalIgnoreCodes,
+                isNegative: false
+            });
+        }
+
+        for (let filter of diagnosticFilters as any) {
             if (typeof filter === 'number') {
                 result.push({
                     codes: [filter],
@@ -186,7 +349,7 @@ export class DiagnosticFilterer {
                 continue;
             }
 
-            if ('src' in filter) {
+            if ('src' in filter && typeof filter.src === 'string') {
                 const isNegative = filter.src.startsWith('!');
                 const trimmedFilter = isNegative ? filter.src.slice(1) : filter.src;
 
@@ -206,4 +369,39 @@ export class DiagnosticFilterer {
         }
         return result;
     }
+
+
+    private getNormalizedFilter(fileGlob: string, filter: { files: string } | { codes?: (number | string)[] }, locationKey: 'src' | 'dest' = 'src'): NormalizedFilter {
+        const isNegative = fileGlob.startsWith('!');
+        const trimmedFilter = isNegative ? fileGlob.slice(1) : fileGlob;
+        if (locationKey === 'src') {
+            if ('codes' in filter && Array.isArray(filter.codes)) {
+                return {
+                    src: trimmedFilter,
+                    codes: filter.codes,
+                    isNegative: isNegative
+                };
+            } else {
+                return {
+                    src: trimmedFilter,
+                    isNegative: isNegative
+                };
+            }
+        } else {
+            // dest
+            if ('codes' in filter && Array.isArray(filter.codes)) {
+                return {
+                    dest: trimmedFilter,
+                    codes: filter.codes,
+                    isNegative: isNegative
+                };
+            } else {
+                return {
+                    dest: trimmedFilter,
+                    isNegative: isNegative
+                };
+            }
+        }
+
+    }
 }
diff --git a/src/DiagnosticManager.spec.ts b/src/DiagnosticManager.spec.ts
new file mode 100644
index 000000000..6895acd6e
--- /dev/null
+++ b/src/DiagnosticManager.spec.ts
@@ -0,0 +1,256 @@
+import { Scope } from './Scope';
+import type { BrsFile } from './files/BrsFile';
+import type { BsDiagnostic } from './interfaces';
+import { Program } from './Program';
+import { expectDiagnostics, expectZeroDiagnostics } from './testHelpers.spec';
+import util from './util';
+import { expect } from 'chai';
+
+
+describe('DiagnosticManager', () => {
+    let program: Program;
+    beforeEach(() => {
+        program = new Program({});
+    });
+
+    describe('diagnosticIsSuppressed', () => {
+        it('does not crash when diagnostic is missing location information', () => {
+            const file = program.setFile('source/main.brs', '') as BrsFile;
+            const diagnostic: BsDiagnostic = {
+                message: 'crash',
+                //important part of the test. range must be missing
+                location: { uri: util.pathToUri(file?.srcPath), range: undefined }
+            };
+
+            file.commentFlags.push({
+                affectedRange: util.createRange(1, 2, 3, 4),
+                codes: [1, 2, 3],
+                file: file,
+                range: util.createRange(1, 2, 3, 4)
+            });
+            program.diagnostics.register(diagnostic);
+
+            program.diagnostics.isDiagnosticSuppressed(diagnostic);
+
+            //test passes if there's no crash
+        });
+
+        it('does not crash when diagnostic is missing the entire `.location` object', () => {
+            const file = program.setFile('source/main.brs', '') as BrsFile;
+            const diagnostic: BsDiagnostic = {
+                message: 'crash',
+                //important part of the test, `.uri` must be missing
+                location: { uri: undefined, range: util.createRange(1, 2, 3, 4) }
+            };
+
+            file.commentFlags.push({
+                affectedRange: util.createRange(1, 2, 3, 4),
+                codes: [1, 2, 3],
+                file: file,
+                range: util.createRange(1, 2, 3, 4)
+            });
+            program.diagnostics.register(diagnostic);
+
+            program.diagnostics.isDiagnosticSuppressed(diagnostic);
+
+            //test passes if there's no crash
+        });
+    });
+
+    describe('clearForFile', () => {
+        it('does not crash when filePath is invalid', () => {
+            const diagnostic: BsDiagnostic = {
+                message: 'crash',
+                //important part of the test. `.uri` must be missing
+                location: { uri: undefined, range: util.createRange(1, 2, 3, 4) }
+            };
+
+            program.diagnostics.register(diagnostic);
+
+            program.diagnostics.clearForFile(undefined);
+            program.diagnostics.clearForFile(null);
+            program.diagnostics.clearForFile('');
+            //the test passes because none of these lines throw an error
+        });
+
+        it('removes diagnostics from the file specified', () => {
+            program.diagnostics.register([
+                {
+                    message: 'test',
+                    location: { uri: 'source/main.brs', range: util.createRange(1, 2, 3, 4) }
+                },
+                {
+                    message: 'test2',
+                    location: { uri: 'source/main2.brs', range: util.createRange(1, 2, 3, 4) }
+                }
+            ]);
+
+            program.diagnostics.clearForFile('source/main.brs');
+            expectDiagnostics(program.getDiagnostics(), [
+                { message: 'test2' }
+            ]);
+        });
+    });
+
+    describe('clearForScope', () => {
+
+        it('removes diagnostic contexts with the scope specified', () => {
+            const scope1 = new Scope('scope1', program);
+            const scope2 = new Scope('scope2', program);
+            const location = { uri: 'source/main.brs', range: util.createRange(1, 2, 3, 4) };
+
+            program.diagnostics.register([
+                {
+                    diagnostic: { message: 'test', location: location },
+                    context: { scope: scope1 }
+                },
+                {
+                    diagnostic: { message: 'test', location: location },
+                    context: { scope: scope2 }
+                }
+            ]);
+
+            program.diagnostics.clearForScope(scope1);
+            expectDiagnostics(program.getDiagnostics(), [
+                { message: 'test', relatedInformation: [{ message: `In scope 'scope2'` }] }
+            ]);
+        });
+
+        it('removes diagnostics with when all contexts are removed', () => {
+            const scope1 = new Scope('scope1', program);
+            const scope2 = new Scope('scope2', program);
+            const location = { uri: 'source/main.brs', range: util.createRange(1, 2, 3, 4) };
+            program.diagnostics.register([
+                {
+                    diagnostic: { message: 'test', location: location },
+                    context: { scope: scope1 }
+                },
+                {
+                    diagnostic: { message: 'test', location: location },
+                    context: { scope: scope2 }
+                }
+            ]);
+
+            program.diagnostics.clearForScope(scope1);
+            program.diagnostics.clearForScope(scope2);
+            expectZeroDiagnostics(program.getDiagnostics());
+        });
+
+    });
+
+    describe('clearTag', () => {
+        it('removes diagnostic contexts with the tag specified', () => {
+            const location = { uri: 'source/main.brs', range: util.createRange(1, 2, 3, 4) };
+            const location2 = { uri: 'source/main2.brs', range: util.createRange(1, 2, 3, 4) };
+
+            program.diagnostics.register([
+                {
+                    diagnostic: { message: 'test', location: location },
+                    context: { tags: ['testTag'] }
+                },
+                {
+                    diagnostic: { message: 'test2', location: location },
+                    context: { tags: ['testTag'] }
+                },
+
+                {
+                    diagnostic: { message: 'test2', location: location2 },
+                    context: { tags: ['testTag'] }
+                },
+                {
+                    diagnostic: { message: 'test3', location: location },
+                    context: { tags: ['otherTag', 'testTag'] }
+                }
+            ]);
+
+            program.diagnostics.clearForTag('testTag');
+            expectZeroDiagnostics(program.getDiagnostics());
+        });
+
+        it('removes diagnostic contexts with the tag specified', () => {
+            const location = { uri: 'source/main.brs', range: util.createRange(1, 2, 3, 4) };
+            const location2 = { uri: 'source/main2.brs', range: util.createRange(1, 2, 3, 4) };
+
+            program.diagnostics.register([
+                {
+                    diagnostic: { message: 'test', location: location },
+                    context: { tags: ['testTag'] }
+                },
+                {
+                    diagnostic: { message: 'test2', location: location },
+                    context: { tags: ['testTag'] }
+                },
+
+                {
+                    diagnostic: { message: 'test2', location: location2 },
+                    context: { tags: ['testTag'] }
+                },
+                {
+                    diagnostic: { message: 'test3', location: location },
+                    context: { tags: ['otherTag', 'testTag'] }
+                }
+            ]);
+
+            program.diagnostics.clearForTag('testTag');
+            expectZeroDiagnostics(program.getDiagnostics());
+        });
+    });
+
+    describe('clearByFilter', () => {
+
+        it('removes diagnostics that match the filter', () => {
+            const location = { uri: 'source/main.brs', range: util.createRange(1, 2, 3, 4) };
+            const location2 = { uri: 'source/main2.brs', range: util.createRange(1, 2, 3, 4) };
+
+            program.diagnostics.register([
+                {
+                    diagnostic: { message: 'test', location: location, code: 1 },
+                    context: { tags: ['tag1'] }
+                },
+                {
+                    diagnostic: { message: 'test2', location: location, code: 2 },
+                    context: { tags: ['tag2'] }
+                },
+                {
+                    diagnostic: { message: 'test2', location: location2, code: 3 },
+                    context: { tags: ['tag1'] }
+                },
+                {
+                    diagnostic: { message: 'test3', location: location, code: 4 },
+                    context: { tags: ['tag1'] }
+                }
+            ]);
+
+            program.diagnostics.clearByFilter({ fileUri: location.uri, tag: 'tag1' });
+            expectDiagnostics(program.getDiagnostics(), [
+                { code: 2 }, //different tag
+                { code: 3 } // different uri
+            ]);
+        });
+
+        it('removes diagnostics when all contexts are removed', () => {
+            const location = { uri: 'source/main.brs', range: util.createRange(1, 2, 3, 4) };
+            const scope1 = new Scope('scope1', program);
+            program.diagnostics.register([
+                {
+                    diagnostic: { message: 'test', location: location, code: 1 },
+                    context: { tags: ['tag1'] }
+                },
+                {
+                    diagnostic: { message: 'test', location: location, code: 1 },
+                    context: { scope: scope1 }
+                }
+            ]);
+
+            expect(program.getDiagnostics().length).to.eq(1); // one diagnostic with two contexts
+
+            program.diagnostics.clearByFilter({ tag: 'tag1' });
+            expectDiagnostics(program.getDiagnostics(), [
+                { code: 1 } // still one context left
+            ]);
+            program.diagnostics.clearByFilter({ scope: scope1 });
+            expectZeroDiagnostics(program.getDiagnostics());
+        });
+    });
+
+});
diff --git a/src/DiagnosticManager.ts b/src/DiagnosticManager.ts
new file mode 100644
index 000000000..ee279202d
--- /dev/null
+++ b/src/DiagnosticManager.ts
@@ -0,0 +1,476 @@
+import type { DiagnosticContext, BsDiagnostic, DiagnosticContextPair } from './interfaces';
+import type { AstNode } from './parser/AstNode';
+import type { Scope } from './Scope';
+import { util } from './util';
+import { Cache } from './Cache';
+import { isBsDiagnostic, isXmlScope } from './astUtils/reflection';
+import type { DiagnosticRelatedInformation, Location } from 'vscode-languageserver-protocol';
+import { DiagnosticFilterer } from './DiagnosticFilterer';
+import { DiagnosticSeverityAdjuster } from './DiagnosticSeverityAdjuster';
+import type { FinalizedBsConfig } from './BsConfig';
+import chalk from 'chalk';
+import type { Logger } from './logging';
+import { LogLevel, createLogger } from './logging';
+import type { Program } from './Program';
+import type { BrsFile } from './files/BrsFile';
+
+interface DiagnosticWithContexts {
+    diagnostic: BsDiagnosticWithKey;
+    contexts: Set<DiagnosticContext>;
+}
+
+interface BsDiagnosticWithKey extends BsDiagnostic {
+    key: string;
+}
+
+export interface LocationResolverArgs {
+    diagnostic: BsDiagnosticWithKey;
+    contexts: Set<DiagnosticContext>;
+}
+
+type LocationResolver = (options: LocationResolverArgs) => Location | undefined;
+
+/**
+ * Manages all diagnostics for a program.
+ * Diagnostics can be added specific to a certain file/range and optionally scope or an AST node
+ * and can be tagged with arbitrary keys.
+ * Diagnostics can be cleared based on file, scope, and/or AST node.
+ * If multiple diagnostics are added related to the same range of code, they will be consolidated as related information
+ */
+export class DiagnosticManager {
+
+    constructor(options?: { logger?: Logger; locationResolver: LocationResolver }) {
+        this.logger = options?.logger ?? createLogger();
+        this.locationResolver = options?.locationResolver ?? ((x) => x?.diagnostic?.location);
+    }
+
+    private diagnosticsCache = new Cache<string, DiagnosticWithContexts>();
+
+    private diagnosticFilterer = new DiagnosticFilterer();
+
+    private diagnosticAdjuster = new DiagnosticSeverityAdjuster();
+
+    public logger: Logger;
+
+    public locationResolver: LocationResolver;
+
+    public options: FinalizedBsConfig;
+
+    public program: Program;
+
+    private fileUriMap = new Map<string, Set<string>>();
+    private tagMap = new Map<string, Set<string>>();
+    private scopeMap = new Map<string, Set<string>>();
+    private segmentMap = new Map<AstNode, Set<string>>();
+
+    /**
+     * Registers a diagnostic (or multiple diagnostics) for a program.
+     * Diagnostics can optionally be associated with a context
+     */
+    public register(diagnostic: BsDiagnostic, context?: DiagnosticContext);
+    public register(diagnostics: Array<BsDiagnostic>, context?: DiagnosticContext);
+    public register(diagnostics: Array<DiagnosticContextPair>);
+    public register(diagnosticArg: BsDiagnostic | Array<BsDiagnostic | DiagnosticContextPair>, context?: DiagnosticContext) {
+        const diagnostics = Array.isArray(diagnosticArg) ? diagnosticArg : [{ diagnostic: diagnosticArg, context: context }];
+        for (const diagnosticData of diagnostics) {
+            const diagnostic = isBsDiagnostic(diagnosticData) ? diagnosticData : diagnosticData.diagnostic;
+            const diagContext = (diagnosticData as DiagnosticContextPair)?.context ?? context;
+            const key = this.getDiagnosticKey(diagnostic);
+            let fromCache = true;
+            const cacheData = this.diagnosticsCache.getOrAdd(key, () => {
+
+                if (!diagnostic.relatedInformation) {
+                    diagnostic.relatedInformation = [];
+                }
+                fromCache = false;
+                return { diagnostic: { key: key, ...diagnostic }, contexts: new Set<DiagnosticContext>() };
+            });
+
+            const cachedDiagnostic = cacheData.diagnostic;
+            if (!fromCache && diagnostic.relatedInformation) {
+                this.mergeRelatedInformation(cachedDiagnostic.relatedInformation, diagnostic.relatedInformation);
+            }
+            const contexts = cacheData.contexts;
+            if (diagContext) {
+                contexts.add(diagContext);
+            }
+            this.addToMaps(cachedDiagnostic, diagContext);
+        }
+    }
+
+    private addToMaps(diagnostic: BsDiagnosticWithKey, context?: DiagnosticContext) {
+        const uriLower = util.pathToUri(diagnostic.location?.uri?.toLowerCase());
+        if (uriLower) {
+            if (!this.fileUriMap.has(uriLower)) {
+                this.fileUriMap.set(uriLower, new Set());
+            }
+            this.fileUriMap.get(uriLower)?.add(diagnostic.key);
+        }
+        if (context) {
+            if (context.tags) {
+                for (const tag of context.tags) {
+                    const lowerTag = tag.toLowerCase();
+                    if (!this.tagMap.has(lowerTag)) {
+                        this.tagMap.set(lowerTag, new Set());
+                    }
+                    this.tagMap.get(lowerTag)?.add(diagnostic.key);
+                }
+            }
+            if (context.scope) {
+                const scopeKey = context.scope.name.toLowerCase();
+                if (!this.scopeMap.has(scopeKey)) {
+                    this.scopeMap.set(scopeKey, new Set());
+                }
+                this.scopeMap.get(scopeKey)?.add(diagnostic.key);
+            }
+            if (context.segment) {
+                if (!this.segmentMap.has(context.segment)) {
+                    this.segmentMap.set(context.segment, new Set());
+                }
+                this.segmentMap.get(context.segment)?.add(diagnostic.key);
+            }
+        }
+    }
+
+    /**
+     * Returns a list of all diagnostics, filtered by the in-file comment filters, filtered by BsConfig diagnostics and adjusted based on BsConfig
+     * If the same diagnostic is included in multiple contexts, they are included in a single diagnostic's relatedInformation
+     */
+    public getDiagnostics(): BsDiagnostic[] {
+        const doDiagnosticsGathering = () => {
+            const diagnostics = this.getNonSuppressedDiagnostics();
+            const filteredDiagnostics = this.logger?.time(LogLevel.debug, ['filter diagnostics'], () => {
+                return this.filterDiagnostics(diagnostics);
+            }) ?? this.filterDiagnostics(diagnostics);
+
+            this.logger?.time(LogLevel.debug, ['adjust diagnostics severity'], () => {
+                this.diagnosticAdjuster?.adjust(this.options ?? {}, filteredDiagnostics);
+            });
+
+            this.logger?.info(`diagnostic counts: total=${chalk.yellow(diagnostics.length.toString())}, after filter=${chalk.yellow(filteredDiagnostics.length.toString())}`);
+
+            return filteredDiagnostics;
+        };
+
+        return this.logger?.time(LogLevel.info, ['DiagnosticsManager.getDiagnostics()'], doDiagnosticsGathering) ?? doDiagnosticsGathering();
+    }
+
+    private getNonSuppressedDiagnostics() {
+        const results = [] as Array<BsDiagnostic>;
+        for (const cachedDiagnostic of this.diagnosticsCache.values()) {
+            const diagnostic = { ...cachedDiagnostic.diagnostic };
+            const relatedInformation = [...cachedDiagnostic.diagnostic.relatedInformation];
+            const affectedScopes = new Set<Scope>();
+            for (const context of cachedDiagnostic.contexts.values()) {
+                if (context.scope) {
+                    affectedScopes.add(context.scope);
+                }
+            }
+            for (const scope of affectedScopes) {
+                if (isXmlScope(scope) && scope.xmlFile?.srcPath) {
+                    relatedInformation.push({
+                        message: `In component scope '${scope?.xmlFile?.componentName?.text}'`,
+                        location: util.createLocationFromRange(
+                            util.pathToUri(scope.xmlFile?.srcPath),
+                            scope?.xmlFile?.ast?.componentElement?.getAttribute('name')?.tokens?.value?.location?.range ?? util.createRange(0, 0, 0, 10)
+                        )
+                    });
+                } else {
+                    relatedInformation.push({
+                        message: `In scope '${scope.name}'`,
+                        location: diagnostic.location
+                    });
+                }
+
+            }
+            diagnostic.relatedInformation = relatedInformation;
+            if (!diagnostic.location?.uri) {
+                diagnostic.location = this.locationResolver?.(cachedDiagnostic);
+                if (diagnostic.location) {
+                    //if we found a location, tweak the message a bit to let devs know this was not the original location
+                    diagnostic.message = `${diagnostic.message} (location unknown, added here for visibility)`;
+                }
+            }
+            results.push(diagnostic);
+        }
+        const filteredResults = results.filter((x) => {
+            return !this.isDiagnosticSuppressed(x);
+        });
+        return filteredResults;
+    }
+
+    /**
+     * Determine whether this diagnostic should be supressed or not, based on brs comment-flags
+     */
+    public isDiagnosticSuppressed(diagnostic: BsDiagnostic) {
+        const diagnosticCode = typeof diagnostic.code === 'string' ? diagnostic.code.toLowerCase() : diagnostic.code?.toString() ?? undefined;
+        const diagnosticLegacyCode = typeof diagnostic.legacyCode === 'string' ? diagnostic.legacyCode.toLowerCase() : diagnostic.legacyCode;
+        const file = this.program?.getFile(diagnostic.location?.uri);
+
+        for (let flag of file?.commentFlags ?? []) {
+            //this diagnostic is affected by this flag
+            if (diagnostic.location.range && util.rangeContains(flag.affectedRange, diagnostic.location.range.start)) {
+                //if the flag acts upon this diagnostic's code
+                const diagCodeSuppressed = (diagnosticCode !== undefined && flag.codes?.includes(diagnosticCode)) ||
+                    (diagnosticLegacyCode !== undefined && flag.codes?.includes(diagnosticLegacyCode));
+                if (flag.codes === null || diagCodeSuppressed) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    private filterDiagnostics(diagnostics: BsDiagnostic[]) {
+        //filter out diagnostics based on our diagnostic filters
+        let filteredDiagnostics = this.diagnosticFilterer.filter({
+            ...this.options ?? {},
+            rootDir: this.options?.rootDir
+        }, diagnostics, this.program);
+        return filteredDiagnostics;
+    }
+
+    public clear() {
+        this.diagnosticsCache.clear();
+    }
+
+    public clearForFile(fileSrcPath: string) {
+        const fileSrcPathUri = util.pathToUri(fileSrcPath)?.toLowerCase?.();
+        for (const key of this.fileUriMap.get(fileSrcPathUri) ?? []) {
+            const cachedData = this.diagnosticsCache.get(key);
+            this.deleteContextsFromDiagnostic(cachedData.diagnostic, Array.from(cachedData.contexts));
+            this.removeDiagnosticIfNoContexts(cachedData.diagnostic);
+        }
+        this.fileUriMap.get(fileSrcPathUri)?.clear();
+    }
+
+    public clearForScope(scope: Scope) {
+        const scopeNameLower = scope.name.toLowerCase();
+        for (const key of this.scopeMap.get(scopeNameLower) ?? []) {
+            const cachedData = this.diagnosticsCache.get(key);
+            const contextsToRemove: DiagnosticContext[] = [];
+            let foundMatch = false;
+            for (const context of cachedData.contexts.values()) {
+                if (context.scope === scope) {
+                    contextsToRemove.push(context);
+                    foundMatch = true;
+                }
+            }
+            this.deleteContextsFromDiagnostic(cachedData.diagnostic, contextsToRemove);
+            if (foundMatch) {
+                this.removeDiagnosticIfNoContexts(cachedData.diagnostic);
+            }
+        }
+        this.scopeMap.get(scopeNameLower)?.clear();
+    }
+
+    public clearForSegment(segment: AstNode) {
+        for (const key of this.segmentMap.get(segment) ?? []) {
+            const cachedData = this.diagnosticsCache.get(key);
+            const contextsToRemove: DiagnosticContext[] = [];
+            let foundMatch = false;
+            for (const context of cachedData.contexts.values()) {
+                if (context.segment === segment) {
+                    foundMatch = true;
+                    contextsToRemove.push(context);
+                }
+            }
+            this.deleteContextsFromDiagnostic(cachedData.diagnostic, contextsToRemove);
+            if (foundMatch) {
+                this.removeDiagnosticIfNoContexts(cachedData.diagnostic);
+            }
+        }
+        this.segmentMap.get(segment)?.clear();
+    }
+
+    public clearForTag(tag: string) {
+        const tagLower = tag.toLowerCase();
+        for (const key of this.tagMap.get(tagLower) ?? []) {
+            const cachedData = this.diagnosticsCache.get(key);
+            const contextsToRemove: DiagnosticContext[] = [];
+            let foundMatch = false;
+            for (const context of cachedData.contexts.values()) {
+                if (context.tags.includes(tag)) {
+                    foundMatch = true;
+                    contextsToRemove.push(context);
+                }
+            }
+            this.deleteContextsFromDiagnostic(cachedData.diagnostic, contextsToRemove);
+            if (foundMatch) {
+                this.removeDiagnosticIfNoContexts(cachedData.diagnostic);
+            }
+        }
+        this.tagMap.get(tagLower)?.clear();
+    }
+
+    /*
+     *  Filters searchData to include only those diagnostics that match the filter provided
+     *
+     * @param shouldMatch true if this is an important filter, false if it is an optional filter
+     * @param {MapIterator<DiagnosticWithContexts>} searchData Data to filter
+     * @param filteredDiagnosticKeysSet Set of keys to filter by
+     * @returns  {MapIterator<DiagnosticWithContexts>} result of intersection
+     */
+    private getSearchIntersection(shouldMatch: boolean, searchData: DiagnosticWithContexts[], filteredDiagnosticKeysSet: Set<string>, ignoreEmptyFilter = false): DiagnosticWithContexts[] {
+        if (!shouldMatch) {
+            return searchData;
+        }
+
+        if (!filteredDiagnosticKeysSet || filteredDiagnosticKeysSet.size === 0) {
+            return [];
+        }
+
+        return searchData.filter((diagnosticWithContext) => {
+            return filteredDiagnosticKeysSet.has(diagnosticWithContext.diagnostic.key);
+        });
+    }
+
+    /**
+     * Clears all diagnostics that match all aspects of the filter provided
+     * Matches equality of tag, scope, file, segment filters. Leave filter option undefined to not filter on option
+     */
+    public clearByFilter(filter: DiagnosticContextFilter) {
+
+        const needToMatch = {
+            tag: !!filter.tag,
+            scope: !!filter.scope,
+            fileUri: !!filter.fileUri,
+            segment: !!filter.segment
+        };
+
+        let searchData = Array.from(this.diagnosticsCache.values());
+        searchData = this.getSearchIntersection(needToMatch.tag, searchData, needToMatch.tag ? this.tagMap.get(filter.tag?.toLowerCase()) : null);
+        if (searchData.length === 0) {
+            return;
+        }
+        searchData = this.getSearchIntersection(needToMatch.scope, searchData, needToMatch.scope ? this.scopeMap.get(filter.scope?.name?.toLowerCase()) : null, true);
+        if (searchData.length === 0) {
+            return;
+        }
+        searchData = this.getSearchIntersection(needToMatch.fileUri, searchData, needToMatch.fileUri ? this.fileUriMap.get(util.pathToUri(filter.fileUri).toLowerCase()) : null);
+        if (searchData.length === 0) {
+            return;
+        }
+        searchData = this.getSearchIntersection(needToMatch.segment, searchData, needToMatch.segment ? this.segmentMap.get(filter.segment) : null);
+
+        for (const { diagnostic, contexts } of searchData ?? []) {
+            const contextsToRemove: DiagnosticContext[] = [];
+            let foundMatch = false;
+            for (const context of contexts) {
+                let isMatch = true;
+                if (isMatch && needToMatch.tag) {
+                    isMatch = !!context.tags?.includes(filter.tag);
+                }
+                if (isMatch && needToMatch.scope) {
+                    isMatch = context.scope?.name === filter.scope.name;
+                }
+                if (isMatch && needToMatch.fileUri) {
+                    isMatch = diagnostic.location?.uri === filter.fileUri;
+                }
+                if (isMatch && needToMatch.segment) {
+                    isMatch = context.segment === filter.segment;
+                }
+
+                if (isMatch) {
+                    contextsToRemove.push(context);
+                    foundMatch = true;
+                }
+            }
+            this.deleteContextsFromDiagnostic(diagnostic, contextsToRemove);
+            if (foundMatch) {
+                this.removeDiagnosticIfNoContexts(diagnostic);
+            }
+        }
+    }
+
+    private deleteContextsFromDiagnostic(diagnostic: BsDiagnosticWithKey, contexts: DiagnosticContext[]) {
+        const key = diagnostic.key;
+        const cachedData = this.diagnosticsCache.get(key);
+        for (const context of contexts) {
+            cachedData.contexts.delete(context);
+        }
+        for (const context of contexts) {
+            for (const tag of context.tags ?? []) {
+                let foundTagOtherContext = false;
+                for (const otherContext of cachedData.contexts) {
+                    if (otherContext.tags?.includes(tag)) {
+                        foundTagOtherContext = true;
+                        break;
+                    }
+                }
+                if (!foundTagOtherContext) {
+                    this.tagMap.get(tag.toLowerCase())?.delete(key);
+                }
+            }
+            if (context.scope) {
+                let foundScopeOtherContext = false;
+                for (const otherContext of cachedData.contexts) {
+                    if (otherContext.scope === context.scope) {
+                        foundScopeOtherContext = true;
+                        break;
+                    }
+                }
+                if (!foundScopeOtherContext) {
+                    this.scopeMap.get(context.scope.name.toLowerCase())?.delete(key);
+                }
+            }
+            if (context.segment) {
+                let foundSegmentOtherContext = false;
+                for (const otherContext of cachedData.contexts) {
+                    if (otherContext.segment === context.segment) {
+                        foundSegmentOtherContext = true;
+                        break;
+                    }
+                }
+                if (!foundSegmentOtherContext) {
+                    this.segmentMap.get(context.segment)?.delete(key);
+                }
+            }
+        }
+    }
+
+    private removeDiagnosticIfNoContexts(diagnostic: BsDiagnosticWithKey) {
+        const key = diagnostic.key;
+        const cachedData = this.diagnosticsCache.get(key);
+        if (cachedData.contexts.size === 0) {
+            this.diagnosticsCache.delete(key);
+            this.fileUriMap.get(diagnostic.location?.uri?.toLowerCase())?.delete(key);
+        }
+    }
+
+
+    private getDiagnosticKey(diagnostic: BsDiagnostic) {
+        return `${diagnostic.location?.uri ?? 'No uri'} ${util.rangeToString(diagnostic.location?.range)} - ${diagnostic.code} - ${diagnostic.message}`;
+    }
+
+    private mergeRelatedInformation(target: DiagnosticRelatedInformation[], source: DiagnosticRelatedInformation[]) {
+        function getRiKey(relatedInfo: DiagnosticRelatedInformation) {
+            return `${relatedInfo.message} - ${relatedInfo.location?.uri} - ${util.rangeToString(relatedInfo.location?.range)}`.toLowerCase();
+        }
+
+        const existingKeys = target.map(ri => getRiKey(ri));
+
+        for (const ri of source) {
+            const key = getRiKey(ri);
+            if (!existingKeys.includes(key)) {
+                target.push(ri);
+            }
+        }
+    }
+
+    public shouldFilterFile(file: BrsFile): boolean {
+        if (this.diagnosticFilterer.options !== this.options) {
+            this.diagnosticFilterer.options = this.options;
+        }
+        this.diagnosticFilterer.isFileFiltered(file);
+        return false;
+    }
+
+}
+
+interface DiagnosticContextFilter {
+    tag?: string;
+    scope?: Scope;
+    fileUri?: string;
+    segment?: AstNode;
+}
diff --git a/src/DiagnosticMessages.spec.ts b/src/DiagnosticMessages.spec.ts
index fa54bfc95..a34506fec 100644
--- a/src/DiagnosticMessages.spec.ts
+++ b/src/DiagnosticMessages.spec.ts
@@ -1,19 +1,56 @@
 import { expect } from './chai-config.spec';
 
-import { DiagnosticMessages } from './DiagnosticMessages';
+import { DiagnosticCodeRegex, DiagnosticMessages } from './DiagnosticMessages';
 
 describe('DiagnosticMessages', () => {
+    it('has unique legacyCode for each message', () => {
+        let codes = {};
+        for (let key in DiagnosticMessages) {
+            let func = DiagnosticMessages[key];
+            let obj = func('', '', '', '', '', '', '', '', '');
+            if (obj.legacyCode === undefined) {
+                // does not have a legacy code
+                continue;
+            }
+
+            //if another message already has this code
+            if (!codes[obj.legacyCode]) {
+                codes[obj.legacyCode] = key;
+            } else {
+                expect(codes[obj.legacyCode]).to.equal(key, 'Two diagnostic messages share the same legacy Code');
+            }
+        }
+    });
+
     it('has unique code for each message', () => {
         let codes = {};
         for (let key in DiagnosticMessages) {
+            if (key.startsWith('__unused')) {
+                // ignore unused diagnostics
+                continue;
+            }
             let func = DiagnosticMessages[key];
             let obj = func('', '', '', '', '', '', '', '', '');
+            const diagCode: string = obj.code ?? '';
+            expect(diagCode).to.not.equal('', `Diagnostic name is empty - ${key}`);
+            expect(diagCode.toLowerCase()).to.equal(obj.code, `Diagnostic name has capitals - ${key}`);
+            expect(diagCode.indexOf(' ')).to.equal(-1, `Diagnostic name has space - ${key}`);
+            expect(DiagnosticCodeRegex.test(diagCode)).to.equal(true, `Diagnostic name does not match regex - ${key}`);
             //if another message already has this code
             if (!codes[obj.code]) {
                 codes[obj.code] = key;
             } else {
-                expect(codes[obj.code]).to.equal(key, 'Two diagnostic messages share the same error code');
+                expect(codes[obj.code]).to.equal(key, 'Two diagnostic messages share the same error codes');
             }
         }
     });
+
+    it('properly formats expected terminator diagnostics', () => {
+        let diag = DiagnosticMessages.expectedTerminator(['end if', 'else if', 'else'], 'then', 'block');
+        expect(diag.message).to.equal(`Expected 'end if', 'else if' or 'else' to terminate 'then' block`);
+        diag = DiagnosticMessages.expectedTerminator('end try', 'try-catch');
+        expect(diag.message).to.equal(`Expected 'end try' to terminate 'try-catch' statement`);
+        diag = DiagnosticMessages.expectedTerminator(['one', 'two'], 'something');
+        expect(diag.message).to.equal(`Expected 'one' or 'two' to terminate 'something' statement`);
+    });
 });
diff --git a/src/DiagnosticMessages.ts b/src/DiagnosticMessages.ts
index 12357a6a3..84ac4fc63 100644
--- a/src/DiagnosticMessages.ts
+++ b/src/DiagnosticMessages.ts
@@ -1,7 +1,13 @@
 import type { Position } from 'vscode-languageserver';
 import { DiagnosticSeverity } from 'vscode-languageserver';
-import type { BsDiagnostic } from './interfaces';
-import type { TokenKind } from './lexer/TokenKind';
+import type { BsDiagnostic, TypeCompatibilityData } from './interfaces';
+import { TokenKind } from './lexer/TokenKind';
+import util from './util';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { BscType } from './types/BscType';
+
+
+export const DiagnosticCodeRegex = /^[a-z](?:[a-z0-9]*(?:-[a-z0-9]+)*)*$/;
 
 /**
  * An object that keeps track of all possible error messages.
@@ -10,779 +16,1192 @@ export let DiagnosticMessages = {
     //this one won't be used much, we just need a catchall object for the code since we pass through the message from the parser
     genericParserMessage: (message: string) => ({
         message: message,
-        code: 1000,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1000,
+        severity: DiagnosticSeverity.Error,
+        code: 'generic-parser-message'
     }),
     /**
      *
      * @param name for local vars, it's the var name. for namespaced parts, it's the specific part that's unknown (`alpha.beta.charlie` would result in "cannot find name 'charlie')
      * @param fullName if a namespaced name, this is the full name `alpha.beta.charlie`, otherwise it's the same as `name`
+     * @param typeName if 'name' refers to a member, what is the the type it is a member of?
+     * @param typeDescriptor defaults to 'type' ... could also be 'namespace', etc.
      */
-    cannotFindName: (name: string, fullName?: string) => ({
-        message: `Cannot find name '${name}'`,
-        code: 1001,
+    cannotFindName: (name: string, fullName?: string, typeName?: string, typeDescriptor = 'type') => ({
+        message: `Cannot find name '${name}'${typeName ? ` for ${typeDescriptor} '${typeName}'` : ''}`,
+        legacyCode: 1001,
         data: {
             name: name,
-            fullName: fullName ?? name
+            fullName: fullName ?? name,
+            typeName: typeName ? typeName : undefined
         },
-        severity: DiagnosticSeverity.Error
+        severity: DiagnosticSeverity.Error,
+        code: 'cannot-find-name'
     }),
     mismatchArgumentCount: (expectedCount: number | string, actualCount: number) => ({
         message: `Expected ${expectedCount} arguments, but got ${actualCount}.`,
-        code: 1002,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1002,
+        severity: DiagnosticSeverity.Error,
+        code: 'incorrect-argument-count'
     }),
-    duplicateFunctionImplementation: (functionName: string, scopeName: string) => ({
-        message: `Duplicate function implementation for '${functionName}' when this file is included in scope '${scopeName}'.`,
-        code: 1003,
-        severity: DiagnosticSeverity.Error
+    duplicateFunctionImplementation: (functionName: string) => ({
+        message: `Duplicate function implementation for '${functionName}'.`,
+        legacyCode: 1003,
+        severity: DiagnosticSeverity.Error,
+        code: 'duplicate-function'
     }),
     referencedFileDoesNotExist: () => ({
         message: `Referenced file does not exist.`,
-        code: 1004,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1004,
+        severity: DiagnosticSeverity.Error,
+        code: 'file-not-found'
     }),
     xmlComponentMissingComponentDeclaration: () => ({
         message: `Missing a component declaration.`,
-        code: 1005,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1005,
+        severity: DiagnosticSeverity.Error,
+        code: 'missing-component-element'
     }),
     xmlComponentMissingNameAttribute: () => ({
         message: `Component must have a name attribute.`,
-        code: 1006,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1006,
+        severity: DiagnosticSeverity.Error,
+        code: 'missing-name-attribute'
     }),
     xmlComponentMissingExtendsAttribute: () => ({
         message: `Component is mising "extends" attribute and will automatically extend "Group" by default`,
-        code: 1007,
-        severity: DiagnosticSeverity.Warning
+        legacyCode: 1007,
+        severity: DiagnosticSeverity.Warning,
+        code: 'missing-extends-attribute'
     }),
-    xmlGenericParseError: (message: string) => ({
+    syntaxError: (message: string) => ({
         //generic catchall xml parse error
         message: message,
-        code: 1008,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1008,
+        severity: DiagnosticSeverity.Error,
+        code: 'syntax-error'
     }),
     unnecessaryScriptImportInChildFromParent: (parentComponentName: string) => ({
         message: `Unnecessary script import: Script is already imported in ancestor component '${parentComponentName}'.`,
-        code: 1009,
-        severity: DiagnosticSeverity.Warning
+        legacyCode: 1009,
+        severity: DiagnosticSeverity.Warning,
+        code: 'redundant-import'
     }),
     overridesAncestorFunction: (callableName: string, currentScopeName: string, parentFilePath: string, parentScopeName: string) => ({
         message: `Function '${callableName}' included in '${currentScopeName}' overrides function in '${parentFilePath}' included in '${parentScopeName}'.`,
-        code: 1010,
-        severity: DiagnosticSeverity.Hint
+        legacyCode: 1010,
+        severity: DiagnosticSeverity.Hint,
+        code: 'overrides-ancestor-function'
     }),
     localVarFunctionShadowsParentFunction: (scopeName: 'stdlib' | 'scope') => ({
         message: `Local variable function has same name as ${scopeName} function and will never be called.`,
-        code: 1011,
-        severity: DiagnosticSeverity.Warning
+        legacyCode: 1011,
+        severity: DiagnosticSeverity.Warning,
+        code: 'variable-shadows-function'
     }),
     scriptImportCaseMismatch: (correctFilePath: string, correctUri?: string) => ({
         message: `Script import path does not match casing of actual file path '${correctFilePath}'.`,
-        code: 1012,
+        legacyCode: 1012,
         data: {
             correctFilePath: correctUri ?? correctFilePath
         },
-        severity: DiagnosticSeverity.Warning
+        severity: DiagnosticSeverity.Warning,
+        code: 'import-case-mismatch'
     }),
     fileNotReferencedByAnyOtherFile: () => ({
         message: `This file is not referenced by any other file in the project.`,
-        code: 1013,
-        severity: DiagnosticSeverity.Warning
+        legacyCode: 1013,
+        severity: DiagnosticSeverity.Warning,
+        code: 'file-not-referenced'
     }),
-    unknownDiagnosticCode: (theUnknownCode: number) => ({
+    unknownDiagnosticCode: (theUnknownCode: number | string) => ({
         message: `Unknown diagnostic code ${theUnknownCode}`,
-        code: 1014,
-        severity: DiagnosticSeverity.Warning
+        legacyCode: 1014,
+        severity: DiagnosticSeverity.Warning,
+        code: 'unknown-diagnostic-code'
     }),
     scriptSrcCannotBeEmpty: () => ({
         message: `Script import cannot be empty or whitespace`,
-        code: 1015,
-        severity: DiagnosticSeverity.Error
-    }),
-    expectedIdentifierAfterKeyword: (keywordText: string) => ({
-        message: `Expected identifier after '${keywordText}' keyword`,
-        code: 1016,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1015,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-import-path'
     }),
+    expectedIdentifier: (preceedingTokenText?: string) => {
+        let message = `Expected identifier`;
+        if (preceedingTokenText) {
+            message += ` after '${preceedingTokenText}'`;
+        }
+        return {
+            message: message,
+            legacyCode: 1016,
+            severity: DiagnosticSeverity.Error,
+            code: 'expected-identifier'
+        };
+    },
     missingCallableKeyword: () => ({
-        message: `Expected 'function' or 'sub' to preceed identifier`,
-        code: 1017,
-        severity: DiagnosticSeverity.Error
+        message: `Expected 'function' or 'sub' to precede identifier`,
+        legacyCode: 1017,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-leading-keyword'
     }),
-    expectedValidTypeToFollowAsKeyword: () => ({
+    __unused12: () => ({
         message: `Expected valid type to follow 'as' keyword`,
-        code: 1018,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1018,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-valid-type'
     }),
     bsFeatureNotSupportedInBrsFiles: (featureName) => ({
         message: `BrighterScript feature '${featureName}' is not supported in standard BrightScript files`,
-        code: 1019,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1019,
+        severity: DiagnosticSeverity.Error,
+        code: 'bs-feature-not-supported'
     }),
-    brsConfigJsonIsDeprecated: () => ({
+    __ununsed12: () => ({
         message: `'brsconfig.json' is deprecated. Please rename to 'bsconfig.json'`,
-        code: 1020,
-        severity: DiagnosticSeverity.Warning
+        legacyCode: 1020,
+        severity: DiagnosticSeverity.Warning,
+        code: 'brsconfig-deprecated'
     }),
     bsConfigJsonHasSyntaxErrors: (message: string) => ({
         message: `Encountered syntax errors in bsconfig.json: ${message}`,
-        code: 1021,
-        severity: DiagnosticSeverity.Error
-    }),
-    namespacedClassCannotShareNamewithNonNamespacedClass: (nonNamespacedClassName: string) => ({
-        message: `Namespaced class cannot have the same name as a non-namespaced class '${nonNamespacedClassName}'`,
-        code: 1022,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1021,
+        severity: DiagnosticSeverity.Error,
+        code: 'bsconfig-syntax-errors'
     }),
+    itemIsDeprecated: (itemName?: string, deprecatedDescription?: string) => {
+        itemName ??= 'Item';
+        return {
+            message: `${itemName} has been deprecated${deprecatedDescription ? ': ' + deprecatedDescription : ''} `,
+            legacyCode: 1022,
+            severity: DiagnosticSeverity.Hint,
+            code: 'item-deprecated'
+        };
+    },
     cannotUseOverrideKeywordOnConstructorFunction: () => ({
         message: 'Override keyword is not allowed on class constructor method',
-        code: 1023,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1023,
+        severity: DiagnosticSeverity.Error,
+        code: 'override-keyword-on-constructor'
     }),
-    importStatementMustBeDeclaredAtTopOfFile: () => ({
-        message: `'import' statement must be declared at the top of the file`,
-        code: 1024,
-        severity: DiagnosticSeverity.Error
+    unexpectedStatementLocation: (statementKeyword: string, locationText: string) => ({
+        message: `'${statementKeyword}' statement must be declared ${locationText}`,
+        legacyCode: 1024,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-statement-location'
     }),
-    methodDoesNotExistOnType: (methodName: string, className: string) => ({
+    __unused8: (methodName: string, className: string) => ({
         message: `Method '${methodName}' does not exist on type '${className}'`,
-        code: 1025,
+        legacyCode: 1025,
         severity: DiagnosticSeverity.Error
     }),
     duplicateIdentifier: (memberName: string) => ({
         message: `Duplicate identifier '${memberName}'`,
-        code: 1026,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1026,
+        severity: DiagnosticSeverity.Error,
+        code: 'duplicate-identifier'
     }),
     missingOverrideKeyword: (ancestorClassName: string) => ({
         message: `Method has no override keyword but is declared in ancestor class '${ancestorClassName}'`,
-        code: 1027,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1027,
+        severity: DiagnosticSeverity.Error,
+        code: 'missing-override-keyword'
     }),
-    duplicateClassDeclaration: (scopeName: string, className: string) => ({
-        message: `Scope '${scopeName}' already contains a class with name '${className}'`,
-        code: 1028,
-        severity: DiagnosticSeverity.Error
+    nameCollision: (thisThingKind: string, thatThingKind: string, thatThingName: string) => ({
+        message: `${thisThingKind} has same name as ${thatThingKind} '${thatThingName}'`,
+        legacyCode: 1028,
+        severity: DiagnosticSeverity.Error,
+        code: 'name-collision'
     }),
-    classCouldNotBeFound: (className: string, scopeName: string) => ({
+    __unused9: (className: string, scopeName: string) => ({
         message: `Class '${className}' could not be found when this file is included in scope '${scopeName}'`,
-        code: 1029,
+        legacyCode: 1029,
         severity: DiagnosticSeverity.Error,
         data: {
             className: className
         }
     }),
-    expectedClassFieldIdentifier: () => ({
+    __unused27: () => ({
         message: `Expected identifier in class body`,
-        code: 1030,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1030,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-identifier-in-body'
     }),
     expressionIsNotConstructable: (expressionType: string) => ({
         message: `Cannot use the 'new' keyword here because '${expressionType}' is not a constructable type`,
-        code: 1031,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1031,
+        severity: DiagnosticSeverity.Error,
+        code: 'not-constructable'
     }),
     expectedKeyword: (kind: TokenKind) => ({
         message: `Expected '${kind}' keyword`,
-        code: 1032,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1032,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-keyword'
     }),
-    expectedLeftParenAfterCallable: (callableType: string) => ({
+    __unused28: (callableType: string) => ({
         message: `Expected '(' after ${callableType}`,
-        code: 1033,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1033,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-left-paren-after-callable'
     }),
-    expectedNameAfterCallableKeyword: (callableType: string) => ({
+    __unused29: (callableType: string) => ({
         message: `Expected ${callableType} name after '${callableType}' keyword`,
-        code: 1034,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1034,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-name-after-callable'
     }),
-    expectedLeftParenAfterCallableName: (callableType: string) => ({
+    __unused30: (callableType: string) => ({
         message: `Expected '(' after ${callableType} name`,
-        code: 1035,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1035,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-left-paren-after-callable-name'
     }),
     tooManyCallableParameters: (actual: number, max: number) => ({
         message: `Cannot have more than ${max} parameters but found ${actual})`,
-        code: 1036,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1036,
+        severity: DiagnosticSeverity.Error,
+        code: 'exceeds-max-parameter-count'
     }),
-    invalidFunctionReturnType: (typeText: string) => ({
+    __unused: (typeText: string) => ({
         message: `Function return type '${typeText}' is invalid`,
-        code: 1037,
+        legacyCode: 1037,
         severity: DiagnosticSeverity.Error
     }),
     requiredParameterMayNotFollowOptionalParameter: (parameterName: string) => ({
         message: `Required parameter '${parameterName}' must be declared before any optional parameters`,
-        code: 1038,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1038,
+        severity: DiagnosticSeverity.Error,
+        code: 'required-parameter-before-optional'
     }),
     expectedNewlineOrColon: () => ({
         message: `Expected newline or ':' at the end of a statement`,
-        code: 1039,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1039,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-statement-separator'
     }),
-    functionNameCannotEndWithTypeDesignator: (callableType: string, name: string, designator: string) => ({
-        message: `${callableType} name '${name}' cannot end with type designator '${designator}'`,
-        code: 1040,
-        severity: DiagnosticSeverity.Error
+    invalidIdentifier: (name: string, character: string) => ({
+        message: `Identifier '${name}' may not contain the character '${character}'`,
+        legacyCode: 1040,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-identifier'
     }),
-    callableBlockMissingEndKeyword: (callableType: string) => ({
+    __unused31: (callableType: string) => ({
         message: `Expected 'end ${callableType}' to terminate ${callableType} block`,
-        code: 1041,
-        severity: DiagnosticSeverity.Error
-    }),
-    mismatchedEndCallableKeyword: (expectedCallableType: string, actualCallableType: string) => ({
-        message: `Expected 'end ${expectedCallableType?.replace(/^end\s*/, '')}' to terminate ${expectedCallableType} block but found 'end ${actualCallableType?.replace(/^end\s*/, '')}' instead.`,
-        code: 1042,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1041,
+        severity: DiagnosticSeverity.Error,
+        code: 'closing-keyword-mismatch'
     }),
+    closingKeywordMismatch: (expectedCallableType: string, actualCallableType: string) => {
+        let message = `Expected 'end ${expectedCallableType?.replace(/^end\s*/, '')}' to terminate ${expectedCallableType} block`;
+        if (actualCallableType) {
+            message += ` but found 'end ${actualCallableType?.replace(/^end\s*/, '')}' instead.`;
+        }
+        return {
+            message: message,
+            legacyCode: 1042,
+            severity: DiagnosticSeverity.Error,
+            code: 'closing-keyword'
+        };
+    },
     expectedParameterNameButFound: (text: string) => ({
         message: `Expected parameter name, but found '${text ?? ''}'`,
-        code: 1043,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1043,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-parameter-name'
     }),
-    functionParameterTypeIsInvalid: (parameterName: string, typeText: string) => ({
+    __unused2: (parameterName: string, typeText: string) => ({
         message: `Function parameter '${parameterName}' is of invalid type '${typeText}'`,
-        code: 1044,
+        legacyCode: 1044,
         severity: DiagnosticSeverity.Error
     }),
     cannotUseReservedWordAsIdentifier: (name: string) => ({
         message: `Cannot use reserved word '${name}' as an identifier`,
-        code: 1045,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1045,
+        severity: DiagnosticSeverity.Error,
+        code: 'cannot-use-reserved-word'
     }),
-    expectedOperatorAfterIdentifier: (operators: TokenKind[], name: string) => {
+    expectedOperator: (operators: TokenKind[], name: string) => {
         operators = Array.isArray(operators) ? operators : [];
+        let message = `Expected operator ('${operators.join(`', '`)}')`;
+        if (name) {
+            message += ` after idenfifier '${name}'`;
+        }
         return {
-            message: `Expected operator ('${operators.join(`', '`)}') after idenfifier '${name}'`,
-            code: 1046,
-            severity: DiagnosticSeverity.Error
+            message: message,
+            legacyCode: 1046,
+            severity: DiagnosticSeverity.Error,
+            code: 'expected-operator'
         };
     },
     expectedInlineIfStatement: () => ({
         message: `If/else statement within an inline if should be also inline`,
-        code: 1047,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1047,
+        severity: DiagnosticSeverity.Error,
+        code: 'malformed-inline-if'
     }),
     expectedFinalNewline: () => ({
         message: `Expected newline at the end of an inline if statement`,
-        code: 1048,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1048,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-final-newline'
     }),
     couldNotFindMatchingEndKeyword: (keyword: string) => ({
         message: `Could not find matching 'end ${keyword}'`,
-        code: 1049,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1049,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-end-keyword'
     }),
     expectedCatchBlockInTryCatch: () => ({
         message: `Expected 'catch' block in 'try' statement`,
-        code: 1050,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1050,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-catch'
     }),
-    expectedEndForOrNextToTerminateForLoop: () => ({
-        message: `Expected 'end for' or 'next' to terminate 'for' loop`,
-        code: 1051,
-        severity: DiagnosticSeverity.Error
+    expectedEndForOrNextToTerminateForLoop: (forLoopNameText: string = TokenKind.For) => ({
+        message: `Expected 'end for' or 'next' to terminate '${forLoopNameText}' loop`,
+        legacyCode: 1051,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-loop-terminator'
     }),
-    expectedInAfterForEach: (name: string) => ({
+    __unused32: (name: string) => ({
         message: `Expected 'in' after 'for each ${name}'`,
-        code: 1052,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1052,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-in-for-each'
     }),
     expectedExpressionAfterForEachIn: () => ({
         message: `Expected expression after 'in' keyword from 'for each' statement`,
-        code: 1053,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1053,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-loop-expression'
     }),
     unexpectedColonBeforeIfStatement: () => ({
         message: `Colon before 'if' statement is not allowed`,
-        code: 1054,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1054,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-leading-colon'
     }),
     expectedStringLiteralAfterKeyword: (keyword: string) => ({
-        message: `Missing string literal after '${keyword}' keyword`,
-        code: 1055,
-        severity: DiagnosticSeverity.Error
+        message: `Expected string literal after '${keyword}' keyword`,
+        legacyCode: 1055,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-string-literal'
     }),
     keywordMustBeDeclaredAtRootLevel: (keyword: string) => ({
         message: `${keyword} must be declared at the root level`,
-        code: 1056,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1056,
+        severity: DiagnosticSeverity.Error,
+        code: 'keyword-must-be-root-level'
     }),
-    libraryStatementMustBeDeclaredAtTopOfFile: () => ({
+    __unused5: () => ({
         message: `'library' statement must be declared at the top of the file`,
-        code: 1057,
+        legacyCode: 1057,
         severity: DiagnosticSeverity.Error
     }),
-    expectedEndIfElseIfOrElseToTerminateThenBlock: () => ({
+    expectedTerminator: (expectedTerminators: string[] | string, statementType: string, blockDescriptor: 'block' | 'statement' = 'statement') => ({
+        message: `Expected ${getPossibilitiesString(expectedTerminators)} to terminate '${statementType}' ${blockDescriptor}`,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-terminator'
+    }),
+    __unused14: () => ({
         message: `Expected 'end if', 'else if', or 'else' to terminate 'then' block`,
-        code: 1058,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1058,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-terminator-on-then'
     }),
-    expectedEndTryToTerminateTryCatch: () => ({
+    __unused15: () => ({
         message: `Expected 'end try' to terminate 'try-catch' statement`,
-        code: 1059,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1059,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-terminator-on-try-catch'
     }),
-    expectedEndIfToCloseIfStatement: (startingPosition: Position) => ({
-        message: `Expected 'end if' to close 'if' statement started at ${startingPosition?.line + 1}:${startingPosition?.character + 1}`,
-        code: 1060,
-        severity: DiagnosticSeverity.Error
+    __unused16: (startingPosition: Position) => ({
+        message: `Expected 'end if' to close 'if' statement started at ${startingPosition?.line + 1}:${startingPosition?.character + 1} `,
+        legacyCode: 1060,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-terminator-on-if'
     }),
-    expectedStatementToFollowConditionalCondition: (conditionType: string) => ({
+    expectedStatement: (conditionType?: string, extraDetail?: string) => {
+        let message = 'Expected statement';
+        if (conditionType) {
+            message += ` to follow '${conditionType?.toLowerCase()}'`;
+        }
+        if (extraDetail) {
+            message += ` ${extraDetail}`;
+        }
+        return {
+            message: message,
+            severity: DiagnosticSeverity.Error,
+            code: 'expected-statement'
+        };
+    },
+    __unused18: (conditionType: string) => ({
         message: `Expected a statement to follow '${conditionType?.toLowerCase()} ...condition... then'`,
-        code: 1061,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1061,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-statement-after-conditional'
     }),
-    expectedStatementToFollowElse: () => ({
+    __unused19: () => ({
         message: `Expected a statement to follow 'else'`,
-        code: 1062,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1062,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-statement-after-else'
     }),
-    consecutiveIncrementDecrementOperatorsAreNotAllowed: () => ({
-        message: `Consecutive increment/decrement operators are not allowed`,
-        code: 1063,
-        severity: DiagnosticSeverity.Error
+    unexpectedOperator: () => ({
+        message: `Unexpected operator`,
+        legacyCode: 1063,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-operator'
     }),
-    incrementDecrementOperatorsAreNotAllowedAsResultOfFunctionCall: () => ({
-        message: ``,
-        code: 1064,
-        severity: DiagnosticSeverity.Error
+    __unused13: () => ({
+        message: `Increment / decrement operators are not allowed on function calls`,
+        legacyCode: 1064,
+        severity: DiagnosticSeverity.Error,
+        code: 'increment-decrement-on-function-call'
     }),
     xmlUnexpectedTag: (tagName: string) => ({
         message: `Unexpected tag '${tagName}'`,
-        code: 1065,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1065,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-tag'
     }),
     expectedStatementOrFunctionCallButReceivedExpression: (expressionType = 'expression') => ({
         message: `Expected statement or function call but instead found ${expressionType}`,
-        code: 1066,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1066,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-statement-or-function-call-not-expression'
     }),
     xmlFunctionNotFound: (name: string) => ({
         message: `Cannot find function with name '${name}' in component scope`,
-        code: 1067,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1067,
+        severity: DiagnosticSeverity.Error,
+        code: 'function-not-found'
     }),
     xmlInvalidFieldType: (name: string) => ({
         message: `Invalid field type ${name}`,
-        code: 1068,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1068,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-field-type'
     }),
     xmlUnexpectedChildren: (tagName: string) => ({
         message: `Tag '${tagName}' should not have children`,
-        code: 1069,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1069,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-children'
     }),
     xmlTagMissingAttribute: (tagName: string, attrName: string) => ({
         message: `Tag '${tagName}' must have a '${attrName}' attribute`,
-        code: 1070,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1070,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-attribute'
     }),
     expectedLabelIdentifierAfterGotoKeyword: () => ({
         message: `Expected label identifier after 'goto' keyword`,
-        code: 1071,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1071,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-label'
     }),
-    expectedRightSquareBraceAfterArrayOrObjectIndex: () => ({
+    __unused26: () => ({
         message: `Expected ']' after array or object index`,
-        code: 1072,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1072,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-right-brace'
     }),
-    expectedPropertyNameAfterPeriod: () => ({
+    __unused21: () => ({
         message: `Expected property name after '.'`,
-        code: 1073,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1073,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-property-name'
     }),
     tooManyCallableArguments: (actual: number, max: number) => ({
-        message: `Cannot have more than ${max} arguments but found ${actual}`,
-        code: 1074,
-        severity: DiagnosticSeverity.Error
-    }),
-    expectedRightParenAfterFunctionCallArguments: () => ({
-        message: `Expected ')' after function call arguments`,
-        code: 1075,
-        severity: DiagnosticSeverity.Error
+        message: `Cannot have more than ${max} arguments but found ${actual} `,
+        legacyCode: 1074,
+        severity: DiagnosticSeverity.Error,
+        code: 'exceeds-max-argument-count'
     }),
-    unmatchedLeftParenAfterExpression: () => ({
+    /**
+     * @param unmatchedToken Should be one of '(', '[', or '{'
+     * @param afterDetail any additional message to describe what came before the unmatched token
+     */
+    unmatchedLeftToken: (unmatchedToken: string, afterDetail = '') => {
+        let matchingToken = '';
+        switch (unmatchedToken) {
+            case '(':
+                matchingToken = ')';
+                break;
+            case '[':
+                matchingToken = ']';
+                break;
+            case '{':
+                matchingToken = '}';
+                break;
+        }
+        let message = `Unmatched '${unmatchedToken}'`;
+        if (matchingToken) {
+            message += `: expected '${matchingToken}'`;
+        }
+        if (afterDetail) {
+            message += ` after ${afterDetail}`;
+        }
+        return {
+            message: message,
+            legacyCode: 1075,
+            severity: DiagnosticSeverity.Error,
+            code: 'unmatched-left-token'
+        };
+    },
+    __unused23: () => ({
         message: `Unmatched '(': expected ')' after expression`,
-        code: 1076,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1076,
+        severity: DiagnosticSeverity.Error,
+        code: 'unmatched-left-paren'
     }),
-    unmatchedLeftSquareBraceAfterArrayLiteral: () => ({
+    __unused24: () => ({
         message: `Unmatched '[': expected ']' after array literal`,
-        code: 1077,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1077,
+        severity: DiagnosticSeverity.Error,
+        code: 'unmatched-left-brace'
     }),
     unexpectedAAKey: () => ({
         message: `Expected identifier or string as associative array key`,
-        code: 1078,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1078,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-aa-key'
     }),
     expectedColonBetweenAAKeyAndvalue: () => ({
         message: `Expected ':' between associative array key and value`,
-        code: 1079,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1079,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-aa-separator'
     }),
-    unmatchedLeftCurlyAfterAALiteral: () => ({
+    __unused25: () => ({
         message: `Unmatched '{': expected '}' after associative array literal`,
-        code: 1080,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1080,
+        severity: DiagnosticSeverity.Error,
+        code: 'unmatched-left-curly'
     }),
     unexpectedToken: (text: string) => ({
         message: `Unexpected token '${text}'`,
-        code: 1081,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1081,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-token'
     }),
     /**
      * Used in the lexer anytime we encounter an unsupported character
      */
     unexpectedCharacter: (text: string) => ({
-        message: `Unexpected character '${text}' (char code ${text?.charCodeAt(0)})`,
-        code: 1082,
-        severity: DiagnosticSeverity.Error
+        message: `Unexpected character '${text}'(char code ${text?.charCodeAt(0)})`,
+        legacyCode: 1082,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-character'
     }),
-    unterminatedStringAtEndOfLine: () => ({
-        message: `Unterminated string at end of line`,
-        code: 1083,
-        severity: DiagnosticSeverity.Error
+    unterminatedString: () => ({
+        message: `Unterminated string literal`,
+        legacyCode: 1083,
+        severity: DiagnosticSeverity.Error,
+        code: 'unterminated-string'
     }),
-    unterminatedStringAtEndOfFile: () => ({
+    __unused33: () => ({
         message: `Unterminated string at end of file`,
-        code: 1084,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1084,
+        severity: DiagnosticSeverity.Error,
+        code: 'unterminated-string-at-end-of-file'
     }),
-    fractionalHexLiteralsAreNotSupported: () => ({
+    __unused44: () => ({
         message: `Fractional hex literals are not supported`,
-        code: 1085,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1085,
+        severity: DiagnosticSeverity.Error,
+        code: 'fractional-hex-literal'
     }),
     unexpectedConditionalCompilationString: () => ({
-        message: `Unexpected conditional-compilation string`,
-        code: 1086,
-        severity: DiagnosticSeverity.Error
+        message: `Unknown conditional compile keyword`,
+        legacyCode: 1086,
+        severity: DiagnosticSeverity.Error,
+        code: 'unknown-conditional-compile-keyword'
     }),
     duplicateConstDeclaration: (name: string) => ({
         message: `Attempting to redeclare #const with name '${name}'`,
-        code: 1087,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1087,
+        severity: DiagnosticSeverity.Error,
+        code: 'duplicate-const-declaration'
     }),
-    constAliasDoesNotExist: (name: string) => ({
+    __unused34: (name: string) => ({
         message: `Attempting to create #const alias of '${name}', but no such #const exists`,
-        code: 1088,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1088,
+        severity: DiagnosticSeverity.Error,
+        code: 'const-alias-does-not-exist'
     }),
     invalidHashConstValue: () => ({
         message: '#const declarations can only have values of `true`, `false`, or other #const names',
-        code: 1089,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1089,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-hash-const-value'
     }),
-    referencedConstDoesNotExist: () => ({
+    hashConstDoesNotExist: () => ({
         message: `Referenced #const does not exist`,
-        code: 1090,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1090,
+        severity: DiagnosticSeverity.Error,
+        code: 'hash-const-does-not-exist'
     }),
     invalidHashIfValue: () => ({
         message: `#if conditionals can only be 'true', 'false', or other #const names`,
-        code: 1091,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1091,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-hash-if-value'
     }),
+    /**
+     * Treat #error directives like diagnostics, because the presence of `#error` even inside a runtime logical block that evaluates to false will 100% cause a compile error.
+     */
     hashError: (message: string) => ({
-        message: `#error ${message}`,
-        code: 1092,
-        severity: DiagnosticSeverity.Error
+        message: `#error ${message} `,
+        legacyCode: 1092,
+        severity: DiagnosticSeverity.Error,
+        code: 'hash-error'
     }),
-    expectedEqualAfterConstName: () => ({
+    __unused43: () => ({
         message: `Expected '=' after #const`,
-        code: 1093,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1093,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-equal-after-hash-const'
     }),
-    expectedHashElseIfToCloseHashIf: (startingLine: number) => ({
-        message: `Expected '#else if' to close '#if' conditional compilation statement starting on line ${startingLine}`,
-        code: 1094,
-        severity: DiagnosticSeverity.Error
+    __unused17: (startingLine: number) => ({
+        message: `Expected '#end if' to close '#if' conditional compilation statement starting on line ${startingLine} `,
+        legacyCode: 1094,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-terminator-on-hash-if'
     }),
-    constNameCannotBeReservedWord: () => ({
+    __unused35: () => ({
         message: `#const name cannot be a reserved word`,
-        code: 1095,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1095,
+        severity: DiagnosticSeverity.Error,
+        code: 'const-reservered-word'
     }),
-    expectedIdentifier: () => ({
+    __unused22: () => ({
         message: `Expected identifier`,
-        code: 1096,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1096,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-identifier'
     }),
     expectedAttributeNameAfterAtSymbol: () => ({
         message: `Expected xml attribute name after '@'`,
-        code: 1097,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1097,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-attribute-name'
     }),
     childFieldTypeNotAssignableToBaseProperty: (childTypeName: string, baseTypeName: string, fieldName: string, childFieldType: string, parentFieldType: string) => ({
-        message: `Field '${fieldName}' in class '${childTypeName}' is not assignable to the same field in base class '${baseTypeName}'. Type '${childFieldType}' is not assignable to type '${parentFieldType}'.`,
-        code: 1098,
-        severity: DiagnosticSeverity.Error
+        message: `Field '${fieldName}' in class '${childTypeName}' is not assignable to the same field in base class '${baseTypeName}'.Type '${childFieldType}' is not assignable to type '${parentFieldType}'.`,
+        legacyCode: 1098,
+        severity: DiagnosticSeverity.Error,
+        code: 'field-inheritance-mismatch'
     }),
-    classChildMemberDifferentMemberTypeThanAncestor: (memberType: string, parentMemberType: string, parentClassName: string) => ({
+    __unused36: (memberType: string, parentMemberType: string, parentClassName: string) => ({
         message: `Class member is a ${memberType} here but a ${parentMemberType} in ancestor class '${parentClassName}'`,
-        code: 1099,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1099,
+        severity: DiagnosticSeverity.Error,
+        code: 'child-field-type-different'
     }),
     classConstructorMissingSuperCall: () => ({
         message: `Missing "super()" call in class constructor method.`,
-        code: 1100,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1100,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-super-call'
     }),
     classConstructorIllegalUseOfMBeforeSuperCall: () => ({
         message: `Illegal use of "m" before calling "super()"`,
-        code: 1101,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1101,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-super-before-statement'
     }),
     classFieldCannotBeOverridden: () => ({
         message: `Class field cannot be overridden`,
-        code: 1102,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1102,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-field-override'
     }),
     unusedAnnotation: () => ({
         message: `This annotation is not attached to any statement`,
-        code: 1103,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1103,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-annotation'
     }),
     localVarShadowedByScopedFunction: () => ({
-        message: `Declaring a local variable with same name as scoped function can result in unexpected behavior`,
-        code: 1104,
-        severity: DiagnosticSeverity.Error
+        message: `Declaring a local variable with same name as scoped function or class can result in unexpected behavior`,
+        legacyCode: 1104,
+        severity: DiagnosticSeverity.Error,
+        code: 'var-shadows-function'
     }),
     scopeFunctionShadowedByBuiltInFunction: () => ({
-        message: `Scope function will not be accessible because it has the same name as a built-in function`,
-        code: 1105,
-        severity: DiagnosticSeverity.Error
+        message: `Scope function will not be accessible because it has the same name as a built -in function`,
+        legacyCode: 1105,
+        severity: DiagnosticSeverity.Error,
+        code: 'native-function-collision'
     }),
-    localVarSameNameAsClass: (className: string) => ({
+    __unused38: (className: string) => ({
         message: `Local variable has same name as class '${className}'`,
-        code: 1106,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1106,
+        severity: DiagnosticSeverity.Error,
+        code: 'local-var-same-name-as-class'
     }),
     unnecessaryCodebehindScriptImport: () => ({
         message: `This import is unnecessary because compiler option 'autoImportComponentScript' is enabled`,
-        code: 1107,
-        severity: DiagnosticSeverity.Warning
+        legacyCode: 1107,
+        severity: DiagnosticSeverity.Warning,
+        code: 'unnecessary-codebehind-script-import'
     }),
-    expectedOpenParenToFollowCallfuncIdentifier: () => ({
+    __unused37: () => ({
         message: `Expected '(' to follow callfunc identifier`,
-        code: 1108,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1108,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-left-paren-after-callfunc'
     }),
     expectedToken: (...tokenKinds: string[]) => ({
         message: `Expected token '${tokenKinds.join(`' or '`)}'`,
-        code: 1109,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1109,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-token'
     }),
-    parameterMayNotHaveSameNameAsNamespace: (paramName: string) => ({
+    __unused10: (paramName: string) => ({
         message: `Parameter '${paramName}' may not have the same name as namespace`,
-        code: 1110,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1110,
+        severity: DiagnosticSeverity.Error,
+        code: 'parameter-same-name-as-namespace'
     }),
-    variableMayNotHaveSameNameAsNamespace: (variableName: string) => ({
+    __unused11: (variableName: string) => ({
         message: `Variable '${variableName}' may not have the same name as namespace`,
-        code: 1111,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1111,
+        severity: DiagnosticSeverity.Error,
+        code: 'variable-same-name-as-namespace'
     }),
-    unterminatedTemplateStringAtEndOfFile: () => ({
-        message: `Unterminated template string at end of file`,
-        code: 1113,
-        severity: DiagnosticSeverity.Error
+    unterminatedTemplateString: () => ({
+        message: `Unterminated template string`,
+        legacyCode: 1113,
+        severity: DiagnosticSeverity.Error,
+        code: 'unterminated-template-string'
     }),
     unterminatedTemplateExpression: () => ({
         message: `Unterminated template string expression. '\${' must be followed by expression, then '}'`,
-        code: 1114,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1114,
+        severity: DiagnosticSeverity.Error,
+        code: 'unterminated-template-string-expression'
     }),
     duplicateComponentName: (componentName: string) => ({
         message: `There are multiple components with the name '${componentName}'`,
-        code: 1115,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1115,
+        severity: DiagnosticSeverity.Error,
+        code: 'duplicate-component-name'
     }),
-    functionCannotHaveSameNameAsClass: (className: string) => ({
+    __unused6: (className: string) => ({
         message: `Function has same name as class '${className}'`,
-        code: 1116,
+        legacyCode: 1116,
         severity: DiagnosticSeverity.Error
     }),
-    missingExceptionVarToFollowCatch: () => ({
-        message: `Missing exception variable after 'catch' keyword`,
-        code: 1117,
-        severity: DiagnosticSeverity.Error
+    expectedExceptionVarToFollowCatch: () => ({
+        message: `Expected exception variable after 'catch' keyword`,
+        legacyCode: 1117,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-exception-variable'
     }),
     missingExceptionExpressionAfterThrowKeyword: () => ({
         message: `Missing exception expression after 'throw' keyword`,
-        code: 1118,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1118,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-throw-expression'
     }),
-    missingLeftSquareBracketAfterDimIdentifier: () => ({
+    __unused42: () => ({
         message: `Missing left square bracket after 'dim' identifier`,
-        code: 1119,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1119,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-left-brace-after-dim'
     }),
-    missingRightSquareBracketAfterDimIdentifier: () => ({
+    __unused39: () => ({
         message: `Missing right square bracket after 'dim' identifier`,
-        code: 1120,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1120,
+        severity: DiagnosticSeverity.Error,
+        code: 'missing-right-brace-after-dim'
     }),
     missingExpressionsInDimStatement: () => ({
         message: `Missing expression(s) in 'dim' statement`,
-        code: 1121,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1121,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-dim-expression'
     }),
     mismatchedOverriddenMemberVisibility: (childClassName: string, memberName: string, childAccessModifier: string, ancestorAccessModifier: string, ancestorClassName: string) => ({
         message: `Access modifier mismatch: '${memberName}' is ${childAccessModifier} in type '${childClassName}' but is ${ancestorAccessModifier} in base type '${ancestorClassName}'.`,
-        code: 1122,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1122,
+        severity: DiagnosticSeverity.Error,
+        code: 'access-modifier-mismatch'
     }),
-    cannotFindType: (typeName: string) => ({
+    __unused3: (typeName: string) => ({
         message: `Cannot find type with name '${typeName}'`,
-        code: 1123,
+        legacyCode: 1123,
         severity: DiagnosticSeverity.Error
     }),
     enumValueMustBeType: (expectedType: string) => ({
         message: `Enum value must be type '${expectedType}'`,
-        code: 1124,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1124,
+        severity: DiagnosticSeverity.Error,
+        code: 'enum-type-mismatch'
     }),
     enumValueIsRequired: (expectedType: string) => ({
         message: `Value is required for ${expectedType} enum`,
-        code: 1125,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1125,
+        severity: DiagnosticSeverity.Error,
+        code: 'expected-enum-value'
     }),
-    unknownEnumValue: (name: string, enumName: string) => ({
+    __unused40: (name: string, enumName: string) => ({
         message: `Property '${name}' does not exist on enum '${enumName}'`,
-        code: 1126,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1126,
+        severity: DiagnosticSeverity.Error,
+        code: 'unknown-enum-value'
     }),
-    duplicateEnumDeclaration: (scopeName: string, enumName: string) => ({
+    __unused7: (scopeName: string, enumName: string) => ({
         message: `Scope '${scopeName}' already contains an enum with name '${enumName}'`,
-        code: 1127,
+        legacyCode: 1127,
         severity: DiagnosticSeverity.Error
     }),
     unknownRoSGNode: (nodeName: string) => ({
         message: `Unknown roSGNode '${nodeName}'`,
-        code: 1128,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1128,
+        severity: DiagnosticSeverity.Error,
+        code: 'unknown-rosgnode'
     }),
     unknownBrightScriptComponent: (componentName: string) => ({
         message: `Unknown BrightScript component '${componentName}'`,
-        code: 1129,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1129,
+        severity: DiagnosticSeverity.Error,
+        code: 'unknown-brightscript-component'
     }),
     mismatchCreateObjectArgumentCount: (componentName: string, allowedArgCounts: number[], actualCount: number) => {
         const argCountArray = (allowedArgCounts || [1]).sort().filter((value, index, self) => self.indexOf(value) === index);
         return {
             message: `For ${componentName}, expected ${argCountArray.map(c => c.toString()).join(' or ')} total arguments, but got ${actualCount}.`,
-            code: 1130,
-            severity: DiagnosticSeverity.Error
+            legacyCode: 1130,
+            severity: DiagnosticSeverity.Error,
+            code: 'incorrect-createobject-argument-count'
+        };
+    },
+    __unused41: (componentName: string, deprecatedDescription?: string) => ({
+        message: `${componentName} has been deprecated${deprecatedDescription ? ': ' + deprecatedDescription : ''} `,
+        legacyCode: 1131,
+        severity: DiagnosticSeverity.Error,
+        code: 'deprecated-brightscript-component'
+    }),
+    circularReferenceDetected: (items: string | string[] = []) => {
+        let detail = '';
+        if (Array.isArray(items)) {
+            if (items.length > 1) {
+                detail += ' between';
+            }
+            if (items.length > 0) {
+                detail += ' ' + items.map(item => `'${item}'`).join(' -> ');
+            }
+        } else if (items) {
+            detail = ` '${items}'`;
+        }
+        return {
+            message: `Circular reference detected${detail}`,
+            legacyCode: 1132,
+            severity: DiagnosticSeverity.Error,
+            code: 'circular-reference'
         };
     },
-    deprecatedBrightScriptComponent: (componentName: string, deprecatedDescription?: string) => ({
-        message: `${componentName} has been deprecated${deprecatedDescription ? ': ' + deprecatedDescription : ''}`,
-        code: 1131,
-        severity: DiagnosticSeverity.Error
-    }),
-    circularReferenceDetected: (items: string[], scopeName: string) => ({
-        message: `Circular reference detected between ${Array.isArray(items) ? items.join(' -> ') : ''} in scope '${scopeName}'`,
-        code: 1132,
-        severity: DiagnosticSeverity.Error
-    }),
     unexpectedStatementOutsideFunction: () => ({
         message: `Unexpected statement found outside of function body`,
-        code: 1133,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1133,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-statement'
     }),
     detectedTooDeepFileSource: (numberOfParentDirectories: number) => ({
-        message: `Expected directory depth no larger than 7, but found ${numberOfParentDirectories}`,
-        code: 1134,
-        severity: DiagnosticSeverity.Error
+        message: `Expected directory depth no larger than 7, but found ${numberOfParentDirectories} `,
+        legacyCode: 1134,
+        severity: DiagnosticSeverity.Error,
+        code: 'directory-depth'
     }),
     illegalContinueStatement: () => ({
         message: `Continue statement must be contained within a loop statement`,
-        code: 1135,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1135,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-continue'
     }),
     keywordMustBeDeclaredAtNamespaceLevel: (keyword: string) => ({
         message: `${keyword} must be declared at the root level or within a namespace`,
-        code: 1136,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1136,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-declaration-location'
     }),
     itemCannotBeUsedAsVariable: (itemType: string) => ({
         message: `${itemType} cannot be used as a variable`,
-        code: 1137,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1137,
+        severity: DiagnosticSeverity.Error,
+        code: 'type-not-variable'
     }),
     callfuncHasToManyArgs: (numberOfArgs: number) => ({
-        message: `You can not have more than 5 arguments in a callFunc. ${numberOfArgs} found.`,
-        code: 1138,
-        severity: DiagnosticSeverity.Error
+        message: `You can not have more than 5 arguments in a callFunc.${numberOfArgs} found.`,
+        legacyCode: 1138,
+        severity: DiagnosticSeverity.Error,
+        code: 'exceeds-max-callfunc-arg-count'
     }),
     noOptionalChainingInLeftHandSideOfAssignment: () => ({
         message: `Optional chaining may not be used in the left-hand side of an assignment`,
-        code: 1139,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1139,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-optional-chain'
     }),
     /**
      * @param name for function calls where we can't find the name of the function
      * @param fullName if a namespaced name, this is the full name `alpha.beta.charlie`, otherwise it's the same as `name`
+     * @param typeName if 'name' refers to a member, what is the the type it is a member of?
+     * @param typeDescriptor defaults to 'type' ... could also be 'namespace', etc.
      */
-    cannotFindFunction: (name: string, fullName?: string) => ({
-        message: `Cannot find function '${name}'`,
-        code: 1140,
+    cannotFindFunction: (name: string, fullName?: string, typeName?: string, typeDescriptor = 'type') => ({
+        message: `Cannot find function '${name}'${typeName ? ` for ${typeDescriptor} '${typeName}'` : ''} `,
+        legacyCode: 1140,
         data: {
             name: name,
-            fullName: fullName ?? name
+            fullName: fullName ?? name,
+            typeName: typeName ? typeName : undefined
         },
-        severity: DiagnosticSeverity.Error
+        severity: DiagnosticSeverity.Error,
+        code: 'cannot-find-function'
     }),
     voidFunctionMayNotReturnValue: (functionType = 'function') => ({
         message: `Void ${functionType} may not return a value`,
-        code: 1141,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1141,
+        severity: DiagnosticSeverity.Error,
+        code: 'unexpected-return-value'
     }),
     nonVoidFunctionMustReturnValue: (functionType = 'function') => ({
         message: `Non-void ${functionType} must return a value`,
-        code: 1142,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1142,
+        severity: DiagnosticSeverity.Error,
+        code: 'missing-return-value'
+    }),
+    assignmentTypeMismatch: (actualTypeString: string, expectedTypeString: string, data?: TypeCompatibilityData) => ({
+        message: `Type '${actualTypeString}' is not compatible with type '${expectedTypeString}'${typeCompatibilityMessage(actualTypeString, expectedTypeString, data)}`,
+        data: data,
+        severity: DiagnosticSeverity.Error,
+        code: 'assignment-type-mismatch'
+    }),
+    operatorTypeMismatch: (operatorString: string, firstType: string, secondType = '') => ({
+        message: `Operator '${operatorString}' cannot be applied to type${secondType ? 's' : ''} '${firstType}'${secondType ? ` and '${secondType}'` : ''}`,
+        severity: DiagnosticSeverity.Error,
+        code: 'operator-type-mismatch'
+    }),
+    incompatibleSymbolDefinition: (symbol: string, options: { scopes?: string[]; isUnion?: boolean; types?: BscType[]; data?: TypeCompatibilityData } = {}) => ({
+        message: `'${symbol}' is incompatible${incompatibleSymbolMessage(symbol, options)}`,
+        severity: DiagnosticSeverity.Error,
+        code: 'incompatible-definition'
+    }),
+    memberAccessibilityMismatch: (memberName: string, accessModifierFlag: SymbolTypeFlag, definingClassName: string) => {
+        let accessModName: string = TokenKind.Public;
+        // eslint-disable-next-line no-bitwise
+        if (accessModifierFlag & SymbolTypeFlag.private) {
+            accessModName = TokenKind.Private;
+            // eslint-disable-next-line no-bitwise
+        } else if (accessModifierFlag & SymbolTypeFlag.protected) {
+            accessModName = TokenKind.Protected;
+        }
+        accessModName = accessModName.toLowerCase();
+        let accessAdditionalInfo = '';
+
+        // eslint-disable-next-line no-bitwise
+        if (accessModifierFlag & SymbolTypeFlag.private) {
+            accessAdditionalInfo = ` and only accessible from within class '${definingClassName}'`;
+            // eslint-disable-next-line no-bitwise
+        } else if (accessModifierFlag & SymbolTypeFlag.protected) {
+            accessAdditionalInfo = ` and only accessible from within class '${definingClassName}' and its subclasses`;
+        }
+
+        return {
+            message: `Member '${memberName}' is ${accessModName}${accessAdditionalInfo}`, // TODO: Add scopes where it was defined
+            severity: DiagnosticSeverity.Error,
+            code: 'member-access-violation'
+        };
+    },
+    invalidTypecastStatementApplication: (foundApplication: string, isInFunctionBlock: boolean) => ({
+        message: `'typecast' statement can only be applied to ${!isInFunctionBlock ? '\'m\'' : 'variables'}, but was applied to '${foundApplication}'`,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-typecast-target'
+    }),
+    itemCannotBeUsedAsType: (typeText: string) => ({
+        message: `'${typeText}' cannot be used as a type`,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-type-reference'
+    }),
+    unsafeUnmatchedTerminatorInConditionalCompileBlock: (terminator: string) => ({
+        message: `Unsafe unmatched terminator '${terminator}' in conditional compilation block`,
+        severity: DiagnosticSeverity.Error,
+        code: 'inconsistent-conditional-compile-nesting'
+    }),
+    returnTypeCoercionMismatch: (returnType = 'string') => ({
+        message: `Function has no return statement and will return 'invalid': '${returnType}' cannot be coerced into 'invalid'`,
+        severity: DiagnosticSeverity.Error,
+        code: 'return-type-coercion-mismatch'
+    }),
+    argumentTypeMismatch: (actualTypeString: string, expectedTypeString: string, data?: TypeCompatibilityData) => ({
+        message: `Argument of type '${actualTypeString}' is not compatible with parameter of type '${expectedTypeString}'${typeCompatibilityMessage(actualTypeString, expectedTypeString, data)} `,
+        data: data,
+        severity: DiagnosticSeverity.Error,
+        code: 'argument-type-mismatch'
+    }),
+    returnTypeMismatch: (actualTypeString: string, expectedTypeString: string, data?: TypeCompatibilityData) => ({
+        message: `Type '${actualTypeString}' is not compatible with declared return type '${expectedTypeString}'${typeCompatibilityMessage(actualTypeString, expectedTypeString, data)} '`,
+        data: data,
+        severity: DiagnosticSeverity.Error,
+        code: 'return-type-mismatch'
+    }),
+    cannotFindCallFuncFunction: (name: string, fullName: string, typeName: string) => ({
+        message: `Cannot find callfunc function '${name}' for type '${typeName}'`,
+        data: {
+            name: name,
+            fullName: fullName,
+            typeName: typeName,
+            isCallfunc: true
+        },
+        severity: DiagnosticSeverity.Error,
+        code: 'cannot-find-callfunc'
+    }),
+    notCallable: (name: string) => ({
+        message: `'${name}' is not callable'`,
+        severity: DiagnosticSeverity.Error,
+        code: 'not-callable'
+    }),
+    notIterable: (typeName: string) => ({
+        message: `Type '${typeName}' is not iterable`,
+        severity: DiagnosticSeverity.Error,
+        code: 'not-iterable'
     }),
     propAccessNotPermittedAfterFunctionCallInExpressionStatement: (accessDescription: string) => ({
         message: `${accessDescription} access not permitted after a function call when used in an expression statement`,
-        code: 1143,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1143,
+        severity: DiagnosticSeverity.Error,
+        code: 'invalid-access'
     }),
     computedPropertyKeyMustBeConstantExpression: () => ({
         message: `Computed property keys must be a compile-time constant (enum member or const value)`,
-        code: 1144,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1144,
+        severity: DiagnosticSeverity.Error,
+        code: 'computed-property-key-not-constant'
     }),
     computedAAKeyMustBeStringExpression: () => ({
         message: `Computed associative array keys must resolve to a string value`,
-        code: 1145,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1145,
+        severity: DiagnosticSeverity.Error,
+        code: 'computed-property-key-not-string'
     }),
     featureRequiresMinFirmwareVersion: (featureName: string, minimumVersion: string, configuredVersion: string) => ({
         message: `'${featureName}' requires Roku firmware version ${minimumVersion} or higher (current target is ${configuredVersion})`,
-        code: 1146,
-        severity: DiagnosticSeverity.Error
+        legacyCode: 1146,
+        severity: DiagnosticSeverity.Error,
+        code: 'requires-min-firmware-version'
     })
 };
+export const defaultMaximumTruncationLength = 160;
+
+export function typeCompatibilityMessage(actualTypeString: string, expectedTypeString: string, data: TypeCompatibilityData) {
+    let message = '';
+    if (!data) {
+        return message;
+    }
+    actualTypeString = data?.actualType?.toString() ?? actualTypeString;
+    expectedTypeString = data?.expectedType?.toString() ?? expectedTypeString;
+
+    if (data?.missingFields?.length > 0) {
+        message = `\n    Type '${actualTypeString}' is missing the following members of type '${expectedTypeString}': ` + util.truncate({
+            leadingText: ``,
+            trailingText: '',
+            itemSeparator: ', ',
+            items: data.missingFields,
+            partBuilder: (x) => x.name,
+            maxLength: defaultMaximumTruncationLength
+        });
+    } else if (data?.fieldMismatches?.length > 0) {
+        message = '. ' + util.truncate({
+            leadingText: `Type '${actualTypeString}' has incompatible members:`,
+            items: data.fieldMismatches,
+            itemSeparator: '',
+            partBuilder: (x) => `\n    member "${x.name}" should be '${x.expectedType}' but is '${x.actualType}'`,
+            maxLength: defaultMaximumTruncationLength
+        });
+    } else if (data?.actualParamCount !== data?.expectedParamCount) {
+        message = `. Type '${expectedTypeString}' requires ${data.expectedParamCount} parameter${data.expectedParamCount === 1 ? '' : 's'} but '${actualTypeString}' has ${data.actualParamCount}`;
+    } else if (data?.parameterMismatches?.length > 0) {
+        message = '. ' + util.truncate({
+            leadingText: `Type '${actualTypeString}' has incompatible parameters:`,
+            items: data.parameterMismatches,
+            itemSeparator: '',
+            partBuilder: (x) => {
+                let pExpected = x.data?.expectedType?.toString() ?? 'dynamic';
+                let pActual = x.data?.actualType?.toString() ?? 'dynamic';
+
+                if (x.expectedOptional !== x.actualOptional) {
+                    pExpected += x.expectedOptional ? '?' : '';
+                    pActual += x.actualOptional ? '?' : '';
+                }
+                return `\n    parameter ${x.index + 1} should be '${pExpected}' but is '${pActual}'`;
+            },
+            maxLength: defaultMaximumTruncationLength
+        });
+    } else if (data?.returnTypeMismatch?.actualType && data.returnTypeMismatch?.expectedType) {
+        message = `. Type '${actualTypeString}' has incompatible return type:`;
+        message += `\n    return type should be '${data.returnTypeMismatch?.expectedType}' but is '${data?.returnTypeMismatch?.actualType}'`;
+    } else if (data?.expectedVariadic !== data?.actualVariadic) {
+        const shouldMsg = data.expectedVariadic ? 'should' : 'should not';
+        message = `. Type '${actualTypeString}' ${shouldMsg} be variadic`;
+    }
+    return message;
+}
+
+function getPossibilitiesString(possibilities: string[] | string) {
+    if (!Array.isArray(possibilities)) {
+        return `'${possibilities}'`;
+    }
+    if (possibilities.length === 1) {
+        return `'${possibilities}'`;
+
+    }
+    let result = '';
+    for (let i = 0; i < possibilities.length; i++) {
+        result += `'${possibilities[i]}'`;
+        if (i < possibilities.length - 2) {
+            result += ', ';
+        } else if (i < possibilities.length - 1) {
+            result += ' or ';
+        }
+    }
+    return result;
+}
+
+export function incompatibleSymbolMessage(symbolName: string, options: { scopes?: string[]; isUnion?: boolean; data?: TypeCompatibilityData }) {
+    let message = '';
+    const data = options.data;
+    if (options.scopes?.length > 0) {
+        message += ` across these scopes: ${options.scopes.join(', ')}`;
+    }
+    if (options.isUnion) {
+        message += ` in union`;
+    }
+    const actualTypeString = data?.actualType?.toString();
+    const expectedTypeString = data?.expectedType?.toString();
+    if (data && actualTypeString && expectedTypeString) {
+        message += typeCompatibilityMessage(actualTypeString, expectedTypeString, data);
+    }
+    return message;
+}
 
-export const DiagnosticCodeMap = {} as Record<keyof (typeof DiagnosticMessages), number>;
-export let diagnosticCodes = [] as number[];
+export const DiagnosticCodeMap = {} as Record<keyof (typeof DiagnosticMessages), string>;
+export const DiagnosticLegacyCodeMap = {} as Record<keyof (typeof DiagnosticMessages), number>;
+export let diagnosticCodes = [] as string[];
 for (let key in DiagnosticMessages) {
     diagnosticCodes.push(DiagnosticMessages[key]().code);
+    diagnosticCodes.push(DiagnosticMessages[key]().legacyCode);
     DiagnosticCodeMap[key] = DiagnosticMessages[key]().code;
+    DiagnosticLegacyCodeMap[key] = DiagnosticMessages[key]().legacyCode;
 }
 
 export interface DiagnosticInfo {
     message: string;
-    code: number;
+    legacyCode: number;
     severity: DiagnosticSeverity;
 }
 
@@ -794,4 +1213,4 @@ export interface DiagnosticInfo {
 export type DiagnosticMessageType<K extends keyof D, D extends Record<string, (...args: any) => any> = typeof DiagnosticMessages> =
     ReturnType<D[K]> &
     //include the missing properties from BsDiagnostic
-    Pick<BsDiagnostic, 'range' | 'file' | 'relatedInformation' | 'tags'>;
+    Pick<BsDiagnostic, 'code' | 'location' | 'relatedInformation' | 'tags'>;
diff --git a/src/DiagnosticSeverityAdjuster.ts b/src/DiagnosticSeverityAdjuster.ts
index b651f30bf..d5ef5afb7 100644
--- a/src/DiagnosticSeverityAdjuster.ts
+++ b/src/DiagnosticSeverityAdjuster.ts
@@ -11,6 +11,10 @@ export class DiagnosticSeverityAdjuster {
             if (map.has(code)) {
                 diagnostic.severity = map.get(code);
             }
+            const legacyCode = String(diagnostic.legacyCode);
+            if (legacyCode && map.has(legacyCode)) {
+                diagnostic.severity = map.get(legacyCode);
+            }
         });
     }
 
diff --git a/src/FunctionScope.spec.ts b/src/FunctionScope.spec.ts
index a60b242bc..a125afcce 100644
--- a/src/FunctionScope.spec.ts
+++ b/src/FunctionScope.spec.ts
@@ -1,5 +1,5 @@
-import { expect } from './chai-config.spec';
-
+import { expect } from 'chai';
+import type { BrsFile } from './files/BrsFile';
 import { FunctionScope } from './FunctionScope';
 import type { FunctionExpression } from './parser/Expression';
 import { Program } from './Program';
@@ -24,7 +24,7 @@ describe('FunctionScope', () => {
         });
 
         it('returns variables defined above the specified line number', () => {
-            let file = program.setFile('source/main.brs', `
+            let file = program.setFile<BrsFile>('source/main.brs', `
                 sub main()
                     var1 = 1
                     var2 = 2
@@ -35,7 +35,6 @@ describe('FunctionScope', () => {
             expect(file.functionScopes[0].getVariablesAbove(3)).to.be.lengthOf(1);
             expect(file.functionScopes[0].getVariablesAbove(3)[0].name).to.equal('var1');
             expect(file.functionScopes[0].getVariablesAbove(4)).to.be.lengthOf(2);
-
         });
     });
 });
diff --git a/src/FunctionScope.ts b/src/FunctionScope.ts
index b4296cf9a..e1af48c26 100644
--- a/src/FunctionScope.ts
+++ b/src/FunctionScope.ts
@@ -13,7 +13,7 @@ export class FunctionScope {
      * and ends after the final `n` in `end function` or `b` in end sub.
      */
     public get range() {
-        return this.func?.range;
+        return this.func?.location?.range;
     }
     /**
      * The scopes that are children of this scope
@@ -51,4 +51,7 @@ export class FunctionScope {
         }
     }
 
+    get symbolTable() {
+        return this.func.body.getSymbolTable();
+    }
 }
diff --git a/src/LanguageServer.spec.ts b/src/LanguageServer.spec.ts
index ad88ae30e..7197cd491 100644
--- a/src/LanguageServer.spec.ts
+++ b/src/LanguageServer.spec.ts
@@ -8,6 +8,7 @@ import type { BrightScriptClientConfiguration } from './LanguageServer';
 import { CustomCommands, LanguageServer } from './LanguageServer';
 import { createSandbox } from 'sinon';
 import { standardizePath as s, util } from './util';
+import { URI } from 'vscode-uri';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import type { Program } from './Program';
 import * as assert from 'assert';
@@ -16,9 +17,8 @@ import { createInactivityStub, expectZeroDiagnostics, normalizeDiagnostics, trim
 import { isBrsFile, isLiteralString } from './astUtils/reflection';
 import { createVisitor, WalkMode } from './astUtils/visitors';
 import { tempDir, rootDir } from './testHelpers.spec';
-import { URI } from 'vscode-uri';
 import { BusyStatusTracker } from './BusyStatusTracker';
-import type { BscFile } from './interfaces';
+import type { BscFile } from './files/BscFile';
 import type { Project } from './lsp/Project';
 import { LogLevel, Logger, createLogger } from './logging';
 import { DiagnosticMessages } from './DiagnosticMessages';
@@ -522,6 +522,13 @@ describe('LanguageServer', () => {
     });
 
     describe('project-activate', () => {
+        beforeEach(() => {
+            //the project-activate listener calls syncLogLevel which needs `connection.workspace`.
+            //in production that's set up by `server.run()`; these tests fire the event directly
+            //on the project manager without calling run(), so wire the mock connection in by hand.
+            server['connection'] = connection as any;
+        });
+
         it('should sync all open document changes to all projects', async () => {
 
             //force an open text document
@@ -2141,7 +2148,7 @@ describe('LanguageServer', () => {
                 expect(result['pathAbsolute']).to.eql(result.srcPath);
             });
 
-            it('calls beforeProgramTranspile and afterProgramTranspile plugin events', async () => {
+            it('calls beforeBuildProgram and afterBuildProgram plugin events', async () => {
                 fsExtra.outputFileSync(s`${rootDir}/source/main.bs`, `
                     sub main()
                         print \`hello world\`
@@ -2154,13 +2161,14 @@ describe('LanguageServer', () => {
                 //make a plugin that changes string text
                 (server['projectManager'].projects[0] as Project)['builder'].program.plugins.add({
                     name: 'test-plugin',
-                    beforeProgramTranspile: (program, entries, editor) => {
-                        const file = program.getFile('source/main.bs')!;
+                    beforeBuildProgram: (event) => {
+                        const { program, editor } = event;
+                        const file = program.getFile('source/main.bs');
                         if (isBrsFile(file)) {
                             file.ast.walk(createVisitor({
                                 LiteralExpression: (expression) => {
                                     if (isLiteralString(expression)) {
-                                        editor.setProperty(expression.token, 'text', 'hello moon');
+                                        editor.setProperty(expression.tokens.value, 'text', 'hello moon');
                                     }
                                 }
                             }), {
@@ -2168,7 +2176,7 @@ describe('LanguageServer', () => {
                             });
                         }
                     },
-                    afterProgramTranspile: afterSpy
+                    afterBuildProgram: afterSpy
                 });
 
                 const result = (await server.onExecuteCommand({
@@ -2208,7 +2216,7 @@ describe('LanguageServer', () => {
             `;
         };
 
-        const uri = URI.file(s`${rootDir}/source/sgnode.bs`).toString();
+        const uri = util.pathToUri(s`${rootDir}/source/sgnode.bs`);
 
         fsExtra.outputFileSync(s`${rootDir}/source/sgnode.bs`, getContents());
         server.run();
@@ -2276,7 +2284,7 @@ describe('LanguageServer', () => {
             for (let collection of [actualDiagnostics, expectedDiagnostics]) {
                 //convert a URI-like string to an fsPath
                 for (let key in collection) {
-                    let keyNormalized = key.startsWith('file:') ? URI.parse(key).fsPath : key;
+                    let keyNormalized = key.startsWith('file:') ? util.uriToPath(key) : key;
                     keyNormalized = standardizePath(
                         path.isAbsolute(keyNormalized) ? keyNormalized : s`${rootDir}/${keyNormalized}`
                     );
@@ -2312,7 +2320,7 @@ describe('LanguageServer', () => {
                 end sub
             `);
             fsExtra.outputFileSync(`${rootDir}/source/lib.bs`, `
-                    namespace alpha
+                namespace alpha
                     sub beta()
                     end sub
                 end namespace
@@ -2335,7 +2343,7 @@ describe('LanguageServer', () => {
             });
 
             const document = TextDocument.create(
-                URI.file(s`${rootDir}/source/main.bs`).toString(),
+                util.pathToUri(s`${rootDir}/source/main.bs`),
                 'brightscript',
                 0, `
                     sub main()
@@ -2368,7 +2376,7 @@ describe('LanguageServer', () => {
             await server['onDidChangeWatchedFiles']({
                 changes: [{
                     type: FileChangeType.Changed,
-                    uri: URI.file(`${rootDir}/bsconfig.json`).toString()
+                    uri: util.uriToPath(`${rootDir}/bsconfig.json`)
                 }]
             });
 
@@ -2384,7 +2392,7 @@ describe('LanguageServer', () => {
                     DiagnosticMessages.cannotFindName('missing2').message
                 ],
                 'bsconfig.json': [
-                    'Encountered syntax errors in bsconfig.json: CloseBraceExpected'
+                    'Syntax errors in bsconfig.json: CloseBraceExpected'
                 ]
             });
 
@@ -2402,7 +2410,7 @@ describe('LanguageServer', () => {
             await server['onDidChangeWatchedFiles']({
                 changes: [{
                     type: FileChangeType.Changed,
-                    uri: URI.file(`${rootDir}/bsconfig.json`).toString()
+                    uri: util.uriToPath(`${rootDir}/bsconfig.json`)
                 }]
             });
 
@@ -2418,6 +2426,45 @@ describe('LanguageServer', () => {
         });
     });
 
+    describe('onCompletion', () => {
+        it('should remove duplicate items across projects', async () => {
+            server['connection'] = server['establishConnection']();
+            fsExtra.outputFileSync(`${rootDir}/source/main.brs`, `
+                function pi()
+                    return 3.141592653589793
+                end function
+
+                function buildAwesome()
+                    return 42
+                end function
+            `);
+            fsExtra.outputJsonSync(s`${rootDir}/bsconfig.json`, {});
+            const subProjectConfig = {
+                files: [
+                    '**/*',
+                    { src: '../source/**/*', dest: 'source/common' }
+                ]
+            };
+
+            fsExtra.outputJsonSync(s`${rootDir}/alpha/bsconfig.json`, subProjectConfig);
+            fsExtra.outputJsonSync(s`${rootDir}/beta/bsconfig.json`, subProjectConfig);
+            server.run();
+
+            await server['onInitialize']({ capabilities: {} } as any);
+            await server['onInitialized']();
+            await server['syncProjects']();
+
+            const result = await server['onCompletion']({
+                textDocument: {
+                    uri: util.pathToUri(s`${rootDir}/source/main.brs`)
+                },
+                position: util.createPosition(2, 26)
+            });
+            expect(result.items.filter(compItem => compItem.label === 'buildAwesome')).to.length(1);
+            expect(result.items.filter(compItem => compItem.label === 'pi')).to.length(1);
+            expect(result.items.filter(compItem => compItem.label === 'LCase')).to.length(1);
+        });
+    });
     describe('onCodeAction', () => {
         beforeEach(async () => {
             server.run();
diff --git a/src/LanguageServer.ts b/src/LanguageServer.ts
index 92b6d7122..439ba3326 100644
--- a/src/LanguageServer.ts
+++ b/src/LanguageServer.ts
@@ -521,7 +521,7 @@ export class LanguageServer {
      * Provide a list of completion items based on the current cursor position
      */
     @AddStackToErrorMessage
-    public async onCompletion(params: CompletionParams, cancellationToken: CancellationToken, workDoneProgress: WorkDoneProgressReporter, resultProgress: ResultProgressReporter<CompletionItem[]>): Promise<CompletionList> {
+    public async onCompletion(params: CompletionParams, cancellationToken?: CancellationToken, workDoneProgress?: WorkDoneProgressReporter, resultProgress?: ResultProgressReporter<CompletionItem[]>): Promise<CompletionList> {
         this.logger.debug('onCompletion', params, cancellationToken);
 
         const srcPath = util.uriToPath(params.textDocument.uri);
diff --git a/src/PluginInterface.spec.ts b/src/PluginInterface.spec.ts
index 886f2c34e..93f2f96d6 100644
--- a/src/PluginInterface.spec.ts
+++ b/src/PluginInterface.spec.ts
@@ -13,17 +13,15 @@ describe('PluginInterface', () => {
     });
 
     it('allows adding a plugin', () => {
-        const beforePublish = sinon.spy();
+        const beforeSerializeProgram = sinon.spy();
         const plugin = {
             name: 'allows adding a plugin',
-            beforePublish: beforePublish
+            beforeSerializeProgram: beforeSerializeProgram
         };
-        //@ts-ignore the current definition of `emit` doesn't like this third argument
-        pluginInterface.emit('beforePublish', undefined, []);
+        pluginInterface.emit('beforeSerializeProgram', {} as any);
         pluginInterface.add(plugin);
-        //@ts-ignore the current definition of `emit` doesn't like this third argument
-        pluginInterface.emit('beforePublish', undefined, []);
-        expect(beforePublish.callCount).to.equal(1);
+        pluginInterface.emit('beforeSerializeProgram', {} as any);
+        expect(beforeSerializeProgram.callCount).to.equal(1);
     });
 
     it('allows testing whether a plugin is registered', () => {
@@ -36,33 +34,31 @@ describe('PluginInterface', () => {
     });
 
     it('does not allows adding a plugin multiple times', () => {
-        const beforePublish = sinon.spy();
+        const beforeSerializeProgram = sinon.spy();
         const plugin = {
             name: 'does not allows adding a plugin multiple times',
-            beforePublish: beforePublish
+            beforeSerializeProgram: beforeSerializeProgram
         };
         pluginInterface.add(plugin);
         pluginInterface.add(plugin);
-        //@ts-ignore the current definition of `emit` doesn't like this third argument
-        pluginInterface.emit('beforePublish', undefined, []);
-        expect(beforePublish.callCount).to.equal(1);
+        pluginInterface.emit('beforeSerializeProgram', {} as any);
+
+        expect(beforeSerializeProgram.callCount).to.equal(1);
         pluginInterface.remove(plugin);
         expect(pluginInterface.has(plugin)).to.be.false;
     });
 
     it('allows removing a plugin', () => {
-        const beforePublish = sinon.spy();
+        const beforeSerializeProgram = sinon.spy();
         const plugin = {
             name: 'allows removing a plugin',
-            beforePublish: beforePublish
+            beforeSerializeProgram: beforeSerializeProgram
         };
         pluginInterface.add(plugin);
-        //@ts-ignore the current definition of `emit` doesn't like this third argument
-        pluginInterface.emit('beforePublish', undefined, []);
-        expect(beforePublish.callCount).to.equal(1);
+        pluginInterface.emit('beforeSerializeProgram', {} as any);
+        expect(beforeSerializeProgram.callCount).to.equal(1);
         pluginInterface.remove(plugin);
-        //@ts-ignore the current definition of `emit` doesn't like this third argument
-        pluginInterface.emit('beforePublish', undefined, []);
-        expect(beforePublish.callCount).to.equal(1);
+        pluginInterface.emit('beforeSerializeProgram', {} as any);
+        expect(beforeSerializeProgram.callCount).to.equal(1);
     });
 });
diff --git a/src/PluginInterface.ts b/src/PluginInterface.ts
index d550a98fc..2499736dd 100644
--- a/src/PluginInterface.ts
+++ b/src/PluginInterface.ts
@@ -23,41 +23,27 @@ export type PluginEventArgs<T> = {
 };
 
 export default class PluginInterface<T extends Plugin = Plugin> {
-
-    constructor();
-    /**
-     * @deprecated use the `options` parameter pattern instead
-     */
-    constructor(
-        plugins?: Plugin[],
-        logger?: Logger
-    );
     constructor(
         plugins?: Plugin[],
         options?: {
             logger?: Logger;
             suppressErrors?: boolean;
         }
-    );
-    constructor(
-        private plugins?: Plugin[],
-        options?: {
-            logger?: Logger;
-            suppressErrors?: boolean;
-        } | Logger
     ) {
-        this.plugins ??= [];
-        if (options?.constructor.name === 'Logger') {
-            this.logger = options as unknown as Logger;
-        } else {
-            this.logger = (options as any)?.logger;
-            this.suppressErrors = (options as any)?.suppressErrors === false ? false : true;
+        this.logger = options?.logger;
+        this.suppressErrors = (options as any)?.suppressErrors === false ? false : true;
+        for (const plugin of plugins ?? []) {
+            this.add(plugin);
+        }
+        if (!this.logger) {
+            this.logger = createLogger();
         }
         if (!this.logger) {
             this.logger = createLogger();
         }
     }
 
+    private plugins: Plugin[] = [];
     private logger: Logger;
 
     /**
@@ -69,20 +55,46 @@ export default class PluginInterface<T extends Plugin = Plugin> {
      * Call `event` on plugins
      */
     public emit<K extends keyof PluginEventArgs<T> & string>(event: K, ...args: PluginEventArgs<T>[K]) {
+        this.logger.debug(`Emitting plugin event: ${event}`);
         for (let plugin of this.plugins) {
             if ((plugin as any)[event]) {
                 try {
-                    this.logger.time(LogLevel.debug, [plugin.name, event], () => {
+                    this.logger?.time(LogLevel.debug, [plugin.name, event], () => {
                         (plugin as any)[event](...args);
                     });
                 } catch (err) {
-                    this.logger.error(`Error when calling plugin ${plugin.name}.${event}:`, err);
+                    this.logger?.error(`Error when calling plugin ${plugin.name}.${event}:`, (err as Error).stack);
+                    if (!this.suppressErrors) {
+                        throw err;
+                    }
+                }
+            }
+        }
+        return args[0];
+    }
+
+    /**
+     * Call `event` on plugins, but allow the plugins to return promises that will be awaited before the next plugin is notified
+     */
+    public async emitAsync<K extends keyof PluginEventArgs<T> & string>(event: K, ...args: PluginEventArgs<T>[K]): Promise<PluginEventArgs<T>[K][0]> {
+        this.logger.debug(`Emitting async plugin event: ${event}`);
+        for (let plugin of this.plugins) {
+            if ((plugin as any)[event]) {
+                try {
+                    await this.logger?.time(LogLevel.debug, [plugin.name, event], async () => {
+                        await Promise.resolve(
+                            (plugin as any)[event](...args)
+                        );
+                    });
+                } catch (err) {
+                    this.logger?.error(`Error when calling plugin ${plugin.name}.${event}:`, (err as Error).stack);
                     if (!this.suppressErrors) {
                         throw err;
                     }
                 }
             }
         }
+        return args[0];
     }
 
     /**
@@ -100,18 +112,81 @@ export default class PluginInterface<T extends Plugin = Plugin> {
      */
     public add<T extends Plugin = Plugin>(plugin: T) {
         if (!this.has(plugin)) {
+            this.sanitizePlugin(plugin);
             this.plugins.push(plugin);
         }
         return plugin;
     }
 
+    /**
+     * Find deprecated or removed historic plugin hooks, and warn about them.
+     * Some events can be forwards-converted
+     */
+    private sanitizePlugin(plugin: Plugin) {
+        const removedHooks = [
+            'beforePrepublish',
+            'afterPrepublish'
+        ];
+        for (const removedHook of removedHooks) {
+            if (plugin[removedHook]) {
+                this.logger?.error(`Plugin "${plugin.name}": event ${removedHook} is no longer supported and will never be called`);
+            }
+        }
+
+        const upgradeWithWarn = {
+            beforePublish: 'beforeSerializeProgram',
+            afterPublish: 'afterSerializeProgram',
+            beforeProgramTranspile: 'beforeBuildProgram',
+            afterProgramTranspile: 'afterBuildProgram',
+            beforeFileParse: 'beforeProvideFile',
+            afterFileParse: 'afterProvideFile',
+            beforeFileTranspile: 'beforePrepareFile',
+            afterFileTranspile: 'afterPrepareFile',
+            beforeFileDispose: 'beforeRemoveFile',
+            afterFileDispose: 'afterRemoveFile',
+            beforeProgramCreate: 'beforeProvideProgram',
+            afterProgramCreate: 'afterProvideProgram',
+            beforeProgramValidate: 'beforeValidateProgram',
+            onProgramValidate: 'validateProgram',
+            beforeProgramDispose: 'beforeRemoveProgram',
+            afterScopeCreate: 'afterProvideScope',
+            beforeScopeDispose: 'beforeRemoveScope',
+            onScopeDispose: 'removeScope',
+            afterScopeDispose: 'afterRemoveScope',
+            beforeScopeValidate: 'beforeValidateScope',
+            onScopeValidate: 'validateScope',
+            afterScopeValidate: 'afterValidateScope',
+            onGetCodeActions: 'provideCodeActions',
+            onGetSemanticTokens: 'provideSemanticTokens',
+            beforeFileAdd: 'beforeAddFile',
+            afterFileAdd: 'afterAddFile',
+            beforeFileRemove: 'beforeRemoveFile',
+            afterFileRemove: 'afterRemoveFile',
+            beforeFileValidate: 'beforeValidateFile',
+            onFileValidate: 'validateFile',
+            afterFileValidate: 'afterValidateFile',
+            onSerializeProgram: 'serializeProgram'
+        };
+
+        for (const [oldEvent, newEvent] of Object.entries(upgradeWithWarn)) {
+            if (plugin[oldEvent]) {
+                if (!plugin[newEvent]) {
+                    plugin[newEvent] = plugin[oldEvent];
+                    this.logger?.warn(`Plugin '${plugin.name}': event '${oldEvent}' is no longer supported. It has been converted to '${newEvent}' but you may encounter issues as their signatures may not match.`);
+                } else {
+                    this.logger?.warn(`Plugin "${plugin.name}": event '${oldEvent}' is no longer supported and will never be called`);
+                }
+            }
+        }
+    }
+
     public has(plugin: Plugin) {
         return this.plugins.includes(plugin);
     }
 
     public remove<T extends Plugin = Plugin>(plugin: T) {
         if (this.has(plugin)) {
-            this.plugins.splice(this.plugins.indexOf(plugin));
+            this.plugins.splice(this.plugins.indexOf(plugin), 1);
         }
         return plugin;
     }
diff --git a/src/Program.spec.ts b/src/Program.spec.ts
index f86d6a1ab..4cac04bf0 100644
--- a/src/Program.spec.ts
+++ b/src/Program.spec.ts
@@ -1,34 +1,35 @@
 import { assert, expect } from './chai-config.spec';
 import * as path from 'path';
 import * as pick from 'object.pick';
-import * as sinonImport from 'sinon';
-import { CancellationTokenSource, CompletionItemKind, Position, Range } from 'vscode-languageserver';
+import { CancellationTokenSource, Position, Range } from 'vscode-languageserver';
 import * as fsExtra from 'fs-extra';
 import { DiagnosticMessages } from './DiagnosticMessages';
 import type { BrsFile } from './files/BrsFile';
 import type { XmlFile } from './files/XmlFile';
-import type { BsConfig } from './BsConfig';
-import type { TranspileObj } from './Program';
 import { Program } from './Program';
 import { standardizePath as s, util } from './util';
-import { URI } from 'vscode-uri';
-import PluginInterface from './PluginInterface';
 import type { FunctionStatement, PrintStatement } from './parser/Statement';
 import { EmptyStatement } from './parser/Statement';
-import { expectCompletionsExcludes, expectCompletionsIncludes, expectDiagnostics, expectHasDiagnostics, expectThrows, expectThrowsAsync, expectZeroDiagnostics, trim, trimMap } from './testHelpers.spec';
+import { expectDiagnostics, expectHasDiagnostics, expectThrows, expectThrowsAsync, expectTypeToBe, expectZeroDiagnostics, trim, trimMap } from './testHelpers.spec';
 import { doesNotThrow } from 'assert';
 import { createVisitor, WalkMode } from './astUtils/visitors';
 import { isBrsFile } from './astUtils/reflection';
 import type { LiteralExpression } from './parser/Expression';
-import type { AstEditor } from './astUtils/AstEditor';
-import { tempDir, rootDir, stagingDir } from './testHelpers.spec';
-import type { BsDiagnostic, Plugin } from './interfaces';
-import { createLogger } from './logging';
-import { Scope } from './Scope';
-import undent from 'undent';
+import { tempDir, rootDir, outDir } from './testHelpers.spec';
+import type { SinonSpy } from 'sinon';
+import { createSandbox } from 'sinon';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import { AssetFile } from './files/AssetFile';
+import type { ProvideFileEvent, Plugin, BeforeProvideFileEvent, AfterProvideFileEvent, BeforeAddFileEvent, AfterAddFileEvent, BeforeRemoveFileEvent, AfterRemoveFileEvent, ScopeValidationOptions, AfterValidateFileEvent, BeforeValidateScopeEvent, ValidateScopeEvent, BeforeValidateFileEvent, ValidateFileEvent, AfterValidateScopeEvent, CompilerPlugin } from './interfaces';
+import { StringType, TypedFunctionType, DynamicType, FloatType, IntegerType, InterfaceType, ArrayType, BooleanType, DoubleType, UnionType } from './types';
+import { AssociativeArrayType } from './types/AssociativeArrayType';
 import { SourceMapConsumer } from 'source-map';
+import type { BsConfig } from './BsConfig';
+import { ComponentType } from './types/ComponentType';
+import undent from 'undent';
+import { Scope } from './Scope';
 
-let sinon = sinonImport.createSandbox();
+const sinon = createSandbox();
 
 describe('Program', () => {
     let program: Program;
@@ -38,7 +39,7 @@ describe('Program', () => {
         fsExtra.emptyDirSync(tempDir);
         program = new Program({
             rootDir: rootDir,
-            stagingDir: stagingDir
+            outDir: outDir
         });
         program.createSourceScope(); //ensure source scope is created
     });
@@ -71,25 +72,38 @@ describe('Program', () => {
         await program.getTranspiledFileContents('tests/testFile.spec.bs');
     });
 
+    it('allows diagnostics to be set on AssetFile', () => {
+        const file = program.setFile<AssetFile>('manifest', ``);
+        program.diagnostics.register({
+            message: 'Manifest is totally bogus',
+            location: util.createLocationFromFileRange(file, util.createRange(0, 0, 0, 10)),
+            code: 10
+        });
+        program.validate();
+        expectDiagnostics(program, [{
+            code: 10,
+            message: 'Manifest is totally bogus'
+        }]);
+    });
+
     describe('global scope', () => {
         it('returns all callables when asked', () => {
             expect(program.globalScope.getAllCallables().length).to.be.greaterThan(0);
         });
         it('validate gets called and does nothing', () => {
-            expect(program.globalScope.validate()).to.eql(undefined);
+            expect(program.globalScope.validate()).to.eql(false);
         });
     });
 
     describe('addFile', () => {
         it('adds various files to `pkgMap`', () => {
             program.setFile('source/main.brs', '');
-            expect(program['pkgMap']).to.have.property(s`source/main.brs`);
-
-            program.setFile('source/main.bs', '');
-            expect(program['pkgMap']).to.have.property(s`source/main.bs`);
+            expect(program.getFile('source/main.brs')).to.exist;
+            expect(program.getFile('source\\main.brs')).to.exist;
 
             program.setFile('components/comp1.xml', '');
-            expect(program['pkgMap']).to.have.property(s`components/comp1.xml`);
+            expect(program.getFile(s`components/comp1.xml`)).to.exist;
+            expect(program.getFile(s`components\\comp1.xml`)).to.exist;
         });
 
         it('does not crash when given a totally bogus file', () => {
@@ -116,14 +130,14 @@ describe('Program', () => {
         it('only parses xml files as components when file is found within the "components" folder', () => {
             expect(Object.keys(program.files).length).to.equal(0);
 
-            program.setFile('components/comp1.xml', '');
-            expect(Object.keys(program.files).length).to.equal(1);
+            let file = program.setFile(`components/comp1.xml`, '');
+            expect(file.type).to.eql('XmlFile');
 
-            program.setFile('notComponents/comp1.xml', '');
-            expect(Object.keys(program.files).length).to.equal(1);
+            file = program.setFile(`notComponents/comp1.xml`, '');
+            expect(file.type).to.eql('AssetFile');
 
-            program.setFile('componentsExtra/comp1.xml', '');
-            expect(Object.keys(program.files).length).to.equal(1);
+            program.setFile(`componentsExtra/comp1.xml`, '');
+            expect(file.type).to.eql('AssetFile');
         });
 
         it('supports empty statements for transpile', async () => {
@@ -134,7 +148,10 @@ describe('Program', () => {
                 end sub
             `);
             (file.parser.ast.statements[0] as FunctionStatement).func.body.statements[0] = new EmptyStatement();
-            await program.transpile([{ src: file.srcPath, dest: file.pkgPath }], tempDir);
+            await program.build({
+                files: [file],
+                outDir: tempDir
+            });
         });
 
         it('works with different cwd', () => {
@@ -184,25 +201,25 @@ describe('Program', () => {
         });
 
         it(`emits events for scope and file creation`, () => {
-            const beforeProgramValidate = sinon.spy();
-            const afterProgramValidate = sinon.spy();
-            const afterScopeCreate = sinon.spy();
-            const beforeScopeValidate = sinon.spy();
-            const afterScopeValidate = sinon.spy();
-            const beforeFileParse = sinon.spy();
-            const afterFileParse = sinon.spy();
-            const afterFileValidate = sinon.spy();
-            program.plugins = new PluginInterface([{
+            const beforeValidateProgram = sinon.spy();
+            const afterValidateProgram = sinon.spy();
+            const afterProvideScope = sinon.spy();
+            const beforeValidateScope = sinon.spy();
+            const afterValidateScope = sinon.spy();
+            const beforeProvideFile = sinon.spy();
+            const afterProvideFile = sinon.spy();
+            const afterValidateFile = sinon.spy();
+            program.plugins.add({
                 name: 'emits events for scope and file creation',
-                beforeProgramValidate: beforeProgramValidate,
-                afterProgramValidate: afterProgramValidate,
-                afterScopeCreate: afterScopeCreate,
-                beforeScopeValidate: beforeScopeValidate,
-                afterScopeValidate: afterScopeValidate,
-                beforeFileParse: beforeFileParse,
-                afterFileParse: afterFileParse,
-                afterFileValidate: afterFileValidate
-            }], { logger: createLogger() });
+                beforeValidateProgram: beforeValidateProgram,
+                afterValidateProgram: afterValidateProgram,
+                afterProvideScope: afterProvideScope,
+                beforeValidateScope: beforeValidateScope,
+                afterValidateScope: afterValidateScope,
+                beforeProvideFile: beforeProvideFile,
+                afterProvideFile: afterProvideFile,
+                afterValidateFile: afterValidateFile
+            });
 
             //add a new source file
             program.setFile('source/main.brs', '');
@@ -215,17 +232,39 @@ describe('Program', () => {
             program.validate();
 
             //program events
-            expect(beforeProgramValidate.callCount).to.equal(1);
-            expect(afterProgramValidate.callCount).to.equal(1);
+            expect(beforeValidateProgram.callCount).to.equal(1);
+            expect(afterValidateProgram.callCount).to.equal(1);
             //scope events
             //(we get component scope event only because source is created in beforeEach)
-            expect(afterScopeCreate.callCount).to.equal(1);
-            expect(beforeScopeValidate.callCount).to.equal(2);
-            expect(afterScopeValidate.callCount).to.equal(2);
+            expect(afterProvideScope.callCount).to.equal(1);
+            expect(beforeValidateScope.callCount).to.equal(2);
+            expect(afterValidateScope.callCount).to.equal(2);
             //file events
-            expect(beforeFileParse.callCount).to.equal(2);
-            expect(afterFileParse.callCount).to.equal(2);
-            expect(afterFileValidate.callCount).to.equal(2);
+            expect(beforeProvideFile.callCount).to.equal(2);
+            expect(afterProvideFile.callCount).to.equal(2);
+            expect(afterValidateFile.callCount).to.equal(2);
+        });
+    });
+
+    describe('getFile', () => {
+        it('can get a file from the srcPath', () => {
+            const file = program.setFile({
+                src: s`${rootDir}/source/main.brs`,
+                dest: s`${rootDir}/source/maindest.brs`
+            }, '');
+            expect(program.getFile(s`${rootDir}/source/main.brs`)).to.exist;
+            expect(program.getFile(s`${rootDir}\\source\\main.brs`)).to.exist;
+            expect(program.getFile(s`${rootDir}/SOURCE/MAIN.brs`, true)).to.exist;
+
+            expect(program.getFile(file.srcPath)).to.exist;
+        });
+
+        it('can get a file from the uri', () => {
+            const file = program.setFile({
+                src: s`${rootDir}/source/main.brs`,
+                dest: s`${rootDir}/source/maindest.brs`
+            }, '');
+            expect(program.getFile(util.pathToUri(file?.srcPath))).to.exist;
         });
     });
 
@@ -254,7 +293,7 @@ describe('Program', () => {
             program.validate();
             //ensure the diagnostic is there during normal run
             expectDiagnostics(program, [
-                DiagnosticMessages.unknownEnumValue('down', 'Direction').message
+                DiagnosticMessages.cannotFindName('down', 'Direction', 'Direction', 'enum').message
             ]);
 
             const cancel = new CancellationTokenSource();
@@ -262,17 +301,17 @@ describe('Program', () => {
             let count = 0;
             const plugin = {
                 name: 'cancel validation',
-                beforeProgramValidate: () => {
+                beforeValidateProgram: () => {
                     count++;
                     //if this is the second validate, remove the plugin and change the file to invalidate the scopes again
                     if (count === 2) {
                         program.plugins.remove(plugin);
-                        program.setFile('source/test.bs', program.getFile('source/test.bs').fileContents + `'comment`);
+                        program.setFile('source/test.bs', program.getFile<BrsFile>('source/test.bs').fileContents + `'comment`);
                     }
                 },
-                afterScopeValidate: () => {
+                afterValidateScope: () => {
                     //if the diagnostic is avaiable, we know it's safe to cancel
-                    if (program.getDiagnostics().find(x => x.code === DiagnosticMessages.unknownEnumValue('down', 'Direction').code)) {
+                    if (program.getDiagnostics().find(x => x.code === DiagnosticMessages.cannotFindName('down', 'Direction').code)) {
                         cancel.cancel();
                     }
                 }
@@ -281,7 +320,7 @@ describe('Program', () => {
             program.plugins.add(plugin);
 
             //change the file so it forces a reload
-            program.setFile('source/test.bs', program.getFile('source/test.bs').fileContents + `'comment`);
+            program.setFile('source/test.bs', program.getFile<BrsFile>('source/test.bs').fileContents + `'comment`);
 
             //now trigger two validations, the first one will be cancelled, the second one will run to completion
             await Promise.all([
@@ -296,7 +335,7 @@ describe('Program', () => {
 
             //ensure the diagnostic is there after a cancelled run (with a subsequent completed run)
             expectDiagnostics(program, [
-                DiagnosticMessages.unknownEnumValue('down', 'Direction').message
+                DiagnosticMessages.cannotFindName('down', 'Direction', 'Direction', 'enum').message
             ]);
         });
 
@@ -329,9 +368,9 @@ describe('Program', () => {
                 end sub
             `);
             //disable the plugins
-            expect(file.parser.references.expressions).to.be.lengthOf(1);
+            expect(file['_cachedLookups'].expressions).to.be.lengthOf(1);
             program.validate();
-            expect(file.parser.references.expressions).to.be.lengthOf(1);
+            expect(file['_cachedLookups'].expressions).to.be.lengthOf(1);
         });
         it('catches duplicate XML component names', () => {
             //add 2 components which both reference the same errored file
@@ -346,22 +385,24 @@ describe('Program', () => {
                 </component>
             `);
             program.validate();
+            // the duplicate of component1.xml, which is in component2.xml is first
+            // the duplicate of component2.xml, which is in component1.xml is second
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.duplicateComponentName('Component1'),
-                range: Range.create(1, 17, 1, 27),
+                location: { range: Range.create(1, 17, 1, 27) },
                 relatedInformation: [{
-                    location: util.createLocation(
-                        URI.file(s`${rootDir}/components/component2.xml`).toString(),
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/components/component2.xml`),
                         Range.create(1, 17, 1, 27)
                     ),
                     message: 'Also defined here'
                 }]
             }, {
                 ...DiagnosticMessages.duplicateComponentName('Component1'),
-                range: Range.create(1, 17, 1, 27),
+                location: { range: Range.create(1, 17, 1, 27) },
                 relatedInformation: [{
-                    location: util.createLocation(
-                        URI.file(s`${rootDir}/components/component1.xml`).toString(),
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/components/component1.xml`),
                         Range.create(1, 17, 1, 27)
                     ),
                     message: 'Also defined here'
@@ -369,17 +410,6 @@ describe('Program', () => {
             }]);
         });
 
-        it('allows adding diagnostics', () => {
-            const expected = [{
-                message: 'message',
-                file: undefined,
-                range: undefined
-            }] as any as BsDiagnostic[];
-            program.addDiagnostics(expected);
-            const actual = (program as any).diagnostics;
-            expect(actual).to.deep.equal(expected);
-        });
-
         it('does not produce duplicate parse errors for different component scopes', () => {
             //add a file with a parse error
             program.setFile('components/lib.brs', `
@@ -532,8 +562,8 @@ describe('Program', () => {
             `);
             program.validate();
             expectDiagnostics(program, [
-                DiagnosticMessages.duplicateFunctionImplementation('DoSomething', 'source'),
-                DiagnosticMessages.duplicateFunctionImplementation('DoSomething', 'source')
+                DiagnosticMessages.duplicateFunctionImplementation('DoSomething'),
+                DiagnosticMessages.duplicateFunctionImplementation('DoSomething')
             ]);
         });
 
@@ -548,8 +578,8 @@ describe('Program', () => {
             `);
             program.validate();
             expectDiagnostics(program, [
-                DiagnosticMessages.duplicateFunctionImplementation('DoSomething', 'source'),
-                DiagnosticMessages.duplicateFunctionImplementation('DoSomething', 'source')
+                DiagnosticMessages.duplicateFunctionImplementation('DoSomething'),
+                DiagnosticMessages.duplicateFunctionImplementation('DoSomething')
             ]);
         });
 
@@ -659,9 +689,164 @@ describe('Program', () => {
             expectZeroDiagnostics(program);
         });
 
+        describe('changed symbols', () => {
+            it('includes components when component interface changes', () => {
+                program.setFile('components/widget.xml', trim`
+                    <component name="Widget" extends="Group">
+                        <interface>
+                            <field id="foo" type="string" />
+                        </interface>
+                    </component>
+                `);
+                program.setFile('components/other.xml', trim`
+                    <component name="Other" extends="Group">
+                        <interface>
+                            <field id="foo" type="string" />
+                        </interface>
+                    </component>
+                `);
+                program.setFile('source/main.bs', `
+                    sub sourceScopeFunc()
+                    end sub
+                `);
+                program.validate();
+                let options: ScopeValidationOptions = program['currentScopeValidationOptions'];
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodewidget')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodeother')).to.be.true;
+
+                expectZeroDiagnostics(program);
+                //change widget
+                program.setFile('components/widget.xml', trim`
+                    <component name="Widget" extends="Group">
+                        <interface>
+                            <field id="foo" type="integer" />
+                        </interface>
+                    </component>
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                options = program['currentScopeValidationOptions'];
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodewidget')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodeother')).to.be.false;
+            });
+
+            it('includes components when component callfunc changes', () => {
+                program.setFile('components/widget.xml', trim`
+                    <component name="Widget" extends="Group">
+                        <script type="text/brightscript" uri="widget.bs" />
+                        <interface>
+                            <function name="foo" />
+                        </interface>
+                    </component>
+                `);
+                program.setFile('components/widget.bs', `
+                    sub foo()
+                    end sub
+                `);
+                program.setFile('components/other.xml', trim`
+                    <component name="Other" extends="Group">
+                        <interface>
+                            <field id="foo" type="string" />
+                        </interface>
+                    </component>
+                `);
+                program.setFile('source/main.bs', `
+                    sub sourceScopeFunc()
+                    end sub
+                `);
+                program.validate();
+                let options: ScopeValidationOptions = program['currentScopeValidationOptions'];
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodewidget')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodeother')).to.be.true;
+
+                expectZeroDiagnostics(program);
+                //change widget@.foo
+                program.setFile('components/widget.bs', `
+                    sub foo(input)
+                        print input
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                options = program['currentScopeValidationOptions'];
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodewidget')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodeother')).to.be.false;
+            });
+
+            it('includes types that depend on a changed component', () => {
+                program.setFile('components/widget.xml', trim`
+                    <component name="Widget" extends="Group">
+                        <script type="text/brightscript" uri="widget.bs" />
+                        <interface>
+                            <function name="foo" />
+                        </interface>
+                    </component>
+                `);
+                program.setFile('components/widget.bs', `
+                    sub foo()
+                    end sub
+                `);
+                program.setFile('components/other.xml', trim`
+                    <component name="Other" extends="Group">
+                        <interface>
+                            <field id="foo" type="string" />
+                        </interface>
+                    </component>
+                `);
+                program.setFile('source/main.bs', `
+                    interface IncludesWidget
+                        widget as roSGNodeWidget
+                    end interface
+
+                    sub sourceScopeFunc()
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                let options: ScopeValidationOptions = program['currentScopeValidationOptions'];
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodewidget')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodeother')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('includeswidget')).to.be.true;
+
+                // change roSgNodeOther
+                program.setFile('components/other.xml', trim`
+                    <component name="Other" extends="Group">
+                        <interface>
+                            <field id="foo" type="integer" />
+                        </interface>
+                    </component>
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                options = program['currentScopeValidationOptions'];
+
+                // only rosgnodewidget changes
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodewidget')).to.be.false;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodeother')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('includeswidget')).to.be.false;
+
+                //change widget@.foo
+                program.setFile('components/widget.bs', `
+                    sub foo(input)
+                        print input
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                options = program['currentScopeValidationOptions'];
+
+                // has rosgnodewidget AND IncludesWidget, because it depends on roSgnodeWidget
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodewidget')).to.be.true;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('rosgnodeother')).to.be.false;
+                expect(options.changedSymbols.get(SymbolTypeFlag.typetime).has('includeswidget')).to.be.true;
+            });
+
+        });
+
         it('properly handles errors in async mode', async () => {
             const file = program.setFile<BrsFile>('source/main.brs', ``);
-            file.validate = () => {
+            const scope = program.getFirstScopeForFile(file);
+            scope.validate = () => {
                 throw new Error('Crash for test');
             };
             let error: Error;
@@ -673,7 +858,214 @@ describe('Program', () => {
             expect(error?.message).to.eql('Crash for test');
         });
 
-        it('includes files added during beforeProgramValidate in validation', () => {
+        describe('cancelled', () => {
+
+            type eventName = 'beforeValidateFile' | 'validateFile' | 'afterValidateFile' | 'beforeValidateScope' | 'validateScope' | 'afterValidateScope';
+            interface CancellationPluginOptions {
+                cancelOn?: eventName[];
+                eventWhenCancelled?: BeforeValidateFileEvent | ValidateFileEvent | AfterValidateFileEvent | BeforeValidateScopeEvent | ValidateScopeEvent | AfterValidateScopeEvent;
+                cancelTokenSource: CancellationTokenSource;
+            }
+
+            function getCancellationPlugin(option: CancellationPluginOptions): Plugin {
+                return {
+                    name: 'cancelPlugin',
+                    beforeValidateFile: (event) => {
+                        if (option?.cancelOn.includes('beforeValidateFile')) {
+                            option.eventWhenCancelled = event;
+                            option.cancelTokenSource.cancel();
+                        }
+                    },
+                    validateFile: (event) => {
+                        if (option?.cancelOn.includes('validateFile')) {
+                            option.eventWhenCancelled = event;
+                            option.cancelTokenSource.cancel();
+                        }
+                    },
+                    afterValidateFile: (event) => {
+                        if (option?.cancelOn.includes('afterValidateFile')) {
+                            option.eventWhenCancelled = event;
+                            option.cancelTokenSource.cancel();
+                        }
+                    },
+                    beforeValidateScope: (event) => {
+                        if (option?.cancelOn.includes('beforeValidateScope')) {
+                            option.eventWhenCancelled = event;
+                            option.cancelTokenSource.cancel();
+                        }
+                    },
+                    validateScope: (event) => {
+                        if (option?.cancelOn.includes('validateScope')) {
+                            option.eventWhenCancelled = event;
+                            option.cancelTokenSource.cancel();
+                        }
+                    },
+                    afterValidateScope: (event) => {
+                        if (option?.cancelOn.includes('afterValidateScope')) {
+                            option.eventWhenCancelled = event;
+                            option.cancelTokenSource.cancel();
+                        }
+                    }
+                };
+            }
+
+            it('should be cancellable', async () => {
+                const options: CancellationPluginOptions = { cancelOn: [], eventWhenCancelled: null, cancelTokenSource: new CancellationTokenSource() };
+                const cancelPlugin = getCancellationPlugin(options);
+                program.plugins.add(cancelPlugin);
+
+                program.setFile('source/file1.bs', `
+                    function foo() as integer
+                        return 1
+                    end function
+                `);
+                program.setFile('source/file2.bs', `
+                    function bar() as boolean
+                        return true
+                    end function
+                `);
+                // do an initial validation
+                program.validate();
+                expectZeroDiagnostics(program);
+                options.cancelOn = ['afterValidateFile'];
+
+                // change file
+                program.setFile('source/file2.bs', `
+                    function bar() as integer
+                        return true
+                    end function
+                `);
+                options.cancelTokenSource = new CancellationTokenSource();
+                await program.validate({ async: true, cancellationToken: options.cancelTokenSource.token });
+                const event = options.eventWhenCancelled as AfterValidateFileEvent;
+                expect(event).not.to.undefined;
+                expect(event.file.srcPath).includes('file2.bs');
+            });
+
+            it('scope validation should contain symbols from previous cancellations', async () => {
+                const options: CancellationPluginOptions = { cancelOn: [], eventWhenCancelled: null, cancelTokenSource: new CancellationTokenSource() };
+                const cancelPlugin = getCancellationPlugin(options);
+                program.plugins.add(cancelPlugin);
+
+                program.setFile('source/file1.bs', `
+                    function foo() as integer
+                        return 1
+                    end function
+                `);
+                program.setFile('source/file2.bs', `
+                    function bar() as boolean
+                        return true
+                    end function
+                `);
+                // do an initial validation
+                program.validate();
+                expectZeroDiagnostics(program);
+                options.cancelOn = ['beforeValidateScope'];
+
+                // change file2
+                program.setFile('source/file2.bs', `
+                    function bar() as integer
+                        return true
+                    end function
+                `);
+                options.cancelTokenSource = new CancellationTokenSource();
+                await program.validate({ async: true, cancellationToken: options.cancelTokenSource.token });
+                //cancelled before scope validation, so source scope should be unvalidated
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope.isValidated).to.be.false;
+
+                // change file1
+                program.setFile('source/file1.bs', `
+                    function foo(x as integer) as integer
+                        return x
+                    end function
+                `);
+
+                options.cancelOn = ['validateScope'];
+                options.cancelTokenSource = new CancellationTokenSource();
+                await program.validate({ async: true, cancellationToken: options.cancelTokenSource.token });
+                const event = options.eventWhenCancelled as ValidateScopeEvent;
+                // Event details has info from both changes at scope validation step
+                const srcPaths = event.changedFiles.map(file => file.srcPath);
+                expect(srcPaths.length).to.eq(2);
+                const changedFunctions = Array.from(event.changedSymbols.get(SymbolTypeFlag.runtime).values());
+                expect(changedFunctions).to.include('foo');
+                expect(changedFunctions).to.include('bar');
+            });
+
+            it('does not duplicate symbol-table entries when validateFile is cancelled and re-runs', async () => {
+                //BrsFileValidator runs in the `validateFile` plugin event and pushes into per-file
+                //symbol tables for every class/interface/function/etc. If a cancelled validation
+                //re-fired `validateFile` for the same file, those addSymbol calls would run again
+                //and accumulate parallel entries — and CrossScopeValidator would flag a
+                //name-collision. The fix is structural: before/validate/after run as a single
+                //per-file action so cancellation can never land between them.
+                program.setFile('source/types.bs', `
+                    class MyClass
+                        name as string
+                        sub method()
+                        end sub
+                    end class
+                `);
+
+                const options: CancellationPluginOptions = { cancelOn: ['validateFile'], eventWhenCancelled: null, cancelTokenSource: new CancellationTokenSource() };
+                program.plugins.add(getCancellationPlugin(options));
+
+                //first validate is cancelled inside `validateFile`
+                await program.validate({ async: true, cancellationToken: options.cancelTokenSource.token });
+
+                //second validate runs to completion (no cancel)
+                options.cancelOn = [];
+                await program.validate({ async: true });
+
+                //the symbol table should have exactly one entry for MyClass per flag
+                const file = program.getFile<BrsFile>('source/types.bs');
+                const runtimeEntries = file.parser.symbolTable.getOwnSymbols(SymbolTypeFlag.runtime).filter(s => s.name === 'MyClass');
+                const typetimeEntries = file.parser.symbolTable.getOwnSymbols(SymbolTypeFlag.typetime).filter(s => s.name === 'MyClass');
+                expect(runtimeEntries).to.have.lengthOf(1);
+                expect(typetimeEntries).to.have.lengthOf(1);
+
+                //and no name-collision diagnostic should be emitted
+                expectZeroDiagnostics(program);
+            });
+
+            it('does not duplicate symbols across many files when validation is cancelled and re-run repeatedly', async () => {
+                //multi-file variant of the previous test. Each file defines its own class.
+                //Cancel the first pass mid-validateFile, then re-validate to completion, and
+                //verify every file's symbol table has exactly one entry per class. This catches
+                //regressions where partial-file processing leaks duplicate addSymbol calls into
+                //the next pass.
+                const fileCount = 5;
+                for (let i = 0; i < fileCount; i++) {
+                    program.setFile(`source/types${i}.bs`, `
+                        class MyClass${i}
+                            name as string
+                        end class
+                    `);
+                }
+
+                const options: CancellationPluginOptions = { cancelOn: ['validateFile'], eventWhenCancelled: null, cancelTokenSource: new CancellationTokenSource() };
+                program.plugins.add(getCancellationPlugin(options));
+
+                //first pass cancels mid-validateFile
+                await program.validate({ async: true, cancellationToken: options.cancelTokenSource.token });
+
+                //second pass runs to completion
+                options.cancelOn = [];
+                await program.validate({ async: true });
+
+                for (let i = 0; i < fileCount; i++) {
+                    const file = program.getFile<BrsFile>(`source/types${i}.bs`);
+                    const runtimeEntries = file.parser.symbolTable.getOwnSymbols(SymbolTypeFlag.runtime).filter(s => s.name === `MyClass${i}`);
+                    const typetimeEntries = file.parser.symbolTable.getOwnSymbols(SymbolTypeFlag.typetime).filter(s => s.name === `MyClass${i}`);
+                    expect(runtimeEntries, `runtime entries for MyClass${i}`).to.have.lengthOf(1);
+                    expect(typetimeEntries, `typetime entries for MyClass${i}`).to.have.lengthOf(1);
+                }
+                expectZeroDiagnostics(program);
+            });
+        });
+
+        it('includes files added during beforeValidateProgram in validation', () => {
             program.setFile('source/a.brs', `
                 sub a()
                     b()
@@ -681,8 +1073,8 @@ describe('Program', () => {
             `);
 
             program.plugins.add({
-                name: 'add file in beforeProgramValidate',
-                beforeProgramValidate: () => {
+                name: 'add file in beforeValidateProgram',
+                beforeValidateProgram: () => {
                     program.setFile('source/b.brs', `
                         sub b()
                         end sub
@@ -712,7 +1104,7 @@ describe('Program', () => {
                 getPaths('source/main.brs', rootDir)
             ).to.eql({
                 srcPath: s`${rootDir}/source/main.brs`,
-                pkgPath: s`source/main.brs`
+                destPath: s`source/main.brs`
             });
         });
 
@@ -721,7 +1113,7 @@ describe('Program', () => {
                 getPaths(`${rootDir}/source\\main.brs`, rootDir)
             ).to.eql({
                 srcPath: s`${rootDir}/source/main.brs`,
-                pkgPath: s`source/main.brs`
+                destPath: s`source/main.brs`
             });
         });
 
@@ -730,7 +1122,7 @@ describe('Program', () => {
                 getPaths({ dest: 'source/main.brs' }, rootDir)
             ).to.eql({
                 srcPath: s`${rootDir}/source/main.brs`,
-                pkgPath: s`source/main.brs`
+                destPath: s`source/main.brs`
             });
         });
 
@@ -739,7 +1131,7 @@ describe('Program', () => {
                 getPaths({ src: `${rootDir}/source/main.brs` }, rootDir)
             ).to.eql({
                 srcPath: s`${rootDir}/source/main.brs`,
-                pkgPath: s`source/main.brs`
+                destPath: s`source/main.brs`
             });
         });
 
@@ -748,30 +1140,13 @@ describe('Program', () => {
                 getPaths('pkg:/source/main.brs', rootDir)
             ).to.eql({
                 srcPath: s`${rootDir}/source/main.brs`,
-                pkgPath: s`source/main.brs`
-            });
-        });
-
-        it('favors pkgPath over destPath', () => {
-            expect(
-                getPaths({ srcPath: `${rootDir}/source/main.brs`, destPath: 'source/DontUse.brs', pkgPath: `pkg:/source/main.brs` })
-            ).to.eql({
-                srcPath: s`${rootDir}/source/main.brs`,
-                pkgPath: s`source/main.brs`
-            });
-        });
-
-        it('works when given a file', () => {
-            expect(
-                getPaths({ srcPath: `${rootDir}/source/main.brs`, pkgPath: `source/main.brs` })
-            ).to.eql({
-                srcPath: s`${rootDir}/source/main.brs`,
-                pkgPath: s`source/main.brs`
+                destPath: s`source/main.brs`
             });
         });
     });
 
     describe('setFile', () => {
+
         it('links xml scopes based on xml parent-child relationships', () => {
             program.setFile('components/ParentScene.xml', trim`
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -820,8 +1195,8 @@ describe('Program', () => {
             program.setFile('components/component1.brs', '');
 
             let scope = program.getScopeByName(`components/component1.xml`);
-            expect(scope.getFile('components/component1.xml').pkgPath).to.equal(s`components/component1.xml`);
-            expect(scope.getFile('components/component1.brs').pkgPath).to.equal(s`components/component1.brs`);
+            expect(scope.getFile('components/component1.xml').destPath).to.equal(s`components/component1.xml`);
+            expect(scope.getFile('components/component1.brs').destPath).to.equal(s`components/component1.brs`);
         });
 
         it('adds xml file to files map', () => {
@@ -839,7 +1214,7 @@ describe('Program', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.referencedFileDoesNotExist(),
-                range: Range.create(2, 42, 2, 72)
+                location: { range: Range.create(2, 42, 2, 72) }
             }]);
         });
 
@@ -945,34 +1320,46 @@ describe('Program', () => {
             ]);
         });
 
-        it('includes a correctly-cased relative path in the diagnostic data for a relative import', () => {
-            program.setFile('components/component1.xml', trim`
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="HeroScene" extends="Scene">
-                    <script type="text/brightscript" uri="component1.brs" />
-                </component>
-            `);
-            program.setFile('components/COMPONENT1.brs', '');
+        describe('multiple files', () => {
+            beforeEach(() => {
+                program.plugins.add({
+                    name: 'test',
+                    provideFile: (event: ProvideFileEvent) => {
+                        //every .component file also produces a secondary file
+                        if (event.srcPath.endsWith('.component')) {
+                            const fileName = path.parse(event.srcPath).name;
+                            event.files.push({
+                                type: 'XmlFile',
+                                srcPath: event.srcPath,
+                                destPath: `components/${fileName}.xml`
+                            }, {
+                                type: 'BrsFile',
+                                srcPath: `virtual:/${fileName}.brs`,
+                                destPath: `components/${fileName}.brs`
+                            });
+                        }
+                    }
+                });
+            });
 
-            program.validate();
-            const diagnostics = program.getDiagnostics();
-            const mismatch = diagnostics.find(d => d.code === DiagnosticMessages.scriptImportCaseMismatch('').code);
-            expect((mismatch?.data as any)?.correctFilePath).to.equal('COMPONENT1.brs');
-        });
+            it('allows finding files by `virtual:/` srcPath', () => {
+                program.setFile('components/ButtonPrimary.component', ``);
+                expect(program.hasFile('virtual:/ButtonPrimary.brs')).to.be.true;
+            });
 
-        it('includes a correctly-cased relative path for imports across directories', () => {
-            program.setFile('components/sub/comp.xml', trim`
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="comp" extends="Scene">
-                    <script type="text/brightscript" uri="../utils/helper.brs" />
-                </component>
-            `);
-            program.setFile('components/utils/HELPER.brs', '');
+            it('supports virtual file contributions', () => {
+                //add the file
+                program.setFile('components/ButtonPrimary.component', ``);
+                //both virtual files should exist
+                expect(program.hasFile('components/ButtonPrimary.xml')).to.be.true;
+                expect(program.hasFile('components/ButtonPrimary.brs')).to.be.true;
 
-            program.validate();
-            const diagnostics = program.getDiagnostics();
-            const mismatch = diagnostics.find(d => d.code === DiagnosticMessages.scriptImportCaseMismatch('').code);
-            expect((mismatch?.data as any)?.correctFilePath).to.equal('../utils/HELPER.brs');
+                //remove the file
+                program.removeFile('components/ButtonPrimary.component');
+                //the virtual files should be missing
+                expect(program.hasFile('components/ButtonPrimary.xml')).to.be.false;
+                expect(program.hasFile('components/ButtonPrimary.brs')).to.be.false;
+            });
         });
     });
 
@@ -1020,7 +1407,7 @@ describe('Program', () => {
             `);
             program.validate();
             expectZeroDiagnostics(program);
-            expect(program.getScopeByName(xmlFile.pkgPath).getFile(brsPath)).to.exist;
+            expect(program.getScopeByName(xmlFile.destPath).getFile(brsPath)).to.exist;
         });
 
         it('reloads referenced fles when xml file changes', () => {
@@ -1035,7 +1422,7 @@ describe('Program', () => {
             `);
             program.validate();
             expectZeroDiagnostics(program);
-            expect(program.getScopeByName(xmlFile.pkgPath).getFile('components/component1.brs')).not.to.exist;
+            expect(program.getScopeByName(xmlFile.destPath).getFile('components/component1.brs')).not.to.exist;
 
             //reload the xml file contents, adding a new script reference.
             xmlFile = program.setFile('components/component1.xml', trim`
@@ -1045,7 +1432,7 @@ describe('Program', () => {
                 </component>
             `);
 
-            expect(program.getScopeByName(xmlFile.pkgPath).getFile('components/component1.brs')).to.exist;
+            expect(program.getScopeByName(xmlFile.destPath).getFile('components/component1.brs')).to.exist;
         });
     });
 
@@ -1055,678 +1442,21 @@ describe('Program', () => {
                 program.getCodeActions('not/real/file', util.createRange(1, 2, 3, 4));
             });
         });
-    });
-
-    describe('getCompletions', () => {
-        it('includes `for each` variable', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    items = [1, 2, 3]
-                    for each thing in items
-                        t =
-                    end for
-                    end for
-                end sub
-            `);
-            program.validate();
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(4, 28)).map(x => x.label);
-            expect(completions).to.include('thing');
-        });
-
-        it('finds enum member after dot', () => {
-            program.setFile('source/main.bs', `
-                sub test()
-                    thing = alpha.Direction.
-                end sub
-                namespace alpha
-                    enum Direction
-                        up
-                    end enum
-                end namespace
-            `);
-            program.validate();
-            const completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 44));
-            expect(completions.map(x => ({ kind: x.kind, label: x.label }))).to.eql([{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }]);
-        });
-
-        it('finds enum member after dot in if statement', () => {
-            program.setFile('source/main.bs', `
-                sub test()
-                    if alpha.beta. then
-                    end if
-                end sub
-                namespace alpha.beta
-                    const isEnabled = true
-                end namespace
-            `);
-            program.validate();
-            const completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 34));
-            expect(completions.map(x => ({ kind: x.kind, label: x.label }))).to.eql([{
-                label: 'isEnabled',
-                kind: CompletionItemKind.Constant
-            }]);
-        });
-
-        it('includes `for` variable', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    for i = 0 to 10
-                        t =
-                    end for
-                end sub
-            `);
-            program.validate();
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 28)).map(x => x.label);
-            expect(completions).to.include('i');
-        });
-
-        it('should include first-level namespace names for brighterscript files', () => {
-            program.setFile('source/main.bs', `
-                namespace NameA.NameB.NameC
-                    sub DoSomething()
-                    end sub
-                end namespace
-                sub main()
-                    print
-                end sub
-            `);
-            expectCompletionsIncludes(program.getCompletions(`${rootDir}/source/main.bs`, Position.create(6, 25)), [{
-                label: 'NameA',
-                kind: CompletionItemKind.Module
-            }]);
-            expectCompletionsExcludes(program.getCompletions(`${rootDir}/source/main.bs`, Position.create(6, 25)), [{
-                label: 'NameB',
-                kind: CompletionItemKind.Module
-            }, {
-                label: 'NameA.NameB',
-                kind: CompletionItemKind.Module
-            }, {
-                label: 'NameA.NameB.NameC',
-                kind: CompletionItemKind.Module
-            }, {
-                label: 'NameA.NameB.NameC.DoSomething',
-                kind: CompletionItemKind.Module
-            }]);
-        });
-
-        it('resolves completions for namespaces with next namespace part for brighterscript file', () => {
-            program.setFile('source/main.bs', `
-                namespace NameA.NameB.NameC
-                    sub DoSomething()
-                    end sub
-                end namespace
-                sub main()
-                    NameA.
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(6, 26)).map(x => x.label);
-            expect(completions).to.include('NameB');
-            expect(completions).not.to.include('NameA');
-            expect(completions).not.to.include('NameA.NameB');
-            expect(completions).not.to.include('NameA.NameB.NameC');
-            expect(completions).not.to.include('NameA.NameB.NameC.DoSomething');
-        });
-
-        it('finds namespace members for brighterscript file', () => {
-            program.setFile('source/main.bs', `
-                sub main()
-                    NameA.
-                    NameA.NameB.
-                    NameA.NameB.NameC.
-                end sub
-                namespace NameA
-                    sub alertA()
-                    end sub
-                end namespace
-                namespace NameA
-                    sub info()
-                    end sub
-                end namespace
-                namespace NameA.NameB
-                    sub alertB()
-                    end sub
-                end namespace
-                namespace NameA.NameB.NameC
-                    sub alertC()
-                    end sub
-                end namespace
-            `);
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 26)).map(x => x.label).sort()
-            ).to.eql(['NameB', 'alertA', 'info']);
-
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 32)).map(x => x.label).sort()
-            ).to.eql(['NameC', 'alertB']);
-
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 38)).map(x => x.label).sort()
-            ).to.eql(['alertC']);
-        });
-
-        it('finds namespace members for classes', () => {
-            program.setFile('source/main.bs', `
-                sub main()
-                    NameA.
-                    NameA.NameB.
-                    NameA.NameB.NameC.
-                end sub
-                namespace NameA
-                    sub alertA()
-                    end sub
-                end namespace
-                namespace NameA
-                    sub info()
-                    end sub
-                    class MyClassA
-                    end class
-                end namespace
-                namespace NameA.NameB
-                    sub alertB()
-                    end sub
-                    class MyClassB
-                    end class
-                end namespace
-                namespace NameA.NameB.NameC
-                    sub alertC()
-                    end sub
-                end namespace
-            `);
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 26)).map(x => x.label).sort()
-            ).to.eql(['MyClassA', 'NameB', 'alertA', 'info']);
-
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 32)).map(x => x.label).sort()
-            ).to.eql(['MyClassB', 'NameC', 'alertB']);
-
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 38)).map(x => x.label).sort()
-            ).to.eql(['alertC']);
-        });
-
-        it('finds only namespaces that have classes, when new keyword is used', () => {
-            program.setFile('source/main.bs', `
-                sub main()
-                    a = new NameA.
-                    b = new NameA.NameB.
-                    c = new NameA.NameB.NameC.
-                end sub
-                namespace NameA
-                    sub alertA()
-                    end sub
-                end namespace
-                namespace NameA
-                    sub info()
-                    end sub
-                    class MyClassA
-                    end class
-                end namespace
-                namespace NameA.NoClassA
-                end namespace
-                namespace NameA.NoClassB
-                end namespace
-                namespace NameA.NameB
-                    sub alertB()
-                    end sub
-                    class MyClassB
-                    end class
-                end namespace
-                namespace NameA.NameB.NoClass
-                end namespace
-                namespace NameA.NameB.NameC
-                    sub alertC()
-                    end sub
-                end namespace
-            `);
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 34)).map(x => x.label).sort()
-            ).to.eql(['MyClassA', 'NameB']);
-
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 40)).map(x => x.label).sort()
-            ).to.eql(['MyClassB']);
-
-            expect(
-                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 46)).map(x => x.label).sort()
-            ).to.be.empty;
-        });
-
-        //Bron.. pain to get this working.. do we realy need this? seems moot with ropm..
-        it.skip('should include translated namespace function names for brightscript files', () => {
-            program.setFile('source/main.bs', `
-                namespace NameA.NameB.NameC
-                    sub DoSomething()
-                    end sub
-                end namespace
-            `);
-            program.setFile('source/lib.brs', `
-                sub test()
-
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/lib.brs`, Position.create(2, 23));
-            expect(completions.map(x => x.label)).to.include('NameA_NameB_NameC_DoSomething');
-        });
-
-        it('inlcudes global completions for file with no scope', () => {
-            program.setFile('main.brs', `
-                function Main()
-                    age = 1
-                end function
-            `);
-            let completions = program.getCompletions('main.brs', Position.create(2, 10));
-            expect(completions.filter(x => x.label.toLowerCase() === 'abs')).to.be.lengthOf(1);
-        });
-
-        it('filters out text results for top-level function statements', () => {
-            program.setFile('source/main.brs', `
-                function Main()
-                    age = 1
-                end function
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
-            expect(completions.filter(x => x.label === 'Main')).to.be.lengthOf(1);
-        });
-
-        it('does not filter text results for object properties used in conditional statements', () => {
-            program.setFile('source/main.brs', `
-                sub Main()
-                    p.
-                end sub
-                sub SayHello()
-                    person = {}
-                    if person.isAlive then
-                        print "Hello"
-                    end if
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 22));
-            expect(completions.filter(x => x.label === 'isAlive')).to.be.lengthOf(1);
-        });
-
-        it('does not filter text results for object properties used in assignments', () => {
-            program.setFile('source/main.brs', `
-                sub Main()
-                    p.
-                end sub
-                sub SayHello()
-                   person = {}
-                   localVar = person.name
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 22));
-            expect(completions.filter(x => x.label === 'name')).to.be.lengthOf(1);
-        });
-
-        it('does not filter text results for object properties', () => {
-            program.setFile('source/main.brs', `
-                sub Main()
-                    p.
-                end sub
-                sub SayHello()
-                   person = {}
-                   person.name = "bob"
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 22));
-            expect(completions.filter(x => x.label === 'name')).to.be.lengthOf(1);
-        });
-
-        it('filters out text results for local vars used in conditional statements', () => {
-            program.setFile('source/main.brs', `
-                sub Main()
-
-                end sub
-                sub SayHello()
-                    isTrue = true
-                    if isTrue then
-                        print "is true"
-                    end if
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
-            expect(completions.filter(x => x.label === 'isTrue')).to.be.lengthOf(0);
-        });
-
-        it('filters out text results for local variable assignments', () => {
-            program.setFile('source/main.brs', `
-                sub Main()
-
-                end sub
-                sub SayHello()
-                    message = "Hello"
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
-            expect(completions.filter(x => x.label === 'message')).to.be.lengthOf(0);
-        });
-
-        it('filters out text results for local variables used in assignments', () => {
-            program.setFile('source/main.brs', `
-                sub Main()
-
-                end sub
-                sub SayHello()
-                    message = "Hello"
-                    otherVar = message
-                end sub
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
-            expect(completions.filter(x => x.label === 'message')).to.be.lengthOf(0);
-        });
-
-        it('does not suggest local variables when initiated to the right of a period', () => {
-            program.setFile('source/main.brs', `
-                function Main()
-                    helloMessage = "jack"
-                    person.hello
-                end function
-            `);
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 32));
-            expect(completions.filter(x => x.kind === CompletionItemKind.Variable).map(x => x.label)).not.to.contain('helloMessage');
-        });
-
-        it('finds all file paths when initiated on xml uri', () => {
-            let xmlPath = s`${rootDir}/components/component1.xml`;
-            program.setFile('components/component1.xml', trim`
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="HeroScene" extends="Scene">
-                    <script type="text/brightscript" uri="" />
-                </component>
-            `);
-            program.setFile('components/component1.brs', '');
-            let completions = program.getCompletions(xmlPath, Position.create(2, 42));
-            expect(completions[0]).to.include({
-                kind: CompletionItemKind.File,
-                label: 'component1.brs'
-            });
-            expect(completions[1]).to.include({
-                kind: CompletionItemKind.File,
-                label: 'pkg:/components/component1.brs'
-            });
-            //it should NOT include the global methods
-            expect(completions).to.be.lengthOf(2);
-        });
-
-        it('get all functions and properties in scope when doing any dotted get on non m ', () => {
-            program.setFile('source/main.bs', `
-                sub main()
-                    thing.anonPropA = "foo"
-                    thing.anonPropB = "bar"
-                    thing.person
-                end sub
-                class MyClassA
-                    personName = "rafa"
-                    personAName = "rafaA"
-                    function personAMethodA()
-                    end function
-                    function personAMethodB()
-                    end function
-                end class
-                namespace NameA
-                    sub alertA()
-                    end sub
-                end namespace
-                namespace NameA.NameB
-                    sub alertB()
-                    end sub
-                    class MyClassB
-                        personName = "roger"
-                        personBName = "rogerB"
-                        function personAMethodC()
-                        end function
-                        function personBMethodA()
-                        end function
-                        function personBMethodB()
-                        end function
-                    end class
-                end namespace
-                namespace NameA.NameB.NameC
-                    sub alertC()
-                    end sub
-                end namespace
-            `);
-            //note - we let the vscode extension do the filtering, so we still return everything; otherwise it exhibits strange behaviour in the IDE
-            expect(
-                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 32))).map(x => x.label).sort()
-            ).to.eql(['anonPropA', 'anonPropB', 'person', 'personAMethodA', 'personAMethodB', 'personAMethodC', 'personAName', 'personBMethodA', 'personBMethodB', 'personBName', 'personName']);
-        });
-
-        it('get all functions and properties relevant for m ', () => {
-            program.setFile('source/main.bs', `
-                class MyClassA
-                    function new()
-                        m.
-                    end function
-                    personName = "rafa"
-                    personAName = "rafaA"
-                    function personAMethodA()
-                    end function
-                    function personAMethodB()
-                    end function
-                end class
-                class MyClassB
-                    personName = "roger"
-                    personBName = "rogerB"
-                    function personAMethodC()
-                    end function
-                    function personBMethodA()
-                    end function
-                    function personBMethodB()
-                    end function
-                end class
-                class MyClassC extends MyClassA
-                    function new()
-                        m.
-                    end function
-                    personCName = "rogerC"
-                    function personCMethodC()
-                    end function
-                    function personCMethodA()
-                    end function
-                    function personCMethodB()
-                    end function
-                end class
-                sub alertC()
-                end sub
-            `);
-            expect(
-                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 26))).map(x => x.label).sort()
-            ).to.eql(['personAMethodA', 'personAMethodB', 'personAName', 'personName']);
-            expect(
-                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(24, 26))).map(x => x.label).sort()
-            ).to.eql(['personAMethodA', 'personAMethodB', 'personAName', 'personCMethodA', 'personCMethodB', 'personCMethodC', 'personCName', 'personName']);
-        });
-
-    });
-
-    it('include non-namespaced classes in the list of general output', () => {
-        program.setFile('source/main.bs', `
-                function regularFunc()
-                    MyClass
-                end function
-                sub alertC()
-                end sub
-                class MyClassA
-                end class
-                class MyClassB
-                end class
-                class MyClassC extends MyClassA
-                end class
-            `);
-        expect(
-            (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 26))).map(x => x.label).sort()
-        ).to.include.members(['MyClassA', 'MyClassB', 'MyClassC']);
-    });
-
-    it('only include classes when using new keyword', () => {
-        program.setFile('source/main.bs', `
-                class MyClassA
-                end class
-                class MyClassB
-                end class
-                class MyClassC extends MyClassA
-                end class
-                function regularFunc()
-                    new MyClass
-                end function
-                sub alertC()
-                end sub
-            `);
-        expect(
-            (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(8, 29))).map(x => x.label).sort()
-        ).to.eql(['MyClassA', 'MyClassB', 'MyClassC']);
-    });
-
-    it('gets completions when using callfunc inovation', () => {
-        program.setFile('source/main.bs', `
-            function main()
-                myNode@.sayHello(arg1)
-            end function
-        `);
-        program.setFile('components/MyNode.bs', `
-            function sayHello(text, text2)
-            end function
-        `);
-        program.setFile<XmlFile>('components/MyNode.xml',
-            trim`<?xml version="1.0" encoding="utf-8" ?>
-            <component name="Component1" extends="Scene">
-                <script type="text/brightscript" uri="pkg:/components/MyNode.bs" />
-                <interface>
-                    <function name="sayHello"/>
-                </interface>
-            </component>`);
-        program.validate();
-
-        expect(
-            (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 30))).map(x => x.label).sort()
-        ).to.eql(['sayHello']);
-    });
-
-    it('gets completions for callfunc invocation with multiple nodes', () => {
-        program.setFile('source/main.bs', `
-            function main()
-                myNode@.sayHello(arg1)
-            end function
-        `);
-        program.setFile('components/MyNode.bs', `
-            function sayHello(text, text2)
-            end function
-            function sayHello2(text, text2)
-            end function
-        `);
-        program.setFile<XmlFile>('components/MyNode.xml',
-            trim`<?xml version="1.0" encoding="utf-8" ?>
-            <component name="Component1" extends="Scene">
-                <script type="text/brightscript" uri="pkg:/components/MyNode.bs" />
-                <interface>
-                    <function name="sayHello"/>
-                    <function name="sayHello2"/>
-                </interface>
-            </component>`);
-        program.setFile('components/MyNode2.bs', `
-            function sayHello3(text, text2)
-            end function
-            function sayHello4(text, text2)
-            end function
-        `);
-        program.setFile<XmlFile>('components/MyNode2.xml',
-            trim`<?xml version="1.0" encoding="utf-8" ?>
-            <component name="Component2" extends="Scene">
-                <script type="text/brightscript" uri="pkg:/components/MyNode2.bs" />
-                <interface>
-                    <function name="sayHello3"/>
-                    <function name="sayHello4"/>
-                </interface>
-            </component>`);
-        program.validate();
-
-        expect(
-            (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 30))).map(x => x.label).sort()
-        ).to.eql(['sayHello', 'sayHello2', 'sayHello3', 'sayHello4']);
-    });
-
-    it('gets completions for callfunc invocation with multiple nodes and validates single code completion results', () => {
-        program.setFile('source/main.bs', `
-            function main()
-                ParentNode@.sayHello(arg1)
-            end function
-        `);
-        program.setFile('components/ParentNode.bs', `
-            function sayHello(text, text2)
-            end function
-        `);
-        program.setFile<XmlFile>('components/ParentNode.xml',
-            trim`<?xml version="1.0" encoding="utf-8" ?>
-            <component name="ParentNode" extends="Scene">
-                <script type="text/brightscript" uri="pkg:/components/ParentNode.bs" />
-                <interface>
-                    <function name="sayHello"/>
-                </interface>
-            </component>`);
-        program.setFile('components/ChildNode.bs', `
-            function sayHello(text, text2)
-            end function
-        `);
-        program.setFile<XmlFile>('components/ChildNode.xml',
-            trim`<?xml version="1.0" encoding="utf-8" ?>
-            <component name="ChildNode" extends="ParentNode">
-                <script type="text/brightscript" uri="pkg:/components/ChildNode.bs" />
-            </component>`);
-        program.validate();
-
-        expect(
-            (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 30))).map(x => x.label).sort()
-        ).to.eql(['sayHello']);
-    });
 
-    it('gets completions for extended nodes with callfunc invocation - ensure overridden methods included', () => {
-        program.setFile('source/main.bs', `
-            function main()
-                myNode@.sayHello(arg1)
-            end function
-        `);
-        program.setFile('components/MyNode.bs', `
-            function sayHello(text, text2)
-            end function
-            function sayHello2(text, text2)
-            end function
-        `);
-        program.setFile<XmlFile>('components/MyNode.xml',
-            trim`<?xml version="1.0" encoding="utf-8" ?>
-            <component name="Component1" extends="Scene">
-                <script type="text/brightscript" uri="pkg:/components/MyNode.bs" />
-                <interface>
-                    <function name="sayHello"/>
-                    <function name="sayHello2"/>
-                </interface>
-            </component>`);
-        program.setFile('components/MyNode2.bs', `
-            function sayHello3(text, text2)
-            end function
-            function sayHello2(text, text2)
-            end function
-            function sayHello4(text, text2)
-            end function
-        `);
-        program.setFile<XmlFile>('components/MyNode2.xml',
-            trim`<?xml version="1.0" encoding="utf-8" ?>
-            <component name="Component2" extends="Component1">
-                <script type="text/brightscript" uri="pkg:/components/MyNode2.bs" />
-                <interface>
-                    <function name="sayHello3"/>
-                    <function name="sayHello4"/>
-                </interface>
-            </component>`);
-        program.validate();
+        it('does not crash when a diagnostic is missing a URI', () => {
+            const file = program.setFile('source/main.brs', '');
+            const diagnostic = {
+                message: 'crash',
+                location: { uri: util.pathToUri(file.srcPath), range: util.createRange(1, 2, 3, 4) }
+            };
+            program.diagnostics.register(diagnostic);
+            //delete the uri
+            diagnostic.location.uri = undefined;
 
-        expect(
-            (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 30))).map(x => x.label).sort()
-        ).to.eql(['sayHello', 'sayHello2', 'sayHello3', 'sayHello4']);
+            doesNotThrow(() => {
+                program.getCodeActions('source/main.brs', util.createRange(1, 2, 3, 4));
+            });
+        });
     });
 
     describe('xml inheritance', () => {
@@ -1853,7 +1583,7 @@ describe('Program', () => {
             `);
 
             //the component scope should only have the xml file
-            expect(program.getScopeByName(xmlFile.pkgPath).getOwnFiles().length).to.equal(1);
+            expect(program.getScopeByName(xmlFile.destPath).getOwnFiles().length).to.equal(1);
 
             //create the lib file
             let libFile = program.setFile('source/lib.brs', `'comment`);
@@ -1865,7 +1595,7 @@ describe('Program', () => {
                     <script type="text/brightscript" uri="pkg:/source/lib.brs" />
                 </component>
             `);
-            let scope = program.getScopeByName(xmlFile.pkgPath);
+            let scope = program.getScopeByName(xmlFile.destPath);
             //the component scope should have the xml file AND the lib file
             expect(scope.getOwnFiles().length).to.equal(2);
             expect(scope.getFile(xmlFile.srcPath)).to.exist;
@@ -1879,28 +1609,17 @@ describe('Program', () => {
             `);
 
             //the scope should again only have the xml file loaded
-            expect(program.getScopeByName(xmlFile.pkgPath).getOwnFiles().length).to.equal(1);
-            expect(program.getScopeByName(xmlFile.pkgPath)).to.exist;
-        });
-    });
-
-    describe('getFileByPkgPath', () => {
-        it('finds file in source folder', () => {
-            expect(program.getFileByPkgPath(s`source/main.brs`)).not.to.exist;
-            expect(program.getFileByPkgPath(s`source/main2.brs`)).not.to.exist;
-            program.setFile('source/main2.brs', '');
-            program.setFile('source/main.brs', '');
-            expect(program.getFileByPkgPath(s`source/main.brs`)).to.exist;
-            expect(program.getFileByPkgPath(s`source/main2.brs`)).to.exist;
+            expect(program.getScopeByName(xmlFile.destPath).getOwnFiles().length).to.equal(1);
+            expect(program.getScopeByName(xmlFile.destPath)).to.exist;
         });
     });
 
     describe('removeFiles', () => {
         it('removes files by absolute paths', () => {
             program.setFile('source/main.brs', '');
-            expect(program.getFileByPkgPath(s`source/main.brs`)).to.exist;
+            expect(program.getFile(s`source/main.brs`)).to.exist;
             program.removeFiles([`${rootDir}/source/main.brs`]);
-            expect(program.getFileByPkgPath(s`source/main.brs`)).not.to.exist;
+            expect(program.getFile(s`source/main.brs`)).not.to.exist;
         });
     });
 
@@ -1913,10 +1632,13 @@ describe('Program', () => {
             `);
             //the file should be included in the program
             expect(program.getFile('components/a/b/c/main.brs')).to.exist;
-            let diagnostics = program.getDiagnostics();
-            expectHasDiagnostics(diagnostics);
-            let parseError = diagnostics.filter(x => x.message === 'Unterminated string at end of line')[0];
-            expect(parseError).to.exist;
+            expectDiagnostics(program, [
+                DiagnosticMessages.expectedStatement(),
+                {
+                    ...DiagnosticMessages.unterminatedString(),
+                    location: util.createLocation(2, 20, 2, 49, s`${rootDir}/components/a/b/c/main.brs`)
+                }
+            ]);
         });
 
         it('it excludes specified error codes', () => {
@@ -1924,7 +1646,7 @@ describe('Program', () => {
             program.setFile('source/main.brs', `
                 sub A()
                     'call with wrong param count
-                    B(1,2,3)
+                    B("one", "two")
 
                     'call unknown function
                     C()
@@ -1945,6 +1667,33 @@ describe('Program', () => {
                 DiagnosticMessages.cannotFindFunction('C')
             ]);
         });
+
+        it('attaches locationless diagnostic to the nearest xml file', () => {
+            const xmlFile = program.setFile('components/MainScene.xml', trim`
+                <component name="MainScene" extends="Scene">
+                </component>
+            `);
+            program.diagnostics.register({
+                message: 'test'
+            } as any, {
+                scope: program.getFirstScopeForFile(xmlFile)
+            });
+            expectDiagnostics(program, [{
+                message: 'test (location unknown, added here for visibility)',
+                location: util.createLocation(0, 0, 0, 100, xmlFile.srcPath)
+            }]);
+        });
+
+        it('attaches locationless diagnostic to the nearest manifest file', () => {
+            const manifestFile = program.setFile('manifest', trim``);
+            program.diagnostics.register({
+                message: 'test'
+            } as any);
+            expectDiagnostics(program, [{
+                message: 'test (location unknown, added here for visibility)',
+                location: util.createLocation(0, 0, 0, 100, manifestFile.srcPath)
+            }]);
+        });
     });
 
     describe('getCompletions', () => {
@@ -1992,7 +1741,7 @@ describe('Program', () => {
 
             program.validate();
 
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, util.createPosition(2, 10));
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, util.createPosition(3, 10));
             let labels = completions.map(x => pick(x, 'label'));
 
             expect(labels).to.deep.include({ label: 'Main' });
@@ -2003,15 +1752,15 @@ describe('Program', () => {
             expect(labels).to.deep.include({ label: 'shoeSize' });
         });
 
-        it('returns empty set when out of range', () => {
-            const position = util.createPosition(99, 99);
-            program.setFile('source/main.brs', '');
-            let completions = program.getCompletions(`${rootDir}/source/main.brs`, position);
-            //get the name of all global completions
-            const globalCompletions = program.globalScope.getAllFiles().flatMap(x => x.getCompletions(position)).map(x => x.label);
-            //filter out completions from global scope
-            completions = completions.filter(x => !globalCompletions.includes(x.label));
-            expect(completions).to.be.empty;
+        it.skip('returns empty set when out of range', () => {
+            // const position = util.createPosition(99, 99);
+            // program.setFile('source/main.brs', '');
+            // let completions = program.getCompletions(`${rootDir}/source/main.brs`, position);
+            // //get the name of all global completions
+            // const globalCompletions = program.globalScope.getAllFiles().flatMap(x => (x as BrsFile).getCompletions(position)).map(x => x.label);
+            // //filter out completions from global scope
+            // completions = completions.filter(x => !globalCompletions.includes(x.label));
+            // expect(completions).to.be.empty;
         });
 
         it('finds parameters', () => {
@@ -2022,6 +1771,7 @@ describe('Program', () => {
                     shoeSize = 10
                 end sub
             `);
+            program.validate();
             let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
             let labels = completions.map(x => pick(x, 'label'));
 
@@ -2030,19 +1780,19 @@ describe('Program', () => {
     });
 
     it('does not create map by default', async () => {
-        fsExtra.ensureDirSync(program.options.stagingDir!);
+        fsExtra.ensureDirSync(program.options.outDir!);
         program.setFile('source/main.brs', `
             sub main()
             end sub
         `);
         program.validate();
-        await program.transpile([], program.options.stagingDir!);
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/source/main.brs`)).is.true;
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/source/main.brs.map`)).is.false;
+        await program.build({ outDir: program.options.outDir });
+        expect(fsExtra.pathExistsSync(s`${outDir}/source/main.brs`)).is.true;
+        expect(fsExtra.pathExistsSync(s`${outDir}/source/main.brs.map`)).is.false;
     });
 
     it('creates sourcemap for brs and xml files', async () => {
-        fsExtra.ensureDirSync(program.options.stagingDir!);
+        fsExtra.ensureDirSync(program.options.outDir!);
         program.setFile('source/main.brs', `
             sub main()
             end sub
@@ -2054,41 +1804,37 @@ describe('Program', () => {
         `);
         program.validate();
 
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/source/main.brs.map`)).is.false;
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/components/comp1.xml.map`)).is.false;
+        expect(fsExtra.pathExistsSync(s`${outDir}/source/main.brs.map`)).is.false;
+        expect(fsExtra.pathExistsSync(s`${outDir}/components/comp1.xml.map`)).is.false;
 
-        let filePaths = [{
-            src: s`${rootDir}/source/main.brs`,
-            dest: s`source/main.brs`
-        }, {
-            src: s`${rootDir}/components/comp1.xml`,
-            dest: s`components/comp1.xml`
-        }];
         program.options.sourceMap = true;
-        await program.transpile(filePaths, program.options.stagingDir!);
+        await program.build({
+            files: program.getFiles([s`${rootDir}/source/main.brs`, s`${rootDir}/components/comp1.xml`]),
+            outDir: program.options.outDir
+        });
 
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/source/main.brs.map`)).is.true;
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/components/comp1.xml.map`)).is.true;
+        expect(fsExtra.pathExistsSync(s`${outDir}/source/main.brs.map`)).is.true;
+        expect(fsExtra.pathExistsSync(s`${outDir}/components/comp1.xml.map`)).is.true;
     });
 
     describe('sourcemap source paths', () => {
-        async function transpileFile(options: BsConfig, pkgPath = 'source/main.bs') {
-            fsExtra.ensureDirSync(program.options.stagingDir!);
+        const stagingDir = outDir;
+        async function transpileFile(options: BsConfig, destPath = 'source/main.bs') {
+            fsExtra.ensureDirSync(stagingDir);
+            program.dispose();
             program = new Program({
                 rootDir: rootDir,
-                stagingDir: stagingDir,
+                outDir: stagingDir,
                 sourceMap: true,
                 ...options
             });
-            program.setFile(pkgPath, `
+            program.setFile(destPath, `
                 sub main()
                 end sub
             `);
             program.validate();
-            const src = s`${rootDir}/${pkgPath}`;
-            const dest = pkgPath.replace(/\.bs$/, '.brs');
-            await program.transpile([{ src: src, dest: dest }], stagingDir);
-            const mapPath = s`${stagingDir}/${dest}.map`;
+            await program.build({ outDir: stagingDir });
+            const mapPath = s`${stagingDir}/${destPath.replace(/\.bs$/, '.brs')}.map`;
             return JSON.parse(fsExtra.readFileSync(mapPath, 'utf8'));
         }
 
@@ -2186,9 +1932,10 @@ describe('Program', () => {
             it('sources[] is unaffected for files outside rootDir', async () => {
                 // a file whose srcPath doesn't start with rootDir should not be rewritten
                 fsExtra.ensureDirSync(stagingDir);
+                program.dispose();
                 program = new Program({
                     rootDir: rootDir,
-                    stagingDir: stagingDir,
+                    outDir: stagingDir,
                     sourceMap: true,
                     sourceRoot: s`${rootDir}/../sourceRootFolder`
                 });
@@ -2196,10 +1943,7 @@ describe('Program', () => {
                 fsExtra.outputFileSync(outsidePath, 'sub main()\nend sub\n');
                 program.setFile({ src: outsidePath, dest: 'source/main.brs' }, fsExtra.readFileSync(outsidePath, 'utf8'));
                 program.validate();
-                await program.transpile([{
-                    src: outsidePath,
-                    dest: 'source/main.brs'
-                }], stagingDir);
+                await program.build({ outDir: stagingDir });
                 const map = JSON.parse(fsExtra.readFileSync(s`${stagingDir}/source/main.brs.map`, 'utf8'));
                 // path outside rootDir is left as-is (absolute, under its real location)
                 expect(s`${map.sources[0]}`).to.eql(outsidePath);
@@ -2212,6 +1956,7 @@ describe('Program', () => {
         // BrighterScript must apply that incoming map so the final output traces all the
         // way to the original source — not just to the intermediate file.
 
+        const stagingDir = outDir;
         let prebuildBrsMapJson: string;
         let prebuildXmlMapJson: string;
         const brsSource = 'sub main()\n    print "hello"\nend sub';
@@ -2245,13 +1990,14 @@ describe('Program', () => {
 
         async function assertBrsOutputMapChainsToOriginal() {
             program.validate();
-            await program.transpile([{ src: s`${rootDir}/source/main.brs`, dest: s`source/main.brs` }], stagingDir);
+            await program.build({ outDir: stagingDir });
 
             const outputMapPath = s`${stagingDir}/source/main.brs.map`;
             expect(fsExtra.pathExistsSync(outputMapPath)).is.true;
             const outputMapJson = JSON.parse(fsExtra.readFileSync(outputMapPath, 'utf8'));
 
-            // Program._getTranspiledFileContents chains the input map via applySourceMap.
+            // FileSerializer.chainInputSourceMap loads the input map (co-located file or
+            // sourceMappingURL comment) and applies it onto the generated output map.
             await SourceMapConsumer.with(outputMapJson, null, (consumer) => {
                 const pos = consumer.originalPositionFor({ line: 2, column: 4 });
                 expect(pos.source, 'output map should chain back to original.bs').to.include('original.bs');
@@ -2261,7 +2007,7 @@ describe('Program', () => {
 
         async function assertXmlOutputMapChainsToOriginal() {
             program.validate();
-            await program.transpile([{ src: s`${rootDir}/components/comp1.xml`, dest: s`components/comp1.xml` }], stagingDir);
+            await program.build({ outDir: stagingDir });
 
             const outputMapPath = s`${stagingDir}/components/comp1.xml.map`;
             expect(fsExtra.pathExistsSync(outputMapPath)).is.true;
@@ -2341,7 +2087,7 @@ describe('Program', () => {
             program.validate();
             expectZeroDiagnostics(program);
             // Should complete without throwing
-            await program.transpile([{ src: s`${rootDir}/source/main.brs`, dest: 'source/main.brs' }], stagingDir);
+            await program.build({ outDir: stagingDir });
 
             const outputMapPath = s`${stagingDir}/source/main.brs.map`;
             expect(fsExtra.pathExistsSync(outputMapPath)).is.true;
@@ -2363,7 +2109,7 @@ describe('Program', () => {
 
             program.setFile({ src: s`${rootDir}/source/main.brs`, dest: 'source/main.brs' }, brsSource);
             program.validate();
-            await program.transpile([{ src: s`${rootDir}/source/main.brs`, dest: 'source/main.brs' }], stagingDir);
+            await program.build({ outDir: stagingDir });
 
             expect(fsExtra.pathExistsSync(s`${stagingDir}/source/main.brs.map`)).is.false;
         });
@@ -2414,22 +2160,26 @@ describe('Program', () => {
     });
 
     it('copies the bslib.brs file', async () => {
-        fsExtra.ensureDirSync(program.options.stagingDir!);
+        fsExtra.ensureDirSync(program.options.outDir!);
         program.validate();
 
-        await program.transpile([], program.options.stagingDir!);
+        await program.build({
+            outDir: program.options.outDir
+        });
 
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/source/bslib.brs`)).is.true;
+        expect(fsExtra.pathExistsSync(s`${outDir}/source/bslib.brs`)).is.true;
     });
 
     it('copies the bslib.brs file to optionally specified directory', async () => {
-        fsExtra.ensureDirSync(program.options.stagingDir!);
+        fsExtra.ensureDirSync(program.options.outDir!);
         program.options.bslibDestinationDir = 'source/opt';
         program.validate();
 
-        await program.transpile([], program.options.stagingDir!);
+        await program.build({
+            outDir: program.options.outDir
+        });
 
-        expect(fsExtra.pathExistsSync(s`${stagingDir}/source/opt/bslib.brs`)).is.true;
+        expect(fsExtra.pathExistsSync(s`${outDir}/source/opt/bslib.brs`)).is.true;
     });
 
     describe('getTranspiledFileContents', () => {
@@ -2441,39 +2191,55 @@ describe('Program', () => {
             `);
             const plugin = program.plugins.add({
                 name: 'TestPlugin',
-                beforeFileTranspile: (event) => {
+                beforePrepareFile: (event) => {
+                    //getTranspiledFileContents triggers a build which prepares every file in the
+                    //program (including the auto-injected bslib), so guard the assumption about
+                    //AST shape to the file we actually authored
+                    if (event.file !== file) {
+                        return;
+                    }
                     const stmt = ((event.file as BrsFile).ast.statements[0] as FunctionStatement).func.body.statements[0] as PrintStatement;
-                    event.editor.setProperty((stmt.expressions[0] as LiteralExpression).token, 'text', '"hello there"');
+                    event.editor.setProperty((stmt.expressions[0] as LiteralExpression).tokens.value, 'text', '"hello there"');
                 },
-                afterFileTranspile: sinon.spy()
+                afterPrepareFile: sinon.spy()
             });
+            const result = await program.getTranspiledFileContents(file.srcPath);
             expect(
-                (await program.getTranspiledFileContents(file.srcPath)).code
+                result.code
             ).to.eql(trim`
                 sub main()
                     print "hello there"
                 end sub`
             );
-            expect(plugin.afterFileTranspile.callCount).to.be.greaterThan(0);
+            expect(plugin.afterPrepareFile.callCount).to.be.greaterThan(0);
         });
 
         it('allows events to modify the file contents', async () => {
             program.options.emitDefinitions = true;
             program.plugins.add({
                 name: 'TestPlugin',
-                afterFileTranspile: (event) => {
-                    event.code = `'code comment\n${event.code}`;
-                    event.typedef = `'typedef comment\n${event.typedef}`;
+                afterSerializeFile: (event) => {
+                    if (event.file.pkgPath.endsWith('lib.brs')) {
+                        const fileResult = event.result.get(event.file);
+
+                        const brsFile = fileResult.find(x => x.pkgPath.endsWith('lib.brs'));
+                        brsFile.data = Buffer.from(`'code comment\n${brsFile.data.toString()}`);
+
+                        const dbsFile = fileResult.find(x => x.pkgPath.endsWith('lib.d.bs'));
+                        dbsFile.data = Buffer.from(`'typedef comment\n${dbsFile.data.toString()}`);
+                    }
                 }
-            });
+            } as CompilerPlugin);
             program.setFile('source/lib.bs', `
                 sub log(message)
                     print message
                 end sub
             `);
-            await program.transpile([], stagingDir);
+            await program.build({
+                outDir: outDir
+            });
             expect(
-                fsExtra.readFileSync(`${stagingDir}/source/lib.brs`).toString().trimEnd()
+                fsExtra.readFileSync(`${outDir}/source/lib.brs`).toString().trimEnd()
             ).to.eql(trim`
                 'code comment
                 sub log(message)
@@ -2481,7 +2247,7 @@ describe('Program', () => {
                 end sub`
             );
             expect(
-                fsExtra.readFileSync(`${stagingDir}/source/lib.d.bs`).toString().trimEnd()
+                fsExtra.readFileSync(`${outDir}/source/lib.d.bs`).toString().trimEnd()
             ).to.eql(trim`
                 'typedef comment
                 sub log(message)
@@ -2489,8 +2255,14 @@ describe('Program', () => {
             `);
         });
     });
-
-    it('beforeProgramTranspile sends entries in alphabetical order', () => {
+    it('beforeBuildProgram sends entries in alphabetical order', async () => {
+        const destPaths: string[] = [];
+        program.plugins.add({
+            name: 'test',
+            beforePrepareFile: (e) => {
+                destPaths.push(e.file.destPath);
+            }
+        });
         program.setFile('source/main.bs', trim`
             sub main()
                 print "hello world"
@@ -2503,87 +2275,41 @@ describe('Program', () => {
             end sub
         `);
 
-        //send the files out of order
-        const result = program['beforeProgramTranspile']([{
-            src: s`${rootDir}/source/main.bs`,
-            dest: 'source/main.bs'
-        }, {
-            src: s`${rootDir}/source/common.bs`,
-            dest: 'source/common.bs'
-        }], program.options.stagingDir);
+        await program['prepare'](Object.values(program.files));
 
         //entries should now be in alphabetic order
         expect(
-            result.entries.map(x => x.outputPath)
+            destPaths
         ).to.eql([
-            s`${stagingDir}/source/common.brs`,
-            s`${stagingDir}/source/main.brs`
+            s`source/common.bs`,
+            s`source/main.bs`
         ]);
     });
 
     describe('transpile', () => {
-        it('detects and transpiles files added between beforeProgramTranspile and afterProgramTranspile', async () => {
-            program.setFile('source/main.bs', trim`
-                sub main()
-                    print "hello world"
-                end sub
-            `);
-            program.plugins.add({
-                name: 'TestPlugin',
-                beforeFileTranspile: (event) => {
-                    if (isBrsFile(event.file)) {
-                        //add lib1
-                        if (event.outputPath.endsWith('main.brs')) {
-                            event.program.setFile('source/lib1.bs', `
-                                sub lib1()
-                                end sub
-                            `);
-                        }
-                        //add lib2 (this should happen during the next cycle of "catch missing files" cycle
-                        if (event.outputPath.endsWith('main.brs')) {
-                            //add another file
-                            event.program.setFile('source/lib2.bs', `
-                                sub lib2()
-                                end sub
-                            `);
-                        }
-                    }
-                }
-            });
-            await program.transpile([], stagingDir);
-            //our new files should exist
-            expect(
-                fsExtra.readFileSync(`${stagingDir}/source/lib1.brs`).toString()
-            ).to.eql(trim`
-                sub lib1()
-                end sub
-            `);
-            //our changes should be there
-            expect(
-                fsExtra.readFileSync(`${stagingDir}/source/lib2.brs`).toString()
-            ).to.eql(trim`
-                sub lib2()
-                end sub
-            `);
-        });
-
         it('sets needsTranspiled=true when there is at least one edit', async () => {
-            program.setFile('source/main.brs', trim`
+            const file = program.setFile('source/main.brs', trim`
                 sub main()
                     print "hello world"
                 end sub
             `);
             program.plugins.add({
                 name: 'TestPlugin',
-                beforeFileTranspile: (event) => {
+                beforePrepareFile: (event) => {
+                    //skip the auto-injected bslib that the build pipeline also prepares
+                    if (event.file !== file) {
+                        return;
+                    }
                     const stmt = ((event.file as BrsFile).ast.statements[0] as FunctionStatement).func.body.statements[0] as PrintStatement;
-                    event.editor.setProperty((stmt.expressions[0] as LiteralExpression).token, 'text', '"hello there"');
+                    event.editor.setProperty((stmt.expressions[0] as LiteralExpression).tokens.value, 'text', '"hello there"');
                 }
             });
-            await program.transpile([], stagingDir);
+            await program.build({
+                outDir: outDir
+            });
             //our changes should be there
             expect(
-                fsExtra.readFileSync(`${stagingDir}/source/main.brs`).toString()
+                fsExtra.readFileSync(`${outDir}/source/main.brs`).toString()
             ).to.eql(trim`
                 sub main()
                     print "hello there"
@@ -2591,8 +2317,8 @@ describe('Program', () => {
             );
         });
 
-        it('handles AstEditor flow properly', async () => {
-            program.setFile('source/main.bs', `
+        it('handles Editor flow properly', async () => {
+            const file = program.setFile('source/main.bs', `
                 sub main()
                     print "hello world"
                 end sub
@@ -2601,12 +2327,12 @@ describe('Program', () => {
             //replace all strings with "goodbye world"
             program.plugins.add({
                 name: 'TestPlugin',
-                beforeFileTranspile: (event) => {
-                    if (isBrsFile(event.file)) {
+                beforePrepareFile: (event) => {
+                    if (event.file === file && isBrsFile(event.file)) {
                         event.file.ast.walk(createVisitor({
                             LiteralExpression: (literal) => {
                                 literalExpression = literal;
-                                event.editor.setProperty(literal.token, 'text', '"goodbye world"');
+                                event.editor.setProperty(literal.tokens.value, 'text', '"goodbye world"');
                             }
                         }), {
                             walkMode: WalkMode.visitExpressionsRecursive
@@ -2615,10 +2341,12 @@ describe('Program', () => {
                 }
             });
             //transpile the file
-            await program.transpile([], stagingDir);
+            await program.build({
+                outDir: outDir
+            });
             //our changes should be there
             expect(
-                fsExtra.readFileSync(`${stagingDir}/source/main.brs`).toString()
+                fsExtra.readFileSync(`${outDir}/source/main.brs`).toString()
             ).to.eql(trim`
                 sub main()
                     print "goodbye world"
@@ -2626,10 +2354,10 @@ describe('Program', () => {
             );
 
             //our literalExpression should have been restored to its original value
-            expect(literalExpression!.token.text).to.eql('"hello world"');
+            expect(literalExpression!.tokens.value.text).to.eql('"hello world"');
         });
 
-        it('handles AstEditor for beforeProgramTranspile', async () => {
+        it('handles Editor for beforeBuildProgram', async () => {
             const file = program.setFile<BrsFile>('source/main.bs', `
                 sub main()
                     print "hello world"
@@ -2639,11 +2367,11 @@ describe('Program', () => {
             //replace all strings with "goodbye world"
             program.plugins.add({
                 name: 'TestPlugin',
-                beforeProgramTranspile: (program: Program, entries: TranspileObj[], editor: AstEditor) => {
+                beforePrepareProgram: (event) => {
                     file.ast.walk(createVisitor({
                         LiteralExpression: (literal) => {
                             literalExpression = literal;
-                            editor.setProperty(literal.token, 'text', '"goodbye world"');
+                            event.editor.setProperty(literal.tokens.value, 'text', '"goodbye world"');
                         }
                     }), {
                         walkMode: WalkMode.visitExpressionsRecursive
@@ -2651,10 +2379,12 @@ describe('Program', () => {
                 }
             });
             //transpile the file
-            await program.transpile([], stagingDir);
+            await program.build({
+                outDir: outDir
+            });
             //our changes should be there
             expect(
-                fsExtra.readFileSync(`${stagingDir}/source/main.brs`).toString()
+                fsExtra.readFileSync(`${outDir}/source/main.brs`).toString()
             ).to.eql(trim`
                 sub main()
                     print "goodbye world"
@@ -2662,19 +2392,23 @@ describe('Program', () => {
             );
 
             //our literalExpression should have been restored to its original value
-            expect(literalExpression!.token.text).to.eql('"hello world"');
+            expect(literalExpression!.tokens.value.text).to.eql('"hello world"');
         });
 
-        it('copies bslib.brs when no ropm version was found', async () => {
-            await program.transpile([], stagingDir);
-            expect(fsExtra.pathExistsSync(`${stagingDir}/source/bslib.brs`)).to.be.true;
+        it('copies the embedded version of bslib.brs when a version from ropm is not found', async () => {
+            await program.build({
+                outDir: outDir
+            });
+            expect(fsExtra.pathExistsSync(`${outDir}/source/bslib.brs`)).to.be.true;
         });
 
         it('does not copy bslib.brs when found in roku_modules', async () => {
             program.setFile('source/roku_modules/bslib/bslib.brs', '');
-            await program.transpile([], stagingDir);
-            expect(fsExtra.pathExistsSync(`${stagingDir}/source/bslib.brs`)).to.be.false;
-            expect(fsExtra.pathExistsSync(`${stagingDir}/source/roku_modules/bslib/bslib.brs`)).to.be.true;
+            await program.build({
+                outDir: outDir
+            });
+            expect(fsExtra.pathExistsSync(`${outDir}/source/bslib.brs`)).to.be.false;
+            expect(fsExtra.pathExistsSync(`${outDir}/source/roku_modules/bslib/bslib.brs`)).to.be.true;
         });
 
         it('transpiles in-memory-only files', async () => {
@@ -2683,9 +2417,11 @@ describe('Program', () => {
                     print SOURCE_LINE_NUM
                 end sub
             `);
-            await program.transpile([], program.options.stagingDir!);
+            await program.build({
+                outDir: program.options.outDir
+            });
             expect(trimMap(
-                fsExtra.readFileSync(s`${stagingDir}/source/logger.brs`).toString()
+                fsExtra.readFileSync(s`${outDir}/source/logger.brs`).toString()
             )).to.eql(trim`
                 sub logInfo()
                     print 2
@@ -2693,15 +2429,17 @@ describe('Program', () => {
             `);
         });
 
-        it('copies in-memory-only .brs files to stagingDir', async () => {
+        it('copies in-memory-only .brs files to outDir', async () => {
             program.setFile('source/logger.brs', trim`
                 sub logInfo()
                     print "logInfo"
                 end sub
             `);
-            await program.transpile([], program.options.stagingDir!);
+            await program.build({
+                outDir: program.options.outDir
+            });
             expect(trimMap(
-                fsExtra.readFileSync(s`${stagingDir}/source/logger.brs`).toString()
+                fsExtra.readFileSync(s`${outDir}/source/logger.brs`).toString()
             )).to.eql(trim`
                 sub logInfo()
                     print "logInfo"
@@ -2715,9 +2453,11 @@ describe('Program', () => {
                 <component name="Component1" extends="Scene">
                 </component>
             `);
-            await program.transpile([], program.options.stagingDir!);
+            await program.build({
+                outDir: program.options.outDir
+            });
             expect(trimMap(
-                fsExtra.readFileSync(s`${stagingDir}/components/Component1.xml`).toString()
+                fsExtra.readFileSync(s`${outDir}/components/Component1.xml`).toString()
             )).to.eql(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
@@ -2733,9 +2473,11 @@ describe('Program', () => {
                 <component name="Component1" extends="Scene">
                 </component>
             `);
-            await program.transpile([], program.options.stagingDir!);
+            await program.build({
+                outDir: program.options.outDir
+            });
             expect(trimMap(
-                fsExtra.readFileSync(s`${stagingDir}/components/Component1.xml`).toString()
+                fsExtra.readFileSync(s`${outDir}/components/Component1.xml`).toString()
             )).to.eql(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
@@ -2748,20 +2490,20 @@ describe('Program', () => {
             let sourceRoot = s`${tempDir}/sourceRootFolder`;
             program = new Program({
                 rootDir: rootDir,
-                stagingDir: stagingDir,
+                outDir: outDir,
                 sourceRoot: sourceRoot,
                 sourceMap: true
             });
-            program.setFile('source/main.brs', `
+            const main = program.setFile('source/main.brs', `
                 sub main()
                 end sub
             `);
-            await program.transpile([{
-                src: s`${rootDir}/source/main.brs`,
-                dest: s`source/main.brs`
-            }], stagingDir);
+            await program.build({
+                files: [main],
+                outDir: outDir
+            });
 
-            let contents = fsExtra.readFileSync(s`${stagingDir}/source/main.brs.map`).toString();
+            let contents = fsExtra.readFileSync(s`${outDir}/source/main.brs.map`).toString();
             let map = JSON.parse(contents);
             // legacy behavior: sources[] contains the absolute path with rootDir swapped for sourceRoot
             expect(s`${map.sources[0]}`).to.eql(s`${sourceRoot}/source/main.brs`);
@@ -2772,7 +2514,7 @@ describe('Program', () => {
             let sourceRoot = s`${tempDir}/sourceRootFolder`;
             program = new Program({
                 rootDir: rootDir,
-                stagingDir: stagingDir,
+                outDir: outDir,
                 sourceRoot: sourceRoot,
                 sourceMap: true
             });
@@ -2780,12 +2522,12 @@ describe('Program', () => {
                 sub main()
                 end sub
             `);
-            await program.transpile([{
-                src: s`${rootDir}/source/main.bs`,
-                dest: s`source/main.bs`
-            }], stagingDir);
+            await program.build({
+                files: [program.getFile('source/main.bs')],
+                outDir: outDir
+            });
 
-            let contents = fsExtra.readFileSync(s`${stagingDir}/source/main.brs.map`).toString();
+            let contents = fsExtra.readFileSync(s`${outDir}/source/main.brs.map`).toString();
             let map = JSON.parse(contents);
             // legacy behavior: sources[] contains the absolute path with rootDir swapped for sourceRoot
             expect(s`${map.sources[0]}`).to.eql(s`${sourceRoot}/source/main.bs`);
@@ -2796,7 +2538,7 @@ describe('Program', () => {
             let sourceRoot = s`${tempDir}/sourceRootFolder`;
             program = new Program({
                 rootDir: rootDir,
-                stagingDir: stagingDir,
+                outDir: outDir,
                 sourceRoot: sourceRoot,
                 sourceMap: true,
                 pruneEmptyCodeFiles: true
@@ -2814,19 +2556,10 @@ describe('Program', () => {
                     ? "The night is " + mainstyle.dark + " and full of terror"
                 end sub
             `);
-            await program.transpile([
-                {
-                    src: s`${rootDir}/source/main.bs`,
-                    dest: s`source/main.bs`
-                },
-                {
-                    src: s`${rootDir}/source/types.bs`,
-                    dest: s`source/types.bs`
-                }
-            ], stagingDir);
+            await program.build();
 
             expect(trimMap(
-                fsExtra.readFileSync(s`${stagingDir}/source/main.brs`).toString()
+                fsExtra.readFileSync(s`${outDir}/source/main.brs`).toString()
             )).to.eql(trim`
                 'import "pkg:/source/types.bs"
 
@@ -2834,7 +2567,7 @@ describe('Program', () => {
                     ? "The night is " + "dark" + " and full of terror"
                 end sub
             `);
-            expect(fsExtra.pathExistsSync(s`${stagingDir}/source/types.brs`)).to.be.false;
+            expect(fsExtra.pathExistsSync(s`${outDir}/source/types.brs`)).to.be.false;
         });
     });
 
@@ -2847,11 +2580,13 @@ describe('Program', () => {
                 `);
                 program.options.emitDefinitions = true;
                 program.validate();
-                await program.transpile([], stagingDir);
+                await program.build({
+                    outDir: outDir
+                });
 
-                expect(fsExtra.pathExistsSync(s`${stagingDir}/source/Duck.brs`)).to.be.true;
-                expect(fsExtra.pathExistsSync(s`${stagingDir}/source/Duck.d.bs`)).to.be.true;
-                expect(fsExtra.pathExistsSync(s`${stagingDir}/source/Duck.d.brs`)).to.be.false;
+                expect(fsExtra.pathExistsSync(s`${outDir}/source/Duck.brs`)).to.be.true;
+                expect(fsExtra.pathExistsSync(s`${outDir}/source/Duck.d.bs`)).to.be.true;
+                expect(fsExtra.pathExistsSync(s`${outDir}/source/Duck.d.brs`)).to.be.false;
             });
 
             it('does not generate typedef for typedef file', async () => {
@@ -2861,10 +2596,12 @@ describe('Program', () => {
                 `);
                 program.options.emitDefinitions = true;
                 program.validate();
-                await program.transpile([], stagingDir);
+                await program.build({
+                    outDir: outDir
+                });
 
-                expect(fsExtra.pathExistsSync(s`${stagingDir}/source/Duck.d.brs`)).to.be.false;
-                expect(fsExtra.pathExistsSync(s`${stagingDir}/source/Duck.brs`)).to.be.false;
+                expect(fsExtra.pathExistsSync(s`${outDir}/source/Duck.d.brs`)).to.be.false;
+                expect(fsExtra.pathExistsSync(s`${outDir}/source/Duck.brs`)).to.be.false;
             });
         });
 
@@ -3156,15 +2893,15 @@ describe('Program', () => {
                         outer([inner(["apple"], 100)], 12)
                     end sub
 
-                    sub outer(name as string, age as integer)
+                    sub outer(name as object, age as integer)
                     end sub
 
-                    sub inner(fruits as object, age as integer)
-                    end sub
+                    function inner(fruits as object, age as integer)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(2, 36, 'sub outer(name as string, age as integer)', 0);
+                assertSignatureHelp(2, 36, 'sub outer(name as object, age as integer)', 0);
             });
 
             it('gets signature info for the outer function - index 1', () => {
@@ -3173,15 +2910,15 @@ describe('Program', () => {
                         outer([inner(["apple"], 100)], 12)
                     end sub
 
-                    sub outer(name as string, age as integer)
+                    sub outer(name as object, age as integer)
                     end sub
 
-                    sub inner(fruits as object, age as integer)
-                    end sub
+                    function inner(fruits as object, age as integer)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(2, 57, 'sub outer(name as string, age as integer)', 1);
+                assertSignatureHelp(2, 57, 'sub outer(name as object, age as integer)', 1);
             });
 
             it('gets signature info for the inner function - name', () => {
@@ -3190,15 +2927,15 @@ describe('Program', () => {
                         outer([inner(["apple"], 100)], 12)
                     end sub
 
-                    sub outer(name as string, age as integer)
+                    sub outer(name as object, age as integer)
                     end sub
 
-                    sub inner(fruits as object, age as integer)
-                    end sub
+                    function inner(fruits as object, age as integer)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(2, 43, 'sub inner(fruits as object, age as integer)', 0);
+                assertSignatureHelp(2, 43, 'function inner(fruits as object, age as integer)', 0);
             });
 
             it('gets signature info for the inner function - param 0', () => {
@@ -3207,15 +2944,15 @@ describe('Program', () => {
                         outer([inner(["apple"], 100)], 12)
                     end sub
 
-                    sub outer(name as string, age as integer)
+                    sub outer(name as object, age as integer)
                     end sub
 
-                    sub inner(fruits as object, age as integer)
-                    end sub
+                    function inner(fruits as object, age as integer)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(2, 51, 'sub inner(fruits as object, age as integer)', 1);
+                assertSignatureHelp(2, 51, 'function inner(fruits as object, age as integer)', 1);
             });
 
             it('gets signature info for the inner function - param 1', () => {
@@ -3224,15 +2961,15 @@ describe('Program', () => {
                         outer([inner(["apple"], 100)], 12)
                     end sub
 
-                    sub outer(name as string, age as integer)
+                    sub outer(name as object, age as integer)
                     end sub
 
-                    sub inner(fruits as object, age as integer)
-                    end sub
+                    function inner(fruits as object, age as integer)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(2, 48, 'sub inner(fruits as object, age as integer)', 1);
+                assertSignatureHelp(2, 48, 'function inner(fruits as object, age as integer)', 1);
             });
         });
 
@@ -3398,16 +3135,16 @@ describe('Program', () => {
                         )], 12)
                     end sub
 
-                    sub sayHello(name as string, age as integer)
+                    sub sayHello(name as object, age as integer)
                     end sub
 
-                    sub getName(fruits as object, age as function)
-                    end sub
+                    function getName(fruits as object, age as function)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
                 for (let i = 34; i < 42; i++) {
-                    assertSignatureHelp(2, i, 'sub sayHello(name as string, age as integer)', 0);
+                    assertSignatureHelp(2, i, 'sub sayHello(name as object, age as integer)', 0);
                 }
             });
 
@@ -3423,15 +3160,15 @@ describe('Program', () => {
                         )], 12)
                     end sub
 
-                    sub sayHello(name as string, age as integer)
+                    sub sayHello(name as object, age as integer)
                     end sub
 
-                    sub getName(fruits as object, age as function)
-                    end sub
+                    function getName(fruits as object, age as function)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(8, 25, 'sub sayHello(name as string, age as integer)', 0);
+                assertSignatureHelp(8, 25, 'sub sayHello(name as object, age as integer)', 0);
             });
 
             it('gets signature info for the outer function - index 1', () => {
@@ -3446,15 +3183,15 @@ describe('Program', () => {
                         )], 12)
                     end sub
 
-                    sub sayHello(name as string, age as integer)
+                    sub sayHello(name as object, age as integer)
                     end sub
 
-                    sub getName(fruits as object, age as function)
-                    end sub
+                    function getName(fruits as object, age as function)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(8, 30, 'sub sayHello(name as string, age as integer)', 1);
+                assertSignatureHelp(8, 30, 'sub sayHello(name as object, age as integer)', 1);
             });
 
             it('gets signature info for the inner function - param 0', () => {
@@ -3469,16 +3206,16 @@ describe('Program', () => {
                         )], 12)
                     end sub
 
-                    sub sayHello(name as string, age as integer)
+                    sub sayHello(name as object, age as integer)
                     end sub
 
-                    sub getName(fruits as object, age as function)
-                    end sub
+                    function getName(fruits as object, age as function)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(3, 31, 'sub getName(fruits as object, age as function)', 0);
-                assertSignatureHelp(4, 31, 'sub getName(fruits as object, age as function)', 0);
+                assertSignatureHelp(3, 31, 'function getName(fruits as object, age as function)', 0);
+                assertSignatureHelp(4, 31, 'function getName(fruits as object, age as function)', 0);
             });
 
             it('gets signature info for the inner function - param 1 - function declartion', () => {
@@ -3493,15 +3230,15 @@ describe('Program', () => {
                         )], 12)
                     end sub
 
-                    sub sayHello(name as string, age as integer)
+                    sub sayHello(name as object, age as integer)
                     end sub
 
-                    sub getName(fruits as object, age as function)
-                    end sub
+                    function getName(fruits as object, age as function)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(5, 31, 'sub getName(fruits as object, age as function)', 1);
+                assertSignatureHelp(5, 31, 'function getName(fruits as object, age as function)', 1);
             });
 
             it('gets signature info for the inner function - param 1 - in anon function', () => {
@@ -3516,15 +3253,15 @@ describe('Program', () => {
                         )], 12)
                     end sub
 
-                    sub sayHello(name as string, age as integer)
+                    sub sayHello(name as object, age as integer)
                     end sub
 
-                    sub getName(fruits as object, age as function)
-                    end sub
+                    function getName(fruits as object, age as function)
+                    end function
                 `);
                 program.validate();
                 expectZeroDiagnostics(program);
-                assertSignatureHelp(6, 31, 'sub getName(fruits as object, age as function)', 1);
+                assertSignatureHelp(6, 31, 'function getName(fruits as object, age as function)', 1);
             });
         });
 
@@ -3643,44 +3380,184 @@ describe('Program', () => {
     });
 
     describe('plugins', () => {
+        it('emits provideFile events', () => {
+            const plugin = {
+                name: 'test',
+                beforeProvideFile: sinon.spy() as SinonSpy<[BeforeProvideFileEvent]>,
+                provideFile: sinon.spy() as SinonSpy<[BeforeProvideFileEvent]>,
+                afterProvideFile: sinon.spy() as SinonSpy<[BeforeProvideFileEvent]>
+            };
+            program.plugins.add(plugin);
+            program.setFile('source/main.brs', `'main`);
+            program.setFile('source/lib.brs', `'lib`);
+            program.validate();
+            function test(spy: SinonSpy<[BeforeProvideFileEvent]>) {
+                expect(
+                    spy.getCalls().map(x => ({
+                        srcPath: x.args[0].srcPath,
+                        destPath: x.args[0].destPath,
+                        fileData: x.args[0].data.value.toString()
+                    }))
+                ).to.eql([{
+                    srcPath: s`${rootDir}/source/main.brs`,
+                    destPath: s`source/main.brs`,
+                    fileData: `'main`
+                }, {
+                    srcPath: s`${rootDir}/source/lib.brs`,
+                    destPath: s`source/lib.brs`,
+                    fileData: `'lib`
+                }]);
+            }
+            test(plugin.beforeProvideFile);
+            test(plugin.provideFile);
+            test(plugin.afterProvideFile);
+        });
+
+        it('beforeProvideFile can override source contents', () => {
+            const plugin = {
+                name: 'test',
+                beforeProvideFile: (event: BeforeProvideFileEvent) => {
+                    event.data.value = `'override`;
+                }
+            };
+            program.plugins.add(plugin);
+            const file = program.setFile<BrsFile>('source/main.brs', `'original`);
+            expect(file.fileContents).to.eql(`'override`);
+        });
+
+        it('emits event for each virtual file', () => {
+            const events: string[] = [];
+            const plugin = {
+                name: 'test',
+                beforeProvideFile: (e: BeforeProvideFileEvent) => {
+                    events.push(`beforeProvideFile:${e.destPath}`);
+                    e.files.push(
+                        new AssetFile(e)
+                    );
+                    e.files.push(
+                        new AssetFile({
+                            srcPath: e.srcPath + '.two',
+                            destPath: e.destPath + '.two'
+                        })
+                    );
+                },
+                provideFile: (e: ProvideFileEvent) => {
+                    events.push(`provideFile:${e.destPath}`);
+                },
+                afterProvideFile: (e: AfterProvideFileEvent) => {
+                    events.push(`afterProvideFile:${e.destPath}`);
+                },
+                beforeAddFile: (e: BeforeAddFileEvent) => {
+                    events.push(`beforeAddFile:${e.file.destPath}`);
+                },
+                afterAddFile: (e: AfterAddFileEvent) => {
+                    events.push(`afterAddFile:${e.file.destPath}`);
+                },
+                beforeRemoveFile: (e: BeforeRemoveFileEvent) => {
+                    events.push(`beforeRemoveFile:${e.file.destPath}`);
+                },
+                afterRemoveFile: (e: AfterRemoveFileEvent) => {
+                    events.push(`afterRemoveFile:${e.file.destPath}`);
+                }
+            };
+            program.plugins.add(plugin);
+
+            program.setFile('source/buttons.component.bs', '');
+            program.removeFile('source/buttons.component.bs');
+
+            expect(events).to.eql([
+                'beforeProvideFile:' + s('source/buttons.component.bs'),
+                'provideFile:' + s('source/buttons.component.bs'),
+                'afterProvideFile:' + s('source/buttons.component.bs'),
+                'beforeAddFile:' + s('source/buttons.component.bs'),
+                'afterAddFile:' + s('source/buttons.component.bs'),
+                'beforeAddFile:' + s('source/buttons.component.bs.two'),
+                'afterAddFile:' + s('source/buttons.component.bs.two'),
+                'beforeRemoveFile:' + s('source/buttons.component.bs'),
+                'afterRemoveFile:' + s('source/buttons.component.bs'),
+                'beforeRemoveFile:' + s('source/buttons.component.bs.two'),
+                'afterRemoveFile:' + s('source/buttons.component.bs.two')
+            ]);
+        });
+
+        it('does not emit duplicate events for virtual files that get removed', () => {
+            const events: string[] = [];
+            const plugin = {
+                name: 'test',
+                beforeProvideFile: (e: BeforeProvideFileEvent) => {
+                    e.files.push(
+                        new AssetFile(e)
+                    );
+                    e.files.push(
+                        new AssetFile({
+                            srcPath: e.srcPath + '.two',
+                            destPath: e.destPath + '.two'
+                        })
+                    );
+                },
+                beforeRemoveFile: (e: BeforeRemoveFileEvent) => {
+                    events.push(`beforeRemoveFile:${e.file.destPath}`);
+                },
+                afterRemoveFile: (e: AfterRemoveFileEvent) => {
+                    events.push(`afterRemoveFile:${e.file.destPath}`);
+                }
+            };
+            program.plugins.add(plugin);
+
+            program.setFile('source/buttons.component.bs', '');
+
+            //remove the virtual file first
+            program.removeFile('source/buttons.component.bs.two');
+            //now remove the physical file
+            program.removeFile('source/buttons.component.bs');
+
+            //we should only have one set of events per file
+            expect(events).to.eql([
+                'beforeRemoveFile:' + s('source/buttons.component.bs.two'),
+                'afterRemoveFile:' + s('source/buttons.component.bs.two'),
+                'beforeRemoveFile:' + s('source/buttons.component.bs'),
+                'afterRemoveFile:' + s('source/buttons.component.bs')
+            ]);
+        });
+
         it('emits file validation events', () => {
             const plugin = {
                 name: 'test',
-                beforeFileValidate: sinon.spy(),
-                onFileValidate: sinon.spy(),
-                afterFileValidate: sinon.spy()
+                beforeValidateFile: sinon.spy(),
+                validateFile: sinon.spy(),
+                afterValidateFile: sinon.spy()
             };
             program.plugins.add(plugin);
             program.setFile('source/main.brs', '');
             program.validate();
-            expect(plugin.beforeFileValidate.callCount).to.equal(1);
-            expect(plugin.onFileValidate.callCount).to.equal(1);
-            expect(plugin.afterFileValidate.callCount).to.equal(1);
+            expect(plugin.beforeValidateFile.callCount).to.equal(1);
+            expect(plugin.validateFile.callCount).to.equal(1);
+            expect(plugin.afterValidateFile.callCount).to.equal(1);
         });
 
         it('emits file validation events', () => {
             const plugin = {
                 name: 'test',
-                beforeFileValidate: sinon.spy(),
-                onFileValidate: sinon.spy(),
-                afterFileValidate: sinon.spy()
+                beforeValidateFile: sinon.spy(),
+                validateFile: sinon.spy(),
+                afterValidateFile: sinon.spy()
             };
             program.plugins.add(plugin);
             program.setFile('components/main.xml', '');
             program.validate();
-            expect(plugin.beforeFileValidate.callCount).to.equal(1);
-            expect(plugin.onFileValidate.callCount).to.equal(1);
-            expect(plugin.afterFileValidate.callCount).to.equal(1);
+            expect(plugin.beforeValidateFile.callCount).to.equal(1);
+            expect(plugin.validateFile.callCount).to.equal(1);
+            expect(plugin.afterValidateFile.callCount).to.equal(1);
         });
 
         it('emits program dispose event', () => {
             const plugin = {
                 name: 'test',
-                beforeProgramDispose: sinon.spy()
+                beforeRemoveProgram: sinon.spy()
             };
             program.plugins.add(plugin);
             program.dispose();
-            expect(plugin.beforeProgramDispose.callCount).to.equal(1);
+            expect(plugin.beforeRemoveProgram.callCount).to.equal(1);
         });
     });
 
@@ -3706,6 +3583,344 @@ describe('Program', () => {
         });
     });
 
+    describe('build', () => {
+        it('copies AssetFile contents', async () => {
+            const file = program.setFile('locale/en_US/translations.xml', Buffer.from(''));
+            program.validate();
+            await program.build();
+            expect(
+                fsExtra.pathExistsSync(
+                    s`${program.options.outDir}/${file.pkgPath}`
+                )
+            ).to.be.true;
+        });
+
+        it('writes to correct dir', async () => {
+            const cwd = process.cwd();
+            try {
+                fsExtra.ensureDirSync(`${tempDir}/alpha/beta`);
+                process.chdir(s`${tempDir}/alpha/beta`);
+
+                program.options.cwd = s`${tempDir}/rootDir`;
+                program.options.rootDir = s`${tempDir}/rootDir`;
+                program.options.outDir = s`../outDir`;
+                program.setFile('source/main.brs', '');
+                await program.build();
+            } finally {
+                process.chdir(cwd);
+            }
+            expect(fsExtra.pathExistsSync(`${tempDir}/outDir/source/main.brs`)).to.be.true;
+            expect(fsExtra.pathExistsSync(`${tempDir}/alpha/source/main.brs`)).to.be.false;
+        });
+
+        it('write binary files properly', async () => {
+            const data = Buffer.from([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
+            program.setFile('assets/logo.png', data);
+            await program.build();
+            const result = fsExtra.readFileSync(`${outDir}/assets/logo.png`);
+
+            //the buffers should be identical
+            expect(
+                data.compare(result as any)
+            ).to.equal(0);
+        });
+
+        it('includes bslib in the outDir', async () => {
+            program.options.autoImportComponentScript = true;
+            program.setFile('manifest', '');
+            program.setFile('components/MainScene.xml', trim`
+                <component name="MainScene" extends="Scene">
+                </component>
+            `);
+            program.setFile('components/MainScene.bs', `
+                sub init()
+                    print 1 > 0 ? 1 : 0
+                end sub
+            `);
+            await program.build();
+            expect(
+                fsExtra.pathExistsSync(`${outDir}/source/bslib.brs`)
+            ).to.be.true;
+        });
+
+        it('transpiles namespaces properly', async () => {
+            program.options.autoImportComponentScript = true;
+            program.setFile('manifest', '');
+            program.setFile('components/MainScene.xml', trim`
+                <component name="MainScene" extends="Scene">
+                </component>
+            `);
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    sub test()
+                    end sub
+                end namespace
+                sub init()
+                    alpha.test()
+                end sub
+            `);
+            await program.build();
+            expect(
+                fsExtra.readFileSync(`${outDir}/source/main.brs`).toString()
+            ).to.eql(undent`
+                sub alpha_test()
+                end sub
+
+                sub init()
+                    alpha_test()
+                end sub
+            `);
+        });
+    });
+
+    describe('global symbol table', () => {
+        it('adds primitives', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const rtOpts = { flags: SymbolTypeFlag.runtime };
+            expectTypeToBe(table.getSymbolType('string', opts), StringType);
+            expectTypeToBe(table.getSymbolType('string', opts).getMemberType('trim', rtOpts), TypedFunctionType);
+
+            expectTypeToBe(table.getSymbolType('dynamic', opts), DynamicType);
+            expectTypeToBe(table.getSymbolType('float', opts), FloatType);
+            expectTypeToBe(table.getSymbolType('integer', opts), IntegerType);
+        });
+
+        it('adds brightscript components', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const rtOpts = { flags: SymbolTypeFlag.runtime };
+            expectTypeToBe(table.getSymbolType('roAssociativeArray', opts), InterfaceType);
+            expectTypeToBe(table.getSymbolType('roAssociativeArray', opts).getMemberType('Lookup', rtOpts), TypedFunctionType);
+
+            expectTypeToBe(table.getSymbolType('roBitmap', opts), InterfaceType);
+            expectTypeToBe(table.getSymbolType('roBitmap', opts).getMemberType('DrawPoint', rtOpts), TypedFunctionType);
+
+            expectTypeToBe(table.getSymbolType('roRegistry', opts), InterfaceType);
+            expectTypeToBe(table.getSymbolType('roRegistry', opts).getMemberType('GetSectionList', rtOpts), TypedFunctionType);
+
+        });
+
+        it('adds brightscript interfaces', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const rtOpts = { flags: SymbolTypeFlag.runtime };
+            expectTypeToBe(table.getSymbolType('ifDeviceInfo', opts), InterfaceType);
+            expectTypeToBe(table.getSymbolType('ifDeviceInfo', opts).getMemberType('GetRandomUUID', rtOpts), TypedFunctionType);
+
+            expectTypeToBe(table.getSymbolType('ifSGNodeField', opts), InterfaceType);
+            expectTypeToBe(table.getSymbolType('ifSGNodeField', opts).getMemberType('addFields', rtOpts), TypedFunctionType);
+        });
+
+        it('adds brightscript events', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const rtOpts = { flags: SymbolTypeFlag.runtime };
+            expectTypeToBe(table.getSymbolType('roInputEvent', opts), InterfaceType);
+            expectTypeToBe(table.getSymbolType('roInputEvent', opts).getMemberType('GetInfo', rtOpts), TypedFunctionType);
+
+            expectTypeToBe(table.getSymbolType('roSGNodeEvent', opts), InterfaceType);
+            expectTypeToBe(table.getSymbolType('roSGNodeEvent', opts).getMemberType('getData', rtOpts), TypedFunctionType);
+        });
+
+        it('adds SceneGraph nodes, prefixed with `roSGNode`', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const rtOpts = { flags: SymbolTypeFlag.runtime };
+            expectTypeToBe(table.getSymbolType('roSGNodeLayoutGroup', opts), ComponentType);
+            expectTypeToBe(table.getSymbolType('roSGNodeLayoutGroup', opts).getMemberType('horizAlignment', rtOpts), StringType);
+            expectTypeToBe(table.getSymbolType('roSGNodeLayoutGroup', opts).getMemberType('itemSpacings', rtOpts), ArrayType);
+            expectTypeToBe(table.getSymbolType('roSGNodeLayoutGroup', opts).getMemberType('getChildren', rtOpts), TypedFunctionType);
+            expectTypeToBe(table.getSymbolType('roSGNodeLayoutGroup', opts).getMemberType('createChild', rtOpts), TypedFunctionType);
+
+            expectTypeToBe(table.getSymbolType('roSGNodePoster', opts), ComponentType);
+            expectTypeToBe(table.getSymbolType('roSGNodePoster', opts).getMemberType('loadWidth', rtOpts), FloatType);
+            expectTypeToBe(table.getSymbolType('roSGNodePoster', opts).getMemberType('loadDisplayMode', rtOpts), StringType);
+            const bmpMarginsType = table.getSymbolType('roSGNodePoster', opts).getMemberType('bitmapMargins', rtOpts);
+            expectTypeToBe(bmpMarginsType, AssociativeArrayType);
+
+            expectTypeToBe(table.getSymbolType('roSGNodeTimer', opts), ComponentType);
+            expectTypeToBe(table.getSymbolType('roSGNodeTimer', opts).getMemberType('control', rtOpts), StringType);
+            expectTypeToBe(table.getSymbolType('roSGNodeTimer', opts).getMemberType('repeat', rtOpts), BooleanType);
+            expectTypeToBe(table.getSymbolType('roSGNodeTimer', opts).getMemberType('duration', rtOpts), DoubleType);
+            expectTypeToBe(table.getSymbolType('roSGNodeTimer', opts).getMemberType('fire', rtOpts), DynamicType);
+
+            expectTypeToBe(table.getSymbolType('roSGNodeNode', opts), ComponentType);
+            expectTypeToBe(table.getSymbolType('roSGNodeNode', opts).getMemberType('id', rtOpts), StringType);
+            expectTypeToBe(table.getSymbolType('roSGNodeNode', opts).getMemberType('change', rtOpts), AssociativeArrayType);
+        });
+
+        it('roSGNode and roSGNodeNode are type equivalent', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const roSGNodeType = table.getSymbolType('roSGNode', opts);
+            const roSGNodeNodeType = table.getSymbolType('roSGNodeNode', opts);
+
+            expectTypeToBe(roSGNodeType, ComponentType);
+            expectTypeToBe(roSGNodeNodeType, ComponentType);
+            let data = {};
+            const first = roSGNodeType.isTypeCompatible(roSGNodeNodeType, data);
+            expect(first).to.be.true;
+            data = {};
+            const second = roSGNodeNodeType.isTypeCompatible(roSGNodeType, data);
+            expect(second).to.be.true;
+        });
+
+        it('components are compatible with roSGNode and roSGNodeNode', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const roSGNodeType = table.getSymbolType('roSGNode', opts);
+            const roSGNodeNodeType = table.getSymbolType('roSGNodeNode', opts);
+
+            const labelType = table.getSymbolType('roSGNodeLabel', opts);
+            const posterType = table.getSymbolType('roSGNodePoster', opts);
+            const rowListType = table.getSymbolType('roSGNodeRowList', opts);
+            const taskType = table.getSymbolType('roSGNodeTask', opts);
+
+            expect(roSGNodeType.isTypeCompatible(labelType)).to.be.true;
+            expect(roSGNodeType.isTypeCompatible(posterType)).to.be.true;
+            expect(roSGNodeType.isTypeCompatible(rowListType)).to.be.true;
+            expect(roSGNodeType.isTypeCompatible(taskType)).to.be.true;
+
+            expect(roSGNodeNodeType.isTypeCompatible(labelType)).to.be.true;
+            expect(roSGNodeNodeType.isTypeCompatible(posterType)).to.be.true;
+            expect(roSGNodeNodeType.isTypeCompatible(rowListType)).to.be.true;
+            expect(roSGNodeNodeType.isTypeCompatible(taskType)).to.be.true;
+        });
+
+        it('built-in objects have interfaces as members', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const labelType = table.getSymbolType('roSGNodeLabel', opts);
+            const registryType = table.getSymbolType('roRegistry', opts);
+
+            expectTypeToBe(labelType.getMemberType('ifSGNodeChildren', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+            expectTypeToBe(registryType.getMemberType('ifRegistry', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+        });
+
+        it('built-in interfaces do not have themselves as members', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.typetime };
+            const ifAAType = table.getSymbolType('ifAssociativeArray', opts);
+
+            expect(ifAAType.getMemberType('ifAssociativeArray', { flags: SymbolTypeFlag.runtime }).isResolvable()).to.be.false;
+        });
+
+        it('has various hard to decipher field types', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.runtime };
+            const recType = table.getSymbolType('roSGNodeRectangle', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(recType.getMemberType('color', opts), UnionType);
+
+            const stdKeyDialogType = table.getSymbolType('roSGNodeStandardKeyboardDialog', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(stdKeyDialogType.getMemberType('textEditBox', opts), ComponentType);
+        });
+
+        it('has content node and all its attributes', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.runtime };
+            const cnType = table.getSymbolType('roSGNodeContentNode', { flags: SymbolTypeFlag.typetime });
+
+            expectTypeToBe(cnType.getMemberType('contentType', opts), StringType);
+
+            const actorsType = cnType.getMemberType('actors', opts) as UnionType;
+            expectTypeToBe(actorsType, UnionType);
+            expectTypeToBe(actorsType.types[0], ArrayType);
+            expectTypeToBe(actorsType.types[1], StringType);
+
+            const cdnConfigType = cnType.getMemberType('cdnConfig', opts) as ArrayType;
+            expectTypeToBe(cdnConfigType, ArrayType);
+            expectTypeToBe(cdnConfigType.defaultType, AssociativeArrayType);
+
+            const subTitleTracksType = cnType.getMemberType('SubtitleTracks', opts) as ArrayType;
+            expectTypeToBe(subTitleTracksType, ArrayType);
+            expectTypeToBe(subTitleTracksType.defaultType, AssociativeArrayType);
+
+            const subtitleConfigType = cnType.getMemberType('SUBTITLECONFIG', opts);
+            expectTypeToBe(subtitleConfigType, AssociativeArrayType);
+
+            const hdlisticonSelType = cnType.getMemberType('HDListItemIconSelectedURL', opts);
+            expectTypeToBe(hdlisticonSelType, StringType);
+        });
+
+        it('has video player internal nodes', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.runtime };
+            const videoType = table.getSymbolType('roSGNodeVideo', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(videoType, ComponentType);
+
+            const bifDisplayType = videoType.getMemberType('bifDisplay', opts) as ComponentType;
+            expectTypeToBe(bifDisplayType, ComponentType);
+            expect(bifDisplayType.name).to.eq('BifDisplay');
+            expectTypeToBe(bifDisplayType.getMemberType('getNearestFrame', opts), DoubleType);
+            expectTypeToBe(bifDisplayType.getMemberType('frameBgImageUri', opts), StringType);
+
+            const trickBarType = videoType.getMemberType('trickPlayBar', opts) as ComponentType;
+            expectTypeToBe(trickBarType, ComponentType);
+            expect(trickBarType.name).to.eq('TrickPlayBar');
+            expectTypeToBe(trickBarType.getMemberType('trackImageUri', opts), StringType);
+            expectTypeToBe(trickBarType.getMemberType('trackBlendColor', opts), UnionType);
+        });
+
+        it('deals with roDateTime overloaded method', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    function getDate() as roDateTime
+                        theDate = createObject("roDateTime")
+                        return theDate
+                    end function
+                end namespace
+
+                function toUtcTime(localTime as roDateTime) as roDateTime
+                    theDate = alpha.getDate()
+                    return theDate
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('includes non-standard fields tables', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.runtime };
+            const multiLabel = table.getSymbolType('roSGNodeMultiStyleLabel', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(multiLabel, ComponentType);
+            expectTypeToBe(multiLabel.getMemberType('drawingStyles', opts), AssociativeArrayType);
+        });
+
+        it('includes overrides from scrapper', () => {
+            const table = program.globalScope.symbolTable;
+            const opts = { flags: SymbolTypeFlag.runtime };
+            const regionType = table.getSymbolType('roRegion', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(regionType, InterfaceType);
+
+            const ifDraw2DType = regionType.getMemberType('ifDraw2D', opts) as InterfaceType;
+            expectTypeToBe(ifDraw2DType, InterfaceType);
+            expect(ifDraw2DType.name).to.eq('ifDraw2D');
+            expectTypeToBe(ifDraw2DType.getMemberType('getWidth', opts), TypedFunctionType);
+            expectTypeToBe(regionType.getMemberType('getWidth', opts), TypedFunctionType);
+
+            const streamSocketType = table.getSymbolType('roStreamSocket', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(streamSocketType, InterfaceType);
+
+            const socketAsyncType = streamSocketType.getMemberType('ifSocketAsync', opts) as InterfaceType;
+            expectTypeToBe(socketAsyncType, InterfaceType);
+            expect(socketAsyncType.name).to.eq('ifSocketAsync');
+            expectTypeToBe(socketAsyncType.getMemberType('setMessagePort', opts), TypedFunctionType);
+            expectTypeToBe(streamSocketType.getMemberType('setMessagePort', opts), TypedFunctionType);
+
+            const vector2dInterp = table.getSymbolType('roSGNodeVector2DFieldInterpolator', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(vector2dInterp, ComponentType);
+
+            const vector2dKeyValueType = vector2dInterp.getMemberType('keyValue', opts) as ArrayType;
+            expectTypeToBe(vector2dKeyValueType, ArrayType);
+            expectTypeToBe(vector2dKeyValueType.defaultType, ArrayType);
+            expectTypeToBe((vector2dKeyValueType.defaultType as ArrayType).defaultType, FloatType);
+        });
+
+    });
+
     describe('manifest', () => {
         beforeEach(() => {
             fsExtra.emptyDirSync(tempDir);
diff --git a/src/Program.ts b/src/Program.ts
index b687c9c84..362d612c4 100644
--- a/src/Program.ts
+++ b/src/Program.ts
@@ -1,60 +1,73 @@
 import * as assert from 'assert';
 import * as fsExtra from 'fs-extra';
 import * as path from 'path';
-import type { CodeAction, CompletionItem, Position, Range, SignatureInformation, Location, DocumentSymbol, CancellationToken, SelectionRange } from 'vscode-languageserver';
-import { CancellationTokenSource, CompletionItemKind } from 'vscode-languageserver';
+import type { CodeAction, Position, Range, SignatureInformation, Location, DocumentSymbol, CancellationToken, SelectionRange } from 'vscode-languageserver';
+import { CancellationTokenSource } from 'vscode-languageserver';
 import type { BsConfig, FinalizedBsConfig } from './BsConfig';
 import { Scope } from './Scope';
 import type { NamespaceContainer, NamespaceFileContribution } from './Scope';
 import { SymbolTable } from './SymbolTable';
 import { DiagnosticMessages } from './DiagnosticMessages';
-import { BrsFile } from './files/BrsFile';
-import { XmlFile } from './files/XmlFile';
-import type { BsDiagnostic, File, FileReference, FileObj, BscFile, SemanticToken, AfterFileTranspileEvent, FileLink, ProvideHoverEvent, ProvideCompletionsEvent, Hover, ProvideDefinitionEvent, ProvideReferencesEvent, ProvideDocumentSymbolsEvent, ProvideWorkspaceSymbolsEvent, ProvideSelectionRangesEvent, OnGetSourceFixAllCodeActionsEvent } from './interfaces';
+import type { FileObj, SemanticToken, FileLink, ProvideHoverEvent, ProvideCompletionsEvent, Hover, ProvideDefinitionEvent, ProvideReferencesEvent, ProvideDocumentSymbolsEvent, ProvideWorkspaceSymbolsEvent, BeforeAddFileEvent, BeforeRemoveFileEvent, PrepareFileEvent, PrepareProgramEvent, ProvideFileEvent, SerializedFile, TranspileObj, SerializeFileEvent, ScopeValidationOptions, ExtraSymbolData, ProvideSelectionRangesEvent, OnGetSourceFixAllCodeActionsEvent } from './interfaces';
 import type { SourceFixAllCodeAction } from './CodeActionUtil';
 import { codeActionUtil } from './CodeActionUtil';
 import { standardizePath as s, util } from './util';
 import { XmlScope } from './XmlScope';
-import { DiagnosticFilterer } from './DiagnosticFilterer';
 import { DependencyGraph } from './DependencyGraph';
 import type { Logger } from './logging';
 import { LogLevel, createLogger } from './logging';
 import chalk from 'chalk';
-import { globalFile } from './globalCallables';
+import { globalCallables, globalFile } from './globalCallables';
 import { parseManifest, getBsConst } from './preprocessor/Manifest';
 import { URI } from 'vscode-uri';
 import PluginInterface from './PluginInterface';
-import { isBrsFile, isXmlFile, isXmlScope, isNamespaceStatement } from './astUtils/reflection';
-import type { FunctionStatement, NamespaceStatement } from './parser/Statement';
+import { isBrsFile, isXmlFile, isXmlScope, isNamespaceStatement, isReferenceType } from './astUtils/reflection';
+import type { FunctionStatement, MethodStatement, NamespaceStatement } from './parser/Statement';
 import { BscPlugin } from './bscPlugin/BscPlugin';
-import { AstEditor } from './astUtils/AstEditor';
-import type { SourceMapGenerator } from 'source-map';
+import { Editor } from './astUtils/Editor';
+import { IntegerType } from './types/IntegerType';
+import { StringType } from './types/StringType';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import { BooleanType } from './types/BooleanType';
+import { DoubleType } from './types/DoubleType';
+import { DynamicType } from './types/DynamicType';
+import { FloatType } from './types/FloatType';
+import { LongIntegerType } from './types/LongIntegerType';
+import { ObjectType } from './types/ObjectType';
+import { VoidType } from './types/VoidType';
+import { FunctionType } from './types/FunctionType';
+import { FileFactory } from './files/Factory';
+import { ActionPipeline } from './ActionPipeline';
+import type { FileData } from './files/LazyFileData';
+import { LazyFileData } from './files/LazyFileData';
+import { rokuDeploy } from 'roku-deploy';
+import type { SGNodeData, BRSComponentData, BRSEventData, BRSInterfaceData } from './roku-types';
+import { nodes, components, interfaces, events } from './roku-types';
+import { ComponentType } from './types/ComponentType';
+import { InterfaceType } from './types/InterfaceType';
+import { BuiltInInterfaceAdder } from './types/BuiltInInterfaceAdder';
+import type { UnresolvedSymbol } from './AstValidationSegmenter';
+import { WalkMode, createVisitor } from './astUtils/visitors';
+import type { BscFile } from './files/BscFile';
+import { firstBy } from 'thenby';
+import { CrossScopeValidator } from './CrossScopeValidator';
+import { DiagnosticManager } from './DiagnosticManager';
+import { ProgramValidatorDiagnosticsTag } from './bscPlugin/validation/ProgramValidator';
+import type { ProvidedSymbolInfo, BrsFile } from './files/BrsFile';
+import type { UnresolvedXMLSymbol, XmlFile } from './files/XmlFile';
+import type { BscType } from './types/BscType';
+import { ReferenceType } from './types/ReferenceType';
+import { TypesCreated } from './types/helpers';
 import type { Statement } from './parser/AstNode';
 import { CallExpressionInfo } from './bscPlugin/CallExpressionInfo';
 import { SignatureHelpUtil } from './bscPlugin/SignatureHelpUtil';
-import { DiagnosticSeverityAdjuster } from './DiagnosticSeverityAdjuster';
 import { Sequencer } from './common/Sequencer';
 import { Deferred } from './deferred';
+import { roFunctionType } from './types/roFunctionType';
 
-const startOfSourcePkgPath = `source${path.sep}`;
 const bslibNonAliasedRokuModulesPkgPath = s`source/roku_modules/rokucommunity_bslib/bslib.brs`;
 const bslibAliasedRokuModulesPkgPath = s`source/roku_modules/bslib/bslib.brs`;
 
-export interface SourceObj {
-    /**
-     * @deprecated use `srcPath` instead
-     */
-    pathAbsolute: string;
-    srcPath: string;
-    source: string;
-    definitions?: string;
-}
-
-export interface TranspileObj {
-    file: BscFile;
-    outputPath: string;
-}
-
 export interface SignatureInfoObj {
     index: number;
     key: string;
@@ -68,11 +81,47 @@ export class Program {
          */
         options: BsConfig,
         logger?: Logger,
-        plugins?: PluginInterface
+        plugins?: PluginInterface,
+        diagnosticsManager?: DiagnosticManager
     ) {
         this.options = util.normalizeConfig(options);
         this.logger = logger ?? createLogger(options);
         this.plugins = plugins || new PluginInterface([], { logger: this.logger });
+        this.diagnostics = diagnosticsManager || new DiagnosticManager();
+
+        //try to find a location for the diagnostic if it doesn't have one
+        this.diagnostics.locationResolver = (args) => {
+
+            //find the first xml scope for this diagnostic
+            for (let context of args.contexts) {
+                if (isXmlScope(context.scope) && isXmlFile(context.scope.xmlFile)) {
+                    return util.createLocation(0, 0, 0, 100, context.scope.xmlFile.srcPath);
+                }
+            }
+
+            //we couldn't find an xml scope for this, so try to find the manifest file instead
+            const manifest = this.getFile('manifest', false);
+            if (manifest) {
+                return util.createLocation(0, 0, 0, 100, manifest.srcPath);
+            }
+
+            //if we still don't have a manifest, try to find the first file in the program
+            for (const key in this.files) {
+                if (isBrsFile(this.files[key]) || isXmlFile(this.files[key])) {
+                    return util.createLocation(0, 0, 0, 100, this.files[key].srcPath);
+                }
+            }
+
+            this.logger.warn(`Unable to find a location for the diagnostic.`, args);
+
+            //we couldn't find any locations for the file, so just return undefined
+            return undefined;
+        };
+
+        // initialize the diagnostics Manager
+        this.diagnostics.logger = this.logger;
+        this.diagnostics.options = this.options;
+        this.diagnostics.program = this;
 
         //inject the bsc plugin as the first plugin in the stack.
         this.plugins.addFirst(new BscPlugin());
@@ -81,25 +130,135 @@ export class Program {
         this.options.rootDir = util.getRootDir(this.options);
 
         this.createGlobalScope();
+
+        this.fileFactory = new FileFactory(this);
     }
 
     public options: FinalizedBsConfig;
     public logger: Logger;
 
+    /**
+     * An editor that plugins can use to modify program-level things during the build flow. Don't use this to edit files (they have their own `.editor`)
+     */
+    public editor = new Editor();
+
+    /**
+     * A factory that creates `File` instances
+     */
+    private fileFactory: FileFactory;
+
     private createGlobalScope() {
         //create the 'global' scope
         this.globalScope = new Scope('global', this, 'scope:global');
         this.globalScope.attachDependencyGraph(this.dependencyGraph);
         this.scopes.global = this.globalScope;
+
+        this.populateGlobalSymbolTable();
+        this.globalScope.symbolTable.addSibling(this.componentsTable);
+
         //hardcode the files list for global scope to only contain the global file
         this.globalScope.getAllFiles = () => [globalFile];
+        globalFile.isValidated = true;
         this.globalScope.validate();
-        //for now, disable validation of global scope because the global files have some duplicate method declarations
-        this.globalScope.getDiagnostics = () => [];
+
         //TODO we might need to fix this because the isValidated clears stuff now
         (this.globalScope as any).isValidated = true;
     }
 
+
+    private recursivelyAddNodeToSymbolTable(nodeData: SGNodeData) {
+        if (!nodeData) {
+            return;
+        }
+        let nodeType: ComponentType;
+        const nodeName = util.getSgNodeTypeName(nodeData.name);
+        if (!this.globalScope.symbolTable.hasSymbol(nodeName, SymbolTypeFlag.typetime)) {
+            let parentNode: ComponentType;
+            if (nodeData.extends) {
+                const parentNodeData = nodes[nodeData.extends.name.toLowerCase()];
+                try {
+                    parentNode = this.recursivelyAddNodeToSymbolTable(parentNodeData);
+                } catch (error) {
+                    this.logger.error(error, nodeData);
+                }
+            }
+            nodeType = new ComponentType(nodeData.name, parentNode);
+            nodeType.addBuiltInInterfaces();
+            nodeType.isBuiltIn = true;
+            if (nodeData.name === 'Node') {
+                // Add `roSGNode` as shorthand for `roSGNodeNode`
+                this.globalScope.symbolTable.addSymbol('roSGNode', { description: nodeData.description, isBuiltIn: true }, nodeType, SymbolTypeFlag.typetime);
+            }
+            this.globalScope.symbolTable.addSymbol(nodeName, { description: nodeData.description, isBuiltIn: true }, nodeType, SymbolTypeFlag.typetime);
+        } else {
+            nodeType = this.globalScope.symbolTable.getSymbolType(nodeName, { flags: SymbolTypeFlag.typetime }) as ComponentType;
+        }
+
+        return nodeType;
+    }
+    /**
+     * Do all setup required for the global symbol table.
+     */
+    private populateGlobalSymbolTable() {
+        //Setup primitive types in global symbolTable
+
+        const builtInSymbolData: ExtraSymbolData = { isBuiltIn: true };
+
+        this.globalScope.symbolTable.addSymbol('boolean', builtInSymbolData, BooleanType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('double', builtInSymbolData, DoubleType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('dynamic', builtInSymbolData, DynamicType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('float', builtInSymbolData, FloatType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('function', builtInSymbolData, FunctionType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('integer', builtInSymbolData, IntegerType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('longinteger', builtInSymbolData, LongIntegerType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('object', builtInSymbolData, ObjectType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('string', builtInSymbolData, StringType.instance, SymbolTypeFlag.typetime);
+        this.globalScope.symbolTable.addSymbol('void', builtInSymbolData, VoidType.instance, SymbolTypeFlag.typetime);
+
+        BuiltInInterfaceAdder.getLookupTable = () => this.globalScope.symbolTable;
+
+        for (const callable of globalCallables) {
+            this.globalScope.symbolTable.addSymbol(callable.name, { ...builtInSymbolData, description: callable.shortDescription }, callable.type, SymbolTypeFlag.runtime);
+        }
+
+        for (const ifaceData of Object.values(interfaces) as BRSInterfaceData[]) {
+            const ifaceType = new InterfaceType(ifaceData.name);
+            ifaceType.addBuiltInInterfaces();
+            ifaceType.isBuiltIn = true;
+            this.globalScope.symbolTable.addSymbol(ifaceData.name, { ...builtInSymbolData, description: ifaceData.description }, ifaceType, SymbolTypeFlag.typetime);
+        }
+
+        for (const componentData of Object.values(components) as BRSComponentData[]) {
+            let roComponentType: BscType;
+            const lowerComponentName = componentData.name.toLowerCase();
+
+            if (lowerComponentName === 'rosgnode') {
+                // we will add `roSGNode` as shorthand for `roSGNodeNode`, since all roSgNode components are SceneGraph nodes
+                continue;
+            }
+            if (lowerComponentName === 'rofunction') {
+                roComponentType = new roFunctionType();
+            } else {
+                roComponentType = new InterfaceType(componentData.name);
+            }
+            roComponentType.addBuiltInInterfaces();
+            roComponentType.isBuiltIn = true;
+            this.globalScope.symbolTable.addSymbol(componentData.name, { ...builtInSymbolData, description: componentData.description }, roComponentType, SymbolTypeFlag.typetime);
+        }
+
+        for (const nodeData of Object.values(nodes) as SGNodeData[]) {
+            this.recursivelyAddNodeToSymbolTable(nodeData);
+        }
+
+        for (const eventData of Object.values(events) as BRSEventData[]) {
+            const eventType = new InterfaceType(eventData.name);
+            eventType.addBuiltInInterfaces();
+            eventType.isBuiltIn = true;
+            this.globalScope.symbolTable.addSymbol(eventData.name, { ...builtInSymbolData, description: eventData.description }, eventType, SymbolTypeFlag.typetime);
+        }
+
+    }
+
     /**
      * A graph of all files and their dependencies.
      * For example:
@@ -108,9 +267,7 @@ export class Program {
      */
     private dependencyGraph = new DependencyGraph();
 
-    private diagnosticFilterer = new DiagnosticFilterer();
-
-    private diagnosticAdjuster = new DiagnosticSeverityAdjuster();
+    public diagnostics: DiagnosticManager;
 
     /**
      * A scope that contains all built-in global functions.
@@ -123,11 +280,34 @@ export class Program {
      */
     public plugins: PluginInterface;
 
+    private fileSymbolInformation = new Map<string, { provides: ProvidedSymbolInfo; requires: UnresolvedSymbol[] }>();
+
+    private currentScopeValidationOptions: ScopeValidationOptions;
+
     /**
-     * A set of diagnostics. This does not include any of the scope diagnostics.
-     * Should only be set from `this.validate()`
+     *  Map of typetime symbols which depend upon the key symbol
      */
-    private diagnostics = [] as BsDiagnostic[];
+    private symbolDependencies = new Map<string, Set<string>>();
+
+
+    /**
+     * Symbol Table for storing custom component types
+     * This is a sibling to the global table (as Components can be used/referenced anywhere)
+     * Keeping custom components out of the global table and in a specific symbol table
+     * compartmentalizes their use
+     */
+    private componentsTable = new SymbolTable('Custom Components');
+
+    public addFileSymbolInfo(file: BrsFile) {
+        this.fileSymbolInformation.set(file.pkgPath, {
+            provides: file.providedSymbols,
+            requires: file.requiredSymbols
+        });
+    }
+
+    public getFileSymbolInfo(file: BrsFile) {
+        return this.fileSymbolInformation.get(file.pkgPath);
+    }
 
     /**
      * The path to bslib.brs (the BrightScript runtime for certain BrighterScript features)
@@ -160,7 +340,16 @@ export class Program {
      * A map of every file loaded into this program, indexed by its original file location
      */
     public files = {} as Record<string, BscFile>;
-    private pkgMap = {} as Record<string, BscFile>;
+    /**
+     * A map of every file loaded into this program, indexed by its destPath
+     */
+    private destMap = new Map<string, BscFile>();
+    /**
+     * Plugins can contribute multiple virtual files for a single physical file.
+     * This collection links the virtual files back to the physical file that produced them.
+     * The key is the standardized and lower-cased srcPath
+     */
+    private fileClusters = new Map<string, BscFile[]>();
 
     /**
      * Map from a lower-cased namespace name part to the set of `BrsFile`s that contribute
@@ -249,6 +438,7 @@ export class Program {
             nameRange: first.nameRange,
             lastPartName: first.lastPartName,
             namespaces: new Map(),
+            namespaceStatements: undefined,
             statements: undefined,
             classStatements: undefined,
             functionStatements: undefined,
@@ -257,6 +447,9 @@ export class Program {
             symbolTable: undefined
         };
         for (const contribution of contributions) {
+            if (contribution.namespaceStatements?.length) {
+                (aggregate.namespaceStatements ??= []).push(...contribution.namespaceStatements);
+            }
             if (contribution.statements?.length) {
                 (aggregate.statements ??= []).push(...contribution.statements);
             }
@@ -301,6 +494,14 @@ export class Program {
 
     protected addScope(scope: Scope) {
         this.scopes[scope.name] = scope;
+        delete this.sortedScopeNames;
+    }
+
+    protected removeScope(scope: Scope) {
+        if (this.scopes[scope.name]) {
+            delete this.scopes[scope.name];
+            delete this.sortedScopeNames;
+        }
     }
 
     /**
@@ -317,18 +518,40 @@ export class Program {
     public getComponent(componentName: string) {
         if (componentName) {
             //return the first compoment in the list with this name
-            //(components are ordered in this list by pkgPath to ensure consistency)
+            //(components are ordered in this list by destPath to ensure consistency)
             return this.components[componentName.toLowerCase()]?.[0];
         } else {
             return undefined;
         }
     }
 
+    /**
+     * Get the sorted names of custom components
+     */
+    public getSortedComponentNames() {
+        const componentNames = Object.keys(this.components);
+        componentNames.sort((a, b) => {
+            if (a < b) {
+                return -1;
+            } else if (b < a) {
+                return 1;
+            }
+            return 0;
+        });
+        return componentNames;
+    }
+
+    /**
+     * Keeps a set of all the components that need to have their types updated during the current validation cycle
+     * Map <componentKey, componentName>
+     */
+    private componentSymbolsToUpdate = new Map<string, string>();
+
     /**
      * Register (or replace) the reference to a component in the component map
      */
     private registerComponent(xmlFile: XmlFile, scope: XmlScope) {
-        const key = (xmlFile.componentName?.text ?? xmlFile.pkgPath).toLowerCase();
+        const key = this.getComponentKey(xmlFile);
         if (!this.components[key]) {
             this.components[key] = [];
         }
@@ -337,8 +560,8 @@ export class Program {
             scope: scope
         });
         this.components[key].sort((a, b) => {
-            const pathA = a.file.pkgPath.toLowerCase();
-            const pathB = b.file.pkgPath.toLowerCase();
+            const pathA = a.file.destPath.toLowerCase();
+            const pathB = b.file.destPath.toLowerCase();
             if (pathA < pathB) {
                 return -1;
             } else if (pathA > pathB) {
@@ -347,13 +570,14 @@ export class Program {
             return 0;
         });
         this.syncComponentDependencyGraph(this.components[key]);
+        this.addDeferredComponentTypeSymbolCreation(xmlFile);
     }
 
     /**
      * Remove the specified component from the components map
      */
     private unregisterComponent(xmlFile: XmlFile) {
-        const key = (xmlFile.componentName?.text ?? xmlFile.pkgPath).toLowerCase();
+        const key = this.getComponentKey(xmlFile);
         const arr = this.components[key] || [];
         for (let i = 0; i < arr.length; i++) {
             if (arr[i].file === xmlFile) {
@@ -361,7 +585,90 @@ export class Program {
                 break;
             }
         }
+
         this.syncComponentDependencyGraph(arr);
+        this.addDeferredComponentTypeSymbolCreation(xmlFile);
+    }
+
+    /**
+     * Adds a component described in an XML to the set of components that needs to be updated this validation cycle.
+     * @param xmlFile XML file with <component> tag
+     */
+    private addDeferredComponentTypeSymbolCreation(xmlFile: XmlFile) {
+        const componentKey = this.getComponentKey(xmlFile);
+        const componentName = xmlFile.componentName?.text;
+        if (this.componentSymbolsToUpdate.has(componentKey)) {
+            return;
+        }
+        this.componentSymbolsToUpdate.set(componentKey, componentName);
+    }
+
+    private getComponentKey(xmlFile: XmlFile) {
+        return (xmlFile.componentName?.text ?? xmlFile.pkgPath).toLowerCase();
+    }
+
+    /**
+     * Resolves symbol table with the first component in this.components to have the same name as the component in the file
+     * @param componentKey key getting a component from `this.components`
+     * @param componentName the unprefixed name of the component that will be added (e.g. 'MyLabel' NOT 'roSgNodeMyLabel')
+     */
+    private updateComponentSymbolInGlobalScope(componentKey: string, componentName: string) {
+        const symbolName = componentName ? util.getSgNodeTypeName(componentName) : undefined;
+        if (!symbolName) {
+            return;
+        }
+        const components = this.components[componentKey] || [];
+        const previousComponentType = this.componentsTable.getSymbolType(symbolName, { flags: SymbolTypeFlag.typetime });
+        // Remove any existing symbols that match
+        this.componentsTable.removeSymbol(symbolName);
+        if (components.length > 0) {
+            // There is a component that can be added - use it.
+            const componentScope = components[0].scope;
+
+            this.componentsTable.removeSymbol(symbolName);
+            componentScope.linkSymbolTable();
+            const componentType = componentScope.getComponentType();
+            if (componentType) {
+                this.componentsTable.addSymbol(symbolName, {}, componentType, SymbolTypeFlag.typetime);
+            }
+            const typeData = {};
+            const isSameAsPrevious = previousComponentType && componentType.isEqual(previousComponentType, typeData);
+            const isComponentTypeDifferent = !previousComponentType || isReferenceType(previousComponentType) || !isSameAsPrevious;
+            componentScope.unlinkSymbolTable();
+            return isComponentTypeDifferent;
+
+        }
+        // There was a previous component type, but no new one, so it's different
+        return !!previousComponentType;
+    }
+
+    /**
+     * Adds a reference type to the global symbol table with the first component in this.components to have the same name as the component in the file
+     * This is so on a first validation, these types can be resolved in teh future (eg. when the actual component is created)
+     * If we don't add reference types at this top level, they will be created at the file level, and will never get resolved
+     * @param componentKey key getting a component from `this.components`
+     * @param componentName the unprefixed name of the component that will be added (e.g. 'MyLabel' NOT 'roSgNodeMyLabel')
+     */
+    private addComponentReferenceType(componentKey: string, componentName: string) {
+        const symbolName = componentName ? util.getSgNodeTypeName(componentName) : undefined;
+        if (!symbolName) {
+            return;
+        }
+        const components = this.components[componentKey] || [];
+
+        if (components.length > 0) {
+            // There is a component that can be added,
+            if (!this.componentsTable.hasSymbol(symbolName, SymbolTypeFlag.typetime)) {
+                // it doesn't already exist in the table
+                const componentRefType = new ReferenceType(symbolName, symbolName, SymbolTypeFlag.typetime, () => this.componentsTable);
+                if (componentRefType) {
+                    this.componentsTable.addSymbol(symbolName, {}, componentRefType, SymbolTypeFlag.typetime);
+                }
+            }
+        } else {
+            // there is no component. remove from table
+            this.componentsTable.removeSymbol(symbolName);
+        }
     }
 
     /**
@@ -377,6 +684,7 @@ export class Program {
             //attach (or re-attach) the dependencyGraph for every component whose position changed
             if (file.dependencyGraphIndex !== i) {
                 file.dependencyGraphIndex = i;
+                this.dependencyGraph.addOrReplace(file.dependencyGraphKey, file.dependencies);
                 file.attachDependencyGraph(this.dependencyGraph);
                 scope.attachDependencyGraph(this.dependencyGraph);
             }
@@ -388,7 +696,7 @@ export class Program {
      * by any scope in the program.
      */
     public getUnreferencedFiles() {
-        let result = [] as File[];
+        let result = [] as BscFile[];
         for (let filePath in this.files) {
             let file = this.files[filePath];
             //is this file part of a scope
@@ -401,49 +709,10 @@ export class Program {
     }
 
     /**
-     * Get the list of errors for the entire program. It's calculated on the fly
-     * by walking through every file, so call this sparingly.
+     * Get the list of errors for the entire program.
      */
     public getDiagnostics() {
-        return this.logger.time(LogLevel.info, ['Program.getDiagnostics()'], () => {
-
-            let diagnostics = [...this.diagnostics];
-
-            //get the diagnostics from all scopes
-            for (let scopeName in this.scopes) {
-                let scope = this.scopes[scopeName];
-                diagnostics.push(
-                    ...scope.getDiagnostics()
-                );
-            }
-
-            //get the diagnostics from all unreferenced files
-            let unreferencedFiles = this.getUnreferencedFiles();
-            for (let file of unreferencedFiles) {
-                diagnostics.push(
-                    ...file.getDiagnostics()
-                );
-            }
-            const filteredDiagnostics = this.logger.time(LogLevel.debug, ['filter diagnostics'], () => {
-                //filter out diagnostics based on our diagnostic filters
-                let finalDiagnostics = this.diagnosticFilterer.filter({
-                    ...this.options,
-                    rootDir: this.options.rootDir
-                }, diagnostics);
-                return finalDiagnostics;
-            });
-
-            this.logger.time(LogLevel.debug, ['adjust diagnostics severity'], () => {
-                this.diagnosticAdjuster.adjust(this.options, diagnostics);
-            });
-
-            this.logger.info(`diagnostic counts: total=${chalk.yellow(diagnostics.length.toString())}, after filter=${chalk.yellow(filteredDiagnostics.length.toString())}`);
-            return filteredDiagnostics;
-        });
-    }
-
-    public addDiagnostics(diagnostics: BsDiagnostic[]) {
-        this.diagnostics.push(...diagnostics);
+        return this.diagnostics.getDiagnostics();
     }
 
     /**
@@ -455,12 +724,9 @@ export class Program {
         return !!this.getFile(filePath, normalizePath);
     }
 
-    public getPkgPath(...args: any[]): any { //eslint-disable-line
-        throw new Error('Not implemented');
-    }
-
     /**
      * roku filesystem is case INsensitive, so find the scope by key case insensitive
+     * @param scopeName xml scope names are their `destPath`. Source scope is stored with the key `"source"`
      */
     public getScopeByName(scopeName: string): Scope | undefined {
         if (!scopeName) {
@@ -491,8 +757,18 @@ export class Program {
      * Update internal maps with this file reference
      */
     private assignFile<T extends BscFile = BscFile>(file: T) {
+        const fileAddEvent: BeforeAddFileEvent = {
+            file: file,
+            program: this
+        };
+
+        this.plugins.emit('beforeAddFile', fileAddEvent);
+
         this.files[file.srcPath.toLowerCase()] = file;
-        this.pkgMap[file.pkgPath.toLowerCase()] = file;
+        this.destMap.set(file.destPath.toLowerCase(), file);
+
+        this.plugins.emit('afterAddFile', fileAddEvent);
+
         return file;
     }
 
@@ -501,45 +777,26 @@ export class Program {
      */
     private unassignFile<T extends BscFile = BscFile>(file: T) {
         delete this.files[file.srcPath.toLowerCase()];
-        delete this.pkgMap[file.pkgPath.toLowerCase()];
+        this.destMap.delete(file.destPath.toLowerCase());
         return file;
     }
 
-    /**
-     * Load a file into the program. If that file already exists, it is replaced.
-     * If file contents are provided, those are used, Otherwise, the file is loaded from the file system
-     * @param srcPath the file path relative to the root dir
-     * @param fileContents the file contents
-     * @deprecated use `setFile` instead
-     */
-    public addOrReplaceFile<T extends BscFile>(srcPath: string, fileContents: string): T;
-    /**
-     * Load a file into the program. If that file already exists, it is replaced.
-     * @param fileEntry an object that specifies src and dest for the file.
-     * @param fileContents the file contents. If not provided, the file will be loaded from disk
-     * @deprecated use `setFile` instead
-     */
-    public addOrReplaceFile<T extends BscFile>(fileEntry: FileObj, fileContents: string): T;
-    public addOrReplaceFile<T extends BscFile>(fileParam: FileObj | string, fileContents: string): T {
-        return this.setFile<T>(fileParam as any, fileContents);
-    }
-
     /**
      * Load a file into the program. If that file already exists, it is replaced.
      * If file contents are provided, those are used, Otherwise, the file is loaded from the file system
      * @param srcDestOrPkgPath the absolute path, the pkg path (i.e. `pkg:/path/to/file.brs`), or the destPath (i.e. `path/to/file.brs` relative to `pkg:/`)
-     * @param fileContents the file contents
+     * @param fileData the file contents. omit or pass `undefined` to prevent loading the data at this time
      */
-    public setFile<T extends BscFile>(srcDestOrPkgPath: string, fileContents: string): T;
+    public setFile<T extends BscFile>(srcDestOrPkgPath: string, fileData?: FileData): T;
     /**
      * Load a file into the program. If that file already exists, it is replaced.
      * @param fileEntry an object that specifies src and dest for the file.
-     * @param fileContents the file contents. If not provided, the file will be loaded from disk
+     * @param fileData the file contents. omit or pass `undefined` to prevent loading the data at this time
      */
-    public setFile<T extends BscFile>(fileEntry: FileObj, fileContents: string): T;
-    public setFile<T extends BscFile>(fileParam: FileObj | string, fileContents: string): T {
+    public setFile<T extends BscFile>(fileEntry: FileObj, fileData: FileData): T;
+    public setFile<T extends BscFile>(fileParam: FileObj | string, fileData: FileData): T {
         //normalize the file paths
-        const { srcPath, pkgPath } = this.getPaths(fileParam, this.options.rootDir);
+        const { srcPath, destPath } = this.getPaths(fileParam, this.options.rootDir);
 
         //namespace contributions for the new/replaced file may differ; force the
         //program-level contributors map to rebuild on next query
@@ -548,109 +805,123 @@ export class Program {
         let file = this.logger.time(LogLevel.debug, ['Program.setFile()', chalk.green(srcPath)], () => {
             //if the file is already loaded, remove it
             if (this.hasFile(srcPath)) {
-                this.removeFile(srcPath);
+                this.removeFile(srcPath, true, true);
             }
-            let fileExtension = path.extname(srcPath).toLowerCase();
-            let file: BscFile | undefined;
 
-            if (fileExtension === '.brs' || fileExtension === '.bs') {
-                //add the file to the program
-                const brsFile = this.assignFile(
-                    new BrsFile(srcPath, pkgPath, this)
-                );
+            const data = new LazyFileData(fileData);
 
-                //add file to the `source` dependency list
-                if (brsFile.pkgPath.startsWith(startOfSourcePkgPath)) {
-                    this.createSourceScope();
-                    this.dependencyGraph.addDependency('scope:source', brsFile.dependencyGraphKey);
-                }
+            const event = new ProvideFileEventInternal(this, srcPath, destPath, data, this.fileFactory);
 
-                let sourceObj: SourceObj = {
-                    //TODO remove `pathAbsolute` in v1
-                    pathAbsolute: srcPath,
-                    srcPath: srcPath,
-                    source: fileContents
-                };
-                this.plugins.emit('beforeFileParse', sourceObj);
+            this.plugins.emit('beforeProvideFile', event);
+            this.plugins.emit('provideFile', event);
+            this.plugins.emit('afterProvideFile', event);
 
-                this.logger.time(LogLevel.debug, ['parse', chalk.green(srcPath)], () => {
-                    brsFile.parse(sourceObj.source);
-                });
+            //if no files were provided, create a AssetFile to represent it.
+            if (event.files.length === 0) {
+                event.files.push(
+                    this.fileFactory.AssetFile({
+                        srcPath: event.srcPath,
+                        destPath: event.destPath,
+                        pkgPath: event.destPath,
+                        data: data
+                    })
+                );
+            }
 
-                //notify plugins that this file has finished parsing
-                this.plugins.emit('afterFileParse', brsFile);
+            //find the file instance for the srcPath that triggered this action.
+            const primaryFile = event.files.find(x => x.srcPath === srcPath);
 
-                file = brsFile;
+            if (!primaryFile) {
+                throw new Error(`No file provided for srcPath '${srcPath}'. Instead, received ${JSON.stringify(event.files.map(x => ({
+                    type: x.type,
+                    srcPath: x.srcPath,
+                    destPath: x.destPath
+                })))}`);
+            }
 
-                brsFile.attachDependencyGraph(this.dependencyGraph);
+            //link the virtual files to the primary file
+            this.fileClusters.set(primaryFile.srcPath?.toLowerCase(), event.files);
 
-            } else if (
-                //is xml file
-                fileExtension === '.xml' &&
-                //resides in the components folder (Roku will only parse xml files in the components folder)
-                pkgPath.toLowerCase().startsWith(util.pathSepNormalize(`components/`))
-            ) {
-                //add the file to the program
-                const xmlFile = this.assignFile(
-                    new XmlFile(srcPath, pkgPath, this)
-                );
+            for (const file of event.files) {
+                file.srcPath = s(file.srcPath);
+                if (file.destPath) {
+                    file.destPath = s`${util.replaceCaseInsensitive(file.destPath, this.options.rootDir, '')}`;
+                }
+                if (file.pkgPath) {
+                    file.pkgPath = s`${util.replaceCaseInsensitive(file.pkgPath, this.options.rootDir, '')}`;
+                } else {
+                    file.pkgPath = file.destPath;
+                }
+                file.excludeFromOutput = file.excludeFromOutput === true;
 
-                let sourceObj: SourceObj = {
-                    //TODO remove `pathAbsolute` in v1
-                    pathAbsolute: srcPath,
-                    srcPath: srcPath,
-                    source: fileContents
-                };
-                this.plugins.emit('beforeFileParse', sourceObj);
+                //set the dependencyGraph key for every file to its destPath
+                file.dependencyGraphKey = file.destPath.toLowerCase();
 
-                this.logger.time(LogLevel.debug, ['parse', chalk.green(srcPath)], () => {
-                    xmlFile.parse(sourceObj.source);
-                });
+                this.assignFile(file);
 
-                //notify plugins that this file has finished parsing
-                this.plugins.emit('afterFileParse', xmlFile);
+                //register a callback anytime this file's dependencies change
+                if (typeof file.onDependenciesChanged === 'function') {
+                    file.disposables ??= [];
+                    file.disposables.push(
+                        this.dependencyGraph.onchange(file.dependencyGraphKey, file.onDependenciesChanged.bind(file))
+                    );
+                }
 
-                file = xmlFile;
+                //register this file (and its dependencies) with the dependency graph
+                this.dependencyGraph.addOrReplace(file.dependencyGraphKey, file.dependencies ?? []);
 
-                //create a new scope for this xml file
-                let scope = new XmlScope(xmlFile, this);
-                this.addScope(scope);
+                //if this is a `source` file, add it to the source scope's dependency list
+                if (this.isSourceBrsFile(file)) {
+                    this.createSourceScope();
+                    this.dependencyGraph.addDependency('scope:source', file.dependencyGraphKey);
+                }
 
-                //register this compoent now that we have parsed it and know its component name
-                this.registerComponent(xmlFile, scope);
+                //if this is an xml file in the components folder, register it as a component
+                if (this.isComponentsXmlFile(file)) {
+                    this.plugins.emit('beforeProvideScope', {
+                        program: this,
+                        scope: undefined
+                    });
+                    //create a new scope for this xml file
+                    let scope = new XmlScope(file, this);
+                    this.addScope(scope);
 
-                //notify plugins that the scope is created and the component is registered
-                this.plugins.emit('afterScopeCreate', scope);
-            } else {
-                //TODO do we actually need to implement this? Figure out how to handle img paths
-                // let genericFile = this.files[srcPath] = <any>{
-                //     srcPath: srcPath,
-                //     pkgPath: pkgPath,
-                //     wasProcessed: true
-                // } as File;
-                // file = <any>genericFile;
+                    //register this componet now that we have parsed it and know its component name
+                    this.registerComponent(file, scope);
+                    this.plugins.emit('provideScope', {
+                        program: this,
+                        scope: scope
+                    });
+
+                    //notify plugins that the scope is created and the component is registered
+                    this.plugins.emit('afterProvideScope', {
+                        program: this,
+                        scope: scope
+                    });
+                }
             }
-            return file;
+
+            return primaryFile;
         });
         return file as T;
     }
 
     /**
-     * Given a srcPath, a pkgPath, or both, resolve whichever is missing, relative to rootDir.
+     * Given a srcPath, a destPath, or both, resolve whichever is missing, relative to rootDir.
      * @param fileParam an object representing file paths
      * @param rootDir must be a pre-normalized path
      */
     private getPaths(fileParam: string | FileObj | { srcPath?: string; pkgPath?: string }, rootDir: string) {
         let srcPath: string | undefined;
-        let pkgPath: string | undefined;
+        let destPath: string | undefined;
 
         assert.ok(fileParam, 'fileParam is required');
 
-        //lift the srcPath and pkgPath vars from the incoming param
+        //lift the path vars from the incoming param
         if (typeof fileParam === 'string') {
             fileParam = this.removePkgPrefix(fileParam);
             srcPath = s`${path.resolve(rootDir, fileParam)}`;
-            pkgPath = s`${util.replaceCaseInsensitive(srcPath, rootDir, '')}`;
+            destPath = s`${util.replaceCaseInsensitive(srcPath, rootDir, '')}`;
         } else {
             let param: any = fileParam;
 
@@ -661,34 +932,34 @@ export class Program {
                 srcPath = s`${param.srcPath}`;
             }
             if (param.dest) {
-                pkgPath = s`${this.removePkgPrefix(param.dest)}`;
+                destPath = s`${this.removePkgPrefix(param.dest)}`;
             }
             if (param.pkgPath) {
-                pkgPath = s`${this.removePkgPrefix(param.pkgPath)}`;
+                destPath = s`${this.removePkgPrefix(param.pkgPath)}`;
             }
         }
 
-        //if there's no srcPath, use the pkgPath to build an absolute srcPath
+        //if there's no srcPath, use the destPath to build an absolute srcPath
         if (!srcPath) {
-            srcPath = s`${rootDir}/${pkgPath}`;
+            srcPath = s`${rootDir}/${destPath}`;
         }
         //coerce srcPath to an absolute path
         if (!path.isAbsolute(srcPath)) {
             srcPath = util.standardizePath(srcPath);
         }
 
-        //if there's no pkgPath, compute relative path from rootDir
-        if (!pkgPath) {
-            pkgPath = s`${util.replaceCaseInsensitive(srcPath, rootDir, '')}`;
+        //if destPath isn't set, compute it from the other paths
+        if (!destPath) {
+            destPath = s`${util.replaceCaseInsensitive(srcPath, rootDir, '')}`;
         }
 
         assert.ok(srcPath, 'fileEntry.src is required');
-        assert.ok(pkgPath, 'fileEntry.dest is required');
+        assert.ok(destPath, 'fileEntry.dest is required');
 
         return {
             srcPath: srcPath,
-            //remove leading slash from pkgPath
-            pkgPath: pkgPath.replace(/^[\/\\]+/, '')
+            //remove leading slash
+            destPath: destPath.replace(/^[\/\\]+/, '')
         };
     }
 
@@ -700,52 +971,33 @@ export class Program {
     }
 
     /**
-     * Ensure source scope is created.
-     * Note: automatically called internally, and no-op if it exists already.
-     */
-    public createSourceScope() {
-        if (!this.scopes.source) {
-            const sourceScope = new Scope('source', this, 'scope:source');
-            sourceScope.attachDependencyGraph(this.dependencyGraph);
-            this.addScope(sourceScope);
-            this.plugins.emit('afterScopeCreate', sourceScope);
-        }
-    }
-
-    /**
-     * Find the file by its absolute path. This is case INSENSITIVE, since
-     * Roku is a case insensitive file system. It is an error to have multiple files
-     * with the same path with only case being different.
-     * @param srcPath the absolute path to the file
-     * @deprecated use `getFile` instead, which auto-detects the path type
+     * Is this file a .brs file found somewhere within the `pkg:/source/` folder?
      */
-    public getFileByPathAbsolute<T extends BrsFile | XmlFile>(srcPath: string) {
-        srcPath = s`${srcPath}`;
-        for (let filePath in this.files) {
-            if (filePath.toLowerCase() === srcPath.toLowerCase()) {
-                return this.files[filePath] as T;
-            }
-        }
+    private isSourceBrsFile(file: BscFile) {
+        return !!/^(pkg:\/)?source[\/\\]/.exec(file.destPath);
     }
 
     /**
-     * Get a list of files for the given (platform-normalized) pkgPath array.
-     * Missing files are just ignored.
-     * @deprecated use `getFiles` instead, which auto-detects the path types
+     * Is this file a .brs file found somewhere within the `pkg:/source/` folder?
      */
-    public getFilesByPkgPaths<T extends BscFile[]>(pkgPaths: string[]) {
-        return pkgPaths
-            .map(pkgPath => this.getFileByPkgPath(pkgPath))
-            .filter(file => file !== undefined) as T;
+    private isComponentsXmlFile(file: BscFile): file is XmlFile {
+        return isXmlFile(file) && !!/^(pkg:\/)?components[\/\\]/.exec(file.destPath);
     }
 
     /**
-     * Get a file with the specified (platform-normalized) pkg path.
-     * If not found, return undefined
-     * @deprecated use `getFile` instead, which auto-detects the path type
+     * Ensure source scope is created.
+     * Note: automatically called internally, and no-op if it exists already.
      */
-    public getFileByPkgPath<T extends BscFile>(pkgPath: string) {
-        return this.pkgMap[pkgPath.toLowerCase()] as T;
+    public createSourceScope() {
+        if (!this.scopes.source) {
+            const sourceScope = new Scope('source', this, 'scope:source');
+            sourceScope.attachDependencyGraph(this.dependencyGraph);
+            this.addScope(sourceScope);
+            this.plugins.emit('afterProvideScope', {
+                program: this,
+                scope: sourceScope
+            });
+        }
     }
 
     /**
@@ -761,29 +1013,45 @@ export class Program {
 
     /**
      * Remove a file from the program
-     * @param filePath can be a srcPath, a pkgPath, or a destPath (same as pkgPath but without `pkg:/`)
+     * @param filePath can be a srcPath, a destPath, or a destPath with leading `pkg:/`
      * @param normalizePath should this function repair and standardize the path? Passing false should have a performance boost if you can guarantee your path is already sanitized
      */
-    public removeFile(filePath: string, normalizePath = true) {
+    public removeFile(filePath: string, normalizePath = true, keepSymbolInformation = false) {
         this.logger.debug('Program.removeFile()', filePath);
+        const paths = this.getPaths(filePath, this.options.rootDir);
 
         //namespace contributions may have included this file; force the program-level
         //contributors map to rebuild on next query
         this.invalidateNamespaceContributorCache();
 
-        let file = this.getFile(filePath, normalizePath);
-        if (file) {
-            this.plugins.emit('beforeFileDispose', file);
+        //there can be one or more File entries for a single srcPath, so get all of them and remove them all
+        const files = this.fileClusters.get(paths.srcPath?.toLowerCase()) ?? [this.getFile(filePath, normalizePath)];
+
+        for (const file of files) {
+            //if a file has already been removed, nothing more needs to be done here
+            if (!file || !this.hasFile(file.srcPath)) {
+                continue;
+            }
+            this.diagnostics.clearForFile(file.srcPath);
+
+            const event: BeforeRemoveFileEvent = { file: file, program: this };
+            this.plugins.emit('beforeRemoveFile', event);
 
             //if there is a scope named the same as this file's path, remove it (i.e. xml scopes)
-            let scope = this.scopes[file.pkgPath];
+            let scope = this.scopes[file.destPath];
             if (scope) {
-                this.plugins.emit('beforeScopeDispose', scope);
+                this.logger.debug('Removing associated scope', scope.name);
+                const scopeRemoveEvent = {
+                    program: this,
+                    scope: scope
+                };
+                this.plugins.emit('beforeRemoveScope', scopeRemoveEvent);
+                this.plugins.emit('removeScope', scopeRemoveEvent);
                 scope.dispose();
                 //notify dependencies of this scope that it has been removed
                 this.dependencyGraph.remove(scope.dependencyGraphKey!);
-                delete this.scopes[file.pkgPath];
-                this.plugins.emit('afterScopeDispose', scope);
+                this.removeScope(this.scopes[file.destPath]);
+                this.plugins.emit('afterRemoveScope', scopeRemoveEvent);
             }
             //remove the file from the program
             this.unassignFile(file);
@@ -791,20 +1059,72 @@ export class Program {
             this.dependencyGraph.remove(file.dependencyGraphKey);
 
             //if this is a pkg:/source file, notify the `source` scope that it has changed
-            if (file.pkgPath.startsWith(startOfSourcePkgPath)) {
+            if (this.isSourceBrsFile(file)) {
                 this.dependencyGraph.removeDependency('scope:source', file.dependencyGraphKey);
             }
+            if (isBrsFile(file)) {
+                this.logger.debug('Removing file symbol info', file.srcPath);
+
+                if (!keepSymbolInformation) {
+                    this.fileSymbolInformation.delete(file.pkgPath);
+                }
+                this.crossScopeValidation.clearResolutionsForFile(file);
+            }
+
+            this.diagnostics.clearForFile(file.srcPath);
 
             //if this is a component, remove it from our components map
             if (isXmlFile(file)) {
+                this.logger.debug('Unregistering component', file.srcPath);
+
                 this.unregisterComponent(file);
             }
+            this.logger.debug('Disposing file', file.srcPath);
+
+            //dispose any disposable things on the file
+            for (const disposable of file?.disposables ?? []) {
+                disposable();
+            }
             //dispose file
-            file?.dispose();
-            this.plugins.emit('afterFileDispose', file);
+            file?.dispose?.();
+
+            this.plugins.emit('afterRemoveFile', event);
         }
     }
 
+    public crossScopeValidation = new CrossScopeValidator(this);
+
+    private isFirstValidation = true;
+
+    private validationDetails: {
+        brsFilesValidated: BrsFile[];
+        xmlFilesValidated: XmlFile[];
+        changedSymbols: Map<SymbolTypeFlag, Set<string>>;
+        changedComponentTypes: string[];
+        scopesToValidate: Scope[];
+        filesToBeValidatedInScopeContext: Set<BscFile>;
+
+    } = {
+            brsFilesValidated: [],
+            xmlFilesValidated: [],
+            changedSymbols: new Map<SymbolTypeFlag, Set<string>>(),
+            changedComponentTypes: [],
+            scopesToValidate: [],
+            filesToBeValidatedInScopeContext: new Set<BscFile>()
+        };
+
+    public lastValidationInfo: {
+        brsFilesSrcPath: Set<string>;
+        xmlFilesSrcPath: Set<string>;
+        scopeNames: Set<string>;
+        componentsRebuilt: Set<string>;
+    } = {
+            brsFilesSrcPath: new Set<string>(),
+            xmlFilesSrcPath: new Set<string>(),
+            scopeNames: new Set<string>(),
+            componentsRebuilt: new Set<string>()
+        };
+
     /**
      * Counter used to track which validation run is being logged
      */
@@ -825,7 +1145,6 @@ export class Program {
     public validate(options: { async: true; cancellationToken?: CancellationToken }): Promise<void>;
     public validate(options?: { async?: boolean; cancellationToken?: CancellationToken }) {
         const validationRunId = this.validationRunSequence++;
-        const timeEnd = this.logger.timeStart(LogLevel.log, `Validating project${(this.logger.logLevel as LogLevel) > LogLevel.log ? ` (run ${validationRunId})` : ''}`);
 
         let previousValidationPromise = this.validatePromise;
         const deferred = new Deferred();
@@ -841,79 +1160,290 @@ export class Program {
             throw new Error('Cannot run synchronous validation while an async validation is in progress');
         }
 
-        if (options?.async) {
-            //we're async, so create a new promise chain to resolve after this validation is done
-            this.validatePromise = Promise.resolve(previousValidationPromise).then(() => {
-                return deferred.promise;
-            });
+        let beforeValidateProgramWasEmitted = false;
 
-            //we are not async but there's a pending promise, then we cannot run this validation
-        } else if (previousValidationPromise !== undefined) {
-            throw new Error('Cannot run synchronous validation while an async validation is in progress');
-        }
+        const brsFilesValidated: BrsFile[] = this.validationDetails.brsFilesValidated;
+        const xmlFilesValidated: XmlFile[] = this.validationDetails.xmlFilesValidated;
+        const changedSymbols = this.validationDetails.changedSymbols;
+        const changedComponentTypes = this.validationDetails.changedComponentTypes;
+        const scopesToValidate = this.validationDetails.scopesToValidate;
+        const filesToBeValidatedInScopeContext = this.validationDetails.filesToBeValidatedInScopeContext;
+
+        //validate every file
+
+        let logValidateEnd = (status?: string) => { };
+
+        //will be populated later on during the correspnding sequencer event
+        let filesToProcess: BscFile[];
 
         const sequencer = new Sequencer({
             name: 'program.validate',
             cancellationToken: options?.cancellationToken ?? new CancellationTokenSource().token,
             minSyncDuration: this.validationMinSyncDuration
         });
+        //this sequencer allows us to run in both sync and async mode, depending on whether options.async is enabled.
+        //We use this to prevent starving the CPU during long validate cycles when running in a language server context
+        sequencer
+            .once('wait for previous run', () => {
+                //if running in async mode, return the previous validation promise to ensure we're only running one at a time
+                if (options?.async) {
+                    return previousValidationPromise;
+                }
+            })
+            .once('before and on programValidate', () => {
+                logValidateEnd = this.logger.timeStart(LogLevel.log, `Validating project${(this.logger.logLevel as LogLevel) > LogLevel.log ? ` (run ${validationRunId})` : ''}`);
+                this.diagnostics.clearForTag(ProgramValidatorDiagnosticsTag);
+                this.plugins.emit('beforeValidateProgram', {
+                    program: this
+                });
+                beforeValidateProgramWasEmitted = true;
+                this.plugins.emit('validateProgram', {
+                    program: this
+                });
+            })
+            .once('get files to be validated', () => {
+                filesToProcess = Object.values(this.files).sort(firstBy(x => x.srcPath)).filter(x => !x.isValidated);
+                for (const file of filesToProcess) {
+                    filesToBeValidatedInScopeContext.add(file);
+                }
+            })
+            .once('add component reference types', () => {
+                // Create reference component types for any component that changes
+                for (let [componentKey, componentName] of this.componentSymbolsToUpdate.entries()) {
+                    this.addComponentReferenceType(componentKey, componentName);
+                }
+            })
+            //run before/validate/after as a single per-file action so the Sequencer can't cancel
+            //between them. Splitting into three forEach steps would let cancellation land after
+            //`validateFile` (where BrsFileValidator pushes per-node symbols via addSymbol) but
+            //before `afterValidateFile` (where processSymbolInformation registers validation
+            //segments) — leaving the file in a half-processed state. The next pass would either
+            //re-run BrsFileValidator (pushing duplicate symbols → CrossScopeValidator name-
+            //collision) or skip the file in scope validation (no segments to walk → no
+            //diagnostics emitted). Atomic-per-file means either the file is fully processed or
+            //it's untouched. Plugins that need an all-files-done signal should use
+            //`afterValidateProgram` instead of `afterValidateFile`.
+            .forEach('validateFile', () => filesToProcess, (file) => {
+                this.plugins.emit('beforeValidateFile', {
+                    program: this,
+                    file: file
+                });
+                this.plugins.emit('validateFile', {
+                    program: this,
+                    file: file
+                });
+                this.plugins.emit('afterValidateFile', {
+                    program: this,
+                    file: file
+                });
+                file.isValidated = true;
+                if (isBrsFile(file)) {
+                    brsFilesValidated.push(file);
+                } else if (isXmlFile(file)) {
+                    xmlFilesValidated.push(file);
+                }
+            })
+            .forEach('do deferred component creation', () => [...brsFilesValidated, ...xmlFilesValidated], (file) => {
+                if (isXmlFile(file)) {
+                    this.addDeferredComponentTypeSymbolCreation(file);
+                } else if (isBrsFile(file)) {
+                    const fileHasChanges = file.providedSymbols.changes.get(SymbolTypeFlag.runtime).size > 0 || file.providedSymbols.changes.get(SymbolTypeFlag.typetime).size > 0;
+                    if (fileHasChanges) {
+                        for (const scope of this.getScopesForFile(file)) {
+                            if (isXmlScope(scope) && this.doesXmlFileRequireProvidedSymbols(scope.xmlFile, file.providedSymbols.changes)) {
+                                this.addDeferredComponentTypeSymbolCreation(scope.xmlFile);
+                            }
+                        }
+                    }
+                }
+            })
+            .once('build component types for any component that changes', () => {
+                this.logger.time(LogLevel.info, ['Build component types'], () => {
+                    this.logger.debug(`Component Symbols to update:`, [...this.componentSymbolsToUpdate.entries()].sort());
+                    this.lastValidationInfo.componentsRebuilt = new Set<string>();
+                    for (let [componentKey, componentName] of this.componentSymbolsToUpdate.entries()) {
+                        this.lastValidationInfo.componentsRebuilt.add(componentName?.toLowerCase());
+                        if (this.updateComponentSymbolInGlobalScope(componentKey, componentName)) {
+                            changedComponentTypes.push(util.getSgNodeTypeName(componentName).toLowerCase());
+                        }
+                    }
+                    this.componentSymbolsToUpdate.clear();
+                });
+            })
+            .once('track and update type-time and runtime symbol dependencies and changes', () => {
+                const changedSymbolsMapArr = [...brsFilesValidated, ...xmlFilesValidated]?.map(f => {
+                    if (isBrsFile(f)) {
+                        return f.providedSymbols.changes;
+                    }
+                    return null;
+                }).filter(x => x);
+
+                // update the map of typetime dependencies
+                for (const file of brsFilesValidated) {
+                    for (const [symbolName, provided] of file.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime).entries()) {
+                        // clear existing dependencies
+                        for (const values of this.symbolDependencies.values()) {
+                            values.delete(symbolName);
+                        }
+
+                        // map types to the set of types that depend upon them
+                        for (const dependentSymbol of provided.requiredSymbolNames?.values() ?? []) {
+                            const dependentSymbolLower = dependentSymbol.toLowerCase();
+                            if (!this.symbolDependencies.has(dependentSymbolLower)) {
+                                this.symbolDependencies.set(dependentSymbolLower, new Set<string>());
+                            }
+                            const symbolsDependentUpon = this.symbolDependencies.get(dependentSymbolLower);
+                            symbolsDependentUpon.add(symbolName);
+                        }
+                    }
+                }
+
+                for (const flag of [SymbolTypeFlag.runtime, SymbolTypeFlag.typetime]) {
+                    const changedSymbolsSetArr = changedSymbolsMapArr.map(symMap => symMap.get(flag));
+                    const changedSymbolSet = new Set<string>();
+                    for (const changeSet of changedSymbolsSetArr) {
+                        for (const change of changeSet) {
+                            changedSymbolSet.add(change);
+                        }
+                    }
+                    if (!changedSymbols.has(flag)) {
+                        changedSymbols.set(flag, changedSymbolSet);
+                    } else {
+                        changedSymbols.set(flag, new Set([...changedSymbols.get(flag), ...changedSymbolSet]));
+                    }
+                }
+
+                // update changed symbol set with any changed component
+                for (const changedComponentType of changedComponentTypes) {
+                    changedSymbols.get(SymbolTypeFlag.typetime).add(changedComponentType);
+                }
+
+                // Add any additional types that depend on a changed type
+                // as each iteration of the loop might add new types, need to keep checking until nothing new is added
+                const dependentTypesChanged = new Set<string>();
+                let foundDependentTypes = false;
+                const changedTypeSymbols = changedSymbols.get(SymbolTypeFlag.typetime);
+                do {
+                    foundDependentTypes = false;
+                    const allChangedTypesSofar = [...Array.from(changedTypeSymbols), ...Array.from(dependentTypesChanged)];
+                    for (const changedSymbol of allChangedTypesSofar) {
+                        const symbolsDependentUponChangedSymbol = this.symbolDependencies.get(changedSymbol) ?? [];
+                        for (const symbolName of symbolsDependentUponChangedSymbol) {
+                            if (!changedTypeSymbols.has(symbolName) && !dependentTypesChanged.has(symbolName)) {
+                                foundDependentTypes = true;
+                                dependentTypesChanged.add(symbolName);
+                            }
+                        }
+                    }
+                } while (foundDependentTypes);
 
-        let beforeProgramValidateWasEmitted = false;
+                changedSymbols.set(SymbolTypeFlag.typetime, new Set([...changedSymbols.get(SymbolTypeFlag.typetime), ...changedTypeSymbols, ...dependentTypesChanged]));
 
-        //this sequencer allows us to run in both sync and async mode, depending on whether options.async is enabled.
-        //We use this to prevent starving the CPU during long validate cycles when running in a language server context
-        sequencer
-            .once(() => {
-                //if running in async mode, return the previous validation promise to ensure we're only running one at a time
-                if (options?.async) {
-                    return previousValidationPromise;
-                }
-            })
-            .once(() => {
-                this.diagnostics = [];
-                this.plugins.emit('beforeProgramValidate', this);
-                beforeProgramValidateWasEmitted = true;
+                this.lastValidationInfo.brsFilesSrcPath = new Set<string>(this.validationDetails.brsFilesValidated.map(f => f.srcPath?.toLowerCase() ?? ''));
+                this.lastValidationInfo.xmlFilesSrcPath = new Set<string>(this.validationDetails.xmlFilesValidated.map(f => f.srcPath?.toLowerCase() ?? ''));
+
+                // can reset filesValidatedList, because they are no longer needed
+                this.validationDetails.brsFilesValidated = [];
+                this.validationDetails.xmlFilesValidated = [];
             })
-            .forEach(() => Object.values(this.files), (file) => {
-                if (!file.isValidated) {
-                    this.plugins.emit('beforeFileValidate', {
-                        program: this,
-                        file: file
-                    });
+            .once('tracks changed symbols and prepares files and scopes for validation', () => {
+                if (this.options.logLevel === LogLevel.debug) {
+                    const changedRuntime = Array.from(changedSymbols.get(SymbolTypeFlag.runtime)).sort();
+                    this.logger.debug('Changed Symbols (runTime):', changedRuntime.join(', '));
+                    const changedTypetime = Array.from(changedSymbols.get(SymbolTypeFlag.typetime)).sort();
+                    this.logger.debug('Changed Symbols (typeTime):', changedTypetime.join(', '));
+                }
+                const didComponentChange = changedComponentTypes.length > 0;
+                const didProvidedSymbolChange = changedSymbols.get(SymbolTypeFlag.runtime).size > 0 || changedSymbols.get(SymbolTypeFlag.typetime).size > 0;
+                const scopesToCheck = this.getScopesForCrossScopeValidation(didComponentChange, didProvidedSymbolChange);
 
-                    //emit an event to allow plugins to contribute to the file validation process
-                    this.plugins.emit('onFileValidate', {
-                        program: this,
-                        file: file
-                    });
-                    //call file.validate() IF the file has that function defined
-                    file.validate?.();
-                    file.isValidated = true;
+                this.crossScopeValidation.buildComponentsMap();
+                this.logger.time(LogLevel.info, ['addDiagnosticsForScopes'], () => {
+                    this.crossScopeValidation.addDiagnosticsForScopes(scopesToCheck);
+                });
+                const filesToRevalidate = this.crossScopeValidation.getFilesRequiringChangedSymbol(scopesToCheck, changedSymbols);
+                for (const file of filesToRevalidate) {
+                    filesToBeValidatedInScopeContext.add(file);
+                }
+
+                this.currentScopeValidationOptions = {
+                    filesToBeValidatedInScopeContext: filesToBeValidatedInScopeContext,
+                    changedSymbols: changedSymbols,
+                    changedFiles: Array.from(filesToBeValidatedInScopeContext),
+                    initialValidation: this.isFirstValidation
+                };
 
-                    this.plugins.emit('afterFileValidate', file);
+                //can reset changedComponent types
+                this.validationDetails.changedComponentTypes = [];
+            })
+            .forEach('invalidate affected scopes', () => filesToBeValidatedInScopeContext, (file) => {
+                if (isBrsFile(file)) {
+                    file.validationSegmenter.unValidateAllSegments();
+                    for (const scope of this.getScopesForFile(file)) {
+                        scope.invalidate();
+                    }
+                }
+            })
+            .once('checking scopes to validate', () => {
+                //sort the scope names so we get consistent results
+                for (const scopeName of this.getSortedScopeNames()) {
+                    let scope = this.scopes[scopeName];
+                    if (scope.shouldValidate(this.currentScopeValidationOptions)) {
+                        scopesToValidate.push(scope);
+                    }
                 }
+                this.lastValidationInfo.scopeNames = new Set<string>(scopesToValidate.map(s => s.name?.toLowerCase() ?? ''));
             })
-            .forEach(Object.values(this.scopes), (scope) => {
-                scope.linkSymbolTable();
-                scope.validate();
-                scope.unlinkSymbolTable();
+            .forEach('beforeScopeValidate', () => scopesToValidate, (scope) => {
+                this.plugins.emit('beforeValidateScope', {
+                    program: this,
+                    scope: scope
+                });
+            })
+            .forEach('validate scope', () => scopesToValidate, (scope) => {
+                scope.validate(this.currentScopeValidationOptions);
+            })
+            .forEach('afterValidateScope', () => scopesToValidate, (scope) => {
+                this.plugins.emit('afterValidateScope', {
+                    program: this,
+                    scope: scope
+                });
             })
-            .once(() => {
+            .once('detect duplicate component names', () => {
                 this.detectDuplicateComponentNames();
+                this.isFirstValidation = false;
+
+                // can reset other validation details
+                this.validationDetails.changedSymbols = new Map<SymbolTypeFlag, Set<string>>();
+                this.validationDetails.scopesToValidate = [];
+                this.validationDetails.filesToBeValidatedInScopeContext = new Set<BscFile>();
+
             })
             .onCancel(() => {
-                timeEnd('cancelled');
+                logValidateEnd('cancelled');
             })
             .onSuccess(() => {
-                timeEnd();
+                logValidateEnd();
             })
             .onComplete(() => {
-                //if we emitted the beforeProgramValidate hook, emit the afterProgramValidate hook as well
-                if (beforeProgramValidateWasEmitted) {
+                //if we emitted the beforeValidateProgram hook, emit the afterValidateProgram hook as well
+                if (beforeValidateProgramWasEmitted) {
                     const wasCancelled = options?.cancellationToken?.isCancellationRequested ?? false;
-                    this.plugins.emit('afterProgramValidate', this, wasCancelled);
+                    this.plugins.emit('afterValidateProgram', {
+                        program: this,
+                        wasCancelled: wasCancelled
+                    });
                 }
 
+                //log all the sequencer timing metrics if `info` logging is enabled
+                this.logger.info(
+                    sequencer.formatMetrics({
+                        header: 'Program.validate metrics:',
+                        //only include loop iterations if `debug` logging is enabled
+                        includeLoopIterations: this.logger.isLogLevelEnabled(LogLevel.debug)
+                    })
+                );
+
                 //regardless of the success of the validation, mark this run as complete
                 deferred.resolve();
                 //clear the validatePromise which means we're no longer running a validation
@@ -930,6 +1460,34 @@ export class Program {
         }
     }
 
+    private getScopesForCrossScopeValidation(someComponentTypeChanged: boolean, didProvidedSymbolChange: boolean) {
+        const scopesForCrossScopeValidation: Scope[] = [];
+        for (let scopeName of this.getSortedScopeNames()) {
+            let scope = this.scopes[scopeName];
+            if (this.globalScope === scope) {
+                continue;
+            }
+            if (someComponentTypeChanged) {
+                scopesForCrossScopeValidation.push(scope);
+            }
+            if (didProvidedSymbolChange && !scope.isValidated) {
+                scopesForCrossScopeValidation.push(scope);
+            }
+        }
+        return scopesForCrossScopeValidation;
+    }
+
+    private doesXmlFileRequireProvidedSymbols(file: XmlFile, providedSymbolsByFlag: Map<SymbolTypeFlag, Set<string>>) {
+        for (const required of file.requiredSymbols) {
+            const symbolNameLower = (required as UnresolvedXMLSymbol).name.toLowerCase();
+            const requiredSymbolIsProvided = providedSymbolsByFlag.get(required.flags).has(symbolNameLower);
+            if (requiredSymbolIsProvided) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Flag all duplicate component names
      */
@@ -953,20 +1511,16 @@ export class Program {
             if (xmlFiles.length > 1) {
                 for (let xmlFile of xmlFiles) {
                     const { componentName } = xmlFile;
-                    this.diagnostics.push({
+                    this.diagnostics.register({
                         ...DiagnosticMessages.duplicateComponentName(componentName.text),
-                        range: xmlFile.componentName.range,
-                        file: xmlFile,
+                        location: xmlFile.componentName.location,
                         relatedInformation: xmlFiles.filter(x => x !== xmlFile).map(x => {
                             return {
-                                location: util.createLocation(
-                                    URI.file(x.srcPath ?? xmlFile.srcPath).toString(),
-                                    x.componentName.range
-                                ),
+                                location: x.componentName.location,
                                 message: 'Also defined here'
                             };
                         })
-                    });
+                    }, { tags: [ProgramValidatorDiagnosticsTag] });
                 }
             }
         }
@@ -983,36 +1537,92 @@ export class Program {
             .filter(file => file !== undefined) as T[];
     }
 
+    private getFilePathCache = new Map<string, { path: string; isDestMap?: boolean }>();
+
     /**
      * Get the file at the given path
      * @param filePath can be a srcPath or a destPath
      * @param normalizePath should this function repair and standardize the path? Passing false should have a performance boost if you can guarantee your path is already sanitized
      */
     public getFile<T extends BscFile>(filePath: string, normalizePath = true) {
+        if (this.getFilePathCache.has(filePath)) {
+            const cachedFilePath = this.getFilePathCache.get(filePath);
+            if (cachedFilePath.isDestMap) {
+                return this.destMap.get(
+                    cachedFilePath.path
+                ) as T;
+            }
+            return this.files[
+                cachedFilePath.path
+            ] as T;
+        }
         if (typeof filePath !== 'string') {
             return undefined;
-        } else if (path.isAbsolute(filePath)) {
+            //is the path absolute (or the `virtual:` prefix)
+        } else if (/^(?:(?:virtual:[\/\\])|(?:\w:)|(?:[\/\\]))/gmi.exec(filePath)) {
+            const standardizedPath = (normalizePath ? util.standardizePath(filePath) : filePath).toLowerCase();
+            this.getFilePathCache.set(filePath, { path: standardizedPath });
+
             return this.files[
-                (normalizePath ? util.standardizePath(filePath) : filePath).toLowerCase()
+                standardizedPath
             ] as T;
-        } else {
-            return this.pkgMap[
-                (normalizePath ? util.standardizePath(filePath) : filePath).toLowerCase()
+        } else if (util.isUriLike(filePath)) {
+            const path = URI.parse(filePath).fsPath;
+            const standardizedPath = (normalizePath ? util.standardizePath(path) : path).toLowerCase();
+            this.getFilePathCache.set(filePath, { path: standardizedPath });
+
+            return this.files[
+                standardizedPath
             ] as T;
+        } else {
+            const standardizedPath = (normalizePath ? util.standardizePath(filePath) : filePath).toLowerCase();
+            this.getFilePathCache.set(filePath, { path: standardizedPath, isDestMap: true });
+            return this.destMap.get(
+                standardizedPath
+            ) as T;
+        }
+    }
+
+    private sortedScopeNames: string[] = undefined;
+
+    /**
+     * Gets a sorted list of all scopeNames, always beginning with "global", "source", then any others in alphabetical order
+     */
+    private getSortedScopeNames() {
+        if (!this.sortedScopeNames) {
+            this.sortedScopeNames = Object.keys(this.scopes).sort((a, b) => {
+                if (a === 'global') {
+                    return -1;
+                } else if (b === 'global') {
+                    return 1;
+                }
+                if (a === 'source') {
+                    return -1;
+                } else if (b === 'source') {
+                    return 1;
+                }
+                if (a < b) {
+                    return -1;
+                } else if (b < a) {
+                    return 1;
+                }
+                return 0;
+            });
         }
+        return this.sortedScopeNames;
     }
 
     /**
      * Get a list of all scopes the file is loaded into
      * @param file the file
      */
-    public getScopesForFile(file: XmlFile | BrsFile | string) {
-
+    public getScopesForFile(file: BscFile | string) {
         const resolvedFile = typeof file === 'string' ? this.getFile(file) : file;
 
         let result = [] as Scope[];
         if (resolvedFile) {
-            for (let key in this.scopes) {
+            const scopeKeys = this.getSortedScopeNames();
+            for (let key of scopeKeys) {
                 let scope = this.scopes[key];
 
                 if (scope.hasFile(resolvedFile)) {
@@ -1026,8 +1636,9 @@ export class Program {
     /**
      * Get the first found scope for a file.
      */
-    public getFirstScopeForFile(file: XmlFile | BrsFile): Scope | undefined {
-        for (let key in this.scopes) {
+    public getFirstScopeForFile(file: BscFile): Scope | undefined {
+        const scopeKeys = this.getSortedScopeNames();
+        for (let key of scopeKeys) {
             let scope = this.scopes[key];
 
             if (scope.hasFile(file)) {
@@ -1041,22 +1652,35 @@ export class Program {
         const filesSearched = new Set<BrsFile>();
         let lowerNamespaceName = namespaceName?.toLowerCase();
         let lowerName = name?.toLowerCase();
+
+        function addToResults(statement: FunctionStatement | MethodStatement, file: BrsFile) {
+            let parentNamespaceName = statement.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(originFile.parseMode)?.toLowerCase();
+            if (statement.tokens.name.text.toLowerCase() === lowerName && (!lowerNamespaceName || parentNamespaceName === lowerNamespaceName)) {
+                if (!results.has(statement)) {
+                    results.set(statement, { item: statement, file: file as BrsFile });
+                }
+            }
+        }
+
         //look through all files in scope for matches
         for (const scope of this.getScopesForFile(originFile)) {
             for (const file of scope.getAllFiles()) {
-                if (isXmlFile(file) || filesSearched.has(file)) {
+                //skip non-brs files, or files we've already processed
+                if (!isBrsFile(file) || filesSearched.has(file)) {
                     continue;
                 }
                 filesSearched.add(file);
 
-                for (const statement of [...file.parser.references.functionStatements, ...file.parser.references.classStatements.flatMap((cs) => cs.methods)]) {
-                    let parentNamespaceName = statement.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(originFile.parseMode)?.toLowerCase();
-                    if (statement.name.text.toLowerCase() === lowerName && (!lowerNamespaceName || parentNamespaceName === lowerNamespaceName)) {
-                        if (!results.has(statement)) {
-                            results.set(statement, { item: statement, file: file });
-                        }
+                file.ast.walk(createVisitor({
+                    FunctionStatement: (statement: FunctionStatement) => {
+                        addToResults(statement, file);
+                    },
+                    MethodStatement: (statement: MethodStatement) => {
+                        addToResults(statement, file);
                     }
-                }
+                }), {
+                    walkMode: WalkMode.visitStatements
+                });
             }
         }
         return [...results.values()];
@@ -1070,7 +1694,7 @@ export class Program {
         let funcNames = new Set<string>();
         let currentScope = scope;
         while (isXmlScope(currentScope)) {
-            for (let name of currentScope.xmlFile.ast.component.api?.functions.map((f) => f.name) ?? []) {
+            for (let name of currentScope.xmlFile.ast.componentElement.interfaceElement?.functions.map((f) => f.name) ?? []) {
                 if (!filterName || name === filterName) {
                     funcNames.add(name);
                 }
@@ -1080,18 +1704,23 @@ export class Program {
 
         //look through all files in scope for matches
         for (const file of scope.getOwnFiles()) {
-            if (isXmlFile(file) || filesSearched.has(file)) {
+            //skip non-brs files, or files we've already processed
+            if (!isBrsFile(file) || filesSearched.has(file)) {
                 continue;
             }
             filesSearched.add(file);
 
-            for (const statement of file.parser.references.functionStatements) {
-                if (funcNames.has(statement.name.text)) {
-                    if (!results.has(statement)) {
-                        results.set(statement, { item: statement, file: file });
+            file.ast.walk(createVisitor({
+                FunctionStatement: (statement: FunctionStatement) => {
+                    if (funcNames.has(statement.tokens.name.text)) {
+                        if (!results.has(statement)) {
+                            results.set(statement, { item: statement, file: file });
+                        }
                     }
                 }
-            }
+            }), {
+                walkMode: WalkMode.visitStatements
+            });
         }
         return [...results.values()];
     }
@@ -1107,16 +1736,10 @@ export class Program {
             return [];
         }
 
-        //find the scopes for this file
-        let scopes = this.getScopesForFile(file);
-
-        //if there are no scopes, include the global scope so we at least get the built-in functions
-        scopes = scopes.length > 0 ? scopes : [this.globalScope];
-
         const event: ProvideCompletionsEvent = {
             program: this,
             file: file,
-            scopes: scopes,
+            scopes: this.getScopesForFile(file),
             position: position,
             completions: []
         };
@@ -1240,17 +1863,36 @@ export class Program {
         const codeActions = [] as CodeAction[];
         const file = this.getFile(srcPath);
         if (file) {
+            const fileUri = util.pathToUri(file?.srcPath);
             const diagnostics = this
                 //get all current diagnostics (filtered by diagnostic filters)
                 .getDiagnostics()
                 //only keep diagnostics related to this file
-                .filter(x => x.file === file)
+                .filter(x => x.location?.uri === fileUri)
                 //only keep diagnostics that touch this range
-                .filter(x => util.rangesIntersectOrTouch(x.range, range));
+                .filter(x => util.rangesIntersectOrTouch(x.location.range, range));
 
             const scopes = this.getScopesForFile(file);
 
-            this.plugins.emit('onGetCodeActions', {
+            this.plugins.emit('beforeProvideCodeActions', {
+                program: this,
+                file: file,
+                range: range,
+                diagnostics: diagnostics,
+                scopes: scopes,
+                codeActions: codeActions
+            });
+
+            this.plugins.emit('provideCodeActions', {
+                program: this,
+                file: file,
+                range: range,
+                diagnostics: diagnostics,
+                scopes: scopes,
+                codeActions: codeActions
+            });
+
+            this.plugins.emit('afterProvideCodeActions', {
                 program: this,
                 file: file,
                 range: range,
@@ -1271,9 +1913,10 @@ export class Program {
         const actions: SourceFixAllCodeAction[] = [];
         const file = this.getFile(srcPath);
         if (file) {
+            const fileUri = util.pathToUri(file.srcPath);
             const diagnostics = this
                 .getDiagnostics()
-                .filter(x => x.file === file);
+                .filter(x => x.location?.uri === fileUri);
             const scopes = this.getScopesForFile(file);
             this.plugins.emit('onGetSourceFixAllCodeActions', {
                 program: this,
@@ -1295,8 +1938,20 @@ export class Program {
     public getSemanticTokens(srcPath: string): SemanticToken[] | undefined {
         const file = this.getFile(srcPath);
         if (file) {
+            this.plugins.emit('beforeProvideSemanticTokens', {
+                program: this,
+                file: file,
+                scopes: this.getScopesForFile(file),
+                semanticTokens: undefined
+            });
             const result = [] as SemanticToken[];
-            this.plugins.emit('onGetSemanticTokens', {
+            this.plugins.emit('provideSemanticTokens', {
+                program: this,
+                file: file,
+                scopes: this.getScopesForFile(file),
+                semanticTokens: result
+            });
+            this.plugins.emit('afterProvideSemanticTokens', {
                 program: this,
                 file: file,
                 scopes: this.getScopesForFile(file),
@@ -1319,9 +1974,6 @@ export class Program {
     public getReferences(srcPath: string, position: Position): Location[] {
         //find the file
         let file = this.getFile(srcPath);
-        if (!file) {
-            return null;
-        }
 
         const event: ProvideReferencesEvent = {
             program: this,
@@ -1337,62 +1989,6 @@ export class Program {
         return event.references;
     }
 
-    /**
-     * Get a list of all script imports, relative to the specified pkgPath
-     * @param sourcePkgPath - the pkgPath of the source that wants to resolve script imports.
-     */
-    public getScriptImportCompletions(sourcePkgPath: string, scriptImport: FileReference) {
-        let lowerSourcePkgPath = sourcePkgPath.toLowerCase();
-
-        let result = [] as CompletionItem[];
-        /**
-         * hashtable to prevent duplicate results
-         */
-        let resultPkgPaths = {} as Record<string, boolean>;
-
-        //restrict to only .brs files
-        for (let key in this.files) {
-            let file = this.files[key];
-            if (
-                //is a BrightScript or BrighterScript file
-                (file.extension === '.bs' || file.extension === '.brs') &&
-                //this file is not the current file
-                lowerSourcePkgPath !== file.pkgPath.toLowerCase()
-            ) {
-                //add the relative path
-                let relativePath = util.getRelativePath(sourcePkgPath, file.pkgPath).replace(/\\/g, '/');
-                let pkgPathStandardized = file.pkgPath.replace(/\\/g, '/');
-                let filePkgPath = `pkg:/${pkgPathStandardized}`;
-                let lowerFilePkgPath = filePkgPath.toLowerCase();
-                if (!resultPkgPaths[lowerFilePkgPath]) {
-                    resultPkgPaths[lowerFilePkgPath] = true;
-
-                    result.push({
-                        label: relativePath,
-                        detail: file.srcPath,
-                        kind: CompletionItemKind.File,
-                        textEdit: {
-                            newText: relativePath,
-                            range: scriptImport.filePathRange
-                        }
-                    });
-
-                    //add the absolute path
-                    result.push({
-                        label: filePkgPath,
-                        detail: file.srcPath,
-                        kind: CompletionItemKind.File,
-                        textEdit: {
-                            newText: filePkgPath,
-                            range: scriptImport.filePathRange
-                        }
-                    });
-                }
-            }
-        }
-        return result;
-    }
-
     /**
      * Transpile a single file and get the result as a string.
      * This does not write anything to the file system.
@@ -1401,248 +1997,277 @@ export class Program {
      * Internal usage should call `_getTranspiledFileContents` instead.
      * @param filePath can be a srcPath or a destPath
      */
-    public async getTranspiledFileContents(filePath: string) {
+    public async getTranspiledFileContents(filePath: string): Promise<FileTranspileResult> {
         const file = this.getFile(filePath);
-        const fileMap: FileObj[] = [{
-            src: file.srcPath,
-            dest: file.pkgPath
-        }];
-        const { entries, astEditor } = this.beforeProgramTranspile(fileMap, this.options.stagingDir);
-        const result = this._getTranspiledFileContents(
-            file
-        );
-        await this._chainInputSourceMap(result, file);
-        this.afterProgramTranspile(entries, astEditor);
-        return result;
+
+        return this.getTranspiledFileContentsPipeline.run(async () => {
+
+            const result = {
+                destPath: file.destPath,
+                pkgPath: file.pkgPath,
+                srcPath: file.srcPath
+            } as FileTranspileResult;
+
+            const expectedPkgPath = file.pkgPath.toLowerCase();
+            const expectedMapPath = `${expectedPkgPath}.map`;
+            const expectedTypedefPkgPath = expectedPkgPath.replace(/\.brs$/i, '.d.bs');
+
+            //add a temporary plugin to tap into the file writing process
+            const plugin = this.plugins.addFirst({
+                name: 'getTranspiledFileContents',
+                beforeWriteFile: (event) => {
+                    const pkgPath = event.file.pkgPath.toLowerCase();
+                    switch (pkgPath) {
+                        //this is the actual transpiled file
+                        case expectedPkgPath:
+                            result.code = event.file.data.toString();
+                            break;
+                        //this is the sourcemap
+                        case expectedMapPath:
+                            result.map = event.file.data.toString();
+                            break;
+                        //this is the typedef
+                        case expectedTypedefPkgPath:
+                            result.typedef = event.file.data.toString();
+                            break;
+                        default:
+                        //no idea what this file is. just ignore it
+                    }
+                    //mark every file as processed so it they don't get written to the output directory
+                    event.processedFiles.add(event.file);
+                }
+            });
+
+            try {
+                //now that the plugin has been registered, run the build with just this file
+                await this.build({
+                    files: [file]
+                });
+            } finally {
+                this.plugins.remove(plugin);
+            }
+            return result;
+        });
     }
+    private getTranspiledFileContentsPipeline = new ActionPipeline();
 
     /**
-     * Internal function used to transpile files.
-     * This does not write anything to the file system
+     * Get the absolute output path for a file
      */
-    private _getTranspiledFileContents(file: BscFile, outputPath?: string): FileTranspileResult {
-        const editor = new AstEditor();
-        this.plugins.emit('beforeFileTranspile', {
-            program: this,
-            file: file,
-            outputPath: outputPath,
-            editor: editor
-        });
-
-        //if we have any edits, assume the file needs to be transpiled
-        if (editor.hasChanges) {
-            //use the `editor` because it'll track the previous value for us and revert later on
-            editor.setProperty(file, 'needsTranspiled', true);
-        }
-
-        //transpile the file
-        const result = file.transpile();
+    private getOutputPath(file: { pkgPath?: string }, outDir = this.getOutDir()) {
+        return s`${outDir}/${file.pkgPath}`;
+    }
 
-        //generate the typedef if enabled
-        let typedef: string;
-        if (isBrsFile(file) && this.options.emitDefinitions) {
-            typedef = file.getTypedef();
+    private getOutDir(outDir?: string) {
+        let result = outDir ?? this.options.outDir ?? this.options.outDir;
+        if (!result) {
+            result = rokuDeploy.getOptions(this.options as any).outDir;
         }
-
-        const event: AfterFileTranspileEvent = {
-            program: this,
-            file: file,
-            outputPath: outputPath,
-            editor: editor,
-            code: result.code,
-            map: result.map,
-            typedef: typedef
-        };
-        this.plugins.emit('afterFileTranspile', event);
-
-        //undo all `editor` edits that may have been applied to this file.
-        editor.undoAll();
-
-        return {
-            srcPath: file.srcPath,
-            pkgPath: file.pkgPath,
-            code: event.code,
-            map: event.map,
-            typedef: event.typedef
-        };
+        result = s`${path.resolve(this.options.cwd ?? process.cwd(), result ?? '/')}`;
+        return result;
     }
 
     /**
-     * If the file has an incoming sourcemap (from a prebuild step), chain it into the
-     * generated sourcemap so the output map traces all the way back to the original source.
-     * This is async because SourceMapConsumer requires async initialisation in source-map v0.7.
+     * Prepare the program for building
+     * @param files the list of files that should be prepared
      */
-    private async _chainInputSourceMap(result: FileTranspileResult, file: BscFile): Promise<void> {
-        if (result.map) {
-            const inputMap = await util.resolveInputSourceMap(file.fileContents ?? '', file.srcPath);
-            if (inputMap) {
-                await util.applySourceMap(result.map, inputMap, file.srcPath);
+    private async prepare(files: BscFile[]) {
+        const programEvent: PrepareProgramEvent = {
+            program: this,
+            editor: this.editor,
+            files: files
+        };
+
+        //assign an editor to every file
+        for (const file of programEvent.files) {
+            //if the file doesn't have an editor yet, assign one now
+            if (!file.editor) {
+                file.editor = new Editor();
             }
         }
-    }
-
-    private beforeProgramTranspile(fileEntries: FileObj[], stagingDir: string) {
-        // map fileEntries using their path as key, to avoid excessive "find()" operations
-        const mappedFileEntries = fileEntries.reduce<Record<string, FileObj>>((collection, entry) => {
-            collection[s`${entry.src}`] = entry;
-            return collection;
-        }, {});
 
-        const getOutputPath = (file: BscFile) => {
-            let filePathObj = mappedFileEntries[s`${file.srcPath}`];
-            if (!filePathObj) {
-                //this file has been added in-memory, from a plugin, for example
-                filePathObj = {
-                    //add an interpolated src path (since it doesn't actually exist in memory)
-                    src: `bsc:/${file.pkgPath}`,
-                    dest: file.pkgPath
-                };
+        //sort the entries to make transpiling more deterministic
+        programEvent.files.sort((a, b) => {
+            if (a.pkgPath < b.pkgPath) {
+                return -1;
+            } else if (a.pkgPath > b.pkgPath) {
+                return 1;
+            } else {
+                return 1;
             }
-            //replace the file extension
-            let outputPath = filePathObj.dest.replace(/\.bs$/gi, '.brs');
-            //prepend the staging folder path
-            outputPath = s`${stagingDir}/${outputPath}`;
-            return outputPath;
-        };
+        });
 
-        const entries = Object.values(this.files)
-            //only include the files from fileEntries
-            .filter(file => !!mappedFileEntries[file.srcPath])
-            .map(file => {
-                return {
-                    file: file,
-                    outputPath: getOutputPath(file)
-                };
-            })
-            //sort the entries to make transpiling more deterministic
-            .sort((a, b) => {
-                return a.file.srcPath < b.file.srcPath ? -1 : 1;
-            });
+        await this.plugins.emitAsync('beforePrepareProgram', programEvent);
+        await this.plugins.emitAsync('prepareProgram', programEvent);
 
-        const astEditor = new AstEditor();
+        const outDir = this.getOutDir();
 
-        this.plugins.emit('beforeProgramTranspile', this, entries, astEditor);
-        return {
-            entries: entries,
-            getOutputPath: getOutputPath,
-            astEditor: astEditor
-        };
-    }
+        const entries: TranspileObj[] = [];
 
-    public async transpile(fileEntries: FileObj[], stagingDir: string) {
-        const { entries, getOutputPath, astEditor } = this.beforeProgramTranspile(fileEntries, stagingDir);
+        for (const file of files) {
+            const scope = this.getFirstScopeForFile(file);
+            //link the symbol table for all the files in this scope
+            scope?.linkSymbolTable();
 
-        const processedFiles = new Set<string>();
+            //if the file doesn't have an editor yet, assign one now
+            if (!file.editor) {
+                file.editor = new Editor();
+            }
+            const event = {
+                program: this,
+                file: file,
+                editor: file.editor,
+                scope: scope,
+                outputPath: this.getOutputPath(file, outDir)
+            } as PrepareFileEvent & { outputPath: string };
 
-        const transpileFile = async (srcPath: string, outputPath?: string) => {
-            //find the file in the program
-            const file = this.getFile(srcPath);
-            //mark this file as processed so we don't process it more than once
-            processedFiles.add(outputPath?.toLowerCase());
+            await this.plugins.emitAsync('beforePrepareFile', event);
+            await this.plugins.emitAsync('prepareFile', event);
+            await this.plugins.emitAsync('afterPrepareFile', event);
 
-            if (!this.options.pruneEmptyCodeFiles || !file.canBePruned) {
-                //skip transpiling typedef files
-                if (isBrsFile(file) && file.isTypedef) {
-                    return;
-                }
+            //TODO remove this in v1
+            entries.push(event);
 
-                const fileTranspileResult = this._getTranspiledFileContents(file, outputPath);
-                await this._chainInputSourceMap(fileTranspileResult, file);
+            //unlink the symbolTable so the next loop iteration can link theirs
+            scope?.unlinkSymbolTable();
+        }
 
-                //make sure the full dir path exists
-                await fsExtra.ensureDir(path.dirname(outputPath));
+        await this.plugins.emitAsync('afterPrepareProgram', programEvent);
+        return files;
+    }
 
-                if (await fsExtra.pathExists(outputPath)) {
-                    throw new Error(`Error while transpiling "${file.srcPath}". A file already exists at "${outputPath}" and will not be overwritten.`);
-                }
-                const writeMapPromise = fileTranspileResult.map ? fsExtra.writeFile(`${outputPath}.map`, this.serializeSourceMap(fileTranspileResult.map, outputPath)) : null;
-                await Promise.all([
-                    fsExtra.writeFile(outputPath, fileTranspileResult.code),
-                    writeMapPromise
-                ]);
-
-                if (fileTranspileResult.typedef) {
-                    const typedefPath = outputPath.replace(/\.brs$/i, '.d.bs');
-                    await fsExtra.writeFile(typedefPath, fileTranspileResult.typedef);
-                }
-            }
-        };
+    /**
+     * Generate the contents of every file
+     */
+    private async serialize(files: BscFile[]) {
 
-        let promises = entries.map(async (entry) => {
-            return transpileFile(entry?.file?.srcPath, entry.outputPath);
-        });
+        const allFiles = new Map<BscFile, SerializedFile[]>();
 
-        //if there's no bslib file already loaded into the program, copy it to the staging directory
-        if (!this.getFile(bslibAliasedRokuModulesPkgPath) && !this.getFile(s`source/bslib.brs`)) {
-            promises.push(util.copyBslibToStaging(stagingDir, this.options.bslibDestinationDir));
+        //exclude prunable files if that option is enabled
+        if (this.options.pruneEmptyCodeFiles === true) {
+            files = files.filter(x => x.canBePruned !== true);
         }
-        await Promise.all(promises);
 
-        //transpile any new files that plugins added since the start of this transpile process
-        do {
-            promises = [];
-            for (const key in this.files) {
-                const file = this.files[key];
-                //this is a new file
-                const outputPath = getOutputPath(file);
-                if (!processedFiles.has(outputPath?.toLowerCase())) {
-                    promises.push(
-                        transpileFile(file?.srcPath, outputPath)
-                    );
-                }
-            }
-            if (promises.length > 0) {
-                this.logger.info(`Transpiling ${promises.length} new files`);
-                await Promise.all(promises);
+        const serializeProgramEvent = await this.plugins.emitAsync('beforeSerializeProgram', {
+            program: this,
+            files: files,
+            result: allFiles
+        });
+        await this.plugins.emitAsync('serializeProgram', serializeProgramEvent);
+
+        // serialize each file
+        for (const file of files) {
+            let scope = this.getFirstScopeForFile(file);
+
+            //if the file doesn't have a scope, create a temporary scope for the file so it can depend on scope-level items
+            if (!scope) {
+                scope = new Scope(`temporary-for-${file.pkgPath}`, this);
+                scope.getAllFiles = () => [file];
+                scope.getOwnFiles = scope.getAllFiles;
             }
+
+            //link the symbol table for all the files in this scope
+            scope?.linkSymbolTable();
+            const event: SerializeFileEvent = {
+                program: this,
+                file: file,
+                scope: scope,
+                result: allFiles
+            };
+            await this.plugins.emitAsync('beforeSerializeFile', event);
+            await this.plugins.emitAsync('serializeFile', event);
+            await this.plugins.emitAsync('afterSerializeFile', event);
+            //unlink the symbolTable so the next loop iteration can link theirs
+            scope?.unlinkSymbolTable();
         }
-        while (promises.length > 0);
-        this.afterProgramTranspile(entries, astEditor);
-    }
 
-    private afterProgramTranspile(entries: TranspileObj[], astEditor: AstEditor) {
-        this.plugins.emit('afterProgramTranspile', this, entries, astEditor);
-        astEditor.undoAll();
+        this.plugins.emit('afterSerializeProgram', serializeProgramEvent);
+
+        return allFiles;
     }
 
     /**
-     * Serialize a source map to a JSON string, handling relativeSourceMaps and sourceRoot.
-     *
-     * relativeSourceMaps:false — legacy: sources[] has absolute paths (rootDir swapped for sourceRoot
-     * if set); map's sourceRoot field is never written.
-     *
-     * relativeSourceMaps:true, no sourceRoot — sources[] is relative to the map file directory.
-     *
-     * relativeSourceMaps:true, sourceRoot set — map's sourceRoot field is written; sources[] is
-     * relative to sourceRoot so that path.resolve(sourceRoot, sources[0]) gives the source file.
+     * Write the entire project to disk
      */
-    private serializeSourceMap(sourceMap: SourceMapGenerator, outputPath: string): string {
-        const { relativeSourceMaps, sourceRoot } = this.options;
+    private async write(outDir: string, files: Map<BscFile, SerializedFile[]>) {
+        const programEvent = await this.plugins.emitAsync('beforeWriteProgram', {
+            program: this,
+            files: files,
+            outDir: outDir
+        });
+        //empty the out directory
+        await fsExtra.emptyDir(outDir);
+
+        const serializedFiles = [...files]
+            .map(([, serializedFiles]) => serializedFiles)
+            .flat();
+
+        //write all the files to disk (asynchronously)
+        await Promise.all(
+            serializedFiles.map(async (file) => {
+                const event = await this.plugins.emitAsync('beforeWriteFile', {
+                    program: this,
+                    file: file,
+                    outputPath: this.getOutputPath(file, outDir),
+                    processedFiles: new Set<SerializedFile>()
+                });
 
-        if (!relativeSourceMaps) {
-            return sourceMap.toString();
-        }
+                await this.plugins.emitAsync('writeFile', event);
 
-        const mapJson = sourceMap.toJSON();
+                await this.plugins.emitAsync('afterWriteFile', event);
+            })
+        );
 
-        if (sourceRoot) {
-            mapJson.sourceRoot = sourceRoot;
-            mapJson.sources = mapJson.sources.map((source: string) => {
-                const absolute = path.isAbsolute(source) ? source : path.resolve(path.dirname(outputPath), source);
-                return path.relative(sourceRoot, absolute).replace(/\\/g, '/');
-            });
-        } else {
-            const mapDir = path.dirname(outputPath);
-            mapJson.sources = mapJson.sources.map((source: string) => {
-                return path.isAbsolute(source)
-                    ? path.relative(mapDir, source).replace(/\\/g, '/')
-                    : source;
+        await this.plugins.emitAsync('afterWriteProgram', programEvent);
+    }
+
+    private buildPipeline = new ActionPipeline();
+
+    /**
+     * Build the project. This transpiles/transforms/copies all files and moves them to the staging directory
+     * @param options the list of options used to build the program
+     */
+    public async build(options?: ProgramBuildOptions) {
+        //run a single build at a time
+        await this.buildPipeline.run(async () => {
+            const outDir = this.getOutDir(options?.outDir);
+
+            const event = await this.plugins.emitAsync('beforeBuildProgram', {
+                program: this,
+                editor: this.editor,
+                files: options?.files ?? Object.values(this.files)
             });
-        }
 
-        return JSON.stringify(mapJson);
+            //prepare the program (and files) for building
+            event.files = await this.prepare(event.files);
+
+            //stage the entire program
+            const serializedFilesByFile = await this.serialize(event.files);
+
+            await this.write(outDir, serializedFilesByFile);
+
+            await this.plugins.emitAsync('afterBuildProgram', event);
+
+            //undo all edits for the program
+            this.editor.undoAll();
+            //undo all edits for each file
+            for (const file of event.files) {
+                file.editor.undoAll();
+            }
+        });
+
+        this.logger.debug('Types Created', TypesCreated);
+        let totalTypesCreated = 0;
+        for (const key in TypesCreated) {
+            if (TypesCreated.hasOwnProperty(key)) {
+                totalTypesCreated += TypesCreated[key];
+
+            }
+        }
+        this.logger.info('Total Types Created', totalTypesCreated);
     }
 
+
     /**
      * Find a list of files in the program that have a function with the given name (case INsensitive)
      */
@@ -1654,7 +2279,8 @@ export class Program {
             if (isBrsFile(file)) {
                 //TODO handle namespace-relative function calls
                 //if the file has a function with this name
-                if (file.parser.references.functionStatementLookup.get(lowerFunctionName) !== undefined) {
+                // eslint-disable-next-line @typescript-eslint/dot-notation
+                if (file['_cachedLookups'].functionStatementMap.get(lowerFunctionName)) {
                     files.push(file);
                 }
             }
@@ -1673,7 +2299,9 @@ export class Program {
             if (isBrsFile(file)) {
                 //TODO handle namespace-relative classes
                 //if the file has a function with this name
-                if (file.parser.references.classStatementLookup.get(lowerClassName) !== undefined) {
+
+                // eslint-disable-next-line @typescript-eslint/dot-notation
+                if (file['_cachedLookups'].classStatementMap.get(lowerClassName) !== undefined) {
                     files.push(file);
                 }
             }
@@ -1687,7 +2315,9 @@ export class Program {
         //find every file with this class defined
         for (const file of Object.values(this.files)) {
             if (isBrsFile(file)) {
-                if (file.parser.references.namespaceStatements.find((x) => {
+
+                // eslint-disable-next-line @typescript-eslint/dot-notation
+                if (file['_cachedLookups'].namespaceStatements.find((x) => {
                     const namespaceName = x.name.toLowerCase();
                     return (
                         //the namespace name matches exactly
@@ -1700,16 +2330,18 @@ export class Program {
                 }
             }
         }
+
         return files;
     }
 
     public findFilesForEnum(name: string) {
         const files = [] as BscFile[];
         const lowerName = name.toLowerCase();
-        //find every file with this class defined
+        //find every file with this enum defined
         for (const file of Object.values(this.files)) {
             if (isBrsFile(file)) {
-                if (file.parser.references.enumStatementLookup.get(lowerName)) {
+                // eslint-disable-next-line @typescript-eslint/dot-notation
+                if (file['_cachedLookups'].enumStatementMap.get(lowerName)) {
                     files.push(file);
                 }
             }
@@ -1791,23 +2423,55 @@ export class Program {
     }
 
     public dispose() {
-        this.plugins.emit('beforeProgramDispose', { program: this });
+        this.plugins.emit('beforeRemoveProgram', { program: this });
 
         for (let filePath in this.files) {
-            this.files[filePath].dispose();
+            this.files[filePath]?.dispose?.();
         }
         for (let name in this.scopes) {
-            this.scopes[name].dispose();
+            this.scopes[name]?.dispose?.();
         }
-        this.globalScope.dispose();
-        this.dependencyGraph.dispose();
+        this.globalScope?.dispose?.();
+        this.dependencyGraph?.dispose?.();
+        this.plugins.emit('removeProgram', { program: this });
+        this.plugins.emit('afterRemoveProgram', { program: this });
     }
 }
 
 export interface FileTranspileResult {
     srcPath: string;
+    destPath: string;
     pkgPath: string;
     code: string;
-    map: SourceMapGenerator;
+    map: string;
     typedef: string;
 }
+
+
+class ProvideFileEventInternal<TFile extends BscFile = BscFile> implements ProvideFileEvent<TFile> {
+    constructor(
+        public program: Program,
+        public srcPath: string,
+        public destPath: string,
+        public data: LazyFileData,
+        public fileFactory: FileFactory
+    ) {
+        this.srcExtension = path.extname(srcPath)?.toLowerCase();
+    }
+
+    public srcExtension: string;
+
+    public files: TFile[] = [];
+}
+
+export interface ProgramBuildOptions {
+    /**
+     * The directory where the final built files should be placed. This directory will be cleared before running
+     */
+    outDir?: string;
+    /**
+     * An array of files to build. If omitted, the entire list of files from the program will be used instead.
+     * Typically you will want to leave this blank
+     */
+    files?: BscFile[];
+}
diff --git a/src/ProgramBuilder.spec.ts b/src/ProgramBuilder.spec.ts
index 82773aff3..98a335347 100644
--- a/src/ProgramBuilder.spec.ts
+++ b/src/ProgramBuilder.spec.ts
@@ -7,13 +7,14 @@ import { ProgramBuilder } from './ProgramBuilder';
 import { standardizePath as s, util } from './util';
 import { LogLevel, createLogger } from './logging';
 import * as diagnosticUtils from './diagnosticUtils';
-import type { BscFile, BsDiagnostic } from '.';
-import { Deferred, Range } from '.';
 import { DiagnosticSeverity } from 'vscode-languageserver';
 import { BrsFile } from './files/BrsFile';
 import { expectZeroDiagnostics } from './testHelpers.spec';
 import type { BsConfig } from './BsConfig';
-import { tempDir, rootDir, stagingDir } from './testHelpers.spec';
+import type { BscFile } from './files/BscFile';
+import { tempDir, rootDir, outDir } from './testHelpers.spec';
+import { Deferred } from './deferred';
+import type { AfterProvideProgramEvent, BsDiagnostic } from './interfaces';
 
 describe('ProgramBuilder', () => {
 
@@ -41,22 +42,60 @@ describe('ProgramBuilder', () => {
         builder.dispose();
     });
 
-    it('includes .program in the afterProgramCreate event', async () => {
+    it('does not corrupt binary files', async () => {
+        //transparent PNG
+        const data = Buffer.from(
+            new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 1, 0, 0, 0, 1, 8, 6, 0, 0, 0, 31, 21, 196, 137, 0, 0, 0, 9, 112, 72, 89, 115, 0, 0, 11, 19, 0, 0, 11, 19, 1, 0, 154, 156, 24, 0, 0, 0, 13, 73, 68, 65, 84, 8, 153, 99, 248, 255, 255, 63, 3, 0, 8, 252, 2, 254, 133, 205, 171, 52, 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130])
+        );
+        fsExtra.outputFileSync(`${rootDir}/assets/image.png`, data);
+        fsExtra.outputFileSync(`${rootDir}/manifest`, '');
+        await builder.run({
+            ...builder.options,
+            outDir: outDir,
+            files: ['**/*']
+        });
+        const newData = fsExtra.readFileSync(s`${outDir}/assets/image.png`);
+        expect(
+            data.compare(newData as any)
+        ).to.eql(0);
+    });
+
+    it('includes .program in the afterProvideProgram event', async () => {
+        builder = new ProgramBuilder();
+        const deferred = new Deferred<Program>();
+        builder.plugins.add({
+            name: 'test',
+            afterProvideProgram: () => {
+                deferred.resolve(builder.program);
+            }
+        });
+        builder['createProgram']();
+        expect(
+            await deferred.promise
+        ).to.exist;
+    });
+
+
+    it('can edit files array in afterProvideProgram event', async () => {
         builder = new ProgramBuilder();
         const deferred = new Deferred<Program>();
         builder.plugins.add({
             name: 'test',
-            afterProgramCreate: () => {
+            afterProvideProgram: (event: AfterProvideProgramEvent) => {
+                event.program.options.files.push('other/**/*.*');
                 deferred.resolve(builder.program);
+
             }
         });
         builder['createProgram']();
         expect(
             await deferred.promise
         ).to.exist;
+
+        expect(builder.options.files.length).to.equal(5);
     });
 
-    describe('loadAllFilesAST', () => {
+    describe('loadFiles', () => {
         it('loads .bs, .brs, .xml files', async () => {
             sinon.stub(util, 'getFilePaths').returns(Promise.resolve([{
                 src: 'file1.brs',
@@ -71,7 +110,7 @@ describe('ProgramBuilder', () => {
 
             let stub = sinon.stub(builder.program, 'setFile');
             sinon.stub(builder, 'getFileContents').returns(Promise.resolve(''));
-            await builder['loadAllFilesAST']();
+            await builder['loadFiles']();
             expect(stub.getCalls()).to.be.lengthOf(3);
         });
 
@@ -93,7 +132,7 @@ describe('ProgramBuilder', () => {
             let stubLoadManifest = sinon.stub(builder.program, 'loadManifest');
             let stubSetFile = sinon.stub(builder.program, 'setFile');
             sinon.stub(builder, 'getFileContents').returns(Promise.resolve(''));
-            await builder['loadAllFilesAST']();
+            await builder['loadFiles']();
             expect(stubLoadManifest.calledBefore(stubSetFile)).to.be.true;
         });
 
@@ -107,7 +146,7 @@ describe('ProgramBuilder', () => {
             fsExtra.outputFileSync(s`${rootDir}/source/lib.d.bs`, '');
             fsExtra.outputFileSync(s`${rootDir}/source/lib.brs`, '');
             const stub = sinon.stub(builder.program, 'setFile');
-            await builder['loadAllFilesAST']();
+            await builder['loadFiles']();
             const srcPaths = stub.getCalls().map(x => x.args[0].src);
             //the d files should be first
             expect(srcPaths.indexOf(s`${rootDir}/source/main.d.bs`)).within(0, 1);
@@ -123,8 +162,8 @@ describe('ProgramBuilder', () => {
                 requestedFiles.push(s(filePath));
             });
             fsExtra.outputFileSync(s`${rootDir}/source/main.brs`, '');
-            await builder['loadAllFilesAST']();
-            //the d file should not be requested because `loadAllFilesAST` knows it doesn't exist
+            await builder['loadFiles']();
+            //the d file should not be requested because `loadFiles` knows it doesn't exist
             expect(requestedFiles).not.to.include(s`${rootDir}/source/main.d.bs`);
             expect(requestedFiles).to.include(s`${rootDir}/source/main.brs`);
         });
@@ -136,6 +175,34 @@ describe('ProgramBuilder', () => {
             await builder.run(undefined as any);
         });
 
+        afterEach(() => {
+            try {
+                fsExtra.removeSync(`${rootDir}/testProject`);
+            } catch (e) {
+                console.error(e);
+            }
+        });
+
+        it('includes non-code files', async () => {
+            fsExtra.outputFileSync(`${rootDir}/source/main.bs`, '');
+            fsExtra.outputFileSync(`${rootDir}/manifest`, '');
+            fsExtra.outputFileSync(`${rootDir}/assets/images/logo.png`, '');
+            fsExtra.outputFileSync(`${rootDir}/locale/en_US/translations.xml`, '');
+
+            await builder.run({
+                ...builder.options,
+                outDir: outDir,
+                files: [
+                    '**/*'
+                ]
+            });
+
+            expect(fsExtra.pathExistsSync(s`${outDir}/source/main.brs`)).to.be.true;
+            expect(fsExtra.pathExistsSync(s`${outDir}/manifest`)).to.be.true;
+            expect(fsExtra.pathExistsSync(s`${outDir}/assets/images/logo.png`)).to.be.true;
+            expect(fsExtra.pathExistsSync(s`${outDir}/locale/en_US/translations.xml`)).to.be.true;
+        });
+
         it('uses default options when the config file fails to parse', async () => {
             //supress the console log statements for the bsconfig parse errors
             sinon.stub(console, 'log').returns(undefined);
@@ -143,9 +210,10 @@ describe('ProgramBuilder', () => {
             fsExtra.outputFileSync(s`${rootDir}/bsconfig.json`, '{');
             await builder.run({
                 project: s`${rootDir}/bsconfig.json`,
-                username: 'john'
+                outDir: 'testOut'
             });
-            expect(builder.program.options.username).to.equal('rokudev');
+            // TODO: this is not run - builder.run throws a diagnostic
+            expect(builder.program.options.outDir).to.equal('./out');
         });
 
         //this fails on the windows travis build for some reason. skipping for now since it's not critical
@@ -157,14 +225,6 @@ describe('ProgramBuilder', () => {
             } catch (e) { }
         });
 
-        afterEach(() => {
-            try {
-                fsExtra.removeSync(`${rootDir}/testProject`);
-            } catch (e) {
-                console.error(e);
-            }
-        });
-
         it('only adds the last file with the same pkg path', async () => {
             //undo the vfs for this test
             sinon.restore();
@@ -174,9 +234,7 @@ describe('ProgramBuilder', () => {
 
             await builder.run({
                 rootDir: s`${rootDir}/testProject`,
-                createPackage: false,
-                deploy: false,
-                copyToStaging: false,
+                noEmit: true,
                 //both files should want to be the `source/lib.brs` file...but only the last one should win
                 files: [{
                     src: s`${rootDir}/testProject/source/lib1.brs`,
@@ -199,9 +257,7 @@ describe('ProgramBuilder', () => {
 
             await builder.run({
                 rootDir: rootDir,
-                createPackage: false,
-                deploy: false,
-                copyToStaging: false,
+                noEmit: true,
                 //both files should want to be the `source/lib.brs` file...but only the last one should win
                 files: ['source/**/*']
             });
@@ -219,9 +275,7 @@ describe('ProgramBuilder', () => {
 
             await builder.run({
                 rootDir: rootDir,
-                createPackage: false,
-                deploy: false,
-                copyToStaging: false,
+                noEmit: true,
                 validate: false,
                 //both files should want to be the `source/lib.brs` file...but only the last one should win
                 files: ['source/**/*']
@@ -241,9 +295,8 @@ describe('ProgramBuilder', () => {
             await builder.run({
                 project: `${rootDir}/bsconfig.json`,
                 rootDir: rootDir,
-                createPackage: false,
-                deploy: false,
-                copyToStaging: false,
+
+
                 files: ['source/**/*']
             });
             //validate was not called
@@ -259,9 +312,8 @@ describe('ProgramBuilder', () => {
             //pass validate:false explicitly - this should override even if the config would otherwise say true
             await builder.run({
                 rootDir: rootDir,
-                createPackage: false,
-                deploy: false,
-                copyToStaging: false,
+
+
                 validate: false,
                 files: ['source/**/*']
             });
@@ -279,9 +331,8 @@ describe('ProgramBuilder', () => {
             //the initial run, then calls program.validate() directly in its own validate() method
             await builder.run({
                 rootDir: rootDir,
-                createPackage: false,
-                deploy: false,
-                copyToStaging: false,
+
+
                 validate: false,
                 showDiagnosticsInConsole: false,
                 files: ['source/**/*']
@@ -299,11 +350,11 @@ describe('ProgramBuilder', () => {
     it('uses a unique logger for each builder', async () => {
         let builder1 = new ProgramBuilder();
         sinon.stub(builder1 as any, 'runOnce').returns(Promise.resolve());
-        sinon.stub(builder1 as any, 'loadAllFilesAST').returns(Promise.resolve());
+        sinon.stub(builder1 as any, 'loadFiles').returns(Promise.resolve());
 
         let builder2 = new ProgramBuilder();
         sinon.stub(builder2 as any, 'runOnce').returns(Promise.resolve());
-        sinon.stub(builder2 as any, 'loadAllFilesAST').returns(Promise.resolve());
+        sinon.stub(builder2 as any, 'loadFiles').returns(Promise.resolve());
 
         expect(builder1.logger).not.to.equal(builder2.logger);
 
@@ -311,13 +362,11 @@ describe('ProgramBuilder', () => {
             builder1.run({
                 logLevel: LogLevel.info,
                 rootDir: rootDir,
-                stagingDir: stagingDir,
                 watch: false
             }),
             builder2.run({
                 logLevel: LogLevel.error,
                 rootDir: rootDir,
-                stagingDir: stagingDir,
                 watch: false
             })
         ]);
@@ -327,48 +376,43 @@ describe('ProgramBuilder', () => {
         expect(builder2.logger.logLevel).to.equal(LogLevel.error);
     });
 
-    it('does not error when loading stagingDir from bsconfig.json', async () => {
+    it('does not error when loading outDir from bsconfig.json', async () => {
         fsExtra.ensureDirSync(rootDir);
         fsExtra.writeFileSync(`${rootDir}/bsconfig.json`, `{
-            "stagingDir": "./out"
+            "outDir": "./out"
         }`);
         let builder = new ProgramBuilder();
         await builder.run({
-            cwd: rootDir,
-            createPackage: false
+            cwd: rootDir
         });
     });
 
     it('forwards program events', async () => {
-        const beforeProgramValidate = sinon.spy();
-        const afterProgramValidate = sinon.spy();
+        const beforeValidateProgram = sinon.spy();
+        const afterValidateProgram = sinon.spy();
         builder.plugins.add({
             name: 'forwards program events',
-            beforeProgramValidate: beforeProgramValidate,
-            afterProgramValidate: afterProgramValidate
-        });
-        await builder.run({
-            createPackage: false
+            beforeValidateProgram: beforeValidateProgram,
+            afterValidateProgram: afterValidateProgram
         });
-        expect(beforeProgramValidate.callCount).to.equal(1);
-        expect(afterProgramValidate.callCount).to.equal(1);
+        await builder.run({});
+        expect(beforeValidateProgram.callCount).to.equal(1);
+        expect(afterValidateProgram.callCount).to.equal(1);
     });
 
 
     describe('printDiagnostics', () => {
 
         it('does not crash when a diagnostic is missing range informtaion', () => {
-            const file = builder.program.setFile('source/main.brs', ``);
-            file.addDiagnostics([{
+            builder.program.setFile('source/main.brs', ``);
+            builder.diagnostics.register([{
                 message: 'message 1',
-                code: 'test1',
-                file: file
+                code: 'test1'
             }, {
                 message: 'message 2',
-                code: 'test1',
-                file: file
+                code: 'test1'
             }] as any);
-            const stub = sinon.stub(diagnosticUtils, 'printDiagnostic').callsFake(() => { });
+            const stub = sinon.stub(diagnosticUtils, 'printDiagnostic').callsFake((...args) => { });
             //if this doesn't crash, then the test passes
             builder['printDiagnostics']();
             expect(stub.getCalls().map(x => x.args[4].message)).to.eql([
@@ -399,12 +443,10 @@ describe('ProgramBuilder', () => {
         it('prints diagnostic, when file is present in project', () => {
             builder.options.showDiagnosticsInConsole = true;
 
-            let diagnostics = createBsDiagnostic('p1', ['m1']);
-            let f1 = diagnostics[0].file as BrsFile;
-            f1.fileContents = `l1\nl2\nl3`;
-            sinon.stub(builder, 'getDiagnostics').returns(diagnostics);
+            let diagnostics = createBsDiagnostics('p1', ['m1']);
+            builder.program.setFile('p1', `l1\nl2\nl3`);
 
-            sinon.stub(builder.program, 'getFile').returns(f1);
+            sinon.stub(builder, 'getDiagnostics').returns(diagnostics);
 
             let printStub = sinon.stub(diagnosticUtils, 'printDiagnostic');
 
@@ -417,13 +459,9 @@ describe('ProgramBuilder', () => {
     it('prints diagnostic, when file has no lines', () => {
         builder.options.showDiagnosticsInConsole = true;
 
-        let diagnostics = createBsDiagnostic('p1', ['m1']);
-        let f1 = diagnostics[0].file as BrsFile;
-        (f1.fileContents as any) = null;
+        let diagnostics = createBsDiagnostics('p1', ['m1']);
+        builder.program.setFile('p1', null);
         sinon.stub(builder, 'getDiagnostics').returns(diagnostics);
-
-        sinon.stub(builder.program, 'getFile').returns(f1);
-
         let printStub = sinon.stub(diagnosticUtils, 'printDiagnostic');
 
         builder['printDiagnostics']();
@@ -434,7 +472,7 @@ describe('ProgramBuilder', () => {
     it('prints diagnostic, when no file present', () => {
         builder.options.showDiagnosticsInConsole = true;
 
-        let diagnostics = createBsDiagnostic('p1', ['m1']);
+        let diagnostics = createBsDiagnostics('p1', ['m1']);
         sinon.stub(builder, 'getDiagnostics').returns(diagnostics);
 
         sinon.stub(builder.program, 'getFile').returns(null as any);
@@ -495,18 +533,17 @@ describe('ProgramBuilder', () => {
     });
 });
 
-function createBsDiagnostic(filePath: string, messages: string[]): BsDiagnostic[] {
-    let file = new BrsFile(filePath, filePath, null as any);
-    let diagnostics: BsDiagnostic[] = [];
+function createBsDiagnostics(filePath: string, messages: string[]): BsDiagnostic[] {
+    let file = new BrsFile({ srcPath: filePath, destPath: filePath, program: null });
+    let diagnostics = [];
     for (let message of messages) {
         let d = createDiagnostic(file, 1, message);
-        d.file = file;
         diagnostics.push(d);
     }
     return diagnostics;
 }
 function createDiagnostic(
-    bscFile: BscFile,
+    file: BscFile,
     code: number,
     message: string,
     startLine = 0,
@@ -515,11 +552,10 @@ function createDiagnostic(
     endCol = 99999,
     severity: DiagnosticSeverity = DiagnosticSeverity.Error
 ) {
-    const diagnostic = {
+    const diagnostic: BsDiagnostic = {
         code: code,
         message: message,
-        range: Range.create(startLine, startCol, endLine, endCol),
-        file: bscFile,
+        location: util.createLocationFromFileRange(file, util.createRange(startLine, startCol, endLine, endCol)),
         severity: severity
     };
     return diagnostic;
diff --git a/src/ProgramBuilder.ts b/src/ProgramBuilder.ts
index 81196bea4..2ff64aa49 100644
--- a/src/ProgramBuilder.ts
+++ b/src/ProgramBuilder.ts
@@ -1,9 +1,8 @@
 import * as debounce from 'debounce-promise';
 import * as path from 'path';
 import { rokuDeploy } from 'roku-deploy';
-import type { LogLevel as RokuDeployLogLevel } from 'roku-deploy/dist/Logger';
 import type { BsConfig, FinalizedBsConfig } from './BsConfig';
-import type { BscFile, BsDiagnostic, FileObj, FileResolver } from './interfaces';
+import type { BsDiagnostic, FileObj, FileResolver } from './interfaces';
 import { Program } from './Program';
 import { standardizePath as s, util } from './util';
 import { Watcher } from './Watcher';
@@ -15,7 +14,8 @@ import * as diagnosticUtils from './diagnosticUtils';
 import * as fsExtra from 'fs-extra';
 import * as requireRelative from 'require-relative';
 import { Throttler } from './Throttler';
-import { URI } from 'vscode-uri';
+import type { BrsFile } from './files/BrsFile';
+import { DiagnosticManager } from './DiagnosticManager';
 
 /**
  * A runner class that handles
@@ -32,9 +32,7 @@ export class ProgramBuilder {
 
         //add the default file resolver (used to load source file contents).
         this.addFileResolver((filePath) => {
-            return fsExtra.readFile(filePath).then((value) => {
-                return value.toString();
-            });
+            return fsExtra.readFile(filePath);
         });
     }
     /**
@@ -68,53 +66,38 @@ export class ProgramBuilder {
         let reversedResolvers = [...this.fileResolvers].reverse();
         for (let fileResolver of reversedResolvers) {
             let result = await fileResolver(srcPath);
-            if (typeof result === 'string') {
+            if (typeof result === 'string' || Buffer.isBuffer(result)) {
                 return result;
             }
         }
         throw new Error(`Could not load file "${srcPath}"`);
     }
 
-    /**
-     * A list of diagnostics that are always added to the `getDiagnostics()` call.
-     */
-    private staticDiagnostics = [] as BsDiagnostic[];
+    public diagnostics = new DiagnosticManager();
 
     public addDiagnostic(srcPath: string, diagnostic: Partial<BsDiagnostic>) {
         if (!this.program) {
             throw new Error('Cannot call `ProgramBuilder.addDiagnostic` before `ProgramBuilder.run()`');
         }
-        let file: BscFile | undefined = this.program.getFile(srcPath);
-        if (!file) {
-            file = {
-                pkgPath: path.basename(srcPath),
-                pathAbsolute: srcPath, //keep this for backwards-compatibility. TODO remove in v1
-                srcPath: srcPath,
-                getDiagnostics: () => {
-                    return [<any>diagnostic];
-                }
-            } as BscFile;
+        if (!diagnostic.location) {
+            diagnostic.location = {
+                uri: util.pathToUri(srcPath),
+                range: util.createRange(0, 0, 0, 0)
+            };
+        } else {
+            diagnostic.location.uri = util.pathToUri(srcPath);
         }
-        diagnostic.file = file;
-        this.staticDiagnostics.push(<any>diagnostic);
+        this.diagnostics.register(<any>diagnostic, { tags: ['ProgramBuilder'] });
     }
 
-    public getDiagnostics() {
-        return [
-            ...this.staticDiagnostics,
-            ...(this.program?.getDiagnostics() ?? [])
-        ];
+    public getDiagnostics(): BsDiagnostic[] {
+        return this.diagnostics.getDiagnostics();
     }
 
-    public async run(options: BsConfig) {
-        if (options?.logLevel) {
-            this.logger.logLevel = options.logLevel;
-        }
-
-        if (this.isRunning) {
-            throw new Error('Server is already running');
-        }
-        this.isRunning = true;
+    /**
+     * Load the project and all the files, but don't run the validation, transpile, or watch cycles
+     */
+    public async load(options: BsConfig) {
         try {
             this.options = util.normalizeAndResolveConfig(options);
             if (this.options?.logLevel !== undefined) {
@@ -122,7 +105,7 @@ export class ProgramBuilder {
             }
 
             if (this.options.noProject) {
-                this.logger.log(`'no-project' flag is set so bsconfig.json loading is disabled'`);
+                this.logger.log(`'noProject' flag is set so bsconfig.json loading is disabled'`);
             } else if (this.options.project) {
                 this.logger.log(`Using config file: "${this.options.project}"`);
             } else {
@@ -136,9 +119,9 @@ export class ProgramBuilder {
                 showDiagnosticsInConsole: options?.showDiagnosticsInConsole
             });
 
-            if (e?.file && e.message && e.code) {
+            if (e?.location && e.message && e.code) {
                 let err = e as BsDiagnostic;
-                this.staticDiagnostics.push(err);
+                this.diagnostics.register(err);
             } else {
                 //if this is not a diagnostic, something else is wrong...
                 throw e;
@@ -151,25 +134,47 @@ export class ProgramBuilder {
         this.createProgram();
 
         //parse every file in the entire project
-        await this.loadAllFilesAST();
+        await this.loadFiles();
+    }
+
+    public async run(options: BsConfig) {
+        if (options?.logLevel) {
+            this.logger.logLevel = options.logLevel;
+        }
+
+        if (this.isRunning) {
+            throw new Error('Server is already running');
+        }
+        this.isRunning = true;
+
+        await this.load(options);
 
         if (this.options.watch) {
             this.logger.log('Starting compilation in watch mode...');
             await this.runOnce({
-                validate: options?.validate
+                validate: options?.validate,
+                noEmit: options?.noEmit
             });
             this.enableWatchMode();
         } else {
             await this.runOnce({
-                validate: options?.validate
+                validate: options?.validate,
+                noEmit: options?.noEmit
             });
         }
     }
 
     protected createProgram() {
-        this.program = new Program(this.options, this.logger, this.plugins);
+        this.program = new Program(this.options, this.logger, this.plugins, this.diagnostics);
+        this.plugins.emit('provideProgram', {
+            builder: this,
+            program: this.program
+        });
 
-        this.plugins.emit('afterProgramCreate', this.program);
+        this.plugins.emit('afterProvideProgram', {
+            builder: this,
+            program: this.program
+        });
 
         return this.program;
     }
@@ -186,7 +191,9 @@ export class ProgramBuilder {
             this.plugins.add(plugin);
         }
 
-        this.plugins.emit('beforeProgramCreate', this);
+        this.plugins.emit('beforeProvideProgram', {
+            builder: this
+        });
     }
 
     /**
@@ -286,7 +293,8 @@ export class ProgramBuilder {
     /**
      * Run the entire process exactly one time.
      */
-    private runOnce(options?: { validate?: boolean }) {
+    private runOnce(options?: { validate?: boolean; noEmit?: boolean }) {
+
         //clear the console
         this.clearConsole();
         let cancellationToken = { isCanceled: false };
@@ -295,7 +303,8 @@ export class ProgramBuilder {
             //start the new run
             return this._runOnce({
                 cancellationToken: cancellationToken,
-                validate: options?.validate
+                validate: options?.validate,
+                noEmit: options?.noEmit
             });
         }) as any;
 
@@ -318,41 +327,42 @@ export class ProgramBuilder {
         //group the diagnostics by file
         let diagnosticsByFile = {} as Record<string, BsDiagnostic[]>;
         for (let diagnostic of diagnostics) {
-            if (!diagnosticsByFile[diagnostic.file.srcPath]) {
-                diagnosticsByFile[diagnostic.file.srcPath] = [];
+            const diagnosticFileKey = diagnostic.location?.uri ?? 'no-uri';
+            if (!diagnosticsByFile[diagnosticFileKey]) {
+                diagnosticsByFile[diagnosticFileKey] = [];
             }
-            diagnosticsByFile[diagnostic.file.srcPath].push(diagnostic);
+            diagnosticsByFile[diagnosticFileKey].push(diagnostic);
         }
 
         //get printing options
         const options = diagnosticUtils.getPrintDiagnosticOptions(this.options);
         const { cwd, emitFullPaths } = options;
 
-        let srcPaths = Object.keys(diagnosticsByFile).sort();
-        for (let srcPath of srcPaths) {
-            let diagnosticsForFile = diagnosticsByFile[srcPath];
+        let fileUris = Object.keys(diagnosticsByFile).sort();
+        for (let fileUri of fileUris) {
+            let diagnosticsForFile = diagnosticsByFile[fileUri];
             //sort the diagnostics in line and column order
             let sortedDiagnostics = diagnosticsForFile.sort((a, b) => {
                 return (
-                    (a.range?.start.line ?? -1) - (b.range?.start.line ?? -1) ||
-                    (a.range?.start.character ?? -1) - (b.range?.start.character ?? -1)
+                    (a.location?.range?.start.line ?? -1) - (b.location?.range?.start.line ?? -1) ||
+                    (a.location?.range?.start.character ?? -1) - (b.location?.range?.start.character ?? -1)
                 );
             });
 
-            let filePath = srcPath;
+            let filePath = util.uriToPath(fileUri);
             if (!emitFullPaths) {
                 filePath = path.relative(cwd, filePath);
             }
             //load the file text
-            const file = this.program?.getFile(srcPath);
+            const file = this.program?.getFile(fileUri);
             //get the file's in-memory contents if available
-            const lines = file?.fileContents?.split(/\r?\n/g) ?? [];
+            const lines = (file as BrsFile)?.fileContents?.split(/\r?\n/g) ?? [];
 
             for (let diagnostic of sortedDiagnostics) {
                 //default the severity to error if undefined
                 let severity = typeof diagnostic.severity === 'number' ? diagnostic.severity : DiagnosticSeverity.Error;
-                let relatedInformation = (diagnostic.relatedInformation ?? []).map(x => {
-                    let relatedInfoFilePath = URI.parse(x.location.uri).fsPath;
+                let relatedInformation = (util.toDiagnostic(diagnostic, diagnostic.source)?.relatedInformation ?? []).map(x => {
+                    let relatedInfoFilePath = util.uriToPath(x.location?.uri);
                     if (!emitFullPaths) {
                         relatedInfoFilePath = path.relative(cwd, relatedInfoFilePath);
                     }
@@ -372,7 +382,7 @@ export class ProgramBuilder {
      * Run the process once, allowing it to be cancelled.
      * NOTE: This should only be called by `runOnce`.
      */
-    private async _runOnce(options: { cancellationToken: { isCanceled: any }; validate?: boolean }) {
+    private async _runOnce(options: { cancellationToken: { isCanceled: any }; validate: boolean; noEmit: boolean }) {
         let wereDiagnosticsPrinted = false;
         try {
             //maybe cancel?
@@ -400,17 +410,15 @@ export class ProgramBuilder {
                 return errorCount;
             }
 
-            //create the deployment package (and transpile as well)
-            await this.createPackageIfEnabled();
+            if (options.noEmit !== true) {
+                await this.transpile();
+            }
 
             //maybe cancel?
             if (options?.cancellationToken?.isCanceled === true) {
                 return -1;
             }
 
-            //deploy the package
-            await this.deployPackageIfEnabled();
-
             return 0;
         } catch (e) {
             if (wereDiagnosticsPrinted === false) {
@@ -420,45 +428,19 @@ export class ProgramBuilder {
         }
     }
 
-    private async createPackageIfEnabled() {
-        if (this.options.copyToStaging || this.options.createPackage || this.options.deploy) {
-
-            //transpile the project
-            await this.transpile();
-
-            //create the zip file if configured to do so
-            if (this.options.createPackage !== false || this.options.deploy) {
-                await this.logger.time(LogLevel.log, [`Creating package at ${this.options.outFile}`], async () => {
-                    await rokuDeploy.zipPackage({
-                        ...this.options,
-                        logLevel: this.options.logLevel as unknown as RokuDeployLogLevel,
-                        outDir: util.getOutDir(this.options),
-                        outFile: path.basename(this.options.outFile)
-                    });
-                });
-            }
-        }
-    }
-
-    private transpileThrottler = new Throttler(0);
+    private buildThrottler = new Throttler(0);
     /**
-     * Transpiles the entire program into the staging folder
+     * Build the entire project and place the contents into the staging directory
      */
-    public async transpile() {
-        await this.transpileThrottler.run(async () => {
-            let options = util.cwdWork(this.options.cwd, () => {
-                return rokuDeploy.getOptions({
-                    ...this.options,
-                    logLevel: this.options.logLevel as unknown as RokuDeployLogLevel,
-                    outDir: util.getOutDir(this.options),
-                    outFile: path.basename(this.options.outFile)
-
-                    //rokuDeploy's return type says all its fields can be nullable, but it sets values for all of them.
-                }) as any as Required<ReturnType<typeof rokuDeploy.getOptions>>;
-            });
-
+    public async build() {
+        await this.buildThrottler.run(async () => {
             //get every file referenced by the files array
-            let fileMap = await rokuDeploy.getFilePaths(options.files, options.rootDir);
+            let fileMap = Object.values(this.program.files).map(x => {
+                return {
+                    src: x.srcPath,
+                    dest: x.destPath
+                };
+            });
 
             //remove files currently loaded in the program, we will transpile those instead (even if just for source maps)
             let filteredFileMap = [] as FileObj[];
@@ -469,71 +451,51 @@ export class ProgramBuilder {
                 }
             }
 
-            this.plugins.emit('beforePrepublish', this, filteredFileMap);
-
-            await this.logger.time(LogLevel.log, ['Copying to staging directory'], async () => {
-                //prepublish all non-program-loaded files to staging
-                await rokuDeploy.prepublishToStaging({
-                    ...options,
-                    files: filteredFileMap
-                });
-            });
-
-            this.plugins.emit('afterPrepublish', this, filteredFileMap);
-            this.plugins.emit('beforePublish', this, fileMap);
-
-            await this.logger.time(LogLevel.log, ['Transpiling'], async () => {
+            await this.logger.time(LogLevel.log, ['Building'], async () => {
                 //transpile any brighterscript files
-                await this.program!.transpile(fileMap, options.stagingDir);
+                await this.program!.build();
             });
-
-            this.plugins.emit('afterPublish', this, fileMap);
         });
     }
 
-    private async deployPackageIfEnabled() {
-        //deploy the project if configured to do so
-        if (this.options.deploy) {
-            await this.logger.time(LogLevel.log, ['Deploying package to', this.options.host], async () => {
-                await rokuDeploy.publish({
-                    ...this.options,
-                    logLevel: this.options.logLevel as unknown as RokuDeployLogLevel,
-                    outDir: util.getOutDir(this.options),
-                    outFile: path.basename(this.options.outFile)
-                });
-            });
-        }
+    /**
+     * Transpiles the entire program into the staging folder
+     * @deprecated use `.build()` instead
+     */
+    public async transpile() {
+        return this.build();
     }
 
     /**
-     * Parse and load the AST for every file in the project
+     * Load every file into the project
      */
-    private async loadAllFilesAST() {
-        await this.logger.time(LogLevel.log, ['Parsing files'], async () => {
+    private async loadFiles() {
+        await this.logger.time(LogLevel.log, ['load files'], async () => {
             let files = await this.logger.time(LogLevel.debug, ['getFilePaths'], async () => {
                 return util.getFilePaths(this.options);
             });
-            this.logger.trace('ProgramBuilder.loadAllFilesAST() files:', files);
+            this.logger.trace('ProgramBuilder.loadFiles() files:', files);
 
             const typedefFiles = [] as FileObj[];
-            const sourceFiles = [] as FileObj[];
+            const allOtherFiles = [] as FileObj[];
             let manifestFile: FileObj | null = null;
 
             for (const file of files) {
-                // source files (.brs, .bs, .xml)
-                if (/(?<!\.d)\.(bs|brs|xml)$/i.test(file.dest)) {
-                    sourceFiles.push(file);
-
-                    // typedef files (.d.bs)
-                } else if (/\.d\.bs$/i.test(file.dest)) {
+                // typedef files
+                if (/\.d\.bs$/i.test(file.dest)) {
                     typedefFiles.push(file);
 
-                    // manifest file
-                } else if (/^manifest$/i.test(file.dest)) {
-                    manifestFile = file;
+                    // all other files
+                } else {
+                    if (/^manifest$/i.test(file.dest)) {
+                        //manifest file
+                        manifestFile = file;
+                    }
+                    allOtherFiles.push(file);
                 }
             }
 
+            //load the manifest file first
             if (manifestFile) {
                 this.program!.loadManifest(manifestFile, false);
             }
@@ -545,8 +507,10 @@ export class ProgramBuilder {
                     this.logger.log(e); // log the error, but don't fail this process because the file might be fixable later
                 }
             };
-            await Promise.all(typedefFiles.map(loadFile)); // preload every type definition file, which eliminates duplicate file loading
-            await Promise.all(sourceFiles.map(loadFile)); // parse source files
+            // preload every type definition file, which eliminates duplicate file loading
+            await Promise.all(typedefFiles.map(loadFile));
+            // load all other files
+            await Promise.all(allOtherFiles.map(loadFile));
         });
     }
 
diff --git a/src/Scope.spec.ts b/src/Scope.spec.ts
index ecbd00017..a5c93d16f 100644
--- a/src/Scope.spec.ts
+++ b/src/Scope.spec.ts
@@ -4,12 +4,34 @@ import { Position, Range } from 'vscode-languageserver';
 import util, { standardizePath as s } from './util';
 import { DiagnosticMessages } from './DiagnosticMessages';
 import { Program } from './Program';
-import { ParseMode } from './parser/Parser';
 import PluginInterface from './PluginInterface';
-import { expectDiagnostics, expectZeroDiagnostics, trim } from './testHelpers.spec';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectTypeToBe, expectZeroDiagnostics, trim } from './testHelpers.spec';
 import type { BrsFile } from './files/BrsFile';
-import type { NamespaceStatement } from './parser/Statement';
-import type { OnScopeValidateEvent } from './interfaces';
+import type { AssignmentStatement, ForEachStatement, IfStatement, NamespaceStatement, PrintStatement, TypeStatement } from './parser/Statement';
+import type { CompilerPlugin, ValidateScopeEvent } from './interfaces';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import { EnumMemberType, EnumType } from './types/EnumType';
+import { ClassType } from './types/ClassType';
+import { BooleanType } from './types/BooleanType';
+import { StringType } from './types/StringType';
+import { IntegerType } from './types/IntegerType';
+import { DynamicType } from './types/DynamicType';
+import { FloatType } from './types/FloatType';
+import { NamespaceType } from './types/NamespaceType';
+import { DoubleType } from './types/DoubleType';
+import { UnionType } from './types/UnionType';
+import { isBlock, isCallExpression, isForEachStatement, isFunctionExpression, isFunctionStatement, isIfStatement, isNamespaceStatement, isPrintStatement, isTypeStatement } from './astUtils/reflection';
+import { ArrayType } from './types/ArrayType';
+import { AssociativeArrayType } from './types/AssociativeArrayType';
+import { InterfaceType } from './types/InterfaceType';
+import { ComponentType } from './types/ComponentType';
+import { WalkMode, createVisitor } from './astUtils/visitors';
+import type { BinaryExpression, CallExpression, DottedGetExpression, FunctionExpression } from './parser/Expression';
+import { ObjectType, TypedFunctionType, UninitializedType } from './types';
+import undent from 'undent';
+import * as fsExtra from 'fs-extra';
+import { InlineInterfaceType } from './types/InlineInterfaceType';
+import { IntersectionType } from './types/IntersectionType';
 
 describe('Scope', () => {
     let sinon = sinonImport.createSandbox();
@@ -68,16 +90,19 @@ describe('Scope', () => {
         program.validate();
         const scope = program.getScopesForFile('source/alpha.bs')[0];
         scope.linkSymbolTable();
-        const symbolTable = file.parser.references.namespaceStatements[1].body.getSymbolTable();
+        const symbolTable = file.ast.findChildren<NamespaceStatement>(isNamespaceStatement)[1].body.getSymbolTable();
         //the symbol table should contain the relative names for all items in this namespace across the entire scope
         expect(
-            symbolTable.hasSymbol('Beta')
+            // eslint-disable-next-line no-bitwise
+            symbolTable.hasSymbol('Beta', SymbolTypeFlag.runtime | SymbolTypeFlag.typetime)
         ).to.be.true;
         expect(
-            symbolTable.hasSymbol('Charlie')
+            // eslint-disable-next-line no-bitwise
+            symbolTable.hasSymbol('Charlie', SymbolTypeFlag.runtime | SymbolTypeFlag.typetime)
         ).to.be.true;
         expect(
-            symbolTable.hasSymbol('createBeta')
+            // eslint-disable-next-line no-bitwise
+            symbolTable.hasSymbol('createBeta', SymbolTypeFlag.runtime)
         ).to.be.true;
 
         expectZeroDiagnostics(program);
@@ -93,7 +118,51 @@ describe('Scope', () => {
         expectZeroDiagnostics(program);
     });
 
-    it('flags parameter with same name as namespace', () => {
+    it('does not flag unrelated namespace const and function collision', () => {
+        program.setFile('source/main.bs', `
+            namespace alpha
+                const options = {}
+            end namespace
+            namespace beta
+                sub options()
+                end sub
+            end namespace
+        `);
+        program.validate();
+        expectZeroDiagnostics(program);
+    });
+
+    it('does flag related namespace const and function collision', () => {
+        program.setFile('source/main.bs', `
+            namespace alpha
+                const options = {}
+            end namespace
+            namespace alpha
+                sub options()
+                end sub
+            end namespace
+        `);
+        program.validate();
+        expectDiagnostics(program, [
+            DiagnosticMessages.nameCollision('Const', 'Function', 'alpha.options').message,
+            DiagnosticMessages.nameCollision('Function', 'Const', 'alpha.options').message
+        ]);
+    });
+
+    it('does not flag namespaced const and un-namespaced function collision', () => {
+        program.setFile('source/main.bs', `
+            namespace alpha
+                const options = {}
+            end namespace
+
+            sub options()
+            end sub
+        `);
+        program.validate();
+        expectZeroDiagnostics(program);
+    });
+
+    it('allows parameter with same name as namespace', () => {
         program.setFile('source/main.bs', `
             namespace NameA.NameB
             end namespace
@@ -101,12 +170,10 @@ describe('Scope', () => {
             end sub
         `);
         program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.parameterMayNotHaveSameNameAsNamespace('nameA')
-        ]);
+        expectZeroDiagnostics(program);
     });
 
-    it('flags parameter with same name as a sub namespace part', () => {
+    it('allows parameter with same name as a sub namespace part', () => {
         program.setFile('source/main.bs', `
             namespace alpha
                 sub test(lineHeight as integer)
@@ -117,48 +184,20 @@ describe('Scope', () => {
             end namespace
         `);
         program.validate();
-        expectDiagnostics(program, [{
-            //sub test(|lineHeight| as integer)
-            message: DiagnosticMessages.parameterMayNotHaveSameNameAsNamespace('lineHeight').message,
-            range: util.createRange(2, 25, 2, 35)
-        }]);
+        expectZeroDiagnostics(program);
     });
 
-    it('flags assignments with same name as namespace', () => {
+    it('allows assignments with same name as namespace', () => {
         program.setFile('source/main.bs', `
             namespace NameA.NameB
             end namespace
             sub main()
                 namea = 2
-                NAMEA += 1
+                NAMEA = 1
             end sub
         `);
         program.validate();
-        expectDiagnostics(program, [
-            {
-                ...DiagnosticMessages.variableMayNotHaveSameNameAsNamespace('namea'),
-                range: util.createRange(4, 16, 4, 21)
-            },
-            {
-                ...DiagnosticMessages.variableMayNotHaveSameNameAsNamespace('NAMEA'),
-                range: util.createRange(5, 16, 5, 21)
-            },
-            {
-                ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
-                range: util.createRange(5, 16, 5, 21)
-            }
-        ]);
-    });
-
-    it('allows adding diagnostics', () => {
-        const source = program.getScopeByName('source');
-        const expected = [{
-            message: 'message',
-            file: undefined,
-            range: undefined
-        }];
-        source.addDiagnostics(expected);
-        expectDiagnostics(source, expected);
+        expectZeroDiagnostics(program);
     });
 
     it('allows getting all scopes', () => {
@@ -320,20 +359,20 @@ describe('Scope', () => {
             program.validate();
             expectDiagnostics(program, [
                 {
-                    message: DiagnosticMessages.cannotFindName('delta').message,
-                    file: {
-                        srcPath: buttonPrimary.srcPath
+                    ...DiagnosticMessages.cannotFindName('delta', 'constants.alpha.delta', 'constants.alpha', 'namespace'),
+                    location: {
+                        uri: util.pathToUri(buttonPrimary?.srcPath)
                     },
                     relatedInformation: [{
-                        message: `Not defined in scope '${s('components/ButtonPrimary.xml')}'`
+                        message: `In component scope 'ButtonPrimary'`
                     }]
                 }, {
-                    message: DiagnosticMessages.cannotFindName('delta').message,
-                    file: {
-                        srcPath: buttonSecondary.srcPath
+                    ...DiagnosticMessages.cannotFindName('delta', 'constants.alpha.delta', 'constants.alpha', 'namespace'),
+                    location: {
+                        uri: util.pathToUri(buttonSecondary?.srcPath)
                     },
                     relatedInformation: [{
-                        message: `Not defined in scope '${s('components/ButtonSecondary.xml')}'`
+                        message: `In component scope 'ButtonSecondary'`
                     }]
                 }
             ]);
@@ -384,15 +423,15 @@ describe('Scope', () => {
             `);
             program.validate();
             expectDiagnostics(program, [{
-                ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
-                range: util.createRange(6, 32, 6, 39)
+                ...DiagnosticMessages.cannotFindName('Charlie'),
+                location: { range: util.createRange(6, 32, 6, 39) }
             }, {
                 ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
-                range: util.createRange(7, 32, 7, 50)
+                location: { range: util.createRange(7, 32, 7, 50) }
             }]);
         });
 
-        it('flags assignment with same name as a sub namespace part', () => {
+        it('allows assignment with same name as a sub namespace part', () => {
             program.setFile('source/main.bs', `
                 namespace alpha
                     sub test()
@@ -404,11 +443,7 @@ describe('Scope', () => {
                 end namespace
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                //|lineHeight| = 1
-                message: DiagnosticMessages.variableMayNotHaveSameNameAsNamespace('lineHeight').message,
-                range: util.createRange(3, 24, 3, 34)
-            }]);
+            expectZeroDiagnostics(program);
         });
 
         it('flags local vars with same name as a sub namespace part', () => {
@@ -429,8 +464,8 @@ describe('Scope', () => {
             program.validate();
             expectDiagnostics(program, [{
                 //print |lineHeight|
-                message: DiagnosticMessages.itemCannotBeUsedAsVariable('namespace').message,
-                range: util.createRange(3, 30, 3, 40)
+                message: DiagnosticMessages.cannotFindName('lineHeight').message,
+                location: { range: util.createRange(3, 30, 3, 40) }
             }]);
         });
 
@@ -452,13 +487,6 @@ describe('Scope', () => {
                     A_B_C_ga()
                 end sub
             `);
-            program.setFile('source/main.xml', `
-                <?xml version="1.0" encoding="UTF-8"?>
-                    <component name="MyComponent" extends="Group">
-                    <script type="text/brightscript" uri="main.brs"/>
-                    <script type="text/brightscript" uri="ns.bs"/>
-                </component>
-            `);
             program.validate();
             expectZeroDiagnostics(program);
         });
@@ -495,8 +523,7 @@ describe('Scope', () => {
             `);
             program.validate();
             expectDiagnostics(program, [{
-                ...DiagnosticMessages.cannotFindName('subname', 'Name1.subname'),
-                range: util.createRange(2, 26, 2, 33)
+                ...DiagnosticMessages.cannotFindName('subname', 'Name1.subname', 'Name1', 'namespace')
             }]);
         });
 
@@ -575,7 +602,7 @@ describe('Scope', () => {
                 end function
             `);
             program.validate();
-            expectDiagnostics(program, [
+            expectDiagnosticsIncludes(program, [
                 DiagnosticMessages.cannotFindName('param2'),
                 DiagnosticMessages.cannotFindName('name2'),
                 DiagnosticMessages.cannotFindName('item2'),
@@ -763,9 +790,75 @@ describe('Scope', () => {
                 `);
                 program.validate();
                 // only care about code and `roFontMetrics` match
-                expectDiagnostics(program, [
-                    DiagnosticMessages.unknownBrightScriptComponent('roFontMetrics')
-                ]);
+                expectDiagnostics(program, [{
+                    ...DiagnosticMessages.unknownBrightScriptComponent('roFontMetrics'),
+                    location: { range: Range.create(2, 51, 2, 66) }
+                }]);
+            });
+
+            it('infers the correct type', () => {
+                const file = program.setFile<BrsFile>(`source/file.brs`, `
+                    sub main()
+                        scene = CreateObject("roSGScreen")
+                        button = CreateObject("roSGNode", "Button")
+                        list = CreateObject("roSGNode", "MarkupList")
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainSymbolTable = file.ast.findChild(isBlock).getSymbolTable();
+                const sceneType = mainSymbolTable.getSymbolType('scene', { flags: SymbolTypeFlag.runtime }) as InterfaceType;
+                expectTypeToBe(sceneType, InterfaceType);
+                expect(sceneType.name).to.eq('roSGScreen');
+                const buttonType = mainSymbolTable.getSymbolType('button', { flags: SymbolTypeFlag.runtime }) as InterfaceType;
+                expectTypeToBe(buttonType, ComponentType);
+                expect(buttonType.name).to.eq('Button');
+                const listType = mainSymbolTable.getSymbolType('list', { flags: SymbolTypeFlag.runtime }) as InterfaceType;
+                expectTypeToBe(listType, ComponentType);
+                expect(listType.name).to.eq('MarkupList');
+            });
+
+            it('infers custom component types', () => {
+                program.setFile('components/Comp1.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Comp1" extends="Group">
+                    </component>
+                `);
+                program.setFile('components/Comp2.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Comp2" extends="Poster">
+                    </component>
+                `);
+                const file = program.setFile<BrsFile>(`source/file.brs`, `
+                    sub main()
+                        comp1 = CreateObject("roSGNode", "Comp1")
+                        comp2 = CreateObject("roSGNode", "Comp2")
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                program.getScopeByName('source').linkSymbolTable();
+                const mainSymbolTable = file.ast.findChild(isBlock).getSymbolTable();
+                const comp1Type = mainSymbolTable.getSymbolType('comp1', { flags: SymbolTypeFlag.runtime }) as InterfaceType;
+                expectTypeToBe(comp1Type, ComponentType);
+                expect(comp1Type.name).to.eq('Comp1');
+                const comp2Type = mainSymbolTable.getSymbolType('comp2', { flags: SymbolTypeFlag.runtime }) as InterfaceType;
+                expectTypeToBe(comp2Type, ComponentType);
+                expect(comp2Type.name).to.eq('Comp2');
+            });
+
+            it('implies objectType by default', () => {
+                const file = program.setFile<BrsFile>(`source/file.brs`, `
+                    function getObj(myObjName)
+                        result = CreateObject(myObjName)
+                        return result
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainSymbolTable = file.ast.findChild(isBlock).getSymbolTable();
+                const resultType = mainSymbolTable.getSymbolType('result', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(resultType, ObjectType);
             });
         });
 
@@ -812,7 +905,7 @@ describe('Scope', () => {
                     sayMyName = function(name as string)
                     end function
 
-                    sayMyName()
+                    sayMyName("John Doe")
                 end sub`
             );
             program.validate();
@@ -832,21 +925,10 @@ describe('Scope', () => {
                 program.validate();
                 expectDiagnostics(program, [{
                     ...DiagnosticMessages.localVarFunctionShadowsParentFunction('stdlib'),
-                    range: Range.create(2, 24, 2, 27)
+                    location: { range: Range.create(2, 24, 2, 27) }
                 }]);
             });
 
-            it('warns when local var has same name as built-in function', () => {
-                program.setFile(`source/main.brs`, `
-                    sub main()
-                        str = 12345
-                        print str ' prints "12345" (i.e. our local variable is allowed to shadow the built-in function name)
-                    end sub
-                `);
-                program.validate();
-                expectZeroDiagnostics(program);
-            });
-
             it('warns when local var has same name as built-in function', () => {
                 program.setFile(`source/main.brs`, `
                     sub main()
@@ -874,11 +956,11 @@ describe('Scope', () => {
                 program.validate();
                 expectDiagnostics(program, [{
                     message: DiagnosticMessages.localVarFunctionShadowsParentFunction('scope').message,
-                    range: Range.create(2, 24, 2, 32)
+                    location: { range: Range.create(2, 24, 2, 32) }
                 }]);
             });
 
-            it('detects local function with same name as scope function', () => {
+            it('detects local variable with same name as scope function', () => {
                 program.setFile(`source/main.brs`, `
                     sub main()
                         getHello = "override"
@@ -891,7 +973,23 @@ describe('Scope', () => {
                 program.validate();
                 expectDiagnostics(program, [{
                     message: DiagnosticMessages.localVarShadowedByScopedFunction().message,
-                    range: Range.create(2, 24, 2, 32)
+                    location: { range: Range.create(2, 24, 2, 32) }
+                }]);
+            });
+
+            it('detects function param with same name as scope function', () => {
+                program.setFile(`source/main.brs`, `
+                    sub main(getHello = "hello")
+                        print getHello ' prints <Function: gethello> (i.e. local variable override does NOT work for same-scope-defined methods)
+                    end sub
+                    function getHello()
+                        return "hello"
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [{
+                    message: DiagnosticMessages.localVarShadowedByScopedFunction().message,
+                    location: { range: Range.create(1, 29, 1, 37) }
                 }]);
             });
 
@@ -905,10 +1003,15 @@ describe('Scope', () => {
                     end function
                 `);
                 program.validate();
-                expectDiagnostics(program, [{
-                    message: DiagnosticMessages.scopeFunctionShadowedByBuiltInFunction().message,
-                    range: Range.create(4, 29, 4, 32)
-                }]);
+                expectDiagnostics(program, [
+                    {
+                        message: DiagnosticMessages.nameCollision('Function', 'Global Function', 'Str').message,
+                        location: { range: Range.create(4, 29, 4, 32) }
+                    }, {
+                        message: DiagnosticMessages.scopeFunctionShadowedByBuiltInFunction().message,
+                        location: { range: Range.create(4, 29, 4, 32) }
+                    }
+                ]);
             });
         });
 
@@ -927,8 +1030,8 @@ describe('Scope', () => {
             program.validate();
             //we should have the "DoA declared more than once" error twice (one for each function named "DoA")
             expectDiagnostics(program, [
-                DiagnosticMessages.duplicateFunctionImplementation('DoA', 'source'),
-                DiagnosticMessages.duplicateFunctionImplementation('DoA', 'source')
+                DiagnosticMessages.duplicateFunctionImplementation('DoA'),
+                DiagnosticMessages.duplicateFunctionImplementation('DoA')
             ]);
         });
 
@@ -1007,6 +1110,51 @@ describe('Scope', () => {
             ]);
         });
 
+        it('detects calling interface function with too few args', () => {
+            program.setFile('source/file.bs', `
+                sub init(arg as Tester)
+                    arg.test()
+                end sub
+                interface Tester
+                    sub test(param1)
+                end interface
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(1, 0).message
+            ]);
+        });
+
+        it('detects calling interface function with too many args', () => {
+            program.setFile('source/file.bs', `
+                sub init(arg as Tester)
+                    arg.test(1, 2)
+                end sub
+                interface Tester
+                    sub test(param1)
+                end interface
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(1, 2).message
+            ]);
+        });
+
+        it('detects calling interface function with mismatch argument type', () => {
+            program.setFile('source/file.bs', `
+                sub init(arg as Tester)
+                    arg.test(1)
+                end sub
+                interface Tester
+                    sub test(param1 as string)
+                end interface
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message
+            ]);
+        });
+
         it('detects calling class constructors with too many parameters', () => {
             program.setFile('source/main.bs', `
                 function noop0()
@@ -1127,25 +1275,170 @@ describe('Scope', () => {
             program.plugins = new PluginInterface();
             const plugin = program.plugins.add({
                 name: 'Emits validation events',
-                beforeScopeValidate: sinon.spy(),
-                onScopeValidate: sinon.spy(),
-                afterScopeValidate: sinon.spy()
+                beforeValidateScope: sinon.spy(),
+                validateScope: sinon.spy(),
+                afterValidateScope: sinon.spy()
             });
             program.validate();
-            const scopeNames = program.getScopes().map(x => x.name).filter(x => x !== 'global').sort();
+            let scopeNames = program.getScopes().map(x => x.name).filter(x => x !== 'global').sort();
 
-            expect(plugin.beforeScopeValidate.callCount).to.equal(2);
-            expect(plugin.beforeScopeValidate.calledWith(sourceScope)).to.be.true;
-            expect(plugin.beforeScopeValidate.calledWith(compScope)).to.be.true;
+            const scopes = plugin.beforeValidateScope.getCalls().map(x => x.args[0].scope);
+            expect(plugin.beforeValidateScope.callCount).to.equal(2);
+            expect(scopes).to.include(sourceScope);
+            expect(scopes).to.include(compScope);
 
-            expect(plugin.onScopeValidate.callCount).to.equal(2);
-            expect(plugin.onScopeValidate.getCalls().map(
-                x => (x.args[0] as OnScopeValidateEvent).scope.name
+            expect(plugin.validateScope.callCount).to.equal(2);
+            expect(plugin.validateScope.getCalls().map(
+                x => (x.args[0] as ValidateScopeEvent).scope.name
             ).sort()).to.eql(scopeNames);
 
-            expect(plugin.afterScopeValidate.callCount).to.equal(2);
-            expect(plugin.afterScopeValidate.calledWith(sourceScope)).to.be.true;
-            expect(plugin.afterScopeValidate.calledWith(compScope)).to.be.true;
+            scopeNames = program.getScopes().map(x => x.name).filter(x => x !== 'global').sort();
+            expect(plugin.afterValidateScope.callCount).to.equal(2);
+            expect(scopes).to.include(sourceScope);
+            expect(scopes).to.include(compScope);
+        });
+
+        it('supports parameter types in functions in AA literals defined in other scope', () => {
+            program.setFile('source/util.brs', `
+                function getObj() as object
+                    aa = {
+                        name: "test"
+                        addInts: function(a = 1 as integer, b =-1 as integer) as integer
+                            return a + b
+                        end function
+                    }
+                    return aa
+                end function
+            `);
+            program.setFile('components/comp.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="comp" extends="Scene">
+                    <script uri="comp.brs"/>
+                    <script uri="pkg:/source/util.brs"/>
+                </component>
+            `);
+            program.setFile(s`components/comp.brs`, ``);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('name collisions', () => {
+            it('should validate when class have name collisions with global function', () => {
+                program.setFile('source/main.bs', `
+                    class Log
+                    end class
+
+                    interface Lcase
+                        name as string
+                    end interface
+
+                `);
+                program.validate();
+                expectDiagnosticsIncludes(program, [
+                    DiagnosticMessages.nameCollision('Class', 'Global Function', 'Log').message
+                ]);
+            });
+
+            it('should not validate when interfaces have name collisions with global function', () => {
+                program.setFile('source/main.bs', `
+                    interface Lcase
+                        name as string
+                    end interface
+
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('should validate when a namespace has a name collision with a class', () => {
+                program.setFile('source/main.bs', `
+                    namespace SomeKlass
+                        function anything()
+                        end function
+                    end namespace
+
+                    class SomeKlass
+                    end class
+                `);
+                program.validate();
+                let diagnostics = program.getDiagnostics();
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.nameCollision('Namespace', 'Class', 'SomeKlass').message,
+                    DiagnosticMessages.nameCollision('Class', 'Namespace', 'SomeKlass').message
+                ]);
+            });
+
+            it('should not give diagnostics for a class that partially matches a namespace', () => {
+                program.setFile('source/main.bs', `
+                    namespace some.nameSpace
+                        function anything()
+                        end function
+                    end namespace
+
+                    namespace some
+                            class name
+                            end class
+                    end namespace
+
+                    namespace some
+                        class name2
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                let diagnostics = program.getDiagnostics();
+                expect(diagnostics).to.be.empty;
+            });
+
+            it('should validate when an enum has a name collision with a namespace', () => {
+                program.setFile('source/main.bs', `
+                    namespace SomeEnum
+                        function anything()
+                        end function
+                    end namespace
+
+                    enum SomeEnum
+                        a = "A"
+                        b = "B"
+                    end enum
+                `);
+                program.validate();
+                let diagnostics = program.getDiagnostics();
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.nameCollision('Enum', 'Namespace', 'SomeEnum').message,
+                    DiagnosticMessages.nameCollision('Namespace', 'Enum', 'SomeEnum').message
+                ]);
+            });
+
+            it('should not validate when a const has a name collision with something else in different namespace', () => {
+                program.setFile('source/main.bs', `
+                    namespace SomeEnum
+                        const MY_CONST = "hello"
+                    end namespace
+
+                    function MY_CONST()
+                    end function
+                `);
+                program.validate();
+                let diagnostics = program.getDiagnostics();
+                expectZeroDiagnostics(diagnostics);
+            });
+
+            it('should validate when a const has a name collision with something else in same namespace', () => {
+                program.setFile('source/main.bs', `
+                    namespace SomeEnum
+                        const MY_CONST = "hello"
+
+                        function MY_CONST()
+                        end function
+                    end namespace
+                `);
+                program.validate();
+                let diagnostics = program.getDiagnostics();
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.nameCollision('Const', 'Function', 'SomeEnum.MY_CONST').message
+                ]);
+            });
         });
 
         describe('custom types', () => {
@@ -1174,9 +1467,9 @@ describe('Scope', () => {
                     end function
                 `);
                 program.validate();
-                expectDiagnostics(program, [
-                    DiagnosticMessages.invalidFunctionReturnType('unknownType').message,
-                    DiagnosticMessages.invalidFunctionReturnType('unknownType').message
+                expectDiagnosticsIncludes(program, [
+                    DiagnosticMessages.cannotFindName('unknownType').message,
+                    DiagnosticMessages.cannotFindName('unknownType').message
                 ]);
             });
 
@@ -1198,8 +1491,8 @@ describe('Scope', () => {
                 `);
                 program.validate();
                 expectDiagnostics(program, [
-                    DiagnosticMessages.functionParameterTypeIsInvalid('unknownParam', 'unknownType').message,
-                    DiagnosticMessages.functionParameterTypeIsInvalid('unknownParam', 'unknownType').message
+                    DiagnosticMessages.cannotFindName('unknownType').message,
+                    DiagnosticMessages.cannotFindName('unknownType').message
                 ]);
             });
 
@@ -1217,8 +1510,8 @@ describe('Scope', () => {
                 `);
                 program.validate();
                 expectDiagnostics(program, [
-                    DiagnosticMessages.cannotFindType('unknownType').message,
-                    DiagnosticMessages.cannotFindType('unknownType').message
+                    DiagnosticMessages.cannotFindName('unknownType').message,
+                    DiagnosticMessages.cannotFindName('unknownType').message
                 ]);
             });
 
@@ -1249,10 +1542,9 @@ describe('Scope', () => {
                         end interface
 
                         function bar(param as MyNamespace.MyInterface) as MyNamespace.MyInterface
+                            return param
                         end function
-
                     end namespace
-
                 `);
                 program.validate();
 
@@ -1267,10 +1559,9 @@ describe('Scope', () => {
 
                     namespace MyNamespace
                         function bar(param as MyInterface) as MyInterface
+                            return param
                         end function
-
                     end namespace
-
                 `);
                 program.validate();
 
@@ -1285,10 +1576,9 @@ describe('Scope', () => {
                         end enum
 
                         function bar(param as MyNamespace.MyEnum) as MyNamespace.MyEnum
+                            return param
                         end function
-
                     end namespace
-
                 `);
                 program.validate();
 
@@ -1303,10 +1593,9 @@ describe('Scope', () => {
 
                     namespace MyNamespace
                         function bar(param as MyEnum) as MyEnum
+                            return param
                         end function
-
                     end namespace
-
                 `);
                 program.validate();
 
@@ -1320,13 +1609,13 @@ describe('Scope', () => {
                         end class
 
                         function foo(param as MyClass) as MyClass
+                            return param
                         end function
 
                         function bar(param as MyNamespace.MyClass) as MyNamespace.MyClass
+                            return param
                         end function
-
                     end namespace
-
                 `);
                 program.validate();
 
@@ -1341,6 +1630,7 @@ describe('Scope', () => {
                     end namespace
 
                     function foo(param as MyNamespace.MyClass) as MyNamespace.MyClass
+                        return param
                     end function
                 `);
                 program.validate();
@@ -1348,6 +1638,51 @@ describe('Scope', () => {
                 expectZeroDiagnostics(program);
             });
 
+            it('finds custom types from same namespace defined in different file', () => {
+                program.setFile(`source/klass.bs`, `
+                    namespace MyNamespace
+                        class Klass
+                        end class
+                    end namespace
+                `);
+
+                program.setFile(`source/otherklass.bs`, `
+                    namespace MyNamespace
+                        class OtherKlass
+                            function beClassy() as Klass
+                              return new Klass()
+                            end function
+                        end class
+                    end namespace
+                `);
+                program.validate();
+
+                expectZeroDiagnostics(program);
+            });
+
+            it('finds custom types from same namespace defined in different file when using full Namespace', () => {
+                program.setFile(`source/klass.bs`, `
+                    namespace MyNamespace
+                        class Klass
+                        end class
+                    end namespace
+                `);
+
+                program.setFile(`source/otherklass.bs`, `
+                    namespace MyNamespace
+                        class OtherKlass
+                            function beClassy() as MyNamespace.Klass
+                                return new Klass()
+                            end function
+                        end class
+                    end namespace
+
+                `);
+                program.validate();
+
+                expectZeroDiagnostics(program);
+            });
+
             it('detects missing custom types from current namespaces', () => {
                 program.setFile(`source/main.bs`, `
                     namespace MyNamespace
@@ -1361,13 +1696,14 @@ describe('Scope', () => {
                 program.validate();
 
                 expectDiagnostics(program, [
-                    DiagnosticMessages.invalidFunctionReturnType('UnknownType').message
+                    DiagnosticMessages.cannotFindName('UnknownType').message
                 ]);
             });
 
             it('finds custom types from other other files', () => {
                 program.setFile(`source/main.bs`, `
                     function foo(param as MyClass) as MyClass
+                        return param
                     end function
                 `);
                 program.setFile(`source/MyClass.bs`, `
@@ -1382,6 +1718,7 @@ describe('Scope', () => {
             it('finds custom types from other other files', () => {
                 program.setFile(`source/main.bs`, `
                     function foo(param as MyNameSpace.MyClass) as MyNameSpace.MyClass
+                        return param
                     end function
                 `);
                 program.setFile(`source/MyNameSpace.bs`, `
@@ -1408,8 +1745,9 @@ describe('Scope', () => {
                 program.validate();
 
                 expectDiagnostics(program, [
-                    DiagnosticMessages.invalidFunctionReturnType('MyNamespace.UnknownType')
+                    DiagnosticMessages.cannotFindName('UnknownType', 'MyNamespace.UnknownType', 'MyNamespace', 'namespace').message
                 ]);
+                expect(program.getDiagnostics()[0]?.data?.fullName).to.eq('MyNamespace.UnknownType');
             });
 
             it('scopes types to correct scope', () => {
@@ -1442,7 +1780,7 @@ describe('Scope', () => {
                 program.validate();
 
                 expectDiagnostics(program, [
-                    DiagnosticMessages.invalidFunctionReturnType('MyClass').message
+                    DiagnosticMessages.cannotFindName('MyClass').message
                 ]);
             });
 
@@ -1467,6 +1805,7 @@ describe('Scope', () => {
                 `);
                 program.setFile(s`components/child.bs`, `
                     function getFoo() as MyClass
+                        return invalid
                     end function
                 `);
 
@@ -1476,6 +1815,25 @@ describe('Scope', () => {
 
             });
 
+            it('finds correctly types a variable with type from different file', () => {
+                program.setFile(`source/main.bs`, `
+                    sub main()
+                        thing = new MyKlass()
+                        useKlass(thing)
+                    end sub
+
+                    sub useKlass(thing as MyKlass)
+                        print thing
+                    end sub
+                `);
+                program.setFile(`source/MyKlass.bs`, `
+                    class MyKlass
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
             it('finds type statement types', () => {
                 program.setFile(`source/main.bs`, `
                     type MyType = integer or string
@@ -1539,806 +1897,1413 @@ describe('Scope', () => {
             });
 
         });
-    });
 
-    describe('inheritance', () => {
-        it('inherits callables from parent', () => {
-            program = new Program({ rootDir: rootDir });
+        describe('runtime vs typetime', () => {
+            it('detects invalidly using a class member as a parameter type', () => {
+                program.setFile(`source/main.bs`, `
+                    sub a(num as myClass.member)
+                    end sub
 
-            program.setFile('components/child.xml', trim`
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="child" extends="parent">
-                    <script uri="child.brs"/>
-                </component>
-            `);
-            program.setFile(s`components/child.brs`, ``);
-            program.validate();
-            let childScope = program.getComponentScope('child')!;
-            expect(childScope.getAllCallables().map(x => x.callable.name)).not.to.include('parentSub');
+                    class MyClass
+                        member as integer
+                    end class
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.itemCannotBeUsedAsType('myClass.member').message
+                ]);
+            });
 
-            program.setFile('components/parent.xml', trim`
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="parent" extends="Scene">
-                    <script uri="parent.brs"/>
-                </component>
-            `);
-            program.setFile(s`components/parent.brs`, `
-                sub parentSub()
-                end sub
-            `);
-            program.validate();
+            it('detects invalidly using an EnumMember as a parameter type', () => {
+                program.setFile(`source/main.bs`, `
+                    sub a(num as MyNameSpace.SomeEnum.memberA)
+                    end sub
 
-            expect(childScope.getAllCallables().map(x => x.callable.name)).to.include('parentSub');
-        });
-    });
+                    namespace MyNameSpace
+                        enum SomeEnum
+                            memberA
+                            memberB
+                        end enum
+                    end namespace
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.itemCannotBeUsedAsType('MyNameSpace.SomeEnum.memberA').message
+                ]);
+            });
 
-    describe('detachParent', () => {
-        it('does not attach global to itself', () => {
-            expect(program.globalScope.getParentScope()).not.to.exist;
-        });
-    });
+            it('detects a member of a nested namespace', () => {
+                program.setFile(`source/main.bs`, `
+                    sub a(num as NSExistsA.NSExistsB.Klass)
+                    end sub
 
-    describe('getDefinition', () => {
-        it('returns empty list when there are no files', () => {
-            let file = program.setFile('source/main.brs', '');
-            let scope = program.getScopeByName('source');
-            expect(scope.getDefinition(file, Position.create(0, 0))).to.be.lengthOf(0);
-        });
-    });
+                    namespace NSExistsA.NSExistsB
+                        class Klass
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
 
-    describe('getCallablesAsCompletions', () => {
-        it('returns documentation when possible', () => {
-            let completions = program.globalScope.getCallablesAsCompletions(ParseMode.BrightScript);
-            //it should find the completions for the global scope
-            expect(completions).to.be.length.greaterThan(0);
-            //it should find documentation for completions
-            expect(completions.filter(x => !!x.documentation)).to.have.length.greaterThan(0);
-        });
-    });
+            it('detects an unknown member of a nested namespace', () => {
+                program.setFile(`source/main.bs`, `
+                    sub a(num as NSExistsA.NSExistsB.NSDoesNotExistC.Klass)
+                    end sub
 
-    describe('buildNamespaceLookup', () => {
-        it('does not crash when class statement is missing `name` prop', () => {
-            program.setFile<BrsFile>('source/main.bs', `
-                namespace NameA
-                    class
-                    end class
-                end namespace
-            `);
-            program['scopes']['source'].buildNamespaceLookup();
-        });
+                    namespace NSExistsA.NSExistsB
+                        class Klass
+                        end class
+                    end namespace
+                `);
+                program.validate();
 
-        it('does not crash when function statement is missing `name` prop', () => {
-            const file = program.setFile<BrsFile>('source/main.bs', `
-                namespace NameA
-                    function doSomething()
-                    end function
-                end namespace
-            `);
-            delete ((file.ast.statements[0] as NamespaceStatement).body.statements[0] as any).name;
-            program.validate();
-            program['scopes']['source'].buildNamespaceLookup();
-        });
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('NSDoesNotExistC', 'NSExistsA.NSExistsB.NSDoesNotExistC', 'NSExistsA.NSExistsB', 'namespace').message
+                ]);
+            });
 
-        it('skips allocating statement collections and symbolTable for pure-intermediate containers', () => {
-            //"NameA" is only a dotted prefix here, never a leaf of any namespace declaration
-            program.setFile<BrsFile>('source/main.bs', `
-                namespace NameA.NameB
-                    function doSomething()
-                    end function
-                end namespace
-            `);
-            const lookup = program['scopes']['source'].buildNamespaceLookup();
-            const intermediate = lookup.get('namea');
-            expect(intermediate).to.exist;
-            expect(intermediate.statements).to.be.undefined;
-            expect(intermediate.classStatements).to.be.undefined;
-            expect(intermediate.functionStatements).to.be.undefined;
-            expect(intermediate.enumStatements).to.be.undefined;
-            expect(intermediate.constStatements).to.be.undefined;
-            expect(intermediate.symbolTable).to.be.undefined;
-            //namespaces is always allocated so parent-child wiring works
-            expect(intermediate.namespaces).to.be.instanceOf(Map);
-            expect(intermediate.namespaces.get('nameb')).to.exist;
-        });
+            it('allows a class to extend from a class in another namespace and file', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(myFace as Villain)
+                        print myFace.coin
+                    end sub
 
-        it('only allocates the statement collections that the leaf actually populates', () => {
-            //a leaf with only constants should leave classStatements/functionStatements/enumStatements undefined
-            program.setFile<BrsFile>('source/main.bs', `
-                namespace OnlyConsts
-                    const PI = 3.14
-                end namespace
-            `);
-            const lookup = program['scopes']['source'].buildNamespaceLookup();
-            const leaf = lookup.get('onlyconsts');
-            expect(leaf).to.exist;
-            expect(leaf.constStatements).to.be.instanceOf(Map);
-            expect(leaf.constStatements.has('onlyconsts.pi')).to.be.true;
-            expect(leaf.classStatements).to.be.undefined;
-            expect(leaf.functionStatements).to.be.undefined;
-            expect(leaf.enumStatements).to.be.undefined;
-            //leaves always get a symbolTable allocated for sibling-linking during validation
-            expect(leaf.symbolTable).to.exist;
-        });
+                    class Villain extends MyKlasses.twoFace
+                        name as string
+                    end class
+                `);
+                program.setFile(`source/extra.bs`, `
+                    namespace MyKlasses
+                        class twoFace
+                            coin as string
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
 
-        it('shares per-file contribution data across scopes that pull in the same file (fast path)', () => {
-            //a single .bs file declares the namespace; both source scope and an xml scope
-            //pull it in. The two scopes should produce containers whose heavy fields point
-            //at the same NamespaceFileContribution instances (no per-scope re-allocation).
-            program.setFile<BrsFile>('source/shared.bs', `
-                namespace shared.lib
-                    function helper()
-                    end function
-                end namespace
-            `);
-            program.setFile('components/Comp.xml', `
-                <component name="Comp" extends="Group">
-                    <script type="text/brightscript" uri="pkg:/source/shared.bs" />
-                </component>
-            `);
-            program.validate();
-            const sourceLookup = program['scopes']['source'].buildNamespaceLookup();
-            //XmlScope's key in `program.scopes` is its `xmlFile.pkgPath`, which is path-normalized
-            //(backslashes on Windows). Use `s` to match.
-            const xmlLookup = program['scopes'][s`components/Comp.xml`].buildNamespaceLookup();
-            const fromSource = sourceLookup.get('shared.lib');
-            const fromXml = xmlLookup.get('shared.lib');
-            expect(fromSource).to.exist;
-            expect(fromXml).to.exist;
-            //heavy fields share refs (the wrapper objects themselves are per-scope so
-            //their `namespaces` field can differ, but the inner data is shared)
-            expect(fromSource.functionStatements).to.equal(fromXml.functionStatements);
-            expect(fromSource.symbolTable).to.equal(fromXml.symbolTable);
-        });
 
-        it('aggregates contributions from multiple in-scope files (slow path)', () => {
-            //"shared" namespace is split across two files that both end up in the source scope
-            program.setFile<BrsFile>('source/sharedA.bs', `
-                namespace shared
-                    function fromA()
-                    end function
-                end namespace
-            `);
-            program.setFile<BrsFile>('source/sharedB.bs', `
-                namespace shared
-                    function fromB()
-                    end function
-                end namespace
-            `);
-            const lookup = program['scopes']['source'].buildNamespaceLookup();
-            const merged = lookup.get('shared');
-            expect(merged).to.exist;
-            expect(merged.functionStatements).to.exist;
-            expect(merged.functionStatements.froma).to.exist;
-            expect(merged.functionStatements.fromb).to.exist;
-            //the slow-path symbolTable is freshly allocated and contains both files' symbols
-            expect(merged.symbolTable).to.exist;
-        });
+            it('resolves a const in a namespace', () => {
+                program.setFile(`source/main.bs`, `
+                    sub a()
+                        print NSExistsA.SOME_CONST
+                    end sub
 
-        it('shares slow-path aggregates across scopes with the same in-scope file set', () => {
-            //two files contribute to the same namespace
-            program.setFile<BrsFile>('source/sharedA.bs', `
-                namespace shared.lib
-                    function fromA()
-                    end function
-                end namespace
-            `);
-            program.setFile<BrsFile>('source/sharedB.bs', `
-                namespace shared.lib
-                    function fromB()
-                    end function
-                end namespace
-            `);
-            //two XML components both pull in both files, so each scope sees the multi-contribution slow path
-            program.setFile('components/Comp1.xml', `
-                <component name="Comp1" extends="Group">
-                    <script type="text/brightscript" uri="pkg:/source/sharedA.bs" />
-                    <script type="text/brightscript" uri="pkg:/source/sharedB.bs" />
-                </component>
-            `);
-            program.setFile('components/Comp2.xml', `
-                <component name="Comp2" extends="Group">
-                    <script type="text/brightscript" uri="pkg:/source/sharedA.bs" />
-                    <script type="text/brightscript" uri="pkg:/source/sharedB.bs" />
-                </component>
-            `);
-            program.validate();
-            const comp1Lookup = program['scopes'][s`components/Comp1.xml`].buildNamespaceLookup();
-            const comp2Lookup = program['scopes'][s`components/Comp2.xml`].buildNamespaceLookup();
-            const fromComp1 = comp1Lookup.get('shared.lib');
-            const fromComp2 = comp2Lookup.get('shared.lib');
-            expect(fromComp1).to.exist;
-            expect(fromComp2).to.exist;
-            //heavy fields share refs across scopes via the program-level slow-path aggregate
-            expect(fromComp1.functionStatements).to.equal(fromComp2.functionStatements);
-            expect(fromComp1.symbolTable).to.equal(fromComp2.symbolTable);
-            //the merged data still contains both files' contributions
-            expect(fromComp1.functionStatements.froma).to.exist;
-            expect(fromComp1.functionStatements.fromb).to.exist;
-        });
+                    namespace NSExistsA
+                        const SOME_CONST = 3.14
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
 
-        it('rebuilds the program-level index when a file is replaced', () => {
-            program.setFile<BrsFile>('source/main.bs', `
-                namespace alpha
-                    function originalFn()
-                    end function
-                end namespace
-            `);
-            const beforeLookup = program['scopes']['source'].buildNamespaceLookup();
-            const before = beforeLookup.get('alpha');
-            expect(before.functionStatements?.originalfn).to.exist;
-            //replace the file with a different namespace declaration
-            program.setFile<BrsFile>('source/main.bs', `
-                namespace alpha
-                    function replacementFn()
-                    end function
-                end namespace
-            `);
-            //the source scope's cache invalidates via the dependency-graph chain, so
-            //a fresh lookup reflects the new contributions
-            const afterLookup = program['scopes']['source'].buildNamespaceLookup();
-            const after = afterLookup.get('alpha');
-            expect(after.functionStatements?.replacementfn).to.exist;
-            expect(after.functionStatements?.originalfn).to.be.undefined;
-        });
+            it('resolves namespaces with relative references', () => {
+                program.setFile(`source/main.bs`, `
+                    namespace NameA
+                        sub fn1()
+                            'fully qualified-relative references are allowed
+                            print NameA.API_URL
+                            'namespace-relative references are allowed as well
+                            print API_URL
+                        end sub
 
-        describe('fast path correctness', () => {
-            it('populates only classStatements for a class-only namespace', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace shapes
-                        class Circle
-                        end class
-                        class Square
-                        end class
+                        const API_URL = "http://some.url.com"
                     end namespace
                 `);
-                const leaf = program['scopes']['source'].buildNamespaceLookup().get('shapes');
-                expect(leaf.classStatements).to.exist;
-                expect(leaf.classStatements.circle).to.exist;
-                expect(leaf.classStatements.square).to.exist;
-                expect(leaf.functionStatements).to.be.undefined;
-                expect(leaf.enumStatements).to.be.undefined;
-                expect(leaf.constStatements).to.be.undefined;
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
-            it('populates only functionStatements for a function-only namespace', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace utils
-                        function helper()
-                        end function
+            it('resolves nested namespaces with relative references', () => {
+                program.setFile(`source/main.bs`, `
+                    sub main()
+                        print NameA.A_VAL
+                        print NameA.NameB.B_VAL
+                        print NameA.NameB.NameC.C_VAL
+                        print SOME_CONST
+                    end sub
+                    namespace NameA
+                        sub fnA()
+                            print NameA.A_VAL
+                            print A_VAL
+                        end sub
+                        namespace NameB
+                            sub fnB()
+                                print NameA.NameB.B_VAL
+                                print B_VAL
+                            end sub
+                            namespace NameC
+                                sub fnC()
+                                   print NameA.NameB.NameC.C_VAL
+                                   print C_VAL
+                                end sub
+                                const C_VAL = "C"
+                            end namespace
+                            const B_VAL = "B"
+                        end namespace
+                        const A_VAL="A"
                     end namespace
+                    const SOME_CONST = "hello"
                 `);
-                const leaf = program['scopes']['source'].buildNamespaceLookup().get('utils');
-                expect(leaf.functionStatements).to.exist;
-                expect(leaf.functionStatements.helper).to.exist;
-                expect(leaf.classStatements).to.be.undefined;
-                expect(leaf.enumStatements).to.be.undefined;
-                expect(leaf.constStatements).to.be.undefined;
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
-            it('populates only enumStatements for an enum-only namespace', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace status
-                        enum Active
-                            on = "on"
-                            off = "off"
-                        end enum
+            it('resolves namespaces defined in different locations', () => {
+                program.setFile(`source/main.bs`, `
+                    sub main()
+                        print NameA.A_VAL
+                        print NameA.funcA()
+                        print NameA.makeClass().value
+                    end sub
+                    namespace NameA
+                        const A_VAL="A"
                     end namespace
-                `);
-                const leaf = program['scopes']['source'].buildNamespaceLookup().get('status');
-                expect(leaf.enumStatements).to.exist;
-                expect(leaf.enumStatements.has('status.active')).to.be.true;
-                expect(leaf.classStatements).to.be.undefined;
-                expect(leaf.functionStatements).to.be.undefined;
-                expect(leaf.constStatements).to.be.undefined;
-            });
-
-            it('populates only constStatements for a const-only namespace', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace settings
-                        const MAX = 100
+                    namespace NameA
+                        function funcA() as integer
+                            return 17
+                        end function
                     end namespace
-                `);
-                const leaf = program['scopes']['source'].buildNamespaceLookup().get('settings');
-                expect(leaf.constStatements).to.exist;
-                expect(leaf.constStatements.has('settings.max')).to.be.true;
-                expect(leaf.classStatements).to.be.undefined;
-                expect(leaf.functionStatements).to.be.undefined;
-                expect(leaf.enumStatements).to.be.undefined;
-            });
-
-            it('populates all four collections when present', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace mixed
-                        class Cls
-                        end class
-                        function fn()
+                    namespace NameA
+                        function makeClass() as SomeKlass
+                            return new SomeKlass()
                         end function
-                        enum Enm
-                            a = "a"
-                        end enum
-                        const C = 1
                     end namespace
-                `);
-                const leaf = program['scopes']['source'].buildNamespaceLookup().get('mixed');
-                expect(leaf.classStatements?.cls).to.exist;
-                expect(leaf.functionStatements?.fn).to.exist;
-                expect(leaf.enumStatements?.has('mixed.enm')).to.be.true;
-                expect(leaf.constStatements?.has('mixed.c')).to.be.true;
-            });
-
-            it('shares classStatements across two scopes pulling in the same single-contributor file', () => {
-                program.setFile<BrsFile>('source/utils.bs', `
-                    namespace util
-                        class Helper
+                    namespace NameA
+                        class SomeKlass
+                            value = 3.14
                         end class
                     end namespace
                 `);
-                program.setFile('components/A.xml', `
-                    <component name="A" extends="Group">
-                        <script type="text/brightscript" uri="pkg:/source/utils.bs" />
-                    </component>
-                `);
-                program.setFile('components/B.xml', `
-                    <component name="B" extends="Group">
-                        <script type="text/brightscript" uri="pkg:/source/utils.bs" />
-                    </component>
-                `);
                 program.validate();
-                const fromA = program['scopes'][s`components/A.xml`].buildNamespaceLookup().get('util');
-                const fromB = program['scopes'][s`components/B.xml`].buildNamespaceLookup().get('util');
-                expect(fromA.classStatements).to.equal(fromB.classStatements);
-                expect(fromA.symbolTable).to.equal(fromB.symbolTable);
+                expectZeroDiagnostics(program);
             });
 
-            it('still works with deeply nested namespace declarations', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace a.b.c.d.e
-                        function deep()
+            it('resolves deep namespaces defined in different locations', () => {
+                program.setFile(`source/main.bs`, `
+                    sub main()
+                        print NameA.NameB.B_VAL
+                        print NameA.NameB.funcB()
+                        print NameA.makeClassA().value
+                        print NameA.NameB.makeClassB().value
+                    end sub
+                    namespace NameA
+                        namespace NameB
+                            const B_VAL="B"
+                        end namespace
+                    end namespace
+                    namespace NameA.NameB
+                        function funcB() as integer
+                            return 17
                         end function
                     end namespace
-                `);
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                expect(lookup.get('a').namespaces.has('b')).to.be.true;
-                expect(lookup.get('a.b').namespaces.has('c')).to.be.true;
-                expect(lookup.get('a.b.c').namespaces.has('d')).to.be.true;
-                expect(lookup.get('a.b.c.d').namespaces.has('e')).to.be.true;
-                expect(lookup.get('a.b.c.d.e').functionStatements?.deep).to.exist;
-            });
-
-            it('treats namespace names case-insensitively', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace MyNamespace
-                        function fn()
+                    namespace NameA
+                        function makeClassA() as NameA.NameB.SomeKlass
+                            return new NameA.NameB.SomeKlass()
                         end function
                     end namespace
-                `);
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                expect(lookup.get('mynamespace')).to.exist;
-                expect(lookup.get('MYNAMESPACE')).to.exist;
-                expect(lookup.get('MyNamespace')).to.exist;
-                //all three lookups return the same container (cached on first access)
-                expect(lookup.get('mynamespace')).to.equal(lookup.get('MYNAMESPACE'));
-            });
-        });
-
-        describe('slow path correctness', () => {
-            it('merges classStatements from two contributors', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        class FromA
-                        end class
+                    namespace NameA
+                        namespace NameB
+                            function makeClassB() as SomeKlass
+                                return new SomeKlass()
+                            end function
+                        end namespace
                     end namespace
-                `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        class FromB
+                    namespace NameA.NameB
+                        class SomeKlass
+                            value = 3.14
                         end class
                     end namespace
                 `);
-                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.classStatements?.froma).to.exist;
-                expect(lib.classStatements?.fromb).to.exist;
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
-            it('merges only the field types each contributor populates', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        class OnlyClass
-                        end class
-                    end namespace
-                `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        function onlyFunc()
-                        end function
-                    end namespace
+            it('allows dot-references to properties on results of global callables', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn()
+                        print CreateObject("roSgNode", "Node").id
+                    end sub
                 `);
-                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.classStatements?.onlyclass).to.exist;
-                expect(lib.functionStatements?.onlyfunc).to.exist;
-                //fields not contributed by either file stay undefined
-                expect(lib.enumStatements).to.be.undefined;
-                expect(lib.constStatements).to.be.undefined;
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
-            it('merges three contributors correctly', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        function fa()
-                        end function
-                    end namespace
+            it('allows dot-references to functions on results of global callables', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn()
+                        print CreateObject("roDateTime").asSeconds()
+                    end sub
                 `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        function fb()
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('finds unknown members of primitive types', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(input as SomeKlass)
+                        piValue = input.getPi().someProp
+                    end sub
+
+                    class SomeKlass
+                        function getPi() as float
+                            return 3.14
                         end function
-                    end namespace
+                    end class
                 `);
-                program.setFile<BrsFile>('source/c.bs', `
-                    namespace lib
-                        function fc()
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('someProp', 'float.someProp', 'float').message
+                ]);
+            });
+
+            it('finds unknown methods of primitive types', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(input as SomeKlass)
+                        piValue = input.getPi().noMethod()
+                    end sub
+
+                    class SomeKlass
+                        function getPi() as float
+                            return 3.14
                         end function
-                    end namespace
+                    end class
                 `);
-                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.functionStatements?.fa).to.exist;
-                expect(lib.functionStatements?.fb).to.exist;
-                expect(lib.functionStatements?.fc).to.exist;
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindFunction('noMethod', 'float.noMethod', 'float').message
+                ]);
             });
 
-            it('aggregate symbolTable contains symbols from every contributor', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        function fromA()
+            it('finds members of arrays', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(input as SomeKlass)
+                        numValue = input.getOtherKlasses()[2].num
+                        print numValue
+                    end sub
+
+                    class OtherKlass
+                      num = 1
+                    end class
+
+                    class SomeKlass
+                        function getPi() as float
+                            return 3.14
                         end function
-                    end namespace
-                `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        function fromB()
+
+                        function getOtherKlasses()
+                            return [new OtherKlass(), new OtherKlass(), new OtherKlass()]
                         end function
-                    end namespace
+                    end class
                 `);
-                //BrsFileValidator populates each body's symbolTable during validate; the
-                //namespace contribution's symbolTable is built from those bodies.
                 program.validate();
-                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.symbolTable).to.exist;
-                expect(lib.symbolTable.hasSymbol('fromA')).to.be.true;
-                expect(lib.symbolTable.hasSymbol('fromB')).to.be.true;
+                //TODO: When array types are available, check that `numValue` is an integer
+                expectZeroDiagnostics(program);
             });
 
-            it('produces different aggregates for scopes with different contributor sets', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        function fromA()
-                        end function
-                    end namespace
-                `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        function fromB()
-                        end function
-                    end namespace
+        });
+
+        describe('interfaces', () => {
+            it('allows using interfaces as types', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(myFace as iFace)
+                    end sub
+
+                    interface iFace
+                        name as string
+                    end interface
                 `);
-                program.setFile<BrsFile>('source/c.bs', `
-                    namespace lib
-                        function fromC()
-                        end function
-                    end namespace
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('disallows using interface members as types', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(myFaceName as iFace.name)
+                    end sub
+
+                    interface iFace
+                        name as string
+                    end interface
                 `);
-                program.setFile('components/AB.xml', `
-                    <component name="AB" extends="Group">
-                        <script type="text/brightscript" uri="pkg:/source/a.bs" />
-                        <script type="text/brightscript" uri="pkg:/source/b.bs" />
-                    </component>
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('name', 'iface.name', 'iFace').message
+                ]);
+            });
+
+            it('allows accessing interface members in code', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(myFace as iFace)
+                        print myFace.name
+                    end sub
+
+                    interface iFace
+                        name as string
+                    end interface
                 `);
-                program.setFile('components/BC.xml', `
-                    <component name="BC" extends="Group">
-                        <script type="text/brightscript" uri="pkg:/source/b.bs" />
-                        <script type="text/brightscript" uri="pkg:/source/c.bs" />
-                    </component>
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows accessing an interface member from a super interface', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(myFace as iFace)
+                        print myFace.coin
+                    end sub
+
+                    interface iFace extends twoFace
+                        name as string
+                    end interface
+
+                    interface twoFace
+                        coin as string
+                    end interface
                 `);
                 program.validate();
-                const ab = program['scopes'][s`components/AB.xml`].buildNamespaceLookup().get('lib');
-                const bc = program['scopes'][s`components/BC.xml`].buildNamespaceLookup().get('lib');
-                expect(ab.functionStatements?.froma).to.exist;
-                expect(ab.functionStatements?.fromb).to.exist;
-                expect(ab.functionStatements?.fromc).to.be.undefined;
-                expect(bc.functionStatements?.froma).to.be.undefined;
-                expect(bc.functionStatements?.fromb).to.exist;
-                expect(bc.functionStatements?.fromc).to.exist;
-                //different file sets → different cached aggregates → different references
-                expect(ab.functionStatements).to.not.equal(bc.functionStatements);
+                expectZeroDiagnostics(program);
             });
 
-            it('walks pure-intermediate multi-contributor case without crashing', () => {
-                //"prefix" is intermediate-only across multiple files (no leaf body anywhere)
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace prefix.alpha
-                        function fa()
-                        end function
-                    end namespace
+            it('allows an interface to extend from an interface in another namespace and file', () => {
+                program.setFile(`source/main.bs`, `
+                    sub fn(myFace as iFace)
+                        print myFace.coin
+                    end sub
+
+                    interface iFace extends MyInterfaces.twoFace
+                        name as string
+                    end interface
                 `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace prefix.beta
-                        function fb()
-                        end function
+                program.setFile(`source/interfaces.bs`, `
+                    namespace MyInterfaces
+                        interface twoFace
+                            coin as string
+                        end interface
                     end namespace
                 `);
-                const prefix = program['scopes']['source'].buildNamespaceLookup().get('prefix');
-                expect(prefix).to.exist;
-                expect(prefix.namespaces.has('alpha')).to.be.true;
-                expect(prefix.namespaces.has('beta')).to.be.true;
-                expect(prefix.statements).to.be.undefined;
-                expect(prefix.classStatements).to.be.undefined;
-                expect(prefix.functionStatements).to.be.undefined;
-                //pure intermediates have no symbolTable
-                expect(prefix.symbolTable).to.be.undefined;
+                program.validate();
+                expectZeroDiagnostics(program);
             });
-        });
 
-        describe('cache invalidation', () => {
-            it('removes a namespace from the lookup when the only contributing file is removed', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace will_be_gone
-                        function fn()
-                        end function
-                    end namespace
+            it('allows interfaces to extend components', () => {
+                program.setFile('components/MyNode.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="MyNode" extends="Group">
+                        <script uri="MyNode.bs"/>
+                        <interface>
+                            <field id="myProp" type="integer" />
+                        </interface>
+                    </component>
                 `);
-                expect(program['scopes']['source'].buildNamespaceLookup().get('will_be_gone')).to.exist;
-                program.removeFile('source/main.bs');
-                expect(program['scopes']['source'].buildNamespaceLookup().get('will_be_gone')).to.be.undefined;
+
+                program.setFile(s`components/MyNode.bs`, `
+                `);
+
+                program.setFile(`source/main.bs`, `
+                    interface MyIFace extends roSGNodeMyNode
+                    end interface
+
+                    sub foo(iface as MyIFace)
+                        value = iface.myProp
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
-            it('updates the slow-path aggregate when one contributor changes its content', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        function originalA()
-                        end function
-                    end namespace
+            it('allows interfaces to have callfunc members from parent components', () => {
+                program.setFile('components/MyNode.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="MyNode" extends="Group">
+                        <script uri="MyNode.bs"/>
+                        <interface>
+                            <field id="myProp" type="integer" />
+                            <function name="someCallfunc" />
+                        </interface>
+                    </component>
                 `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        function fromB()
-                        end function
-                    end namespace
+
+                program.setFile(s`components/MyNode.bs`, `
+                    function someCallfunc() as integer
+                        return m.top.myProp
+                    end function
                 `);
-                let lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.functionStatements?.originala).to.exist;
-                expect(lib.functionStatements?.fromb).to.exist;
-                //replace one contributor
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        function newA()
-                        end function
-                    end namespace
+
+                program.setFile(`source/main.bs`, `
+                    interface MyIFace extends roSGNodeMyNode
+                    end interface
+
+
+                    sub foo(iface as MyIFace)
+                        value = iface@.someCallfunc()
+                        print value
+                    end sub
                 `);
-                lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.functionStatements?.newa).to.exist;
-                expect(lib.functionStatements?.originala).to.be.undefined;
-                expect(lib.functionStatements?.fromb).to.exist;
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
-            it('handles a namespace gaining a new contributor (single -> multi)', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        function fromA()
-                        end function
-                    end namespace
+        });
+
+
+        it('should accept global callables returning objects', () => {
+            program.setFile(`source/main.brs`, `
+                sub main()
+                    screen = CreateObject("roSGScreen")
+                    port = CreateObject("roMessagePort")
+                    scene = screen.CreateScene("MyMainScene")
+                    screen.setMessagePort(port)
+                    screen.show()
+                    while(true)
+                        msg     = wait(0, port)
+                        msgType = type(msg)
+
+                        if type(msg) = "roInputEvent"
+                            if msg.IsInput()
+                                info = msg.GetInfo()
+                                if info.DoesExist("mediaType")
+                                    mediaType = info.mediaType
+                                    print mediaType
+                                end if
+                            end if
+                        end if
+                    end while
+                end sub
+            `);
+            program.setFile('components/MyMainScene.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="MyMainScene" extends="Scene">
+                </component>
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should allow object = invalid test', () => {
+            program.setFile(`source/main.brs`, `
+                sub create(objName)
+                    obj = createObject(objName)
+                    if obj = invalid
+                        print "not valid"
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should correctly validate formatJson', () => {
+            program.setFile(`source/main.brs`, `
+                sub main()
+                    obj = {hello: "world"}
+                    print formatJson(obj) ' 2nd param not included
+                    print formatJson(obj, 0) ' 2nd param as integer
+                    print formatJson(obj, "0") ' 2nd param as string
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('inheritance', () => {
+            it('inherits callables from parent', () => {
+                program = new Program({ rootDir: rootDir });
+
+                program.setFile('components/child.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="child" extends="parent">
+                        <script uri="child.brs"/>
+                    </component>
                 `);
-                let lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.functionStatements?.froma).to.exist;
-                expect(lib.functionStatements?.fromb).to.be.undefined;
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        function fromB()
-                        end function
-                    end namespace
+                program.setFile(s`components/child.brs`, ``);
+                program.validate();
+                let childScope = program.getComponentScope('child');
+                expect(childScope.getAllCallables().map(x => x.callable.name)).not.to.include('parentSub');
+
+                program.setFile('components/parent.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="parent" extends="Scene">
+                        <script uri="parent.brs"/>
+                    </component>
                 `);
-                lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                //both contributions now present
-                expect(lib.functionStatements?.froma).to.exist;
-                expect(lib.functionStatements?.fromb).to.exist;
+                program.setFile(s`components/parent.brs`, `
+                    sub parentSub()
+                    end sub
+                `);
+                program.validate();
+
+                expect(childScope.getAllCallables().map(x => x.callable.name)).to.include('parentSub');
             });
+        });
 
-            it('handles a namespace losing a contributor (multi -> single)', () => {
-                program.setFile<BrsFile>('source/a.bs', `
-                    namespace lib
-                        function fromA()
-                        end function
-                    end namespace
+        describe('.d.bs files', () => {
+            it('should be able to include .d.bs files', () => {
+                program.setFile('source/roku_modules/anything.d.bs', `
+                    function anything()
+                    end function
                 `);
-                program.setFile<BrsFile>('source/b.bs', `
-                    namespace lib
-                        function fromB()
-                        end function
+                program.setFile('source/main.bs', `
+                    namespace alpha
+                         sub someFunc()
+                            anything()
+                         end sub
                     end namespace
                 `);
-                let lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.functionStatements?.froma).to.exist;
-                expect(lib.functionStatements?.fromb).to.exist;
-                program.removeFile('source/b.bs');
-                lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
-                expect(lib.functionStatements?.froma).to.exist;
-                expect(lib.functionStatements?.fromb).to.be.undefined;
+                program.validate();
+                expectZeroDiagnostics(program);
             });
-        });
 
-        describe('Map interface', () => {
-            beforeEach(() => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace one
-                        function f1()
+
+            it('should be able to include .d.bs files that have namespaces', () => {
+                program.setFile('source/roku_modules/anything.d.bs', `
+                    namespace SomeNamespace
+                        function anything()
                         end function
                     end namespace
-                    namespace two.three
-                        function f2()
-                        end function
+                `);
+                program.setFile('source/main.bs', `
+                    namespace alpha
+                         sub someFunc()
+                              SomeNamespace.anything()
+                         end sub
                     end namespace
                 `);
+                program.validate();
+                expectZeroDiagnostics(program);
             });
+        });
 
-            it('responds to .has() for in-scope namespaces', () => {
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                expect(lookup.has('one')).to.be.true;
-                expect(lookup.has('two')).to.be.true;
-                expect(lookup.has('two.three')).to.be.true;
-                expect(lookup.has('not_a_namespace')).to.be.false;
-            });
-
-            it('returns undefined for .get() of a missing namespace', () => {
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                expect(lookup.get('not_a_namespace')).to.be.undefined;
-            });
-
-            it('reports correct .size', () => {
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                //three name parts: one, two, two.three
-                expect(lookup.size).to.equal(3);
-            });
-
-            it('iterates entries() and produces all in-scope namespaces', () => {
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                const keys = [...lookup.entries()].map(([key]) => key).sort();
-                expect(keys).to.eql(['one', 'two', 'two.three']);
-            });
+        describe('revalidations', () => {
+            it('revalidates dependent files when a file is changed', () => {
+                program.setFile('source/common.bs', `
+                    function doThing() as string
+                        return "hello"
+                    end function
+                `);
 
-            it('iterates keys() and values()', () => {
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                const keys = [...lookup.keys()].sort();
-                expect(keys).to.eql(['one', 'two', 'two.three']);
-                const values = [...lookup.values()];
-                expect(values.length).to.equal(3);
-                expect(values.every(value => value !== undefined && value !== null)).to.be.true;
-            });
+                program.setFile('components/Comp.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Comp" extends="Scene">
+                        <script uri="Comp.bs"/>
+                    </component>
+                `);
+                program.setFile('components/Comp.bs', `
+                    import "pkg:/source/common.bs"
 
-            it('supports for...of iteration via Symbol.iterator', () => {
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                const seenKeys = [];
-                for (const [key] of lookup) {
-                    seenKeys.push(key);
-                }
-                expect(seenKeys.sort()).to.eql(['one', 'two', 'two.three']);
-            });
+                    sub init()
+                        print doThing()
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
 
-            it('supports forEach', () => {
-                const lookup = program['scopes']['source'].buildNamespaceLookup();
-                const seenKeys = [];
-                lookup.forEach((_, key) => {
-                    seenKeys.push(key);
-                });
-                expect(seenKeys.sort()).to.eql(['one', 'two', 'two.three']);
+                program.setFile('source/common.bs', `
+                    function doOtherThing() as string
+                        return "hello"
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindFunction('doThing').message
+                ]);
             });
-        });
 
-        describe('scope filtering of children', () => {
-            it('only includes children whose contributors are in scope', () => {
-                program.setFile<BrsFile>('source/colors.bs', `
-                    namespace ds.colors
-                        function getRed()
-                        end function
-                    end namespace
-                `);
-                program.setFile<BrsFile>('source/icons.bs', `
-                    namespace ds.icons
-                        function getStar()
-                        end function
-                    end namespace
-                `);
-                //a component that only imports colors.bs should see ds.colors but not ds.icons
-                program.setFile('components/ColorOnly.xml', `
-                    <component name="ColorOnly" extends="Group">
-                        <script type="text/brightscript" uri="pkg:/source/colors.bs" />
-                    </component>
-                `);
-                //a component that imports both should see both children
-                program.setFile('components/Both.xml', `
-                    <component name="Both" extends="Group">
-                        <script type="text/brightscript" uri="pkg:/source/colors.bs" />
-                        <script type="text/brightscript" uri="pkg:/source/icons.bs" />
+            it('diagnostics in dependent files go away when a file is changed with a fix', () => {
+                program.setFile('components/Comp.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Comp" extends="Scene">
+                        <script uri="Comp.bs"/>
                     </component>
                 `);
-                program.validate();
-                const colorOnly = program['scopes'][s`components/ColorOnly.xml`].buildNamespaceLookup().get('ds');
-                const both = program['scopes'][s`components/Both.xml`].buildNamespaceLookup().get('ds');
-                expect(colorOnly.namespaces.has('colors')).to.be.true;
-                expect(colorOnly.namespaces.has('icons')).to.be.false;
-                expect(both.namespaces.has('colors')).to.be.true;
-                expect(both.namespaces.has('icons')).to.be.true;
-            });
-        });
+                program.setFile('components/Comp.bs', `
+                    import "pkg:/source/common.bs"
 
-        describe('edge cases', () => {
-            it('does not crash on an empty namespace body', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace empty
-                    end namespace
+                    sub init()
+                        print doThing()
+                    end sub
                 `);
-                const empty = program['scopes']['source'].buildNamespaceLookup().get('empty');
-                expect(empty).to.exist;
-                expect(empty.statements).to.be.undefined;
-                expect(empty.classStatements).to.be.undefined;
-                expect(empty.functionStatements).to.be.undefined;
-            });
 
-            it('merges multiple `namespace X` blocks within the same file', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace dual
-                        function fromFirstBlock()
-                        end function
-                    end namespace
-                    namespace dual
-                        function fromSecondBlock()
-                        end function
-                    end namespace
+                program.setFile('source/common.bs', `
+                    function doOtherThing() as string
+                        return "hello"
+                    end function
                 `);
-                const dual = program['scopes']['source'].buildNamespaceLookup().get('dual');
-                expect(dual.functionStatements?.fromfirstblock).to.exist;
-                expect(dual.functionStatements?.fromsecondblock).to.exist;
-            });
 
-            it('returns a namespaces Map (not undefined) even for namespaces with no children', () => {
-                program.setFile<BrsFile>('source/main.bs', `
-                    namespace lonely
-                        function fn()
-                        end function
-                    end namespace
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindFunction('doThing').message
+                ]);
+                program.setFile('source/common.bs', `
+                    function doThing() as string
+                        return "hello"
+                    end function
                 `);
-                const lonely = program['scopes']['source'].buildNamespaceLookup().get('lonely');
-                expect(lonely.namespaces).to.be.instanceOf(Map);
-                expect(lonely.namespaces.size).to.equal(0);
+
+                program.validate();
+                expectZeroDiagnostics(program);
             });
         });
     });
 
-    describe('buildEnumLookup', () => {
-        it('builds enum lookup', () => {
-            const sourceScope = program.getScopeByName('source');
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.bs', `
-                enum foo
-                    bar1
-                    bar2
-                end enum
+    describe('detachParent', () => {
+        it('does not attach global to itself', () => {
+            expect(program.globalScope.getParentScope()).not.to.exist;
+        });
+    });
 
-                namespace test
-                    function fooFace2()
-                    end function
+    describe('getDefinition', () => {
+        it('returns empty list when there are no files', () => {
+            let file = program.setFile('source/main.brs', '');
+            expect(program.getDefinition(file.srcPath, Position.create(0, 0))).to.be.lengthOf(0);
+        });
+    });
 
-                    class fooClass2
+    describe('buildNamespaceLookup', () => {
+        it('does not crash when class statement is missing `name` prop', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                namespace NameA
+                    class
                     end class
+                end namespace
+            `);
+            program['scopes']['source'].buildNamespaceLookup();
+        });
 
-                    enum foo2
-                        bar2_1
-                        bar2_2
-                    end enum
+        it('does not crash when function statement is missing `name` prop', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                namespace NameA
+                    function doSomething()
+                    end function
                 end namespace
+            `);
+            delete ((file.ast.statements[0] as NamespaceStatement).body.statements[0] as any).name;
+            program.validate();
+            program['scopes']['source'].buildNamespaceLookup();
+        });
 
-                enum foo3
-                    bar3_1
-                    bar3_2
-                end enum
+        it('skips allocating statement collections and symbolTable for pure-intermediate containers', () => {
+            //"NameA" is only a dotted prefix here, never a leaf of any namespace declaration
+            program.setFile<BrsFile>('source/main.bs', `
+                namespace NameA.NameB
+                    function doSomething()
+                    end function
+                end namespace
+            `);
+            const lookup = program['scopes']['source'].buildNamespaceLookup();
+            const intermediate = lookup.get('namea');
+            expect(intermediate).to.exist;
+            expect(intermediate.statements).to.be.undefined;
+            expect(intermediate.classStatements).to.be.undefined;
+            expect(intermediate.functionStatements).to.be.undefined;
+            expect(intermediate.enumStatements).to.be.undefined;
+            expect(intermediate.constStatements).to.be.undefined;
+            expect(intermediate.symbolTable).to.be.undefined;
+            //namespaces is always allocated so parent-child wiring works
+            expect(intermediate.namespaces).to.be.instanceOf(Map);
+            expect(intermediate.namespaces.get('nameb')).to.exist;
+        });
+
+        it('only allocates the statement collections that the leaf actually populates', () => {
+            //a leaf with only constants should leave classStatements/functionStatements/enumStatements undefined
+            program.setFile<BrsFile>('source/main.bs', `
+                namespace OnlyConsts
+                    const PI = 3.14
+                end namespace
+            `);
+            const lookup = program['scopes']['source'].buildNamespaceLookup();
+            const leaf = lookup.get('onlyconsts');
+            expect(leaf).to.exist;
+            expect(leaf.constStatements).to.be.instanceOf(Map);
+            expect(leaf.constStatements.has('onlyconsts.pi')).to.be.true;
+            expect(leaf.classStatements).to.be.undefined;
+            expect(leaf.functionStatements).to.be.undefined;
+            expect(leaf.enumStatements).to.be.undefined;
+            //leaves always get a symbolTable allocated for sibling-linking during validation
+            expect(leaf.symbolTable).to.exist;
+        });
+
+        it('shares per-file contribution data across scopes that pull in the same file (fast path)', () => {
+            //a single .bs file declares the namespace; both source scope and an xml scope
+            //pull it in. The two scopes should produce containers whose heavy fields point
+            //at the same NamespaceFileContribution instances (no per-scope re-allocation).
+            program.setFile<BrsFile>('source/shared.bs', `
+                namespace shared.lib
+                    function helper()
+                    end function
+                end namespace
+            `);
+            program.setFile('components/Comp.xml', `
+                <component name="Comp" extends="Group">
+                    <script type="text/brightscript" uri="pkg:/source/shared.bs" />
+                </component>
+            `);
+            program.validate();
+            const sourceLookup = program['scopes']['source'].buildNamespaceLookup();
+            //XmlScope's key in `program.scopes` is its `xmlFile.pkgPath`, which is path-normalized
+            //(backslashes on Windows). Use `s` to match.
+            const xmlLookup = program['scopes'][s`components/Comp.xml`].buildNamespaceLookup();
+            const fromSource = sourceLookup.get('shared.lib');
+            const fromXml = xmlLookup.get('shared.lib');
+            expect(fromSource).to.exist;
+            expect(fromXml).to.exist;
+            //heavy fields share refs (the wrapper objects themselves are per-scope so
+            //their `namespaces` field can differ, but the inner data is shared)
+            expect(fromSource.functionStatements).to.equal(fromXml.functionStatements);
+            expect(fromSource.symbolTable).to.equal(fromXml.symbolTable);
+        });
+
+        it('aggregates contributions from multiple in-scope files (slow path)', () => {
+            //"shared" namespace is split across two files that both end up in the source scope
+            program.setFile<BrsFile>('source/sharedA.bs', `
+                namespace shared
+                    function fromA()
+                    end function
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/sharedB.bs', `
+                namespace shared
+                    function fromB()
+                    end function
+                end namespace
+            `);
+            const lookup = program['scopes']['source'].buildNamespaceLookup();
+            const merged = lookup.get('shared');
+            expect(merged).to.exist;
+            expect(merged.functionStatements).to.exist;
+            expect(merged.functionStatements.froma).to.exist;
+            expect(merged.functionStatements.fromb).to.exist;
+            //the slow-path symbolTable is freshly allocated and contains both files' symbols
+            expect(merged.symbolTable).to.exist;
+        });
+
+        it('shares slow-path aggregates across scopes with the same in-scope file set', () => {
+            //two files contribute to the same namespace
+            program.setFile<BrsFile>('source/sharedA.bs', `
+                namespace shared.lib
+                    function fromA()
+                    end function
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/sharedB.bs', `
+                namespace shared.lib
+                    function fromB()
+                    end function
+                end namespace
+            `);
+            //two XML components both pull in both files, so each scope sees the multi-contribution slow path
+            program.setFile('components/Comp1.xml', `
+                <component name="Comp1" extends="Group">
+                    <script type="text/brightscript" uri="pkg:/source/sharedA.bs" />
+                    <script type="text/brightscript" uri="pkg:/source/sharedB.bs" />
+                </component>
+            `);
+            program.setFile('components/Comp2.xml', `
+                <component name="Comp2" extends="Group">
+                    <script type="text/brightscript" uri="pkg:/source/sharedA.bs" />
+                    <script type="text/brightscript" uri="pkg:/source/sharedB.bs" />
+                </component>
+            `);
+            program.validate();
+            const comp1Lookup = program['scopes'][s`components/Comp1.xml`].buildNamespaceLookup();
+            const comp2Lookup = program['scopes'][s`components/Comp2.xml`].buildNamespaceLookup();
+            const fromComp1 = comp1Lookup.get('shared.lib');
+            const fromComp2 = comp2Lookup.get('shared.lib');
+            expect(fromComp1).to.exist;
+            expect(fromComp2).to.exist;
+            //heavy fields share refs across scopes via the program-level slow-path aggregate
+            expect(fromComp1.functionStatements).to.equal(fromComp2.functionStatements);
+            expect(fromComp1.symbolTable).to.equal(fromComp2.symbolTable);
+            //the merged data still contains both files' contributions
+            expect(fromComp1.functionStatements.froma).to.exist;
+            expect(fromComp1.functionStatements.fromb).to.exist;
+        });
+
+        it('rebuilds the program-level index when a file is replaced', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                namespace alpha
+                    function originalFn()
+                    end function
+                end namespace
+            `);
+            const beforeLookup = program['scopes']['source'].buildNamespaceLookup();
+            const before = beforeLookup.get('alpha');
+            expect(before.functionStatements?.originalfn).to.exist;
+            //replace the file with a different namespace declaration
+            program.setFile<BrsFile>('source/main.bs', `
+                namespace alpha
+                    function replacementFn()
+                    end function
+                end namespace
+            `);
+            //the source scope's cache invalidates via the dependency-graph chain, so
+            //a fresh lookup reflects the new contributions
+            const afterLookup = program['scopes']['source'].buildNamespaceLookup();
+            const after = afterLookup.get('alpha');
+            expect(after.functionStatements?.replacementfn).to.exist;
+            expect(after.functionStatements?.originalfn).to.be.undefined;
+        });
+
+        describe('fast path correctness', () => {
+            it('populates only classStatements for a class-only namespace', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace shapes
+                        class Circle
+                        end class
+                        class Square
+                        end class
+                    end namespace
+                `);
+                const leaf = program['scopes']['source'].buildNamespaceLookup().get('shapes');
+                expect(leaf.classStatements).to.exist;
+                expect(leaf.classStatements.circle).to.exist;
+                expect(leaf.classStatements.square).to.exist;
+                expect(leaf.functionStatements).to.be.undefined;
+                expect(leaf.enumStatements).to.be.undefined;
+                expect(leaf.constStatements).to.be.undefined;
+            });
+
+            it('populates only functionStatements for a function-only namespace', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace utils
+                        function helper()
+                        end function
+                    end namespace
+                `);
+                const leaf = program['scopes']['source'].buildNamespaceLookup().get('utils');
+                expect(leaf.functionStatements).to.exist;
+                expect(leaf.functionStatements.helper).to.exist;
+                expect(leaf.classStatements).to.be.undefined;
+                expect(leaf.enumStatements).to.be.undefined;
+                expect(leaf.constStatements).to.be.undefined;
+            });
+
+            it('populates only enumStatements for an enum-only namespace', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace status
+                        enum Active
+                            on = "on"
+                            off = "off"
+                        end enum
+                    end namespace
+                `);
+                const leaf = program['scopes']['source'].buildNamespaceLookup().get('status');
+                expect(leaf.enumStatements).to.exist;
+                expect(leaf.enumStatements.has('status.active')).to.be.true;
+                expect(leaf.classStatements).to.be.undefined;
+                expect(leaf.functionStatements).to.be.undefined;
+                expect(leaf.constStatements).to.be.undefined;
+            });
+
+            it('populates only constStatements for a const-only namespace', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace settings
+                        const MAX = 100
+                    end namespace
+                `);
+                const leaf = program['scopes']['source'].buildNamespaceLookup().get('settings');
+                expect(leaf.constStatements).to.exist;
+                expect(leaf.constStatements.has('settings.max')).to.be.true;
+                expect(leaf.classStatements).to.be.undefined;
+                expect(leaf.functionStatements).to.be.undefined;
+                expect(leaf.enumStatements).to.be.undefined;
+            });
+
+            it('populates all four collections when present', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace mixed
+                        class Cls
+                        end class
+                        function fn()
+                        end function
+                        enum Enm
+                            a = "a"
+                        end enum
+                        const C = 1
+                    end namespace
+                `);
+                const leaf = program['scopes']['source'].buildNamespaceLookup().get('mixed');
+                expect(leaf.classStatements?.cls).to.exist;
+                expect(leaf.functionStatements?.fn).to.exist;
+                expect(leaf.enumStatements?.has('mixed.enm')).to.be.true;
+                expect(leaf.constStatements?.has('mixed.c')).to.be.true;
+            });
+
+            it('shares classStatements across two scopes pulling in the same single-contributor file', () => {
+                program.setFile<BrsFile>('source/utils.bs', `
+                    namespace util
+                        class Helper
+                        end class
+                    end namespace
+                `);
+                program.setFile('components/A.xml', `
+                    <component name="A" extends="Group">
+                        <script type="text/brightscript" uri="pkg:/source/utils.bs" />
+                    </component>
+                `);
+                program.setFile('components/B.xml', `
+                    <component name="B" extends="Group">
+                        <script type="text/brightscript" uri="pkg:/source/utils.bs" />
+                    </component>
+                `);
+                program.validate();
+                const fromA = program['scopes'][s`components/A.xml`].buildNamespaceLookup().get('util');
+                const fromB = program['scopes'][s`components/B.xml`].buildNamespaceLookup().get('util');
+                expect(fromA.classStatements).to.equal(fromB.classStatements);
+                expect(fromA.symbolTable).to.equal(fromB.symbolTable);
+            });
+
+            it('still works with deeply nested namespace declarations', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace a.b.c.d.e
+                        function deep()
+                        end function
+                    end namespace
+                `);
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                expect(lookup.get('a').namespaces.has('b')).to.be.true;
+                expect(lookup.get('a.b').namespaces.has('c')).to.be.true;
+                expect(lookup.get('a.b.c').namespaces.has('d')).to.be.true;
+                expect(lookup.get('a.b.c.d').namespaces.has('e')).to.be.true;
+                expect(lookup.get('a.b.c.d.e').functionStatements?.deep).to.exist;
+            });
+
+            it('treats namespace names case-insensitively', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace MyNamespace
+                        function fn()
+                        end function
+                    end namespace
+                `);
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                expect(lookup.get('mynamespace')).to.exist;
+                expect(lookup.get('MYNAMESPACE')).to.exist;
+                expect(lookup.get('MyNamespace')).to.exist;
+                //all three lookups return the same container (cached on first access)
+                expect(lookup.get('mynamespace')).to.equal(lookup.get('MYNAMESPACE'));
+            });
+        });
+
+        describe('slow path correctness', () => {
+            it('merges classStatements from two contributors', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        class FromA
+                        end class
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        class FromB
+                        end class
+                    end namespace
+                `);
+                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.classStatements?.froma).to.exist;
+                expect(lib.classStatements?.fromb).to.exist;
+            });
+
+            it('merges only the field types each contributor populates', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        class OnlyClass
+                        end class
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        function onlyFunc()
+                        end function
+                    end namespace
+                `);
+                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.classStatements?.onlyclass).to.exist;
+                expect(lib.functionStatements?.onlyfunc).to.exist;
+                //fields not contributed by either file stay undefined
+                expect(lib.enumStatements).to.be.undefined;
+                expect(lib.constStatements).to.be.undefined;
+            });
+
+            it('merges three contributors correctly', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        function fa()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        function fb()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/c.bs', `
+                    namespace lib
+                        function fc()
+                        end function
+                    end namespace
+                `);
+                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.functionStatements?.fa).to.exist;
+                expect(lib.functionStatements?.fb).to.exist;
+                expect(lib.functionStatements?.fc).to.exist;
+            });
+
+            it('aggregate symbolTable contains symbols from every contributor', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        function fromA()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        function fromB()
+                        end function
+                    end namespace
+                `);
+                //BrsFileValidator populates each body's symbolTable during validate; the
+                //namespace contribution's symbolTable is built from those bodies.
+                program.validate();
+                const lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.symbolTable).to.exist;
+                expect(lib.symbolTable.hasSymbol('fromA', SymbolTypeFlag.runtime)).to.be.true;
+                expect(lib.symbolTable.hasSymbol('fromB', SymbolTypeFlag.runtime)).to.be.true;
+            });
+
+            it('produces different aggregates for scopes with different contributor sets', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        function fromA()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        function fromB()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/c.bs', `
+                    namespace lib
+                        function fromC()
+                        end function
+                    end namespace
+                `);
+                program.setFile('components/AB.xml', `
+                    <component name="AB" extends="Group">
+                        <script type="text/brightscript" uri="pkg:/source/a.bs" />
+                        <script type="text/brightscript" uri="pkg:/source/b.bs" />
+                    </component>
+                `);
+                program.setFile('components/BC.xml', `
+                    <component name="BC" extends="Group">
+                        <script type="text/brightscript" uri="pkg:/source/b.bs" />
+                        <script type="text/brightscript" uri="pkg:/source/c.bs" />
+                    </component>
+                `);
+                program.validate();
+                const ab = program['scopes'][s`components/AB.xml`].buildNamespaceLookup().get('lib');
+                const bc = program['scopes'][s`components/BC.xml`].buildNamespaceLookup().get('lib');
+                expect(ab.functionStatements?.froma).to.exist;
+                expect(ab.functionStatements?.fromb).to.exist;
+                expect(ab.functionStatements?.fromc).to.be.undefined;
+                expect(bc.functionStatements?.froma).to.be.undefined;
+                expect(bc.functionStatements?.fromb).to.exist;
+                expect(bc.functionStatements?.fromc).to.exist;
+                //different file sets → different cached aggregates → different references
+                expect(ab.functionStatements).to.not.equal(bc.functionStatements);
+            });
+
+            it('walks pure-intermediate multi-contributor case without crashing', () => {
+                //"prefix" is intermediate-only across multiple files (no leaf body anywhere)
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace prefix.alpha
+                        function fa()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace prefix.beta
+                        function fb()
+                        end function
+                    end namespace
+                `);
+                const prefix = program['scopes']['source'].buildNamespaceLookup().get('prefix');
+                expect(prefix).to.exist;
+                expect(prefix.namespaces.has('alpha')).to.be.true;
+                expect(prefix.namespaces.has('beta')).to.be.true;
+                expect(prefix.statements).to.be.undefined;
+                expect(prefix.classStatements).to.be.undefined;
+                expect(prefix.functionStatements).to.be.undefined;
+                //pure intermediates have no symbolTable
+                expect(prefix.symbolTable).to.be.undefined;
+            });
+        });
+
+        describe('cache invalidation', () => {
+            it('removes a namespace from the lookup when the only contributing file is removed', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace will_be_gone
+                        function fn()
+                        end function
+                    end namespace
+                `);
+                expect(program['scopes']['source'].buildNamespaceLookup().get('will_be_gone')).to.exist;
+                program.removeFile('source/main.bs');
+                expect(program['scopes']['source'].buildNamespaceLookup().get('will_be_gone')).to.be.undefined;
+            });
+
+            it('updates the slow-path aggregate when one contributor changes its content', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        function originalA()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        function fromB()
+                        end function
+                    end namespace
+                `);
+                let lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.functionStatements?.originala).to.exist;
+                expect(lib.functionStatements?.fromb).to.exist;
+                //replace one contributor
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        function newA()
+                        end function
+                    end namespace
+                `);
+                lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.functionStatements?.newa).to.exist;
+                expect(lib.functionStatements?.originala).to.be.undefined;
+                expect(lib.functionStatements?.fromb).to.exist;
+            });
+
+            it('handles a namespace gaining a new contributor (single -> multi)', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        function fromA()
+                        end function
+                    end namespace
+                `);
+                let lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.functionStatements?.froma).to.exist;
+                expect(lib.functionStatements?.fromb).to.be.undefined;
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        function fromB()
+                        end function
+                    end namespace
+                `);
+                lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                //both contributions now present
+                expect(lib.functionStatements?.froma).to.exist;
+                expect(lib.functionStatements?.fromb).to.exist;
+            });
+
+            it('handles a namespace losing a contributor (multi -> single)', () => {
+                program.setFile<BrsFile>('source/a.bs', `
+                    namespace lib
+                        function fromA()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/b.bs', `
+                    namespace lib
+                        function fromB()
+                        end function
+                    end namespace
+                `);
+                let lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.functionStatements?.froma).to.exist;
+                expect(lib.functionStatements?.fromb).to.exist;
+                program.removeFile('source/b.bs');
+                lib = program['scopes']['source'].buildNamespaceLookup().get('lib');
+                expect(lib.functionStatements?.froma).to.exist;
+                expect(lib.functionStatements?.fromb).to.be.undefined;
+            });
+        });
+
+        describe('Map interface', () => {
+            beforeEach(() => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace one
+                        function f1()
+                        end function
+                    end namespace
+                    namespace two.three
+                        function f2()
+                        end function
+                    end namespace
+                `);
+            });
+
+            it('responds to .has() for in-scope namespaces', () => {
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                expect(lookup.has('one')).to.be.true;
+                expect(lookup.has('two')).to.be.true;
+                expect(lookup.has('two.three')).to.be.true;
+                expect(lookup.has('not_a_namespace')).to.be.false;
+            });
+
+            it('returns undefined for .get() of a missing namespace', () => {
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                expect(lookup.get('not_a_namespace')).to.be.undefined;
+            });
+
+            it('reports correct .size', () => {
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                //three name parts: one, two, two.three
+                expect(lookup.size).to.equal(3);
+            });
+
+            it('iterates entries() and produces all in-scope namespaces', () => {
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                const keys = [...lookup.entries()].map(([key]) => key).sort();
+                expect(keys).to.eql(['one', 'two', 'two.three']);
+            });
+
+            it('iterates keys() and values()', () => {
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                const keys = [...lookup.keys()].sort();
+                expect(keys).to.eql(['one', 'two', 'two.three']);
+                const values = [...lookup.values()];
+                expect(values.length).to.equal(3);
+                expect(values.every(value => value !== undefined && value !== null)).to.be.true;
+            });
+
+            it('supports for...of iteration via Symbol.iterator', () => {
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                const seenKeys = [];
+                for (const [key] of lookup) {
+                    seenKeys.push(key);
+                }
+                expect(seenKeys.sort()).to.eql(['one', 'two', 'two.three']);
+            });
+
+            it('supports forEach', () => {
+                const lookup = program['scopes']['source'].buildNamespaceLookup();
+                const seenKeys = [];
+                lookup.forEach((_, key) => {
+                    seenKeys.push(key);
+                });
+                expect(seenKeys.sort()).to.eql(['one', 'two', 'two.three']);
+            });
+        });
+
+        describe('scope filtering of children', () => {
+            it('only includes children whose contributors are in scope', () => {
+                program.setFile<BrsFile>('source/colors.bs', `
+                    namespace ds.colors
+                        function getRed()
+                        end function
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/icons.bs', `
+                    namespace ds.icons
+                        function getStar()
+                        end function
+                    end namespace
+                `);
+                //a component that only imports colors.bs should see ds.colors but not ds.icons
+                program.setFile('components/ColorOnly.xml', `
+                    <component name="ColorOnly" extends="Group">
+                        <script type="text/brightscript" uri="pkg:/source/colors.bs" />
+                    </component>
+                `);
+                //a component that imports both should see both children
+                program.setFile('components/Both.xml', `
+                    <component name="Both" extends="Group">
+                        <script type="text/brightscript" uri="pkg:/source/colors.bs" />
+                        <script type="text/brightscript" uri="pkg:/source/icons.bs" />
+                    </component>
+                `);
+                program.validate();
+                const colorOnly = program['scopes'][s`components/ColorOnly.xml`].buildNamespaceLookup().get('ds');
+                const both = program['scopes'][s`components/Both.xml`].buildNamespaceLookup().get('ds');
+                expect(colorOnly.namespaces.has('colors')).to.be.true;
+                expect(colorOnly.namespaces.has('icons')).to.be.false;
+                expect(both.namespaces.has('colors')).to.be.true;
+                expect(both.namespaces.has('icons')).to.be.true;
+            });
+        });
+
+        describe('edge cases', () => {
+            it('does not crash on an empty namespace body', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace empty
+                    end namespace
+                `);
+                const empty = program['scopes']['source'].buildNamespaceLookup().get('empty');
+                expect(empty).to.exist;
+                expect(empty.statements).to.be.undefined;
+                expect(empty.classStatements).to.be.undefined;
+                expect(empty.functionStatements).to.be.undefined;
+            });
+
+            it('merges multiple `namespace X` blocks within the same file', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace dual
+                        function fromFirstBlock()
+                        end function
+                    end namespace
+                    namespace dual
+                        function fromSecondBlock()
+                        end function
+                    end namespace
+                `);
+                const dual = program['scopes']['source'].buildNamespaceLookup().get('dual');
+                expect(dual.functionStatements?.fromfirstblock).to.exist;
+                expect(dual.functionStatements?.fromsecondblock).to.exist;
+            });
+
+            it('returns a namespaces Map (not undefined) even for namespaces with no children', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    namespace lonely
+                        function fn()
+                        end function
+                    end namespace
+                `);
+                const lonely = program['scopes']['source'].buildNamespaceLookup().get('lonely');
+                expect(lonely.namespaces).to.be.instanceOf(Map);
+                expect(lonely.namespaces.size).to.equal(0);
+            });
+        });
+    });
+
+    describe('buildEnumLookup', () => {
+        it('builds enum lookup', () => {
+            const sourceScope = program.getScopeByName('source');
+            //eslint-disable-next-line @typescript-eslint/no-floating-promises
+            program.setFile('source/main.bs', `
+                enum foo
+                    bar1
+                    bar2
+                end enum
+
+                namespace test
+                    function fooFace2()
+                    end function
+
+                    class fooClass2
+                    end class
+
+                    enum foo2
+                        bar2_1
+                        bar2_2
+                    end enum
+                end namespace
+
+                enum foo3
+                    bar3_1
+                    bar3_2
+                end enum
             `);
             program.validate();
 
@@ -2351,4 +3316,3728 @@ describe('Scope', () => {
             ]);
         });
     });
+
+    describe('symbolTable lookups with enhanced typing', () => {
+
+        const mainFileContents = `
+            sub main()
+                population = Animals.getPopulation()
+                print population
+                flyBoy = new Animals.Bird()
+                flyBoysWings = flyBoy.hasWings
+                flyBoysSkin = flyBoy.skin
+                fido = new Animals.Dog()
+                fidoBark = fido.bark()
+                chimp = new Animals.Ape()
+                chimpHasLegs = chimp.hasLegs
+                chimpSpeed = chimp.getRunSpeed()
+                fidoSpeed = fido.getRunSpeed()
+                skin = Animals.SkinType.fur
+            end sub
+         `;
+
+        const animalFileContents = `
+            namespace Animals
+                function getPopulation() as integer
+                    return 10
+                end function
+
+                class Creature
+                    skin as Animals.SkinType
+                end class
+
+                class Bird extends Creature
+                    hasWings = true
+                    skin = Animals.SkinType.feathers
+                end class
+
+                class Mammal extends Creature
+                    hasLegs = true
+                    legCount as integer
+                    skin = Animals.SkinType.fur
+
+                    function getRunSpeed() as integer
+                        speed = m.legCount * 10
+                        return speed
+                    end function
+                end class
+
+                class Dog extends Mammal
+                    legCount = 4
+                    function bark() as string
+                        return "woof"
+                    end function
+                end class
+
+                class Ape extends Mammal
+                    legCount = 2
+                end class
+
+                enum SkinType
+                    feathers
+                    fur
+                end enum
+            end namespace
+        `;
+
+        it('finds correct return type for class methods', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    fooInstance = new Foo()
+                    myNum = fooInstance.getNum()
+                end sub
+
+                class Foo
+                    function getNum() as integer
+                        return 1
+                    end function
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 10));
+            const sourceScope = program.getScopeByName('source');
+            expect(sourceScope).to.exist;
+            expect(mainFnScope).to.exist;
+            sourceScope.linkSymbolTable();
+            const mainSymbolTable = mainFnScope.symbolTable;
+            expectTypeToBe(mainSymbolTable.getSymbol('fooInstance', SymbolTypeFlag.runtime)[0].type, ClassType);
+            expect(mainSymbolTable.getSymbol('fooInstance', SymbolTypeFlag.runtime)[0].type.toString()).to.eq('Foo');
+            let myNumType = mainSymbolTable.getSymbolType('myNum', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(myNumType, IntegerType);
+        });
+
+        it('finds correct parameter type with default value enums are used', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                sub paint(x as Color, colorChoice = Color.red)
+                    paintColor = colorChoice
+                    print paintColor
+                    print x.toStr()
+                end sub
+
+                enum Color
+                    red
+                    blue
+                end enum
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 25));
+            const sourceScope = program.getScopeByName('source');
+            expect(sourceScope).to.exist;
+            expect(mainFnScope).to.exist;
+            sourceScope.linkSymbolTable();
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('paintColor', SymbolTypeFlag.runtime)[0].type, EnumType);
+        });
+
+        it('finds correct class field type with default value enums are used', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    foo = new Paint()
+                    paintColor = foo.colorType
+                    print paintColor
+                end sub
+
+                class Paint
+                    colorType = Color.red
+                end class
+
+                enum Color
+                    red
+                    blue
+                end enum
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 25));
+            const sourceScope = program.getScopeByName('source');
+            expect(sourceScope).to.exist;
+            expect(mainFnScope).to.exist;
+            sourceScope.linkSymbolTable();
+            let mainScopeSymbolTable = mainFnScope.symbolTable;
+            let paintType = mainScopeSymbolTable.getSymbolType('paintColor', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(paintType, EnumType);
+        });
+
+
+        it('finds correct type for namespaced lookups', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', mainFileContents);
+            program.setFile('source/animals.bs', animalFileContents);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(7, 23));
+            const sourceScope = program.getScopeByName('source');
+            expect(sourceScope).to.exist;
+            sourceScope.linkSymbolTable();
+            expect(mainFnScope).to.exist;
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('skin', SymbolTypeFlag.runtime)[0].type, EnumMemberType);
+
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('flyBoy', SymbolTypeFlag.runtime)[0].type, ClassType);
+            expect(mainFnScope.symbolTable.getSymbol('flyBoy', SymbolTypeFlag.runtime)[0].type.toString()).to.eq('Animals.Bird');
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('flyBoysWings', SymbolTypeFlag.runtime)[0].type, BooleanType);
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('flyBoysSkin', SymbolTypeFlag.runtime)[0].type, EnumType);
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('fido', SymbolTypeFlag.runtime)[0].type, ClassType);
+            expect(mainFnScope.symbolTable.getSymbol('fido', SymbolTypeFlag.runtime)[0].type.toString()).to.eq('Animals.Dog');
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('fidoBark', SymbolTypeFlag.runtime)[0].type, StringType);
+        });
+
+        it('finds correct type for members of classes with super classes', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', mainFileContents);
+            program.setFile('source/animals.bs', animalFileContents);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(7, 23));
+            const sourceScope = program.getScopeByName('source');
+            expect(sourceScope).to.exist;
+            sourceScope.linkSymbolTable();
+            expect(mainFnScope).to.exist;
+            const chimpType = mainFnScope.symbolTable.getSymbol('chimp', SymbolTypeFlag.runtime)[0].type;
+            expectTypeToBe(chimpType, ClassType);
+            expectTypeToBe((chimpType as ClassType).parentType, ClassType);
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('chimpHasLegs', SymbolTypeFlag.runtime)[0].type, BooleanType);
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('chimpSpeed', SymbolTypeFlag.runtime)[0].type, IntegerType);
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('fidoSpeed', SymbolTypeFlag.runtime)[0].type, IntegerType);
+        });
+
+        it('finds correct types for method calls', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    myVal = (new NameA.Klass()).getNumObj().num
+                end sub
+
+                namespace NameA
+                    class Klass
+                        function getNumObj() as NumObj
+                            return new NumObj()
+                        end function
+                    end class
+
+                    class NumObj
+                        num = 2
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+            const sourceScope = program.getScopeByName('source');
+            expect(sourceScope).to.exist;
+            sourceScope.linkSymbolTable();
+            expect(mainFnScope).to.exist;
+            expectTypeToBe(mainFnScope.symbolTable.getSymbol('myVal', SymbolTypeFlag.runtime)[0].type, IntegerType);
+        });
+
+        it('finds correct types for self-referencing variables', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    dt = CreateObject("roDateTime")
+                    hours = dt.GetHours()
+                    hours = hours
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+            const sourceScope = program.getScopeByName('source');
+            expect(sourceScope).to.exist;
+            sourceScope.linkSymbolTable();
+            expect(mainFnScope).to.exist;
+            const getTypeOptions = { flags: SymbolTypeFlag.runtime };
+            let dtType = mainFnScope.symbolTable.getSymbolType('dt', getTypeOptions);
+            expectTypeToBe(dtType, InterfaceType);
+            let hoursType = mainFnScope.symbolTable.getSymbolType('hours', getTypeOptions);
+            expectTypeToBe(hoursType, IntegerType);
+        });
+
+        describe('union types', () => {
+
+            it('should find actual members correctly', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printName(thing as Person or Pet)
+                        name = thing.name
+                        print name
+                    end sub
+
+                    class Person
+                        name as string
+                        age as integer
+                    end class
+
+                    class Pet
+                        name as string
+                        legs as integer
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                expectTypeToBe(mainSymbolTable.getSymbolType('name', { flags: SymbolTypeFlag.runtime }), StringType);
+            });
+
+            it('should have an error when a non union member is accessed', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printLegs(thing as Person or Pet)
+                        print thing.legs
+                    end sub
+
+                    class Person
+                        name as string
+                        age as integer
+                    end class
+
+                    class Pet
+                        name as string
+                        legs as integer
+                    end class
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('legs', '(Person or Pet).legs', '(Person or Pet)').message
+                ]);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+            });
+
+            it('should use the union of types in union of interfaces', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub unionOfFuncs(thing as IfaceA or IfaceB)
+                        data = thing.data
+                        print data
+                    end sub
+
+                    interface IfaceA
+                        data as string
+                    end interface
+
+                    interface IfaceB
+                        data as integer
+                    end interface
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const dataType = mainSymbolTable.getSymbolType('data', { flags: SymbolTypeFlag.runtime }) as UnionType;
+                expectTypeToBe(dataType, UnionType);
+                expect(dataType.types).includes(StringType.instance);
+                expect(dataType.types).includes(IntegerType.instance);
+            });
+
+            it('should use the union of return types of a union of functions', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub unionOfFuncs(thing as IfaceA or IfaceB)
+                        result = thing.getData()
+                        print result
+                    end sub
+
+                    interface IfaceA
+                        function getData() as string
+                    end interface
+
+                    interface IfaceB
+                        function getData() as integer
+                    end interface
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const resultType = mainSymbolTable.getSymbolType('result', { flags: SymbolTypeFlag.runtime }) as UnionType;
+                expectTypeToBe(resultType, UnionType);
+                expect(resultType.types.map(t => t.toString())).includes(StringType.instance.toString());
+                expect(resultType.types.map(t => t.toString())).includes(IntegerType.instance.toString());
+            });
+
+            it('should handle union types grouped', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub nestedUnion(thing as (Person or Pet) or (Vehicle or Duck))
+                        id = thing.id
+                        print id
+                    end sub
+
+                    sub takesIntOrString(x as (integer or string))
+                        print x
+                    end sub
+
+                    class Person
+                        id as integer
+                    end class
+
+                    class Pet
+                        id as integer
+                    end class
+
+                    class Vehicle
+                        id as string
+                    end class
+
+                    class Duck
+                        id as string
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const idType = mainSymbolTable.getSymbolType('id', { flags: SymbolTypeFlag.runtime }) as UnionType;
+                expectTypeToBe(idType, UnionType);
+                expect(idType.types).includes(StringType.instance);
+                expect(idType.types).includes(IntegerType.instance);
+            });
+        });
+
+        describe('intersection types', () => {
+
+            it('should create intersection types', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printName(thing as Person and Pet)
+                        name = thing.name
+                        print name
+                        legs = thing.legs
+                        print legs
+                        isAdult = thing.isAdult
+                        print isAdult
+                    end sub
+
+                    class Person
+                        name as string
+                        isAdult as boolean
+                    end class
+
+                    class Pet
+                        name as string
+                        legs as integer
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const thingType = mainSymbolTable.getSymbolType('thing', { flags: SymbolTypeFlag.runtime }) as IntersectionType;
+                expectTypeToBe(thingType, IntersectionType);
+                expect(thingType.types).to.have.lengthOf(2);
+                expect(thingType.types).to.satisfy((types) => {
+                    return types.some(t => t.toString() === 'Person') &&
+                        types.some(t => t.toString() === 'Pet');
+                });
+                const nameType = mainSymbolTable.getSymbolType('name', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(nameType, StringType);
+                const legsType = mainSymbolTable.getSymbolType('legs', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(legsType, IntegerType);
+                const isAdultType = mainSymbolTable.getSymbolType('isAdult', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(isAdultType, BooleanType);
+            });
+
+
+            it('should allow intersection of types in namespaces', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printData(thing as NamespaceA.TypeA and NamespaceB.TypeB)
+                        dataA = thing.dataA
+                        print dataA
+                        dataB = thing.dataB
+                        print dataB
+                    end sub
+
+                    namespace NamespaceA
+                        class TypeA
+                            dataA as string
+                        end class
+                    end namespace
+
+                    namespace NamespaceB
+                        class TypeB
+                            dataB as integer
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const thingType = mainSymbolTable.getSymbolType('thing', { flags: SymbolTypeFlag.runtime }) as IntersectionType;
+                expectTypeToBe(thingType, IntersectionType);
+                expect(thingType.types).to.have.lengthOf(2);
+                expect(thingType.types).to.satisfy((types) => {
+                    return types.some(t => t.toString() === 'NamespaceA.TypeA') &&
+                        types.some(t => t.toString() === 'NamespaceB.TypeB');
+                });
+                const dataAType = mainSymbolTable.getSymbolType('dataA', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(dataAType, StringType);
+                const dataBType = mainSymbolTable.getSymbolType('dataB', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(dataBType, IntegerType);
+            });
+
+            it('should allow intersections with types from another file', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printInfo(thing as Person and Pet)
+                        name = thing.name
+                        print name
+                        legs = thing.legs
+                        print legs
+                    end sub
+                `);
+                program.setFile<BrsFile>('source/types.bs', `
+                    class Person
+                        name as string
+                    end class
+
+                    class Pet
+                        legs as integer
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const thingType = mainSymbolTable.getSymbolType('thing', { flags: SymbolTypeFlag.runtime }) as IntersectionType;
+                expectTypeToBe(thingType, IntersectionType);
+                expect(thingType.types).to.have.lengthOf(2);
+                expect(thingType.types).to.satisfy((types) => {
+                    return types.some(t => t.toString() === 'Person') &&
+                        types.some(t => t.toString() === 'Pet');
+                });
+                const nameType = mainSymbolTable.getSymbolType('name', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(nameType, StringType);
+                const legsType = mainSymbolTable.getSymbolType('legs', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(legsType, IntegerType);
+            });
+
+            it('allows a type intersection with a built in type', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printStringInfo(data as MyKlass and roAssociativeArray)
+                        x = data.customData
+                        print x
+                        y = data.count()
+                        print y
+                    end sub
+
+                    class MyKlass
+                        customData as string
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const dataType = mainSymbolTable.getSymbolType('data', { flags: SymbolTypeFlag.runtime }) as IntersectionType;
+                expectTypeToBe(dataType, IntersectionType);
+                expect(dataType.types).to.have.lengthOf(2);
+                expect(dataType.types).to.satisfy((types) => {
+                    return types.some(t => t.toString() === 'MyKlass') &&
+                        types.some(t => t.toString() === 'roAssociativeArray');
+                });
+                const customDataType = mainSymbolTable.getSymbolType('x', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(customDataType, StringType);
+                const countType = mainSymbolTable.getSymbolType('y', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(countType, IntegerType);
+            });
+
+            it('allows grouped expressions in type statement', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    type guy = ({name as string, age as integer} or {id as integer, age as integer}) and {foo as boolean}
+
+
+                    sub foo(person as guy)
+                        if person.foo
+                            print person.age + 123
+                        end if
+                    end sub
+                `);
+                const ast = mainFile.ast;
+                program.validate();
+                expectZeroDiagnostics(program);
+                expect(isTypeStatement(ast.statements[0])).to.be.true;
+                const stmt = ast.statements[0] as TypeStatement;
+                expect(stmt.tokens.type.text).to.eq('type');
+                expect(stmt.value).to.exist;
+            });
+
+            it('unknown members of intersections with AA types return dynamic', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printData(data as {customData as string} and roAssociativeArray)
+                        x = data.someDynamicKey
+                        y = data.customData
+                        print x
+                        print y
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const dataType = mainSymbolTable.getSymbolType('data', { flags: SymbolTypeFlag.runtime }) as IntersectionType;
+                expectTypeToBe(dataType, IntersectionType);
+                expect(dataType.types).to.have.lengthOf(2);
+                const xType = mainSymbolTable.getSymbolType('x', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(xType, DynamicType);
+                const yType = mainSymbolTable.getSymbolType('y', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(yType, StringType);
+            });
+
+            it('unknown members of intersections with object type return dynamic', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printData(data as {customData as string} and object)
+                        x = data.someDynamicKey
+                        y = data.customData
+                        print x
+                        print y
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const dataType = mainSymbolTable.getSymbolType('data', { flags: SymbolTypeFlag.runtime }) as IntersectionType;
+                expectTypeToBe(dataType, IntersectionType);
+                expect(dataType.types).to.have.lengthOf(2);
+                const xType = mainSymbolTable.getSymbolType('x', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(xType, DynamicType);
+                const yType = mainSymbolTable.getSymbolType('y', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(yType, StringType);
+            });
+
+            it('order doesnt matter for intersections with object type and finding members', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub printData(data as object and {customData as string})
+                        x = data.someDynamicKey
+                        y = data.customData
+                        print x
+                        print y
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                expect(sourceScope).to.exist;
+                sourceScope.linkSymbolTable();
+                expect(mainFnScope).to.exist;
+                const mainSymbolTable = mainFnScope.symbolTable;
+                const dataType = mainSymbolTable.getSymbolType('data', { flags: SymbolTypeFlag.runtime }) as IntersectionType;
+                expectTypeToBe(dataType, IntersectionType);
+                expect(dataType.types).to.have.lengthOf(2);
+                const xType = mainSymbolTable.getSymbolType('x', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(xType, DynamicType);
+                const yType = mainSymbolTable.getSymbolType('y', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(yType, StringType);
+            });
+        });
+
+        describe('type casts', () => {
+            it('should use type casts to determine the types of symbols', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub main(thing)
+                        value = thing as float
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                let mainSymbolTable = mainFnScope.symbolTable;
+                expectTypeToBe(mainSymbolTable.getSymbol('value', SymbolTypeFlag.runtime)[0].type, FloatType);
+            });
+
+
+            it('should allow type casts in dotted get statements', () => {
+                const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub main(thing)
+                        value = (thing as MyThing).name
+                    end sub
+
+                    interface MyThing
+                        name as string
+                    end interface
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const mainFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                let mainSymbolTable = mainFnScope.symbolTable;
+                expectTypeToBe(mainSymbolTable.getSymbol('value', SymbolTypeFlag.runtime)[0].type, StringType);
+            });
+        });
+
+
+        describe('multiple nested namespaces', () => {
+
+            it('should be able to define deep namespaces in any order', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    function getData()
+                        return alpha.beta.gamma.value1 + alpha.beta.gamma.delta.deltaValue +  alpha.beta.gamma.value2
+                    end function
+
+                    namespace alpha.beta.gamma.delta
+                        const deltaValue = 50
+                    end namespace
+
+                    namespace alpha.beta.gamma
+                        const value1 = 300
+                        const value2 = 400
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                program.getScopeByName('source').linkSymbolTable();
+                const getDataFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = getDataFnScope.symbolTable;
+                const getTypeOptions = { flags: SymbolTypeFlag.runtime };
+                let alphaType = symbolTable.getSymbolType('alpha', getTypeOptions);
+                let betaType = alphaType?.getMemberType('beta', getTypeOptions);
+                let gammaType = betaType?.getMemberType('gamma', getTypeOptions);
+                let value1Type = gammaType?.getMemberType('value1', getTypeOptions);
+                let deltaType = gammaType?.getMemberType('delta', getTypeOptions);
+                let deltaValueType = deltaType?.getMemberType('deltaValue', getTypeOptions);
+                expectTypeToBe(alphaType, NamespaceType);
+                expectTypeToBe(betaType, NamespaceType);
+                expectTypeToBe(gammaType, NamespaceType);
+                expectTypeToBe(value1Type, IntegerType);
+                expectTypeToBe(deltaType, NamespaceType);
+                expectTypeToBe(deltaValueType, IntegerType);
+            });
+
+            it('should be able to define deep namespaces in multiple files', () => {
+                program.setFile('source/util.bs', `
+                    function getData()
+                        return alpha.beta.gamma.sayHello(alpha.values.value1)
+                    end function
+
+                    namespace alpha.beta.gamma
+                        function sayHello(num as integer)
+                            return "hello " + num.toStr()
+                        end function
+                    end namespace
+                `);
+                program.setFile('source/values.bs', `
+                    namespace alpha.values
+                        const value1 = 300
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('should allow access to underscored version of namespace members in different file', () => {
+                program.setFile('source/main.bs', `
+                    sub printPi()
+                        print alpha_util_getPi().toStr()
+                    end sub
+                `);
+                program.setFile('source/util.bs', `
+                    namespace alpha.util
+                        function getPi() as float
+                            return 3.14
+                        end function
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('should allow access to underscored version of namespaced class constructor in different file', () => {
+                program.setFile('source/main.bs', `
+                    sub printPi()
+                        print alpha_util_SomeKlass().value
+                    end sub
+                `);
+                program.setFile('source/util.bs', `
+                    namespace alpha.util
+                       class SomeKlass
+                            value as float
+
+                            sub new()
+                                value = 3.14
+                            end sub
+                       end class
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('resolves deep namespaces defined in different locations', () => {
+                program.setFile(`source/main.bs`, `
+                sub main()
+                    print NameA.NameB.makeClassB().value
+                end sub
+
+                namespace NameA
+                    namespace NameB
+                        function makeClassB() as SomeKlass
+                            return new SomeKlass()
+                        end function
+                    end namespace
+                end namespace
+                namespace NameA.NameB
+                    class SomeKlass
+                        value = 3.14
+                    end class
+                end namespace
+            `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('should find things in current namespace', () => {
+                program.setFile('source/utils.bs', `
+                    namespace sgnode
+                        sub speak(message)
+                            print message
+                        end sub
+
+                        sub sayHello()
+                            sgnode.speak("Hello")
+                        end sub
+                    end namespace`
+                );
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+        });
+
+        describe('const values', () => {
+            it('should allow const values to be composed of other const values from namespaces', () => {
+                program.setFile('source/constants.bs', `
+                    const top_pi = alpha.beta.pi
+                    const top_two = alpha.gamma.two
+                    const top_twoPi = top_two * top_pi
+                `);
+                program.setFile('source/ns.bs', `
+                    namespace alpha.beta
+                        const pi = 3.14
+                    end namespace
+
+                    namespace alpha.gamma
+                        const two = 2
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('should show an error when an invalid value is references', () => {
+                program.setFile('source/constants.bs', `
+                    const pi = alpha.beta.pi
+                    const two = alpha.gamma.two
+                    const twoPi = two * pi
+                `);
+                program.setFile('source/ns.bs', `
+                    namespace alpha.beta
+                        const pi = 3.14
+                    end namespace
+
+                    namespace alpha.gamma
+                        const three = 3
+                    end namespace
+                `);
+                program.validate();
+                expectDiagnosticsIncludes(program, [
+                    DiagnosticMessages.cannotFindName('two', 'alpha.gamma.two').message
+                ]);
+            });
+        });
+
+        it('should be able to reference multiple properties of a class that is itself a property', () => {
+            program.setFile('source/main.bs', `
+                sub process(dataObj as alpha.media.MediaObject)
+                    stream = dataObj.stream
+                    url = stream.url
+                    isLive = stream.live
+                end sub
+            `);
+            program.setFile('source/media.bs', `
+                namespace alpha.media
+                    class MediaObject
+                        stream as MediaStream
+                    end class
+                end namespace
+
+                namespace alpha.media
+                    class MediaStream
+                        url as string
+                        live as boolean
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('knows about items defined in different files in same namespace', () => {
+            program.options.autoImportComponentScript = true;
+            const constFileContents = `
+                import "pkg:/source/consts2.bs"
+
+                namespace a
+                    const PI = 3.14
+                    const PIX2 = PI * TWO
+                end namespace
+            `;
+            const const2FileContents = `
+                namespace a
+                    const TWO = 2
+                end namespace
+            `;
+            program.setFile('source/consts.bs', constFileContents);
+            program.setFile('source/consts2.bs', const2FileContents);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('knows about items defined in different files in same deeply nested namespace', () => {
+            program.options.autoImportComponentScript = true;
+            const constFileContents = `
+                import "pkg:/source/consts2.bs"
+
+                namespace a.b.c
+                    const PI = 3.14
+                    const PIX2 = PI * TWO
+                end namespace
+            `;
+            const const2FileContents = `
+                namespace a.b.c
+                    const TWO = 2
+                end namespace
+            `;
+            program.setFile('source/consts.bs', constFileContents);
+            program.setFile('source/consts2.bs', const2FileContents);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('binary and unary expressions', () => {
+            it('should set symbols with correct types from binary expressions', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process()
+                        s = "hello" + "world"
+                        exp = 2^3
+                        num = 3.14 + 3.14
+                        bool = true or false
+                        notEq = {} <> invalid
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('s', opts), StringType);
+                expectTypeToBe(symbolTable.getSymbolType('exp', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('num', opts), FloatType);
+                expectTypeToBe(symbolTable.getSymbolType('bool', opts), BooleanType);
+                expectTypeToBe(symbolTable.getSymbolType('notEq', opts), BooleanType);
+            });
+
+            it('should set symbols with correct types from unary expressions', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(boolVal as boolean, intVal as integer)
+                        a = not boolVal
+                        b = not true
+                        c = not intVal
+                        d = not 3.14
+
+                        e = -34
+                        f = -3.14
+                        g = -intVal
+                        h = - (-f)
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('a', opts), BooleanType);
+                expectTypeToBe(symbolTable.getSymbolType('b', opts), BooleanType);
+                expectTypeToBe(symbolTable.getSymbolType('c', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('d', opts), IntegerType);
+
+                expectTypeToBe(symbolTable.getSymbolType('e', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('f', opts), FloatType);
+                expectTypeToBe(symbolTable.getSymbolType('g', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('h', opts), FloatType);
+            });
+
+            it('should set correct types on bitwise operators on numbers', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process()
+                        three = &h01 or &h02
+                        print three ' prints 3
+
+                        one = &h01 and &h01
+                        print one ' prints 1
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const func = mainFile.ast.findChild<FunctionExpression>(isFunctionExpression);
+                const symbolTable = func.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('one', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('three', opts), IntegerType);
+            });
+        });
+
+        describe('assignment expressions', () => {
+            it('should set correct type on simple equals', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(intVal as integer, dblVal as double, strVal as string)
+                        a = intVal
+                        b = dblVal
+                        c = strVal
+                        d = {}
+                        f = m.foo
+                        e = true
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('a', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('b', opts), DoubleType);
+                expectTypeToBe(symbolTable.getSymbolType('c', opts), StringType);
+                expectTypeToBe(symbolTable.getSymbolType('d', opts), AssociativeArrayType);
+                expectTypeToBe(symbolTable.getSymbolType('f', opts), DynamicType);
+                expectTypeToBe(symbolTable.getSymbolType('e', opts), BooleanType);
+            });
+
+            it('should set correct type for aa literals', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(intVal as integer, dblVal as double, strVal as string)
+                        myAA = {
+                            a: intVal
+                            b: dblVal
+                            c: strVal
+                            d: {}
+                            f :m.foo
+                            e: true
+                        }
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const myAA = symbolTable.getSymbolType('myAA', opts);
+                expectTypeToBe(myAA, AssociativeArrayType);
+                expectTypeToBe(myAA.getMemberType('a', opts), IntegerType);
+                expectTypeToBe(myAA.getMemberType('b', opts), DoubleType);
+                expectTypeToBe(myAA.getMemberType('c', opts), StringType);
+                expectTypeToBe(myAA.getMemberType('d', opts), AssociativeArrayType);
+                expectTypeToBe(myAA.getMemberType('f', opts), DynamicType);
+                expectTypeToBe(myAA.getMemberType('e', opts), BooleanType);
+                expectTypeToBe(myAA.getMemberType('someUnsetThing', opts), DynamicType);
+            });
+
+            it('should set correct type on compound equals', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(intVal as integer, dblVal as double, strVal as string)
+                        a = intVal
+                        a += 4
+                        b = dblVal
+                        b *= 23
+                        c = strVal
+                        c += "hello world"
+                        d = 3.14
+                        d \= 3 ' integer division -> d could be either a float or int
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('a', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('b', opts), DoubleType);
+                expectTypeToBe(symbolTable.getSymbolType('c', opts), StringType);
+                const dType = symbolTable.getSymbolType('d', opts);
+                expectTypeToBe(dType, UnionType); // this is a union because we didn't supply a statementIndex
+                expect((dType as UnionType).types).to.include(FloatType.instance);
+                expect((dType as UnionType).types).to.include(IntegerType.instance);
+                const lastStatement = processFnScope.func.body.statements[processFnScope.func.body.statements.length - 1] as AssignmentStatement;
+                const dTypeAtEnd = lastStatement.getType(opts);
+                expectTypeToBe(dTypeAtEnd, IntegerType); // this is an int because we got the type at the final statement
+            });
+
+            it('should set correct type on compound equals with function call', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    function check() as string
+                        test = "hello"
+                        test += lcase("WORLD")
+                        return test
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('test', opts), StringType);
+            });
+
+            it('should work for a multiple binary expressions', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    function process(intVal as integer)
+                        x = (intVal * 2) + 1 + 3^8 + intVal + (3 - 9)  ' should be int
+                        result = 3.5 ' float
+                        result *= (x + 1.123 * 3) ' -> float
+                        return result
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('x', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('result', opts), FloatType);
+            });
+
+            it('should recognize consistent type after function call in binary op', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    function process(items) as string
+                        myString = ""
+                        for each item in items
+                            myString += utils.toString(item) + " "
+                        end for
+                        return myString
+                    end function
+                `);
+                program.setFile('source/utils.bs', `
+                    namespace utils
+                        function toString(thing) as string
+                            return type(thing)
+                        end function
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('myString', opts), StringType);
+            });
+        });
+
+        describe('typed array expressions', () => {
+            it('should set correct type on indexedGet', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub first(nums as integer[]) as integer
+                        num = nums[0]
+                        return num
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('num', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('nums', opts), ArrayType);
+            });
+
+            it('should set correct type on indexedGet of multi-dimensional arrays', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub first(numsArray as integer[][]) as integer
+                        nums = numsArray[0]
+                        num = nums[0]
+                        return num
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('num', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('nums', opts), ArrayType);
+
+                expectTypeToBe((symbolTable.getSymbolType('numsArray', opts) as any).defaultType, ArrayType);
+                expectTypeToBe((symbolTable.getSymbolType('nums', opts) as any).defaultType, IntegerType);
+            });
+
+
+            it('should set correct type on for each loop items', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub sum(nums as integer[]) as integer
+                        total = 0
+                        for each num in nums
+                            total += num
+                        end for
+                        return total
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime, statementIndex: forEachStmt.statementIndex + 1 };
+                expectTypeToBe(symbolTable.getSymbolType('total', opts), IntegerType);
+                // at top level, num could possible be uninitialized if loop is not run
+                const loopVarType = symbolTable.getSymbolType('num', opts) as UnionType;
+                expectTypeToBe(loopVarType, UnionType);
+                expect(loopVarType.types).to.include(UninitializedType.instance);
+                // inside the loop, num must be an integer
+                const loopBodySymbolTable = forEachStmt.body.getSymbolTable();
+                expectTypeToBe(loopBodySymbolTable.getSymbolType('num', opts), IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('nums', opts), ArrayType);
+            });
+
+            it('should set correct type on for each loop items when looping a const array in a namespace', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    namespace Alpha
+                        const data = [1,2,3]
+
+                        function printData()
+                            for each item in Alpha.data
+                                print item
+                            end for
+                        end function
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                const forEachStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('data', opts), ArrayType);
+                expectTypeToBe((symbolTable.getSymbolType('data', opts) as ArrayType).defaultType, IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('Alpha', opts).getMemberType('data', opts), ArrayType);
+                expectTypeToBe(((symbolTable.getSymbolType('Alpha', opts).getMemberType('data', opts)) as ArrayType).defaultType, IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('item', opts), IntegerType);
+            });
+
+            it('should set correct type on for each loop items of multi-dimensional arrays', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(numsArray as integer[][]) as integer
+                        total = 0
+                        for each nums in numsArray
+                            for each num in nums
+                                total += num
+                            end for
+                        end for
+                        return total
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmts = mainFile.ast.findChildren<ForEachStatement>(isForEachStatement);
+                const outerSymbolTable = forEachStmts[0].body.getSymbolTable();
+                const innerSymbolTable = forEachStmts[1].body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(outerSymbolTable.getSymbolType('total', opts), IntegerType);
+                expectTypeToBe(outerSymbolTable.getSymbolType('nums', opts), ArrayType);
+                expectTypeToBe(innerSymbolTable.getSymbolType('num', opts), IntegerType);
+            });
+
+            it('should set the type of the loop item based on the declared type', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(strs)
+                        for each str as string in strs
+                            print str
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('str', opts), StringType);
+            });
+
+            it('should set the type of the loop item based on the inferred type for ByteArray', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(bytes as roByteArray)
+                        for each byte in bytes
+                            print byte
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('byte', opts), IntegerType);
+            });
+
+
+            it('should set the type of the loop item based on the inferred type for AAs', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(data as roAssociativeArray)
+                        for each key in data
+                            print key
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('key', opts), StringType);
+            });
+
+            it('should set the type of the for loop item whn the target is a union of typed arrays', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(data as integer[] or string[])
+                        for each item in data
+                            print item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const itemType = symbolTable.getSymbolType('item', opts) as UnionType;
+                expectTypeToBe(itemType, UnionType);
+                expect(itemType.types).to.include(IntegerType.instance);
+                expect(itemType.types).to.include(StringType.instance);
+            });
+
+            it('should use dynamic type for loop item when type cannot be inferred', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process(data as roList)
+                        for each item in data
+                            print item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('item', opts), DynamicType);
+            });
+
+            it('should set correct type on array literals', () => {
+                let mainFile = program.setFile<BrsFile>('source/main.bs', `
+                    sub process()
+                        intArr = [1, 2, 3]
+                        strArr = ["hello", "bronley"]
+                        floatArr = [3.14, 282.23]
+                        unionArr = ["string", 2]
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = mainFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('intArr', opts), ArrayType);
+                expectTypeToBe((symbolTable.getSymbolType('intArr', opts) as ArrayType).defaultType, IntegerType);
+                expectTypeToBe(symbolTable.getSymbolType('strArr', opts), ArrayType);
+                expectTypeToBe((symbolTable.getSymbolType('strArr', opts) as ArrayType).defaultType, StringType);
+                expectTypeToBe(symbolTable.getSymbolType('floatArr', opts), ArrayType);
+                expectTypeToBe((symbolTable.getSymbolType('floatArr', opts) as ArrayType).defaultType, FloatType);
+                expectTypeToBe(symbolTable.getSymbolType('unionArr', opts), ArrayType);
+                const unionDefaultType = (symbolTable.getSymbolType('unionArr', opts) as ArrayType).defaultType;
+                expectTypeToBe(unionDefaultType, UnionType);
+                expect((unionDefaultType as UnionType).types).to.include(StringType.instance);
+                expect((unionDefaultType as UnionType).types).to.include(IntegerType.instance);
+            });
+
+            it('should allow built in component types', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    sub process(data as roAssociativeArray[])
+                        for each datum in data
+                            print datum
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const forEachStmt = utilFile.ast.findChild<ForEachStatement>(isForEachStatement);
+                const symbolTable = forEachStmt.body.getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                expectTypeToBe(symbolTable.getSymbolType('data', opts), ArrayType);
+                expectTypeToBe(symbolTable.getSymbolType('datum', opts), InterfaceType);
+            });
+
+            it('should allow class types', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    sub process(data as Klass[])
+                        for each datum in data
+                            print datum.name
+                        end for
+                    end sub
+
+
+                    class Klass
+                        name as string
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const dataType = symbolTable.getSymbolType('data', opts);
+                expectTypeToBe(dataType, ArrayType);
+                expectTypeToBe((dataType as ArrayType).defaultType, ClassType);
+                expect((dataType as ArrayType).defaultType.toString()).to.equal('Klass');
+            });
+
+            it('should allow component types', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    sub process(labels as roSgNodeLabel[])
+                        for each label in labels
+                            print label.text
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(2, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const dataType = symbolTable.getSymbolType('labels', opts);
+                expectTypeToBe(dataType, ArrayType);
+                expectTypeToBe((dataType as ArrayType).defaultType, ComponentType);
+                expect((dataType as ArrayType).defaultType.toString()).to.equal('roSGNodeLabel');
+            });
+
+            it('should allow a typed array of an enum', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    enum Direction
+                        North = 1
+                        East = 2
+                        South = 3
+                        West = 4
+                    end enum
+
+                    sub EnumTest()
+                        arr = [Direction.North]
+                        arr.push(Direction.South)
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(9, 24));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const dataType = symbolTable.getSymbolType('arr', opts) as ArrayType;
+                expectTypeToBe(dataType, ArrayType);
+                expectTypeToBe(dataType.defaultType, EnumType);
+                expect(dataType.defaultType.toString()).to.equal('Direction');
+            });
+
+            it('should allow a typed array of an enum defined in a different namespace', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    namespace nsOne
+                        sub EnumTest()
+                            arr = [nsTwo.Direction.North]
+                            arr.push(nsTwo.Direction.South)
+                        end sub
+                    end namespace
+
+                    namespace nsTwo
+                        enum Direction
+                            North = 1
+                            East = 2
+                            South = 3
+                            West = 4
+                        end enum
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const symbolTable = utilFile.ast.findChild<CallExpression>(isCallExpression).getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const dataType = symbolTable.getSymbolType('arr', opts) as ArrayType;
+                expectTypeToBe(dataType, ArrayType);
+                expectTypeToBe(dataType.defaultType, EnumType);
+                expect(dataType.defaultType.toString()).to.equal('nsTwo.Direction');
+            });
+
+            it('should allow a typed array of an enum defined with multiple enum members', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    namespace nsOne
+                        sub EnumTest()
+                            arr = [nsTwo.Direction.North, nsTwo.Direction.South]
+                            arr.push(nsTwo.Direction.South)
+                        end sub
+                    end namespace
+
+                    namespace nsTwo
+                        enum Direction
+                            North = 1
+                            East = 2
+                            South = 3
+                            West = 4
+                        end enum
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const symbolTable = utilFile.ast.findChild<CallExpression>(isCallExpression).getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const dataType = symbolTable.getSymbolType('arr', opts) as ArrayType;
+                expectTypeToBe(dataType, ArrayType);
+                expectTypeToBe(dataType.defaultType, EnumType);
+                expect(dataType.defaultType.toString()).to.equal('nsTwo.Direction');
+            });
+
+            it('should allow a typed array of an enum defined with multiple consts', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    namespace nsOne
+                        sub ArrayTest()
+                            arr = [nsTwo.Letters.abc, nsTwo.Letters.def]
+                            arr.push(nsTwo.Letters.abc)
+                        end sub
+                    end namespace
+
+                    namespace nsTwo
+                        namespace Letters
+                            const abc = "ABC"
+                            const def = "DEF"
+                        end namespace
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const symbolTable = utilFile.ast.findChild<CallExpression>(isCallExpression).getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const dataType = symbolTable.getSymbolType('arr', opts) as ArrayType;
+                expectTypeToBe(dataType, ArrayType);
+                expectTypeToBe(dataType.defaultType, StringType);
+                expect(dataType.defaultType.toString()).to.equal('string');
+            });
+
+            it('should correctly set an array as initial value', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    function alsoGoEast(path = [Direction.North, Direction.South])
+                        path.Push(Direction.East) ' "path" should be typed as Array<Direction>
+                        return path
+                    end function
+
+                    enum Direction
+                        North = "North"
+                        South = "South"
+                        East = "East"
+                        West = "West"
+                    end  enum
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                let symbolTable = utilFile.ast.findChild<CallExpression>(isFunctionExpression).getSymbolTable();
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const pathType = symbolTable.getSymbolType('Path', opts) as ArrayType;
+                expectTypeToBe(pathType, ArrayType);
+                expectTypeToBe(pathType.defaultType, EnumType);
+                expect(pathType.defaultType.toString()).to.eql('Direction');
+            });
+        });
+
+        describe('callFunc invocations', () => {
+            it('should set correct return type', () => {
+
+                program.setFile('components/Widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="Widget.brs"/>
+                        <interface>
+                            <function name="getFloatFromString" />
+                        </interface>
+                    </component>
+                `);
+
+                program.setFile('components/Widget.brs', `
+                    function getFloatFromString(input as string) as float
+                        return input.toFloat()
+                    end function
+                `);
+
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    sub someFunc(widget as roSGNodeWidget)
+                        pi = widget@.getFloatFromString("3.14")
+                        print pi
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(3, 31));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                expectTypeToBe(symbolTable.getSymbolType('pi', opts), FloatType);
+                sourceScope.unlinkSymbolTable();
+            });
+
+            it('should set correct return type when using `callFunc()`', () => {
+                program.setFile('components/Widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="Widget.brs"/>
+                        <interface>
+                            <function name="getFloatFromString" />
+                        </interface>
+                    </component>
+                `);
+
+                program.setFile('components/Widget.brs', `
+                    function getFloatFromString(input as string) as float
+                        return input.toFloat()
+                    end function
+                `);
+
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    sub someFunc(widget as roSGNodeWidget)
+                        pi = widget.callfunc("getFloatFromString", "3.14")
+                        print pi
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(3, 31));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                expectTypeToBe(symbolTable.getSymbolType('pi', opts), FloatType);
+                sourceScope.unlinkSymbolTable();
+            });
+
+            it('should set correct return type when using `<component>.createchild()`', () => {
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    sub someFunc()
+                        rect = createObject("roSgNode", "Rectangle")
+                        label = rect.createChild("label")
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(3, 31));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                const labelType = symbolTable.getSymbolType('label', opts) as ComponentType;
+                expectTypeToBe(labelType, ComponentType);
+                expect(labelType.toString()).to.eql('roSGNodeLabel');
+                sourceScope.unlinkSymbolTable();
+            });
+
+            it('should set correct return type with a custom type', () => {
+                program.setFile('components/Widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="Widget.bs"/>
+                        <interface>
+                            <function name="getWidgetType" />
+                        </interface>
+                    </component>
+                `);
+
+                program.setFile('components/Widget.bs', `
+                    interface WidgetInternal
+                       name as string
+                    end interface
+
+                    function getWidgetType(input as string) as WidgetInternal
+                        return {name: input}
+                    end function
+                `);
+
+                let utilFile = program.setFile<BrsFile>('source/util.bs', `
+                    sub someFunc(widget as roSGNodeWidget)
+                        thing = widget@.getWidgetType("hello")
+                        print thing
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(3, 31));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                const thingType = symbolTable.getSymbolType('thing', opts) as InterfaceType;
+
+                expectTypeToBe(thingType, InterfaceType);
+                expect(thingType.name).to.eq('WidgetInternal');
+                sourceScope.unlinkSymbolTable();
+            });
+
+            it('should correctly get return value of interfaces with callfunc members', () => {
+                program.setFile('components/MyNode.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="MyNode" extends="Group">
+                        <script uri="MyNode.bs"/>
+                        <interface>
+                            <field id="myProp" type="integer" />
+                            <function name="someCallfunc" />
+                        </interface>
+                    </component>
+                `);
+
+                program.setFile(s`components/MyNode.bs`, `
+                    function someCallfunc() as integer
+                        return m.top.myProp
+                    end function
+                `);
+
+                let utilFile = program.setFile<BrsFile>(`source/util.bs`, `
+                    interface MyIFace extends roSGNodeMyNode
+                    end interface
+
+                    sub foo(iface as MyIFace)
+                        value = iface@.someCallfunc()
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const processFnScope = utilFile.getFunctionScopeAtPosition(util.createPosition(5, 31));
+                const symbolTable = processFnScope.symbolTable;
+                const opts = { flags: SymbolTypeFlag.runtime };
+                const sourceScope = program.getScopeByName('source');
+                sourceScope.linkSymbolTable();
+                const thingType = symbolTable.getSymbolType('value', opts) as IntegerType;
+
+                expectTypeToBe(thingType, IntegerType);
+                sourceScope.unlinkSymbolTable();
+            });
+        });
+
+
+        describe('roAssociativeArray type', () => {
+
+            it('allows accessing built-in member of AA', () => {
+                program.setFile<BrsFile>('source/aa.bs', `
+                    function getSize(aa as roAssociativeArray) as integer
+                        return aa.count()
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows assigning to prop of AA', () => {
+                program.setFile<BrsFile>('source/aa.bs', `
+                    sub addName(aa as roAssociativeArray)
+                        aa.name = "foo"
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows accessing random prop of typecasted AA', () => {
+                program.setFile<BrsFile>('source/aa.bs', `
+                    sub foo()
+                        print (m as roAssociativeArray).whatever.whatever
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows asscessing prop of AA through square brackets', () => {
+                program.setFile<BrsFile>('source/aa.bs', `
+                    sub addName(aa as roAssociativeArray)
+                        aa["whatEver"] = "hello"
+                        print aa["whatEver"]
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+        });
+
+        describe('roArray type', () => {
+
+            it('allows accessing built-in member of array', () => {
+                program.setFile<BrsFile>('source/array.bs', `
+                    function getSize(aa as roArray) as integer
+                        return aa.count()
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows assigning to prop of item in array', () => {
+                program.setFile<BrsFile>('source/array.bs', `
+                    sub addName(aa as roArray)
+                        aa[0].name = "foo"
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows accessing random prop item in array of typecasted array', () => {
+                program.setFile<BrsFile>('source/array.bs', `
+                    sub foo()
+                        print (m as roArray)[0].whatever
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows asscessing prop of AA through square brackets', () => {
+                program.setFile<BrsFile>('source/array.bs', `
+                    sub addName(myArray as roArray)
+                        myArray[0] = "hello"
+                        print myArray[0]
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+        });
+
+        describe('type Statements', () => {
+            it('allows type statement types of primitives in function params', () => {
+                program.setFile<BrsFile>('source/wrapped.bs', `
+                    type myString  = string
+                    sub useTypeStatementType(data as myString)
+                        print data.len()
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows type statement types of primitives in variable declarations', () => {
+                program.setFile<BrsFile>('source/wrapped.bs', `
+                    type myInteger = integer
+                    sub useTypeStatementType()
+                        value as myInteger = 123
+                        print value.toStr()
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows type statement types of unions in function params', () => {
+                program.setFile<BrsFile>('source/wrapped.bs', `
+                    type StringOrInteger = string or integer
+                    sub useTypeStatementType(data as StringOrInteger)
+                        print data
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows type statement types wrapping custom types in function params', () => {
+                program.setFile<BrsFile>('source/wrapped.bs', `
+                    interface WithName1
+                        name as string
+                    end interface
+
+                    interface WithName2
+                        name as string
+                    end interface
+
+                    type HasName = WithName1 or WithName2
+
+                    sub useTypeStatementType(data as HasName)
+                        print data.name
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('provides a type statement type when importing a file', () => {
+                program.setFile<BrsFile>('source/wrapped.bs', `
+                    interface WithName1
+                        name as string
+                    end interface
+
+                    interface WithName2
+                        name as string
+                    end interface
+
+                    type HasName = WithName1 or WithName2
+                `);
+
+                program.setFile<BrsFile>('components/useWrapped.xml', `
+                    <component name="useWrapped" extends="Group">
+                        <script uri="useWrapped.bs"/>
+                    </component>
+                `);
+
+                program.setFile<BrsFile>('components/useWrapped.bs', `
+                    import "pkg:/source/wrapped.bs"
+                    sub useTypeStatementType(data as HasName)
+                        print data.name
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+        });
+
+        it('classes in namespaces that reference themselves without namespace work', () => {
+            program.setFile<BrsFile>('source/class.bs', `
+                namespace Alpha
+                    class TestClass
+                        function getCopy() as TestClass
+                            return new TestClass()
+                        end function
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('namespaces can shadow global functions', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                namespace log ' shadows built-in function "log"
+                    sub doPrint(x)
+                        print x
+                    end sub
+                end namespace
+
+                sub main()
+                    log.doPrint("hello")
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('namespaces shadowing global functions do not break other stuff', () => {
+            program.setFile('source/roku_modules/anything.d.bs', `
+                namespace log ' shadows built-in function "log"
+                    sub doPrint(x)
+                        print x
+                    end sub
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    log.doPrint("hello")
+                    anotherNs.foo()
+                end sub
+            `);
+            program.setFile<BrsFile>('source/zzzz.bs', `
+                namespace anotherNs
+                   sub foo()
+                        print 1234
+                    end sub
+               end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('resets m in a function in an AA literal to be an AssociativeArray type', () => {
+            const file = program.setFile<BrsFile>('source/class.bs', `
+                class TestKlass
+                    function getData() as object
+                        data = {
+                            data: [] as float[],
+                            sum: function() as float
+                                value = 0
+                                for each item in m.data
+                                    value += item
+                                end for
+                                return value
+                            end function
+                        }
+                        return data
+                    end function
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const forEachStmt = file.parser.ast.findChildren(isForEachStatement, { walkMode: WalkMode.visitAllRecursive })[0] as ForEachStatement;
+            const mType = forEachStmt.getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(mType, AssociativeArrayType);
+        });
+
+        it('does not propagate a typecast m across namespace statements', () => {
+            const file1 = program.setFile<BrsFile>('source/one.bs', `
+                interface Thing1
+                    value as integer
+                end interface
+
+                namespace Alpha.Beta
+                    typecast m as Thing1
+
+                    sub method1()
+                        x = m.value
+                        print x
+                    end sub
+                end namespace
+            `);
+            const file2 = program.setFile<BrsFile>('source/two.bs', `
+                namespace Alpha.Beta
+                    sub method2()
+                        x = m.whatever
+                        print x
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            // find places in AST where "x" is assigned
+            const assigns = [] as Array<AssignmentStatement>;
+            const assignmentVisitor = createVisitor({
+                AssignmentStatement: (stmt) => {
+                    if (stmt.tokens.name.text.toLowerCase() === 'x') {
+                        assigns.push(stmt);
+                    }
+                }
+            });
+            file1.ast.walk(assignmentVisitor, { walkMode: WalkMode.visitAllRecursive });
+            file2.ast.walk(assignmentVisitor, { walkMode: WalkMode.visitAllRecursive });
+            program.getScopeByName('source').linkSymbolTable();
+
+            // method1 - uses Thing1 'm'
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+            expect(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }).toString()).to.eq('Thing1');
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), IntegerType);
+
+            // method1 - uses untypecast 'm'
+            expectTypeToBe(assigns[1].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), AssociativeArrayType);
+            expectTypeToBe(assigns[1].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), DynamicType);
+        });
+
+
+        describe('inline interfaces', () => {
+            it('understands type of inline interface member', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(input as {x as string})
+                        value = input.x
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, StringType);
+            });
+
+            it('understands type of inline interface member with complex type with external source', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    import "test2.bs"
+
+                    sub testFunc(input as {x as OtherIface})
+                        value = input.x.data.name
+                        print value
+                    end sub
+                `);
+                program.setFile<BrsFile>('source/test2.bs', `
+                    interface OtherIface
+                        data as {name as string}
+                    end interface
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, StringType);
+            });
+
+            it('understands type of inline interface member from typecast', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    import "test2.bs"
+
+                    sub testFunc(input)
+                        input2 as {x as OtherIface} = input
+                        value = input2.x.data.name
+                        print value
+                    end sub
+                `);
+                program.setFile<BrsFile>('source/test2.bs', `
+                    interface OtherIface
+                        data as {name as string}
+                    end interface
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, StringType);
+            });
+
+            it('understands type of inline interface member with string literal name', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(input as {"my string literal" as string})
+                        print input
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const inputSymbol = table.getSymbol('input', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(inputSymbol.type, InlineInterfaceType);
+                const memberType = inputSymbol.type.getMemberType('my string literal', { flags: SymbolTypeFlag.runtime });
+                expectTypeToBe(memberType, StringType);
+            });
+        });
+
+        describe('typed function expressions', () => {
+            it('correctly types parameters with typed function expressions', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(callback as function(s as string) as integer)
+                        value = callback("hello")
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, IntegerType);
+            });
+
+            it('correctly types parameters with typed function expressions with multiple parameters', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(callback as function(s as string, i as integer) as integer)
+                        value = callback("hello", 123)
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const callbackSymbol = table.getSymbol('callback', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(callbackSymbol.type, TypedFunctionType);
+                const callbackType = callbackSymbol.type as TypedFunctionType;
+                expect(callbackType.params.length).to.equal(2);
+                expectTypeToBe(callbackType.params[0].type, StringType);
+                expectTypeToBe(callbackType.params[1].type, IntegerType);
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, IntegerType);
+            });
+
+            it('can use type statement to define a typed function type', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    type MyCallback = function(s as string) as integer
+
+                    sub testFunc(callback as MyCallback)
+                        value = callback("hello")
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, IntegerType);
+            });
+
+            it('can use a union of typed function types', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    type CallbackA = function(s as string) as integer
+                    type CallbackB = function(i as integer) as string
+
+                    sub testFunc(input, callback as CallbackA or CallbackB)
+                        value = callback(input)
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, UnionType);
+                const valueType = valueSymbol.type as UnionType;
+                expect(valueType.types).to.include(IntegerType.instance);
+                expect(valueType.types).to.include(StringType.instance);
+            });
+
+            it('function return types are greedy in the parser', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(callback as function() as integer  or string)
+                        value = callback()
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, UnionType);
+                const valueType = valueSymbol.type as UnionType;
+                expect(valueType.types).to.include(IntegerType.instance);
+                expect(valueType.types).to.include(StringType.instance);
+            });
+
+            it('brackets in function types do not cause issues', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(callback as function(s as string) as (integer or string))
+                        value = callback("hello")
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, UnionType);
+                const valueType = valueSymbol.type as UnionType;
+                expect(valueType.types).to.include(IntegerType.instance);
+                expect(valueType.types).to.include(StringType.instance);
+            });
+
+            it('function types with unions in parameters work', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(callback as function(s as string or integer) as integer)
+                        value = callback("hello")
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const callbackSymbol = table.getSymbol('callback', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(callbackSymbol.type, TypedFunctionType);
+                const callbackType = callbackSymbol.type as TypedFunctionType;
+                expect(callbackType.params.length).to.equal(1);
+                expectTypeToBe(callbackType.params[0].type, UnionType);
+                const paramType = callbackType.params[0].type as UnionType;
+                expect(paramType.types).to.include(StringType.instance);
+                expect(paramType.types).to.include(IntegerType.instance);
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, IntegerType);
+            });
+
+            it('args can be union of function types', () => {
+                const file = program.setFile<BrsFile>('source/test.bs', `
+                    sub testFunc(callback as (function(s as string) as string) or (function(s as string) as integer))
+                        value = callback("hello")
+                        print value
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const funcExprBody = file.parser.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive })[0].body;
+                const table = funcExprBody.getSymbolTable();
+                const valueSymbol = table.getSymbol('value', SymbolTypeFlag.runtime)[0];
+                expectTypeToBe(valueSymbol.type, UnionType);
+                const valueType = valueSymbol.type as UnionType;
+                expect(valueType.types).to.include(IntegerType.instance);
+                expect(valueType.types).to.include(StringType.instance);
+            });
+        });
+    });
+
+    describe('symbol tables with pocket tables', () => {
+        it('should understand type changes throughout a function', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub test()
+                    x = "hello"
+                    print x
+                    x = 123
+                    print x
+                    x = true
+                    print x
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let xVar = printStmts[0].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            xVar = printStmts[1].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            xVar = printStmts[2].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), BooleanType);
+        });
+
+        it('should understand type changes with conditional paths', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub test(toggle as boolean)
+                    x = "hello"
+                    print x ' printStmt 0 - should be string
+                    if toggle
+                      x = 123
+                      print x ' printStmt 1 - should be int
+                    end if
+                    print x ' printStmt 2 - should be (string or int)
+                    x = true
+                    print x ' printStmt 3 - should be bool
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let xVar = printStmts[0].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            xVar = printStmts[1].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            xVar = printStmts[2].expressions[0];
+            let xVarType = xVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(xVarType, UnionType);
+            expect((xVarType as UnionType).types).to.include(StringType.instance);
+            expect((xVarType as UnionType).types).to.include(IntegerType.instance);
+            xVar = printStmts[3].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), BooleanType);
+        });
+
+        it('should understand type changes with loops', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub test()
+                    x = "hello"
+                    print x ' printStmt 0 - should be string
+                    while(rnd(0) > 0.5)
+                        x = 1
+                        print x ' printStmt 1 - should be int
+                    end while
+                    print x ' printStmt 2 - should be (string or int)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let xVar = printStmts[0].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            xVar = printStmts[1].expressions[0];
+            expectTypeToBe(xVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            xVar = printStmts[2].expressions[0];
+            let xVarType = xVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(xVarType, UnionType);
+            expect((xVarType as UnionType).types).to.include(StringType.instance);
+            expect((xVarType as UnionType).types).to.include(IntegerType.instance);
+        });
+
+
+        it('should understand type changes in conditional compile blocks', () => {
+            fsExtra.outputFileSync(`${rootDir}/manifest`, undent`
+                bs_const=DEBUG=true
+            `);
+
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub main()
+                    dbg = 0
+                    print dbg ' integer
+                    #if DEBUG
+                        dbg = "DEBUG"
+                        print dbg ' string
+                    #end if
+                    print dbg ' string
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let dbgVar = printStmts[0].expressions[0];
+            expectTypeToBe(dbgVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            dbgVar = printStmts[1].expressions[0];
+            expectTypeToBe(dbgVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            dbgVar = printStmts[2].expressions[0];
+            expectTypeToBe(dbgVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+        });
+
+        it('should understand type changes in deep if statements', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub main(x as integer)
+                    data = "hello"
+
+                    if x > 1
+                        if x > 2
+                            if x > 3
+                                if x > 4
+                                    data = x
+                                    print data
+                                end if
+                            end if
+                        end if
+                    end if
+
+                    print data
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let dbgVar = printStmts[0].expressions[0];
+            expectTypeToBe(dbgVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            dbgVar = printStmts[1].expressions[0];
+            expectTypeToBe(dbgVar.getType({ flags: SymbolTypeFlag.runtime }), UnionType);
+            expect((dbgVar.getType({ flags: SymbolTypeFlag.runtime }) as UnionType).types).to.include(StringType.instance);
+            expect((dbgVar.getType({ flags: SymbolTypeFlag.runtime }) as UnionType).types).to.include(IntegerType.instance);
+        });
+
+        it('should understand type changes in deep if/else statements', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub main(x as integer)
+                    data = "hello"
+
+                    if x > 1
+                      print data ' string
+                    else if x > 2
+                        data = false
+                        print data ' boolean
+                    else
+                       data = 123
+                       print data ' int
+                    end if
+
+                    print data ' union
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let dataVar = printStmts[0].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            dataVar = printStmts[1].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), BooleanType);
+            dataVar = printStmts[2].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            dataVar = printStmts[3].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), UnionType);
+            expect((dataVar.getType({ flags: SymbolTypeFlag.runtime }) as UnionType).types).to.include(StringType.instance);
+            expect((dataVar.getType({ flags: SymbolTypeFlag.runtime }) as UnionType).types).to.include(IntegerType.instance);
+            expect((dataVar.getType({ flags: SymbolTypeFlag.runtime }) as UnionType).types).to.include(BooleanType.instance);
+        });
+
+        it('deals with reference type conditions in else if stmts', () => {
+            const file = program.setFile<BrsFile>('source/lib.bs', `
+                function testIfStmt(id as string)
+                    x = "data is not the first line"
+                    data = getData()
+
+                    if data.type = "Movie"
+                        print "movie"
+                    else if data.type = "Series"
+                        print "series"
+                    end if
+                end function
+
+
+                function getData() as object
+                    return invalid
+                end function
+                `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const ifStmts = file.ast.findChildren<IfStatement>(isIfStatement);
+            let lhs2 = (ifStmts[1].condition as BinaryExpression).left as DottedGetExpression;
+            expectTypeToBe(lhs2.obj.getType({ flags: SymbolTypeFlag.runtime }), ObjectType);
+        });
+
+        it('should understand assignment within try/catch blocks', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub test()
+                    data = "hello"
+                    print data ' printStmt 0 - should be string
+                    try
+                        data = 123
+                        print data ' printStmt 1 - should be int
+                    catch error
+                        print error ' printStmt 2 - (ignored)
+                    end try
+                    print data ' printStmt 3 - should be (string or int)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let dataVar = printStmts[0].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            dataVar = printStmts[1].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            dataVar = printStmts[3].expressions[0];
+            let dataVarType = dataVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(dataVarType, UnionType);
+            expect((dataVarType as UnionType).types).to.include(StringType.instance);
+            expect((dataVarType as UnionType).types).to.include(IntegerType.instance);
+        });
+
+        it('should understand assignment in if/then in try/catch blocks', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub test()
+                    data = "hello"
+                    print data ' printStmt 0 - should be string
+                    try
+                        if data = "hello"
+                            data = "goodbye"
+                        end if
+                        print data ' printStmt 1 - should be string
+                    catch error
+                        print error ' printStmt 2 - (ignored)
+                    end try
+                    print data ' printStmt 3 - should be (string)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let dataVar = printStmts[0].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            dataVar = printStmts[1].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            dataVar = printStmts[3].expressions[0];
+            let dataVarType = dataVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(dataVarType, StringType);
+        });
+
+        it('should understand assignment that changes types in if/then in try/catch blocks', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub test()
+                    data = "hello"
+                    print data ' printStmt 0 - should be string
+                    try
+                        if data = "hello"
+                            data = 123
+                        end if
+                        print data ' printStmt 1 - should be union (string or int)
+                    catch error
+                        print error ' printStmt 2 - (ignored)
+                    end try
+                    print data ' printStmt 3 - should be union (string or int)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let dataVar = printStmts[0].expressions[0];
+            expectTypeToBe(dataVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            dataVar = printStmts[1].expressions[0];
+            let dataVarType = dataVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(dataVarType, UnionType);
+            expect((dataVarType as UnionType).types).to.include(StringType.instance);
+            expect((dataVarType as UnionType).types).to.include(IntegerType.instance);
+            dataVar = printStmts[3].expressions[0];
+            dataVarType = dataVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(dataVarType, UnionType);
+            expect((dataVarType as UnionType).types).to.include(StringType.instance);
+            expect((dataVarType as UnionType).types).to.include(IntegerType.instance);
+        });
+
+        it('should understand changing the type of a param in try/catch', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub testPocket1(msg as string)
+                    try
+                        if msg = "" then
+                            msg = "hello!"
+                        end if
+                        msg = 123
+                    catch e
+                    end try
+                    print msg
+                    print msg.toStr() ' confirming msg is string|int, and not uninitialized
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let msgVar = printStmts[0].expressions[0];
+            let msgVarType = msgVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(msgVarType, UnionType);
+            expect((msgVarType as UnionType).types).to.include(StringType.instance);
+            expect((msgVarType as UnionType).types).to.include(IntegerType.instance);
+        });
+
+        it('should understand changing the type of a param in try/catch in non-first function', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                function foo() as string
+                    msg = "test"
+                    return msg
+                end function
+
+                sub testPocket1(msg as string)
+                    try
+                        if msg = "" then
+                            msg = "hello!"
+                        end if
+                        msg = 123
+                    catch e
+                    end try
+                    print msg
+                    print msg.toStr() ' confirming msg is string|int, and not uninitialized
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let msgVar = printStmts[0].expressions[0];
+            let msgVarType = msgVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(msgVarType, UnionType);
+            expect((msgVarType as UnionType).types).to.include(StringType.instance);
+            expect((msgVarType as UnionType).types).to.include(IntegerType.instance);
+        });
+
+
+        it('should allow redefinition of function param and immediate use', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub testPocket1(data as string)
+                    data = 123
+                    data += 1
+                    print data
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let dataType = printStmts[0].expressions[0];
+            let dataTypeType = dataType.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(dataTypeType, IntegerType);
+        });
+
+        it('handles this long function from Rooibos', () => {
+            program.setFile<BrsFile>('source/test.bs', `
+                function assertAAHasKeys(aa as dynamic, keys as dynamic, msg = "" as string) as boolean
+                    if m.currentResult.isFail then
+                        return false
+                    end if
+
+                    try
+                        if not isAA(aa) then
+                            if msg = "" then
+                                msg = "expected to be an AssociativeArray"
+                            end if
+                            fail(msg, "", "", true)
+                            return false
+                        end if
+
+                        if not isArray(keys) then
+                            if msg = "" then
+                                msg = "expected to be an Array"
+                            end if
+                            fail(msg, "", "", true)
+                            return false
+                        end if
+
+                        foundKeys = []
+                        missingKeys = []
+                        for each key in keys
+                            if not aa.ifAssociativeArray.DoesExist(key) then
+                                missingKeys.push(key)
+                            else
+                                foundKeys.push(key)
+                            end if
+                        end for
+
+                        if missingKeys.count() > 0 then
+                            actual = "blah"
+                            expected = "blah"
+                            if msg = "" then
+                                msg = "expected to have properties"
+                            end if
+                            fail(msg, actual, expected, true)
+                            return false
+                        end if
+                        return true
+                    catch error
+                        failCrash(error, msg)
+                    end try
+                    return false
+                end function
+
+
+                function isAA(value as dynamic) as boolean
+                    return type(value) = "roAssociativeArray"
+                end function
+
+
+                function isArray(value as dynamic) as boolean
+                    return type(value) = "roArray"
+                end function
+
+
+                sub fail(msg as string, actual as dynamic, expected as dynamic, isSoftFail as boolean)
+                    print "fail"
+                end sub
+
+                sub failCrash(error as dynamic, msg as string)
+                    print "fail crash"
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('properly handles type assignment in for loops', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub testPocket1()
+                    i = "hello"
+                    print i ' i is string at this point
+
+                    for i = 0 to 2
+                        print i ' i is a string at this point
+                    end for
+                    print i ' i is integer or string at this point
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let itemVar = printStmts[0].expressions[0];
+            expectTypeToBe(itemVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            itemVar = printStmts[1].expressions[0];
+            expectTypeToBe(itemVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            itemVar = printStmts[2].expressions[0];
+            let itemVarType = itemVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(itemVarType, UnionType);
+        });
+
+        it('properly handles type assignment in for each loops', () => {
+            const testFile = program.setFile<BrsFile>('source/test.bs', `
+                sub testPocket1()
+                    items = ["one", "two", "three"]
+                    item = 1234
+                    print item ' item is integer at this point
+
+                    for each item in items
+                        print item ' item is a string at this point
+                    end for
+                    print item ' item is integer or string at this point
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const printStmts = testFile.ast.findChildren<PrintStatement>(isPrintStatement);
+            let itemVar = printStmts[0].expressions[0];
+            expectTypeToBe(itemVar.getType({ flags: SymbolTypeFlag.runtime }), IntegerType);
+            itemVar = printStmts[1].expressions[0];
+            expectTypeToBe(itemVar.getType({ flags: SymbolTypeFlag.runtime }), StringType);
+            itemVar = printStmts[2].expressions[0];
+            let itemVarType = itemVar.getType({ flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(itemVarType, UnionType);
+        });
+    });
+
+    describe('unlinkSymbolTable', () => {
+        it('properly removes sibling symbol tables', () => {
+            const file = program.setFile<BrsFile>('source/lib.bs', `
+                namespace alpha.beta.charlie
+                    function delta()
+                    end function
+                end namespace
+
+                namespace alpha.beta.charlie
+                    function echo()
+                    end function
+                end namespace
+            `);
+
+            program.setFile<BrsFile>('source/lib2.bs', `
+                namespace alpha.beta.charlie
+                    function foxtrot()
+                    end function
+                end namespace
+
+                namespace alpha.beta.charlie
+                    function hotel()
+                    end function
+                end namespace
+            `);
+            const scope = program.getScopeByName('source');
+
+            scope.linkSymbolTable();
+
+            const opts = { flags: 3 as SymbolTypeFlag };
+
+            function getSymbolTableList() {
+                const namespaceContainingDelta = file.ast.findChild(x => isFunctionStatement(x) && x.tokens.name.text === 'delta').findAncestor(x => isNamespaceStatement(x));
+                return {
+                    statements: [
+                        (namespaceContainingDelta as NamespaceStatement).getSymbolTable()
+                    ],
+                    types: [
+                        scope.symbolTable.getSymbolType('alpha', opts).memberTable,
+                        scope.symbolTable.getSymbolType('alpha', opts).getMemberType('beta', opts).memberTable,
+                        scope.symbolTable.getSymbolType('alpha', opts).getMemberType('beta', opts).getMemberType('charlie', opts).memberTable
+                    ]
+                };
+            }
+            // Statements get linked/unlinked at scope linking time.
+            // Namespace types exist at file level, and will not change
+            let symbolTables = getSymbolTableList();
+
+            symbolTables.statements.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+            symbolTables.types.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+
+            scope.unlinkSymbolTable();
+            symbolTables.statements.forEach(x => expect(x['siblings'].size).to.eql(0, `${x.name} has wrong number of siblings`));
+            symbolTables.types.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+
+            //do it again, make sure we don't end up with additional siblings
+            scope.linkSymbolTable();
+
+            // get the member tables again, as the types were re-created
+            symbolTables = getSymbolTableList();
+            symbolTables.statements.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+            symbolTables.types.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+
+            scope.unlinkSymbolTable();
+            symbolTables.statements.forEach(x => expect(x['siblings'].size).to.eql(0, `${x.name} has wrong number of siblings`));
+            symbolTables.types.forEach(x => expect(x['siblings'].size).to.eql(1, `${x.name} has wrong number of siblings`));
+        });
+    });
+
+    describe('provides & requires', () => {
+
+        it('a class can reference itself', () => {
+            program.setFile<BrsFile>('source/klass.bs', `
+                class Klass
+                    function copy(otherKlass as Klass) as Klass
+                        return otherKlass
+                    end function
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('classes can reference each other across files', () => {
+            program.setFile<BrsFile>('source/klass.bs', `
+                class Klass
+                    function copy(otherKlass as Klass2) as Klass
+                        return otherKlass.getKlass()
+                    end function
+                end class
+            `);
+
+            program.setFile<BrsFile>('source/klass2.bs', `
+                class Klass2
+                    function getKlass() as Klass
+                        return new Klass()
+                    end function
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('requires a enum defined in a different namespace', () => {
+            let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                namespace Alpha
+                    function printEnum(enumVal as Alpha.Beta.Charlie.SomeEnum) as string
+                        return enumVal.toStr()
+                    end function
+                end namespace
+            `);
+
+            let file2 = program.setFile<BrsFile>('source/file2.bs', `
+                namespace Alpha.Beta.Charlie
+                    enum SomeEnum
+                        val1 = 1
+                        val2 = 2
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(file1.requiredSymbols.length).to.eq(1);
+            expect(file1.requiredSymbols[0].containingNamespaces).to.have.members(['Alpha']);
+            expect(file1.requiredSymbols[0].endChainFlags).to.eq(SymbolTypeFlag.typetime);
+            expect(file1.requiredSymbols[0].typeChain.length).to.eq(4);
+            expect(file1.requiredSymbols[0].typeChain.map(x => x.name)).to.have.members(['Alpha', 'Beta', 'Charlie', 'SomeEnum']);
+            expect(file2.requiredSymbols.length).to.eq(0);
+            expect(file2.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime).size).to.eq(1);
+            const file2TypeProvides = file2.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime);
+            expectTypeToBe(file2TypeProvides.get('alpha.beta.charlie.someenum').symbol.type, EnumType);
+        });
+
+        it('classes that extend classes in other files show change properly', () => {
+            program.setFile<BrsFile>('source/class.bs', `
+                class TestClass
+                    name as string
+                end class
+            `);
+
+            program.setFile<BrsFile>('source/subclass.bs', `
+                class SubTestClass extends TestClass
+                    length as float
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            program.setFile<BrsFile>('source/subclass.bs', `
+                class SubTestClass extends TestClass
+                    ' added a comment
+                    length as float
+                end class
+            `);
+
+            let changedSymbolsSize = -1;
+            class TestScopeValidator implements CompilerPlugin {
+                name = 'TestScopeValidator';
+                public validateScope(event: ValidateScopeEvent) {
+                    changedSymbolsSize = event.changedSymbols.get(SymbolTypeFlag.runtime).size;
+                }
+            }
+
+            program.plugins.add(new TestScopeValidator());
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(changedSymbolsSize).to.equal(0);
+        });
+
+        it('does not throw exception when updating a file with roSGNodeNode interface extension', () => {
+            program.setFile<BrsFile>('source/class.bs', `
+
+                namespace mc.internal.commands
+                    interface ICommandTask extends roSGNodeNode
+                        __commandName as string
+                    end interface
+
+                    function doesItWork(thing as mc.internal.commands.ICommandTask)
+                        ? thing.__commandName
+                    end function
+                end namespace
+            `);
+
+            program.validate();
+            let symbolChanges: Map<SymbolTypeFlag, Set<string>>;
+            class TestScopeValidator implements CompilerPlugin {
+                name = 'TestScopeValidator';
+                public validateScope(event: ValidateScopeEvent) {
+                    symbolChanges = event.changedSymbols;
+                }
+            }
+            program.plugins.add(new TestScopeValidator());
+            program.setFile<BrsFile>('source/class.bs', `
+
+                namespace mc.internal.commands
+                    interface ICommandTask extends roSGNodeNode
+                        __commandName as string
+                        __otherProp as integer
+                    end interface
+
+                    function doesItWork(thing as mc.internal.commands.ICommandTask)
+                        ? thing.__commandName
+                    end function
+                end namespace
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            let runTimeChanges = symbolChanges.get(SymbolTypeFlag.runtime);
+            let typeTimeChanges = symbolChanges.get(SymbolTypeFlag.typetime);
+
+            expect(runTimeChanges.size).to.equal(0); // mc.internal.commands.doesItWork did not change
+            expect(typeTimeChanges.size).to.equal(1); // mc.internal.commands.ICommandTask
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('does not throw exception when updating a file with roSGNode interface extension', () => {
+            program.setFile<BrsFile>('source/class.bs', `
+
+                namespace mc.internal.commands
+                    interface ICommandTask extends roSGNode
+                        __commandName as string
+                    end interface
+
+                    function doesItWork(thing as mc.internal.commands.ICommandTask)
+                        ? thing.__commandName
+                    end function
+                end namespace
+            `);
+
+            program.validate();
+            let symbolChanges: Map<SymbolTypeFlag, Set<string>>;
+            class TestScopeValidator implements CompilerPlugin {
+                name = 'TestScopeValidator';
+                public validateScope(event: ValidateScopeEvent) {
+                    symbolChanges = event.changedSymbols;
+                }
+            }
+            program.plugins.add(new TestScopeValidator());
+            program.setFile<BrsFile>('source/class.bs', `
+
+                namespace mc.internal.commands
+                    interface ICommandTask extends roSGNodeNode
+                        __commandName as string
+                        __otherProp as integer
+                    end interface
+
+                    function doesItWork(thing as mc.internal.commands.ICommandTask)
+                        ? thing.__commandName
+                    end function
+                end namespace
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            let runTimeChanges = symbolChanges.get(SymbolTypeFlag.runtime);
+            let typeTimeChanges = symbolChanges.get(SymbolTypeFlag.typetime);
+
+            expect(runTimeChanges.size).to.equal(0); // mc.internal.commands.doesItWork did not change
+            expect(typeTimeChanges.size).to.equal(1); // mc.internal.commands.ICommandTask
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('revalidates if import file changes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                import "pkg:/source/file2.bs"
+
+                    function test()
+                        print test2()
+                    end function
+            `);
+            program.setFile<BrsFile>('source/file2.bs', ``);
+            //let widgetXml =
+            program.setFile<BrsFile>('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/file1.bs"/>
+                </component>
+            `);
+            program.setFile<BrsFile>('components/Widget.bs', trim`
+                sub init()
+                    test()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindFunction('test2').message
+            ]);
+
+            program.setFile<BrsFile>('source/file2.bs', `
+                function test2()
+                    return 2
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('namespaces', () => {
+
+            it('does not require symbols found in same namespace', () => {
+                let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                    namespace alpha
+                        const PI = 3.14
+
+                        const ABC = "abc"
+
+                        function test()
+                            print ABC
+                            return 2*alpha.PI
+                        end function
+
+                    end namespace
+                `);
+                program.setFile<BrsFile>('components/Widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="Widget.bs"/>
+                        <script uri="pkg:/source/file1.bs"/>
+                    </component>
+                `);
+                program.setFile<BrsFile>('components/Widget.bs', trim`
+                    sub init()
+                        print alpha.test()
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                expect(file1.requiredSymbols.length).to.eq(0);
+                const validationSegments = file1.validationSegmenter.getSegmentsWithChangedSymbols(file1.providedSymbols.changes);
+                expect(validationSegments).to.not.undefined;
+            });
+
+            it('does require symbols found in namespace of import', () => {
+                let file1 = program.setFile<BrsFile>('source/file1.bs', `
+                    import "pkg:/source/file2.bs"
+
+                    namespace alpha
+                        const PI = 3.14
+
+                        const ABC = "abc"
+
+                        function test()
+                            print ABC + beta.XYZ + alpha.alpha2.DEF
+                            return 2*alpha.PI
+                        end function
+
+                    end namespace
+                `);
+                program.setFile<BrsFile>('source/file2.bs', `
+                    namespace beta
+                        const XYZ = "XYZ"
+                    end namespace
+
+                    namespace alpha.alpha2
+                        const DEF = "def"
+                    end namespace
+                `);
+                //let widgetXml =
+                program.setFile<BrsFile>('components/Widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="Widget.bs"/>
+                        <script uri="pkg:/source/file1.bs"/>
+                    </component>
+                `);
+                program.setFile<BrsFile>('components/Widget.bs', trim`
+                    sub init()
+                        print alpha.test()
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                expect(file1.requiredSymbols.length).to.eq(2);
+                const validationSegments = file1.validationSegmenter.getSegmentsWithChangedSymbols(file1.providedSymbols.changes);
+                expect(validationSegments).to.not.undefined;
+            });
+        });
+
+        describe('xmlFiles', () => {
+
+            it('does not rebuild component if import file has no substantive changes', () => {
+                program.setFile<BrsFile>('source/util.bs', `
+                    function test1() as integer
+                        return 1
+                    end function
+
+
+                    function test2() as boolean
+                        return true
+                    end function
+                `);
+                program.setFile<BrsFile>('source/file2.bs', ``);
+                //let widgetXml =
+                program.setFile<BrsFile>('components/Widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="pkg:/source/util.bs"/>
+                        <interface>
+                            <function name="test1" />
+                            <function name="test2" />
+                        </interface>
+                    </component>
+                `);
+                program.validate();
+
+
+                program.setFile<BrsFile>('source/util.bs', `
+                     function test1() as integer
+                        return 1
+                    end function
+
+
+                    function test2() as boolean
+                        return false ' changed value, but not type!
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                expect(program.lastValidationInfo.componentsRebuilt).to.be.empty;
+            });
+
+            it('rebuilds component if import file has substantive changes', () => {
+                program.setFile<BrsFile>('source/util.bs', `
+                    function test1() as integer
+                        return 1
+                    end function
+
+                    function test2() as boolean
+                        return true
+                    end function
+                `);
+                program.setFile<BrsFile>('source/file2.bs', ``);
+                //let widgetXml =
+                program.setFile<BrsFile>('components/Widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <script uri="pkg:/source/util.bs"/>
+                        <interface>
+                            <function name="test1" />
+                            <function name="test2" />
+                        </interface>
+                    </component>
+                `);
+                program.validate();
+
+
+                program.setFile<BrsFile>('source/util.bs', `
+                     function test1() as integer
+                        return 1
+                    end function
+
+                    function test2() as integer ' changed type
+                        return 2
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                expect(program.lastValidationInfo.componentsRebuilt.has('widget')).to.be.true;
+            });
+        });
+
+    });
+
+    describe('shadowing', () => {
+        it('allows namespaces shadowing global function names', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace log
+                    sub doLog(x)
+                        ? x
+                    end sub
+                end namespace
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                sub foo()
+                    log.doLog("hello")
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows enums shadowing global function names', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                enum log
+                    debug = "DEBUG"
+                    error = "ERROR"
+                end enum
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                sub foo(message)
+                    print log.debug;" ";message
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows interfaces shadowing global function names', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                interface log
+                    abs
+                    function formatJson(input)
+                end interface
+            `);
+            program.setFile<BrsFile>('source/file2.bs', `
+                sub foo(logger as log)
+                    print logger.abs;" ";logger.formatJson("message")
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows consts shadowing global function names', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                const log = "hello"   ' const shadows global function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('disallows enum/const shadowing', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                enum SomeName
+                    opt1
+                    opt2
+                end enum
+
+                const SomeName = "hello"    ' const and enum have same name
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Const', 'Enum', 'SomeName').message,
+                DiagnosticMessages.nameCollision('Enum', 'Const', 'SomeName').message
+            ]);
+        });
+
+        it('disallows enum/namespace shadowing', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                enum SomeName
+                    opt1
+                    opt2
+                end enum
+
+                namespace SomeName
+                    sub foo()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Enum', 'Namespace', 'SomeName').message,
+                DiagnosticMessages.nameCollision('Namespace', 'Enum', 'SomeName').message
+            ]);
+        });
+
+        it('disallows interface/namespace shadowing', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                interface SomeName  ' interface has same name as namespace
+                    opt1
+                    opt2
+                end interface
+
+                namespace SomeName
+                    sub foo()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Interface', 'Namespace', 'SomeName').message,
+                DiagnosticMessages.nameCollision('Namespace', 'Interface', 'SomeName').message
+            ]);
+        });
+
+        it('disallows class/namespace shadowing', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                class SomeName  ' class has same name as namespace
+                    opt1
+                    opt2
+                end class
+
+                namespace SomeName
+                    sub foo()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Class', 'Namespace', 'SomeName').message,
+                DiagnosticMessages.nameCollision('Namespace', 'Class', 'SomeName').message
+            ]);
+        });
+
+        it('allows namespaced functions shadowing upper scope function names', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    sub log(input)
+                      print "in namespace"
+                    end sub
+
+                    sub test()
+                        log(44) ' prints "in namespace"
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows namespaced functions shadowing upper scope function names', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                sub someFunc()
+                    print "outside"
+                end sub
+
+                namespace alpha
+                    sub someFunc()
+                      print "inside"
+                    end sub
+
+                    sub test()
+                        someFunc() ' prints "inside"
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('disallows class/global function shadowing', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                class log  ' class shadows global function
+                    sub foo()
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Class', 'Global Function', 'Log')
+            ]);
+        });
+
+        it('disallows class/local function shadowing', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                function someName()
+                end function
+
+                class SomeName  ' class shadows local function
+                    sub foo()
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nameCollision('Class', 'Function', 'someName'),
+                DiagnosticMessages.nameCollision('Function', 'Class', 'SomeName')
+            ]);
+        });
+
+
+        it('allows function having same name as class in namespace', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                function someName()
+                end function
+
+                namespace alpha
+                    class SomeName  ' class in namespace shadows function in upper scope
+                        sub foo()
+                        end sub
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows class in namespace having same name as global function', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    class log ' class in namespace shadows global function
+                        text = "hello"
+                    end class
+
+                    sub foo()
+                       myLog = new Log()
+                       print myLog.text ' prints "hello"
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('disallows reusing a class name as "for each" variable in a function', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                class Person
+                    name as string
+                end class
+
+                sub foo(people as Person[])
+                    for each person in people
+                        print person.name
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, DiagnosticMessages.localVarShadowedByScopedFunction().message);
+        });
+
+        it('disallows reusing a class name as "for each" variable in a method', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                class Person
+                    name as string
+                    children as Person[]
+
+                    sub test()
+                        for each person in m.children
+                            print person.name
+                        end for
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, DiagnosticMessages.localVarShadowedByScopedFunction().message);
+        });
+
+        it('allows reusing a namespaced class name as "for each" variable in a method', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    class Person
+                        name as string
+                        children as Person[]
+
+                        sub test()
+                            for each person in m.children
+                                print person.name
+                            end for
+                        end sub
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows reusing a namespaced function name as "for each" variable in a method', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    sub bar()
+                    end sub
+
+                    sub test()
+                        for each bar in m.bars
+                            print bar.whatever
+                        end for
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows reusing a namespaced class name as variable in a method', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    class Person
+                        name as string
+                        children as Person[]
+                    end class
+
+                    sub test()
+                        person = {name: 123}
+                        print person
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows using a namespace name as a parameter inside a function in the namespace', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    sub foo(alpha as string)
+                        print alpha
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows using a namespace name as a variable inside a function in the namespace', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    sub foo()
+                        alpha = "hello"
+                        print alpha
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows using a namespace name as a variable, and claling methods on it', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    sub foo()
+                        alpha = "hello"
+                        print alpha.len()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows shadowing namespaced function in same namespace', () => {
+            program.setFile<BrsFile>('source/file.bs', `
+                namespace alpha
+                    sub foo()
+                    end sub
+
+                    sub test()
+                        foo = 1
+                        m.data = []
+                        m.data.push(foo)
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+
+    describe('performance', () => {
+
+        // eslint-disable-next-line func-names, prefer-arrow-callback
+        it.skip('namespace linking performance', function () {
+            this.timeout(10000);
+            program.logger.logLevel = 'info';
+            // this test takes a few seconds (~4) it is skipped just to make regular test running faster
+            program.options.autoImportComponentScript = true;
+            const constFileContents = `
+                import "pkg:/source/consts2.bs"
+
+                namespace a.b.c
+                    const PI = 3.14
+                end namespace
+
+                namespace d.e.f
+                    const EULER = 2.78
+                    const GOLDEN_EULER = EULER + GOLDEN
+                end namespace
+
+                namespace g.h.i
+                    const A = "A"
+                end namespace
+
+                namespace j.k.l
+                    const B = "B"
+                end namespace
+
+                namespace n.o.p
+                    const C = "C"
+                end namespace
+            `;
+
+            const const2FileContents = `
+                import "pkg:/source/consts3.bs"
+                import "pkg:/source/consts2a.bs"
+                namespace a.b.c
+                    const ROOT2 = 1.41
+                end namespace
+
+                namespace a.b.c.d
+                    const D = "D"
+                end namespace
+
+                namespace d.e.f.g
+                    const D = "D"
+                end namespace
+            `;
+
+            const const2AFileContents = `
+                namespace d.e.f
+                    const GOLDEN = 1.62
+                end namespace
+            `;
+
+            let const3FileContents = '';
+            const exponentBase = 7; // 7^4 = 2401 total namespaces
+            for (let i = 0; i < exponentBase; i++) {
+                for (let j = 0; j < exponentBase; j++) {
+                    for (let k = 0; k < exponentBase; k++) {
+                        for (let l = 0; l < exponentBase; l++) {
+                            const3FileContents += `
+                            namespace alpha_${i}.beta_${j}.charlie_${k}.delta_${l}
+                                const test = "TEST"
+                                function getNum() as integer
+                                    return 100
+                                end function
+                            end namespace
+                        `;
+                        }
+                    }
+                }
+            }
+
+            program.setFile('source/consts.bs', constFileContents);
+            program.setFile('source/consts2.bs', const2FileContents);
+            program.setFile('source/consts2a.bs', const2AFileContents);
+            program.setFile('source/consts3.bs', const3FileContents);
+
+            const widgetBsFileContents = `
+                    import "pkg:/source/consts.bs"
+
+                    sub init()
+                        print a.b.c.PI + d.e.f.EULER
+                        print a.b.c.d.D + n.o.p.C
+                        print d.e.f.GOLDEN
+                        print d.e.f.GOLDEN_EULER
+                        print alpha_0.beta_0.charlie_0.delta_0.getNum().toStr() +  alpha_0.beta_0.charlie_0.delta_0.TEST
+                    end sub
+                `;
+            for (let i = 0; i < 100; i++) {
+                const widgetXmlFileContents = trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget${i}" extends="Group">
+                    </component>
+                `;
+                program.setFile(`components/Widget${i}.bs`, widgetBsFileContents);
+                program.setFile(`components/Widget${i}.xml`, widgetXmlFileContents);
+            }
+            program.validate();
+            expectZeroDiagnostics(program);
+            program.setFile('source/consts.bs', constFileContents);
+            program.validate();
+            program.setFile('source/consts2.bs', const2FileContents);
+            program.validate();
+            program.setFile('source/consts3.bs', const3FileContents);
+            program.validate();
+            program.setFile('source/consts2a.bs', `
+                namespace d.e.f
+                    const NOT_GOLDEN = 1.62
+                end namespace
+            `);
+            program.validate();
+
+        });
+    });
 });
diff --git a/src/Scope.ts b/src/Scope.ts
index 176cd39b4..40be3b5a7 100644
--- a/src/Scope.ts
+++ b/src/Scope.ts
@@ -1,27 +1,37 @@
-import type { CompletionItem, Position, Range, Location } from 'vscode-languageserver';
+/* eslint-disable @typescript-eslint/dot-notation */
 import * as path from 'path';
-import { CompletionItemKind } from 'vscode-languageserver';
 import chalk from 'chalk';
-import type { DiagnosticInfo } from './DiagnosticMessages';
-import { DiagnosticMessages } from './DiagnosticMessages';
-import type { CallableContainer, BsDiagnostic, FileReference, BscFile, CallableContainerMap, FileLink, Callable } from './interfaces';
+import type { Range } from 'vscode-languageserver-protocol';
+import type { CallableContainer, FileReference, FileLink, Callable, ScopeValidationOptions } from './interfaces';
 import type { Program } from './Program';
-import { BsClassValidator } from './validators/ClassValidator';
 import type { NamespaceStatement, FunctionStatement, ClassStatement, EnumStatement, InterfaceStatement, EnumMemberStatement, ConstStatement, TypeStatement } from './parser/Statement';
-import type { NewExpression } from './parser/Expression';
 import { ParseMode } from './parser/Parser';
 import { util } from './util';
-import { globalCallableMap } from './globalCallables';
 import { Cache } from './Cache';
-import { URI } from 'vscode-uri';
 import type { BrsFile } from './files/BrsFile';
+import type { Identifier } from './lexer/Token';
 import type { DependencyGraph, DependencyChangedEvent } from './DependencyGraph';
-import { isBrsFile, isMethodStatement, isCustomType, isFunctionType, isXmlFile, isNamespaceStatement, isEnumMemberStatement } from './astUtils/reflection';
+import { isBrsFile, isXmlFile, isEnumMemberStatement, isNamespaceStatement, isTypeStatement, isXmlScope } from './astUtils/reflection';
+import { WalkMode } from './astUtils/visitors';
 import { SymbolTable } from './SymbolTable';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { BscFile } from './files/BscFile';
+import { referenceTypeFactory } from './types/ReferenceType';
+import { unionTypeFactory } from './types/UnionType';
+import { AssociativeArrayType } from './types/AssociativeArrayType';
 import type { Statement } from './parser/AstNode';
+import { performance } from 'perf_hooks';
 import { LogLevel } from './logging';
+import { uninitializedTypeFactory } from './types/UninitializedType';
 import { ScopeNamespaceLookup } from './ScopeNamespaceLookup';
 
+/**
+ * Assign some few factories to the SymbolTable to prevent cyclical imports. This file seems like the most intuitive place to do the linking
+ * since Scope will be used by pretty much everything
+ */
+SymbolTable.referenceTypeFactory = referenceTypeFactory;
+SymbolTable.unionTypeFactory = unionTypeFactory;
+SymbolTable.uninitializedTypeFactory = uninitializedTypeFactory;
 /**
  * A class to keep track of all declarations within a given scope (like source scope, component scope)
  */
@@ -54,9 +64,43 @@ export class Scope {
      * "namea", "namea.nameb", "namea.nameb.namec"
      */
     public get namespaceLookup() {
+        let allFilesValidated = true;
+        for (const file of this.getAllFiles()) {
+            if (isBrsFile(file) && !file.hasTypedef) {
+                allFilesValidated = allFilesValidated && file.isValidated;
+                if (!allFilesValidated) {
+                    break;
+                }
+            }
+        }
+        if (!allFilesValidated) {
+            // This is not fit to cache
+            // Since the files have not been validated, all namespace info might not have been available
+            return this.buildNamespaceLookup();
+        }
         return this.cache.getOrAdd('namespaceLookup', () => this.buildNamespaceLookup());
     }
 
+    /**
+     * A dictionary of namespaces, indexed by the lower case full name of each namespace.
+     * If a namespace is declared as "NameA.NameB.NameC", there will be 3 entries in this dictionary,
+     * "namea", "namea.nameb", "namea.nameb.namec"
+     */
+    public get namespaceNameSet() {
+        return this.cache.getOrAdd('namespaceNameSet', () => {
+            const lowerNamespaceNames = new Set<string>();
+
+            this.enumerateBrsFiles((file) => {
+                const fileNamespaceLookup = file.getNamespaceLookupObject();
+                for (const [lowerNamespaceName, _] of fileNamespaceLookup) {
+                    lowerNamespaceNames.add(lowerNamespaceName);
+                }
+            });
+            return lowerNamespaceNames;
+        });
+    }
+
+
     /**
      * Get a NamespaceContainer by its name, looking for a fully qualified version first, then global version next if not found
      */
@@ -75,6 +119,35 @@ export class Scope {
         return ns;
     }
 
+    /**
+     * Get a NamespaceContainer by its name, looking for a fully qualified version first, then global version next if not found
+     */
+    public getNamespacesWithRoot(rootName: string, containingNamespace?: string) {
+        const nameLower = rootName?.toLowerCase();
+        const lookup = this.namespaceLookup;
+        const lookupKeys = [...lookup.keys()];
+        let lookupName = nameLower;
+        if (containingNamespace) {
+            lookupName = `${containingNamespace?.toLowerCase()}.${nameLower}`;
+        }
+        const nsList = lookupKeys.filter(key => key === lookupName).map(key => lookup.get(key));
+        return nsList;
+    }
+
+
+    /**
+     * Get a NamespaceContainer by its name, looking for a fully qualified version first, then global version next if not found
+     */
+    public getFirstNamespaceWithRoot(rootName: string, containingNamespace?: string) {
+        const nameLower = rootName?.toLowerCase();
+
+        let lookupName = nameLower;
+        if (containingNamespace) {
+            lookupName = `${containingNamespace?.toLowerCase()}.${nameLower}`;
+        }
+        return this.namespaceLookup.get(lookupName);
+    }
+
     /**
      * Get the class with the specified name.
      * @param className - The class name, including the namespace of the class if possible
@@ -102,6 +175,33 @@ export class Scope {
         return this.getEnumFileLink(enumName, containingNamespace)?.item;
     }
 
+    private useFileCachesForFileLinkLookups = false;
+
+    private getFileLinkFromFileMap<T>(cachedMapName: string, itemName: string, containingNamespace?: string): FileLink<T> {
+        let result: FileLink<T>;
+        const fullNameLower = util.getFullyQualifiedClassName(itemName, containingNamespace)?.toLowerCase();
+        const itemNameLower = itemName?.toLowerCase();
+        if (fullNameLower) {
+            this.enumerateBrsFilesWithBreak((file) => {
+                let stmt = file['_cachedLookups'][cachedMapName].get(fullNameLower);
+                if (stmt) {
+                    result = { item: stmt, file: file };
+                }
+                return !!stmt;
+            });
+        }
+        if (!result && itemNameLower && fullNameLower !== itemNameLower) {
+            this.enumerateBrsFilesWithBreak((file) => {
+                let stmt = file['_cachedLookups'][cachedMapName].get(itemNameLower);
+                if (stmt) {
+                    result = { item: stmt, file: file };
+                }
+                return !!stmt;
+            });
+        }
+        return result;
+    }
+
     public getTypeStatement(typeName: string, containingNamespace?: string): Statement {
         return this.getTypeStatementFileLink(typeName, containingNamespace)?.item;
     }
@@ -112,34 +212,37 @@ export class Scope {
      * @param containingNamespace - The namespace used to resolve relative class names. (i.e. the namespace around the current statement trying to find a class)
      */
     public getClassFileLink(className: string, containingNamespace?: string): FileLink<ClassStatement> {
-        const lowerClassName = className?.toLowerCase();
+        if (this.useFileCachesForFileLinkLookups) {
+            return this.getFileLinkFromFileMap('classStatementMap', className, containingNamespace);
+        }
+        const lowerName = className?.toLowerCase();
+        const fullNameLower = util.getFullyQualifiedClassName(lowerName, containingNamespace)?.toLowerCase();
         const classMap = this.getClassMap();
 
-        let cls = classMap.get(
-            util.getFullyQualifiedClassName(lowerClassName, containingNamespace?.toLowerCase())
-        );
+        let cls = classMap.get(fullNameLower);
         //if we couldn't find the class by its full namespaced name, look for a global class with that name
-        if (!cls) {
-            cls = classMap.get(lowerClassName);
+        if (!cls && lowerName && lowerName !== fullNameLower) {
+            cls = classMap.get(lowerName);
         }
         return cls;
     }
 
-
     /**
      * Get an interface and its containing file by the interface name
      * @param ifaceName - The interface name, including the namespace of the interface if possible
      * @param containingNamespace - The namespace used to resolve relative interface names. (i.e. the namespace around the current statement trying to find a interface)
      */
     public getInterfaceFileLink(ifaceName: string, containingNamespace?: string): FileLink<InterfaceStatement> {
+        if (this.useFileCachesForFileLinkLookups) {
+            return this.getFileLinkFromFileMap('interfaceStatementMap', ifaceName, containingNamespace);
+        }
         const lowerName = ifaceName?.toLowerCase();
+        const fullNameLower = util.getFullyQualifiedClassName(lowerName, containingNamespace)?.toLowerCase();
         const ifaceMap = this.getInterfaceMap();
 
-        let iface = ifaceMap.get(
-            util.getFullyQualifiedClassName(lowerName, containingNamespace?.toLowerCase())
-        );
+        let iface = ifaceMap.get(fullNameLower);
         //if we couldn't find the iface by its full namespaced name, look for a global class with that name
-        if (!iface) {
+        if (!iface && lowerName && lowerName !== fullNameLower) {
             iface = ifaceMap.get(lowerName);
         }
         return iface;
@@ -151,14 +254,16 @@ export class Scope {
      * @param containingNamespace - The namespace used to resolve relative enum names. (i.e. the namespace around the current statement trying to find a enum)
      */
     public getEnumFileLink(enumName: string, containingNamespace?: string): FileLink<EnumStatement> {
+        if (this.useFileCachesForFileLinkLookups) {
+            return this.getFileLinkFromFileMap('enumStatementMap', enumName, containingNamespace);
+        }
         const lowerName = enumName?.toLowerCase();
+        const fullNameLower = util.getFullyQualifiedClassName(lowerName, containingNamespace)?.toLowerCase();
         const enumMap = this.getEnumMap();
 
-        let enumeration = enumMap.get(
-            util.getFullyQualifiedClassName(lowerName, containingNamespace?.toLowerCase())
-        );
+        let enumeration = enumMap.get(fullNameLower);
         //if we couldn't find the enum by its full namespaced name, look for a global enum with that name
-        if (!enumeration) {
+        if (!enumeration && lowerName && lowerName !== fullNameLower) {
             enumeration = enumMap.get(lowerName);
         }
         return enumeration;
@@ -194,19 +299,53 @@ export class Scope {
      * @param containingNamespace - The namespace used to resolve relative constant names. (i.e. the namespace around the current statement trying to find a constant)
      */
     public getConstFileLink(constName: string, containingNamespace?: string): FileLink<ConstStatement> {
+        if (this.useFileCachesForFileLinkLookups) {
+            return this.getFileLinkFromFileMap('constStatementMap', constName, containingNamespace);
+        }
         const lowerName = constName?.toLowerCase();
+        const fullNameLower = util.getFullyQualifiedClassName(lowerName, containingNamespace)?.toLowerCase();
+
         const constMap = this.getConstMap();
 
-        let result = constMap.get(
-            util.getFullyQualifiedClassName(lowerName, containingNamespace?.toLowerCase())
-        );
+        let result = constMap.get(fullNameLower);
         //if we couldn't find the constant by its full namespaced name, look for a global constant with that name
-        if (!result) {
+        if (!result && lowerName !== fullNameLower) {
             result = constMap.get(lowerName);
         }
         return result;
     }
 
+    public getAllFileLinks(name: string, containingNamespace?: string, includeNamespaces = false, includeNameShadowsOutsideNamespace = false): FileLink<Statement>[] {
+        let links: FileLink<Statement>[] = [];
+
+        links.push(this.getClassFileLink(name, containingNamespace),
+            this.getInterfaceFileLink(name, containingNamespace),
+            this.getConstFileLink(name, containingNamespace),
+            this.getEnumFileLink(name, containingNamespace));
+        if (includeNameShadowsOutsideNamespace && containingNamespace) {
+            links.push(this.getClassFileLink(name),
+                this.getInterfaceFileLink(name),
+                this.getConstFileLink(name),
+                this.getEnumFileLink(name));
+        }
+        if (includeNamespaces) {
+            const nameSpaceContainer = this.getFirstNamespaceWithRoot(name, containingNamespace);
+            if (nameSpaceContainer) {
+                links.push({ item: nameSpaceContainer.namespaceStatements?.[0], file: nameSpaceContainer?.file as BrsFile });
+            }
+        }
+        const fullNameLower = (containingNamespace ? `${containingNamespace}.${name}` : name).toLowerCase();
+        const callable = this.getCallableByName(name);
+        if (callable) {
+            if ((!callable.hasNamespace && includeNameShadowsOutsideNamespace) || callable.getName(ParseMode.BrighterScript).toLowerCase() === fullNameLower) {
+                // this callable has no namespace, or has same namespace
+                links.push({ item: callable.functionStatement, file: callable.file as BrsFile });
+            }
+        }
+        // remove empty links
+        return links.filter(link => link);
+    }
+
     /**
      * Get an TypeStatement and its containing file by the type name
      * @param typeName - The TypeStatement name, including the namespace of the type if possible
@@ -284,11 +423,11 @@ export class Scope {
             const map = new Map<string, FileLink<ClassStatement>>();
             this.enumerateBrsFiles((file) => {
                 if (isBrsFile(file)) {
-                    for (let cls of file.parser.references.classStatements) {
-                        const lowerClassName = cls.getName(ParseMode.BrighterScript)?.toLowerCase();
+                    for (let cls of file['_cachedLookups'].classStatements) {
+                        const className = cls.getName(ParseMode.BrighterScript);
                         //only track classes with a defined name (i.e. exclude nameless malformed classes)
-                        if (lowerClassName) {
-                            map.set(lowerClassName, { item: cls, file: file });
+                        if (className) {
+                            map.set(className.toLowerCase(), { item: cls, file: file });
                         }
                     }
                 }
@@ -306,11 +445,11 @@ export class Scope {
             const map = new Map<string, FileLink<InterfaceStatement>>();
             this.enumerateBrsFiles((file) => {
                 if (isBrsFile(file)) {
-                    for (let iface of file.parser.references.interfaceStatements) {
-                        const lowerIfaceName = iface.getName(ParseMode.BrighterScript)?.toLowerCase();
+                    for (let iface of file['_cachedLookups'].interfaceStatements) {
+                        const ifaceName = iface.getName(ParseMode.BrighterScript);
                         //only track classes with a defined name (i.e. exclude nameless malformed classes)
-                        if (lowerIfaceName) {
-                            map.set(lowerIfaceName, { item: iface, file: file });
+                        if (ifaceName) {
+                            map.set(ifaceName.toLowerCase(), { item: iface, file: file });
                         }
                     }
                 }
@@ -327,11 +466,10 @@ export class Scope {
         return this.cache.getOrAdd('enumMap', () => {
             const map = new Map<string, FileLink<EnumStatement>>();
             this.enumerateBrsFiles((file) => {
-                for (let enumStmt of file.parser.references.enumStatements) {
-                    const lowerEnumName = enumStmt.fullName.toLowerCase();
+                for (let enumStmt of file['_cachedLookups'].enumStatements) {
                     //only track enums with a defined name (i.e. exclude nameless malformed enums)
-                    if (lowerEnumName) {
-                        map.set(lowerEnumName, { item: enumStmt, file: file });
+                    if (enumStmt.fullName) {
+                        map.set(enumStmt.fullName.toLowerCase(), { item: enumStmt, file: file });
                     }
                 }
             });
@@ -347,11 +485,10 @@ export class Scope {
         return this.cache.getOrAdd('constMap', () => {
             const map = new Map<string, FileLink<ConstStatement>>();
             this.enumerateBrsFiles((file) => {
-                for (let stmt of file.parser.references.constStatements) {
-                    const lowerEnumName = stmt.fullName.toLowerCase();
+                for (let stmt of file['_cachedLookups'].constStatements) {
                     //only track enums with a defined name (i.e. exclude nameless malformed enums)
-                    if (lowerEnumName) {
-                        map.set(lowerEnumName, { item: stmt, file: file });
+                    if (stmt.fullName) {
+                        map.set(stmt.fullName.toLowerCase(), { item: stmt, file: file });
                     }
                 }
             });
@@ -367,23 +504,21 @@ export class Scope {
         return this.cache.getOrAdd('typeStatementMap', () => {
             const map = new Map<string, FileLink<TypeStatement>>();
             this.enumerateBrsFiles((file) => {
-                for (let stmt of file.parser.references.typeStatements) {
-                    const lowerTypeName = stmt.fullName.toLowerCase();
-                    //only track enums with a defined name (i.e. exclude nameless malformed enums)
-                    if (lowerTypeName) {
-                        map.set(lowerTypeName, { item: stmt, file: file });
+                file.ast.walk((node) => {
+                    if (isTypeStatement(node)) {
+                        const namespaceName = node.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript);
+                        const typeName = node.tokens.name?.text;
+                        if (typeName) {
+                            const fullName = (namespaceName ? `${namespaceName}.${typeName}` : typeName).toLowerCase();
+                            map.set(fullName, { item: node, file: file });
+                        }
                     }
-                }
+                }, { walkMode: WalkMode.visitAllRecursive });
             });
             return map;
         });
     }
 
-    /**
-     * The list of diagnostics found specifically for this scope. Individual file diagnostics are stored on the files themselves.
-     */
-    protected diagnostics = [] as BsDiagnostic[];
-
     protected onDependenciesChanged(event: DependencyChangedEvent) {
         this.logDebug('invalidated because dependency graph said [', event.sourceKey, '] changed');
         this.invalidate();
@@ -403,7 +538,7 @@ export class Scope {
     public isKnownNamespace(namespaceName: string) {
         let namespaceNameLower = namespaceName.toLowerCase();
         this.enumerateBrsFiles((file) => {
-            for (let namespace of file.parser.references.namespaceStatements) {
+            for (let namespace of file['_cachedLookups'].namespaceStatements) {
                 let loopNamespaceNameLower = namespace.name.toLowerCase();
                 if (loopNamespaceNameLower === namespaceNameLower || loopNamespaceNameLower.startsWith(namespaceNameLower + '.')) {
                     return true;
@@ -453,7 +588,7 @@ export class Scope {
 
     /**
      * Get the file from this scope with the given path.
-     * @param filePath can be a srcPath or pkgPath
+     * @param filePath can be a srcPath or destPath
      * @param normalizePath should this function repair and standardize the path? Passing false should have a performance boost if you can guarantee your path is already sanitized
      */
     public getFile<TFile extends BscFile>(filePath: string, normalizePath = true) {
@@ -461,7 +596,7 @@ export class Scope {
             return undefined;
         }
 
-        const key = path.isAbsolute(filePath) ? 'srcPath' : 'pkgPath';
+        const key: keyof Pick<BscFile, 'srcPath' | 'destPath'> = path.isAbsolute(filePath) ? 'srcPath' : 'destPath';
         let map = this.cache.getOrAdd('fileMaps-srcPath', () => {
             const result = new Map<string, BscFile>();
             for (const file of this.getAllFiles()) {
@@ -494,7 +629,7 @@ export class Scope {
             for (let dependency of dependencies) {
                 //load components by their name
                 if (dependency.startsWith('component:')) {
-                    let comp = this.program.getComponent(dependency.replace(/$component:/, ''));
+                    let comp = this.program.getComponent(dependency.replace(/^component:/, ''));
                     if (comp) {
                         result.push(comp.file);
                     }
@@ -505,35 +640,38 @@ export class Scope {
                     }
                 }
             }
-            this.logDebug('getAllFiles', () => result.map(x => x.pkgPath));
             return result;
         });
     }
 
     /**
-     * Get the list of errors for this scope. It's calculated on the fly, so
-     * call this sparingly.
+     * Gets a list of all files in this scope, but not imported files, and not from ancestor scopes
      */
-    public getDiagnostics() {
-        let diagnosticLists = [this.diagnostics] as BsDiagnostic[][];
-
-        //add diagnostics from every referenced file
-        this.enumerateOwnFiles((file) => {
-            diagnosticLists.push(file.getDiagnostics());
-        });
-        let allDiagnostics = Array.prototype.concat.apply([], diagnosticLists) as BsDiagnostic[];
-
-        let filteredDiagnostics = allDiagnostics.filter((x) => {
-            return !util.diagnosticIsSuppressed(x);
+    public getImmediateFiles(): BscFile[] {
+        return this.cache.getOrAdd('getImmediateFiles', () => {
+            let result = [] as BscFile[];
+            if (isXmlScope(this)) {
+                result.push(this.xmlFile);
+            }
+            let dependencies = this.dependencyGraph.getImmediateDependencies(this.dependencyGraphKey);
+            for (let dependency of dependencies) {
+                //load components by their name
+                if (dependency.startsWith('component:')) {
+                    let comp = this.program.getComponent(dependency.replace(/^component:/, ''));
+                    if (comp) {
+                        result.push(...comp.scope.getImmediateFiles());
+                        result.push(comp.file);
+                    }
+                } else {
+                    let file = this.program.getFile(dependency);
+                    if (file) {
+                        result.push(file);
+                    }
+                }
+            }
+            this.logDebug('getImmediateFiles', () => result.map(x => x.destPath));
+            return result;
         });
-
-        //filter out diangostics that match any of the comment flags
-
-        return filteredDiagnostics;
-    }
-
-    public addDiagnostics(diagnostics: BsDiagnostic[]) {
-        this.diagnostics.push(...diagnostics);
     }
 
     /**
@@ -575,6 +713,15 @@ export class Scope {
         });
     }
 
+    public getCallableContainerMap() {
+        return this.cache.getOrAdd('callableContainerMap', () => {
+            let callables = this.getAllCallables();
+
+            //get a list of all callables, indexed by their lower case names
+            return util.getCallableContainersByLowerName(callables);
+        });
+    }
+
     /**
      * Iterate over Brs files not shadowed by typedefs
      */
@@ -588,6 +735,21 @@ export class Scope {
         }
     }
 
+    /**
+     * Iterate over Brs files not shadowed by typedefs
+     */
+    public enumerateBrsFilesWithBreak(callback: (file: BrsFile) => boolean) {
+        const files = this.getAllFiles();
+        for (const file of files) {
+            //only brs files without a typedef
+            if (isBrsFile(file) && !file.hasTypedef) {
+                if (callback(file)) {
+                    break;
+                }
+            }
+        }
+    }
+
     /**
      * Call a function for each file directly included in this scope (excluding files found only in parent scopes).
      */
@@ -595,7 +757,7 @@ export class Scope {
         const files = this.getOwnFiles();
         for (const file of files) {
             //either XML components or files without a typedef
-            if (isXmlFile(file) || !file.hasTypedef) {
+            if (isXmlFile(file) || (isBrsFile(file) && !file.hasTypedef)) {
                 callback(file);
             }
         }
@@ -607,15 +769,15 @@ export class Scope {
      */
     public getOwnCallables(): CallableContainer[] {
         let result = [] as CallableContainer[];
-        this.logDebug('getOwnCallables() files: ', () => this.getOwnFiles().map(x => x.pkgPath));
-
         //get callables from own files
         this.enumerateOwnFiles((file) => {
-            for (let callable of file?.callables ?? []) {
-                result.push({
-                    callable: callable,
-                    scope: this
-                });
+            if (isBrsFile(file)) {
+                for (let callable of file?.callables ?? []) {
+                    result.push({
+                        callable: callable,
+                        scope: this
+                    });
+                }
             }
         });
         return result;
@@ -642,7 +804,7 @@ export class Scope {
     public getAllNamespaceStatements() {
         let result = [] as NamespaceStatement[];
         this.enumerateBrsFiles((file) => {
-            result.push(...file.parser.references.namespaceStatements);
+            result.push(...file['_cachedLookups'].namespaceStatements);
         });
         return result;
     }
@@ -652,13 +814,44 @@ export class Scope {
     }
     private _debugLogComponentName: string;
 
-    public validate(force = false) {
+
+    public validationMetrics = {
+        linkTime: 0,
+        validationTime: 0
+    };
+
+    public shouldValidate(validationOptions: ScopeValidationOptions = { force: false }) {
         //if this scope is already validated, no need to revalidate
-        if (this.isValidated === true && !force) {
+        if (this.isValidated === true && !validationOptions.force) {
             this.logDebug('validate(): already validated');
-            return;
+            return false;
+        }
+
+        if (!validationOptions.initialValidation && validationOptions.filesToBeValidatedInScopeContext?.size === 0) {
+            // There was no need to validate this scope.
+            (this as any).isValidated = true;
+            return false;
+        }
+        return true;
+    }
+
+
+    public validate(validationOptions: ScopeValidationOptions = { force: false }) {
+        this.validationMetrics = {
+            linkTime: 0,
+            validationTime: 0
+        };
+
+        //if this scope is already validated, no need to revalidate
+        if (!this.shouldValidate(validationOptions)) {
+            this.logDebug('validate(): already validated');
+            // There was no need to validate this scope.
+            (this as any).isValidated = true;
+            return false;
         }
 
+        this.useFileCachesForFileLinkLookups = !validationOptions.initialValidation;
+
         this.program.logger.time(LogLevel.debug, [this._debugLogComponentName, 'validate()'], () => {
 
             let parentScope = this.getParentScope();
@@ -666,75 +859,31 @@ export class Scope {
             //validate our parent before we validate ourself
             if (parentScope && parentScope.isValidated === false) {
                 this.logDebug('validate(): validating parent first');
-                parentScope.validate(force);
+                parentScope.validate(validationOptions);
             }
-            //clear the scope's errors list (we will populate them from this method)
-            this.diagnostics = [];
-
-            let callables = this.getAllCallables();
-
-            //sort the callables by filepath and then method name, so the errors will be consistent
-            // eslint-disable-next-line prefer-arrow-callback
-            callables = callables.sort((a, b) => {
-                const pathA = a.callable.file.srcPath;
-                const pathB = b.callable.file.srcPath;
-                //sort by path
-                if (pathA < pathB) {
-                    return -1;
-                } else if (pathA > pathB) {
-                    return 1;
-                }
-                //sort by function name
-                const funcA = b.callable.name;
-                const funcB = b.callable.name;
-                if (funcA < funcB) {
-                    return -1;
-                } else if (funcA > funcB) {
-                    return 1;
-                }
-                return 0;
-            });
-
-            //get a list of all callables, indexed by their lower case names
-            let callableContainerMap = util.getCallableContainersByLowerName(callables);
-            let files = this.getOwnFiles();
 
             //Since statements from files are shared across multiple scopes, we need to link those statements to the current scope
-            this.linkSymbolTable();
-            this.program.plugins.emit('beforeScopeValidate', this, files, callableContainerMap);
 
-            this.program.plugins.emit('onScopeValidate', {
+            let t0 = performance.now();
+            this.linkSymbolTable();
+            this.validationMetrics.linkTime = performance.now() - t0;
+            const scopeValidateEvent = {
                 program: this.program,
-                scope: this
-            });
-            this._validate(callableContainerMap);
-
-            this.program.plugins.emit('afterScopeValidate', this, files, callableContainerMap);
+                scope: this,
+                changedFiles: validationOptions?.changedFiles ?? [],
+                changedSymbols: validationOptions?.changedSymbols
+            };
+            t0 = performance.now();
+            this.program.plugins.emit('validateScope', scopeValidateEvent);
+            this.validationMetrics.validationTime = performance.now() - t0;
             //unlink all symbol tables from this scope (so they don't accidentally stick around)
             this.unlinkSymbolTable();
-
             (this as any).isValidated = true;
         });
-    }
-
-    protected _validate(callableContainerMap: CallableContainerMap) {
-        //find all duplicate function declarations
-        this.diagnosticFindDuplicateFunctionDeclarations(callableContainerMap);
-
-        //detect missing and incorrect-case script imports
-        this.diagnosticValidateScriptImportPaths();
-
-        //enforce a series of checks on the bodies of class methods
-        this.validateClasses();
-
-        //do many per-file checks
-        this.enumerateBrsFiles((file) => {
-            this.diagnosticDetectFunctionCallsWithWrongParamCount(file, callableContainerMap);
-            this.diagnosticDetectShadowedLocalVars(file, callableContainerMap);
-            this.diagnosticDetectFunctionCollisions(file);
-            this.detectVariableNamespaceCollisions(file);
-            this.diagnosticDetectInvalidFunctionExpressionTypes(file);
-        });
+        for (let file of this.getAllFiles()) {
+            validationOptions.filesToBeValidatedInScopeContext?.delete(file);
+        }
+        return true;
     }
 
     /**
@@ -749,6 +898,7 @@ export class Scope {
     public get symbolTable(): SymbolTable {
         return this.cache.getOrAdd('symbolTable', () => {
             const result = new SymbolTable(`Scope: '${this.name}'`, () => this.getParentScope()?.symbolTable);
+            result.addSymbol('m', undefined, new AssociativeArrayType(), SymbolTypeFlag.runtime);
             for (let file of this.getOwnFiles()) {
                 if (isBrsFile(file)) {
                     result.mergeSymbolTable(file.parser?.symbolTable);
@@ -758,365 +908,90 @@ export class Scope {
         });
     }
 
+    /**
+     * A list of functions that will be called whenever `unlinkSymbolTable` is called
+     */
+    private linkSymbolTableDisposables = [];
+
+    private symbolsAddedDuringLinking: { symbolTable: SymbolTable; name: string; flags: number }[] = [];
+
+    public get allNamespaceTypeTable() {
+        return this._allNamespaceTypeTable;
+    }
+
+    private _allNamespaceTypeTable: SymbolTable;
+
     /**
      * Builds the current symbol table for the scope, by merging the tables for all the files in this scope.
      * Also links all file symbols tables to this new table
      * This will only rebuilt if the symbol table has not been built before
+     *
+     *  Tree of symbol tables:
+     *  ```
+     *  Global Scope Symbol Table
+     *      -  Source Scope Symbol Table :: Aggregate Namespaces Symbol Table (Siblings)
+     *          - File 1 Symbol Table
+     *          - File 2 Symbol Table
+     *      -  Component A Scope Symbol Table :: Aggregate Namespaces Symbol Table (Siblings)
+     *          - File 1 Symbol Table
+     *          - File 2 Symbol Table
+     *      -  Component B Scope Symbol Table :: Aggregate Namespaces Symbol Table (Siblings)
+     *          - File 1 Symbol Table
+     *          - File 2 Symbol Table
+     * ```
      */
     public linkSymbolTable() {
+        SymbolTable.cacheVerifier.generateToken();
+        this._allNamespaceTypeTable = new SymbolTable(`Scope NamespaceTypes ${this.name}`);
         for (const file of this.getAllFiles()) {
             if (isBrsFile(file)) {
-                file.parser.symbolTable.pushParentProvider(() => this.symbolTable);
+                this.linkSymbolTableDisposables.push(
+                    file.parser.symbolTable.pushParentProvider(() => this.symbolTable)
+                );
 
                 //link each NamespaceStatement's SymbolTable with the aggregate NamespaceLookup SymbolTable.
-                //Leaf containers always have symbolTable populated (buildNamespaceLookup allocates one
-                //before the merge step), so the lookup below is safe; the null guard exists only to
-                //tolerate edge cases like a namespace that failed to register.
-                for (const namespace of file.parser.references.namespaceStatements) {
+                //Leaf containers always have symbolTable populated, so the lookup below is safe; the null
+                //guard tolerates edge cases like a namespace that failed to register.
+                for (const namespace of file['_cachedLookups'].namespaceStatements) {
                     const namespaceNameLower = namespace.getName(ParseMode.BrighterScript).toLowerCase();
                     const aggregate = this.namespaceLookup.get(namespaceNameLower)?.symbolTable;
                     if (aggregate) {
-                        namespace.getSymbolTable().addSibling(aggregate);
+                        this.linkSymbolTableDisposables.push(
+                            namespace.getSymbolTable().addSibling(aggregate)
+                        );
                     }
                 }
             }
         }
-    }
-
-    public unlinkSymbolTable() {
-        for (let file of this.getOwnFiles()) {
-            if (isBrsFile(file)) {
-                file.parser?.symbolTable.popParentProvider();
-
-                for (const namespace of file.parser.references.namespaceStatements) {
-                    const namespaceNameLower = namespace.getName(ParseMode.BrighterScript).toLowerCase();
-                    const aggregate = this.namespaceLookup.get(namespaceNameLower)?.symbolTable;
-                    if (aggregate) {
-                        namespace.getSymbolTable().removeSibling(aggregate);
-                    }
-                }
-            }
-        }
-    }
-
-    private detectVariableNamespaceCollisions(file: BrsFile) {
-        //find all function parameters
-        for (let func of file.parser.references.functionExpressions) {
-            for (let param of func.parameters) {
-                let lowerParamName = param.name.text.toLowerCase();
-                let namespace = this.getNamespace(lowerParamName, param.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript).toLowerCase());
-                //see if the param matches any starting namespace part
-                if (namespace) {
-                    this.diagnostics.push({
-                        file: file,
-                        ...DiagnosticMessages.parameterMayNotHaveSameNameAsNamespace(param.name.text),
-                        range: param.name.range,
-                        relatedInformation: [{
-                            message: 'Namespace declared here',
-                            location: util.createLocation(
-                                URI.file(namespace.file.srcPath).toString(),
-                                namespace.nameRange
-                            )
-                        }]
-                    });
-                }
-            }
-        }
-
-        for (let assignment of file.parser.references.assignmentStatements) {
-            let lowerAssignmentName = assignment.name.text.toLowerCase();
-            let namespace = this.getNamespace(lowerAssignmentName, assignment.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript).toLowerCase());
-            //see if the param matches any starting namespace part
-            if (namespace) {
-                this.diagnostics.push({
-                    file: file,
-                    ...DiagnosticMessages.variableMayNotHaveSameNameAsNamespace(assignment.name.text),
-                    range: assignment.name.range,
-                    relatedInformation: [{
-                        message: 'Namespace declared here',
-                        location: util.createLocation(
-                            URI.file(namespace.file.srcPath).toString(),
-                            namespace.nameRange
-                        )
-                    }]
-                });
-            }
-        }
-    }
-
-    /**
-     * Find various function collisions
-     */
-    private diagnosticDetectFunctionCollisions(file: BscFile) {
-        for (let func of file?.callables ?? []) {
-            const funcName = func.getName(ParseMode.BrighterScript);
-            const lowerFuncName = funcName?.toLowerCase();
-            if (lowerFuncName) {
-
-                //find function declarations with the same name as a stdlib function
-                if (globalCallableMap.has(lowerFuncName)) {
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.scopeFunctionShadowedByBuiltInFunction(),
-                        range: func.nameRange,
-                        file: file
-                    });
-                }
-
-                //find any functions that have the same name as a class
-                if (this.hasClass(lowerFuncName)) {
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.functionCannotHaveSameNameAsClass(funcName),
-                        range: func.nameRange,
-                        file: file
-                    });
-                }
-            }
-        }
-    }
-
-    /**
-     * Find function parameters and function return types that are neither built-in types or known Class references
-     */
-    private diagnosticDetectInvalidFunctionExpressionTypes(file: BrsFile) {
-        for (let func of file.parser.references.functionExpressions) {
-            // lazy-compute the namespace name only if a custom type is actually encountered
-            let namespaceFetched = false;
-            let currentNamespaceName: string;
-            const getNamespaceName = () => {
-                if (!namespaceFetched) {
-                    namespaceFetched = true;
-                    currentNamespaceName = func.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript);
-                }
-                return currentNamespaceName;
-            };
-
-            if (isCustomType(func.returnType) && func.returnTypeToken) {
-                // check if this custom type is in our class map
-                const returnTypeName = func.returnType.name;
-                // check for built in types
-                const isBuiltInType = util.isBuiltInType(returnTypeName);
-                if (!isBuiltInType && !this.hasClass(returnTypeName, getNamespaceName()) && !this.hasInterface(returnTypeName) && !this.hasEnum(returnTypeName) && !this.hasTypeStatementType(returnTypeName)) {
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.invalidFunctionReturnType(returnTypeName),
-                        range: func.returnTypeToken.range,
-                        file: file
-                    });
-                }
-            }
-
-            for (let param of func.parameters) {
-                if (isCustomType(param.type) && param.typeToken) {
-                    const paramTypeName = param.type.name;
-                    // check for built in types
-                    const isBuiltInType = util.isBuiltInType(paramTypeName);
-
-                    if (!isBuiltInType && !this.hasClass(paramTypeName, getNamespaceName()) && !this.hasInterface(paramTypeName) && !this.hasEnum(paramTypeName) && !this.hasTypeStatementType(paramTypeName)) {
-                        this.diagnostics.push({
-                            ...DiagnosticMessages.functionParameterTypeIsInvalid(param.name.text, paramTypeName),
-                            range: param.typeToken.range,
-                            file: file
-                        });
-
-                    }
-                }
-            }
-        }
-    }
-
-    public getNewExpressions() {
-        let result = [] as AugmentedNewExpression[];
         this.enumerateBrsFiles((file) => {
-            let expressions = file.parser.references.newExpressions as AugmentedNewExpression[];
-            for (let expression of expressions) {
-                expression.file = file;
-                result.push(expression);
-            }
-        });
-        return result;
-    }
+            const namespaceTypes = file.getNamespaceSymbolTable();
 
-    private validateClasses() {
-        let validator = new BsClassValidator(this);
-        validator.validate();
-        this.diagnostics.push(...validator.diagnostics);
+            this.linkSymbolTableDisposables.push(
+                ...this._allNamespaceTypeTable.mergeNamespaceSymbolTables(namespaceTypes)
+            );
+        });
+        this.linkSymbolTableDisposables.push(
+            this.symbolTable.addSibling(this._allNamespaceTypeTable)
+        );
     }
 
-    /**
-     * Detect calls to functions with the incorrect number of parameters
-     */
-    private diagnosticDetectFunctionCallsWithWrongParamCount(file: BscFile, callableContainersByLowerName: CallableContainerMap) {
-        //validate all function calls
-        for (let expCall of file?.functionCalls ?? []) {
-            let callableContainersWithThisName = callableContainersByLowerName.get(expCall.name.toLowerCase());
-
-            //use the first item from callablesByLowerName, because if there are more, that's a separate error
-            let knownCallableContainer = callableContainersWithThisName ? callableContainersWithThisName[0] : undefined;
-
-            if (knownCallableContainer) {
-                //get min/max parameter count for callable
-                let minParams = 0;
-                let maxParams = 0;
-                for (let param of knownCallableContainer.callable.params) {
-                    maxParams++;
-                    //optional parameters must come last, so we can assume that minParams won't increase once we hit
-                    //the first isOptional
-                    if (param.isOptional !== true) {
-                        minParams++;
-                    }
-                }
-                let expCallArgCount = expCall.args.length;
-                if (expCall.args.length > maxParams || expCall.args.length < minParams) {
-                    let minMaxParamsText = minParams === maxParams ? maxParams : `${minParams}-${maxParams}`;
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.mismatchArgumentCount(minMaxParamsText, expCallArgCount),
-                        range: expCall.nameRange,
-                        //TODO detect end of expression call
-                        file: file
-                    });
-                }
-            }
+    public unlinkSymbolTable() {
+        for (const symbolToRemove of this.symbolsAddedDuringLinking) {
+            this.symbolTable.removeSymbol(symbolToRemove.name);
         }
-    }
-
-    /**
-     * Detect local variables (function scope) that have the same name as scope calls
-     */
-    private diagnosticDetectShadowedLocalVars(file: BscFile, callableContainerMap: CallableContainerMap) {
-        const classMap = this.getClassMap();
-        //loop through every function scope
-        for (let scope of file.functionScopes) {
-            //every var declaration in this function scope
-            for (let varDeclaration of scope.variableDeclarations) {
-                const varName = varDeclaration.name;
-                const lowerVarName = varName.toLowerCase();
-
-                //if the var is a function
-                if (isFunctionType(varDeclaration.type)) {
-                    //local var function with same name as stdlib function
-                    if (
-                        //has same name as stdlib
-                        globalCallableMap.has(lowerVarName)
-                    ) {
-                        this.diagnostics.push({
-                            ...DiagnosticMessages.localVarFunctionShadowsParentFunction('stdlib'),
-                            range: varDeclaration.nameRange,
-                            file: file
-                        });
-
-                        //this check needs to come after the stdlib one, because the stdlib functions are included
-                        //in the scope function list
-                    } else if (
-                        //has same name as scope function
-                        callableContainerMap.has(lowerVarName)
-                    ) {
-                        this.diagnostics.push({
-                            ...DiagnosticMessages.localVarFunctionShadowsParentFunction('scope'),
-                            range: varDeclaration.nameRange,
-                            file: file
-                        });
-                    }
-
-                    //var is not a function
-                } else if (
-                    //is NOT a callable from stdlib (because non-function local vars can have same name as stdlib names)
-                    !globalCallableMap.has(lowerVarName)
-                ) {
-
-                    //is same name as a callable
-                    if (callableContainerMap.has(lowerVarName)) {
-                        this.diagnostics.push({
-                            ...DiagnosticMessages.localVarShadowedByScopedFunction(),
-                            range: varDeclaration.nameRange,
-                            file: file
-                        });
-                        //has the same name as an in-scope class
-                    } else if (classMap.has(lowerVarName)) {
-                        this.diagnostics.push({
-                            ...DiagnosticMessages.localVarSameNameAsClass(classMap.get(lowerVarName)?.item.getName(ParseMode.BrighterScript)),
-                            range: varDeclaration.nameRange,
-                            file: file
-                        });
-                    }
-                }
-            }
+        this.symbolsAddedDuringLinking = [];
+        for (const dispose of this.linkSymbolTableDisposables) {
+            dispose();
         }
-    }
-
-    /**
-     * Create diagnostics for any duplicate function declarations
-     */
-    private diagnosticFindDuplicateFunctionDeclarations(callableContainersByLowerName: CallableContainerMap) {
-        //for each list of callables with the same name
-        for (let [lowerName, callableContainers] of callableContainersByLowerName) {
-
-            let globalCallables = [] as CallableContainer[];
-            let nonGlobalCallables = [] as CallableContainer[];
-            let ownCallables = [] as CallableContainer[];
-            let ancestorNonGlobalCallables = [] as CallableContainer[];
-
-            for (let container of callableContainers) {
-                if (container.scope === this.program.globalScope) {
-                    globalCallables.push(container);
-                } else {
-                    nonGlobalCallables.push(container);
-                    if (container.scope === this) {
-                        ownCallables.push(container);
-                    } else {
-                        ancestorNonGlobalCallables.push(container);
-                    }
-                }
-            }
-
-            //add info diagnostics about child shadowing parent functions
-            if (ownCallables.length > 0 && ancestorNonGlobalCallables.length > 0) {
-                for (let container of ownCallables) {
-                    //skip the init function (because every component will have one of those){
-                    if (lowerName !== 'init') {
-                        let shadowedCallable = ancestorNonGlobalCallables[ancestorNonGlobalCallables.length - 1];
-                        if (!!shadowedCallable && shadowedCallable.callable.file === container.callable.file) {
-                            //same file: skip redundant imports
-                            continue;
-                        }
-                        this.diagnostics.push({
-                            ...DiagnosticMessages.overridesAncestorFunction(
-                                container.callable.name,
-                                container.scope.name,
-                                shadowedCallable.callable.file.pkgPath,
-                                //grab the last item in the list, which should be the closest ancestor's version
-                                shadowedCallable.scope.name
-                            ),
-                            range: container.callable.nameRange,
-                            file: container.callable.file
-                        });
-                    }
-                }
-            }
+        this.linkSymbolTableDisposables = [];
 
-            //add error diagnostics about duplicate functions in the same scope
-            if (ownCallables.length > 1) {
-
-                for (let callableContainer of ownCallables) {
-                    let callable = callableContainer.callable;
-
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.duplicateFunctionImplementation(callable.name, callableContainer.scope.name),
-                        range: util.createRange(
-                            callable.nameRange.start.line,
-                            callable.nameRange.start.character,
-                            callable.nameRange.start.line,
-                            callable.nameRange.end.character
-                        ),
-                        file: callable.file
-                    });
-                }
-            }
-        }
+        this.cache.delete('namespaceLookup');
     }
 
     /**
      * Get the list of all script imports for this scope
      */
-    private getOwnScriptImports() {
+    public getOwnScriptImports() {
         let result = [] as FileReference[];
         this.enumerateOwnFiles((file) => {
             if (isBrsFile(file)) {
@@ -1128,59 +1003,17 @@ export class Scope {
         return result;
     }
 
-    /**
-     * Verify that all of the scripts imported by each file in this scope actually exist
-     */
-    private diagnosticValidateScriptImportPaths() {
-        let scriptImports = this.getOwnScriptImports();
-        //verify every script import
-        for (let scriptImport of scriptImports) {
-            let referencedFile = this.getFileByRelativePath(scriptImport.pkgPath);
-            //if we can't find the file
-            if (!referencedFile) {
-                //skip the default bslib file, it will exist at transpile time but should not show up in the program during validation cycle
-                if (scriptImport.pkgPath === `source${path.sep}bslib.brs`) {
-                    continue;
-                }
-                let dInfo: DiagnosticInfo;
-                if (scriptImport.text.trim().length === 0) {
-                    dInfo = DiagnosticMessages.scriptSrcCannotBeEmpty();
-                } else {
-                    dInfo = DiagnosticMessages.referencedFileDoesNotExist();
-                }
-
-                this.diagnostics.push({
-                    ...dInfo,
-                    range: scriptImport.filePathRange,
-                    file: scriptImport.sourceFile
-                });
-                //if the character casing of the script import path does not match that of the actual path
-            } else if (scriptImport.pkgPath !== referencedFile.pkgPath) {
-                const correctUri = scriptImport.text.startsWith('pkg:/')
-                    ? util.getRokuPkgPath(referencedFile.pkgPath)
-                    : path.posix.relative(
-                        path.dirname(scriptImport.sourceFile.pkgPath).replace(/\\/g, '/'),
-                        referencedFile.pkgPath.replace(/\\/g, '/')
-                    );
-                this.diagnostics.push({
-                    ...DiagnosticMessages.scriptImportCaseMismatch(referencedFile.pkgPath, correctUri),
-                    range: scriptImport.filePathRange,
-                    file: scriptImport.sourceFile
-                });
-            }
-        }
-    }
 
     /**
      * Find the file with the specified relative path
      */
-    protected getFileByRelativePath(relativePath: string) {
+    public getFileByRelativePath(relativePath: string) {
         if (!relativePath) {
             return;
         }
         let files = this.getAllFiles();
         for (let file of files) {
-            if (file.pkgPath.toLowerCase() === relativePath.toLowerCase()) {
+            if (file.destPath.toLowerCase() === relativePath.toLowerCase()) {
                 return file;
             }
         }
@@ -1195,82 +1028,6 @@ export class Scope {
         return hasFile;
     }
 
-    /**
-     * Get all callables as completionItems
-     */
-    public getCallablesAsCompletions(parseMode: ParseMode) {
-        let completions = [] as CompletionItem[];
-        let callables = this.getAllCallables();
-
-        if (parseMode === ParseMode.BrighterScript) {
-            //throw out the namespaced callables (they will be handled by another method)
-            callables = callables.filter(x => x.callable.hasNamespace === false);
-        }
-
-        for (let callableContainer of callables) {
-            completions.push(this.createCompletionFromCallable(callableContainer));
-        }
-        return completions;
-    }
-
-    public createCompletionFromCallable(callableContainer: CallableContainer): CompletionItem {
-        return {
-            label: callableContainer.callable.getName(ParseMode.BrighterScript),
-            kind: CompletionItemKind.Function,
-            detail: callableContainer.callable.shortDescription,
-            documentation: callableContainer.callable.documentation ? { kind: 'markdown', value: callableContainer.callable.documentation } : undefined
-        };
-    }
-
-    public createCompletionFromFunctionStatement(statement: FunctionStatement): CompletionItem {
-        return {
-            label: statement.getName(ParseMode.BrighterScript),
-            kind: CompletionItemKind.Function
-        };
-    }
-
-    /**
-     * Get the definition (where was this thing first defined) of the symbol under the position
-     * @deprecated use `DefinitionProvider.process()`
-     */
-    public getDefinition(file: BscFile, position: Position): Location[] {
-        // Overridden in XMLScope. Brs files use implementation in BrsFile
-        return [];
-    }
-
-    /**
-     * Scan all files for property names, and return them as completions
-     */
-    public getPropertyNameCompletions() {
-        let results = [] as CompletionItem[];
-        this.enumerateBrsFiles((file) => {
-            results.push(...file.propertyNameCompletions);
-        });
-        return results;
-    }
-
-    public getAllClassMemberCompletions() {
-        let results = new Map<string, CompletionItem>();
-        let filesSearched = new Set<BscFile>();
-        for (const file of this.getAllFiles()) {
-            if (isXmlFile(file) || filesSearched.has(file)) {
-                continue;
-            }
-            filesSearched.add(file);
-            for (let cs of file.parser.references.classStatements) {
-                for (let s of [...cs.methods, ...cs.fields]) {
-                    if (!results.has(s.name.text) && s.name.text.toLowerCase() !== 'new') {
-                        results.set(s.name.text, {
-                            label: s.name.text,
-                            kind: isMethodStatement(s) ? CompletionItemKind.Method : CompletionItemKind.Field
-                        });
-                    }
-                }
-            }
-        }
-        return results;
-    }
-
     /**
      * @param className - The name of the class (including namespace if possible)
      * @param callsiteNamespace - the name of the namespace where the call site resides (this is NOT the known namespace of the class).
@@ -1281,7 +1038,7 @@ export class Scope {
         let link = this.getClassFileLink(className, callsiteNamespace);
         while (link) {
             items.push(link);
-            link = this.getClassFileLink(link.item.parentClassName?.getName(ParseMode.BrighterScript)?.toLowerCase(), callsiteNamespace);
+            link = this.getClassFileLink(link.item.parentClassName?.getName()?.toLowerCase(), callsiteNamespace);
         }
         return items;
     }
@@ -1305,6 +1062,7 @@ export interface NamespaceFileContribution {
     fullName: string;
     lastPartName: string;
     nameRange: Range;
+    namespaceStatements?: NamespaceStatement[];
     statements?: Statement[];
     classStatements?: Record<string, ClassStatement>;
     functionStatements?: Record<string, FunctionStatement>;
@@ -1328,16 +1086,19 @@ export interface NamespaceContainer {
     fullName: string;
     nameRange: Range;
     lastPartName: string;
-    namespaces: Map<string, NamespaceContainer>;
+    namespaces?: Map<string, NamespaceContainer>;
+    namespaceStatements?: NamespaceStatement[];
     statements?: Statement[];
     classStatements?: Record<string, ClassStatement>;
     functionStatements?: Record<string, FunctionStatement>;
     enumStatements?: Map<string, EnumStatement>;
     constStatements?: Map<string, ConstStatement>;
     symbolTable?: SymbolTable;
-}
-
-interface AugmentedNewExpression extends NewExpression {
-    file: BscFile;
+    //fields used by per-file namespace lookups; optional so scope-level callers don't have to populate them
+    fullNameLower?: string;
+    parentNameLower?: string;
+    nameParts?: Identifier[];
+    lastPartNameLower?: string;
+    isTopLevel?: boolean;
 }
 
diff --git a/src/ScopeNamespaceLookup.ts b/src/ScopeNamespaceLookup.ts
index 8de6d936d..cad61ab79 100644
--- a/src/ScopeNamespaceLookup.ts
+++ b/src/ScopeNamespaceLookup.ts
@@ -204,6 +204,7 @@ export class ScopeNamespaceLookup extends Map<string, NamespaceContainer> {
             nameRange: contribution.nameRange,
             lastPartName: contribution.lastPartName,
             namespaces: this.buildScopedChildren(nameLower),
+            namespaceStatements: contribution.namespaceStatements,
             statements: contribution.statements,
             classStatements: contribution.classStatements,
             functionStatements: contribution.functionStatements,
@@ -234,6 +235,7 @@ export class ScopeNamespaceLookup extends Map<string, NamespaceContainer> {
             nameRange: aggregate.nameRange,
             lastPartName: aggregate.lastPartName,
             namespaces: this.buildScopedChildren(nameLower),
+            namespaceStatements: aggregate.namespaceStatements,
             statements: aggregate.statements,
             classStatements: aggregate.classStatements,
             functionStatements: aggregate.functionStatements,
diff --git a/src/SemanticTokenUtils.spec.ts b/src/SemanticTokenUtils.spec.ts
index 6506fc163..0cd510c3b 100644
--- a/src/SemanticTokenUtils.spec.ts
+++ b/src/SemanticTokenUtils.spec.ts
@@ -6,6 +6,21 @@ import util from './util';
 
 describe('SemanticTokenUtils', () => {
     describe('encodeSemanticTokens', () => {
+        it('eliminates items with no range', () => {
+            expectEncodeEquals(
+                encodeSemanticTokens([{
+                    range: util.createRange(1, 0, 1, 2),
+                    tokenType: SemanticTokenTypes.class
+                }, {
+                    range: undefined,
+                    tokenType: SemanticTokenTypes.parameter
+                }]),
+                [
+                    1, 0, 2, semanticTokensLegend.tokenTypes.indexOf(SemanticTokenTypes.class), 0
+                ]
+            );
+        });
+
         it('encodes single entry at start of line', () => {
             expectEncodeEquals(
                 encodeSemanticTokens([{
@@ -57,6 +72,14 @@ describe('SemanticTokenUtils', () => {
                 SemanticTokenModifiers.documentation //idx=8
             ])).to.eql(0b100001001);
         });
+
+        it('properly handles deprecated and another', () => {
+            expect(getModifierBitFlags([
+                SemanticTokenModifiers.declaration, //idx=0
+                SemanticTokenModifiers.static, //idx=3
+                SemanticTokenModifiers.documentation //idx=8
+            ])).to.eql(0b100001001);
+        });
     });
 });
 
diff --git a/src/SemanticTokenUtils.ts b/src/SemanticTokenUtils.ts
index 16d92256e..0927b838e 100644
--- a/src/SemanticTokenUtils.ts
+++ b/src/SemanticTokenUtils.ts
@@ -59,6 +59,10 @@ export function encodeSemanticTokens(tokens: SemanticToken[]) {
     util.sortByRange(tokens);
     const builder = new SemanticTokensBuilder();
     for (const token of tokens ?? []) {
+        //skip tokens that have no range
+        if (!token?.range) {
+            continue;
+        }
         builder.push(
             token.range.start.line,
             token.range.start.character,
diff --git a/src/Stopwatch.ts b/src/Stopwatch.ts
index 2866e9a2e..41fe27f25 100644
--- a/src/Stopwatch.ts
+++ b/src/Stopwatch.ts
@@ -31,4 +31,13 @@ export class Stopwatch {
             return `${parts.milliseconds}.${fractionalMilliseconds}ms`;
         }
     }
+
+    getDurationTextFor<T>(func: () => T): { durationText: string; result: T } {
+        this.reset();
+        this.start();
+        const result = func();
+        this.stop();
+        return { durationText: this.getDurationText(), result: result };
+    }
 }
+
diff --git a/src/SymbolTable.spec.ts b/src/SymbolTable.spec.ts
index 5f207183c..66b70cbcf 100644
--- a/src/SymbolTable.spec.ts
+++ b/src/SymbolTable.spec.ts
@@ -1,8 +1,16 @@
+/* eslint-disable no-bitwise */
 import { SymbolTable } from './SymbolTable';
 import { expect } from './chai-config.spec';
 import { StringType } from './types/StringType';
 import { IntegerType } from './types/IntegerType';
 import { BooleanType } from './types/BooleanType';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import { expectTypeToBe } from './testHelpers.spec';
+import { NamespaceType } from './types/NamespaceType';
+import { TypedFunctionType } from './types/TypedFunctionType';
+import { DynamicType, FloatType, UninitializedType, UnionType } from './types';
+import type { AstNode } from './parser/AstNode';
+
 
 describe('SymbolTable', () => {
     let parent: SymbolTable;
@@ -13,105 +21,649 @@ describe('SymbolTable', () => {
 
     it('is case insensitive', () => {
         const st = new SymbolTable('Child');
-        st.addSymbol('foo', null as any, new StringType());
-        expect(st.getSymbol('FOO')!.length).eq(1);
-        expect(st.getSymbol('FOO')![0].type.toString()).eq('string');
+        st.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
+        expect(st.getSymbol('FOO', SymbolTypeFlag.runtime)[0].type.toString()).eq('string');
+        expect(st.getSymbol('FOO', SymbolTypeFlag.runtime)[0].type.toString()).eq('string');
     });
 
     it('stores all previous symbols', () => {
         const st = new SymbolTable('Child');
-        st.addSymbol('foo', null as any, new StringType());
-        st.addSymbol('foo', null as any, new IntegerType());
-        expect(st.getSymbol('FOO')!.length).eq(2);
+        st.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
+        st.addSymbol('foo', null, new IntegerType(), SymbolTypeFlag.runtime);
+        expect(st.getSymbol('FOO', SymbolTypeFlag.runtime).length).eq(2);
     });
 
+    it('can remove symbols', () => {
+        const st = new SymbolTable('Table');
+        st.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
+        expectTypeToBe(st.getSymbolType('foo', { flags: SymbolTypeFlag.runtime }), StringType);
+        st.removeSymbol('foo');
+        expect(st.getSymbol('foo', SymbolTypeFlag.runtime)).to.be.undefined;
+    });
 
     it('reads from parent symbol table if not found in current', () => {
         const st = new SymbolTable('Child', () => parent);
-        parent.addSymbol('foo', null as any, new StringType());
-        expect(st.getSymbol('foo')![0].type.toString()).eq('string');
+        parent.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
+        expect(st.getSymbol('foo', SymbolTypeFlag.runtime)[0].type.toString()).eq('string');
     });
 
     it('reads from current table if it exists', () => {
         const st = new SymbolTable('Child', () => parent);
-        parent.addSymbol('foo', null as any, new StringType());
-        st.addSymbol('foo', null as any, new IntegerType());
-        expect(st.getSymbol('foo')![0].type.toString()).eq('integer');
+        parent.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
+        st.addSymbol('foo', null, new IntegerType(), SymbolTypeFlag.runtime);
+        expect(st.getSymbol('foo', SymbolTypeFlag.runtime)[0].type.toString()).eq('integer');
     });
 
     it('correct checks if a symbol is in the table using hasSymbol', () => {
         const child = new SymbolTable('Child', () => parent);
-        parent.addSymbol('foo', null as any, new StringType());
-        child.addSymbol('bar', null as any, new IntegerType());
-        expect(parent.hasSymbol('foo')).to.be.true;
-        expect(parent.hasSymbol('bar')).to.be.false;
-        expect(child.hasSymbol('foo')).to.be.true;
-        expect(child.hasSymbol('bar')).to.be.true;
-        expect(child.hasSymbol('buz')).to.be.false;
+        parent.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
+        child.addSymbol('bar', null, new IntegerType(), SymbolTypeFlag.runtime);
+        expect(parent.hasSymbol('foo', SymbolTypeFlag.runtime)).to.be.true;
+        expect(parent.hasSymbol('bar', SymbolTypeFlag.runtime)).to.be.false;
+        expect(child.hasSymbol('foo', SymbolTypeFlag.runtime)).to.be.true;
+        expect(child.hasSymbol('bar', SymbolTypeFlag.runtime)).to.be.true;
+        expect(child.hasSymbol('buz', SymbolTypeFlag.runtime)).to.be.false;
+    });
+
+    it('matches bitflags given', () => {
+        const table = new SymbolTable('Child', () => parent);
+        table.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
+        table.addSymbol('bar', null, new IntegerType(), SymbolTypeFlag.typetime);
+        expect(table.hasSymbol('foo', SymbolTypeFlag.runtime)).to.be.true;
+        expect(table.hasSymbol('bar', SymbolTypeFlag.runtime)).to.be.false;
+        expect(table.hasSymbol('foo', SymbolTypeFlag.typetime)).to.be.false;
+        expect(table.hasSymbol('bar', SymbolTypeFlag.typetime)).to.be.true;
     });
 
     describe('mergeSymbolTable', () => {
 
         it('adds each symbol to the table', () => {
             const st = new SymbolTable('Child');
-            st.addSymbol('foo', null as any, new StringType());
+            st.addSymbol('foo', null, new StringType(), SymbolTypeFlag.runtime);
             const otherTable = new SymbolTable('OtherTable');
-            otherTable.addSymbol('bar', null as any, new IntegerType());
-            otherTable.addSymbol('foo', null as any, new IntegerType());
+            otherTable.addSymbol('bar', null, new IntegerType(), SymbolTypeFlag.runtime);
+            otherTable.addSymbol('foo', null, new IntegerType(), SymbolTypeFlag.runtime);
             st.mergeSymbolTable(otherTable);
         });
 
         it('shares symbol object references with the source rather than cloning', () => {
             const source = new SymbolTable('Source');
-            source.addSymbol('foo', null as any, new StringType());
+            source.addSymbol('foo', null as any, new StringType(), SymbolTypeFlag.runtime);
             const destination = new SymbolTable('Destination');
             destination.mergeSymbolTable(source);
 
-            expect(destination.getSymbol('foo')![0]).to.equal(source.getSymbol('foo')![0]);
+            expect(destination.getSymbol('foo', SymbolTypeFlag.runtime)![0]).to.equal(source.getSymbol('foo', SymbolTypeFlag.runtime)![0]);
         });
 
         it('keeps destination isolated from later mutations to source', () => {
             const source = new SymbolTable('Source');
-            source.addSymbol('foo', null as any, new StringType());
+            source.addSymbol('foo', null as any, new StringType(), SymbolTypeFlag.runtime);
             const destination = new SymbolTable('Destination');
             destination.mergeSymbolTable(source);
 
             //adding to source after the merge must not leak into destination
-            source.addSymbol('foo', null as any, new IntegerType());
+            source.addSymbol('foo', null as any, new IntegerType(), SymbolTypeFlag.runtime);
 
-            expect(destination.getSymbol('foo')!.length).to.eq(1);
-            expect(destination.getSymbol('foo')![0].type.toString()).to.eq('string');
+            expect(destination.getSymbol('foo', SymbolTypeFlag.runtime)!.length).to.eq(1);
+            expect(destination.getSymbol('foo', SymbolTypeFlag.runtime)![0].type.toString()).to.eq('string');
         });
 
         it('accumulates symbols when merging multiple sources sharing a key', () => {
             const sourceA = new SymbolTable('SourceA');
-            sourceA.addSymbol('foo', null as any, new StringType());
+            sourceA.addSymbol('foo', null as any, new StringType(), SymbolTypeFlag.runtime);
             const sourceB = new SymbolTable('SourceB');
-            sourceB.addSymbol('foo', null as any, new IntegerType());
+            sourceB.addSymbol('foo', null as any, new IntegerType(), SymbolTypeFlag.runtime);
 
             const destination = new SymbolTable('Destination');
             destination.mergeSymbolTable(sourceA);
             destination.mergeSymbolTable(sourceB);
 
             expect(
-                destination.getSymbol('foo')!.map(symbol => symbol.type.toString())
+                destination.getSymbol('foo', SymbolTypeFlag.runtime)!.map(symbol => symbol.type.toString())
             ).to.eql(['string', 'integer']);
         });
     });
 
     it('searches siblings before parents', () => {
-        parent.addSymbol('alpha', null as any, new StringType());
+        parent.addSymbol('alpha', null, new StringType(), SymbolTypeFlag.runtime);
 
         const child = new SymbolTable('Child', () => parent);
 
         const sibling = new SymbolTable('Sibling');
         child.addSibling(sibling);
-        sibling.addSymbol('alpha', null as any, new BooleanType());
+        sibling.addSymbol('alpha', null, new BooleanType(), SymbolTypeFlag.runtime);
 
         expect(
-            child.getSymbol('alpha')!.map(x => x.type.toTypeString())
+            child.getSymbol('alpha', SymbolTypeFlag.runtime).map(x => x.type.toTypeString())
         ).to.eql([
             'boolean'
         ]);
     });
+
+    it('can check if something is an instance', () => {
+        const table = new SymbolTable('Table');
+
+        table.addSymbol('test', { isInstance: true }, DynamicType.instance, SymbolTypeFlag.runtime);
+
+        expect(table.isSymbolTypeInstance('test')).to.true;
+    });
+
+
+    describe('mergeNamespaceSymbolTables', () => {
+
+        it('merges namespace types', () => {
+            const table1 = new SymbolTable('Table1');
+            const table2 = new SymbolTable('Table2');
+
+            const nsFlag = SymbolTypeFlag.runtime | SymbolTypeFlag.typetime;
+            const alpha1 = new NamespaceType('alpha');
+            const beta1 = new NamespaceType('beta');
+            alpha1.addMember('beta', {}, beta1, nsFlag); // alpha.beta
+            const someFunc = new TypedFunctionType(IntegerType.instance);
+
+            alpha1.addMember('someFunc', {}, someFunc, SymbolTypeFlag.runtime); // alpha.someFunc
+            beta1.addMember('ABC', {}, StringType.instance, SymbolTypeFlag.runtime); //alpha.beta.ABC
+
+            const alpha2 = new NamespaceType('alpha');
+            const beta2 = new NamespaceType('beta');
+            alpha2.addMember('beta', {}, beta2, nsFlag); //alpha.beta
+            beta2.addMember('DEF', {}, StringType.instance, SymbolTypeFlag.runtime); //alpha.beta.DEF
+            const charlie2 = new NamespaceType('charlie');
+            beta2.addMember('charlie', {}, charlie2, SymbolTypeFlag.runtime); //alpha.beta.charlie
+            charlie2.addMember('XYZ', {}, IntegerType.instance, SymbolTypeFlag.runtime); //alpha.beta.charlie.XYZ
+
+            table1.addSymbol('alpha', {}, alpha1, nsFlag);
+            table2.addSymbol('alpha', {}, alpha2, nsFlag);
+
+            const mergedTable = new SymbolTable('Merged');
+
+            mergedTable.mergeNamespaceSymbolTables(table1);
+            mergedTable.mergeNamespaceSymbolTables(table2);
+
+            const alphaType = mergedTable.getSymbolType('alpha', { flags: nsFlag });
+            expectTypeToBe(alphaType, NamespaceType);
+            expectTypeToBe(alphaType.getMemberType('someFunc', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+            const betaType = alphaType.getMemberType('beta', { flags: nsFlag });
+            expectTypeToBe(betaType, NamespaceType);
+            expectTypeToBe(betaType.getMemberType('ABC', { flags: SymbolTypeFlag.runtime }), StringType);
+            expectTypeToBe(betaType.getMemberType('DEF', { flags: SymbolTypeFlag.runtime }), StringType);
+            const charlieType = betaType.getMemberType('charlie', { flags: nsFlag });
+
+            expectTypeToBe(charlieType, NamespaceType);
+            expectTypeToBe(charlieType.getMemberType('XYZ', { flags: SymbolTypeFlag.runtime }), IntegerType);
+
+        });
+
+        it('merges sibling tables', () => {
+            const table1 = new SymbolTable('Table1');
+
+            const nsFlag = SymbolTypeFlag.runtime | SymbolTypeFlag.typetime;
+            const alpha1 = new NamespaceType('alpha');
+
+            const someFunc = new TypedFunctionType(IntegerType.instance);
+
+            const beta1 = new NamespaceType('beta');
+            const alphaSibling = new SymbolTable('AlphaSibling');
+            alphaSibling.addSymbol('beta', {}, beta1, nsFlag);
+            alpha1.memberTable.addSibling(alphaSibling);
+            const alphaSibling2 = new SymbolTable('AlphaSibling2');
+            alphaSibling2.addSymbol('someFunc', {}, someFunc, SymbolTypeFlag.runtime);// alpha.someFunc
+            alpha1.memberTable.addSibling(alphaSibling2);
+
+
+            const betaSibling = new SymbolTable('BetaSibling');
+            betaSibling.addSymbol('ABC', {}, StringType.instance, SymbolTypeFlag.runtime); //alpha.beta.ABC
+            beta1.memberTable.addSibling(betaSibling);
+
+            const table2 = new SymbolTable('Table2');
+
+            const alpha2Sibling = new SymbolTable('Alpha2Sibling');
+            const alpha2 = new NamespaceType('alpha');
+            const beta2 = new NamespaceType('beta');
+            alpha2Sibling.addSymbol('beta', {}, beta2, nsFlag); //alpha.beta
+            alpha2.memberTable.addSibling(alpha2Sibling);
+
+            const beta2Sibling = new SymbolTable('Beta2Sibling');
+            beta2Sibling.addSymbol('DEF', {}, StringType.instance, SymbolTypeFlag.runtime); //alpha.beta.DEF
+            beta2.memberTable.addSibling(beta2Sibling);
+
+            const charlie2 = new NamespaceType('charlie');
+            beta2.addMember('charlie', {}, charlie2, SymbolTypeFlag.runtime); //alpha.beta.charlie
+            charlie2.addMember('XYZ', {}, IntegerType.instance, SymbolTypeFlag.runtime); //alpha.beta.charlie.XYZ
+
+            table1.addSymbol('alpha', {}, alpha1, nsFlag);
+            table2.addSymbol('alpha', {}, alpha2, nsFlag);
+
+            const mergedTable = new SymbolTable('Merged');
+
+            mergedTable.mergeNamespaceSymbolTables(table1);
+            mergedTable.mergeNamespaceSymbolTables(table2);
+
+            const alphaType = mergedTable.getSymbolType('alpha', { flags: nsFlag });
+            expectTypeToBe(alphaType, NamespaceType);
+            expectTypeToBe(alphaType.getMemberType('someFunc', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+            const betaType = alphaType.getMemberType('beta', { flags: nsFlag });
+            expectTypeToBe(betaType, NamespaceType);
+            expectTypeToBe(betaType.getMemberType('ABC', { flags: SymbolTypeFlag.runtime }), StringType);
+            expectTypeToBe(betaType.getMemberType('DEF', { flags: SymbolTypeFlag.runtime }), StringType);
+            const charlieType = betaType.getMemberType('charlie', { flags: nsFlag });
+
+            expectTypeToBe(charlieType, NamespaceType);
+            expectTypeToBe(charlieType.getMemberType('XYZ', { flags: SymbolTypeFlag.runtime }), IntegerType);
+        });
+
+    });
+
+    describe('statementIndex and pocketTables', () => {
+
+        function mockNodeWithIndex(index: number): AstNode {
+            const fakeNode = { statementIndex: index } as AstNode;
+            return fakeNode;
+        }
+
+        it('uses only the preceding assignment type', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, StringType.instance, SymbolTypeFlag.runtime);
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(3) }, FloatType.instance, SymbolTypeFlag.runtime);
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(5) }, DynamicType.instance, SymbolTypeFlag.runtime);
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(7) }, BooleanType.instance, SymbolTypeFlag.runtime);
+            let result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 2 });//last assignment is index 1, string
+            expectTypeToBe(result, StringType);
+            result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 4 });//last assignment is index 3, float
+            expectTypeToBe(result, FloatType);
+            result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 6 }); //last assignment is index 5, dynamic
+            expectTypeToBe(result, DynamicType);
+            result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 8 }); //last assignment is index 7, boolean
+            expectTypeToBe(result, BooleanType);
+        });
+
+        it('order of types added to table doesnt matter - it still finds the correct index', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(7) }, BooleanType.instance, SymbolTypeFlag.runtime);
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(3) }, FloatType.instance, SymbolTypeFlag.runtime);
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(5) }, DynamicType.instance, SymbolTypeFlag.runtime);
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, StringType.instance, SymbolTypeFlag.runtime);
+            let result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 2 });//last assignment is index 1, string
+            expectTypeToBe(result, StringType);
+            result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 4 });//last assignment is index 3, float
+            expectTypeToBe(result, FloatType);
+            result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 6 }); //last assignment is index 5, dynamic
+            expectTypeToBe(result, DynamicType);
+            result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 8 }); //last assignment is index 7, boolean
+            expectTypeToBe(result, BooleanType);
+        });
+
+        it('adds pocket tables', () => {
+            const st = new SymbolTable('test');
+            expect(st['pocketTables'].length).to.eq(0);
+            const pt1 = new SymbolTable('pt1', () => st);
+            st.addPocketTable({ index: 1, table: pt1 });
+            expect(st['pocketTables'].length).to.eq(1);
+        });
+
+        it('searches pocket tables for a symbol', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, StringType.instance, SymbolTypeFlag.runtime);
+            const pt1 = new SymbolTable('pocket1', () => st);
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, StringType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 2, table: pt1 });
+            let result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 3 });
+            expectTypeToBe(result, StringType);
+        });
+
+        it('does not search pocket tables before the preceding assignment for a symbol', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(3) }, StringType.instance, SymbolTypeFlag.runtime);
+            const pt1 = new SymbolTable('pocket1');
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, IntegerType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 1, table: pt1 });
+            let result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 5 });
+            expectTypeToBe(result, StringType); // the pocket table is before the assignment, so it is not an integer
+        });
+
+        it('includes pocket tables results as a union type', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, StringType.instance, SymbolTypeFlag.runtime);
+            const pt1 = new SymbolTable('pocket1', () => st);
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, IntegerType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 2, table: pt1 });
+            const pt2 = new SymbolTable('pocket2', () => st);
+            pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, BooleanType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 3, table: pt2 });
+            let result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 8 });
+            expectTypeToBe(result, UnionType);
+            expect((result as UnionType).types.length).to.eq(3);
+            expect((result as UnionType).types).include(StringType.instance);
+            expect((result as UnionType).types).include(BooleanType.instance);
+            expect((result as UnionType).types).include(IntegerType.instance);
+        });
+
+        it('includes only last pocket tables results', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, StringType.instance, SymbolTypeFlag.runtime);
+            const pt1 = new SymbolTable('pocket1', () => st);
+            pt1.isOrdered = true;
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, IntegerType.instance, SymbolTypeFlag.runtime); // ignored
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(2) }, StringType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 2, table: pt1 });
+            const pt2 = new SymbolTable('pocket2', () => st);
+            pt2.isOrdered = true;
+            pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, BooleanType.instance, SymbolTypeFlag.runtime); // ignored
+            pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(2) }, FloatType.instance, SymbolTypeFlag.runtime); // ignored
+            pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(3) }, DynamicType.instance, SymbolTypeFlag.runtime); // ignored
+            pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(4) }, StringType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 3, table: pt2 });
+            let result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 8 });
+            expectTypeToBe(result, StringType);
+        });
+
+        it('type in a pocket table takes into account only preceding assignments in the parent table', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(1) }, FloatType.instance, SymbolTypeFlag.runtime);
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(2) }, StringType.instance, SymbolTypeFlag.runtime);
+            const pt1 = new SymbolTable('pocket1', () => st);
+            pt1.isOrdered = true;
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(2) }, DynamicType.instance, SymbolTypeFlag.runtime);
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(4) }, IntegerType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 3, table: pt1 });
+            st.addSymbol('someVar', { definingNode: mockNodeWithIndex(4) }, BooleanType.instance, SymbolTypeFlag.runtime);
+
+            // type as it enters the pocket table
+            let result = pt1.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 0 });
+            expectTypeToBe(result, StringType);
+
+            // type after first assignment in the the pocket table
+            result = pt1.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 3 });
+            expectTypeToBe(result, DynamicType);
+
+            // type after second assignment in the the pocket table
+            result = pt1.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 5 });
+            expectTypeToBe(result, IntegerType);
+
+            // type in main table after the pocket table - union of before pocket table and end of pocket table
+            result = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 4 });
+            expectTypeToBe(result, UnionType);
+            expect((result as UnionType).types.length).to.eq(2);
+            expect((result as UnionType).types).include(StringType.instance);
+            expect((result as UnionType).types).include(IntegerType.instance);
+        });
+
+        it('handles when a symbol is potentially uninitialized', () => {
+            const st = new SymbolTable('test');
+            st.isOrdered = true;
+            const pt1 = new SymbolTable('pocket1', () => st);
+            pt1.isOrdered = true;
+            pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+            st.addPocketTable({ index: 0, table: pt1 });
+
+            const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 3 });
+            expectTypeToBe(typeAfterPockets, UnionType);
+            expect((typeAfterPockets as UnionType).types.length).to.eq(2);
+            expect((typeAfterPockets as UnionType).types).include(UninitializedType.instance);
+            expect((typeAfterPockets as UnionType).types).include(IntegerType.instance);
+        });
+
+        describe('complement tables', () => {
+
+            it('add  uninitialized type as a possibility if a symbol is defined in 2 pocket tables that do not complement', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 0, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+
+                st.addPocketTable({ index: 1, table: pt2 });
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 3 }) as UnionType;
+                expectTypeToBe(typeAfterPockets, UnionType);
+                expect(typeAfterPockets.types.length).to.eq(2);
+                expect(typeAfterPockets.types).to.include(UninitializedType.instance);
+                expect(typeAfterPockets.types).to.include(IntegerType.instance);
+            });
+
+            it('handles when a symbol is defined in both complement tables and main table', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                st.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, StringType.instance, SymbolTypeFlag.runtime);
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                pt2.complementOtherTable(pt1);
+
+                st.addPocketTable({ index: 2, table: pt2 });
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 3 });
+                expectTypeToBe(typeAfterPockets, IntegerType); // no string type!
+            });
+
+            it('handles when a symbol is defined in both complement tables and previous pocket tables', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                st.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, StringType.instance, SymbolTypeFlag.runtime);
+                const pt0 = new SymbolTable('pocket0', () => st);
+                pt0.isOrdered = true;
+                pt0.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, BooleanType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt0 });
+
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                pt2.complementOtherTable(pt1);
+
+                st.addPocketTable({ index: 2, table: pt2 });
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 3 });
+                expectTypeToBe(typeAfterPockets, IntegerType); // no string type!
+            });
+
+
+            it('handles when a symbol is defined in both complement tables and subsequent pocket tables', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                st.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, StringType.instance, SymbolTypeFlag.runtime);
+
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                pt2.complementOtherTable(pt1);
+
+                st.addPocketTable({ index: 2, table: pt2 });
+
+                const pt3 = new SymbolTable('pocket0', () => st);
+                pt3.isOrdered = true;
+                pt3.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, BooleanType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 3, table: pt3 });
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 4 }) as UnionType;
+                expectTypeToBe(typeAfterPockets, UnionType); // no string type!
+                expect(typeAfterPockets.types).to.include(IntegerType.instance); // type from complement pockets
+                expect(typeAfterPockets.types).to.include(BooleanType.instance); // type from subsequent pocket
+            });
+
+            it('handles when a symbol is defined in both complement tables and not main table', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                pt2.complementOtherTable(pt1);
+
+                st.addPocketTable({ index: 2, table: pt2 });
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 3 });
+                expectTypeToBe(typeAfterPockets, IntegerType); // no string type!
+            });
+
+            it('handles when a symbol is defined in one complement tables', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                st.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, StringType.instance, SymbolTypeFlag.runtime);
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('notSomeVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                pt2.complementOtherTable(pt1);
+
+                st.addPocketTable({ index: 2, table: pt2 });
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 4 }) as UnionType;
+                expectTypeToBe(typeAfterPockets, UnionType);
+                expect(typeAfterPockets.types.length).to.eq(2);
+                expect(typeAfterPockets.types).to.include(StringType.instance); // type from before pockets
+                expect(typeAfterPockets.types).to.include(IntegerType.instance); // type from 2nd pocket
+            });
+
+            it('handles when a symbol is defined in one complement tables, and not in main table', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('notSomeVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                pt2.complementOtherTable(pt1);
+
+                st.addPocketTable({ index: 2, table: pt2 });
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 4 }) as UnionType;
+                expectTypeToBe(typeAfterPockets, UnionType);
+                expect(typeAfterPockets.types.length).to.eq(2);
+                expect(typeAfterPockets.types).to.include(UninitializedType.instance); // type from before pockets
+                expect(typeAfterPockets.types).to.include(IntegerType.instance); // type from 2nd pocket
+            });
+
+
+            it('handles multiple tables to complement', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 2, table: pt2 });
+                const pt3 = new SymbolTable('pocket3', () => st);
+                pt3.isOrdered = true;
+                pt3.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 3, table: pt3 });
+                const pt4 = new SymbolTable('pocket4', () => st);
+                pt4.isOrdered = true;
+                pt4.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 4, table: pt4 });
+
+                pt4.complementOtherTable(pt1);
+                pt4.complementOtherTable(pt2);
+                pt4.complementOtherTable(pt3);
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 5 });
+                expectTypeToBe(typeAfterPockets, IntegerType);
+            });
+
+            it('handles multiple tables to complement, when one doesnt have the symbol', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('NOTsomeVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 2, table: pt2 });
+                const pt3 = new SymbolTable('pocket3', () => st);
+                pt3.isOrdered = true;
+                pt3.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 3, table: pt3 });
+                const pt4 = new SymbolTable('pocket4', () => st);
+                pt4.isOrdered = true;
+                pt4.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 4, table: pt4 });
+
+                pt4.complementOtherTable(pt1);
+                pt4.complementOtherTable(pt2);
+                pt4.complementOtherTable(pt3);
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 5 }) as UnionType;
+                expectTypeToBe(typeAfterPockets, UnionType);
+                expect(typeAfterPockets.types.length).to.eq(2);
+                expect(typeAfterPockets.types).to.include(UninitializedType.instance); // type from before pockets
+                expect(typeAfterPockets.types).to.include(IntegerType.instance); // type from some pockets
+            });
+
+            it('handles multiple tables to complement, followed by an independent pocket table', () => {
+                const st = new SymbolTable('test');
+                st.isOrdered = true;
+                const pt1 = new SymbolTable('pocket1', () => st);
+                pt1.isOrdered = true;
+                pt1.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 1, table: pt1 });
+                const pt2 = new SymbolTable('pocket2', () => st);
+                pt2.isOrdered = true;
+                pt2.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 2, table: pt2 });
+                const pt3 = new SymbolTable('pocket3', () => st);
+                pt3.isOrdered = true;
+                pt3.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 3, table: pt3 });
+                const pt4 = new SymbolTable('pocket4', () => st);
+                pt4.isOrdered = true;
+                pt4.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, IntegerType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 4, table: pt4 });
+
+                const pt5 = new SymbolTable('pocket5', () => st);
+                pt5.isOrdered = true;
+                pt5.addSymbol('someVar', { definingNode: mockNodeWithIndex(0) }, StringType.instance, SymbolTypeFlag.runtime);
+                st.addPocketTable({ index: 4, table: pt5 });
+
+
+                pt4.complementOtherTable(pt1);
+                pt4.complementOtherTable(pt2);
+                pt4.complementOtherTable(pt3);
+                // pt5 is not associated with this complement business!
+
+                const typeAfterPockets = st.getSymbolType('someVar', { flags: SymbolTypeFlag.runtime, statementIndex: 5 }) as UnionType;
+                expectTypeToBe(typeAfterPockets, UnionType);
+                expect(typeAfterPockets.types.length).to.eq(2);
+                expect(typeAfterPockets.types).to.include(IntegerType.instance); // type from complementary pockets
+                expect(typeAfterPockets.types).to.include(StringType.instance); // type from pt5
+            });
+
+        });
+    });
+
+
 });
diff --git a/src/SymbolTable.ts b/src/SymbolTable.ts
index 874e1c3b0..5853e0edb 100644
--- a/src/SymbolTable.ts
+++ b/src/SymbolTable.ts
@@ -1,15 +1,23 @@
-import type { Range } from 'vscode-languageserver';
 import type { BscType } from './types/BscType';
+import type { ExtraSymbolData, GetTypeOptions } from './interfaces';
+import { CacheVerifier } from './CacheVerifier';
+import type { ReferenceType } from './types/ReferenceType';
+import type { UnionType } from './types/UnionType';
+import { getUniqueType } from './types/helpers';
+import { isAnyReferenceType, isNamespaceType, isReferenceType } from './astUtils/reflection';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { UninitializedType } from './types/UninitializedType';
 
 /**
  * Stores the types associated with variables and functions in the Brighterscript code
  * Can be part of a hierarchy, so lookups can reference parent scopes
  */
-export class SymbolTable {
+export class SymbolTable implements SymbolTypeGetter {
     constructor(
         public name: string,
         parentProvider?: SymbolTableProvider
     ) {
+        this.resetTypeCache();
         if (parentProvider) {
             this.pushParentProvider(parentProvider);
         }
@@ -23,17 +31,38 @@ export class SymbolTable {
 
     private parentProviders = [] as SymbolTableProvider[];
 
+    private cacheToken: string;
+
+    private typeCache: Array<Map<string, TypeCacheEntry>>;
+
+    /**
+     * Used to invalidate the cache for all symbol tables.
+     *
+     * This is not the most optimized solution as cache will be shared across all instances of SymbolTable across all programs,
+     * but this is the easiest way to handle nested/linked symbol table cache management so we can optimize this in the future some time...
+     */
+    static cacheVerifier = new CacheVerifier();
+
+    static referenceTypeFactory: (memberKey: string, fullName, flags: SymbolTypeFlag, tableProvider: SymbolTypeGetterProvider) => ReferenceType;
+    static unionTypeFactory: (types: BscType[]) => UnionType;
+    static uninitializedTypeFactory: () => UninitializedType;
+
     /**
      * Push a function that will provide a parent SymbolTable when requested
      */
     public pushParentProvider(provider: SymbolTableProvider) {
+        this.cachedCircularReferenceCheck = null;
         this.parentProviders.push(provider);
+        return () => {
+            this.popParentProvider();
+        };
     }
 
     /**
      * Pop the current parentProvider
      */
     public popParentProvider() {
+        this.cachedCircularReferenceCheck = null;
         this.parentProviders.pop();
     }
 
@@ -51,6 +80,9 @@ export class SymbolTable {
      */
     public addSibling(sibling: SymbolTable) {
         this.siblings.add(sibling);
+        return () => {
+            this.siblings.delete(sibling);
+        };
     }
 
     /**
@@ -60,16 +92,104 @@ export class SymbolTable {
         this.siblings.delete(sibling);
     }
 
+    /**
+     * Does the order of symbols in this symbol table matter?
+     * Normally, this would only be for symbol tables referencing symbols declared within a function
+     */
+    public isOrdered = false;
+
+    public pocketTables = new Array<PocketTable>();
+
+    public addPocketTable(pocketTable: PocketTable) {
+        pocketTable.table.isPocketTable = true;
+        this.pocketTables.push(pocketTable);
+        return () => {
+            const index = this.pocketTables.findIndex(pt => pt === pocketTable);
+            if (index >= 0) {
+                this.pocketTables.splice(index, 1);
+            }
+        };
+    }
+
+    private isPocketTable = false;
+
+    private getCurrentPocketTableDepth() {
+        let depth = 0;
+        let currentTable: SymbolTable = this;
+        while (currentTable.isPocketTable) {
+            depth++;
+            currentTable = currentTable.parent;
+        }
+        return depth;
+    }
+
+    public getStatementIndexOfPocketTable(symbolTable: SymbolTable) {
+        return this.pocketTables.find(pt => pt.table === symbolTable)?.index ?? -1;
+    }
+
+    private complementsTables = new Set<SymbolTable>();
+
+    /**
+     * This table complements this other table
+     * Eg. This is an else branch, it complements a then branch
+     */
+    public complementOtherTable(otherTable: SymbolTable) {
+        this.complementsTables.add(otherTable);
+    }
+
+    public clearSymbols() {
+        this.symbolMap.clear();
+    }
+
     /**
      * Checks if the symbol table contains the given symbol by name
      * If the identifier is not in this table, it will check the parent
      *
      * @param name the name to lookup
-     * @param searchParent should we look to our parent if we don't have the symbol?
+     * @param bitFlags flags to match (See SymbolTypeFlags)
      * @returns true if this symbol is in the symbol table
      */
-    hasSymbol(name: string, searchParent = true): boolean {
-        return !!this.getSymbol(name, searchParent);
+    hasSymbol(name: string, bitFlags: SymbolTypeFlag): boolean {
+        let currentTable: SymbolTable = this;
+        const key = name?.toLowerCase();
+        let result: BscSymbol[];
+        do {
+            // look in our map first
+            if ((result = currentTable.symbolMap.get(key))) {
+                // eslint-disable-next-line no-bitwise
+                if (result.find(symbol => symbol.flags & bitFlags)) {
+                    return true;
+                }
+            }
+
+            //look in pocket tables
+            for (let pocket of this.pocketTables) {
+                if ((result = pocket.table.symbolMap.get(key))) {
+                    // eslint-disable-next-line no-bitwise
+                    if (result.find(symbol => symbol.flags & bitFlags)) {
+                        return true;
+                    }
+                }
+            }
+            if ((result = currentTable.symbolMap.get(key))) {
+                // eslint-disable-next-line no-bitwise
+                if (result.find(symbol => symbol.flags & bitFlags)) {
+                    return true;
+                }
+            }
+
+            //look through any sibling maps next
+            for (let sibling of currentTable.siblings) {
+                if ((result = sibling.symbolMap.get(key))) {
+                    // eslint-disable-next-line no-bitwise
+                    if (result.find(symbol => symbol.flags & bitFlags)) {
+                        return true;
+                    }
+                }
+            }
+            currentTable = currentTable.parent;
+        } while (currentTable);
+        return false;
     }
 
     /**
@@ -77,41 +197,268 @@ export class SymbolTable {
      * If the identifier is not in this table, it will check the parent
      *
      * @param  name the name to lookup
-     * @param searchParent should we look to our parent if we don't have the symbol?
+     * @param bitFlags flags to match
      * @returns An array of BscSymbols - one for each time this symbol had a type implicitly defined
      */
-    getSymbol(name: string, searchParent = true): BscSymbol[] | undefined {
-        const key = name.toLowerCase();
-        let result: BscSymbol[] | undefined;
-        // look in our map first
-        if ((result = this.symbolMap.get(key))) {
-            return result;
+    getSymbol(name: string, bitFlags: SymbolTypeFlag, additionalOptions: GetSymbolAdditionalOptions = {}): BscSymbol[] {
+        let currentTable: SymbolTable = this;
+        let previousTable: SymbolTable;
+        const key = name?.toLowerCase();
+        let result: BscSymbol[];
+        let memberOfAncestor = false;
+        //only clone the symbol when we actually need to attach the `memberOfAncestor` flag
+        //(i.e., we walked up to a parent table). Returning the original reference for own-table
+        //hits keeps identity stable, which downstream consumers (and one symbol-table spec)
+        //rely on.
+        const addAncestorInfo = (symbol: BscSymbol) => (memberOfAncestor
+            ? { ...symbol, data: { ...symbol.data, memberOfAncestor: true } }
+            : symbol);
+        let maxStatementIndex = Number.isInteger(additionalOptions?.maxStatementIndex) ? additionalOptions.maxStatementIndex : Number.MAX_SAFE_INTEGER;
+        do {
+
+            if (previousTable) {
+                maxStatementIndex = currentTable.isOrdered ? currentTable.getStatementIndexOfPocketTable(previousTable) : Number.MAX_SAFE_INTEGER;
+            }
+
+            // look in our map first
+            let currentResults = currentTable.symbolMap.get(key);
+            if (currentResults) {
+                // eslint-disable-next-line no-bitwise
+                currentResults = currentResults.filter(symbol => symbol.flags & bitFlags)
+                    .filter(this.getSymbolLookupFilter(currentTable, maxStatementIndex, memberOfAncestor));
+            }
+
+            let precedingAssignmentIndex = -1;
+            if (currentResults?.length > 0 && currentTable.isOrdered && maxStatementIndex >= 0) {
+                this.sortSymbolsByAssignmentOrderInPlace(currentResults);
+                const lastResult = currentResults[currentResults.length - 1];
+                currentResults = [lastResult];
+                precedingAssignmentIndex = lastResult.data?.definingNode?.statementIndex ?? -1;
+            }
+
+            if (result?.length > 0) {
+                // we already have results from a deeper pocketTable
+                if (currentResults?.length > 0) {
+                    result.push(...currentResults);
+                }
+            } else if (currentResults?.length > 0) {
+                result = currentResults;
+            }
+
+            let depth = additionalOptions?.depth ?? currentTable.getCurrentPocketTableDepth();
+            const augmentationResult = currentTable.augmentSymbolResultsWithPocketTableResults(name, bitFlags, result, {
+                ...additionalOptions,
+                depth: depth,
+                maxStatementIndex: maxStatementIndex,
+                precedingAssignmentIndex: precedingAssignmentIndex
+            });
+            result = augmentationResult.symbols;
+            const needCheckParent = (!augmentationResult.exhaustive && depth > 0);
+
+            if (result?.length > 0 && !needCheckParent) {
+                result = result.map(addAncestorInfo);
+                break;
+            }
+
+            if (additionalOptions?.ignoreParentsAndSiblings) {
+                break;
+            }
+            //look through any sibling maps next
+            for (let sibling of currentTable.siblings) {
+                result = sibling.getSymbol(key, bitFlags);
+                if (result?.length > 0) {
+                    return result.map(addAncestorInfo);
+                }
+            }
+            previousTable = currentTable;
+            currentTable = currentTable.parent;
+            memberOfAncestor = true;
+        } while (currentTable);
+        return result;
+    }
+
+    private augmentSymbolResultsWithPocketTableResults(name: string, bitFlags: SymbolTypeFlag, result: BscSymbol[], additionalOptions: { precedingAssignmentIndex?: number } & GetSymbolAdditionalOptions = {}): { symbols: BscSymbol[]; exhaustive: boolean } {
+        let pocketTableResults: BscSymbol[] = [];
+        let pocketTablesWeFoundSomethingIn = this.getSymbolDataFromPocketTables(name, bitFlags, additionalOptions);
+        let pocketTablesAreExhaustive = false;
+        const depth = additionalOptions.depth ?? 0;
+        for (let i = 0; i < pocketTablesWeFoundSomethingIn.length; i++) {
+            let tableData = pocketTablesWeFoundSomethingIn[i];
+            let pocketTable = tableData.pocketTable;
+            pocketTableResults.push(...tableData.results);
+            if (pocketTable.willAlwaysBeExecuted) {
+                // remove all results before this
+                pocketTableResults = [...tableData.results];
+                pocketTablesAreExhaustive = true;
+            }
+            if (i === 0) {
+                continue;
+            }
+            if (pocketTable.table.complementsTables?.size > 0) {
+                let tableSatisfied = true;
+                let allPossibleSatisfiedResults: BscSymbol[] = [];
+                // need to check if all tables this complements are satisfied
+                for (const otherTable of pocketTable.table.complementsTables) {
+                    const foundTableData = pocketTablesWeFoundSomethingIn.find((ptd => {
+                        return otherTable === ptd.pocketTable.table;
+                    }));
+                    if (foundTableData) {
+                        allPossibleSatisfiedResults.push(...foundTableData.results);
+                    } else {
+                        tableSatisfied = false;
+                        break;
+                    }
+                }
+                if (tableSatisfied) {
+                    // remove all results before this
+                    pocketTableResults = [...allPossibleSatisfiedResults, ...tableData.results];
+                    pocketTablesAreExhaustive = true;
+                }
+            }
         }
-        //look through any sibling maps next
-        for (let sibling of this.siblings) {
-            if ((result = sibling.symbolMap.get(key))) {
-                return result;
+
+        if (pocketTablesAreExhaustive) {
+            result = pocketTableResults;
+        } else {
+            // we need to take into account the types before the pocket tables
+            if (!result) {
+                // there was no result before the pocket tables
+                if (pocketTableResults.length > 0) {
+                    if (depth === 0) {
+                        // we got pocket tables results, and this is the top recursion
+                        // add uninitialized
+                        result = [{ name: name, type: SymbolTable.uninitializedTypeFactory(), data: {}, flags: bitFlags }, ...pocketTableResults];
+                    } else {
+                        //just return pocket table results:
+                        result = pocketTableResults;
+                    }
+                } else {
+                    // result should be undefined
+                }
+            } else {
+                // just add any pocket table results....
+                result.push(...pocketTableResults);
             }
         }
-        // ask our parent for a symbol
-        if (searchParent && (result = this.parent?.getSymbol(key))) {
-            return result;
+        // Do the results cover all possible execution paths?
+        const areResultsExhaustive = pocketTablesAreExhaustive || pocketTablesWeFoundSomethingIn.length === 0;
+        return { symbols: result, exhaustive: areResultsExhaustive };
+    }
+
+    private getSymbolDataFromPocketTables(name: string, bitFlags: SymbolTypeFlag, additionalOptions: { precedingAssignmentIndex?: number } & GetSymbolAdditionalOptions = {}): Array<{ pocketTable: PocketTable; results: BscSymbol[] }> {
+        const possiblePocketTables = this.getPossiblePocketTables({ statementIndex: additionalOptions.maxStatementIndex }, additionalOptions.precedingAssignmentIndex);
+        const depth = additionalOptions.depth ?? 0;
+
+        const pocketTablesWeFoundSomethingIn = new Array<{ pocketTable: PocketTable; results: BscSymbol[] }>();
+        for (const pocketTable of possiblePocketTables) {
+            const pocketTableTypes = pocketTable.table.getSymbol(name, bitFlags, {
+                ignoreParentsAndSiblings: true,
+                maxStatementIndex: Number.MAX_SAFE_INTEGER,
+                depth: depth + 1
+            });
+            if (pocketTableTypes?.length > 0) {
+                if (pocketTable.table.isOrdered) {
+                    const lastResult = pocketTableTypes[pocketTableTypes.length - 1];
+                    pocketTablesWeFoundSomethingIn.push({ pocketTable: pocketTable, results: [lastResult] });
+                } else {
+                    pocketTablesWeFoundSomethingIn.push({ pocketTable: pocketTable, results: pocketTableTypes });
+                }
+            }
         }
+        return pocketTablesWeFoundSomethingIn;
     }
 
+
     /**
      * Adds a new symbol to the table
      */
-    addSymbol(name: string, range: Range, type: BscType) {
-        const key = name.toLowerCase();
+    addSymbol(name: string, data: ExtraSymbolData, type: BscType, bitFlags: SymbolTypeFlag) {
+        if (!name) {
+            return;
+        }
+        const key = name?.toLowerCase();
         if (!this.symbolMap.has(key)) {
             this.symbolMap.set(key, []);
         }
         this.symbolMap.get(key)?.push({
             name: name,
-            range: range,
-            type: type
+            data: data,
+            type: type,
+            flags: bitFlags
+        });
+    }
+
+    /**
+     * Removes a new symbol from the table
+     */
+    removeSymbol(name: string) {
+        const key = name.toLowerCase();
+        if (!this.symbolMap.has(key)) {
+            this.symbolMap.set(key, []);
+        }
+        this.symbolMap.delete(key);
+    }
+
+    public getSymbolTypes(name: string, options: GetSymbolTypeOptions, sortByStatementIndex = false): TypeCacheEntry[] {
+        const symbolArray = this.getSymbol(name, options.flags, {
+            ignoreParentsAndSiblings: options.ignoreParentTables,
+            maxStatementIndex: Number.isInteger(options.statementIndex) ? options.statementIndex as number : -1
         });
+        if (!symbolArray) {
+            return undefined;
+        }
+        let symbols: TypeCacheEntry[] = symbolArray?.map(symbol => ({ type: symbol.type, data: symbol.data, flags: symbol.flags }));
+
+        if (sortByStatementIndex) {
+            this.sortSymbolsByAssignmentOrderInPlace(symbols);
+        }
+        return symbols;
+    }
+
+    getSymbolType(name: string, options: GetSymbolTypeOptions): BscType {
+        const cacheEntry = options.ignoreCacheForRetrieval ? undefined : this.getCachedType(name, options);
+        let resolvedType = cacheEntry?.type;
+        let doSetCache = !resolvedType;
+        const originalIsReferenceType = isAnyReferenceType(resolvedType);
+        let data = cacheEntry?.data || {} as ExtraSymbolData;
+        let foundFlags: SymbolTypeFlag = cacheEntry?.flags;
+        if (!resolvedType || originalIsReferenceType) {
+            let symbolTypes: TypeCacheEntry[];
+            symbolTypes = this.getSymbolTypes(name, { ...options, statementIndex: options.statementIndex });
+            data = symbolTypes?.[0]?.data;
+            foundFlags = symbolTypes?.[0]?.flags;
+            resolvedType = getUniqueType(symbolTypes?.map(symbol => symbol.type), SymbolTable.unionTypeFactory);
+        }
+        if (!resolvedType && options.fullName && options.tableProvider) {
+            resolvedType = SymbolTable.referenceTypeFactory(name, options.fullName, options.flags, options.tableProvider);
+        }
+        const resolvedTypeIsReference = isAnyReferenceType(resolvedType);
+        const newNonReferenceType = originalIsReferenceType && !isAnyReferenceType(resolvedType) && resolvedType;
+        doSetCache = doSetCache && (options.onlyCacheResolvedTypes ? !resolvedTypeIsReference : true);
+        if (doSetCache || newNonReferenceType) {
+            this.setCachedType(name, { type: resolvedType, data: data, flags: foundFlags }, options);
+        }
+        options.data ??= {};
+        if (options.data) {
+            options.data.definingNode = data?.definingNode;
+            options.data.description = data?.description;
+            options.data.flags = foundFlags ?? options.flags;
+            options.data.memberOfAncestor = data?.memberOfAncestor;
+            options.data.doNotMerge = data?.doNotMerge;
+            options.data.isAlias = data?.isAlias;
+            options.data.isInstance = data?.isInstance;
+            options.data.isFromDocComment = data?.isFromDocComment;
+            options.data.isBuiltIn = data?.isBuiltIn;
+            options.data.isFromCallFunc = data?.isFromCallFunc;
+            options.data.isFromTypeStatement = data?.isFromTypeStatement;
+        }
+        return resolvedType;
+    }
+
+    isSymbolTypeInstance(name: string) {
+        const data: ExtraSymbolData = {};
+        this.getSymbolType(name, { flags: SymbolTypeFlag.runtime, data: data });
+        return data?.isInstance;
     }
 
     /**
@@ -122,13 +469,159 @@ export class SymbolTable {
      */
     mergeSymbolTable(symbolTable: SymbolTable) {
         for (const [key, sourceSymbols] of symbolTable.symbolMap) {
+            //skip symbols flagged `doNotMerge` (e.g. typecast/alias bindings) so they stay
+            //local to their declaring block instead of bleeding into sibling tables that
+            //share the same merge target (e.g. the per-namespace aggregate symbol table).
+            const symbolsToMerge = sourceSymbols.filter(symbol => !symbol.data?.doNotMerge);
+            if (symbolsToMerge.length === 0) {
+                continue;
+            }
             let destSymbols = this.symbolMap.get(key);
             if (!destSymbols) {
                 destSymbols = [];
                 this.symbolMap.set(key, destSymbols);
             }
-            destSymbols.push(...sourceSymbols);
+            destSymbols.push(...symbolsToMerge);
         }
+
+        for (let pocketTable of symbolTable.pocketTables) {
+            this.mergeSymbolTable(pocketTable.table);
+        }
+    }
+
+    mergeNamespaceSymbolTables(symbolTable: SymbolTable) {
+        const disposables = [] as Array<() => void>;
+        for (let [_name, value] of symbolTable.symbolMap) {
+            const symbol = value[0];
+            if (symbol) {
+                if (symbol.data?.doNotMerge) {
+                    continue;
+                }
+                const existingRuntimeType = this.getSymbolType(symbol.name, { flags: symbol.flags });
+
+                if (isNamespaceType(existingRuntimeType) && isNamespaceType(symbol.type)) {
+                    disposables.push(...existingRuntimeType.memberTable.mergeNamespaceSymbolTables(symbol.type.memberTable));
+                } else {
+                    this.addSymbol(
+                        symbol.name,
+                        symbol.data,
+                        symbol.type,
+                        symbol.flags
+                    );
+                    disposables.push(() => this.removeSymbol(symbol.name));
+                }
+            }
+        }
+
+        for (let siblingTable of symbolTable.siblings) {
+            disposables.push(...this.mergeNamespaceSymbolTables(siblingTable));
+        }
+        return disposables;
+    }
+
+    /**
+     * Get list of symbols declared directly in this SymbolTable (excludes parent SymbolTable).
+     */
+    public getOwnSymbols(bitFlags: SymbolTypeFlag): BscSymbol[] {
+        let symbols: BscSymbol[] = [].concat(...this.symbolMap.values());
+        // eslint-disable-next-line no-bitwise
+        symbols = symbols.filter(symbol => symbol.flags & bitFlags);
+        return symbols;
+    }
+
+
+    private cachedCircularReferenceCheck: null | boolean = null;
+
+    private hasCircularReferenceWithAncestor() {
+        if (this.cachedCircularReferenceCheck === false || this.cachedCircularReferenceCheck === true) {
+            return this.cachedCircularReferenceCheck;
+        }
+        let foundCircReference = false;
+        let p = this.parent;
+        while (!foundCircReference && p) {
+            foundCircReference = p === this;
+            p = p.parent;
+        }
+        this.cachedCircularReferenceCheck = foundCircReference;
+        return foundCircReference;
+    }
+
+    /**
+     * Get list of all symbols declared in this SymbolTable (includes parent SymbolTable).
+     */
+    public getAllSymbols(bitFlags: SymbolTypeFlag): BscSymbol[] {
+        let symbols: BscSymbol[] = [].concat(...this.symbolMap.values());
+        //look through any sibling maps next
+        for (let sibling of this.siblings) {
+            symbols = symbols.concat(sibling.getAllSymbols(bitFlags));
+        }
+
+        if (this.parent && !this.hasCircularReferenceWithAncestor()) {
+            symbols = symbols.concat(this.parent.getAllSymbols(bitFlags));
+        }
+        // eslint-disable-next-line no-bitwise
+        symbols = symbols.filter(symbol => symbol.flags & bitFlags);
+
+        //remove duplicate symbols
+        const symbolsMap = new Map<string, BscSymbol>();
+        for (const symbol of symbols) {
+            const lowerSymbolName = symbol.name.toLowerCase();
+            if (!symbolsMap.has(lowerSymbolName)) {
+                symbolsMap.set(lowerSymbolName, symbol);
+            }
+        }
+        return [...symbolsMap.values()];
+    }
+
+    private resetTypeCache() {
+        this.typeCache = [
+            undefined,
+            new Map<string, TypeCacheEntry>(), // SymbolTypeFlags.runtime
+            new Map<string, TypeCacheEntry>(), // SymbolTypeFlags.typetime
+            new Map<string, TypeCacheEntry>() // SymbolTypeFlags.runtime & SymbolTypeFlags.typetime
+        ];
+        this.cacheToken = SymbolTable.cacheVerifier?.getToken();
+    }
+
+    getCachedType(name: string, options: GetTypeOptions): TypeCacheEntry {
+        if (SymbolTable.cacheVerifier) {
+            if (!SymbolTable.cacheVerifier?.checkToken(this.cacheToken)) {
+                // we have a bad token
+                this.resetTypeCache();
+                return;
+            }
+        } else {
+            // no cache verifier
+            return;
+        }
+        const cacheKey = this.getCacheKey(name, options);
+        return this.typeCache[options.flags]?.get(cacheKey);
+    }
+
+    setCachedType(name: string, cacheEntry: TypeCacheEntry, options: GetTypeOptions) {
+        if (!cacheEntry || !cacheEntry.type) {
+            return;
+        }
+        if (SymbolTable.cacheVerifier) {
+            if (!SymbolTable.cacheVerifier?.checkToken(this.cacheToken)) {
+                // we have a bad token - remove all other caches
+                this.resetTypeCache();
+            }
+        } else {
+            // no cache verifier
+            return;
+        }
+        const cacheKey = this.getCacheKey(name, options);
+        let existingCachedValue = this.typeCache[options.flags]?.get(cacheKey);
+        if (isReferenceType(cacheEntry.type) && !isReferenceType(existingCachedValue)) {
+            // No need to overwrite a non-referenceType with a referenceType
+            return;
+        }
+        return this.typeCache[options.flags]?.set(cacheKey, cacheEntry);
+    }
+
+    private getCacheKey(name: string, options?: { statementIndex?: number | 'end' }) {
+        return this.isOrdered ? `${name.toLowerCase()}@${options.statementIndex ?? '*'}` : `${name.toLowerCase()}`;
     }
 
     /**
@@ -137,16 +630,76 @@ export class SymbolTable {
     private toJSON() {
         return {
             name: this.name,
+            siblings: [...this.siblings].map(sibling => sibling.toJSON()),
             parent: this.parent?.toJSON(),
             symbols: [
                 ...new Set(
                     [...this.symbolMap.entries()].map(([key, symbols]) => {
-                        return symbols.map(x => x.name);
+                        return symbols.map(x => {
+                            return { name: x.name, type: (x.type as any)?.__identifier };
+                        });
                     }).flat().sort()
                 )
             ]
         };
     }
+
+
+    private sortSymbolsByAssignmentOrderInPlace(symbols: { data?: ExtraSymbolData }[]) {
+        symbols.sort((a, b) => {
+            if (!Number.isInteger(a.data?.definingNode?.statementIndex)) {
+                return -1;
+            }
+            if (!Number.isInteger(b.data?.definingNode?.statementIndex)) {
+                return 1;
+            }
+            if (b.data.definingNode.statementIndex > a.data.definingNode.statementIndex) {
+                return -1;
+            }
+            if (b.data.definingNode.statementIndex < a.data.definingNode.statementIndex) {
+                return 1;
+            }
+            return -1;
+        });
+        return symbols;
+    }
+
+
+    private getPossiblePocketTables(options: { statementIndex?: number | 'end' }, precedingAssignmentIndex = -1) {
+        if (!this.isOrdered) {
+            return this.pocketTables;
+        }
+        const pocketTablesBetweenAssignmentAndPosition = this.pocketTables.filter(pt => {
+            const isBeforePosition = options.statementIndex === 'end' ? true : options.statementIndex > pt.index;
+            let isAfterPrecedingAssignment = true;
+            if (Number.isInteger(precedingAssignmentIndex)) {
+                isAfterPrecedingAssignment = precedingAssignmentIndex < pt.index;
+            }
+            return isAfterPrecedingAssignment && isBeforePosition;
+        });
+        return pocketTablesBetweenAssignmentAndPosition;
+    }
+
+    private getSymbolLookupFilter(currentTable: SymbolTable, maxAllowedStatementIndex: number, memberOfAncestor: boolean) {
+        return (t: BscSymbol) => {
+            if (!currentTable.isOrdered) {
+                // order doesn't matter for current table
+                return true;
+            }
+
+            if (maxAllowedStatementIndex >= 0 && t.data?.definingNode) {
+                if (memberOfAncestor) {
+                    // if we've already gone up a level, it's possible to have a variable assigned and used
+                    // in the same statement, eg. for loop
+                    return t.data.definingNode.statementIndex <= maxAllowedStatementIndex;
+
+                } else {
+                    return t.data.definingNode.statementIndex < maxAllowedStatementIndex;
+                }
+            }
+            return true;
+        };
+    }
 }
 
 /**
@@ -156,11 +709,60 @@ export class SymbolTable {
  */
 export interface BscSymbol {
     name: string;
-    range: Range;
+    data: ExtraSymbolData;
     type: BscType;
+    flags: SymbolTypeFlag;
+}
+
+export interface BscSymbolWithSource extends BscSymbol {
+    comesFromAncestor: boolean; // this symbol comes from an ancestor symbol table
+}
+
+export interface SymbolTypeGetter {
+    name: string;
+    getSymbolType(name: string, options: GetSymbolTypeOptions): BscType;
+    setCachedType(name: string, cacheEntry: TypeCacheEntry, options: GetSymbolTypeOptions);
+    addSibling(symbolTable: SymbolTable);
 }
 
 /**
  * A function that returns a symbol table.
  */
-export type SymbolTableProvider = () => SymbolTable | undefined;
+export type SymbolTableProvider = () => SymbolTable;
+
+/**
+ * A function that returns a symbol types getter - smaller interface used in types
+ */
+export type SymbolTypeGetterProvider = () => SymbolTypeGetter;
+
+
+export interface GetSymbolTypeOptions extends GetTypeOptions {
+    fullName?: string;
+    tableProvider?: SymbolTableProvider;
+}
+
+export interface TypeCacheEntry {
+    type: BscType;
+    data?: ExtraSymbolData;
+    flags?: SymbolTypeFlag;
+}
+
+export interface PocketTable {
+    table: SymbolTable;
+    /**
+     * The index of the statement that contains this table within its parent block
+     */
+    index: number;
+    /**
+     * Will the code this pocket table represents always be executed?
+     * Eg. Conditional Compile blocks will always be executed because only valid #if blocks are validated
+     */
+    willAlwaysBeExecuted?: boolean;
+}
+
+export interface GetSymbolAdditionalOptions {
+    ignoreParentsAndSiblings?: boolean;
+    precedingAssignmentIndex?: number;
+    maxStatementIndex?: number;
+    depth?: number;
+}
diff --git a/src/SymbolTypeFlag.ts b/src/SymbolTypeFlag.ts
new file mode 100644
index 000000000..cdb962992
--- /dev/null
+++ b/src/SymbolTypeFlag.ts
@@ -0,0 +1,10 @@
+
+export const enum SymbolTypeFlag {
+    runtime = 1,
+    typetime = 2,
+    optional = 4,
+    private = 8,
+    protected = 16,
+    postTranspile = 32,
+    deprecated = 64
+}
diff --git a/src/XmlScope.spec.ts b/src/XmlScope.spec.ts
index 885cbf79b..1517494f1 100644
--- a/src/XmlScope.spec.ts
+++ b/src/XmlScope.spec.ts
@@ -3,10 +3,14 @@ import { Position, Range } from 'vscode-languageserver';
 import { DiagnosticMessages } from './DiagnosticMessages';
 import type { XmlFile } from './files/XmlFile';
 import { Program } from './Program';
-import { expectDiagnostics, trim } from './testHelpers.spec';
+import { expectDiagnostics, expectTypeToBe, expectZeroDiagnostics, trim } from './testHelpers.spec';
 import { standardizePath as s, util } from './util';
 let rootDir = s`${process.cwd()}/rootDir`;
 import { createSandbox } from 'sinon';
+import { ComponentType } from './types/ComponentType';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import { AssociativeArrayType } from './types/AssociativeArrayType';
+import { ArrayType, BooleanType, DoubleType, DynamicType, FloatType, IntegerType, StringType, TypedFunctionType, UnionType } from './types';
 const sinon = createSandbox();
 
 describe('XmlScope', () => {
@@ -30,7 +34,7 @@ describe('XmlScope', () => {
                 <component name="Parent" extends="Scene">
                 </component>
             `);
-            let scope = program.getScopeByName(parentXmlFile.pkgPath);
+            let scope = program.getScopeByName(parentXmlFile.destPath);
 
             //should default to global scope
             expect(scope.getParentScope()).to.equal(program.globalScope);
@@ -112,24 +116,23 @@ describe('XmlScope', () => {
                 end sub
             `);
             program.validate();
-            let childScope = program.getComponentScope('child')!;
-            expectDiagnostics(childScope, [{
+            expectDiagnostics(program, [{
                 ...DiagnosticMessages.xmlFunctionNotFound('func2'),
-                range: Range.create(4, 24, 4, 29)
+                location: { range: Range.create(4, 24, 4, 29) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('function', 'name'),
-                range: Range.create(5, 9, 5, 17)
+                location: { range: Range.create(5, 9, 5, 17) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('function', 'name'),
-                range: Range.create(6, 9, 6, 17)
+                location: { range: Range.create(6, 9, 6, 17) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('function', 'name'),
-                range: Range.create(7, 9, 7, 17)
+                location: { range: Range.create(7, 9, 7, 17) }
             }, { // syntax error expecting '=' but found '/>'
-                code: DiagnosticMessages.xmlGenericParseError('').code
+                code: DiagnosticMessages.syntaxError('').code
             }, { // onChange function
                 ...DiagnosticMessages.xmlFunctionNotFound('func4'),
-                range: Range.create(8, 51, 8, 56)
+                location: { range: Range.create(8, 51, 8, 56) }
             }]);
         });
 
@@ -156,27 +159,161 @@ describe('XmlScope', () => {
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program.getComponentScope('child')!, [{
+            expectDiagnostics(program, [{
                 ...DiagnosticMessages.xmlInvalidFieldType('no'),
-                range: Range.create(4, 33, 4, 35)
+                location: { range: Range.create(4, 33, 4, 35) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('field', 'type'),
-                range: Range.create(5, 9, 5, 14)
+                location: { range: Range.create(5, 9, 5, 14) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('field', 'id'),
-                range: Range.create(6, 9, 6, 14)
+                location: { range: Range.create(6, 9, 6, 14) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('field', 'id'),
-                range: Range.create(8, 9, 8, 14)
+                location: { range: Range.create(8, 9, 8, 14) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('field', 'id'),
-                range: Range.create(9, 9, 9, 14)
+                location: { range: Range.create(9, 9, 9, 14) }
             }, {
                 ...DiagnosticMessages.xmlTagMissingAttribute('field', 'type'),
-                range: Range.create(9, 9, 9, 14)
+                location: { range: Range.create(9, 9, 9, 14) }
             }, { // syntax error expecting '=' but found '/>'
-                code: DiagnosticMessages.xmlGenericParseError('').code
+                code: DiagnosticMessages.syntaxError('').code
             }]);
         });
     });
+
+    describe('symbols and types', () => {
+        it('adds the component type to the global symbol table', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <interface>
+                    </interface>
+                </component>
+            `);
+            program.validate();
+            expectTypeToBe(program.globalScope.symbolTable.getSymbolType('roSGNodeWidget', { flags: SymbolTypeFlag.typetime }), ComponentType);
+        });
+
+        it('adds the fields as members to its type', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <interface>
+                        <field id="isAA" type="assocArray" />
+                        <field id="isFloat" type="float" />
+                        <field id="isNodeArray" type="nodeArray" />
+                        <field id="isArray" type="array" />
+                        <field id="isStringArray" type="stringarray" />
+                        <field id="isIntArray" type="intarray" />
+                        <field id="isUri" type="uri" />
+                        <field id="isBool" type="boolean" />
+                        <field id="isColor" type="color" />
+                        <field id="isColorArray" type="colorarray" />
+                        <field id="isVector2d" type="vector2d" />
+                        <field id="isTime" type="time" />
+                        <field id="isRect2d" type="rect2D" />
+                        <field id="isRect2dArray" type="rect2Darray" />
+                    </interface>
+                </component>
+            `);
+            program.validate();
+            const widgetType = program.globalScope.symbolTable.getSymbolType('roSGNodeWidget', { flags: SymbolTypeFlag.typetime });
+
+            expectTypeToBe(widgetType.getMemberType('isAA', { flags: SymbolTypeFlag.runtime }), AssociativeArrayType);
+            expectTypeToBe(widgetType.getMemberType('isFloat', { flags: SymbolTypeFlag.runtime }), FloatType);
+            expectTypeToBe(widgetType.getMemberType('isNodeArray', { flags: SymbolTypeFlag.runtime }), ArrayType);
+            expectTypeToBe((widgetType.getMemberType('isNodeArray', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType, ComponentType);
+
+            expectTypeToBe(widgetType.getMemberType('isArray', { flags: SymbolTypeFlag.runtime }), ArrayType);
+            expectTypeToBe((widgetType.getMemberType('isArray', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType, DynamicType);
+
+            expectTypeToBe(widgetType.getMemberType('isStringArray', { flags: SymbolTypeFlag.runtime }), ArrayType);
+            expectTypeToBe((widgetType.getMemberType('isStringArray', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType, StringType);
+
+            expectTypeToBe(widgetType.getMemberType('isIntArray', { flags: SymbolTypeFlag.runtime }), ArrayType);
+            expectTypeToBe((widgetType.getMemberType('isIntArray', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType, IntegerType);
+
+            expectTypeToBe(widgetType.getMemberType('isBool', { flags: SymbolTypeFlag.runtime }), BooleanType);
+
+            expectTypeToBe(widgetType.getMemberType('isColor', { flags: SymbolTypeFlag.runtime }), UnionType);
+            let colorType = widgetType.getMemberType('isColor', { flags: SymbolTypeFlag.runtime }) as UnionType;
+            expect(colorType.types).to.include(StringType.instance);
+            expect(colorType.types).to.include(IntegerType.instance);
+
+            expectTypeToBe(widgetType.getMemberType('isColorArray', { flags: SymbolTypeFlag.runtime }), ArrayType);
+            expectTypeToBe((widgetType.getMemberType('isColorArray', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType, UnionType);
+
+            expectTypeToBe(widgetType.getMemberType('isVector2d', { flags: SymbolTypeFlag.runtime }), ArrayType);
+            expectTypeToBe((widgetType.getMemberType('isVector2d', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType, FloatType);
+
+            expectTypeToBe(widgetType.getMemberType('isTime', { flags: SymbolTypeFlag.runtime }), DoubleType);
+
+            expectTypeToBe(widgetType.getMemberType('isRect2d', { flags: SymbolTypeFlag.runtime }), AssociativeArrayType);
+            let rect2dtype = (widgetType.getMemberType('isRect2d', { flags: SymbolTypeFlag.runtime }) as AssociativeArrayType);
+            expectTypeToBe(rect2dtype.getMemberType('height', { flags: SymbolTypeFlag.runtime }), FloatType);
+            expectTypeToBe(rect2dtype.getMemberType('width', { flags: SymbolTypeFlag.runtime }), FloatType);
+            expectTypeToBe(rect2dtype.getMemberType('x', { flags: SymbolTypeFlag.runtime }), FloatType);
+            expectTypeToBe(rect2dtype.getMemberType('y', { flags: SymbolTypeFlag.runtime }), FloatType);
+
+            expectTypeToBe(widgetType.getMemberType('isRect2dArray', { flags: SymbolTypeFlag.runtime }), ArrayType);
+            expectTypeToBe((widgetType.getMemberType('isRect2dArray', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType, AssociativeArrayType);
+            let rect2dArrayDefault = (widgetType.getMemberType('isRect2dArray', { flags: SymbolTypeFlag.runtime }) as ArrayType).defaultType as AssociativeArrayType;
+            expectTypeToBe(rect2dArrayDefault.getMemberType('height', { flags: SymbolTypeFlag.runtime }), FloatType);
+            expectTypeToBe(rect2dArrayDefault.getMemberType('width', { flags: SymbolTypeFlag.runtime }), FloatType);
+            expectTypeToBe(rect2dArrayDefault.getMemberType('x', { flags: SymbolTypeFlag.runtime }), FloatType);
+            expectTypeToBe(rect2dArrayDefault.getMemberType('y', { flags: SymbolTypeFlag.runtime }), FloatType);
+        });
+
+
+        it('adds function as callFunc members to its type', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.brs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.brs', trim`
+                function someFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+            program.validate();
+            const widgetTypeResult = program.globalScope.symbolTable.getSymbolType('roSGNodeWidget', { flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(widgetTypeResult, ComponentType);
+            const widgetType = widgetTypeResult as ComponentType;
+            // 'someFunc' isn't a regular member
+            expect(widgetType.getMemberType('someFunc', { flags: SymbolTypeFlag.runtime }).isResolvable()).to.be.false;
+            expectTypeToBe(widgetType.getCallFuncType('someFunc', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        });
+
+        it('allows .callFunc() on components', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.brs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.brs', `
+                sub someFunc(input as object)
+                    print input
+                end sub
+            `);
+            program.setFile('source/util.bs', `
+                sub useCallFunc(input as roSGNodeWidget)
+                    input.callFunc("someFunc", {hello: "world"})
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+    });
 });
diff --git a/src/XmlScope.ts b/src/XmlScope.ts
index 81180ba40..480aa6cd8 100644
--- a/src/XmlScope.ts
+++ b/src/XmlScope.ts
@@ -1,19 +1,20 @@
-import type { Location, Position } from 'vscode-languageserver';
 import { Scope } from './Scope';
-import { DiagnosticMessages } from './DiagnosticMessages';
 import type { XmlFile } from './files/XmlFile';
-import type { BscFile, CallableContainerMap, FileReference } from './interfaces';
 import type { Program } from './Program';
-import { SGFieldTypes } from './parser/SGTypes';
-import type { SGTag } from './parser/SGTypes';
-import { DefinitionProvider } from './bscPlugin/definition/DefinitionProvider';
+import util from './util';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { BscFile } from './files/BscFile';
+import { DynamicType } from './types/DynamicType';
+import type { BaseFunctionType } from './types/BaseFunctionType';
+import { ComponentType } from './types/ComponentType';
+import type { ExtraSymbolData } from './interfaces';
 
 export class XmlScope extends Scope {
     constructor(
         public xmlFile: XmlFile,
         public program: Program
     ) {
-        super(xmlFile.pkgPath, program);
+        super(xmlFile.destPath, program);
     }
 
     public get dependencyGraphKey() {
@@ -39,102 +40,37 @@ export class XmlScope extends Scope {
         });
     }
 
-    protected _validate(callableContainerMap: CallableContainerMap) {
-        //validate brs files
-        super._validate(callableContainerMap);
-
-        //detect when the child imports a script that its ancestor also imports
-        this.diagnosticDetectDuplicateAncestorScriptImports();
-
-        //validate component interface
-        this.diagnosticValidateInterface(callableContainerMap);
-    }
-
-    private diagnosticValidateInterface(callableContainerMap: CallableContainerMap) {
-        if (!this.xmlFile.parser.ast?.component?.api) {
+    public getComponentType() {
+        let componentElement = this.xmlFile.ast.componentElement;
+        if (!componentElement?.name) {
             return;
         }
-        const { api } = this.xmlFile.parser.ast.component;
-        //validate functions
-        for (const fun of api.functions) {
-            const name = fun.name;
-            if (!name) {
-                this.diagnosticMissingAttribute(fun, 'name');
-            } else if (!callableContainerMap.has(name.toLowerCase())) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.xmlFunctionNotFound(name),
-                    range: fun.getAttribute('name')?.value.range,
-                    file: this.xmlFile
-                });
-            }
+        const parentComponentType = componentElement?.extends
+            ? this.symbolTable.getSymbolType(util.getSgNodeTypeName(componentElement?.extends), { flags: SymbolTypeFlag.typetime, fullName: componentElement?.extends, tableProvider: () => this.symbolTable })
+            : undefined;
+        const result = new ComponentType(componentElement.name, parentComponentType as ComponentType);
+        result.addBuiltInInterfaces();
+        const iface = componentElement.interfaceElement;
+        if (!iface) {
+            return result;
         }
-        //validate fields
-        for (const field of api.fields) {
-            const { id, type, onChange } = field;
-            if (!id) {
-                this.diagnosticMissingAttribute(field, 'id');
-            }
-            if (!type) {
-                if (!field.alias) {
-                    this.diagnosticMissingAttribute(field, 'type');
-                }
-            } else if (!SGFieldTypes.includes(type.toLowerCase())) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.xmlInvalidFieldType(type),
-                    range: field.getAttribute('type')?.value.range,
-                    file: this.xmlFile
-                });
-            }
-            if (onChange) {
-                if (!callableContainerMap.has(onChange.toLowerCase())) {
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.xmlFunctionNotFound(onChange),
-                        range: field.getAttribute('onchange')?.value.range,
-                        file: this.xmlFile
-                    });
-                }
+        //add functions
+        for (const func of iface.functions ?? []) {
+            if (func.name) {
+                const extraData: ExtraSymbolData = {};
+                const componentFuncType = this.symbolTable.getSymbolType(func.name, { flags: SymbolTypeFlag.runtime, data: extraData, fullName: func.name, tableProvider: () => this.symbolTable });
+                result.addCallFuncMember(func.name, extraData, componentFuncType as BaseFunctionType, SymbolTypeFlag.runtime, () => this.symbolTable);
             }
         }
-    }
-
-    private diagnosticMissingAttribute(tag: SGTag, name: string) {
-        const { text, range } = tag.tag;
-        this.diagnostics.push({
-            ...DiagnosticMessages.xmlTagMissingAttribute(text, name),
-            range: range,
-            file: this.xmlFile
-        });
-    }
-
-    /**
-     * Detect when a child has imported a script that an ancestor also imported
-     */
-    private diagnosticDetectDuplicateAncestorScriptImports() {
-        if (this.xmlFile.parentComponent) {
-            //build a lookup of pkg paths -> FileReference so we can more easily look up collisions
-            let parentScriptImports = this.xmlFile.getAncestorScriptTagImports();
-            let lookup = {} as Record<string, FileReference>;
-            for (let parentScriptImport of parentScriptImports) {
-                //keep the first occurance of a pkgPath. Parent imports are first in the array
-                if (!lookup[parentScriptImport.pkgPath]) {
-                    lookup[parentScriptImport.pkgPath] = parentScriptImport;
-                }
-            }
-
-            //add warning for every script tag that this file shares with an ancestor
-            for (let scriptImport of this.xmlFile.scriptTagImports) {
-                let ancestorScriptImport = lookup[scriptImport.pkgPath];
-                if (ancestorScriptImport) {
-                    let ancestorComponent = ancestorScriptImport.sourceFile as XmlFile;
-                    let ancestorComponentName = ancestorComponent.componentName?.text ?? ancestorComponent.pkgPath;
-                    this.diagnostics.push({
-                        file: this.xmlFile,
-                        range: scriptImport.filePathRange,
-                        ...DiagnosticMessages.unnecessaryScriptImportInChildFromParent(ancestorComponentName)
-                    });
-                }
+        //add fields
+        for (const field of iface.fields ?? []) {
+            if (field.id) {
+                const actualFieldType = field.type ? util.getNodeFieldType(field.type, this.symbolTable) : DynamicType.instance;
+                //TODO: add documentation - need to get previous comment from XML
+                result.addMember(field.id, {}, actualFieldType, SymbolTypeFlag.runtime);
             }
         }
+        return result;
     }
 
     public getAllFiles() {
@@ -154,9 +90,9 @@ export class XmlScope extends Scope {
             let result = [
                 this.xmlFile
             ] as BscFile[];
-            let scriptPkgPaths = this.xmlFile.getOwnDependencies();
-            for (let scriptPkgPath of scriptPkgPaths) {
-                let file = this.program.getFileByPkgPath(scriptPkgPath);
+            let scriptDestPaths = this.xmlFile.getOwnDependencies();
+            for (let destPath of scriptDestPaths) {
+                let file = this.program.getFile(destPath, false);
                 if (file) {
                     result.push(file);
                 }
@@ -164,17 +100,4 @@ export class XmlScope extends Scope {
             return result;
         });
     }
-
-    /**
-     * Get the definition (where was this thing first defined) of the symbol under the position
-     * @deprecated use `DefinitionProvider.process()`
-     */
-    public getDefinition(file: BscFile, position: Position): Location[] {
-        return new DefinitionProvider({
-            program: this.program,
-            file: file,
-            position: position,
-            definitions: []
-        }).process();
-    }
 }
diff --git a/src/astUtils/CachedLookups.spec.ts b/src/astUtils/CachedLookups.spec.ts
new file mode 100644
index 000000000..1de215ffb
--- /dev/null
+++ b/src/astUtils/CachedLookups.spec.ts
@@ -0,0 +1,41 @@
+import { expect } from '../chai-config.spec';
+import type { BrsFile } from '../files/BrsFile';
+import * as sinon from 'sinon';
+import { Program } from '../Program';
+import { expectZeroDiagnostics } from '../testHelpers.spec';
+import { CachedLookups } from './CachedLookups';
+
+describe('CachedLookups', () => {
+    const rootDir = process.cwd();
+    let program: Program;
+
+    beforeEach(() => {
+        program = new Program({ rootDir: rootDir });
+    });
+    afterEach(() => {
+        program.dispose();
+    });
+
+    it('doesnt complain with nested grouping expressions in a call chain', () => {
+        const file = program.setFile<BrsFile>('source/main.brs', `
+            sub test(bookmark)
+                print ((bookmark.duration - bookmark.position) \\ 60).toStr()
+            end sub
+        `);
+        const loggerDebug = sinon.stub(program.logger, 'debug');
+        program.validate();
+        expectZeroDiagnostics(program);
+        const cache = new CachedLookups({ program: program, _parser: file.parser });
+
+        expect(file.ast).to.exist;
+        expect(cache.expressions.size).to.be.greaterThan(0);
+        const loggerCalls = loggerDebug.getCalls();
+        const unknownExpressionCall = loggerCalls.find((call) => {
+            if (call.args.length > 0 && typeof call.args[0] === 'string') {
+                return !!call.args[0].includes('Encountered unknown expression');
+            }
+            return false;
+        });
+        expect(unknownExpressionCall).to.be.undefined;
+    });
+});
diff --git a/src/astUtils/CachedLookups.ts b/src/astUtils/CachedLookups.ts
new file mode 100644
index 000000000..915c2c1e8
--- /dev/null
+++ b/src/astUtils/CachedLookups.ts
@@ -0,0 +1,373 @@
+import type { AALiteralExpression, BinaryExpression, CallExpression, CallfuncExpression, DottedGetExpression, FunctionExpression, VariableExpression } from '../parser/Expression';
+import type { AliasStatement, AssignmentStatement, AugmentedAssignmentStatement, ClassStatement, ConstStatement, EnumStatement, FunctionStatement, ImportStatement, InterfaceStatement, LibraryStatement, NamespaceStatement, TypecastStatement } from '../parser/Statement';
+import { Cache } from '../Cache';
+import { InternalWalkMode, WalkMode, createVisitor } from './visitors';
+import type { Expression } from '../parser/AstNode';
+import { isAAMemberExpression, isBinaryExpression, isCallExpression, isDottedGetExpression, isFunctionExpression, isGroupingExpression, isIndexedGetExpression, isLiteralExpression, isMethodStatement, isNamespaceStatement, isNewExpression, isVariableExpression } from './reflection';
+import type { Parser } from '../parser/Parser';
+import { ParseMode } from '../parser/Parser';
+import type { Token } from '../lexer/Token';
+import { isToken } from '../lexer/Token';
+import type { Program } from '../Program';
+import util from '../util';
+
+
+export interface BscFileLike {
+    program: Program;
+    _parser: Parser;
+}
+
+export class CachedLookups {
+
+    private cache = new Cache();
+
+    constructor(private file: BscFileLike) { }
+
+    get namespaceStatements(): NamespaceStatement[] {
+        return this.getFromCache<Array<NamespaceStatement>>('namespaceStatements');
+    }
+
+    get functionStatements(): FunctionStatement[] {
+        return this.getFromCache<Array<FunctionStatement>>('functionStatements');
+    }
+
+    get functionStatementMap() {
+        return this.cache.getOrAdd('functionStatementMap', () => {
+            const funcMap = new Map<string, FunctionStatement>();
+            for (const stmt of this.functionStatements) {
+                funcMap.set(stmt.getName(ParseMode.BrighterScript).toLowerCase(), stmt);
+            }
+            return funcMap;
+        });
+    }
+
+    get functionExpressions(): FunctionExpression[] {
+        return this.getFromCache<Array<FunctionExpression>>('functionExpressions');
+    }
+
+    get libraryStatements(): LibraryStatement[] {
+        return this.getFromCache<Array<LibraryStatement>>('libraryStatements');
+    }
+
+    get importStatements(): ImportStatement[] {
+        return this.getFromCache<Array<ImportStatement>>('importStatements');
+    }
+
+    get typecastStatements(): TypecastStatement[] {
+        return this.getFromCache<Array<TypecastStatement>>('typecastStatements');
+    }
+
+    get aliasStatements(): AliasStatement[] {
+        return this.getFromCache<Array<AliasStatement>>('aliasStatements');
+    }
+
+    /**
+     * A collection of full expressions. This excludes intermediary expressions.
+     *
+     * Example 1:
+     * `a.b.c` is composed of `a` (variableExpression)  `.b` (DottedGetExpression) `.c` (DottedGetExpression)
+     * This will only contain the final `.c` DottedGetExpression because `.b` and `a` can both be derived by walking back from the `.c` DottedGetExpression.
+     *
+     * Example 2:
+     * `name.space.doSomething(a.b.c)` will result in 2 entries in this list. the `CallExpression` for `doSomething`, and the `.c` DottedGetExpression.
+     *
+     * Example 3:
+     * `value = SomeEnum.value > 2 or SomeEnum.otherValue < 10` will result in 4 entries. `SomeEnum.value`, `2`, `SomeEnum.otherValue`, `10`
+     */
+    get expressions(): Set<Expression> {
+        return this.getFromCache<Set<Expression>>('expressions');
+    }
+
+    get classStatements(): ClassStatement[] {
+        return this.getFromCache<Array<ClassStatement>>('classStatements');
+    }
+
+    get classStatementMap() {
+        return this.cache.getOrAdd('classStatementMap', () => {
+            const classMap = new Map<string, ClassStatement>();
+            for (const stmt of this.classStatements) {
+                classMap.set(stmt.getName(ParseMode.BrighterScript).toLowerCase(), stmt);
+            }
+            return classMap;
+        });
+    }
+
+    get assignmentStatements(): AssignmentStatement[] {
+        return this.getFromCache<Array<AssignmentStatement>>('assignmentStatements');
+    }
+
+    get augmentedAssignmentStatements(): AugmentedAssignmentStatement[] {
+        return this.getFromCache<Array<AugmentedAssignmentStatement>>('augmentedAssignmentStatements');
+    }
+
+    get enumStatements(): EnumStatement[] {
+        return this.getFromCache<Array<EnumStatement>>('enumStatements');
+    }
+
+    get enumStatementMap() {
+        return this.cache.getOrAdd('enumStatementMap', () => {
+            const enumMap = new Map<string, EnumStatement>();
+            for (const stmt of this.enumStatements) {
+                enumMap.set(stmt.fullName.toLowerCase(), stmt);
+            }
+            return enumMap;
+        });
+    }
+
+    get constStatements(): ConstStatement[] {
+        return this.getFromCache<Array<ConstStatement>>('constStatements');
+    }
+
+    get constStatementMap() {
+        return this.cache.getOrAdd('constStatementMap', () => {
+            const constMap = new Map<string, ConstStatement>();
+            for (const stmt of this.constStatements) {
+                constMap.set(stmt.fullName.toLowerCase(), stmt);
+            }
+            return constMap;
+        });
+    }
+
+    get interfaceStatements(): InterfaceStatement[] {
+        return this.getFromCache<Array<InterfaceStatement>>('interfaceStatements');
+    }
+
+    get interfaceStatementMap() {
+        return this.cache.getOrAdd('interfaceStatementMap', () => {
+            const ifaceMap = new Map<string, InterfaceStatement>();
+            for (const stmt of this.interfaceStatements) {
+                ifaceMap.set(stmt.fullName.toLowerCase(), stmt);
+            }
+            return ifaceMap;
+        });
+    }
+
+    get propertyHints(): Record<string, string> {
+        return this.getFromCache<Record<string, string>>('propertyHints');
+    }
+
+
+    invalidate() {
+        this.cache.clear();
+    }
+
+
+    private getFromCache<T>(cacheKey: string): T {
+        if (!this.cache.has(cacheKey)) {
+            this.rehydrate();
+        }
+        if (!this.cache.has(cacheKey)) {
+            this.file.program.logger.info('Unable to get cached lookup', cacheKey);
+        }
+        return this.cache.get(cacheKey);
+    }
+
+    private rehydrate() {
+        const expressions = new Set<Expression>();
+        const classStatements: ClassStatement[] = [];
+        const namespaceStatements: NamespaceStatement[] = [];
+        const enumStatements: EnumStatement[] = [];
+        const constStatements: ConstStatement[] = [];
+        const interfaceStatements: InterfaceStatement[] = [];
+        const assignmentStatements: AssignmentStatement[] = [];
+        const libraryStatements: LibraryStatement[] = [];
+        const importStatements: ImportStatement[] = [];
+        const typecastStatements: TypecastStatement[] = [];
+        const aliasStatements: AliasStatement[] = [];
+        const functionStatements: FunctionStatement[] = [];
+        const functionExpressions: FunctionExpression[] = [];
+
+        const augmentedAssignmentStatements: AugmentedAssignmentStatement[] = [];
+
+        const propertyHints: Record<string, string> = {};
+        const addPropertyHints = (item: Token | AALiteralExpression) => {
+            if (isToken(item)) {
+                const name = item.text;
+                propertyHints[name.toLowerCase()] = name;
+            } else {
+                for (const member of item.elements) {
+                    if (!isAAMemberExpression(member)) {
+                        continue;
+                    }
+                    const name = member.tokens.key.text;
+                    if (!name.startsWith('"')) {
+                        propertyHints[name.toLowerCase()] = name;
+                    }
+
+                }
+            }
+        };
+
+        const excludedExpressions = new Set<Expression>();
+
+        const visitBinaryExpression = (e: BinaryExpression) => {
+            //walk the chain of binary expressions and add each one to the list of expressions
+            const expressionsParts: Expression[] = [e];
+            let expression: Expression;
+            while ((expression = expressionsParts.pop())) {
+                if (isBinaryExpression(expression)) {
+                    expressionsParts.push(expression.left, expression.right);
+                } else {
+                    expressions.add(expression);
+                }
+            }
+        };
+
+        const visitCallExpression = (e: CallExpression | CallfuncExpression) => {
+            for (const p of e.args) {
+                expressions.add(p);
+            }
+            //add calls that were not excluded (from loop below)
+            if (!excludedExpressions.has(e)) {
+                expressions.add(e);
+            }
+
+            //if this call is part of a longer expression that includes a call higher up, find that higher one and remove it
+            if (e.callee) {
+                let node: Expression = e.callee;
+                while (node) {
+                    //the primary goal for this loop. If we found a parent call expression, remove it from `references`
+                    if (isCallExpression(node)) {
+                        expressions.delete(node);
+                        excludedExpressions.add(node);
+                        //stop here. even if there are multiple calls in the chain, each child will find and remove its closest parent, so that reduces excess walking.
+                        break;
+
+                        //when we hit a variable expression, we're definitely at the leftmost expression so stop
+                    } else if (isVariableExpression(node) || isLiteralExpression(node) || isGroupingExpression(node)) {
+                        break;
+                    } else if (isDottedGetExpression(node) || isIndexedGetExpression(node)) {
+                        node = node.obj;
+                    } else {
+                        //some expression we don't understand. log it and quit the loop
+                        this.file.program.logger.debug('Encountered unknown expression while calculating function expression chain', node.kind, node.location);
+                        break;
+                    }
+                }
+            }
+        };
+        const visitVariableNameExpression = (e: VariableExpression | DottedGetExpression) => {
+            if (!isDottedGetExpression(e.parent) && // not last expression in a dotted-get chain
+                !isFunctionExpression(e) && // don't include function expressions
+                !isNamespaceStatement(e.parent) && // don't include the name of namespace
+                !isNewExpression(e.parent) && // don't include the inside of a new expression
+                !(isCallExpression(e.parent) && e.parent?.callee === e) && // don't include the callee
+                !util.isInTypeExpression(e)) {
+                expressions.add(e);
+            }
+        };
+
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        this.file['_parser']?.ast.walk(createVisitor({
+            AssignmentStatement: s => {
+                assignmentStatements.push(s);
+                expressions.add(s.value);
+            },
+            ClassStatement: s => {
+                classStatements.push(s);
+            },
+            InterfaceStatement: s => {
+                interfaceStatements.push(s);
+            },
+            FieldStatement: s => {
+                if (s.initialValue) {
+                    expressions.add(s.initialValue);
+                }
+            },
+            NamespaceStatement: s => {
+                namespaceStatements.push(s);
+            },
+            FunctionStatement: s => {
+                functionStatements.push(s);
+            },
+            ImportStatement: s => {
+                importStatements.push(s);
+            },
+            TypecastStatement: s => {
+                typecastStatements.push(s);
+            },
+            LibraryStatement: s => {
+                libraryStatements.push(s);
+            },
+            AliasStatement: s => {
+                aliasStatements.push(s);
+            },
+            FunctionExpression: (expression, parent) => {
+                if (!isMethodStatement(parent)) {
+                    functionExpressions.push(expression);
+                }
+            },
+            ExpressionStatement: s => {
+                expressions.add(s.expression);
+            },
+            CallfuncExpression: e => {
+                visitCallExpression(e);
+            },
+            CallExpression: e => {
+                visitCallExpression(e);
+            },
+            AALiteralExpression: e => {
+                addPropertyHints(e);
+                expressions.add(e);
+                for (const member of e.elements) {
+                    if (isAAMemberExpression(member)) {
+                        expressions.add(member.value);
+                    }
+                }
+            },
+            BinaryExpression: (e, parent) => {
+                visitBinaryExpression(e);
+            },
+            ArrayLiteralExpression: e => {
+                for (const element of e.elements) {
+                    //keep everything except comments
+                    expressions.add(element);
+                }
+            },
+            DottedGetExpression: e => {
+                visitVariableNameExpression(e);
+                addPropertyHints(e.tokens.name);
+            },
+            DottedSetStatement: e => {
+                addPropertyHints(e.tokens.name);
+            },
+            EnumStatement: e => {
+                enumStatements.push(e);
+            },
+            ConstStatement: s => {
+                constStatements.push(s);
+            },
+            UnaryExpression: e => {
+                expressions.add(e);
+            },
+            IncrementStatement: e => {
+                expressions.add(e);
+            },
+            VariableExpression: e => {
+                visitVariableNameExpression(e);
+            },
+            AugmentedAssignmentStatement: e => {
+                augmentedAssignmentStatements.push(e);
+            }
+        }), {
+            // eslint-disable-next-line no-bitwise
+            walkMode: WalkMode.visitAllRecursive | InternalWalkMode.visitFalseConditionalCompilationBlocks
+        });
+
+        this.cache.set('expressions', expressions);
+        this.cache.set('classStatements', classStatements);
+        this.cache.set('namespaceStatements', namespaceStatements);
+        this.cache.set('enumStatements', enumStatements);
+        this.cache.set('constStatements', constStatements);
+        this.cache.set('interfaceStatements', interfaceStatements);
+        this.cache.set('assignmentStatements', assignmentStatements);
+        this.cache.set('libraryStatements', libraryStatements);
+        this.cache.set('importStatements', importStatements);
+        this.cache.set('typecastStatements', typecastStatements);
+        this.cache.set('aliasStatements', aliasStatements);
+        this.cache.set('functionStatements', functionStatements);
+        this.cache.set('functionExpressions', functionExpressions);
+        this.cache.set('propertyHints', propertyHints);
+        this.cache.set('augmentedAssignmentStatements', augmentedAssignmentStatements);
+    }
+}
diff --git a/src/astUtils/AstEditor.spec.ts b/src/astUtils/Editor.spec.ts
similarity index 95%
rename from src/astUtils/AstEditor.spec.ts
rename to src/astUtils/Editor.spec.ts
index 31da12a18..3654988cf 100644
--- a/src/astUtils/AstEditor.spec.ts
+++ b/src/astUtils/Editor.spec.ts
@@ -1,20 +1,20 @@
 import { expect } from '../chai-config.spec';
 import { BrsTranspileState } from '../parser/BrsTranspileState';
-import { AstEditor } from './AstEditor';
+import { Editor } from './Editor';
 import { util } from '../util';
-import { createToken } from '../astUtils/creators';
+import { createToken } from './creators';
 import { TokenKind } from '../lexer/TokenKind';
 import { Program } from '../Program';
 import { BrsFile } from '../files/BrsFile';
 import { LiteralExpression } from '../parser/Expression';
 import { SourceNode } from 'source-map';
 
-describe('AstEditor', () => {
-    let editor: AstEditor;
+describe('Editor', () => {
+    let editor: Editor;
     let obj: ReturnType<typeof getTestObject>;
 
     beforeEach(() => {
-        editor = new AstEditor();
+        editor = new Editor();
         obj = getTestObject();
     });
 
@@ -168,7 +168,11 @@ describe('AstEditor', () => {
     });
 
     describe('overrideTranspileResult', () => {
-        const state = new BrsTranspileState(new BrsFile('', '', new Program({})));
+        const state = new BrsTranspileState(new BrsFile({
+            srcPath: '',
+            destPath: '',
+            program: new Program({})
+        }));
         function transpileToString(transpilable: { transpile: (state: BrsTranspileState) => any }) {
             if (transpilable.transpile) {
                 const result = transpilable.transpile(state);
@@ -178,7 +182,7 @@ describe('AstEditor', () => {
             }
         }
         it('overrides existing transpile method', () => {
-            const expression = new LiteralExpression(createToken(TokenKind.IntegerLiteral, 'original'));
+            const expression = new LiteralExpression({ value: createToken(TokenKind.IntegerLiteral, 'original') });
 
             expect(transpileToString(expression)).to.eql('original');
 
diff --git a/src/astUtils/AstEditor.ts b/src/astUtils/Editor.ts
similarity index 98%
rename from src/astUtils/AstEditor.ts
rename to src/astUtils/Editor.ts
index 6815efa64..22ad1ff82 100644
--- a/src/astUtils/AstEditor.ts
+++ b/src/astUtils/Editor.ts
@@ -1,6 +1,6 @@
 import type { AstNode } from '../parser/AstNode';
 
-export class AstEditor {
+export class Editor {
     private changes: Change[] = [];
 
     /**
@@ -132,6 +132,12 @@ export class AstEditor {
         this.changes = [];
     }
 }
+/**
+ * @deprecated use `Editor` instead
+ */
+export class AstEditor extends Editor {
+
+}
 
 interface Change {
     apply();
@@ -285,4 +291,3 @@ class ManualChange<T> implements Change {
         this._undo?.(this);
     }
 }
-
diff --git a/src/astUtils/creators.spec.ts b/src/astUtils/creators.spec.ts
index b98ea05c8..644c8674b 100644
--- a/src/astUtils/creators.spec.ts
+++ b/src/astUtils/creators.spec.ts
@@ -5,17 +5,17 @@ describe('creators', () => {
 
     describe('createStringLiteral', () => {
         it('wraps the value in quotes', () => {
-            expect(createStringLiteral('hello world').token.text).to.equal('"hello world"');
+            expect(createStringLiteral('hello world').tokens.value.text).to.equal('"hello world"');
         });
         it('does not wrap already-quoted value in extra quotes', () => {
-            expect(createStringLiteral('"hello world"').token.text).to.equal('"hello world"');
+            expect(createStringLiteral('"hello world"').tokens.value.text).to.equal('"hello world"');
         });
 
         it('does not wrap badly quoted value in additional quotes', () => {
             //leading
-            expect(createStringLiteral('"hello world').token.text).to.equal('"hello world');
+            expect(createStringLiteral('"hello world').tokens.value.text).to.equal('"hello world');
             //trailing
-            expect(createStringLiteral('hello world"').token.text).to.equal('hello world"');
+            expect(createStringLiteral('hello world"').tokens.value.text).to.equal('hello world"');
         });
     });
 });
diff --git a/src/astUtils/creators.ts b/src/astUtils/creators.ts
index 97906e2bc..92d6d3331 100644
--- a/src/astUtils/creators.ts
+++ b/src/astUtils/creators.ts
@@ -1,27 +1,12 @@
-import type { Range } from 'vscode-languageserver';
+import type { Location } from 'vscode-languageserver';
 import type { Identifier, Token } from '../lexer/Token';
+import type { SGToken } from '../parser/SGTypes';
+import { SGAttribute, SGComponent, SGInterface, SGInterfaceField, SGInterfaceFunction, SGScript } from '../parser/SGTypes';
 import { TokenKind } from '../lexer/TokenKind';
 import type { Expression, Statement } from '../parser/AstNode';
 import { LiteralExpression, CallExpression, DottedGetExpression, VariableExpression, FunctionExpression } from '../parser/Expression';
-import type { SGAttribute } from '../parser/SGTypes';
 import { AssignmentStatement, Block, DottedSetStatement, IfStatement, IndexedSetStatement, MethodStatement } from '../parser/Statement';
 
-/**
- * A range that points to the beginning of the file. Used to give non-null ranges to programmatically-added source code.
- * (Hardcoded range to prevent circular dependency issue in `../util.ts`)
- * @deprecated don't use this, it screws up sourcemaps. Just set range to null
- */
-export const interpolatedRange = {
-    start: {
-        line: 0,
-        character: 0
-    },
-    end: {
-        line: 0,
-        character: 0
-    }
-} as Range;
-
 const tokenDefaults = {
     [TokenKind.BackTick]: '`',
     [TokenKind.Backslash]: '\\',
@@ -46,6 +31,12 @@ const tokenDefaults = {
     [TokenKind.Equal]: '=',
     [TokenKind.Greater]: '>',
     [TokenKind.GreaterEqual]: '>=',
+    [TokenKind.HashConst]: '#const',
+    [TokenKind.HashElse]: '#else',
+    [TokenKind.HashElseIf]: '#else if',
+    [TokenKind.HashEndIf]: '#end if',
+    [TokenKind.HashError]: '#error',
+    [TokenKind.HashIf]: '#if',
     [TokenKind.LeftCurlyBrace]: '{',
     [TokenKind.LeftParen]: '(',
     [TokenKind.LeftShift]: '<<',
@@ -86,34 +77,40 @@ const tokenDefaults = {
     [TokenKind.Whitespace]: ' '
 };
 
-export function createToken<T extends TokenKind>(kind: T, text?: string, range?: Range): Token & { kind: T } {
+export function createToken<T extends TokenKind>(kind: T, text?: string, location?: Location): Token & { kind: T } {
     return {
         kind: kind,
         text: text ?? tokenDefaults[kind as string] ?? kind.toString().toLowerCase(),
         isReserved: !text || text === kind.toString(),
-        range: range,
-        leadingWhitespace: ''
+        location: location,
+        leadingWhitespace: '',
+        leadingTrivia: []
     };
 }
 
-export function createIdentifier(name: string, range?: Range): Identifier {
+export function createIdentifier(name: string, location?: Location): Identifier {
     return {
         kind: TokenKind.Identifier,
         text: name,
         isReserved: false,
-        range: range,
-        leadingWhitespace: ''
+        location: location,
+        leadingWhitespace: '',
+        leadingTrivia: []
     };
 }
 
-export function createVariableExpression(ident: string, range?: Range): VariableExpression {
-    return new VariableExpression(createToken(TokenKind.Identifier, ident, range));
+export function createVariableExpression(ident: string, location?: Location): VariableExpression {
+    return new VariableExpression({ name: createToken(TokenKind.Identifier, ident, location) });
 }
 
-export function createDottedIdentifier(path: string[], range?: Range): DottedGetExpression {
+export function createDottedIdentifier(path: string[], location?: Location): DottedGetExpression {
     const ident = path.pop();
-    const obj = path.length > 1 ? createDottedIdentifier(path, range) : createVariableExpression(path[0], range);
-    return new DottedGetExpression(obj, createToken(TokenKind.Identifier, ident, range), createToken(TokenKind.Dot, '.', range));
+    const obj = path.length > 1 ? createDottedIdentifier(path, location) : createVariableExpression(path[0], location);
+    return new DottedGetExpression({
+        obj: obj,
+        name: createToken(TokenKind.Identifier, ident, location),
+        dot: createToken(TokenKind.Dot, '.', location)
+    });
 }
 
 /**
@@ -121,73 +118,152 @@ export function createDottedIdentifier(path: string[], range?: Range): DottedGet
  * Since brightscript doesn't support strings with quotes in them, we can safely auto-detect and wrap the value in quotes in this function.
  * @param value - the string value. (value will be wrapped in quotes if they are missing)
  */
-export function createStringLiteral(value: string, range?: Range) {
+export function createStringLiteral(value: string, location?: Location) {
     //wrap the value in double quotes
     if (!value.startsWith('"') && !value.endsWith('"')) {
         value = '"' + value + '"';
     }
-    return new LiteralExpression(createToken(TokenKind.StringLiteral, value, range));
+    return new LiteralExpression({ value: createToken(TokenKind.StringLiteral, value, location) });
+}
+export function createIntegerLiteral(value: string, location?: Location) {
+    return new LiteralExpression({ value: createToken(TokenKind.IntegerLiteral, value, location) });
 }
-export function createIntegerLiteral(value: string, range?: Range) {
-    return new LiteralExpression(createToken(TokenKind.IntegerLiteral, value, range));
+export function createFloatLiteral(value: string, location?: Location) {
+    return new LiteralExpression({ value: createToken(TokenKind.FloatLiteral, value, location) });
 }
-export function createFloatLiteral(value: string, range?: Range) {
-    return new LiteralExpression(createToken(TokenKind.FloatLiteral, value, range));
+export function createDoubleLiteral(value: string, location?: Location) {
+    return new LiteralExpression({ value: createToken(TokenKind.DoubleLiteral, value, location) });
 }
-export function createInvalidLiteral(value?: string, range?: Range) {
-    return new LiteralExpression(createToken(TokenKind.Invalid, value, range));
+export function createLongIntegerLiteral(value: string, location?: Location) {
+    return new LiteralExpression({ value: createToken(TokenKind.LongIntegerLiteral, value, location) });
 }
-export function createBooleanLiteral(value: 'true' | 'false', range?: Range) {
-    return new LiteralExpression(createToken(value === 'true' ? TokenKind.True : TokenKind.False, value, range));
+export function createInvalidLiteral(value?: string, location?: Location) {
+    return new LiteralExpression({ value: createToken(TokenKind.Invalid, value, location) });
+}
+export function createBooleanLiteral(value: string, location?: Location) {
+    return new LiteralExpression({ value: createToken(value === 'true' ? TokenKind.True : TokenKind.False, value, location) });
 }
 export function createFunctionExpression(kind: TokenKind.Sub | TokenKind.Function) {
-    return new FunctionExpression(
-        [],
-        new Block([]),
-        createToken(kind),
-        kind === TokenKind.Sub ? createToken(TokenKind.EndSub) : createToken(TokenKind.EndFunction),
-        createToken(TokenKind.LeftParen),
-        createToken(TokenKind.RightParen)
-    );
+    return new FunctionExpression({
+        parameters: [],
+        body: new Block({ statements: [] }),
+        functionType: createToken(kind),
+        endFunctionType: kind === TokenKind.Sub ? createToken(TokenKind.EndSub) : createToken(TokenKind.EndFunction),
+        leftParen: createToken(TokenKind.LeftParen),
+        rightParen: createToken(TokenKind.RightParen)
+    });
 }
 
 export function createMethodStatement(name: string, kind: TokenKind.Sub | TokenKind.Function = TokenKind.Function, modifiers?: Token[]) {
-    return new MethodStatement(
-        modifiers,
-        createIdentifier(name),
-        createFunctionExpression(kind),
-        null
-    );
+    return new MethodStatement({
+        modifiers: modifiers,
+        name: createIdentifier(name),
+        func: createFunctionExpression(kind)
+    });
 }
 
-/**
- * @deprecated use `createMethodStatement`
- */
-export function createClassMethodStatement(name: string, kind: TokenKind.Sub | TokenKind.Function = TokenKind.Function, accessModifier?: Token) {
-    return createMethodStatement(name, kind, [accessModifier]);
+export function createCall(callee: Expression, args?: Expression[]) {
+    return new CallExpression({
+        callee: callee,
+        openingParen: createToken(TokenKind.LeftParen, '('),
+        closingParen: createToken(TokenKind.RightParen, ')'),
+        args: args
+    });
 }
 
-export function createCall(callee: Expression, args?: Expression[]) {
-    return new CallExpression(
-        callee,
-        createToken(TokenKind.LeftParen, '('),
-        createToken(TokenKind.RightParen, ')'),
-        args || []
-    );
+export function createSGToken(text: string, location?: Location) {
+    return {
+        text: text,
+        range: location
+    } as SGToken;
 }
 
 /**
  * Create an SGAttribute without any ranges
  */
 export function createSGAttribute(keyName: string, value: string) {
-    return {
-        key: {
-            text: keyName
-        },
-        value: {
-            text: value
-        }
-    } as SGAttribute;
+    return new SGAttribute({
+        key: { text: keyName },
+        equals: { text: '=' },
+        openingQuote: { text: '"' },
+        value: { text: value },
+        closingQuote: { text: '"' }
+    });
+}
+
+export function createSGInterfaceField(id: string, attributes: { type?: string; alias?: string; value?: string; onChange?: string; alwaysNotify?: string } = {}) {
+    const attrs = [
+        createSGAttribute('id', id)
+    ];
+    for (let key in attributes) {
+        attrs.push(
+            createSGAttribute(key, attributes[key])
+        );
+    }
+    return new SGInterfaceField({
+        startTagOpen: { text: '<' },
+        startTagName: { text: 'field' },
+        attributes: attrs,
+        startTagClose: { text: '/>' }
+    });
+}
+
+export function createSGComponent(name: string, parentName?: string) {
+    const attributes = [
+        createSGAttribute('name', name)
+    ];
+    if (parentName) {
+        attributes.push(
+            createSGAttribute('extends', parentName)
+        );
+    }
+    return new SGComponent({
+        startTagOpen: { text: '<' },
+        startTagName: { text: 'component' },
+        attributes: attributes,
+        startTagClose: { text: '>' },
+        elements: [],
+        endTagOpen: { text: '</' },
+        endTagName: { text: 'component' },
+        endTagClose: { text: '>' }
+    });
+}
+
+export function createSGInterfaceFunction(functionName: string) {
+    return new SGInterfaceFunction({
+        startTagOpen: { text: '<' },
+        startTagName: { text: 'function' },
+        attributes: [createSGAttribute('name', functionName)],
+        startTagClose: { text: '/>' }
+    });
+}
+
+export function createSGInterface() {
+    return new SGInterface({
+        startTagOpen: { text: '<' },
+        startTagName: { text: 'interface' },
+        attributes: [],
+        startTagClose: { text: '>' },
+        elements: [],
+        endTagOpen: { text: '</' },
+        endTagName: { text: 'interface' },
+        endTagClose: { text: '>' }
+    });
+}
+
+export function createSGScript(attributes: { type?: string; uri?: string }) {
+    const attrs = [] as SGAttribute[];
+    for (let key in attributes) {
+        attrs.push(
+            createSGAttribute(key, attributes[key])
+        );
+    }
+    return new SGScript({
+        startTagOpen: { text: '<' },
+        startTagName: { text: 'script' },
+        attributes: attrs,
+        startTagClose: { text: '/>' }
+    });
 }
 
 export function createIfStatement(options: {
@@ -202,18 +278,18 @@ export function createIfStatement(options: {
     return new IfStatement(
         {
             if: options.if ?? createToken(TokenKind.If),
+            condition: options.condition,
             then: options.then ?? createToken(TokenKind.Then),
+            thenBranch: options.thenBranch,
             else: options.else ?? createToken(TokenKind.Else),
+            elseBranch: options.elseBranch,
             endIf: options.endIf ?? createToken(TokenKind.EndIf)
-        },
-        options.condition,
-        options.thenBranch,
-        options.elseBranch
+        }
     );
 }
 
 export function createBlock(options: { statements: Statement[] }) {
-    return new Block(options.statements);
+    return new Block(options);
 }
 
 export function createAssignmentStatement(options: {
@@ -221,11 +297,11 @@ export function createAssignmentStatement(options: {
     equals?: Token;
     value: Expression;
 }) {
-    return new AssignmentStatement(
-        options.equals ?? createToken(TokenKind.Equal),
-        typeof options.name === 'string' ? createIdentifier(options.name) : options.name,
-        options.value
-    );
+    return new AssignmentStatement({
+        equals: options.equals ?? createToken(TokenKind.Equal),
+        name: typeof options.name === 'string' ? createIdentifier(options.name) : options.name,
+        value: options.value
+    });
 }
 
 export function createDottedSetStatement(options: {
@@ -235,31 +311,29 @@ export function createDottedSetStatement(options: {
     equals?: Token;
     value: Expression;
 }) {
-    return new DottedSetStatement(
-        options.obj,
-        typeof options.name === 'string' ? createIdentifier(options.name) : options.name,
-        options.value,
-        options.dot,
-        options.equals ?? createToken(TokenKind.Equal)
-    );
+    return new DottedSetStatement({
+        obj: options.obj,
+        name: typeof options.name === 'string' ? createIdentifier(options.name) : options.name,
+        value: options.value,
+        dot: options.dot,
+        equals: options.equals ?? createToken(TokenKind.Equal)
+    });
 }
 
 export function createIndexedSetStatement(options: {
     obj: Expression;
     openingSquare?: Token;
-    index: Expression;
+    indexes: Expression[];
     closingSquare?: Token;
     equals?: Token;
     value: Expression;
-    additionalIndexes?: Expression[];
 }) {
-    return new IndexedSetStatement(
-        options.obj,
-        options.index,
-        options.value,
-        options.openingSquare ?? createToken(TokenKind.LeftSquareBracket),
-        options.closingSquare ?? createToken(TokenKind.RightSquareBracket),
-        options.additionalIndexes || [],
-        options.equals ?? createToken(TokenKind.Equal)
-    );
+    return new IndexedSetStatement({
+        obj: options.obj,
+        indexes: options.indexes,
+        value: options.value,
+        openingSquare: options.openingSquare ?? createToken(TokenKind.LeftSquareBracket),
+        closingSquare: options.closingSquare ?? createToken(TokenKind.RightSquareBracket),
+        equals: options.equals ?? createToken(TokenKind.Equal)
+    });
 }
diff --git a/src/astUtils/reflection.spec.ts b/src/astUtils/reflection.spec.ts
index c47b849e1..f20bc9b8c 100644
--- a/src/astUtils/reflection.spec.ts
+++ b/src/astUtils/reflection.spec.ts
@@ -1,22 +1,21 @@
 /* eslint-disable no-multi-spaces */
 import { expect } from '../chai-config.spec';
-import { PrintStatement, Block, Body, AssignmentStatement, CommentStatement, ExitForStatement, ExitWhileStatement, ExpressionStatement, FunctionStatement, IfStatement, IncrementStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassStatement, EmptyStatement, TryCatchStatement, CatchStatement, ThrowStatement } from '../parser/Statement';
-import { FunctionExpression, NamespacedVariableNameExpression, BinaryExpression, CallExpression, DottedGetExpression, IndexedGetExpression, GroupingExpression, EscapedCharCodeLiteralExpression, ArrayLiteralExpression, AALiteralExpression, UnaryExpression, VariableExpression, SourceLiteralExpression, NewExpression, CallfuncExpression, TemplateStringQuasiExpression, XmlAttributeGetExpression, TemplateStringExpression, TaggedTemplateStringExpression, AnnotationExpression } from '../parser/Expression';
+import { PrintStatement, Block, Body, AssignmentStatement, ExpressionStatement, FunctionStatement, IfStatement, IncrementStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassStatement, EmptyStatement, TryCatchStatement, CatchStatement, ThrowStatement, ExitStatement } from '../parser/Statement';
+import { FunctionExpression, BinaryExpression, CallExpression, DottedGetExpression, IndexedGetExpression, GroupingExpression, EscapedCharCodeLiteralExpression, ArrayLiteralExpression, AALiteralExpression, UnaryExpression, VariableExpression, SourceLiteralExpression, NewExpression, CallfuncExpression, TemplateStringQuasiExpression, XmlAttributeGetExpression, TemplateStringExpression, TaggedTemplateStringExpression, AnnotationExpression } from '../parser/Expression';
 import type { Token } from '../lexer/Token';
 import { TokenKind } from '../lexer/TokenKind';
-import { isPrintStatement, isIfStatement, isBody, isAssignmentStatement, isBlock, isExpressionStatement, isCommentStatement, isExitForStatement, isExitWhileStatement, isFunctionStatement, isIncrementStatement, isGotoStatement, isLabelStatement, isReturnStatement, isEndStatement, isStopStatement, isForStatement, isForEachStatement, isWhileStatement, isDottedSetStatement, isIndexedSetStatement, isLibraryStatement, isNamespaceStatement, isImportStatement, isExpression, isBinaryExpression, isCallExpression, isFunctionExpression, isNamespacedVariableNameExpression, isDottedGetExpression, isXmlAttributeGetExpression, isIndexedGetExpression, isGroupingExpression, isLiteralExpression, isEscapedCharCodeLiteralExpression, isArrayLiteralExpression, isAALiteralExpression, isUnaryExpression, isVariableExpression, isSourceLiteralExpression, isNewExpression, isCallfuncExpression, isTemplateStringQuasiExpression, isTemplateStringExpression, isTaggedTemplateStringExpression, isBrsFile, isXmlFile, isClassStatement, isStatement, isAnnotationExpression, isTryCatchStatement, isCatchStatement, isThrowStatement } from './reflection';
-import { createToken, createStringLiteral } from './creators';
+import { isPrintStatement, isIfStatement, isBody, isAssignmentStatement, isBlock, isExpressionStatement, isFunctionStatement, isIncrementStatement, isGotoStatement, isLabelStatement, isReturnStatement, isEndStatement, isStopStatement, isForStatement, isForEachStatement, isWhileStatement, isDottedSetStatement, isIndexedSetStatement, isLibraryStatement, isNamespaceStatement, isImportStatement, isExpression, isBinaryExpression, isCallExpression, isFunctionExpression, isDottedGetExpression, isXmlAttributeGetExpression, isIndexedGetExpression, isGroupingExpression, isLiteralExpression, isEscapedCharCodeLiteralExpression, isArrayLiteralExpression, isAALiteralExpression, isUnaryExpression, isVariableExpression, isSourceLiteralExpression, isNewExpression, isCallfuncExpression, isTemplateStringQuasiExpression, isTemplateStringExpression, isTaggedTemplateStringExpression, isBrsFile, isXmlFile, isClassStatement, isStatement, isAnnotationExpression, isTryCatchStatement, isCatchStatement, isThrowStatement, isLiteralInvalid, isLiteralBoolean, isLiteralNumber, isLiteralInteger, isLiteralLongInteger, isLiteralFloat, isLiteralDouble, isExitStatement } from './reflection';
+import { createToken, createStringLiteral, createInvalidLiteral, createBooleanLiteral, createIntegerLiteral, createVariableExpression, createFloatLiteral, createDoubleLiteral, createLongIntegerLiteral } from './creators';
 import { Program } from '../Program';
 import { BrsFile } from '../files/BrsFile';
 import { XmlFile } from '../files/XmlFile';
-import { createVariableExpression } from '..';
 
 describe('reflection', () => {
     describe('Files', () => {
         it('recognizes files', () => {
             const program = new Program({});
-            const file = new BrsFile('path/to/source/file.brs', 'pkg:/source/file.brs', program);
-            const comp = new XmlFile('path/to/components/file.xml', 'pkg:/components/file.brs', program);
+            const file = new BrsFile({ srcPath: 'path/to/source/file.brs', destPath: 'source/file.brs', program: program });
+            const comp = new XmlFile({ srcPath: 'path/to/components/file.xml', destPath: 'components/file.brs', program: program });
             expect(isBrsFile(file)).to.be.true;
             expect(isXmlFile(file)).to.be.false;
             expect(isBrsFile(comp)).to.be.false;
@@ -28,34 +27,42 @@ describe('reflection', () => {
         const ident = createToken(TokenKind.Identifier, 'a');
         const expr = createStringLiteral('');
         const token = createToken(TokenKind.StringLiteral, '');
-        const body = new Body([]);
-        const assignment = new AssignmentStatement(undefined, ident, expr);
-        const block = new Block([]);
-        const expression = new ExpressionStatement(expr);
-        const comment = new CommentStatement([token]);
-        const exitFor = new ExitForStatement({ exitFor: token });
-        const exitWhile = new ExitWhileStatement({ exitWhile: token });
-        const funs = new FunctionStatement(ident, new FunctionExpression([], block, token, token, token, token));
-        const ifs = new IfStatement({ if: token }, expr, block);
-        const increment = new IncrementStatement(expr, token);
-        const print = new PrintStatement({ print: token }, []);
+        const body = new Body({ statements: [] });
+        const assignment = new AssignmentStatement({ equals: undefined, name: ident, value: expr });
+        const block = new Block({ statements: [] });
+        const expression = new ExpressionStatement({ expression: expr });
+        const exit = new ExitStatement({ exit: token, loopType: token });
+        const funs = new FunctionStatement({
+            name: ident,
+            func: new FunctionExpression({
+                parameters: [],
+                body: block,
+                functionType: token,
+                leftParen: token,
+                rightParen: token,
+                endFunctionType: token
+            })
+        });
+        const ifs = new IfStatement({ if: token, condition: expr, thenBranch: block });
+        const increment = new IncrementStatement({ value: expr, operator: token });
+        const print = new PrintStatement({ print: token, expressions: [] });
         const gotos = new GotoStatement({ goto: token, label: token });
-        const labels = new LabelStatement({ identifier: ident, colon: token });
+        const labels = new LabelStatement({ name: ident, colon: token });
         const returns = new ReturnStatement({ return: token });
         const ends = new EndStatement({ end: token });
         const stop = new StopStatement({ stop: token });
-        const fors = new ForStatement(token, assignment, token, expr, block, token, token, expr);
-        const foreach = new ForEachStatement({ forEach: token, in: token, endFor: token }, token, expr, block);
-        const whiles = new WhileStatement({ while: token, endWhile: token }, expr, block);
-        const dottedSet = new DottedSetStatement(expr, ident, expr);
-        const indexedSet = new IndexedSetStatement(expr, expr, expr, token, token);
+        const fors = new ForStatement({ for: token, counterDeclaration: assignment, to: token, finalValue: expr, body: block, endFor: token, step: token, increment: expr });
+        const foreach = new ForEachStatement({ forEach: token, in: token, endFor: token, item: token, target: expr, body: block });
+        const whiles = new WhileStatement({ while: token, endWhile: token, condition: expr, body: block });
+        const dottedSet = new DottedSetStatement({ obj: expr, name: ident, value: expr });
+        const indexedSet = new IndexedSetStatement({ obj: expr, indexes: [expr], value: expr, openingSquare: token, closingSquare: token });
         const library = new LibraryStatement({ library: token, filePath: token });
-        const namespace = new NamespaceStatement(token, new NamespacedVariableNameExpression(createVariableExpression('a')), body, token);
-        const cls = new ClassStatement(token, ident, [], token);
-        const imports = new ImportStatement(token, token);
-        const catchStmt = new CatchStatement({ catch: token }, ident, block);
-        const tryCatch = new TryCatchStatement({ try: token }, block, catchStmt);
-        const throwSt = new ThrowStatement(createToken(TokenKind.Throw));
+        const namespace = new NamespaceStatement({ namespace: token, nameExpression: createVariableExpression('a'), body: body, endNamespace: token });
+        const cls = new ClassStatement({ class: token, name: ident, body: [], endClass: token });
+        const imports = new ImportStatement({ import: token, path: token });
+        const catchStmt = new CatchStatement({ catch: token, exceptionVariableExpression: createVariableExpression('e'), catchBranch: block });
+        const tryCatch = new TryCatchStatement({ try: token, tryBranch: block, catchStatement: catchStmt });
+        const throwSt = new ThrowStatement({ throw: createToken(TokenKind.Throw) });
 
         it('isStatement', () => {
             expect(isStatement(library)).to.be.true;
@@ -84,17 +91,9 @@ describe('reflection', () => {
             expect(isExpressionStatement(expression)).to.be.true;
             expect(isExpressionStatement(body)).to.be.false;
         });
-        it('isCommentStatement', () => {
-            expect(isCommentStatement(comment)).to.be.true;
-            expect(isCommentStatement(body)).to.be.false;
-        });
-        it('isExitForStatement', () => {
-            expect(isExitForStatement(exitFor)).to.be.true;
-            expect(isExitForStatement(body)).to.be.false;
-        });
-        it('isExitWhileStatement', () => {
-            expect(isExitWhileStatement(exitWhile)).to.be.true;
-            expect(isExitWhileStatement(body)).to.be.false;
+        it('isExitStatement', () => {
+            expect(isExitStatement(exit)).to.be.true;
+            expect(isExitStatement(body)).to.be.false;
         });
         it('isFunctionStatement', () => {
             expect(isFunctionStatement(funs)).to.be.true;
@@ -186,40 +185,48 @@ describe('reflection', () => {
         const ident = createToken(TokenKind.Identifier, 'a');
         const expr = createStringLiteral('');
         const token = createToken(TokenKind.StringLiteral, '');
-        const block = new Block([]);
+        const block = new Block({ statements: [] });
         const charCode: Token & { charCode: number } = {
             kind: TokenKind.EscapedCharCodeLiteral,
             text: '0',
-            range: undefined,
+            location: undefined,
             isReserved: false,
             charCode: 0,
-            leadingWhitespace: ''
+            leadingWhitespace: '',
+            leadingTrivia: []
         };
-        const nsVar = new NamespacedVariableNameExpression(createVariableExpression('a'));
-        const binary = new BinaryExpression(expr, token, expr);
-        const call = new CallExpression(expr, token, token, []);
-        const fun = new FunctionExpression([], block, token, token, token, token);
-        const dottedGet = new DottedGetExpression(expr, ident, token);
-        const xmlAttrGet = new XmlAttributeGetExpression(expr, ident, token);
-        const indexedGet = new IndexedGetExpression(expr, expr, token, token);
-        const grouping = new GroupingExpression({ left: token, right: token }, expr);
+
+        const binary = new BinaryExpression({ left: expr, operator: token, right: expr });
+        const call = new CallExpression({ callee: expr, openingParen: token, closingParen: token, args: [] });
+        const fun = new FunctionExpression({
+            parameters: [],
+            body: block,
+            functionType: token,
+            leftParen: token,
+            rightParen: token,
+            endFunctionType: token
+        });
+        const dottedGet = new DottedGetExpression({ obj: expr, name: ident, dot: token });
+        const xmlAttrGet = new XmlAttributeGetExpression({ obj: expr, name: ident, at: token });
+        const indexedGet = new IndexedGetExpression({ obj: expr, indexes: [expr], openingSquare: token, closingSquare: token });
+        const grouping = new GroupingExpression({ leftParen: token, rightParen: token, expression: expr });
         const literal = createStringLiteral('test');
-        const escapedCarCode = new EscapedCharCodeLiteralExpression(charCode);
-        const arrayLit = new ArrayLiteralExpression([], token, token);
-        const aaLit = new AALiteralExpression([], token, token);
-        const unary = new UnaryExpression(token, expr);
-        const variable = new VariableExpression(ident);
-        const sourceLit = new SourceLiteralExpression(token);
-        const newx = new NewExpression(token, call);
-        const callfunc = new CallfuncExpression(expr, token, ident, token, [], token);
-        const tplQuasi = new TemplateStringQuasiExpression([expr]);
-        const tplString = new TemplateStringExpression(token, [tplQuasi], [], token);
-        const taggedTpl = new TaggedTemplateStringExpression(ident, token, [tplQuasi], [], token);
-        const annotation = new AnnotationExpression(token, token);
+        const escapedCarCode = new EscapedCharCodeLiteralExpression({ value: charCode });
+        const arrayLit = new ArrayLiteralExpression({ elements: [], open: token, close: token });
+        const aaLit = new AALiteralExpression({ elements: [], open: token, close: token });
+        const unary = new UnaryExpression({ operator: token, right: expr });
+        const variable = new VariableExpression({ name: ident });
+        const sourceLit = new SourceLiteralExpression({ value: token });
+        const newx = new NewExpression({ new: token, call: call });
+        const callfunc = new CallfuncExpression({ callee: expr, operator: token, methodName: ident, openingParen: token, args: [], closingParen: token });
+        const tplQuasi = new TemplateStringQuasiExpression({ expressions: [expr] });
+        const tplString = new TemplateStringExpression({ openingBacktick: token, quasis: [tplQuasi], expressions: [], closingBacktick: token });
+        const taggedTpl = new TaggedTemplateStringExpression({ tagName: ident, openingBacktick: token, quasis: [tplQuasi], expressions: [], closingBacktick: token });
+        const annotation = new AnnotationExpression({ at: token, name: token });
 
         it('isExpression', () => {
             expect(isExpression(binary)).to.be.true;
-            expect(isExpression(binary.operator as any)).to.be.false;
+            expect(isExpression(binary.tokens.operator as any)).to.be.false;
         });
         it('isBinaryExpression', () => {
             expect(isBinaryExpression(binary)).to.be.true;
@@ -233,10 +240,7 @@ describe('reflection', () => {
             expect(isFunctionExpression(fun)).to.be.true;
             expect(isFunctionExpression(call)).to.be.false;
         });
-        it('isNamespacedVariableNameExpression', () => {
-            expect(isNamespacedVariableNameExpression(nsVar)).to.be.true;
-            expect(isNamespacedVariableNameExpression(fun)).to.be.false;
-        });
+
         it('isDottedGetExpression', () => {
             expect(isDottedGetExpression(dottedGet)).to.be.true;
             expect(isDottedGetExpression(fun)).to.be.false;
@@ -314,4 +318,93 @@ describe('reflection', () => {
             expect(isExpression(1 as any)).to.be.false;
         });
     });
+
+    describe('isLiteralInvalid', () => {
+        it('handles true cases', () => {
+            expect(isLiteralInvalid(createInvalidLiteral('invalid'))).to.be.true;
+            expect(isLiteralInvalid(createInvalidLiteral('Invalid'))).to.be.true;
+            expect(isLiteralInvalid(createInvalidLiteral('INVALID'))).to.be.true;
+        });
+        it('handles false cases', () => {
+            expect(isLiteralInvalid(createBooleanLiteral('true'))).to.be.false;
+            expect(isLiteralInvalid(createIntegerLiteral('1'))).to.be.false;
+            expect(isLiteralInvalid(createVariableExpression('cat'))).to.be.false;
+        });
+    });
+
+    describe('isLiteralBoolean', () => {
+        it('handles true cases', () => {
+            expect(isLiteralBoolean(createBooleanLiteral('true'))).to.be.true;
+            expect(isLiteralBoolean(createBooleanLiteral('TRUE'))).to.be.true;
+            expect(isLiteralBoolean(createBooleanLiteral('false'))).to.be.true;
+            expect(isLiteralBoolean(createBooleanLiteral('FALSE'))).to.be.true;
+        });
+        it('handles false cases', () => {
+            expect(isLiteralBoolean(createInvalidLiteral('invalid'))).to.be.false;
+            expect(isLiteralBoolean(createIntegerLiteral('1'))).to.be.false;
+            expect(isLiteralBoolean(createVariableExpression('cat'))).to.be.false;
+        });
+    });
+
+    describe('isLiteralNumber', () => {
+        it('handles true cases', () => {
+            expect(isLiteralNumber(createIntegerLiteral('1'))).to.be.true;
+            expect(isLiteralNumber(createLongIntegerLiteral('1'))).to.be.true;
+            expect(isLiteralNumber(createFloatLiteral('1.2'))).to.be.true;
+            expect(isLiteralNumber(createDoubleLiteral('2.3'))).to.be.true;
+        });
+        it('handles false cases', () => {
+            expect(isLiteralNumber(createInvalidLiteral('invalid'))).to.be.false;
+            expect(isLiteralNumber(createBooleanLiteral('true'))).to.be.false;
+            expect(isLiteralNumber(createVariableExpression('cat'))).to.be.false;
+        });
+    });
+
+    describe('isLiteralInteger', () => {
+        it('handles true cases', () => {
+            expect(isLiteralInteger(createIntegerLiteral('1'))).to.be.true;
+            expect(isLiteralInteger(createIntegerLiteral('100'))).to.be.true;
+        });
+        it('handles false cases', () => {
+            expect(isLiteralInteger(createInvalidLiteral('invalid'))).to.be.false;
+            expect(isLiteralInteger(createBooleanLiteral('true'))).to.be.false;
+            expect(isLiteralInteger(createVariableExpression('cat'))).to.be.false;
+        });
+    });
+
+    describe('isLiteralLongInteger', () => {
+        it('handles true cases', () => {
+            expect(isLiteralLongInteger(createLongIntegerLiteral('1'))).to.be.true;
+            expect(isLiteralLongInteger(createLongIntegerLiteral('100'))).to.be.true;
+        });
+        it('handles false cases', () => {
+            expect(isLiteralLongInteger(createInvalidLiteral('invalid'))).to.be.false;
+            expect(isLiteralLongInteger(createBooleanLiteral('true'))).to.be.false;
+            expect(isLiteralLongInteger(createVariableExpression('cat'))).to.be.false;
+        });
+    });
+
+    describe('isLiteralFloat', () => {
+        it('handles true cases', () => {
+            expect(isLiteralFloat(createFloatLiteral('1.2'))).to.be.true;
+            expect(isLiteralFloat(createFloatLiteral('1.234'))).to.be.true;
+        });
+        it('handles false cases', () => {
+            expect(isLiteralFloat(createInvalidLiteral('invalid'))).to.be.false;
+            expect(isLiteralFloat(createBooleanLiteral('true'))).to.be.false;
+            expect(isLiteralFloat(createVariableExpression('cat'))).to.be.false;
+        });
+    });
+
+    describe('isLiteralDouble', () => {
+        it('handles true cases', () => {
+            expect(isLiteralDouble(createDoubleLiteral('1.2'))).to.be.true;
+            expect(isLiteralDouble(createDoubleLiteral('1.234'))).to.be.true;
+        });
+        it('handles false cases', () => {
+            expect(isLiteralDouble(createInvalidLiteral('invalid'))).to.be.false;
+            expect(isLiteralDouble(createBooleanLiteral('true'))).to.be.false;
+            expect(isLiteralDouble(createVariableExpression('cat'))).to.be.false;
+        });
+    });
 });
diff --git a/src/astUtils/reflection.ts b/src/astUtils/reflection.ts
index b5f5e9144..8b738b968 100644
--- a/src/astUtils/reflection.ts
+++ b/src/astUtils/reflection.ts
@@ -1,45 +1,86 @@
-import type { Body, AssignmentStatement, Block, ExpressionStatement, CommentStatement, ExitForStatement, ExitWhileStatement, FunctionStatement, IfStatement, IncrementStatement, PrintStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassFieldStatement, ClassMethodStatement, ClassStatement, InterfaceFieldStatement, InterfaceMethodStatement, InterfaceStatement, EnumStatement, EnumMemberStatement, TryCatchStatement, CatchStatement, ThrowStatement, MethodStatement, FieldStatement, ConstStatement, ContinueStatement, DimStatement, TypecastStatement, AliasStatement, TypeStatement } from '../parser/Statement';
-import type { LiteralExpression, BinaryExpression, CallExpression, FunctionExpression, NamespacedVariableNameExpression, DottedGetExpression, XmlAttributeGetExpression, IndexedGetExpression, GroupingExpression, EscapedCharCodeLiteralExpression, ArrayLiteralExpression, AALiteralExpression, UnaryExpression, VariableExpression, SourceLiteralExpression, NewExpression, CallfuncExpression, TemplateStringQuasiExpression, TemplateStringExpression, TaggedTemplateStringExpression, AnnotationExpression, FunctionParameterExpression, AAMemberExpression, AAIndexedMemberExpression, TypeCastExpression, TernaryExpression, NullCoalescingExpression } from '../parser/Expression';
+import type { Body, AssignmentStatement, Block, ExpressionStatement, FunctionStatement, IfStatement, IncrementStatement, PrintStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassStatement, InterfaceFieldStatement, InterfaceMethodStatement, InterfaceStatement, EnumStatement, EnumMemberStatement, TryCatchStatement, CatchStatement, ThrowStatement, MethodStatement, FieldStatement, ConstStatement, ContinueStatement, DimStatement, TypecastStatement, AliasStatement, AugmentedAssignmentStatement, ConditionalCompileConstStatement, ConditionalCompileErrorStatement, ConditionalCompileStatement, ExitStatement, TypeStatement } from '../parser/Statement';
+import type { LiteralExpression, BinaryExpression, CallExpression, FunctionExpression, DottedGetExpression, XmlAttributeGetExpression, IndexedGetExpression, GroupingExpression, EscapedCharCodeLiteralExpression, ArrayLiteralExpression, AALiteralExpression, UnaryExpression, VariableExpression, SourceLiteralExpression, NewExpression, CallfuncExpression, TemplateStringQuasiExpression, TemplateStringExpression, TaggedTemplateStringExpression, AnnotationExpression, FunctionParameterExpression, AAMemberExpression, AAIndexedMemberExpression, TernaryExpression, NullCoalescingExpression, PrintSeparatorExpression, TypecastExpression, TypedArrayExpression, TypeExpression, InlineInterfaceMemberExpression, InlineInterfaceExpression, TypedFunctionTypeExpression } from '../parser/Expression';
 import type { BrsFile } from '../files/BrsFile';
 import type { XmlFile } from '../files/XmlFile';
-import type { BscFile, File, TypedefProvider } from '../interfaces';
-import { InvalidType } from '../types/InvalidType';
-import { VoidType } from '../types/VoidType';
+import type { BsDiagnostic, TypedefProvider } from '../interfaces';
+import type { InvalidType } from '../types/InvalidType';
+import type { VoidType } from '../types/VoidType';
 import { InternalWalkMode } from './visitors';
-import { FunctionType } from '../types/FunctionType';
-import { StringType } from '../types/StringType';
-import { BooleanType } from '../types/BooleanType';
-import { IntegerType } from '../types/IntegerType';
-import { LongIntegerType } from '../types/LongIntegerType';
-import { FloatType } from '../types/FloatType';
-import { DoubleType } from '../types/DoubleType';
-import { CustomType } from '../types/CustomType';
+import type { TypedFunctionType } from '../types/TypedFunctionType';
+import type { FunctionType } from '../types/FunctionType';
+import type { StringType } from '../types/StringType';
+import type { BooleanType } from '../types/BooleanType';
+import type { IntegerType } from '../types/IntegerType';
+import type { LongIntegerType } from '../types/LongIntegerType';
+import type { FloatType } from '../types/FloatType';
+import type { DoubleType } from '../types/DoubleType';
+import type { ClassType } from '../types/ClassType';
 import type { Scope } from '../Scope';
 import type { XmlScope } from '../XmlScope';
-import { DynamicType } from '../types/DynamicType';
+import type { DynamicType } from '../types/DynamicType';
 import type { InterfaceType } from '../types/InterfaceType';
 import type { ObjectType } from '../types/ObjectType';
 import type { AstNode, Expression, Statement } from '../parser/AstNode';
+import type { AssetFile } from '../files/AssetFile';
+import { AstNodeKind } from '../parser/AstNode';
+import type { TypePropertyReferenceType, ReferenceType, BinaryOperatorReferenceType, ArrayDefaultTypeReferenceType, AnyReferenceType, ParamTypeFromValueReferenceType, ReferenceTypeWithDefault } from '../types/ReferenceType';
+import type { EnumMemberType, EnumType } from '../types/EnumType';
+import type { UnionType } from '../types/UnionType';
+import type { UninitializedType } from '../types/UninitializedType';
+import type { ArrayType } from '../types/ArrayType';
+import type { InheritableType } from '../types/InheritableType';
+import type { CallFuncableType } from '../types/CallFuncableType';
+import { BscTypeKind } from '../types/BscTypeKind';
+import type { NamespaceType } from '../types/NamespaceType';
+import type { BaseFunctionType } from '../types/BaseFunctionType';
+import type { BscFile } from '../files/BscFile';
+import type { ComponentType } from '../types/ComponentType';
+import type { AssociativeArrayType } from '../types/AssociativeArrayType';
+import { TokenKind } from '../lexer/TokenKind';
+import type { Program } from '../Program';
+import type { Project } from '../lsp/Project';
+import type { IntersectionType } from '../types/IntersectionType';
+import type { TypeStatementType } from '../types/TypeStatementType';
+import type { BscType } from '../types/BscType';
+import type { SymbolTable } from '../SymbolTable';
 
-// File reflection
 
-export function isBrsFile(file: BscFile | File | undefined): file is BrsFile {
+// File reflection
+export function isBrsFile(file: BscFile | undefined): file is BrsFile {
     return file?.constructor.name === 'BrsFile';
 }
 
-export function isXmlFile(file: BscFile | undefined): file is XmlFile {
+export function isXmlFile(file: (BscFile | XmlFile | undefined)): file is XmlFile {
     return file?.constructor.name === 'XmlFile';
 }
 
-export function isXmlScope(scope: Scope | undefined): scope is XmlScope {
+export function isAssetFile(file: (BscFile | AssetFile | undefined)): file is AssetFile {
+    return file?.constructor.name === 'AssetFile';
+}
+
+export function isBscFile(file: (BscFile | BscFile | XmlFile | AssetFile | undefined)): file is BscFile {
+    return isBrsFile(file) || isXmlFile(file) || isAssetFile(file);
+}
+
+
+export function isXmlScope(scope: (Scope | undefined)): scope is XmlScope {
     return scope?.constructor.name === 'XmlScope';
 }
 
 
+export function isProgram(arg: any): arg is Program {
+    return arg?.constructor.name === 'Program';
+}
+
+export function isProject(arg: any): arg is Project {
+    return arg?.constructor.name === 'Project';
+}
+
+
 // Statements reflection
 
 /**
- * Determine if the variable is a descendent of the Statement base class.
+ * Determine if the variablvalue is a descendent of the Statement base class.
  * Due to performance restrictions, this expects all statements to
  * directly extend Statement or FunctionStatement,
  * so it only checks the immediate parent's class name.
@@ -53,43 +94,37 @@ export function isBody(element: AstNode | undefined): element is Body {
     return element?.constructor?.name === 'Body';
 }
 export function isAssignmentStatement(element: AstNode | undefined): element is AssignmentStatement {
-    return element?.constructor?.name === 'AssignmentStatement';
+    return element?.kind === AstNodeKind.AssignmentStatement;
 }
 export function isBlock(element: AstNode | undefined): element is Block {
     return element?.constructor?.name === 'Block';
 }
 export function isExpressionStatement(element: AstNode | undefined): element is ExpressionStatement {
-    return element?.constructor?.name === 'ExpressionStatement';
+    return element?.kind === AstNodeKind.ExpressionStatement;
 }
-export function isCommentStatement(element: AstNode | undefined): element is CommentStatement {
-    return element?.constructor?.name === 'CommentStatement';
-}
-export function isExitForStatement(element: AstNode | undefined): element is ExitForStatement {
-    return element?.constructor?.name === 'ExitForStatement';
-}
-export function isExitWhileStatement(element: AstNode | undefined): element is ExitWhileStatement {
-    return element?.constructor?.name === 'ExitWhileStatement';
+export function isExitStatement(element: AstNode | undefined): element is ExitStatement {
+    return element?.kind === AstNodeKind.ExitStatement;
 }
 export function isFunctionStatement(element: AstNode | undefined): element is FunctionStatement {
-    return element?.constructor?.name === 'FunctionStatement';
+    return element?.kind === AstNodeKind.FunctionStatement;
 }
 export function isIfStatement(element: AstNode | undefined): element is IfStatement {
-    return element?.constructor?.name === 'IfStatement';
+    return element?.kind === AstNodeKind.IfStatement;
 }
 export function isIncrementStatement(element: AstNode | undefined): element is IncrementStatement {
-    return element?.constructor?.name === 'IncrementStatement';
+    return element?.kind === AstNodeKind.IncrementStatement;
 }
 export function isPrintStatement(element: AstNode | undefined): element is PrintStatement {
-    return element?.constructor?.name === 'PrintStatement';
+    return element?.kind === AstNodeKind.PrintStatement;
 }
 export function isGotoStatement(element: AstNode | undefined): element is GotoStatement {
-    return element?.constructor?.name === 'GotoStatement';
+    return element?.kind === AstNodeKind.GotoStatement;
 }
 export function isLabelStatement(element: AstNode | undefined): element is LabelStatement {
-    return element?.constructor?.name === 'LabelStatement';
+    return element?.kind === AstNodeKind.LabelStatement;
 }
 export function isReturnStatement(element: AstNode | undefined): element is ReturnStatement {
-    return element?.constructor?.name === 'ReturnStatement';
+    return element?.kind === AstNodeKind.ReturnStatement;
 }
 export function isTernaryExpression(element: AstNode | undefined): element is TernaryExpression {
     return element?.constructor?.name === 'TernaryExpression';
@@ -98,90 +133,95 @@ export function isNullCoalescingExpression(element: AstNode | undefined): elemen
     return element?.constructor?.name === 'NullCoalescingExpression';
 }
 export function isEndStatement(element: AstNode | undefined): element is EndStatement {
-    return element?.constructor?.name === 'EndStatement';
+    return element?.kind === AstNodeKind.EndStatement;
 }
 export function isStopStatement(element: AstNode | undefined): element is StopStatement {
-    return element?.constructor?.name === 'StopStatement';
+    return element?.kind === AstNodeKind.StopStatement;
 }
 export function isForStatement(element: AstNode | undefined): element is ForStatement {
-    return element?.constructor?.name === 'ForStatement';
+    return element?.kind === AstNodeKind.ForStatement;
 }
 export function isForEachStatement(element: AstNode | undefined): element is ForEachStatement {
-    return element?.constructor?.name === 'ForEachStatement';
+    return element?.kind === AstNodeKind.ForEachStatement;
 }
 export function isWhileStatement(element: AstNode | undefined): element is WhileStatement {
-    return element?.constructor?.name === 'WhileStatement';
+    return element?.kind === AstNodeKind.WhileStatement;
 }
 export function isDimStatement(element: AstNode | undefined): element is DimStatement {
     return element?.constructor?.name === 'DimStatement';
 }
 export function isDottedSetStatement(element: AstNode | undefined): element is DottedSetStatement {
-    return element?.constructor?.name === 'DottedSetStatement';
+    return element?.kind === AstNodeKind.DottedSetStatement;
 }
 export function isIndexedSetStatement(element: AstNode | undefined): element is IndexedSetStatement {
-    return element?.constructor?.name === 'IndexedSetStatement';
+    return element?.kind === AstNodeKind.IndexedSetStatement;
 }
 export function isLibraryStatement(element: AstNode | undefined): element is LibraryStatement {
-    return element?.constructor?.name === 'LibraryStatement';
+    return element?.kind === AstNodeKind.LibraryStatement;
 }
 export function isNamespaceStatement(element: AstNode | undefined): element is NamespaceStatement {
-    return element?.constructor?.name === 'NamespaceStatement';
+    return element?.kind === AstNodeKind.NamespaceStatement;
 }
 export function isClassStatement(element: AstNode | undefined): element is ClassStatement {
-    return element?.constructor?.name === 'ClassStatement';
+    return element?.kind === AstNodeKind.ClassStatement;
 }
 export function isImportStatement(element: AstNode | undefined): element is ImportStatement {
-    return element?.constructor?.name === 'ImportStatement';
+    return element?.kind === AstNodeKind.ImportStatement;
 }
 export function isMethodStatement(element: AstNode | undefined): element is MethodStatement {
-    const name = element?.constructor.name;
-    return name === 'MethodStatement' || name === 'ClassMethodStatement';
-}
-/**
- * @deprecated use `isMethodStatement`
- */
-export function isClassMethodStatement(element: AstNode | undefined): element is ClassMethodStatement {
-    return isMethodStatement(element);
+    return element?.kind === AstNodeKind.MethodStatement;
 }
 export function isFieldStatement(element: AstNode | undefined): element is FieldStatement {
-    const name = element?.constructor.name;
-    return name === 'FieldStatement' || name === 'ClassFieldStatement';
-}
-/**
- * @deprecated use `isFieldStatement`
- */
-export function isClassFieldStatement(element: AstNode | undefined): element is ClassFieldStatement {
-    return isFieldStatement(element);
+    return element?.kind === AstNodeKind.FieldStatement;
 }
 export function isInterfaceStatement(element: AstNode | undefined): element is InterfaceStatement {
-    return element?.constructor.name === 'InterfaceStatement';
+    return element?.kind === AstNodeKind.InterfaceStatement;
 }
 export function isInterfaceMethodStatement(element: AstNode | undefined): element is InterfaceMethodStatement {
-    return element?.constructor.name === 'InterfaceMethodStatement';
+    return element?.kind === AstNodeKind.InterfaceMethodStatement;
 }
 export function isInterfaceFieldStatement(element: AstNode | undefined): element is InterfaceFieldStatement {
-    return element?.constructor.name === 'InterfaceFieldStatement';
+    return element?.kind === AstNodeKind.InterfaceFieldStatement;
 }
+export function isMemberField(element: AstNode | undefined): element is InterfaceFieldStatement | FieldStatement {
+    return isFieldStatement(element) || isInterfaceFieldStatement(element);
+}
+export function isMemberMethod(element: AstNode | undefined): element is InterfaceMethodStatement | MethodStatement {
+    return isMethodStatement(element) || isInterfaceMethodStatement(element);
+}
+
 export function isEnumStatement(element: AstNode | undefined): element is EnumStatement {
-    return element?.constructor.name === 'EnumStatement';
+    return element?.kind === AstNodeKind.EnumStatement;
 }
 export function isEnumMemberStatement(element: AstNode | undefined): element is EnumMemberStatement {
-    return element?.constructor.name === 'EnumMemberStatement';
+    return element?.kind === AstNodeKind.EnumMemberStatement;
 }
 export function isConstStatement(element: AstNode | undefined): element is ConstStatement {
-    return element?.constructor.name === 'ConstStatement';
+    return element?.kind === AstNodeKind.ConstStatement;
 }
 export function isContinueStatement(element: AstNode | undefined): element is ContinueStatement {
-    return element?.constructor.name === 'ContinueStatement';
+    return element?.kind === AstNodeKind.ContinueStatement;
 }
 export function isTryCatchStatement(element: AstNode | undefined): element is TryCatchStatement {
-    return element?.constructor.name === 'TryCatchStatement';
+    return element?.kind === AstNodeKind.TryCatchStatement;
 }
 export function isCatchStatement(element: AstNode | undefined): element is CatchStatement {
-    return element?.constructor.name === 'CatchStatement';
+    return element?.kind === AstNodeKind.CatchStatement;
 }
 export function isThrowStatement(element: AstNode | undefined): element is ThrowStatement {
-    return element?.constructor.name === 'ThrowStatement';
+    return element?.kind === AstNodeKind.ThrowStatement;
+}
+export function isConditionalCompileStatement(element: AstNode | undefined): element is ConditionalCompileStatement {
+    return element?.kind === AstNodeKind.ConditionalCompileStatement;
+}
+export function isConditionalCompileConstStatement(element: AstNode | undefined): element is ConditionalCompileConstStatement {
+    return element?.kind === AstNodeKind.ConditionalCompileConstStatement;
+}
+export function isConditionalCompileErrorStatement(element: AstNode | undefined): element is ConditionalCompileErrorStatement {
+    return element?.kind === AstNodeKind.ConditionalCompileErrorStatement;
+}
+export function isAugmentedAssignmentStatement(element: AstNode | undefined): element is AugmentedAssignmentStatement {
+    return element?.kind === AstNodeKind.AugmentedAssignmentStatement;
 }
 export function isTypecastStatement(element: AstNode | undefined): element is TypecastStatement {
     return element?.constructor?.name === 'TypecastStatement';
@@ -189,14 +229,13 @@ export function isTypecastStatement(element: AstNode | undefined): element is Ty
 export function isAliasStatement(element: AstNode | undefined): element is AliasStatement {
     return element?.constructor?.name === 'AliasStatement';
 }
-
 export function isTypeStatement(element: AstNode | undefined): element is TypeStatement {
     return element?.constructor?.name === 'TypeStatement';
 }
 
 // Expressions reflection
 /**
- * Determine if the variable is a descendent of the Expression base class.
+ * Determine if the variablvalue is a descendent of the Expression base class.
  * Due to performance restrictions, this expects all statements to directly extend Expression,
  * so it only checks the immediate parent's class name. For example:
  * this will work for StringLiteralExpression -> Expression,
@@ -208,147 +247,394 @@ export function isExpression(element: AstNode | undefined): element is Expressio
 }
 
 export function isBinaryExpression(element: AstNode | undefined): element is BinaryExpression {
-    return element?.constructor.name === 'BinaryExpression';
+    return element?.kind === AstNodeKind.BinaryExpression;
 }
 export function isCallExpression(element: AstNode | undefined): element is CallExpression {
-    return element?.constructor.name === 'CallExpression';
+    return element?.kind === AstNodeKind.CallExpression;
 }
 export function isFunctionExpression(element: AstNode | undefined): element is FunctionExpression {
-    return element?.constructor.name === 'FunctionExpression';
-}
-export function isNamespacedVariableNameExpression(element: AstNode | undefined): element is NamespacedVariableNameExpression {
-    return element?.constructor.name === 'NamespacedVariableNameExpression';
+    return element?.kind === AstNodeKind.FunctionExpression;
 }
 export function isDottedGetExpression(element: AstNode | undefined): element is DottedGetExpression {
-    return element?.constructor.name === 'DottedGetExpression';
+    return element?.kind === AstNodeKind.DottedGetExpression;
 }
 export function isXmlAttributeGetExpression(element: AstNode | undefined): element is XmlAttributeGetExpression {
-    return element?.constructor.name === 'XmlAttributeGetExpression';
+    return element?.kind === AstNodeKind.XmlAttributeGetExpression;
 }
 export function isIndexedGetExpression(element: AstNode | undefined): element is IndexedGetExpression {
-    return element?.constructor.name === 'IndexedGetExpression';
+    return element?.kind === AstNodeKind.IndexedGetExpression;
 }
 export function isGroupingExpression(element: AstNode | undefined): element is GroupingExpression {
-    return element?.constructor.name === 'GroupingExpression';
+    return element?.kind === AstNodeKind.GroupingExpression;
 }
 export function isLiteralExpression(element: AstNode | undefined): element is LiteralExpression {
-    return element?.constructor.name === 'LiteralExpression';
+    return element?.kind === AstNodeKind.LiteralExpression;
 }
 export function isEscapedCharCodeLiteralExpression(element: AstNode | undefined): element is EscapedCharCodeLiteralExpression {
-    return element?.constructor.name === 'EscapedCharCodeLiteralExpression';
+    return element?.kind === AstNodeKind.EscapedCharCodeLiteralExpression;
 }
 export function isArrayLiteralExpression(element: AstNode | undefined): element is ArrayLiteralExpression {
-    return element?.constructor.name === 'ArrayLiteralExpression';
+    return element?.kind === AstNodeKind.ArrayLiteralExpression;
 }
 export function isAALiteralExpression(element: AstNode | undefined): element is AALiteralExpression {
-    return element?.constructor.name === 'AALiteralExpression';
+    return element?.kind === AstNodeKind.AALiteralExpression;
 }
 export function isAAMemberExpression(element: AstNode | undefined): element is AAMemberExpression {
-    return element?.constructor.name === 'AAMemberExpression';
+    return element?.kind === AstNodeKind.AAMemberExpression;
 }
 export function isAAIndexedMemberExpression(element: AstNode | undefined): element is AAIndexedMemberExpression {
     return element?.constructor.name === 'AAIndexedMemberExpression';
 }
 export function isUnaryExpression(element: AstNode | undefined): element is UnaryExpression {
-    return element?.constructor.name === 'UnaryExpression';
+    return element?.kind === AstNodeKind.UnaryExpression;
 }
 export function isVariableExpression(element: AstNode | undefined): element is VariableExpression {
-    return element?.constructor.name === 'VariableExpression';
+    return element?.kind === AstNodeKind.VariableExpression;
 }
 export function isSourceLiteralExpression(element: AstNode | undefined): element is SourceLiteralExpression {
-    return element?.constructor.name === 'SourceLiteralExpression';
+    return element?.kind === AstNodeKind.SourceLiteralExpression;
 }
 export function isNewExpression(element: AstNode | undefined): element is NewExpression {
-    return element?.constructor.name === 'NewExpression';
+    return element?.kind === AstNodeKind.NewExpression;
 }
 export function isCallfuncExpression(element: AstNode | undefined): element is CallfuncExpression {
-    return element?.constructor.name === 'CallfuncExpression';
+    return element?.kind === AstNodeKind.CallfuncExpression;
 }
 export function isTemplateStringQuasiExpression(element: AstNode | undefined): element is TemplateStringQuasiExpression {
-    return element?.constructor.name === 'TemplateStringQuasiExpression';
+    return element?.kind === AstNodeKind.TemplateStringQuasiExpression;
 }
 export function isTemplateStringExpression(element: AstNode | undefined): element is TemplateStringExpression {
-    return element?.constructor.name === 'TemplateStringExpression';
+    return element?.kind === AstNodeKind.TemplateStringExpression;
 }
 export function isTaggedTemplateStringExpression(element: AstNode | undefined): element is TaggedTemplateStringExpression {
-    return element?.constructor.name === 'TaggedTemplateStringExpression';
+    return element?.kind === AstNodeKind.TaggedTemplateStringExpression;
 }
 export function isFunctionParameterExpression(element: AstNode | undefined): element is FunctionParameterExpression {
-    return element?.constructor.name === 'FunctionParameterExpression';
+    return element?.kind === AstNodeKind.FunctionParameterExpression;
 }
 export function isAnnotationExpression(element: AstNode | undefined): element is AnnotationExpression {
-    return element?.constructor.name === 'AnnotationExpression';
+    return element?.kind === AstNodeKind.AnnotationExpression;
 }
 export function isTypedefProvider(element: any): element is TypedefProvider {
     return 'getTypedef' in element;
 }
-export function isTypeCastExpression(element: any): element is TypeCastExpression {
-    return element?.constructor.name === 'TypeCastExpression';
+export function isTypeExpression(element: any): element is TypeExpression {
+    return element?.kind === AstNodeKind.TypeExpression;
+}
+export function isTypecastExpression(element: any): element is TypecastExpression {
+    return element?.kind === AstNodeKind.TypecastExpression;
+}
+export function isTypedArrayExpression(element: any): element is TypedArrayExpression {
+    return element?.kind === AstNodeKind.TypedArrayExpression;
+}
+export function isPrintSeparatorExpression(element: any): element is PrintSeparatorExpression {
+    return element?.kind === AstNodeKind.PrintSeparatorExpression;
+}
+export function isInlineInterfaceExpression(element: any): element is InlineInterfaceExpression {
+    return element?.kind === AstNodeKind.InlineInterfaceExpression;
+}
+export function isInlineInterfaceMemberExpression(element: any): element is InlineInterfaceMemberExpression {
+    return element?.kind === AstNodeKind.InlineInterfaceMemberExpression;
+}
+export function isTypedFunctionTypeExpression(element: any): element is TypedFunctionTypeExpression {
+    return element?.kind === AstNodeKind.TypedFunctionTypeExpression;
 }
-
 
 // BscType reflection
 export function isStringType(value: any): value is StringType {
-    return value?.constructor.name === StringType.name;
+    return value?.kind === BscTypeKind.StringType;
+}
+export function isRoStringType(value: any): value is InterfaceType {
+    return isBuiltInType(value, 'roString');
+}
+export function isStringTypeLike(value: any): value is StringType | InterfaceType {
+    return isStringType(value) || isRoStringType(value) || isCompoundTypeOf(value, isStringTypeLike);
+}
+
+export function isTypedFunctionType(value: any): value is TypedFunctionType {
+    return value?.kind === BscTypeKind.TypedFunctionType;
+}
+
+export function isTypedFunctionTypeLike(value: any): value is TypedFunctionType | TypeStatementType | UnionType {
+    return isTypedFunctionType(value) || isTypeStatementTypeOf(value, isTypedFunctionTypeLike) || isUnionTypeOf(value, isTypedFunctionTypeLike);
+}
+
+export function isFunctionType(value: any): value is FunctionType {
+    return value?.kind === BscTypeKind.FunctionType;
+}
+export function isRoFunctionType(value: any): value is InterfaceType {
+    return value?.kind === BscTypeKind.RoFunctionType || isBuiltInType(value, 'roFunction');
+}
+export function isFunctionTypeLike(value: any): value is FunctionType | InterfaceType {
+    return isFunctionType(value) || isRoFunctionType(value) || isCompoundTypeOf(value, isFunctionTypeLike);
 }
-export function isFunctionType(e: any): e is FunctionType {
-    return e?.constructor.name === FunctionType.name;
+
+export function isBooleanType(value: any): value is BooleanType {
+    return value?.kind === BscTypeKind.BooleanType;
+}
+export function isRoBooleanType(value: any): value is InterfaceType {
+    return isBuiltInType(value, 'roBoolean');
+}
+export function isBooleanTypeLike(value: any): value is BooleanType | InterfaceType {
+    return isBooleanType(value) || isRoBooleanType(value) || isCompoundTypeOf(value, isBooleanTypeLike);
+}
+
+export function isIntegerType(value: any): value is IntegerType {
+    return value?.kind === BscTypeKind.IntegerType;
 }
-export function isBooleanType(e: any): e is BooleanType {
-    return e?.constructor.name === BooleanType.name;
+export function isRoIntType(value: any): value is LongIntegerType {
+    return isBuiltInType(value, 'roInt');
 }
-export function isIntegerType(e: any): e is IntegerType {
-    return e?.constructor.name === IntegerType.name;
+export function isIntegerTypeLike(value: any): value is IntegerType | InterfaceType {
+    return isIntegerType(value) || isRoIntType(value) || isCompoundTypeOf(value, isIntegerTypeLike);
 }
-export function isLongIntegerType(e: any): e is LongIntegerType {
-    return e?.constructor.name === LongIntegerType.name;
+
+export function isLongIntegerType(value: any): value is LongIntegerType {
+    return value?.kind === BscTypeKind.LongIntegerType;
 }
-export function isFloatType(e: any): e is FloatType {
-    return e?.constructor.name === FloatType.name;
+export function isRoLongIntegerType(value: any): value is InterfaceType {
+    return isBuiltInType(value, 'roLongInteger');
 }
-export function isDoubleType(e: any): e is DoubleType {
-    return e?.constructor.name === DoubleType.name;
+export function isLongIntegerTypeLike(value: any): value is LongIntegerType | InterfaceType {
+    return isLongIntegerType(value) || isRoLongIntegerType(value) || isCompoundTypeOf(value, isLongIntegerTypeLike);
 }
-export function isInvalidType(e: any): e is InvalidType {
-    return e?.constructor.name === InvalidType.name;
+
+export function isFloatType(value: any): value is FloatType {
+    return value?.kind === BscTypeKind.FloatType;
 }
-export function isVoidType(e: any): e is VoidType {
-    return e?.constructor.name === VoidType.name;
+export function isRoFloatType(value: any): value is InterfaceType {
+    return isBuiltInType(value, 'roFloat');
 }
-export function isCustomType(e: any): e is CustomType {
-    return e?.constructor.name === CustomType.name;
+export function isFloatTypeLike(value: any): value is FloatType | InterfaceType {
+    return isFloatType(value) || isRoFloatType(value) || isCompoundTypeOf(value, isFloatTypeLike);
 }
-export function isDynamicType(e: any): e is DynamicType {
-    return e?.constructor.name === DynamicType.name;
+
+export function isDoubleType(value: any): value is DoubleType {
+    return value?.kind === BscTypeKind.DoubleType;
 }
-export function isInterfaceType(e: any): e is InterfaceType {
-    return e?.constructor.name === 'InterfaceType';
+export function isRoDoubleType(value: any): value is InterfaceType {
+    return isBuiltInType(value, 'roDouble');
 }
-export function isObjectType(e: any): e is ObjectType {
-    return e?.constructor.name === 'ObjectType';
+export function isDoubleTypeLike(value: any): value is DoubleType | InterfaceType {
+    return isDoubleType(value) || isRoDoubleType(value) || isCompoundTypeOf(value, isDoubleTypeLike);
 }
 
-const numberConstructorNames = [
-    IntegerType.name,
-    LongIntegerType.name,
-    FloatType.name,
-    DoubleType.name
+export function isInvalidType(value: any): value is InvalidType {
+    return value?.kind === BscTypeKind.InvalidType;
+}
+export function isRoInvalidType(value: any): value is InterfaceType {
+    return isBuiltInType(value, 'roInvalid');
+}
+export function isInvalidTypeLike(value: any): value is InvalidType | InterfaceType {
+    return isInvalidType(value) || isRoInvalidType(value) || isCompoundTypeOf(value, isInvalidTypeLike);
+}
+
+export function isVoidType(value: any): value is VoidType {
+    return value?.kind === BscTypeKind.VoidType;
+}
+export function isClassType(value: any): value is ClassType {
+    return value?.kind === BscTypeKind.ClassType;
+}
+export function isComponentType(value: any): value is ComponentType {
+    return value?.kind === BscTypeKind.ComponentType;
+}
+export function isDynamicType(value: any): value is DynamicType {
+    return value?.kind === BscTypeKind.DynamicType;
+}
+export function isInterfaceType(value: any): value is InterfaceType {
+    return value?.kind === BscTypeKind.InterfaceType;
+}
+export function isObjectType(value: any): value is ObjectType {
+    return value?.kind === BscTypeKind.ObjectType;
+}
+export function isReferenceType(value: any): value is ReferenceType {
+    return value?.__reflection?.name === 'ReferenceType';
+}
+export function isEnumType(value: any): value is EnumType {
+    return value?.kind === BscTypeKind.EnumType;
+}
+export function isEnumMemberType(value: any): value is EnumMemberType {
+    return value?.kind === BscTypeKind.EnumMemberType;
+}
+export function isTypePropertyReferenceType(value: any): value is TypePropertyReferenceType {
+    return value?.__reflection?.name === 'TypePropertyReferenceType';
+}
+export function isBinaryOperatorReferenceType(value: any): value is BinaryOperatorReferenceType {
+    return value?.__reflection?.name === 'BinaryOperatorReferenceType';
+}
+export function isArrayDefaultTypeReferenceType(value: any): value is ArrayDefaultTypeReferenceType {
+    return value?.__reflection?.name === 'ArrayDefaultTypeReferenceType';
+}
+export function isParamTypeFromValueReferenceType(value: any): value is ParamTypeFromValueReferenceType {
+    return value?.__reflection?.name === 'ParamTypeFromValueReferenceType';
+}
+export function isReferenceTypeWithDefault(value: any): value is ReferenceTypeWithDefault {
+    return value?.__reflection?.name === 'ReferenceTypeWithDefault';
+}
+export function isNamespaceType(value: any): value is NamespaceType {
+    return value?.kind === BscTypeKind.NamespaceType;
+}
+export function isUnionType(value: any): value is UnionType {
+    return value?.kind === BscTypeKind.UnionType;
+}
+export function isIntersectionType(value: any): value is IntersectionType {
+    return value?.kind === BscTypeKind.IntersectionType;
+}
+export function isUninitializedType(value: any): value is UninitializedType {
+    return value?.kind === BscTypeKind.UninitializedType;
+}
+export function isArrayType(value: any): value is ArrayType {
+    return value?.kind === BscTypeKind.ArrayType;
+}
+export function isAssociativeArrayType(value: any): value is AssociativeArrayType {
+    return value?.kind === BscTypeKind.AssociativeArrayType;
+}
+export function isTypeStatementType(value: any): value is TypeStatementType {
+    return value?.kind === BscTypeKind.TypeStatementType;
+}
+
+export function isInheritableType(target): target is InheritableType {
+    return isClassType(target) || isInterfaceType(target) || isComponentType(target);
+}
+
+export function isCallFuncableType(target): target is CallFuncableType {
+    return isInterfaceType(target) || isComponentType(target) || isCompoundTypeOf(target, isCallFuncableType);
+}
+
+export function isCallableType(target): target is BaseFunctionType {
+    return isFunctionTypeLike(target) ||
+        isTypedFunctionTypeLike(target) ||
+        isTypeStatementTypeOf(target, isCallableType) ||
+        isUnionTypeOf(target, isCallableType) ||
+        isObjectType(target) ||
+        (isDynamicType(target) && !isAnyReferenceType(target));
+}
+
+export function isAnyReferenceType(target): target is AnyReferenceType {
+    const name = target?.__reflection?.name;
+    return name === 'ReferenceType' || name === 'TypePropertyReferenceType' || name === 'BinaryOperatorReferenceType' || name === 'ArrayDefaultTypeReferenceType' || name === 'ParamTypeFromValueReferenceType' || name === 'ReferenceTypeWithDefault';
+}
+
+export function isNumberType(value: any): value is IntegerType | LongIntegerType | FloatType | DoubleType | InterfaceType {
+    return isIntegerType(value) ||
+        isLongIntegerType(value) ||
+        isFloatType(value) ||
+        isDoubleType(value);
+}
+
+export function isNumberTypeLike(value: any): value is IntegerType | LongIntegerType | FloatType | DoubleType | InterfaceType {
+    return isIntegerTypeLike(value) ||
+        isLongIntegerTypeLike(value) ||
+        isFloatTypeLike(value) ||
+        isDoubleTypeLike(value) ||
+        isCompoundTypeOf(value, isNumberTypeLike);
+}
+
+export function isPrimitiveType(value: any = false): value is IntegerType | LongIntegerType | FloatType | DoubleType | StringType | BooleanType | InterfaceType {
+    return isNumberType(value) ||
+        isBooleanType(value) ||
+        isStringType(value);
+}
+
+export function isPrimitiveTypeLike(value: any = false): value is IntegerType | LongIntegerType | FloatType | DoubleType | StringType | BooleanType | InterfaceType {
+    return isNumberTypeLike(value) ||
+        isBooleanTypeLike(value) ||
+        isStringTypeLike(value) ||
+        isTypeStatementTypeOf(value, isPrimitiveTypeLike);
+}
+
+export function isAssociativeArrayTypeLike(value: any): value is AssociativeArrayType | InterfaceType {
+    return value?.kind === BscTypeKind.AssociativeArrayType || isBuiltInType(value, 'roAssociativeArray') || isCompoundTypeOf(value, isAssociativeArrayTypeLike);
+}
+
+export function isArrayTypeLike(value: any): value is ArrayType | InterfaceType {
+    return value?.kind === BscTypeKind.ArrayType || isBuiltInType(value, 'roArray') || isCompoundTypeOf(value, isArrayTypeLike);
+}
+
+export function isCallFuncableTypeLike(target): target is BscType & { callFuncMemberTable: SymbolTable } {
+    return isCallFuncableType(target) || isCompoundTypeOf(target, isCallFuncableTypeLike);
+}
+
+export function isBuiltInType(value: any, name: string): value is InterfaceType {
+    return (isInterfaceType(value) && value.name.toLowerCase() === name.toLowerCase() && value.isBuiltIn) ||
+        (isTypeStatementType(value) && isBuiltInType(value.wrappedType, name));
+}
+
+const nativeTypeKinds = [
+    BscTypeKind.DynamicType,
+    BscTypeKind.ObjectType,
+    BscTypeKind.VoidType,
+    BscTypeKind.FunctionType
 ];
-export function isNumberType(e: any): e is IntegerType | LongIntegerType | FloatType | DoubleType {
-    return numberConstructorNames.includes(e?.constructor.name);
+export function isNativeType(value: any): value is IntegerType | LongIntegerType | FloatType | DoubleType | StringType | BooleanType | VoidType | DynamicType | ObjectType | FunctionType | InterfaceType {
+    return isPrimitiveType(value) || nativeTypeKinds.includes(value?.kind);
+}
+
+export function isTypeStatementTypeOf(value: any, typeGuard: (val: any) => boolean) {
+    return isTypeStatementType(value) && typeGuard(value.wrappedType);
+}
+
+export function isUnionTypeOf(value: any, typeGuard: (val: any) => boolean) {
+    return isUnionType(value) && value.types.every(typeGuard);
+}
+export function isIntersectionTypeOf(value: any, typeGuard: (val: any) => boolean) {
+    return isIntersectionType(value) && value.types.some(typeGuard);
+}
+
+export function isCompoundTypeOf(value: any, typeGuard: (val: any) => boolean) {
+    return isTypeStatementTypeOf(value, typeGuard) ||
+        isUnionTypeOf(value, typeGuard) ||
+        isIntersectionTypeOf(value, typeGuard);
+}
+
+export function isCompoundType(value: any): value is UnionType | IntersectionType {
+    return isUnionType(value) || isIntersectionType(value);
+}
+
+export function isIterableType(value: any): boolean {
+    if (isDynamicType(value) || isObjectType(value)) {
+        return true;
+    }
+    if (isArrayTypeLike(value) || isAssociativeArrayTypeLike(value)) {
+        return true;
+    }
+    if (isCompoundTypeOf(value, isIterableType)) {
+        return true;
+    }
+    if (isBuiltInType(value, 'roByteArray') || isBuiltInType(value, 'roList') || isBuiltInType(value, 'roXMLList') || isBuiltInType(value, 'roMessagePort')) {
+        return true;
+    }
+    return false;
 }
 
 // Literal reflection
 
-export function isLiteralInvalid(e: any): e is LiteralExpression & { type: InvalidType } {
-    return isLiteralExpression(e) && isInvalidType(e.type);
+export function isLiteralInvalid(value: any): value is LiteralExpression & { type: InvalidType } {
+    return isLiteralExpression(value) && value.tokens.value.kind === TokenKind.Invalid;
+}
+export function isLiteralBoolean(value: any): value is LiteralExpression & { type: BooleanType } {
+    return isLiteralExpression(value) && isBooleanType(value.getType());
+}
+export function isLiteralString(value: any): value is LiteralExpression & { type: StringType } {
+    return isLiteralExpression(value) && isStringType(value.getType());
+}
+export function isLiteralNumber(value: any): value is LiteralExpression & { type: IntegerType | LongIntegerType | FloatType | DoubleType } {
+    return isLiteralExpression(value) && isNumberType(value.getType());
 }
-export function isLiteralBoolean(e: any): e is LiteralExpression & { type: BooleanType } {
-    return isLiteralExpression(e) && isBooleanType(e.type);
+export function isLiteralInteger(value: any): value is LiteralExpression & { type: IntegerType } {
+    return isLiteralExpression(value) && isIntegerType(value.getType());
 }
-export function isLiteralString(e: any): e is LiteralExpression & { type: StringType } {
-    return isLiteralExpression(e) && isStringType(e.type);
+export function isLiteralLongInteger(value: any): value is LiteralExpression & { type: LongIntegerType } {
+    return isLiteralExpression(value) && isLongIntegerType(value.getType());
 }
-export function isLiteralNumber(e: any): e is LiteralExpression & { type: IntegerType | LongIntegerType | FloatType | DoubleType } {
-    return isLiteralExpression(e) && isNumberType(e.type);
+export function isLiteralFloat(value: any): value is LiteralExpression & { type: FloatType } {
+    return isLiteralExpression(value) && isFloatType(value.getType());
+}
+export function isLiteralDouble(value: any): value is LiteralExpression & { type: DoubleType } {
+    return isLiteralExpression(value) && isDoubleType(value.getType());
+}
+
+// Diagnostics
+export function isBsDiagnostic(value: any): value is BsDiagnostic {
+    return value.message;
 }
diff --git a/src/astUtils/visitors.spec.ts b/src/astUtils/visitors.spec.ts
index 7355ed693..316313b9b 100644
--- a/src/astUtils/visitors.spec.ts
+++ b/src/astUtils/visitors.spec.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-multi-spaces */
 import type { CancellationToken } from 'vscode-languageserver';
-import { CancellationTokenSource, Range } from 'vscode-languageserver';
+import { CancellationTokenSource } from 'vscode-languageserver';
 import { expect } from '../chai-config.spec';
 import * as sinon from 'sinon';
 import { Program } from '../Program';
@@ -8,16 +8,16 @@ import type { BrsFile } from '../files/BrsFile';
 import type { FunctionStatement } from '../parser/Statement';
 import { PrintStatement, Block, ReturnStatement, ExpressionStatement } from '../parser/Statement';
 import { TokenKind } from '../lexer/TokenKind';
-import { createVisitor, walkArray, WalkMode, walkStatements } from './visitors';
-import { isBlock, isLiteralExpression, isPrintStatement } from './reflection';
+import { ChildrenSkipper, createVisitor, InternalWalkMode, walkArray, WalkMode, walkStatements } from './visitors';
+import { isBlock, isFunctionExpression, isLiteralExpression, isPrintStatement } from './reflection';
 import { createCall, createIntegerLiteral, createToken, createVariableExpression } from './creators';
 import { createStackedVisitor } from './stackedVisitor';
-import { AstEditor } from './AstEditor';
-import { Parser } from '../parser/Parser';
+import { Editor } from './Editor';
+import { ParseMode, Parser } from '../parser/Parser';
 import type { Statement, Expression, AstNode } from '../parser/AstNode';
 import { expectZeroDiagnostics } from '../testHelpers.spec';
-import type { LiteralExpression, VariableExpression } from '../parser/Expression';
-import { BinaryExpression } from '../parser/Expression';
+import type { VariableExpression } from '../parser/Expression';
+import { BinaryExpression, type FunctionExpression, type LiteralExpression } from '../parser/Expression';
 
 describe('astUtils visitors', () => {
     const rootDir = process.cwd();
@@ -87,7 +87,8 @@ describe('astUtils visitors', () => {
 
     function functionsWalker(visitor: (statement: Statement, parent: Statement) => void, cancel?: CancellationToken) {
         return (file: BrsFile) => {
-            file.parser.references.functionExpressions.some(functionExpression => {
+            const funcExpressions = file.ast.findChildren<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitExpressionsRecursive });
+            funcExpressions.some(functionExpression => {
                 visitor(functionExpression.body, undefined);
                 walkStatements(functionExpression.body, (statement, parent) => visitor(statement, parent), cancel);
                 return cancel?.isCancellationRequested;
@@ -95,6 +96,41 @@ describe('astUtils visitors', () => {
         };
     }
 
+    describe('createVisitor', () => {
+        it(`calls the 'AstNode' event for every node`, () => {
+            const file = program.setFile<BrsFile>('source/main.brs', `
+                sub Main()
+                    print "Hello"
+                end sub
+            `);
+            const nodes: AstNode[] = [];
+            function track(node: AstNode) {
+                nodes.push(node);
+            }
+            const visitor = createVisitor({
+                AstNode: track,
+                FunctionStatement: track,
+                FunctionExpression: track,
+                PrintStatement: track,
+                Block: track,
+                LiteralExpression: track
+            });
+            file.ast.walk(visitor, { walkMode: WalkMode.visitAllRecursive });
+            expect(nodes.map(x => x.constructor.name)).to.eql([
+                'FunctionStatement',
+                'FunctionStatement',
+                'FunctionExpression',
+                'FunctionExpression',
+                'Block',
+                'Block',
+                'PrintStatement',
+                'PrintStatement',
+                'LiteralExpression',
+                'LiteralExpression'
+            ]);
+        });
+    });
+
     describe('Statements', () => {
         it('Walks through all the statements with depth', () => {
             const actual: string[] = [];
@@ -105,7 +141,7 @@ describe('astUtils visitors', () => {
             const walker = functionsWalker(visitor);
             program.plugins.add({
                 name: 'walker',
-                afterFileParse: file => walker(file as BrsFile)
+                afterProvideFile: event => walker(event.files[0] as BrsFile)
             });
             program.setFile('source/main.brs', PRINTS_SRC);
             expect(actual).to.deep.equal([
@@ -142,7 +178,7 @@ describe('astUtils visitors', () => {
             const walker = functionsWalker(s => actual.push(s.constructor.name), cancel.token);
             program.plugins.add({
                 name: 'walker',
-                afterFileParse: file => walker(file as BrsFile)
+                afterProvideFile: event => walker(event.files[0] as BrsFile)
             });
             program.setFile('source/main.brs', PRINTS_SRC);
             expect(actual).to.deep.equal([
@@ -187,7 +223,7 @@ describe('astUtils visitors', () => {
             }, cancel.token);
             program.plugins.add({
                 name: 'walker',
-                afterFileParse: file => walker(file as BrsFile)
+                afterProvideFile: event => walker(event.files[0] as BrsFile)
             });
             program.setFile('source/main.brs', PRINTS_SRC);
             expect(actual).to.deep.equal([
@@ -215,9 +251,10 @@ describe('astUtils visitors', () => {
                 Block: blockHandler
             });
             const printStatement = new PrintStatement({
-                print: createToken(TokenKind.Print)
-            }, []);
-            const blockStatement = new Block([], Range.create(0, 0, 0, 0));
+                print: createToken(TokenKind.Print),
+                expressions: []
+            });
+            const blockStatement = new Block({ statements: [] });
             visitor(printStatement, undefined);
             visitor(blockStatement, undefined);
             expect(printHandler.callCount).to.equal(1);
@@ -230,15 +267,19 @@ describe('astUtils visitors', () => {
     describe('Statement editor', () => {
         it('allows replacing statements', () => {
             const printStatement1 = new PrintStatement({
-                print: createToken(TokenKind.Print)
-            }, []);
+                print: createToken(TokenKind.Print),
+                expressions: []
+            });
             const printStatement2 = new PrintStatement({
-                print: createToken(TokenKind.Print)
-            }, []);
-            const block = new Block([
-                printStatement1,
-                new ReturnStatement({ return: createToken(TokenKind.Return) })
-            ], Range.create(0, 0, 0, 0));
+                print: createToken(TokenKind.Print),
+                expressions: []
+            });
+            const block = new Block({
+                statements: [
+                    printStatement1,
+                    new ReturnStatement({ return: createToken(TokenKind.Return) })
+                ]
+            });
             const visitor = createVisitor({
                 PrintStatement: () => printStatement2
             });
@@ -246,21 +287,22 @@ describe('astUtils visitors', () => {
             expect(block.statements[0]).to.equal(printStatement2);
         });
 
-        it('uses the AstEditor for replacement when provided', () => {
-            const editor = new AstEditor();
+        it('uses the Editor for replacement when provided', () => {
+            const editor = new Editor();
 
             const printStatement1 = new PrintStatement({
-                print: createToken(TokenKind.Print)
-            }, []);
+                print: createToken(TokenKind.Print),
+                expressions: []
+            });
 
             const printStatement2 = new PrintStatement({
-                print: createToken(TokenKind.Print)
-            }, []);
-
-            const block = new Block([
-                printStatement1
-            ], Range.create(0, 0, 0, 0));
+                print: createToken(TokenKind.Print),
+                expressions: []
+            });
 
+            const block = new Block({
+                statements: [printStatement1]
+            });
 
             block.walk(createVisitor({
                 PrintStatement: () => printStatement2
@@ -293,14 +335,13 @@ describe('astUtils visitors', () => {
             });
             program.plugins.add({
                 name: 'walker',
-                afterFileParse: (file) => walker(file as BrsFile)
+                afterProvideFile: (event) => walker(event.files[0] as BrsFile)
             });
 
             program.setFile('source/main.brs', EXPRESSIONS_SRC);
             expect(actual).to.deep.equal([
-                //The comment statement is weird because it can't be both a statement and expression, but is treated that way. Just ignore it for now until we refactor comments.
-                //'CommentStatement:1:CommentStatement',          // '<comment>
                 'PrintStatement:1:LiteralExpression',             // print <"msg">; 3
+                'PrintStatement:1:PrintSeparatorExpression',      // print "msg"<;> 3
                 'PrintStatement:1:LiteralExpression',             // print "msg"; <3>
                 'PrintStatement:1:TemplateStringExpression',      // print <`expand ${var}`>
                 'PrintStatement:1:TemplateStringQuasiExpression', // print `<expand >${var}`
@@ -647,7 +688,6 @@ describe('astUtils visitors', () => {
                end namespace
             `, [
                 'NamespaceStatement',
-                'NamespacedVariableNameExpression',
                 'DottedGetExpression',
                 'VariableExpression'
             ]);
@@ -812,7 +852,6 @@ describe('astUtils visitors', () => {
                 'Block',
                 'AssignmentStatement',
                 'AALiteralExpression',
-                'CommentStatement',
                 'AAMemberExpression',
                 'LiteralExpression'
             ]);
@@ -887,8 +926,7 @@ describe('astUtils visitors', () => {
                 'LiteralExpression',
                 //else
                 'Block',
-                'ReturnStatement',
-                'CommentStatement'
+                'ReturnStatement'
             ]);
         });
 
@@ -941,7 +979,6 @@ describe('astUtils visitors', () => {
                 'AssignmentStatement',
                 'NewExpression',
                 'CallExpression',
-                'NamespacedVariableNameExpression',
                 'VariableExpression'
             ]);
         });
@@ -974,7 +1011,11 @@ describe('astUtils visitors', () => {
             `, [
                 'ClassStatement',
                 'FieldStatement',
+                'TypeExpression',
+                'VariableExpression',
                 'FieldStatement',
+                'TypeExpression',
+                'VariableExpression',
                 'LiteralExpression',
                 'MethodStatement',
                 'FunctionExpression',
@@ -1167,19 +1208,19 @@ describe('astUtils visitors', () => {
                 PrintStatement: (astNode, parent, owner: Statement[], key) => {
                     printStatementCount++;
                     //add another expression to the list every time. This should result in 1 the first time, 2 the second, 3 the third.
-                    calls.push(new ExpressionStatement(
-                        createCall(
+                    calls.push(new ExpressionStatement({
+                        expression: createCall(
                             createVariableExpression('doSomethingBeforePrint'),
                             [
                                 createIntegerLiteral(callExpressionCount.toString())
                             ]
                         )
-                    ));
+                    }));
                     owner.splice(key + 1, 0, ...calls.map(x => x.clone()));
                 },
                 CallExpression: (call) => {
                     callExpressionCount++;
-                    console.log('call visitor for', (call.args[0] as LiteralExpression).token.text);
+                    console.log('call visitor for', (call.args[0] as LiteralExpression).tokens.value.text);
                 }
             }), {
                 walkMode: WalkMode.visitAllRecursive
@@ -1193,6 +1234,112 @@ describe('astUtils visitors', () => {
             ).to.be.lengthOf(9);
         });
 
+        it('skips children when requested', () => {
+            const file: BrsFile = program.setFile('source/main.bs', `
+                sub test()
+                    print 1 + 1
+                    print "hello"
+                end sub
+
+                sub test2()
+                    i = 2
+                    while i > 0
+                        print createObject("roDateTime").ToISOString()
+                        i--
+                    end while
+                end sub
+            `);
+            const actual = new Array<string>();
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            // do not walk into print statements
+            const skipper = new ChildrenSkipper();
+            file.ast.walk((node) => {
+                actual.push(node.kind);
+                if (isPrintStatement(node)) {
+                    skipper.skip();
+                }
+            }, {
+                walkMode: WalkMode.visitAllRecursive,
+                skipChildren: skipper
+            });
+
+            // Does not walk into print statements
+            expect(actual).to.deep.equal([
+                'FunctionStatement',
+                'FunctionExpression',
+                'Block',
+                'PrintStatement',
+                'PrintStatement',
+                'FunctionStatement',
+                'FunctionExpression',
+                'Block',
+                'AssignmentStatement',
+                'LiteralExpression',
+                'WhileStatement',
+                'BinaryExpression',
+                'VariableExpression',
+                'LiteralExpression',
+                'Block',
+                'PrintStatement',
+                'IncrementStatement',
+                'VariableExpression'
+            ]);
+        });
+
+        it('can get end trivia of any kind of block type node', () => {
+            const file: BrsFile = program.setFile('source/main.bs', `
+                sub test()
+                    x = {
+                        val: [123],
+                        count: 4
+                        ' end comment in literal AA 1
+                    }
+                    for each y in x.val
+                        print y
+                        ' end comment in for 2
+                    end for
+
+                    if x.count > 2
+                        print "hi"
+                        ' end comment in if 3
+                    end if
+
+                    while x.count > 3
+                        x.count--
+                        ' end comment in while 4
+                    end while
+
+                    try
+                        print "in try"
+                    catch e
+                        ' end comment in try 5
+                    end try
+
+                    array = [
+                        1,
+                        2,
+                        ' end comment in array 6
+                    ]
+
+                    ' end comment in function 7
+                end sub
+            `);
+            const comments = [];
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            file.ast.walk(createVisitor({
+                AstNode: (node) => {
+                    const endNodeComments = node.endTrivia.filter(t => t.kind === TokenKind.Comment);
+                    comments.push(...endNodeComments);
+                }
+            }), {
+                walkMode: WalkMode.visitAllRecursive
+            });
+        });
+
         it('walks a new child when returned from a visitor', () => {
             let walkedLiterals: string[] = [];
 
@@ -1203,16 +1350,16 @@ describe('astUtils visitors', () => {
             `).ast.walk(createVisitor({
                 BinaryExpression: (node, parent, owner: Statement[], key) => {
                     //replace the `1 + 2` binary expression with a new binary expression
-                    if (isLiteralExpression(node.left) && node.left.token.text === '1') {
-                        return new BinaryExpression(
-                            createIntegerLiteral('3'),
-                            createToken(TokenKind.Plus),
-                            createIntegerLiteral('4')
-                        );
+                    if (isLiteralExpression(node.left) && node.left.tokens.value.text === '1') {
+                        return new BinaryExpression({
+                            left: createIntegerLiteral('3'),
+                            operator: createToken(TokenKind.Plus),
+                            right: createIntegerLiteral('4')
+                        });
                     }
                 },
                 LiteralExpression: (node) => {
-                    walkedLiterals.push(node.token.text);
+                    walkedLiterals.push(node.tokens.value.text);
                 }
             }), {
                 walkMode: WalkMode.visitAllRecursive
@@ -1221,6 +1368,92 @@ describe('astUtils visitors', () => {
             expect(walkedLiterals).to.eql(['3', '4']);
         });
 
+        it('can set bsConst in walk', () => {
+            const { ast } = program.setFile<BrsFile>('source/main.brs', `
+                #if DEBUG
+                sub main()
+                end sub
+                #end if
+            `);
+            const bsConsts = new Map<string, boolean>();
+            let foundMainFunc = false;
+            const visitor = createVisitor({
+                FunctionStatement: (func) => {
+                    foundMainFunc ||= func.getName(ParseMode.BrighterScript) === 'main';
+                }
+            });
+            ast.walk(visitor, {
+                walkMode: WalkMode.visitStatements,
+                bsConsts: bsConsts
+            });
+            // did not walk false block
+            expect(foundMainFunc).to.be.false;
+            bsConsts.set('debug', true);
+            ast.walk(visitor, {
+                walkMode: WalkMode.visitStatements,
+                bsConsts: bsConsts
+            });
+            // debug is true, so it did walk block
+            expect(foundMainFunc).to.be.true;
+        });
+
+        it('can walk false cc blocks', () => {
+            const { ast } = program.setFile<BrsFile>('source/main.brs', `
+                #if false
+                sub main()
+                end sub
+                #end if
+            `);
+            const bsConsts = new Map<string, boolean>();
+            let foundMainFunc = false;
+            const visitor = createVisitor({
+                FunctionStatement: (func) => {
+                    foundMainFunc ||= func.getName(ParseMode.BrighterScript) === 'main';
+                }
+            });
+            ast.walk(visitor, {
+                walkMode: WalkMode.visitStatements,
+                bsConsts: bsConsts
+            });
+            // did not walk false block
+            expect(foundMainFunc).to.be.false;
+            ast.walk(visitor, {
+                // eslint-disable-next-line no-bitwise
+                walkMode: WalkMode.visitStatements | InternalWalkMode.visitFalseConditionalCompilationBlocks,
+                bsConsts: bsConsts
+            });
+            // did walk false block
+            expect(foundMainFunc).to.be.true;
+        });
+
+        it('will correctly walk `not condition` cc blocks', () => {
+            const { ast } = program.setFile<BrsFile>('source/main.brs', `
+                #const DEBUG = false
+                #if not DEBUG
+                sub notDebug()
+                end sub
+                #end if
+                #if not false
+                sub notFalse()
+                end sub
+                #end if
+            `);
+            const bsConsts = new Map<string, boolean>();
+            let functionsFound = new Set<string>();
+            const visitor = createVisitor({
+                FunctionStatement: (func) => {
+                    functionsFound.add(func.getName(ParseMode.BrighterScript));
+                }
+            });
+            ast.walk(visitor, {
+                walkMode: WalkMode.visitStatements,
+                bsConsts: bsConsts
+            });
+            // did walk 'not' block
+            expect(functionsFound.has('notDebug')).to.be.true;
+            expect(functionsFound.has('notFalse')).to.be.true;
+        });
+
         it('walks a new child when returned from a visitor and using an AstEditor', () => {
             let walkedLiterals: string[] = [];
 
@@ -1231,20 +1464,20 @@ describe('astUtils visitors', () => {
             `).ast.walk(createVisitor({
                 BinaryExpression: (node, parent, owner: Statement[], key) => {
                     //replace the `1 + 2` binary expression with a new binary expression
-                    if (isLiteralExpression(node.left) && node.left.token.text === '1') {
-                        return new BinaryExpression(
-                            createIntegerLiteral('3'),
-                            createToken(TokenKind.Plus),
-                            createIntegerLiteral('4')
-                        );
+                    if (isLiteralExpression(node.left) && node.left.tokens.value.text === '1') {
+                        return new BinaryExpression({
+                            left: createIntegerLiteral('3'),
+                            operator: createToken(TokenKind.Plus),
+                            right: createIntegerLiteral('4')
+                        });
                     }
                 },
                 LiteralExpression: (node) => {
-                    walkedLiterals.push(node.token.text);
+                    walkedLiterals.push(node.tokens.value.text);
                 }
             }), {
                 walkMode: WalkMode.visitAllRecursive,
-                editor: new AstEditor()
+                editor: new Editor()
             });
 
             expect(walkedLiterals).to.eql(['3', '4']);
@@ -1265,9 +1498,9 @@ describe('astUtils visitors', () => {
                 return visitor?.(item, parent, owner, key);
             }, { walkMode: WalkMode.visitAllRecursive });
             expect(
-                visitedItems.map(x => x.name.text)
+                visitedItems.map(x => x.tokens.name.text)
             ).to.eql(
-                expected.map(x => x.name.text)
+                expected.map(x => x.tokens.name.text)
             );
         }
 
diff --git a/src/astUtils/visitors.ts b/src/astUtils/visitors.ts
index 4c40c21ef..9d5e9dc43 100644
--- a/src/astUtils/visitors.ts
+++ b/src/astUtils/visitors.ts
@@ -1,12 +1,11 @@
 /* eslint-disable no-bitwise */
 import type { CancellationToken } from 'vscode-languageserver';
-import type { Body, AssignmentStatement, Block, ExpressionStatement, CommentStatement, ExitForStatement, ExitWhileStatement, FunctionStatement, IfStatement, IncrementStatement, PrintStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassStatement, ClassMethodStatement, ClassFieldStatement, EnumStatement, EnumMemberStatement, DimStatement, TryCatchStatement, CatchStatement, ThrowStatement, InterfaceStatement, InterfaceFieldStatement, InterfaceMethodStatement, FieldStatement, MethodStatement, ConstStatement, ContinueStatement, TypeStatement } from '../parser/Statement';
-import type { AAIndexedMemberExpression, AALiteralExpression, AAMemberExpression, AnnotationExpression, ArrayLiteralExpression, BinaryExpression, CallExpression, CallfuncExpression, DottedGetExpression, EscapedCharCodeLiteralExpression, FunctionExpression, FunctionParameterExpression, GroupingExpression, IndexedGetExpression, LiteralExpression, NamespacedVariableNameExpression, NewExpression, NullCoalescingExpression, RegexLiteralExpression, SourceLiteralExpression, TaggedTemplateStringExpression, TemplateStringExpression, TemplateStringQuasiExpression, TernaryExpression, UnaryExpression, VariableExpression, XmlAttributeGetExpression } from '../parser/Expression';
+import type { Body, AssignmentStatement, Block, ExpressionStatement, FunctionStatement, IfStatement, IncrementStatement, PrintStatement, GotoStatement, LabelStatement, ReturnStatement, EndStatement, StopStatement, ForStatement, ForEachStatement, WhileStatement, DottedSetStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, ImportStatement, ClassStatement, EnumStatement, EnumMemberStatement, DimStatement, TryCatchStatement, CatchStatement, ThrowStatement, InterfaceStatement, InterfaceFieldStatement, InterfaceMethodStatement, FieldStatement, MethodStatement, ConstStatement, ContinueStatement, TypecastStatement, AliasStatement, ConditionalCompileStatement, ConditionalCompileErrorStatement, ConditionalCompileConstStatement, AugmentedAssignmentStatement, ExitStatement, TypeStatement } from '../parser/Statement';
+import type { AAIndexedMemberExpression, AALiteralExpression, AAMemberExpression, AnnotationExpression, ArrayLiteralExpression, BinaryExpression, CallExpression, CallfuncExpression, DottedGetExpression, EscapedCharCodeLiteralExpression, FunctionExpression, FunctionParameterExpression, GroupingExpression, IndexedGetExpression, LiteralExpression, NewExpression, NullCoalescingExpression, RegexLiteralExpression, SourceLiteralExpression, TaggedTemplateStringExpression, TemplateStringExpression, TemplateStringQuasiExpression, TernaryExpression, TypecastExpression, TypeExpression, UnaryExpression, VariableExpression, XmlAttributeGetExpression } from '../parser/Expression';
 import { isExpression, isStatement } from './reflection';
-import type { AstEditor } from './AstEditor';
+import type { Editor } from './Editor';
 import type { Statement, Expression, AstNode } from '../parser/AstNode';
 
-
 /**
  * Walks the statements of a block and descendent sub-blocks, and allow replacing statements
  */
@@ -45,6 +44,10 @@ export function walk<T>(owner: T, key: keyof T, visitor: WalkVisitor, options: W
     parent = parent ?? owner as unknown as AstNode;
     element.parent = parent;
 
+    //get current bsConsts
+    if (!options.bsConsts) {
+        options.bsConsts = element.getBsConsts();
+    }
 
     //notify the visitor of this element
     if (element.visitMode & options.walkMode) {
@@ -68,6 +71,12 @@ export function walk<T>(owner: T, key: keyof T, visitor: WalkVisitor, options: W
         return returnValue;
     }
 
+    //do not walk children if skipped
+    if (options.skipChildren?.shouldSkipChildren) {
+        options.skipChildren.reset();
+        return;
+    }
+
     //get the element again in case it was replaced by the visitor
     element = owner[key] as any as AstNode;
     if (!element) {
@@ -128,14 +137,17 @@ export function walkArray<T extends AstNode = AstNode>(array: Array<T>, visitor:
  */
 export function createVisitor(
     visitor: {
+        /**
+         * Called for every Statement or Expression encountered by a walker (while still honoring the WalkMode options)
+         * The more specific visitor functions will still be called.
+         */
+        AstNode?: (node: Statement | Expression, parent?: AstNode, owner?: any, key?: any) => AstNode | void;
         //statements
         Body?: (statement: Body, parent?: Statement, owner?: any, key?: any) => Statement | void;
         AssignmentStatement?: (statement: AssignmentStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         Block?: (statement: Block, parent?: Statement, owner?: any, key?: any) => Statement | void;
         ExpressionStatement?: (statement: ExpressionStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
-        CommentStatement?: (statement: CommentStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
-        ExitForStatement?: (statement: ExitForStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
-        ExitWhileStatement?: (statement: ExitWhileStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
+        ExitStatement?: (statement: ExitStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         FunctionStatement?: (statement: FunctionStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         IfStatement?: (statement: IfStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         IncrementStatement?: (statement: IncrementStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
@@ -154,18 +166,11 @@ export function createVisitor(
         LibraryStatement?: (statement: LibraryStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         NamespaceStatement?: (statement: NamespaceStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         ImportStatement?: (statement: ImportStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
+        TypecastStatement?: (statement: TypecastStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         InterfaceStatement?: (statement: InterfaceStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         InterfaceFieldStatement?: (statement: InterfaceFieldStatement, parent?: Statement) => Statement | void;
         InterfaceMethodStatement?: (statement: InterfaceMethodStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         ClassStatement?: (statement: ClassStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
-        /**
-         * @deprecated use `MethodStatement`
-         */
-        ClassMethodStatement?: (statement: ClassMethodStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
-        /**
-         * @deprecated use `FieldStatement`
-         */
-        ClassFieldStatement?: (statement: ClassFieldStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         ContinueStatement?: (statement: ContinueStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         MethodStatement?: (statement: MethodStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         FieldStatement?: (statement: FieldStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
@@ -175,13 +180,16 @@ export function createVisitor(
         EnumStatement?: (statement: EnumStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         EnumMemberStatement?: (statement: EnumMemberStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
         ConstStatement?: (statement: ConstStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
-        TypeStatement?: (statement: TypeStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
+        ConditionalCompileStatement?: (statement: ConditionalCompileStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
+        ConditionalCompileConstStatement?: (statement: ConditionalCompileConstStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
+        ConditionalCompileErrorStatement?: (statement: ConditionalCompileErrorStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
+        AliasStatement?: (statement: AliasStatement, parent?: AstNode, owner?: any, key?: any) => Statement | void;
+        AugmentedAssignmentStatement?: (statement: AugmentedAssignmentStatement, parent?: AstNode, owner?: any, key?: any) => Statement | void;
         //expressions
         BinaryExpression?: (expression: BinaryExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         CallExpression?: (expression: CallExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         FunctionExpression?: (expression: FunctionExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         FunctionParameterExpression?: (expression: FunctionParameterExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
-        NamespacedVariableNameExpression?: (expression: NamespacedVariableNameExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         DottedGetExpression?: (expression: DottedGetExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         XmlAttributeGetExpression?: (expression: XmlAttributeGetExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         IndexedGetExpression?: (expression: IndexedGetExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
@@ -204,16 +212,15 @@ export function createVisitor(
         TernaryExpression?: (expression: TernaryExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         NullCoalescingExpression?: (expression: NullCoalescingExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
         RegexLiteralExpression?: (expression: RegexLiteralExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
+        TypeExpression?: (expression: TypeExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
+        TypecastExpression?: (expression: TypecastExpression, parent?: AstNode, owner?: any, key?: any) => Expression | void;
+        TypeStatement?: (statement: TypeStatement, parent?: Statement, owner?: any, key?: any) => Statement | void;
     }
 ) {
-    //remap some deprecated visitor names TODO remove this in v1
-    if (visitor.ClassFieldStatement) {
-        visitor.FieldStatement = visitor.ClassFieldStatement;
-    }
-    if (visitor.ClassMethodStatement) {
-        visitor.MethodStatement = visitor.ClassMethodStatement;
-    }
     return <WalkVisitor>((statement: Statement, parent?: Statement, owner?: any, key?: any): Statement | void => {
+        //call the generic AstNode visitor first (if defined)
+        visitor.AstNode?.(statement, parent, owner, key);
+        //now call the specifically-named visitor
         return visitor[statement.constructor.name]?.(statement, parent, owner, key);
     });
 }
@@ -229,11 +236,37 @@ export interface WalkOptions {
      */
     cancel?: CancellationToken;
     /**
-     * If provided, any AST replacements will be done using this AstEditor instead of directly against the AST itself
+     * If provided, any AST replacements will be done using this Editor instead of directly against the AST itself
      */
-    editor?: AstEditor;
+    editor?: Editor;
+    /**
+     * A token that can be used to stop the walk from going any deeper in the current node,
+     * but will continue walking sibling nodes
+     */
+    skipChildren?: ChildrenSkipper;
+    /**
+     * Map of Conditional compilation flags, with names in lowercase
+     */
+    bsConsts?: Map<string, boolean>;
+}
+
+export class ChildrenSkipper {
+    private isSkipped = false;
+
+    public reset() {
+        this.isSkipped = false;
+    }
+
+    public skip() {
+        this.isSkipped = true;
+    }
+
+    get shouldSkipChildren() {
+        return this.isSkipped;
+    }
 }
 
+
 /**
  * An enum used to denote the specific WalkMode options (without
  */
@@ -257,7 +290,11 @@ export enum InternalWalkMode {
     /**
      * If child function expressions are encountered, this will allow the walker to step into them.
      */
-    recurseChildFunctions = 16
+    recurseChildFunctions = 16,
+    /**
+     * Step into conditional compilation blocks that are guarded by a flag that evaluates to false
+     */
+    visitFalseConditionalCompilationBlocks = 64
 }
 
 /* eslint-disable @typescript-eslint/prefer-literal-enum-member */
diff --git a/src/astUtils/xml.ts b/src/astUtils/xml.ts
index 11c2df7fa..622209e30 100644
--- a/src/astUtils/xml.ts
+++ b/src/astUtils/xml.ts
@@ -1,26 +1,26 @@
-import type { SGChildren, SGComponent, SGField, SGFunction, SGInterface, SGNode, SGScript, SGTag } from '../parser/SGTypes';
+import type { SGChildren, SGComponent, SGInterfaceField, SGInterfaceFunction, SGInterface, SGNode, SGScript, SGElement } from '../parser/SGTypes';
 
-export function isSGComponent(tag: SGTag): tag is SGComponent {
+export function isSGComponent(tag: SGElement): tag is SGComponent {
     return tag?.constructor.name === 'SGComponent';
 }
-export function isSGInterface(tag: SGTag): tag is SGInterface {
+export function isSGInterface(tag: SGElement): tag is SGInterface {
     return tag?.constructor.name === 'SGInterface';
 }
-export function isSGScript(tag: SGTag): tag is SGScript {
+export function isSGScript(tag: SGElement): tag is SGScript {
     return tag?.constructor.name === 'SGScript';
 }
-export function isSGChildren(tag: SGTag): tag is SGChildren {
+export function isSGChildren(tag: SGElement): tag is SGChildren {
     return tag?.constructor.name === 'SGChildren';
 }
-export function isSGField(tag: SGTag): tag is SGField {
+export function isSGInterfaceField(tag: SGElement): tag is SGInterfaceField {
     return tag?.constructor.name === 'SGField';
 }
-export function isSGFunction(tag: SGTag): tag is SGFunction {
+export function isSGInterfaceFunction(tag: SGElement): tag is SGInterfaceFunction {
     return tag?.constructor.name === 'SGFunction';
 }
-export function isSGNode(tag: SGTag): tag is SGNode {
+export function isSGNode(tag: SGElement): tag is SGNode {
     return tag?.constructor.name === 'SGNode';
 }
-export function isSGCustomization(tag: SGTag): tag is SGNode {
-    return isSGNode(tag) && tag.tag?.text?.toLowerCase() === 'customization';
+export function isSGCustomization(tag: SGElement): tag is SGNode {
+    return isSGNode(tag) && tag.tokens.startTagName?.text?.toLowerCase() === 'customization';
 }
diff --git a/src/bscPlugin/BscPlugin.ts b/src/bscPlugin/BscPlugin.ts
index d9c338dfa..299a6b7e3 100644
--- a/src/bscPlugin/BscPlugin.ts
+++ b/src/bscPlugin/BscPlugin.ts
@@ -1,6 +1,5 @@
 import { isBrsFile, isXmlFile } from '../astUtils/reflection';
-import type { BeforeFileTranspileEvent, Plugin, OnFileValidateEvent, OnGetCodeActionsEvent, OnGetSourceFixAllCodeActionsEvent, ProvideHoverEvent, OnGetSemanticTokensEvent, OnScopeValidateEvent, ProvideCompletionsEvent, ProvideDefinitionEvent, ProvideReferencesEvent, ProvideDocumentSymbolsEvent, ProvideWorkspaceSymbolsEvent, ProvideSelectionRangesEvent } from '../interfaces';
-import type { Program } from '../Program';
+import type { Plugin, ValidateFileEvent, ProvideCodeActionsEvent, ProvideHoverEvent, ProvideSemanticTokensEvent, ValidateScopeEvent, ProvideCompletionsEvent, ProvideDefinitionEvent, ProvideReferencesEvent, ProvideDocumentSymbolsEvent, ProvideWorkspaceSymbolsEvent, AfterProvideFileEvent, AfterValidateFileEvent, AfterValidateProgramEvent, AfterSerializeFileEvent, BeforeBuildProgramEvent, OnPrepareFileEvent, WriteFileEvent, OnGetSourceFixAllCodeActionsEvent, ProvideSelectionRangesEvent } from '../interfaces';
 import { CodeActionsProcessor } from './codeActions/CodeActionsProcessor';
 import { FixAllCodeActionsProcessor } from './codeActions/FixAllCodeActionsProcessor';
 import { CompletionsProcessor } from './completions/CompletionsProcessor';
@@ -9,18 +8,30 @@ import { DocumentSymbolProcessor } from './symbols/DocumentSymbolProcessor';
 import { HoverProcessor } from './hover/HoverProcessor';
 import { ReferencesProvider } from './references/ReferencesProvider';
 import { BrsFileSemanticTokensProcessor } from './semanticTokens/BrsFileSemanticTokensProcessor';
-import { BrsFilePreTranspileProcessor } from './transpile/BrsFilePreTranspileProcessor';
 import { BrsFileValidator } from './validation/BrsFileValidator';
 import { ProgramValidator } from './validation/ProgramValidator';
 import { ScopeValidator } from './validation/ScopeValidator';
 import { XmlFileValidator } from './validation/XmlFileValidator';
 import { WorkspaceSymbolProcessor } from './symbols/WorkspaceSymbolProcessor';
+import type { BrsFile } from '../files/BrsFile';
+import type { XmlFile } from '../files/XmlFile';
+import { FileWriter } from './FileWriter';
+import { FileProvider } from './fileProviders/FileProvider';
+import { BslibManager } from './serialize/BslibManager';
+import { FileSerializer } from './serialize/FileSerializer';
+import { BrsFilePreTranspileProcessor } from './transpile/BrsFileTranspileProcessor';
+import { XmlFilePreTranspileProcessor } from './transpile/XmlFilePreTranspileProcessor';
+import { BrsFileAfterValidator } from './validation/BrsFileAfterValidator';
 import { SelectionRangesProcessor } from './selectionRanges/SelectionRangesProcessor';
 
 export class BscPlugin implements Plugin {
     public name = 'BscPlugin';
 
-    public onGetCodeActions(event: OnGetCodeActionsEvent) {
+    public afterProvideFile(event: AfterProvideFileEvent) {
+        new FileProvider(event).process();
+    }
+
+    public provideCodeActions(event: ProvideCodeActionsEvent) {
         new CodeActionsProcessor(event).process();
     }
 
@@ -56,35 +67,60 @@ export class BscPlugin implements Plugin {
         new SelectionRangesProcessor(event).process();
     }
 
-    public onGetSemanticTokens(event: OnGetSemanticTokensEvent) {
+    public provideSemanticTokens(event: ProvideSemanticTokensEvent) {
         if (isBrsFile(event.file)) {
             return new BrsFileSemanticTokensProcessor(event as any).process();
         }
     }
 
-    public onFileValidate(event: OnFileValidateEvent) {
+    public validateFile(event: ValidateFileEvent) {
         if (isBrsFile(event.file)) {
-            return new BrsFileValidator(event as any).process();
+            return new BrsFileValidator(event as ValidateFileEvent<BrsFile>).process();
         } else if (isXmlFile(event.file)) {
-            return new XmlFileValidator(event as any).process();
+            return new XmlFileValidator(event as ValidateFileEvent<XmlFile>).process();
+        }
+    }
+
+    public afterValidateFile(event: AfterValidateFileEvent) {
+        if (isBrsFile(event.file)) {
+            return new BrsFileAfterValidator(event as AfterValidateFileEvent<BrsFile>).process();
         }
     }
 
     private scopeValidator = new ScopeValidator();
 
-    public onScopeValidate(event: OnScopeValidateEvent) {
+    public validateScope(event: ValidateScopeEvent) {
         this.scopeValidator.processEvent(event);
     }
 
-    public afterProgramValidate(program: Program) {
-        new ProgramValidator(program).process();
+    public afterValidateProgram(event: AfterValidateProgramEvent) {
+        new ProgramValidator(event).process();
         //release memory once the validation cycle has finished
         this.scopeValidator.reset();
     }
 
-    public beforeFileTranspile(event: BeforeFileTranspileEvent) {
+    public beforeBuildProgram(event: BeforeBuildProgramEvent) {
+        this.bslibManager.addBslibFileIfMissing(event);
+    }
+    private bslibManager = new BslibManager();
+
+    /**
+     * Do transpiling-related work after all plugins had a chance to operate on the files
+     */
+    public prepareFile(event: OnPrepareFileEvent) {
         if (isBrsFile(event.file)) {
-            return new BrsFilePreTranspileProcessor(event as any).process();
+            return new BrsFilePreTranspileProcessor(event as OnPrepareFileEvent<BrsFile>).process();
+        } else if (isXmlFile(event.file)) {
+            return new XmlFilePreTranspileProcessor(event as OnPrepareFileEvent<XmlFile>).process();
         }
     }
+
+    public async afterSerializeFile(event: AfterSerializeFileEvent) {
+        await new FileSerializer(event).process();
+    }
+
+    public async writeFile(event: WriteFileEvent) {
+        await new FileWriter(event).process();
+    }
+
 }
diff --git a/src/bscPlugin/CallExpressionInfo.ts b/src/bscPlugin/CallExpressionInfo.ts
index b14ab36d6..8d4ad4d8d 100644
--- a/src/bscPlugin/CallExpressionInfo.ts
+++ b/src/bscPlugin/CallExpressionInfo.ts
@@ -1,5 +1,5 @@
 import type { Expression } from '../parser/AstNode';
-import type { CallExpression, CallfuncExpression, NewExpression } from '../parser/Expression';
+import type { CallExpression, CallfuncExpression, NewExpression, VariableExpression } from '../parser/Expression';
 import type { ClassStatement } from '../parser/Statement';
 import { isCallExpression, isCallfuncExpression, isVariableExpression, isDottedGetExpression, isClassStatement, isNewExpression } from '../astUtils/reflection';
 import type { BrsFile } from '../files/BrsFile';
@@ -25,7 +25,7 @@ export class CallExpressionInfo {
     expression?: Expression;
 
     //the contextually relevant callExpression, which relates to it
-    callExpression?: CallExpression;
+    callExpression?: CallExpression | CallfuncExpression;
     type: CallExpressionType;
 
     file: BrsFile;
@@ -67,15 +67,15 @@ export class CallExpressionInfo {
             this.newExpression = callExpression.parent;
         }
         if (isCallfuncExpression(callExpression)) {
-            this.name = callExpression.methodName.text;
+            this.name = callExpression.tokens.methodName.text;
         } else if (isVariableExpression(callExpression.callee)) {
-            this.name = callExpression.callee.name.text;
+            this.name = callExpression.callee.tokens.name.text;
         } else if (isVariableExpression(callExpression)) {
-            this.name = callExpression.name.text;
+            this.name = (callExpression as VariableExpression).tokens.name.text;
         } else if (isDottedGetExpression(callExpression.callee)) {
-            this.name = callExpression.callee.name.text;
+            this.name = callExpression.callee.tokens.name.text;
             if (isDottedGetExpression(callExpression.callee) && isVariableExpression(callExpression.callee.obj)) {
-                this.isCallingMethodOnMyClass = callExpression.callee.obj.name.text === 'm';
+                this.isCallingMethodOnMyClass = callExpression.callee.obj.tokens.name.text === 'm';
 
             } else {
                 let parts = util.getAllDottedGetParts(callExpression.callee);
@@ -96,11 +96,11 @@ export class CallExpressionInfo {
         if (!this.callExpression) {
             return false;
         }
-        let boundingRange = util.createBoundingRange(this.callExpression.openingParen, this.callExpression.closingParen);
+        let boundingRange = util.createBoundingRange(this.callExpression.tokens.openingParen?.location, this.callExpression.tokens.closingParen?.location);
         return util.rangeContains(boundingRange, this.position);
     }
 
-    ascertainCallExpression(): CallExpression {
+    ascertainCallExpression(): CallExpression | CallfuncExpression {
         let expression = this.expression;
         function isCallFuncOrCallExpression(expression: Expression) {
             return isCallfuncExpression(expression) || isCallExpression(expression);
@@ -116,7 +116,7 @@ export class CallExpressionInfo {
 
         if (!callExpression && isCallExpression(expression)) {
             //let's check to see if we are in a space, in the args of a valid CallExpression
-            let boundingRange = util.createBoundingRange(expression.openingParen, expression.closingParen);
+            let boundingRange = util.createBoundingRange(expression.tokens.openingParen, expression.tokens.closingParen);
             if (util.rangeContains(boundingRange, this.position)) {
                 callExpression = expression;
             }
@@ -159,7 +159,7 @@ export class CallExpressionInfo {
         }
         for (let i = this.callExpression.args.length - 1; i > -1; i--) {
             let argExpression = this.callExpression.args[i];
-            let comparison = util.comparePositionToRange(this.position, argExpression.range);
+            let comparison = util.comparePositionToRange(this.position, argExpression.location?.range);
             if (comparison >= 0) {
                 return i + comparison;
             }
diff --git a/src/bscPlugin/FileWriter.ts b/src/bscPlugin/FileWriter.ts
new file mode 100644
index 000000000..2071b4c8f
--- /dev/null
+++ b/src/bscPlugin/FileWriter.ts
@@ -0,0 +1,74 @@
+import type { WriteFileEvent } from '../interfaces';
+import * as fsExtra from 'fs-extra';
+import * as path from 'path';
+
+export class FileWriter {
+    constructor(
+        private event: WriteFileEvent
+    ) { }
+
+    public async process() {
+        //if no plugin has handled this file yet, we will handle it
+        if (!this.event.processedFiles.has(this.event.file)) {
+            if (this.event.file.data) {
+                let data = this.event.file.data;
+                //finalize sourcemap source paths now that we know the absolute output path of the
+                //.map file. Doing this here (rather than in serialize) means we can compute
+                //sources[] paths that are relative to the actual map location on disk.
+                if (this.event.file.pkgPath?.endsWith('.map')) {
+                    data = this.transformSourceMap(data);
+                }
+                //write the file to disk
+                await fsExtra.outputFile(this.event.outputPath, data);
+                this.event.processedFiles.add(this.event.file);
+            } else {
+                console.warn(`Missing file data for: "${this.event.file.pkgPath}"`);
+            }
+        }
+    }
+
+    /**
+     * Apply `relativeSourceMaps` and `sourceRoot` BsConfig options to the sources[] array of
+     * the source map, using the .map file's absolute output path to compute relative entries.
+     *
+     * - `relativeSourceMaps: false` (default): leave sources[] as-is (absolute paths produced by
+     *    the transpile step, with `rootDir` already replaced by `sourceRoot` if configured).
+     * - `relativeSourceMaps: true` + no `sourceRoot`: rewrite each absolute source path to be
+     *    relative to the .map file's directory, so the map is portable across machines.
+     * - `relativeSourceMaps: true` + `sourceRoot`: write the `sourceRoot` field and make each
+     *    sources[] entry relative to `sourceRoot` (per the sourcemap spec — consumers
+     *    reconstruct the full path as `path.resolve(sourceRoot, sources[0])`).
+     */
+    private transformSourceMap(data: Buffer): Buffer {
+        const { relativeSourceMaps, sourceRoot } = this.event.program.options;
+        if (!relativeSourceMaps) {
+            return data;
+        }
+        let mapJson: { sources?: string[]; sourceRoot?: string };
+        try {
+            mapJson = JSON.parse(data.toString('utf8'));
+        } catch {
+            //not valid json, leave it alone
+            return data;
+        }
+        if (!Array.isArray(mapJson.sources)) {
+            return data;
+        }
+        const outputPath = this.event.outputPath;
+        if (sourceRoot) {
+            mapJson.sourceRoot = sourceRoot;
+            mapJson.sources = mapJson.sources.map(source => {
+                const absolute = path.isAbsolute(source) ? source : path.resolve(path.dirname(outputPath), source);
+                return path.relative(sourceRoot, absolute).replace(/\\/g, '/');
+            });
+        } else {
+            const mapDir = path.dirname(outputPath);
+            mapJson.sources = mapJson.sources.map(source => {
+                return path.isAbsolute(source)
+                    ? path.relative(mapDir, source).replace(/\\/g, '/')
+                    : source;
+            });
+        }
+        return Buffer.from(JSON.stringify(mapJson));
+    }
+}
diff --git a/src/bscPlugin/SignatureHelpUtil.ts b/src/bscPlugin/SignatureHelpUtil.ts
index f0b052d04..fc9bf36c5 100644
--- a/src/bscPlugin/SignatureHelpUtil.ts
+++ b/src/bscPlugin/SignatureHelpUtil.ts
@@ -75,18 +75,17 @@ export class SignatureHelpUtil {
             return undefined;
         }
         const func = statement.func;
-        const funcStartPosition = func.range.start;
+        const funcStartPosition = func.location?.range.start;
 
         // Get function comments in reverse order
-        let currentToken = file.getTokenAt(funcStartPosition);
+        const trivia = util.concatAnnotationLeadingTrivia(func).reverse();
         let functionComments = [] as string[];
-        while (currentToken) {
-            currentToken = file.getPreviousToken(currentToken);
 
+        for (const currentToken of trivia) {
             if (!currentToken) {
                 break;
             }
-            if (currentToken.range.start.line + 1 < funcStartPosition.line) {
+            if (currentToken.location?.range.start.line + 1 < funcStartPosition.line) {
                 if (functionComments.length === 0) {
                     break;
                 }
@@ -106,6 +105,7 @@ export class SignatureHelpUtil {
                     break;
                 }
                 functionComments.unshift(currentToken.text);
+            } else if (kind === TokenKind.Whitespace) {
             } else {
                 break;
             }
@@ -114,14 +114,14 @@ export class SignatureHelpUtil {
         const documentation = functionComments.join('').trim();
 
         const lines = util.splitIntoLines(file.fileContents);
-        let key = statement.name.text + documentation;
+        let key = statement.tokens.name.text + documentation;
         const params = [] as ParameterInformation[];
         for (const param of func.parameters) {
-            params.push(ParameterInformation.create(param.name.text));
-            key += param.name.text;
+            params.push(ParameterInformation.create(param.tokens.name.text));
+            key += param.tokens.name.text;
         }
 
-        let label = util.getTextForRange(lines, util.createRangeFromPositions(func.functionType.range.start, func.body.range.start)).trim();
+        let label = util.getTextForRange(lines, util.createRangeFromPositions(func.tokens.functionType?.location?.range.start, func.body.location?.range.start)).trim();
         if (namespaceName) {
             label = label.replace(/^(sub | function )/gim, `$1${namespaceName}.`);
         }
@@ -149,7 +149,4 @@ export class SignatureHelpUtil {
         }
         return sigHelp;
     }
-
-
 }
-
diff --git a/src/bscPlugin/codeActions/CodeActionsProcessor.spec.ts b/src/bscPlugin/codeActions/CodeActionsProcessor.spec.ts
index 6a237bd5c..666302188 100644
--- a/src/bscPlugin/codeActions/CodeActionsProcessor.spec.ts
+++ b/src/bscPlugin/codeActions/CodeActionsProcessor.spec.ts
@@ -1,10 +1,10 @@
 import { expect } from '../../chai-config.spec';
-import { URI } from 'vscode-uri';
 import type { Range } from 'vscode-languageserver';
-import type { BscFile, OnGetCodeActionsEvent } from '../../interfaces';
 import { Program } from '../../Program';
 import { expectCodeActions, trim } from '../../testHelpers.spec';
 import { standardizePath as s, util } from '../../util';
+import type { BscFile } from '../../files/BscFile';
+import type { ProvideCodeActionsEvent } from '../../interfaces';
 import { rootDir } from '../../testHelpers.spec';
 import { CodeActionsProcessor } from './CodeActionsProcessor';
 
@@ -29,7 +29,13 @@ describe('CodeActionsProcessor', () => {
             program.getCodeActions(
                 typeof file === 'string' ? file : file.srcPath,
                 range
-            ).map(x => x.title).sort()
+            )
+                //the bs:disable-{line,file} suggestions fire for every diagnostic with a `code`,
+                //which is most of them. The legacy code-action specs predate that feature; filter
+                //the disable suggestions out so each spec can focus on the fix it cares about.
+                .map(x => x.title)
+                .filter(title => !title.startsWith('Disable '))
+                .sort()
         ).to.eql(expected);
     }
 
@@ -94,7 +100,7 @@ describe('CodeActionsProcessor', () => {
                 util.createRange(1, 5, 1, 5)
             );
             expect(
-                codeActions[0].edit!.changes![URI.file(s`${rootDir}/components/comp1.xml`).toString()][0].range
+                codeActions[0].edit!.changes![util.pathToUri(s`${rootDir}/components/comp1.xml`)][0].range
             ).to.eql(
                 util.createRange(1, 51, 1, 51)
             );
@@ -132,15 +138,9 @@ describe('CodeActionsProcessor', () => {
                 </component>
             `);
 
-            program.validate();
-
             //we should only get each file import suggestion exactly once
-            const codeActions = program.getCodeActions(
-                componentCommonFile.srcPath,
-                // doSome|thing()
-                util.createRange(2, 22, 2, 22)
-            );
-            expect(codeActions.map(x => x.title).sort()).to.eql([
+            // doSome|thing()
+            testGetCodeActions(componentCommonFile, util.createRange(2, 22, 2, 22), [
                 `import "pkg:/components/lib1.brs"`,
                 `import "pkg:/components/lib2.brs"`
             ]);
@@ -169,12 +169,13 @@ describe('CodeActionsProcessor', () => {
 
             program.validate();
 
-            //there should be no code actions since this is a brs file
+            //there should be no code actions since this is a brs file (other than the
+            //bs:disable suggestions, which fire on every diagnostic with a `code`)
             const codeActions = program.getCodeActions(
                 file.srcPath,
                 // DoSometh|ing()
                 util.createRange(2, 28, 2, 28)
-            );
+            ).filter(action => !action.title?.startsWith('Disable '));
             expect(codeActions).to.be.empty;
         });
 
@@ -197,15 +198,8 @@ describe('CodeActionsProcessor', () => {
                 end class
             `);
 
-            program.validate();
-
-            expect(
-                program.getCodeActions(
-                    file.srcPath,
-                    // new Per|son()
-                    util.createRange(2, 34, 2, 34)
-                ).map(x => x.title).sort()
-            ).to.eql([
+            // new Per|son()
+            testGetCodeActions(file, util.createRange(2, 34, 2, 34), [
                 `import "pkg:/source/Person.bs"`
             ]);
         });
@@ -214,7 +208,7 @@ describe('CodeActionsProcessor', () => {
             //import the file in two scopes
             program.setFile('components/comp1.xml', trim`
                 <?xml version="1.0" encoding="utf-8" ?>
-                <component name="ChildScene">
+                <component name="ChildScene" extends="Group">
                     <script uri="comp1.bs" />
                 </component>
             `);
@@ -231,15 +225,8 @@ describe('CodeActionsProcessor', () => {
                 end namespace
             `);
 
-            program.validate();
-
-            expect(
-                program.getCodeActions(
-                    file.srcPath,
-                    // new Anim|als.Cat()
-                    util.createRange(2, 36, 2, 36)
-                ).map(x => x.title).sort()
-            ).to.eql([
+            // new Anim|als.Cat()
+            testGetCodeActions(file, util.createRange(2, 36, 2, 36), [
                 `import "pkg:/source/Animals.bs"`
             ]);
         });
@@ -257,7 +244,7 @@ describe('CodeActionsProcessor', () => {
                     end function
                 end namespace
             `);
-            program.setFile('components/MainScene.xml', trim`<component name="MainScene"></component>`);
+            program.setFile('components/MainScene.xml', trim`<component name="MainScene" extends="Scene"></component>`);
             const file = program.setFile('components/MainScene.bs', `
                 sub init()
                     print alpha.secondAction()
@@ -290,12 +277,13 @@ describe('CodeActionsProcessor', () => {
             program.validate();
 
             const range = util.createRange(2, 24, 2, 24);
-            const event: OnGetCodeActionsEvent = {
+            const fileUri = util.pathToUri(file.srcPath);
+            const event: ProvideCodeActionsEvent = {
                 program: program,
                 file: file,
                 range: range,
                 scopes: program.getScopesForFile(file),
-                diagnostics: program.getDiagnostics().filter(d => d.file === file && util.rangesIntersectOrTouch(d.range, range)),
+                diagnostics: program.getDiagnostics().filter(d => d.location?.uri === fileUri && util.rangesIntersectOrTouch(d.location.range, range)),
                 codeActions: []
             };
 
@@ -325,7 +313,7 @@ describe('CodeActionsProcessor', () => {
                     end function
                 end namespace
             `);
-            program.setFile('components/MainScene.xml', trim`<component name="MainScene"></component>`);
+            program.setFile('components/MainScene.xml', trim`<component name="MainScene" extends="Scene"></component>`);
             const file = program.setFile('components/MainScene.bs', `
                 import "pkg:/source/first.bs"
                 sub init()
@@ -468,7 +456,7 @@ describe('CodeActionsProcessor', () => {
                 end function
             end namespace
         `);
-        program.setFile('components/MainScene.xml', trim`<component name="MainScene"></component>`);
+        program.setFile('components/MainScene.xml', trim`<component name="MainScene" extends="Scene"></component>`);
         const file = program.setFile('components/MainScene.bs', `
             sub init()
                 print alpha.firstAction()
@@ -596,7 +584,7 @@ describe('CodeActionsProcessor', () => {
     });
 
     describe('typed function/sub empty return', () => {
-        it('suggests deleting the return value and converting the sub to a function', () => {
+        it('suggests adding `as void` to function declaration or converting to sub', () => {
             const file = program.setFile('source/main.brs', `
                 function test()
                     'need a return value here...
@@ -628,7 +616,7 @@ describe('CodeActionsProcessor', () => {
             expect(changes[0].newText).to.eql(' as void');
         });
 
-        it('suggests deleting the return type from void function', () => {
+        it('suggests removing the return type from sub with return type', () => {
             const file = program.setFile('source/main.brs', `
                 sub test() as integer
                     'need a return value here...
diff --git a/src/bscPlugin/codeActions/CodeActionsProcessor.ts b/src/bscPlugin/codeActions/CodeActionsProcessor.ts
index 0ab7dbdad..7bfc509cf 100644
--- a/src/bscPlugin/codeActions/CodeActionsProcessor.ts
+++ b/src/bscPlugin/codeActions/CodeActionsProcessor.ts
@@ -1,24 +1,27 @@
-import type { Diagnostic } from 'vscode-languageserver';
 import { CodeActionKind } from 'vscode-languageserver';
 import { codeActionUtil } from '../../CodeActionUtil';
 import type { DeleteChange, InsertChange, ReplaceChange } from '../../CodeActionUtil';
 import type { DiagnosticMessageType } from '../../DiagnosticMessages';
 import { DiagnosticCodeMap } from '../../DiagnosticMessages';
 import type { BrsFile } from '../../files/BrsFile';
+import type { BscFile } from '../../files/BscFile';
 import type { XmlFile } from '../../files/XmlFile';
-import type { BscFile, BsDiagnostic, OnGetCodeActionsEvent } from '../../interfaces';
+import type { BsDiagnostic, ProvideCodeActionsEvent } from '../../interfaces';
 import { ParseMode } from '../../parser/Parser';
 import { util } from '../../util';
-import { isBrsFile, isFunctionExpression, isMethodStatement } from '../../astUtils/reflection';
+import { isBrsFile, isFunctionExpression, isMethodStatement, isVoidType, isXmlFile } from '../../astUtils/reflection';
 import type { FunctionExpression } from '../../parser/Expression';
 import type { MethodStatement } from '../../parser/Statement';
 import { WalkMode } from '../../astUtils/visitors';
 import { TokenKind } from '../../lexer/TokenKind';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
 import { getMissingExtendsInsertPosition } from './codeActionHelpers';
+import { rangeFromTokenValue } from '../../parser/SGParser';
+import type { Range } from 'vscode-languageserver';
 
 export class CodeActionsProcessor {
     public constructor(
-        public event: OnGetCodeActionsEvent
+        public event: ProvideCodeActionsEvent
     ) {
 
     }
@@ -31,8 +34,6 @@ export class CodeActionsProcessor {
         for (const diagnostic of this.event.diagnostics) {
             if (diagnostic.code === DiagnosticCodeMap.cannotFindName || diagnostic.code === DiagnosticCodeMap.cannotFindFunction) {
                 this.suggestCannotFindNameQuickFix(diagnostic as any);
-            } else if (diagnostic.code === DiagnosticCodeMap.classCouldNotBeFound) {
-                this.suggestClassImportQuickFix(diagnostic as any);
             } else if (diagnostic.code === DiagnosticCodeMap.xmlComponentMissingExtendsAttribute) {
                 this.suggestMissingExtendsQuickFix(diagnostic as any);
             } else if (diagnostic.code === DiagnosticCodeMap.voidFunctionMayNotReturnValue) {
@@ -66,14 +67,14 @@ export class CodeActionsProcessor {
                     this.suggestVoidFunctionReturnQuickFixes(allInFile);
                 } else if (code === DiagnosticCodeMap.nonVoidFunctionMustReturnValue) {
                     this.suggestNonVoidFunctionReturnQuickFixes(allInFile);
-                } else if (code === DiagnosticCodeMap.unnecessaryCodebehindScriptImport) {
-                    this.suggestRemoveScriptImportQuickFixes(allInFile);
                 } else if (code === DiagnosticCodeMap.cannotUseOverrideKeywordOnConstructorFunction) {
                     this.suggestRemoveOverrideFromConstructorQuickFixes(allInFile);
                 } else if (code === DiagnosticCodeMap.referencedFileDoesNotExist) {
                     this.suggestRemoveScriptImportQuickFixes(allInFile);
                 } else if (code === DiagnosticCodeMap.unnecessaryScriptImportInChildFromParent) {
                     this.suggestRemoveScriptImportQuickFixes(allInFile);
+                } else if (code === DiagnosticCodeMap.unnecessaryCodebehindScriptImport) {
+                    this.suggestRemoveScriptImportQuickFixes(allInFile);
                 } else if (code === DiagnosticCodeMap.scriptImportCaseMismatch) {
                     this.suggestScriptImportCasingQuickFixes(allInFile as DiagnosticMessageType<'scriptImportCaseMismatch'>[]);
                 } else if (code === DiagnosticCodeMap.missingOverrideKeyword) {
@@ -85,47 +86,240 @@ export class CodeActionsProcessor {
         // Import fix-all aggregates across multiple codes so it runs as its own step
         if (
             eventCodes.has(DiagnosticCodeMap.cannotFindName) ||
-            eventCodes.has(DiagnosticCodeMap.cannotFindFunction) ||
-            eventCodes.has(DiagnosticCodeMap.classCouldNotBeFound)
+            eventCodes.has(DiagnosticCodeMap.cannotFindFunction)
         ) {
             this.suggestMissingImportsFixAllQuickFix();
         }
 
+        // Suppression actions appear last so real fixes are surfaced first
+        for (const diagnostic of this.event.diagnostics) {
+            this.suggestDisableDiagnosticQuickFixes(diagnostic);
+        }
+
         this.suggestedImports.clear();
     }
 
+    /**
+     * For any diagnostic with a code, offers two quick-fix actions:
+     *   - "Disable {code} for this line": adds the code to an existing `bs:disable-line` or
+     *     `bs:disable-next-line` directive on/above the diagnostic if present, otherwise inserts
+     *     a new `bs:disable-next-line: {code}` comment on the line above.
+     *   - "Disable {code} for this file": adds the code to an existing header-level `bs:disable`
+     *     directive if present, otherwise inserts a new `bs:disable: {code}` at the top of the file.
+     *
+     * Comment placement and the line-vs-next-line preference are centralized here so they can be
+     * revisited without touching the directive parser.
+     */
+    private suggestDisableDiagnosticQuickFixes(diagnostic: BsDiagnostic) {
+        const code = diagnostic.code;
+        if (code === undefined || code === null) {
+            return;
+        }
+        const file = this.event.file;
+        if (!isBrsFile(file) && !isXmlFile(file)) {
+            return;
+        }
+        const codeStr = String(code);
+        const isXml = isXmlFile(file);
+        //existing.forLine: any line/next-line directive on or above the diagnostic line that the line action could extend
+        //existing.forFile: any header-level bs:disable that the file action could extend
+        const existing = this.findExistingDisableDirectives(file, diagnostic.location.range.start.line);
+
+        //format helpers wrap the directive body in the right comment syntax (`'` for brs, `<!-- -->` for xml)
+        const formatLineDirective = (token: 'line' | 'next-line', codes: string[]) => {
+            const body = `bs:disable-${token}: ${codes.join(' ')}`;
+            return isXml ? `<!-- ${body} -->` : `' ${body}`;
+        };
+        const formatBlockDirective = (codes: string[]) => {
+            const body = `bs:disable: ${codes.join(' ')}`;
+            return isXml ? `<!-- ${body} -->` : `' ${body}`;
+        };
+
+        // ---- "disable for this line" ----
+        //the two lambdas passed to getDiagnosticSuppressionChange are the "extend existing" and "insert fresh" branches:
+        //  1) rebuild the existing directive comment with the new code merged into its code list (preserving line vs next-line)
+        //  2) insert a fresh `bs:disable-next-line: {code}` on the line above the diagnostic, matching its indent
+        const indent = ' '.repeat(diagnostic.location.range.start.character);
+        const lineAction = this.getDiagnosticSuppressionChange(
+            existing.forLine,
+            codeStr,
+            () => formatLineDirective(existing.forLine!.type as 'line' | 'next-line', this.mergeCodes(existing.forLine?.codes, codeStr)),
+            () => ({
+                position: util.createPosition(diagnostic.location.range.start.line, 0),
+                newText: `${indent}${formatLineDirective('next-line', [codeStr])}\n`
+            })
+        );
+        if (lineAction) {
+            this.event.codeActions.push(
+                codeActionUtil.createCodeAction({
+                    title: `Disable ${code} for this line: ${diagnostic.message}`,
+                    diagnostics: [diagnostic],
+                    kind: CodeActionKind.QuickFix,
+                    changes: [lineAction]
+                })
+            );
+        }
+
+        // ---- "disable for this file" ----
+        //same pattern as above, but operating on the header-level bs:disable directive:
+        //  1) rebuild the existing header directive with the new code appended
+        //  2) insert a fresh `bs:disable: {code}` at the file header (top of brs, or after `<?xml ?>` for xml)
+        const fileAction = this.getDiagnosticSuppressionChange(
+            existing.forFile,
+            codeStr,
+            () => formatBlockDirective(this.mergeCodes(existing.forFile?.codes, codeStr)),
+            () => {
+                const headerInsert = this.getDisableFileInsertion(file);
+                return {
+                    position: headerInsert.position,
+                    newText: headerInsert.prefix + formatBlockDirective([codeStr]) + headerInsert.suffix
+                };
+            }
+        );
+        if (fileAction) {
+            this.event.codeActions.push(
+                codeActionUtil.createCodeAction({
+                    title: `Disable ${code} for this file: ${diagnostic.message}`,
+                    diagnostics: [diagnostic],
+                    kind: CodeActionKind.QuickFix,
+                    changes: [fileAction]
+                })
+            );
+        }
+    }
+
+    /**
+     * Returns the file change that suppresses `codeStr` via a directive comment, or `null` when no
+     * change is needed (the existing directive already covers the code, or already suppresses
+     * everything). When `existing` is set, the result is a replace that swaps the directive comment
+     * for the text from `buildReplacementText`. When `existing` is null, the result is an insert
+     * built from `buildInsert`.
+     */
+    private getDiagnosticSuppressionChange(
+        existing: ExistingDirective | null,
+        codeStr: string,
+        buildReplacementText: () => string,
+        buildInsert: () => { position: ReturnType<typeof util.createPosition>; newText: string }
+    ): InsertChange | ReplaceChange | null {
+        if (existing) {
+            //existing directive without specific codes already suppresses everything; no-op
+            if (existing.codes.length === 0) {
+                return null;
+            }
+            //the new code is already in the directive; no-op
+            if (existing.codes.some(c => c.toLowerCase() === codeStr.toLowerCase())) {
+                return null;
+            }
+            return {
+                type: 'replace',
+                filePath: this.event.file.srcPath,
+                range: existing.range,
+                newText: buildReplacementText()
+            };
+        }
+        const insert = buildInsert();
+        return {
+            type: 'insert',
+            filePath: this.event.file.srcPath,
+            position: insert.position,
+            newText: insert.newText
+        };
+    }
+
+    private mergeCodes(existingCodes: string[] | undefined, newCode: string): string[] {
+        return [...(existingCodes ?? []), newCode];
+    }
+
+    /**
+     * Walks the file's tokens and returns existing `bs:disable-{line,next-line}` and header-level
+     * `bs:disable` directives that would cover the diagnostic on `diagLine`. Used so the suppression
+     * quick fixes can extend an existing directive instead of stacking new ones.
+     */
+    private findExistingDisableDirectives(file: BscFile, diagLine: number): { forLine: ExistingDirective | null; forFile: ExistingDirective | null } {
+        const isXml = isXmlFile(file);
+        const tokens: any[] = (file as any).parser?.tokens ?? [];
+        let inHeader = true;
+        let forLine: ExistingDirective | null = null;
+        let forFile: ExistingDirective | null = null;
+        for (const token of tokens) {
+            const isComment = isXml ? token.tokenType?.name === 'Comment' : token.kind === TokenKind.Comment;
+            if (!isComment) {
+                if (isXml) {
+                    if (token.tokenType?.name === 'OPEN') {
+                        inHeader = false;
+                    }
+                } else if (token.kind !== TokenKind.Newline && token.kind !== TokenKind.Whitespace && token.kind !== TokenKind.Eof) {
+                    inHeader = false;
+                }
+                continue;
+            }
+            const tokenRange: Range = isXml ? rangeFromTokenValue(token) : token.location.range;
+            const tokenText: string = isXml ? token.image : token.text;
+            const parsed = parseDisableComment(tokenText);
+            if (!parsed) {
+                continue;
+            }
+            const directive: ExistingDirective = { type: parsed.directiveType, codes: parsed.codes, range: tokenRange };
+            if (!forLine && parsed.directiveType === 'line' && tokenRange.start.line === diagLine) {
+                forLine = directive;
+            } else if (!forLine && parsed.directiveType === 'next-line' && tokenRange.start.line === diagLine - 1) {
+                forLine = directive;
+            } else if (!forFile && parsed.directiveType === 'block' && inHeader) {
+                //only header-level `bs:disable` directives are extended for the file-level quick fix
+                forFile = directive;
+            }
+        }
+        return { forLine: forLine, forFile: forFile };
+    }
+
+    /**
+     * Decides where in the file a header-level `bs:disable` directive should be inserted, returning
+     * the position plus any prefix/suffix needed so the directive lands on its own line in
+     * the header (before the first executable statement / root XML element).
+     */
+    private getDisableFileInsertion(file: BscFile): { position: ReturnType<typeof util.createPosition>; prefix: string; suffix: string } {
+        if (isXmlFile(file)) {
+            //insert after the `<?xml ?>` declaration if present, otherwise at the very top
+            const declCloseToken = file.parser.tokens?.find(t => (t as any).tokenType?.name === 'SPECIAL_CLOSE');
+            if (declCloseToken) {
+                const endLine = (declCloseToken as any).endLine - 1;
+                const endColumn = (declCloseToken as any).endColumn;
+                return {
+                    position: util.createPosition(endLine, endColumn),
+                    prefix: '\n',
+                    suffix: ''
+                };
+            }
+        }
+        return {
+            position: util.createPosition(0, 0),
+            prefix: '',
+            suffix: '\n'
+        };
+    }
+
     /**
      * Builds a map of diagnostic code → all matching diagnostics in the current file for each
      * code in `eventCodes`. Scope-level codes are not present in `file.getDiagnostics()` so they
      * are sourced from `program.getDiagnostics()` (fetched lazily, only when needed).
      */
     private collectFixAllDiagnostics(eventCodes: Set<number | string>): Map<number | string, BsDiagnostic[]> {
-        const scopeLevelCodes = new Set<number | string>([
-            DiagnosticCodeMap.referencedFileDoesNotExist,
-            DiagnosticCodeMap.unnecessaryScriptImportInChildFromParent,
-            DiagnosticCodeMap.scriptImportCaseMismatch,
-            DiagnosticCodeMap.missingOverrideKeyword
-        ]);
+        const fileUri = util.pathToUri(this.event.file.srcPath);
+        const fileDiagnostics = this.event.program.getDiagnostics().filter(d => d.location?.uri === fileUri) as BsDiagnostic[];
 
         const fileDiagsByCode = new Map<number | string, BsDiagnostic[]>();
-        for (const d of this.event.file.getDiagnostics()) {
+        for (const d of fileDiagnostics) {
             if (!fileDiagsByCode.has(d.code)) {
                 fileDiagsByCode.set(d.code, []);
             }
             fileDiagsByCode.get(d.code).push(d);
         }
 
-        const allScopeFileDiags: BsDiagnostic[] = [...eventCodes].some(c => scopeLevelCodes.has(c))
-            ? this.event.program.getDiagnostics().filter(d => (d as BsDiagnostic).file === this.event.file) as BsDiagnostic[]
-            : [];
-
         const result = new Map<number | string, BsDiagnostic[]>();
         for (const code of eventCodes) {
             result.set(
                 code,
-                scopeLevelCodes.has(code)
-                    ? allScopeFileDiags.filter(d => d.code === code)
-                    : fileDiagsByCode.get(code) ?? []
+                fileDiagsByCode.get(code) ?? []
             );
         }
         return result;
@@ -136,20 +330,21 @@ export class CodeActionsProcessor {
     /**
      * Generic import suggestion function. Shouldn't be called directly from the main loop, but instead called by more specific diagnostic handlers
      */
-    private suggestImportQuickFix(diagnostic: Diagnostic, key: string, files: BscFile[]) {
+    private suggestImportQuickFix(diagnostic: BsDiagnostic, key: string, files: BscFile[]) {
         //skip if we already have this suggestion
         if (this.suggestedImports.has(key)) {
             return;
         }
 
         this.suggestedImports.add(key);
-        const importStatements = (this.event.file as BrsFile).parser.references.importStatements;
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        const importStatements = (this.event.file as BrsFile)['_cachedLookups'].importStatements;
         //find the position of the first import statement, or the top of the file if there is none
-        const insertPosition = importStatements[importStatements.length - 1]?.importToken.range?.start ?? util.createPosition(0, 0);
+        const insertPosition = importStatements[importStatements.length - 1]?.tokens.import.location.range?.start ?? util.createPosition(0, 0);
 
         //find all files that reference this function
         for (const file of files) {
-            const pkgPath = util.getRokuPkgPath(file.pkgPath);
+            const pkgPath = util.sanitizePkgPath(file.destPath);
             this.event.codeActions.push(
                 codeActionUtil.createCodeAction({
                     title: `import "${pkgPath}"`,
@@ -172,7 +367,7 @@ export class CodeActionsProcessor {
      */
     private suggestCannotFindNameQuickFix(diagnostic: DiagnosticMessageType<'cannotFindName'>) {
         //skip if not a BrighterScript file
-        if ((diagnostic.file as BrsFile).parseMode !== ParseMode.BrighterScript) {
+        if (!isBrsFile(this.event.file) || (this.event.file as BrsFile).parseMode !== ParseMode.BrighterScript) {
             return;
         }
         const lowerName = (diagnostic.data.fullName ?? diagnostic.data.name).toLowerCase();
@@ -181,30 +376,14 @@ export class CodeActionsProcessor {
             diagnostic,
             lowerName,
             [
-                ...this.event.file.program.findFilesForFunction(lowerName),
-                ...this.event.file.program.findFilesForClass(lowerName),
-                ...this.event.file.program.findFilesForNamespace(lowerName),
-                ...this.event.file.program.findFilesForEnum(lowerName)
+                ...this.event.program.findFilesForFunction(lowerName),
+                ...this.event.program.findFilesForClass(lowerName),
+                ...this.event.program.findFilesForNamespace(lowerName),
+                ...this.event.program.findFilesForEnum(lowerName)
             ]
         );
     }
 
-    /**
-     * Suggests import statements for an unresolved class name.
-     */
-    private suggestClassImportQuickFix(diagnostic: DiagnosticMessageType<'classCouldNotBeFound'>) {
-        //skip if not a BrighterScript file
-        if ((diagnostic.file as BrsFile).parseMode !== ParseMode.BrighterScript) {
-            return;
-        }
-        const lowerClassName = diagnostic.data.className.toLowerCase();
-        this.suggestImportQuickFix(
-            diagnostic,
-            lowerClassName,
-            this.event.file.program.findFilesForClass(lowerClassName)
-        );
-    }
-
     /**
      * Scans all import-related diagnostics in the file and emits a single composite
      * "Fix all: Add missing imports" action when 2+ unambiguous imports are needed.
@@ -216,15 +395,17 @@ export class CodeActionsProcessor {
             return;
         }
         const file = this.event.file;
-        const importStatements = file.parser.references.importStatements;
-        const insertPosition = importStatements[importStatements.length - 1]?.importToken.range?.start ?? util.createPosition(0, 0);
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        const importStatements = file['_cachedLookups'].importStatements;
+        const insertPosition = importStatements[importStatements.length - 1]?.tokens.import.location.range?.start ?? util.createPosition(0, 0);
 
         const changes: InsertChange[] = [];
         const addedPaths = new Set<string>();
 
         // cannotFindName/classCouldNotBeFound are scope-level diagnostics, so we must
         // use program.getDiagnostics() (filtered by file) rather than file.getDiagnostics().
-        const allFileDiagnostics = this.event.program.getDiagnostics().filter(d => d.file === file);
+        const fileUri = util.pathToUri(file.srcPath);
+        const allFileDiagnostics = this.event.program.getDiagnostics().filter(d => d.location?.uri === fileUri);
 
         for (const diagnostic of allFileDiagnostics) {
             let files: BscFile[] = [];
@@ -234,26 +415,20 @@ export class CodeActionsProcessor {
                 const lowerName = (cannotFindNameDiagnostic.data?.fullName ?? cannotFindNameDiagnostic.data?.name)?.toLowerCase();
                 if (lowerName) {
                     files = [
-                        ...file.program.findFilesForFunction(lowerName),
-                        ...file.program.findFilesForClass(lowerName),
-                        ...file.program.findFilesForNamespace(lowerName),
-                        ...file.program.findFilesForEnum(lowerName)
+                        ...this.event.program.findFilesForFunction(lowerName),
+                        ...this.event.program.findFilesForClass(lowerName),
+                        ...this.event.program.findFilesForNamespace(lowerName),
+                        ...this.event.program.findFilesForEnum(lowerName)
                     ];
                 }
-            } else if (diagnostic.code === DiagnosticCodeMap.classCouldNotBeFound) {
-                const classCouldNotBeFoundDiagnostic = diagnostic as DiagnosticMessageType<'classCouldNotBeFound'>;
-                const lowerClassName = classCouldNotBeFoundDiagnostic.data?.className?.toLowerCase();
-                if (lowerClassName) {
-                    files = file.program.findFilesForClass(lowerClassName);
-                }
             }
 
-            //skip ambiguous names — we can't choose a file automatically
+            //skip ambiguous names; we can't choose a file automatically
             if (files.length !== 1) {
                 continue;
             }
 
-            const pkgPath = util.getRokuPkgPath(files[0].pkgPath);
+            const pkgPath = util.sanitizePkgPath(files[0].destPath);
             if (!addedPaths.has(pkgPath)) {
                 addedPaths.add(pkgPath);
                 changes.push({
@@ -329,41 +504,41 @@ export class CodeActionsProcessor {
      * Adds code actions to resolve a `voidFunctionMayNotReturnValue` diagnostic.
      * Offers removing the return value, converting sub→function, or removing an `as void` return type.
      */
-    private suggestVoidFunctionReturnQuickFixes(diagnostics: Diagnostic[]) {
+    private suggestVoidFunctionReturnQuickFixes(diagnostics: BsDiagnostic[]) {
         const changes = diagnostics.map(d => this.getRemoveReturnValueChange(d));
         this.emitOrFixAll(`Remove return value`, `Fix all: Remove void return values`, changes, diagnostics[0]);
 
         //contextual BrsFile actions only apply to the individual (single-violation) case
         if (changes.length === 1 && isBrsFile(this.event.file)) {
             const diagnostic = diagnostics[0];
-            const expression = this.event.file.getClosestExpression(diagnostic.range.start);
+            const expression = this.event.file.getClosestExpression(diagnostic.location.range.start);
             const func = expression.findAncestor<FunctionExpression>(isFunctionExpression);
 
             //if we're in a sub and we do not have a return type, suggest converting to a function
-            if (func.functionType.kind === TokenKind.Sub && !func.returnTypeToken) {
+            if (func.tokens.functionType.kind === TokenKind.Sub && !func.returnTypeExpression) {
                 //find the first function in a file that uses the `function` keyword
                 const referenceFunction = this.event.file.parser.ast.findChild<FunctionExpression>((node) => {
-                    return isFunctionExpression(node) && node.functionType.kind === TokenKind.Function;
+                    return isFunctionExpression(node) && node.tokens.functionType.kind === TokenKind.Function;
                 });
-                const functionTypeText = referenceFunction?.functionType.text ?? 'function';
-                const endFunctionTypeText = referenceFunction?.end?.text ?? 'end function';
+                const functionTypeText = referenceFunction?.tokens.functionType.text ?? 'function';
+                const endFunctionTypeText = referenceFunction?.tokens.endFunctionType?.text ?? 'end function';
                 this.event.codeActions.push(
                     codeActionUtil.createCodeAction({
-                        title: `Convert ${func.functionType.text} to ${functionTypeText}`,
+                        title: `Convert ${func.tokens.functionType.text} to ${functionTypeText}`,
                         diagnostics: [diagnostic],
                         kind: CodeActionKind.QuickFix,
                         changes: [
                             //function
-                            { type: 'replace', filePath: this.event.file.srcPath, range: func.functionType.range, newText: functionTypeText },
+                            { type: 'replace', filePath: this.event.file.srcPath, range: func.tokens.functionType.location.range, newText: functionTypeText },
                             //end function
-                            { type: 'replace', filePath: this.event.file.srcPath, range: func.end.range, newText: endFunctionTypeText }
+                            { type: 'replace', filePath: this.event.file.srcPath, range: func.tokens.endFunctionType.location.range, newText: endFunctionTypeText }
                         ]
                     })
                 );
             }
 
             //function `as void` return type. Suggest removing the return type
-            if (func.functionType.kind === TokenKind.Function && func.returnTypeToken?.kind === TokenKind.Void) {
+            if (func.tokens.functionType.kind === TokenKind.Function && func.returnTypeExpression && isVoidType(func.returnTypeExpression.getType({ flags: SymbolTypeFlag.typetime }))) {
                 this.event.codeActions.push(
                     codeActionUtil.createCodeAction({
                         title: `Remove return type from function declaration`,
@@ -380,7 +555,7 @@ export class CodeActionsProcessor {
      * Adds code actions to resolve a `nonVoidFunctionMustReturnValue` diagnostic.
      * Offers removing the return type from a sub, adding `as void` to a function, or converting function→sub.
      */
-    private suggestNonVoidFunctionReturnQuickFixes(diagnostics: Diagnostic[]) {
+    private suggestNonVoidFunctionReturnQuickFixes(diagnostics: BsDiagnostic[]) {
         if (!isBrsFile(this.event.file)) {
             return;
         }
@@ -413,24 +588,24 @@ export class CodeActionsProcessor {
         const seenFunctions = new Set<string>();
 
         for (const d of diagnostics) {
-            const expr = file.getClosestExpression(d.range.start);
+            const expr = file.getClosestExpression(d.location.range.start);
             const fn = expr?.findAncestor<FunctionExpression>(isFunctionExpression);
             if (!fn) {
                 continue;
             }
-            const fnKey = `${fn.range.start.line}:${fn.range.start.character}`;
+            const fnKey = `${fn.location.range.start.line}:${fn.location.range.start.character}`;
             if (seenFunctions.has(fnKey)) {
                 continue;
             }
             seenFunctions.add(fnKey);
 
-            if (fn.functionType.kind === TokenKind.Sub && fn.returnTypeToken && fn.returnTypeToken.kind !== TokenKind.Void) {
+            if (fn.tokens.functionType.kind === TokenKind.Sub && fn.returnTypeExpression && !isVoidType(fn.returnTypeExpression.getType({ flags: SymbolTypeFlag.typetime }))) {
                 removeReturnTypeChanges.push(this.getRemoveFunctionReturnTypeChange(fn));
-            } else if (fn.functionType.kind === TokenKind.Function && !fn.returnTypeToken) {
+            } else if (fn.tokens.functionType.kind === TokenKind.Function && !fn.returnTypeExpression) {
                 addVoidChanges.push({
                     type: 'insert',
                     filePath: this.event.file.srcPath,
-                    position: fn.rightParen.range.end,
+                    position: fn.tokens.rightParen.location.range.end,
                     newText: ` ${asText ?? 'as'} ${voidText ?? 'void'}`
                 });
             }
@@ -452,15 +627,15 @@ export class CodeActionsProcessor {
 
         //'Convert function to sub' has no fix-all variant; only add it for the individual case
         if (addVoidChanges.length === 1 && diagnostics.length === 1) {
-            const func = file.getClosestExpression(diagnostics[0].range.start).findAncestor<FunctionExpression>(isFunctionExpression);
+            const func = file.getClosestExpression(diagnostics[0].location.range.start).findAncestor<FunctionExpression>(isFunctionExpression);
             this.event.codeActions.push(
                 codeActionUtil.createCodeAction({
                     title: `Convert function to sub`,
                     diagnostics: [diagnostics[0]],
                     kind: CodeActionKind.QuickFix,
                     changes: [
-                        { type: 'replace', filePath: file.srcPath, range: func.functionType.range, newText: subText ?? 'sub' },
-                        { type: 'replace', filePath: file.srcPath, range: func.end.range, newText: endSubText ?? 'end sub' }
+                        { type: 'replace', filePath: file.srcPath, range: func.tokens.functionType.location.range, newText: subText ?? 'sub' },
+                        { type: 'replace', filePath: file.srcPath, range: func.tokens.endFunctionType.location.range, newText: endSubText ?? 'end sub' }
                     ]
                 })
             );
@@ -472,8 +647,8 @@ export class CodeActionsProcessor {
     /**
      * Adds code actions to delete one or more unnecessary or broken script import lines.
      */
-    private suggestRemoveScriptImportQuickFixes(diagnostics: Diagnostic[]) {
-        const titles: Record<number, [string, string]> = {
+    private suggestRemoveScriptImportQuickFixes(diagnostics: BsDiagnostic[]) {
+        const titles: Record<string, [string, string]> = {
             [DiagnosticCodeMap.unnecessaryScriptImportInChildFromParent]: ['Remove redundant script import', 'Fix all: Remove redundant script imports'],
             [DiagnosticCodeMap.unnecessaryCodebehindScriptImport]: ['Remove unnecessary codebehind import', 'Fix all: Remove unnecessary codebehind imports']
         };
@@ -483,9 +658,9 @@ export class CodeActionsProcessor {
                 type: 'delete',
                 filePath: this.event.file.srcPath,
                 range: util.createRange(
-                    diagnostic.range.start.line,
+                    diagnostic.location.range.start.line,
                     0,
-                    diagnostic.range.start.line + 1,
+                    diagnostic.location.range.start.line + 1,
                     0
                 )
             };
@@ -506,7 +681,7 @@ export class CodeActionsProcessor {
             changes.push({
                 type: 'replace',
                 filePath: this.event.file.srcPath,
-                range: diagnostic.range,
+                range: diagnostic.location.range,
                 newText: correctFilePath
             });
         }
@@ -523,7 +698,7 @@ export class CodeActionsProcessor {
     /**
      * Adds code actions to insert the missing `override` keyword before a method declaration.
      */
-    private suggestMissingOverrideQuickFixes(diagnostics: Diagnostic[]) {
+    private suggestMissingOverrideQuickFixes(diagnostics: BsDiagnostic[]) {
         if (!isBrsFile(this.event.file)) {
             return;
         }
@@ -535,10 +710,10 @@ export class CodeActionsProcessor {
             file.ast.walk((node) => {
                 if (
                     isMethodStatement(node) &&
-                    node.range?.start?.line === diagnostic.range.start.line &&
-                    node.range?.start?.character === diagnostic.range.start.character
+                    node.location?.range?.start?.line === diagnostic.location.range.start.line &&
+                    node.location?.range?.start?.character === diagnostic.location.range.start.character
                 ) {
-                    insertPosition = (node as MethodStatement).func.functionType?.range?.start;
+                    insertPosition = (node as MethodStatement).func.tokens.functionType?.location?.range?.start;
                 }
             }, { walkMode: WalkMode.visitStatementsRecursive });
 
@@ -563,16 +738,16 @@ export class CodeActionsProcessor {
     /**
      * Adds code actions to remove the invalid `override` keyword from a constructor method.
      */
-    private suggestRemoveOverrideFromConstructorQuickFixes(diagnostics: Diagnostic[]) {
+    private suggestRemoveOverrideFromConstructorQuickFixes(diagnostics: BsDiagnostic[]) {
         const changes: DeleteChange[] = diagnostics.map(d => ({
             type: 'delete' as const,
             filePath: this.event.file.srcPath,
-            // delete "override " — the keyword token plus the trailing space before function/sub
+            // delete "override " (the keyword token plus the trailing space before function/sub)
             range: util.createRange(
-                d.range.start.line,
-                d.range.start.character,
-                d.range.end.line,
-                d.range.end.character + 1
+                d.location.range.start.line,
+                d.location.range.start.character,
+                d.location.range.end.line,
+                d.location.range.end.character + 1
             )
         }));
         this.emitOrFixAll(
@@ -589,15 +764,15 @@ export class CodeActionsProcessor {
      * Builds a delete change that removes the return value from a `return <expr>` statement,
      * leaving just a bare `return`.
      */
-    private getRemoveReturnValueChange(diagnostic: Diagnostic): DeleteChange {
+    private getRemoveReturnValueChange(diagnostic: BsDiagnostic): DeleteChange {
         return {
             type: 'delete',
             filePath: this.event.file.srcPath,
             range: util.createRange(
-                diagnostic.range.start.line,
-                diagnostic.range.start.character + 'return'.length,
-                diagnostic.range.end.line,
-                diagnostic.range.end.character
+                diagnostic.location.range.start.line,
+                diagnostic.location.range.start.character + 'return'.length,
+                diagnostic.location.range.end.line,
+                diagnostic.location.range.end.character
             )
         };
     }
@@ -612,10 +787,10 @@ export class CodeActionsProcessor {
             filePath: this.event.file.srcPath,
             // )| as <type>|
             range: util.createRange(
-                func.rightParen.range.start.line,
-                func.rightParen.range.start.character + 1,
-                func.returnTypeToken.range.end.line,
-                func.returnTypeToken.range.end.character
+                func.tokens.rightParen.location.range.start.line,
+                func.tokens.rightParen.location.range.start.character + 1,
+                func.returnTypeExpression.location.range.end.line,
+                func.returnTypeExpression.location.range.end.character
             )
         };
     }
@@ -629,7 +804,7 @@ export class CodeActionsProcessor {
         singleTitle: string,
         fixAllTitle: string,
         changes: Array<InsertChange | DeleteChange | ReplaceChange>,
-        diagnostic: Diagnostic
+        diagnostic: BsDiagnostic
     ) {
         if (changes.length === 0) {
             return;
@@ -654,3 +829,52 @@ export class CodeActionsProcessor {
         }
     }
 }
+
+interface ExistingDirective {
+    type: 'line' | 'next-line' | 'block';
+    codes: string[];
+    range: Range;
+}
+
+/**
+ * Parses a comment's text and returns the directive details if it is one. Recognizes
+ * `'`, `rem`, and `<!-- -->` comment styles. Returns `null` for comments that aren't directives.
+ * `block` covers `bs:disable`. The `bs:enable` partner isn't surfaced since the quick fix only
+ * extends `bs:disable` directives.
+ */
+function parseDisableComment(text: string): { directiveType: 'line' | 'next-line' | 'block'; codes: string[] } | null {
+    let inner = text;
+    if (inner.startsWith('<!--')) {
+        inner = inner.slice('<!--'.length);
+        if (inner.endsWith('-->')) {
+            inner = inner.slice(0, -('-->'.length));
+        }
+    } else if (inner.startsWith(`'`)) {
+        inner = inner.slice(1);
+    } else if (/^rem\b/i.test(inner)) {
+        inner = inner.slice('rem'.length);
+    }
+    inner = inner.trimStart();
+    const lower = inner.toLowerCase();
+    //match longest-prefix first so `bs:disable-line` doesn't get parsed as `bs:disable`
+    let directiveType: 'line' | 'next-line' | 'block';
+    let prefixLength: number;
+    if (lower.startsWith('bs:disable-next-line')) {
+        directiveType = 'next-line';
+        prefixLength = 'bs:disable-next-line'.length;
+    } else if (lower.startsWith('bs:disable-line')) {
+        directiveType = 'line';
+        prefixLength = 'bs:disable-line'.length;
+    } else if (lower.startsWith('bs:disable')) {
+        directiveType = 'block';
+        prefixLength = 'bs:disable'.length;
+    } else {
+        return null;
+    }
+    inner = inner.slice(prefixLength);
+    if (inner.startsWith(':')) {
+        inner = inner.slice(1);
+    }
+    const codes = inner.trim().length === 0 ? [] : inner.trim().split(/\s+/);
+    return { directiveType: directiveType, codes: codes };
+}
diff --git a/src/bscPlugin/codeActions/codeActionHelpers.ts b/src/bscPlugin/codeActions/codeActionHelpers.ts
index ee082f501..6130323fb 100644
--- a/src/bscPlugin/codeActions/codeActionHelpers.ts
+++ b/src/bscPlugin/codeActions/codeActionHelpers.ts
@@ -1,5 +1,5 @@
-import type { Diagnostic } from 'vscode-languageserver';
 import type { XmlFile } from '../../files/XmlFile';
+import type { BsDiagnostic } from '../../interfaces';
 import { util } from '../../util';
 
 /**
@@ -8,8 +8,10 @@ import { util } from '../../util';
  * the `<component` tag itself if there are no attributes yet.
  */
 export function getMissingExtendsInsertPosition(file: XmlFile) {
-    const { component } = file.parser.ast;
-    return (component.attributes[component.attributes.length - 1] ?? component.tag).range.end;
+    const componentElement = file.parser.ast.componentElement;
+    const lastAttribute = componentElement.attributes[componentElement.attributes.length - 1];
+    const range = lastAttribute?.location?.range ?? componentElement.tokens.startTagName?.location?.range;
+    return range?.end;
 }
 
 /**
@@ -17,15 +19,15 @@ export function getMissingExtendsInsertPosition(file: XmlFile) {
  * statement flagged by `voidFunctionMayNotReturnValue`. Leaves the bare `return`
  * keyword in place.
  */
-export function getRemoveReturnValueChange(diagnostic: Diagnostic, filePath: string) {
+export function getRemoveReturnValueChange(diagnostic: BsDiagnostic, filePath: string) {
     return {
         type: 'delete' as const,
         filePath: filePath,
         range: util.createRange(
-            diagnostic.range.start.line,
-            diagnostic.range.start.character + 'return'.length,
-            diagnostic.range.end.line,
-            diagnostic.range.end.character
+            diagnostic.location.range.start.line,
+            diagnostic.location.range.start.character + 'return'.length,
+            diagnostic.location.range.end.line,
+            diagnostic.location.range.end.character
         )
     };
 }
diff --git a/src/bscPlugin/completions/CompletionsProcessor.spec.ts b/src/bscPlugin/completions/CompletionsProcessor.spec.ts
new file mode 100644
index 000000000..1904b2b00
--- /dev/null
+++ b/src/bscPlugin/completions/CompletionsProcessor.spec.ts
@@ -0,0 +1,2727 @@
+import { expect } from '../../chai-config.spec';
+import { Program } from '../../Program';
+import util, { standardizePath as s } from '../../util';
+import { CompletionItemKind, Position, Range } from 'vscode-languageserver';
+import { createSandbox } from 'sinon';
+import { expectCompletionsExcludes, expectCompletionsIncludes, tempDir, rootDir, outDir, trim, expectZeroDiagnostics } from '../../testHelpers.spec';
+import { XmlFile } from '../../files/XmlFile';
+import { Keywords } from '../../lexer/TokenKind';
+import { CompletionsProcessor } from './CompletionsProcessor';
+import * as pick from 'object.pick';
+import { BrsFile } from '../../files/BrsFile';
+import type { FileObj } from '../../interfaces';
+import * as fsExtra from 'fs-extra';
+import { isAssignmentStatement, isFunctionExpression } from '../../astUtils/reflection';
+import type { AssignmentStatement } from '../../parser/Statement';
+import type { FunctionExpression } from '../../parser/Expression';
+
+describe('CompletionsProcessor', () => {
+    let program: Program;
+    let sinon = createSandbox();
+
+    beforeEach(() => {
+        fsExtra.emptyDirSync(tempDir);
+        fsExtra.ensureDirSync(rootDir);
+        fsExtra.ensureDirSync(outDir);
+        program = new Program({ rootDir: rootDir });
+    });
+    afterEach(() => {
+        sinon.restore();
+        program.dispose();
+    });
+
+    describe('getCompletions - Program.spec', () => {
+        it('includes `for each` variable', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    items = [1, 2, 3]
+                    for each thing in items
+                        t =
+                    end for
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(4, 28)).map(x => x.label);
+            expect(completions).to.include('thing');
+        });
+
+        it('finds enum member after dot', () => {
+            program.setFile('source/main.bs', `
+                sub test()
+                    thing = alpha.Direction.
+                end sub
+                namespace alpha
+                    enum Direction
+                        up
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            const completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 44));
+            expect(completions.map(x => ({ kind: x.kind, label: x.label }))).to.eql([{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }]);
+        });
+
+        it('finds enum member after dot in if statement', () => {
+            program.setFile('source/main.bs', `
+                sub test()
+                    if alpha.beta. then
+                    end if
+                end sub
+                namespace alpha.beta
+                    const isEnabled = true
+                end namespace
+            `);
+            program.validate();
+            const completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 34));
+            expect(completions.map(x => ({ kind: x.kind, label: x.label }))).to.eql([{
+                label: 'isEnabled',
+                kind: CompletionItemKind.Constant
+            }]);
+        });
+
+        it('includes `for` variable', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    for i = 0 to 10
+                        t =
+                    end for
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 28)).map(x => x.label);
+            expect(completions).to.include('i');
+        });
+
+        it('should include first-level namespace names for brighterscript files', () => {
+            program.setFile('source/main.bs', `
+                namespace NameA.NameB.NameC
+                    sub DoSomething()
+                    end sub
+                end namespace
+                sub main()
+                    print
+                end sub
+            `);
+            program.validate();
+            // print |
+            const completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(6, 25));
+            expectCompletionsIncludes(completions, [{
+                label: 'NameA',
+                kind: CompletionItemKind.Module
+            }]);
+            expectCompletionsExcludes(completions, [{
+                label: 'NameB',
+                kind: CompletionItemKind.Module
+            }, {
+                label: 'NameA.NameB',
+                kind: CompletionItemKind.Module
+            }, {
+                label: 'NameA.NameB.NameC',
+                kind: CompletionItemKind.Module
+            }, {
+                label: 'NameA.NameB.NameC.DoSomething',
+                kind: CompletionItemKind.Module
+            }]);
+        });
+
+        it('resolves completions for namespaces with next namespace part for brighterscript file', () => {
+            program.setFile('source/main.bs', `
+                namespace NameA.NameB.NameC
+                    sub DoSomething()
+                    end sub
+                end namespace
+                sub main()
+                    NameA.
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(6, 26)).map(x => x.label);
+            expect(completions).to.include('NameB');
+            expect(completions).not.to.include('NameA');
+            expect(completions).not.to.include('NameA.NameB');
+            expect(completions).not.to.include('NameA.NameB.NameC');
+            expect(completions).not.to.include('NameA.NameB.NameC.DoSomething');
+        });
+
+        it('finds namespace members for brighterscript file', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    NameA.
+                    NameA.NameB.
+                    NameA.NameB.NameC.
+                end sub
+                namespace NameA
+                    sub alertA()
+                    end sub
+                end namespace
+                namespace NameA
+                    sub info()
+                    end sub
+                end namespace
+                namespace NameA.NameB
+                    sub alertB()
+                    end sub
+                end namespace
+                namespace NameA.NameB.NameC
+                    sub alertC()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 26)).map(x => x.label).sort()
+            ).to.eql(['NameB', 'alertA', 'info']);
+
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 32)).map(x => x.label).sort()
+            ).to.eql(['NameC', 'alertB']);
+
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 38)).map(x => x.label).sort()
+            ).to.eql(['alertC']);
+        });
+
+        it('finds namespace members for classes', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    NameA.
+                    NameA.NameB.
+                    NameA.NameB.NameC.
+                end sub
+                namespace NameA
+                    sub alertA()
+                    end sub
+                end namespace
+                namespace NameA
+                    sub info()
+                    end sub
+                    class MyClassA
+                    end class
+                end namespace
+                namespace NameA.NameB
+                    sub alertB()
+                    end sub
+                    class MyClassB
+                    end class
+                end namespace
+                namespace NameA.NameB.NameC
+                    sub alertC()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 26)).map(x => x.label).sort()
+            ).to.eql(['MyClassA', 'NameB', 'alertA', 'info']);
+
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 32)).map(x => x.label).sort()
+            ).to.eql(['MyClassB', 'NameC', 'alertB']);
+
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 38)).map(x => x.label).sort()
+            ).to.eql(['alertC']);
+        });
+
+        it('finds only namespaces that have classes, when new keyword is used', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    a = new NameA.
+                    b = new NameA.NameB.
+                    c = new NameA.NameB.NameC.
+                end sub
+                namespace NameA
+                    sub alertA()
+                    end sub
+                end namespace
+                namespace NameA
+                    sub info()
+                    end sub
+                    class MyClassA
+                    end class
+                end namespace
+                namespace NameA.NoClassA
+                end namespace
+                namespace NameA.NoClassB
+                end namespace
+                namespace NameA.NameB
+                    sub alertB()
+                    end sub
+                    class MyClassB
+                    end class
+                end namespace
+                namespace NameA.NameB.NoClass
+                end namespace
+                namespace NameA.NameB.NameC
+                    sub alertC()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 34)).map(x => x.label).sort()
+            ).to.eql(['MyClassA', 'NameB']);
+
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 40)).map(x => x.label).sort()
+            ).to.eql(['MyClassB']);
+
+            expect(
+                program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 46)).map(x => x.label).sort()
+            ).to.be.empty;
+        });
+
+        it('should include translated namespace function names for brightscript files', () => {
+            program.setFile('source/main.bs', `
+                namespace NameA.NameB.NameC
+                    sub DoSomething()
+                    end sub
+                end namespace
+            `);
+            program.setFile('source/lib.brs', `
+                sub test()
+
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/lib.brs`, Position.create(2, 23));
+            expect(completions.map(x => x.label)).to.include('NameA_NameB_NameC_DoSomething');
+        });
+
+        it('includes global completions for file with no scope', () => {
+            program.setFile('source/main.brs', `
+                function Main()
+                    age = 1
+                end function
+            `);
+            program.validate();
+            let completions = program.getCompletions('source/main.brs', Position.create(2, 21));
+            expect(completions.filter(x => x.label.toLowerCase() === 'abs')).to.be.lengthOf(1);
+        });
+
+        it('filters out text results for top-level function statements', () => {
+            program.setFile('source/main.brs', `
+                function Main()
+                    age = 1
+                end function
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 21));
+            expect(completions.filter(x => x.label === 'Main')).to.be.lengthOf(1);
+        });
+
+        it('does not filter text results for object properties used in conditional statements', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+                    p.
+                end sub
+                sub SayHello()
+                    person = {}
+                    if person.isAlive then
+                        print "Hello"
+                    end if
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 22));
+            expect(completions.filter(x => x.label === 'isAlive')).to.be.lengthOf(1);
+        });
+
+        it('does not filter text results for object properties used in assignments', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+                    p.
+                end sub
+                sub SayHello()
+                   person = {}
+                   localVar = person.name
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 22));
+            expect(completions.filter(x => x.label === 'name')).to.be.lengthOf(1);
+        });
+
+        it('does not filter text results for object properties', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+                    p.
+                end sub
+                sub SayHello()
+                   person = {}
+                   person.name = "bob"
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 22));
+            expect(completions.filter(x => x.label === 'name')).to.be.lengthOf(1);
+        });
+
+        it('filters out text results for local vars used in conditional statements', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+
+                end sub
+                sub SayHello()
+                    isTrue = true
+                    if isTrue then
+                        print "is true"
+                    end if
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
+            expect(completions.filter(x => x.label === 'isTrue')).to.be.lengthOf(0);
+        });
+
+        it('filters out text results for local variable assignments', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+
+                end sub
+                sub SayHello()
+                    message = "Hello"
+                end sub
+            `);
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
+            expect(completions.filter(x => x.label === 'message')).to.be.lengthOf(0);
+        });
+
+        it('filters out text results for local variables used in assignments', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+
+                end sub
+                sub SayHello()
+                    message = "Hello"
+                    otherVar = message
+                end sub
+            `);
+            program.validate();
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
+            expect(completions.filter(x => x.label === 'message')).to.be.lengthOf(0);
+        });
+
+        it('does not suggest local variables when initiated to the right of a period', () => {
+            program.setFile('source/main.brs', `
+                function Main()
+                    helloMessage = "jack"
+                    person.hello
+                end function
+            `);
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 32));
+            expect(completions.filter(x => x.kind === CompletionItemKind.Variable).map(x => x.label)).not.to.contain('helloMessage');
+        });
+
+        it('finds all file paths when initiated on xml uri', () => {
+            let xmlPath = s`${rootDir}/components/component1.xml`;
+            program.setFile('components/component1.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="HeroScene" extends="Scene">
+                    <script type="text/brightscript" uri="" />
+                </component>
+            `);
+            program.setFile('components/component1.brs', '');
+            program.validate();
+            let completions = program.getCompletions(xmlPath, Position.create(2, 42));
+            expect(completions[0]).to.include({
+                kind: CompletionItemKind.File,
+                label: 'component1.brs'
+            });
+            expect(completions[1]).to.include({
+                kind: CompletionItemKind.File,
+                label: 'pkg:/components/component1.brs'
+            });
+            //it should NOT include the global methods
+            expect(completions).to.be.lengthOf(2);
+        });
+
+        it('get all functions and properties in scope when doing any dotted get on non m', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    thing.anonPropA = "foo"
+                    thing.anonPropB = "bar"
+                    thing.person
+                end sub
+                class MyClassA
+                    personName = "rafa"
+                    personAName = "rafaA"
+                    function personAMethodA()
+                    end function
+                    function personAMethodB()
+                    end function
+                end class
+                namespace NameA
+                    sub alertA()
+                    end sub
+                end namespace
+                namespace NameA.NameB
+                    sub alertB()
+                    end sub
+                    class MyClassB
+                        personName = "roger"
+                        personBName = "rogerB"
+                        function personAMethodC()
+                        end function
+                        function personBMethodA()
+                        end function
+                        function personBMethodB()
+                        end function
+                    end class
+                end namespace
+                namespace NameA.NameB.NameC
+                    sub alertC()
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            //note - we let the vscode extension do the filtering, so we still return everything; otherwise it exhibits strange behaviour in the IDE
+            expect(
+                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(4, 32))).map(x => x.label).sort()
+            ).to.eql(['NameB', 'NameC', 'anonPropA', 'anonPropB', 'person', 'personAMethodA', 'personAMethodB', 'personAMethodC', 'personAName', 'personBMethodA', 'personBMethodB', 'personBName', 'personName']);
+        });
+
+        it('get all functions and properties relevant for m ', () => {
+            program.setFile('source/main.bs', `
+                class MyClassA
+                    function new()
+                        m.
+                    end function
+                    personName = "rafa"
+                    personAName = "rafaA"
+                    function personAMethodA()
+                    end function
+                    function personAMethodB()
+                    end function
+                end class
+                class MyClassB
+                    personName = "roger"
+                    personBName = "rogerB"
+                    function personAMethodC()
+                    end function
+                    function personBMethodA()
+                    end function
+                    function personBMethodB()
+                    end function
+                end class
+                class MyClassC extends MyClassA
+                    function new()
+                        m.
+                    end function
+                    personCName = "rogerC"
+                    function personCMethodC()
+                    end function
+                    function personCMethodA()
+                    end function
+                    function personCMethodB()
+                    end function
+                end class
+                sub alertC()
+                end sub
+            `);
+            program.validate();
+
+            const myClassACompletions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 26));
+            // remove completions with sortText (they are built in methods), then sort the remaining labels
+            const myClassACompletionsSorted = myClassACompletions.filter(x => !x.sortText).map(x => x.label).sort();
+            expect(myClassACompletionsSorted).to.eql(['personAMethodA', 'personAMethodB', 'personAName', 'personName']);
+
+            const myClassCCompletions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(24, 26));
+            // remove completions with sortText (they are built in methods), then sort the remaining labels
+            const myClassCCompletionsSorted = myClassCCompletions.filter(x => !x.sortText).map(x => x.label).sort();
+            expect(myClassCCompletionsSorted).to.eql(['personAMethodA', 'personAMethodB', 'personAName', 'personCMethodA', 'personCMethodB', 'personCMethodC', 'personCName', 'personName']);
+        });
+
+        it.skip('include non-namespaced classes in the list of general output', () => {
+            program.setFile('source/main.bs', `
+                function regularFunc()
+                    MyClass
+                end function
+                sub alertC()
+                end sub
+                class MyClassA
+                end class
+                class MyClassB
+                end class
+                class MyClassC extends MyClassA
+                end class
+            `);
+            expect(
+                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 26))).map(x => x.label).sort()
+            ).to.include.members(['MyClassA', 'MyClassB', 'MyClassC']);
+        });
+
+        it('only include classes when using new keyword', () => {
+            program.setFile('source/main.bs', `
+                class MyClassA
+                end class
+                class MyClassB
+                end class
+                class MyClassC extends MyClassA
+                end class
+                function regularFunc()
+                    new MyClass
+                end function
+                sub alertC()
+                end sub
+            `);
+            program.validate();
+            expect(
+                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(8, 29))).map(x => x.label).sort()
+            ).to.eql(['MyClassA', 'MyClassB', 'MyClassC']);
+        });
+
+        it('gets completions when using callfunc invocation', () => {
+            program.setFile('source/main.bs', `
+                function doStuff(myNode)
+                    myNode@.sayHello(1, 2)
+                end function
+            `);
+            program.setFile('components/MyNode.bs', `
+                function sayHello(text, text2)
+                end function
+            `);
+            program.setFile<XmlFile>('components/MyNode.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+            <component name="Component1" extends="Scene">
+                <script type="text/brightscript" uri="pkg:/components/MyNode.bs" />
+                <interface>
+                    <function name="sayHello"/>
+                </interface>
+            </component>`);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            expect(
+                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 30))).map(x => x.label).sort()
+            ).to.eql(['sayHello']);
+        });
+
+        it('gets completions for callfunc invocation with multiple nodes', () => {
+            program.setFile('source/main.bs', `
+                function main()
+                    myNode@.sayHello(arg1)
+                end function
+            `);
+            program.setFile('components/MyNode.bs', `
+                function sayHello(text, text2)
+                end function
+                function sayHello2(text, text2)
+                end function
+            `);
+            program.setFile<XmlFile>('components/MyNode.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+                <component name="Component1" extends="Scene">
+                    <script type="text/brightscript" uri="pkg:/components/MyNode.bs" />
+                    <interface>
+                        <function name="sayHello"/>
+                        <function name="sayHello2"/>
+                    </interface>
+                </component>`);
+            program.setFile('components/MyNode2.bs', `
+                function sayHello3(text, text2)
+                end function
+                function sayHello4(text, text2)
+                end function
+            `);
+            program.setFile<XmlFile>('components/MyNode2.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+                <component name="Component2" extends="Scene">
+                    <script type="text/brightscript" uri="pkg:/components/MyNode2.bs" />
+                    <interface>
+                        <function name="sayHello3"/>
+                        <function name="sayHello4"/>
+                    </interface>
+                </component>`);
+            program.validate();
+
+            expect(
+                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 30))).map(x => x.label).sort()
+            ).to.eql(['sayHello', 'sayHello2', 'sayHello3', 'sayHello4']);
+        });
+
+        it('gets completions for callfunc invocation with multiple nodes and validates single code completion results', () => {
+            program.setFile('source/main.bs', `
+                function main()
+                    ParentNode@.sayHello(arg1)
+                end function
+            `);
+            program.setFile('components/ParentNode.bs', `
+                function sayHello(text, text2)
+                end function
+            `);
+            program.setFile<XmlFile>('components/ParentNode.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+                <component name="ParentNode" extends="Scene">
+                    <script type="text/brightscript" uri="pkg:/components/ParentNode.bs" />
+                    <interface>
+                        <function name="sayHello"/>
+                    </interface>
+                </component>`);
+            program.setFile('components/ChildNode.bs', `
+                function sayHello(text, text2)
+                end function
+            `);
+            program.setFile<XmlFile>('components/ChildNode.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+                <component name="ChildNode" extends="ParentNode">
+                    <script type="text/brightscript" uri="pkg:/components/ChildNode.bs" />
+                </component>`);
+            program.validate();
+
+            expect(
+                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 31))).map(x => x.label).sort()
+            ).to.eql(['sayHello']);
+        });
+
+        it('gets completions for extended nodes with callfunc invocation - ensure overridden methods included', () => {
+            program.setFile('source/main.bs', `
+                function main()
+                    myNode@.sayHello(arg1)
+                end function
+            `);
+            program.setFile('components/MyNode.bs', `
+                function sayHello(text, text2)
+                end function
+                function sayHello2(text, text2)
+                end function
+            `);
+            program.setFile<XmlFile>('components/MyNode.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+                <component name="Component1" extends="Scene">
+                    <script type="text/brightscript" uri="pkg:/components/MyNode.bs" />
+                    <interface>
+                        <function name="sayHello"/>
+                        <function name="sayHello2"/>
+                    </interface>
+                </component>`);
+            program.setFile('components/MyNode2.bs', `
+                function sayHello3(text, text2)
+                end function
+                function sayHello2(text, text2)
+                end function
+                function sayHello4(text, text2)
+                end function
+            `);
+            program.setFile<XmlFile>('components/MyNode2.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+                <component name="Component2" extends="Component1">
+                    <script type="text/brightscript" uri="pkg:/components/MyNode2.bs" />
+                    <interface>
+                        <function name="sayHello3"/>
+                        <function name="sayHello4"/>
+                    </interface>
+                </component>`);
+            program.validate();
+
+            expect(
+                (program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 30))).map(x => x.label).sort()
+            ).to.eql(['sayHello', 'sayHello2', 'sayHello3', 'sayHello4']);
+        });
+
+        describe('getBrsFileCompletions', () => {
+            it('does not crash on expression with missing range', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    sub main()
+                        message = alpha
+                    end sub
+                `);
+                const assignment = file.ast.findChild<AssignmentStatement>(isAssignmentStatement);
+                // destroy the `range` for this value
+                delete (assignment as any).value.range;
+
+                const processor = new CompletionsProcessor({ scopes: [] } as any);
+                expect(
+                    // message = alpha|
+                    processor['getBrsFileCompletions'](util.createPosition(2, 39), file, [])
+                ).to.eql({ global: [], scoped: [] });
+            });
+
+            it('does not crash when functionExpression.body is undefined (somehow...)', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    sub main()
+                        message = alpha
+                    end sub
+                `);
+                const func = file.ast.findChild<FunctionExpression>(isFunctionExpression);
+                // destroy the `body` for this value
+                delete (func as any).body;
+
+                const processor = new CompletionsProcessor({} as any);
+                expect(
+                    // message = alpha|
+                    processor['getBrsFileCompletions'](util.createPosition(2, 39), file, program.getScopesForFile(file))
+                ).to.eql({ global: [], scoped: [] });
+            });
+        });
+
+        describe('getCompletions', () => {
+            it('returns all functions in scope', () => {
+                program.setFile('source/main.brs', `
+                    sub Main()
+
+                    end sub
+
+                    sub ActionA()
+                    end sub
+                `);
+                program.setFile('source/lib.brs', `
+                    sub ActionB()
+                    end sub
+                `);
+
+                program.validate();
+
+                let completions = program
+                    //get completions
+                    .getCompletions(`${rootDir}/source/main.brs`, util.createPosition(2, 10))
+                    //only keep the label property for this test
+                    .map(x => pick(x, 'label'));
+
+                expect(completions).to.deep.include({ label: 'Main' });
+                expect(completions).to.deep.include({ label: 'ActionA' });
+                expect(completions).to.deep.include({ label: 'ActionB' });
+            });
+
+            it('returns all variables in scope', () => {
+                program.setFile('source/main.brs', `
+                    sub Main()
+                        name = "bob"
+                        age = 20
+                        shoeSize = 12.5
+                    end sub
+                    sub ActionA()
+                    end sub
+                `);
+                program.setFile('source/lib.brs', `
+                    sub ActionB()
+                    end sub
+                `);
+
+                program.validate();
+
+                let completions = program.getCompletions(`${rootDir}/source/main.brs`, util.createPosition(2, 24));
+                let labels = completions.map(x => pick(x, 'label'));
+
+                expect(labels).to.deep.include({ label: 'Main' });
+                expect(labels).to.deep.include({ label: 'ActionA' });
+                expect(labels).to.deep.include({ label: 'ActionB' });
+                expect(labels).to.deep.include({ label: 'name' });
+                expect(labels).to.deep.include({ label: 'age' });
+                expect(labels).to.deep.include({ label: 'shoeSize' });
+            });
+
+            it('returns empty set when out of range', () => {
+                const position = util.createPosition(99, 99);
+                const mainFile = program.setFile('source/main.brs', '');
+                let completions = program.getCompletions(`${rootDir}/source/main.brs`, position);
+                const completionProcessor = new CompletionsProcessor({
+                    program: program,
+                    file: mainFile,
+                    position: position,
+                    scopes: [],
+                    completions: []
+                });
+                program.validate();
+                //get the name of all global completions
+                const globalCompletions = program.globalScope.getAllFiles().flatMap((x) => {
+                    return completionProcessor.getBrsFileCompletions(position, x as BrsFile, program.getScopesForFile(x)).global;
+                }).map(x => x.label);
+                //filter out completions from global scope
+                completions = completions.filter(x => !globalCompletions.includes(x.label));
+                expect(completions).to.be.empty;
+            });
+
+            it('finds parameters', () => {
+                program.setFile('source/main.brs', `
+                    sub Main(count = 1)
+                        firstName = "bob"
+                        age = 21
+                        shoeSize = 10
+                    end sub
+                `);
+                program.validate();
+                let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 10));
+                let labels = completions.map(x => pick(x, 'label'));
+
+                expect(labels).to.deep.include({ label: 'count' });
+            });
+
+            it('finds parameters when file is in multiple scopes', () => {
+                program.setFile('source/main.bs', `
+                    sub Main(count = 1)
+                        firstName = "bob"
+                        age = 21
+                        shoeSize = 10
+                    end sub
+                `);
+
+                program.setFile<XmlFile>('components/MyNode.xml',
+                    trim`<?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Component2" extends="Component1">
+                        <script type="text/brightscript" uri="pkg:/source/main.bs" />
+                        <interface>
+                            <function name="sayHello3"/>
+                            <function name="sayHello4"/>
+                        </interface>
+                    </component>`);
+                program.validate();
+                let completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 10));
+                let labels = completions.map(x => pick(x, 'label'));
+
+                expect(labels).to.deep.include({ label: 'count' });
+            });
+        });
+    });
+
+    describe('getCompletions - BrsFile.spec', () => {
+        it('does not crash for callfunc on a function call', () => {
+            const file = program.setFile('source/main.brs', `
+                sub main()
+                    getManager()@.
+                end sub
+            `);
+            program.validate();
+            expect(() => {
+                program.getCompletions(file.srcPath, util.createPosition(2, 34));
+            }).not.to.throw;
+        });
+
+        it('suggests pkg paths in strings that match that criteria', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    print "pkg:"
+                end sub
+            `);
+            program.validate();
+            const result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 31));
+            const names = result.map(x => x.label);
+            expect(names.sort()).to.eql([
+                'pkg:/source/main.brs'
+            ]);
+        });
+
+        it('suggests libpkg paths in strings that match that criteria', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    print "libpkg:"
+                end sub
+            `);
+            program.validate();
+            const result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 31));
+            const names = result.map(x => x.label);
+            expect(names.sort()).to.eql([
+                'libpkg:/source/main.brs'
+            ]);
+        });
+
+        it('suggests pkg paths in template strings', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    print \`pkg:\`
+                end sub
+            `);
+            program.validate();
+            const result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 31));
+            const names = result.map(x => x.label);
+            expect(names.sort()).to.eql([
+                'pkg:/source/main.brs'
+            ]);
+        });
+
+        it('waits for the file to be processed before collecting completions', () => {
+            //eslint-disable-next-line @typescript-eslint/no-floating-promises
+            program.setFile('source/main.brs', `
+                sub Main()
+                    print "hello"
+                    Say
+                end sub
+
+                sub SayHello()
+                end sub
+            `);
+            program.validate();
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 23));
+            let names = result.map(x => x.label);
+            expect(names).to.includes('Main');
+            expect(names).to.includes('SayHello');
+        });
+
+        it('includes every type of item at base level', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    print
+                end sub
+                sub speak()
+                end sub
+                namespace stuff
+                end namespace
+                class Person
+                end class
+                enum Direction
+                end enum
+            `);
+            program.validate();
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 26)), [{
+                label: 'main',
+                kind: CompletionItemKind.Function
+            }, {
+                label: 'speak',
+                kind: CompletionItemKind.Function
+            }, {
+                label: 'stuff',
+                kind: CompletionItemKind.Module
+            }, {
+                label: 'Person',
+                kind: CompletionItemKind.Class
+            }, {
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        describe('namespaces', () => {
+            it('gets full namespace completions at any point through the leading identifier', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        foo.bar
+                    end sub
+
+                    namespace foo.bar
+                    end namespace
+
+                    class Person
+                    end class
+                `);
+                program.validate();
+                const result = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 24)).map(x => x.label);
+                expect(result).includes('main');
+                expect(result).includes('foo');
+                expect(result).includes('Person');
+            });
+
+            it('gets namespace completions', () => {
+                program.setFile('source/main.bs', `
+                    namespace foo.bar
+                        function sayHello()
+                        end function
+                    end namespace
+
+                    sub Main()
+                        print "hello"
+                        foo.ba
+                        foo.bar.
+                    end sub
+                `);
+                program.validate();
+                let result = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(8, 30));
+                let names = result.map(x => x.label);
+                expect(names).to.includes('bar');
+
+                result = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(9, 32));
+                names = result.map(x => x.label);
+                expect(names).to.includes('sayHello');
+            });
+        });
+
+        it('always includes `m`', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+
+                end sub
+            `);
+            program.validate();
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 23));
+            let names = result.map(x => x.label);
+            expect(names).to.contain('m');
+        });
+
+        it('does not fail for missing previousToken', () => {
+            //add a single character to the file, and get completions after it
+            program.setFile('source/main.brs', `i`);
+            program.validate();
+            expect(() => {
+                program.getCompletions(`${rootDir}/source/main.brs`, Position.create(0, 1)).map(x => x.label);
+            }).not.to.throw;
+        });
+
+        it.skip('includes all keywords`', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+
+                end sub
+            `);
+
+            program.validate();
+            let keywords = Object.keys(Keywords).filter(x => !x.includes(' '));
+
+            //inside the function
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 23));
+            let names = result.map(x => x.label);
+            for (let keyword of keywords) {
+                expect(names).to.include(keyword);
+            }
+
+            //outside the function
+            result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(4, 8));
+            names = result.map(x => x.label);
+            for (let keyword of keywords) {
+                expect(names).to.include(keyword);
+            }
+        });
+
+        it('does not provide completions within a comment', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+                    'some comment
+                end sub
+            `);
+
+            program.validate();
+            //inside the function
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 33));
+            expect(result).to.be.lengthOf(0);
+        });
+
+        it('does not provide duplicate entries for variables', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+                    name = "bob"
+                    age = 12
+                    name = "john"
+                end sub
+            `);
+            program.validate();
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 23));
+
+            let count = result.reduce((total, x) => {
+                return x.label === 'name' ? total + 1 : total;
+            }, 0);
+            expect(count).to.equal(1);
+        });
+
+        it('does not include `as` and `string` text options when used in function params', () => {
+            program.setFile('source/main.brs', `
+                sub Main(name as string)
+
+                end sub
+            `);
+
+            program.validate();
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 23));
+            expect(result.filter(x => x.kind === CompletionItemKind.Text)).not.to.contain('as');
+            expect(result.filter(x => x.kind === CompletionItemKind.Text)).not.to.contain('string');
+        });
+
+        it('does not provide intellisense results when inside a comment', () => {
+            program.setFile('source/main.brs', `
+                sub Main(name as string)
+                    'this is a comment
+                end sub
+            `);
+
+            program.validate();
+            let results = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 30));
+            expect(results).to.be.empty;
+        });
+
+        it('does provide intellisence for labels only after a goto keyword', () => {
+            program.setFile('source/main.brs', `
+                sub Main(name as string)
+                    something:
+                    goto \nend sub
+            `);
+
+            program.validate();
+            let results = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 25));
+            expect(results.length).to.equal(1);
+            expect(results[0]?.label).to.equal('something');
+        });
+
+        it('includes function parameters at the end of the function', () => {
+            program.setFile('source/main.brs', `
+                sub main(myFuncParam as string)
+                    myValue = 234
+                    print
+                end sub
+            `);
+
+            program.validate();
+            // print |
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 28));
+            expectCompletionsIncludes(completions, [{
+                label: 'myFuncParam',
+                kind: CompletionItemKind.Variable
+            }, {
+                label: 'myValue',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('includes function parameters at the end of the function in namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    function main(param)
+                        print
+                        myValue = 234
+                    end function
+                end namespace
+            `);
+
+            program.validate();
+            // print |
+            let completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(3, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'param',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('treats class name as a function', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    name as string
+                end class
+
+                sub test()
+                    print SomeKlass.
+                end sub
+            `);
+
+            program.validate();
+            // print SomeKlass.|
+            let completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(6, 36));
+            expectCompletionsIncludes(completions, [{
+                label: 'ifFunction',
+                kind: CompletionItemKind.Interface
+            }]);
+        });
+
+        it('treats namespaced class name as a function', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    class SomeKlass
+                        name as string
+                    end class
+                end namespace
+
+                sub test()
+                    print alpha.SomeKlass.toStr()
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            // print alpha.SomeKlass.|
+            let completions = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(8, 42));
+            expectCompletionsIncludes(completions, [{
+                label: 'ifFunction',
+                kind: CompletionItemKind.Interface
+            }]);
+        });
+
+    });
+
+    describe('getCompletions - XmlFile.spec', () => {
+        it('formats completion paths with proper slashes', () => {
+            let scriptPath = s`C:/app/components/component1/component1.brs`;
+            program.files[scriptPath] = new BrsFile({ srcPath: scriptPath, destPath: s`components/component1/component1.brs`, program: program });
+
+            let xmlFile = new XmlFile({
+                srcPath: s`${rootDir}/components/component1/component1.xml`,
+                destPath: s`components/component1/component1.xml`,
+                program: program
+            });
+            xmlFile.parser.references.scriptTagImports.push({
+                destPath: s`components/component1/component1.brs`,
+                text: 'component1.brs',
+                filePathRange: Range.create(1, 1, 1, 1)
+            });
+            const processesor = new CompletionsProcessor(null);
+            const completions = processesor.getXmlFileCompletions(Position.create(1, 1), xmlFile);
+            expectCompletionsIncludes(completions, [{
+                label: 'component1.brs',
+                kind: CompletionItemKind.File
+            }, {
+                label: 'pkg:/components/component1/component1.brs',
+                kind: CompletionItemKind.File
+            }]);
+        });
+
+        //TODO - refine this test once cdata scripts are supported
+        it('prevents scope completions entirely', () => {
+            program.setFile('components/component1.brs', ``);
+
+            let xmlFile = program.setFile('components/component1.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="ParentScene" extends="GrandparentScene">
+                    <script type="text/brightscript" uri="./Component1.brs" />
+                </component>
+            `);
+            program.validate();
+            expect(program.getCompletions(xmlFile.srcPath, Position.create(1, 1))).to.be.empty;
+        });
+    });
+
+    describe('documentation', () => {
+        it('returns documentation when possible', () => {
+            program.setFile('source/main.brs', `
+                sub Main()
+                    print "hello"
+                    Say
+                end sub
+
+                ' Says hello to the world
+                sub SayHello()
+                end sub
+            `);
+            program.validate();
+            // Say|
+            let completions = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 22));
+            //it should find the completions for the global scope
+            expect(completions).to.be.length.greaterThan(0);
+            //it should find documentation for completions
+            expect(completions.filter(x => !!x.documentation)).to.have.length.greaterThan(0);
+        });
+    });
+
+    describe('getPartialVariableName', () => {
+        let entry = {
+            src: `${rootDir}/source/lib.brs`,
+            dest: `source/lib.brs`
+        } as FileObj;
+
+        it('creates proper tokens', () => {
+            const file = program.setFile<BrsFile>(entry, `call(ModuleA.ModuleB.ModuleC.`);
+            expect(file['getPartialVariableName'](file.parser.tokens[7])).to.equal('ModuleA.ModuleB.ModuleC.');
+            expect(file['getPartialVariableName'](file.parser.tokens[6])).to.equal('ModuleA.ModuleB.ModuleC');
+            expect(file['getPartialVariableName'](file.parser.tokens[5])).to.equal('ModuleA.ModuleB.');
+            expect(file['getPartialVariableName'](file.parser.tokens[4])).to.equal('ModuleA.ModuleB');
+            expect(file['getPartialVariableName'](file.parser.tokens[3])).to.equal('ModuleA.');
+            expect(file['getPartialVariableName'](file.parser.tokens[2])).to.equal('ModuleA');
+        });
+    });
+
+    describe('import completions', () => {
+        it('should show import completions for a single scope', () => {
+            program.setFile('source/common.bs', `
+                import "
+            `);
+            program.setFile('source/common2.bs', `
+                sub SayHello()
+                end sub
+            `);
+            program.setFile('components/widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="widget.bs"/>
+                </component>
+            `);
+            program.setFile('components/widget.bs', `
+                import "pkg:/source/common.bs"
+            `);
+            program.validate();
+            // import "|
+            const completions = program.getCompletions('source/common.bs', util.createPosition(1, 25));
+            expect(completions).to.exist;
+            expect(completions.map(comp => comp.label)).to.include('common2.bs');
+            expect(completions.map(comp => comp.label)).to.include('../components/widget.bs');
+            expect(completions.map(comp => comp.label)).to.include('pkg:/components/widget.bs');
+            expect(completions.map(comp => comp.label)).to.include('pkg:/source/common2.bs');
+        });
+
+        it('should show import completions with original extensions', () => {
+            program.setFile('source/common.bs', `
+                import "
+            `);
+            program.setFile('source/common2.brs', `
+                sub SayHello()
+                end sub
+            `);
+            program.setFile('components/widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="widget.bs"/>
+                </component>
+            `);
+            program.setFile('components/widget.bs', `
+                import "pkg:/source/common.bs"
+            `);
+            program.validate();
+            // import "|
+            const completions = program.getCompletions('source/common.bs', util.createPosition(1, 25));
+            expect(completions).to.exist;
+            expect(completions.map(comp => comp.label)).to.include('common2.brs');
+            expect(completions.map(comp => comp.label)).to.include('../components/widget.bs');
+            expect(completions.map(comp => comp.label)).to.include('pkg:/components/widget.bs');
+            expect(completions.map(comp => comp.label)).to.include('pkg:/source/common2.brs');
+        });
+    });
+
+    describe('const completions', () => {
+        it('shows up in standard completions', () => {
+            program.setFile('source/main.bs', `
+                const API_KEY = "123"
+                sub log(message)
+                    log()
+                end sub
+            `);
+            program.validate();
+            const completions = program.getCompletions('source/main.bs', util.createPosition(3, 24));
+            expectCompletionsIncludes(
+                // log(|)
+                completions,
+                [{
+                    label: 'API_KEY',
+                    kind: CompletionItemKind.Constant
+                }]
+            );
+        });
+
+        it('shows up in namespace completions', () => {
+            program.setFile('source/main.bs', `
+                namespace constants
+                    const API_KEY = "123"
+                end namespace
+                sub log(message)
+                    log(constants.)
+                end sub
+            `);
+            program.validate();
+            expectCompletionsIncludes(
+                // log(|)
+                program.getCompletions('source/main.bs', util.createPosition(5, 34)),
+                [{
+                    label: 'API_KEY',
+                    kind: CompletionItemKind.Constant
+                }]
+            );
+        });
+    });
+
+    describe('enum completions', () => {
+        it('does not crash when completing enum members with unsupported values', () => {
+            program.setFile('source/main.bs', `
+                sub Main()
+                    direction.obj
+                end sub
+                enum Direction
+                    up
+                    down
+                    obj = {}
+                end enum
+            `);
+            program.validate();
+            //      direction.|obj
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 30)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'obj',
+                kind: CompletionItemKind.EnumMember
+            }]);
+        });
+
+        it('gets enum statement completions from global enum', () => {
+            program.setFile('source/main.bs', `
+                sub Main()
+                    direction.down
+                end sub
+                enum Direction
+                    up
+                    down
+                end enum
+            `);
+            program.validate();
+            //      |direction.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 20)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+            //      dire|ction.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 24)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+            //      direction|.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 29)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('gets enum member completions from global enum', () => {
+            program.setFile('source/main.bs', `
+                sub Main()
+                    direction.down
+                end sub
+                enum Direction
+                    up
+                    down
+                end enum
+            `);
+            program.validate();
+            //      direction.|down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 30)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+            //      direction.do|wn
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 32)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+            //      direction.down|
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 34)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+        });
+
+        it('gets enum statement completions from namespaced enum', () => {
+            program.setFile('source/main.bs', `
+                sub Main()
+                    enums.direction.down
+                end sub
+                namespace enums
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //      enums.|direction.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 26)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+            //      enums.dire|ction.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 30)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+            //      enums.direction|.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 35)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('gets enum member completions from namespaced enum', () => {
+            program.setFile('source/main.bs', `
+                sub Main()
+                    enums.direction.down
+                end sub
+                namespace enums
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //      enums.direction.|down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 36)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+            //      enums.direction.do|wn
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 38)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+            //      enums.direction.down|
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 40)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+        });
+
+        it('excludes enum member completions from namespace enum', () => {
+            program.setFile('source/main.bs', `
+                sub Main()
+                    direction.ba
+                end sub
+                namespace enums
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //should NOT find Direction because it's not directly available at the top level (you need to go through `enums.` to get at it)
+            //      dire|ction.down
+            expectCompletionsExcludes(program.getCompletions('source/main.bs', util.createPosition(2, 24)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('infers namespace for enum statement completions', () => {
+            program.setFile('source/main.bs', `
+                namespace enums
+                    sub Main()
+                        direction.down
+                    end sub
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+                enum Logic
+                    yes
+                    no
+                end enum
+            `);
+            program.validate();
+            //          dire|ction.down
+            const completions = program.getCompletions('source/main.bs', util.createPosition(3, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }, {
+                label: 'Logic',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('infers multilevel deep namespace for enum statement completions', () => {
+            program.setFile('source/main.bs', `
+                namespace enums
+                    namespace deep
+                        sub Main()
+                            direction.down
+                        end sub
+                        enum Direction
+                            up
+                            down
+                        end enum
+                    end namespace
+                end namespace
+                enum Logic
+                    yes
+                    no
+                end enum
+            `);
+            program.validate();
+            //          dire|ction.down
+            const completions = program.getCompletions('source/main.bs', util.createPosition(3, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }, {
+                label: 'Logic',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('infers deep namespace for enum statement completions', () => {
+            program.setFile('source/main.bs', `
+                namespace enums.deep.deeper
+                    sub Main()
+                        direction.down
+                    end sub
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+                enum Logic
+                    yes
+                    no
+                end enum
+            `);
+            program.validate();
+            //          dire|ction.down
+            const completions = program.getCompletions('source/main.bs', util.createPosition(3, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }, {
+                label: 'Logic',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('infers namespace for enum member completions', () => {
+            program.setFile('source/main.bs', `
+                namespace enums
+                    sub Main()
+                        direction.down
+                    end sub
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //          direction.do|wn
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(3, 36)), [{
+                label: 'up',
+                kind: CompletionItemKind.EnumMember
+            }, {
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+        });
+
+        it('supports explicit namespace for enum statement completions', () => {
+            program.setFile('source/main.bs', `
+                namespace enums
+                    sub Main()
+                        enums.direction.down
+                    end sub
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //          enums.dire|ction.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(3, 38)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('supports explicit namespace for enum statement completions', () => {
+            program.setFile('source/main.bs', `
+                namespace logger
+                    sub log()
+                        enums.direction.down
+                    end sub
+                end namespace
+                namespace enums
+                    enum Direction
+                        up
+                        down
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //          enums.dire|ction.down
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(3, 38)), [{
+                label: 'Direction',
+                kind: CompletionItemKind.Enum
+            }]);
+        });
+
+        it('gives completions for underlying types on enum members', () => {
+            program.setFile('source/main.bs', `
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+
+                sub goAway(dir as Direction)
+                    print dir.
+                end sub
+
+            `);
+            program.validate();
+            // print dir.|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(7, 31));
+            expectCompletionsIncludes(completions, [{
+                label: 'Trim',
+                kind: CompletionItemKind.Method
+            }]);
+        });
+
+        it('gives completions for underlying types on enum members on future enum declaration', () => {
+            program.setFile('source/main.bs', `
+                sub goAway(dir as Direction)
+                    print dir.
+                end sub
+
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+            `);
+            program.validate();
+            // print dir.|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 31));
+            expectCompletionsIncludes(completions, [{
+                label: 'Trim',
+                kind: CompletionItemKind.Method
+            }]);
+        });
+
+        it('does not give other members on enum member completion', () => {
+            program.setFile('source/main.bs', `
+                sub goAway(dir as Direction)
+                    print dir.
+                end sub
+
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+            `);
+            program.validate();
+            // print dir.|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 31));
+            expectCompletionsExcludes(completions, [{
+                label: 'down',
+                kind: CompletionItemKind.EnumMember
+            }]);
+        });
+
+    });
+
+    describe('built in type members', () => {
+        it('finds built in members', () => {
+            program.setFile('source/main.bs', `
+                sub foo(name as string)
+                    print name.
+                end sub
+            `);
+            program.validate();
+            // print name|.
+            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 32)), [{
+                label: 'Replace',
+                kind: CompletionItemKind.Method
+            }]);
+        });
+    });
+
+    describe('global callables', () => {
+        it('finds built in members', () => {
+            program.setFile('source/main.bs', `
+                sub foo(name as string)
+                    print
+                end sub
+            `);
+            program.validate();
+            // print |
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 27));
+            expectCompletionsIncludes(completions, [{
+                label: 'LCase',
+                kind: CompletionItemKind.Function
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'CreateObject',
+                kind: CompletionItemKind.Function
+            }]);
+        });
+
+    });
+
+    describe('callfunc completions', () => {
+        it('finds callfunc members', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                     <script uri="Widget.brs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.brs', `
+                function someFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+            program.setFile('source/util.bs', `
+                sub callWidgetSomeFunc(widget as roSGNodeWidget)
+                    print widget@.
+                end sub
+            `);
+            program.validate();
+            // print widget@.|
+            let completions = program.getCompletions('source/util.bs', util.createPosition(2, 34));
+            expect(completions.length).to.eql(1);
+            expectCompletionsIncludes(completions, [{
+                label: 'someFunc',
+                kind: CompletionItemKind.Method
+            }]);
+        });
+
+        it('includes documentation', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                     <script uri="Widget.brs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.brs', `
+                ' This is documentation
+                function someFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+            program.setFile('source/util.bs', `
+                sub callWidgetSomeFunc(widget as roSGNodeWidget)
+                    print widget@.
+                end sub
+            `);
+            program.validate();
+            // print widget@.|
+            let completions = program.getCompletions('source/util.bs', util.createPosition(2, 34));
+            expect(completions.length).to.eql(1);
+            expectCompletionsIncludes(completions, [{
+                label: 'someFunc',
+                kind: CompletionItemKind.Method,
+                documentation: 'This is documentation'
+            }]);
+        });
+
+        it('does not include callfunc members for other components', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                     <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.bs', `
+                function someFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+            program.setFile('components/Thing.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Thing" extends="Group">
+                     <script uri="Thing.bs"/>
+                    <interface>
+                        <function name="otherFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Thing.bs', `
+                function otherFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+
+            program.setFile('source/util.bs', `
+                sub callWidgetSomeFunc(widget as roSGNodeWidget)
+                    print widget@.
+                end sub
+            `);
+            program.validate();
+            // print widget@.|
+            let completions = program.getCompletions('source/util.bs', util.createPosition(2, 34));
+            expect(completions.length).to.eql(1);
+            expectCompletionsIncludes(completions, [{
+                label: 'someFunc',
+                kind: CompletionItemKind.Method
+            }]);
+            expectCompletionsExcludes(completions, [{
+                label: 'otherFunc',
+                kind: CompletionItemKind.Method
+            }]);
+        });
+
+        it('includes all possible callfuncs when used on a generic type', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                     <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.bs', `
+                function someFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+            program.setFile('components/Thing.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Thing" extends="Group">
+                     <script uri="Thing.bs"/>
+                    <interface>
+                        <function name="otherFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Thing.bs', `
+                function otherFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+
+            program.setFile('source/util.bs', `
+                sub useCallfunc(dyn as dynamic, obj as object, node as roSGNode)
+                    print dyn@.
+                    print obj@.
+                    print node@.
+                end sub
+            `);
+            program.validate();
+            // print dyn@.|
+            let completions = program.getCompletions('source/util.bs', util.createPosition(2, 31));
+            const expectedCompletions = [{
+                label: 'someFunc',
+                kind: CompletionItemKind.Method
+            }, {
+                label: 'otherFunc',
+                kind: CompletionItemKind.Method
+            }];
+            expect(completions.length).to.eql(expectedCompletions.length);
+            expectCompletionsIncludes(completions, expectedCompletions);
+            // print obj@.|
+            completions = program.getCompletions('source/util.bs', util.createPosition(3, 31));
+            expect(completions.length).to.eql(expectedCompletions.length);
+            expectCompletionsIncludes(completions, expectedCompletions);
+            // print node@.|
+            completions = program.getCompletions('source/util.bs', util.createPosition(3, 32));
+            expect(completions.length).to.eql(expectedCompletions.length);
+            expectCompletionsIncludes(completions, expectedCompletions);
+        });
+    });
+
+    describe('type expressions', () => {
+        it('finds built in types', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as  )
+                    print thing
+                end sub
+            `);
+            program.validate();
+            //  sub foo(thing as | )
+            const completions = program.getCompletions('source/main.bs', util.createPosition(1, 34));
+            expectCompletionsIncludes(completions, [{
+                label: 'integer',
+                kind: CompletionItemKind.Keyword
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'roSGNode',
+                kind: CompletionItemKind.Interface
+            }]);
+        });
+
+        it('does not include global values (true, false, invalid)', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as  )
+                    print thing
+                end sub
+            `);
+            program.validate();
+            //  sub foo(thing as | )
+            const completions = program.getCompletions('source/main.bs', util.createPosition(1, 34));
+            expectCompletionsExcludes(completions, [{
+                label: 'true',
+                kind: CompletionItemKind.Value
+            }, {
+                label: 'false',
+                kind: CompletionItemKind.Value
+            }, {
+                label: 'invalid',
+                kind: CompletionItemKind.Value
+            }]);
+        });
+
+        it('finds custom types', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as  )
+                    print thing
+                end sub
+
+                class SomeKlass
+                end class
+            `);
+            program.validate();
+            //  sub foo(thing as | )
+            const completions = program.getCompletions('source/main.bs', util.createPosition(1, 34));
+            expectCompletionsIncludes(completions, [{
+                label: 'SomeKlass',
+                kind: CompletionItemKind.Class
+            }]);
+        });
+
+        it('finds custom node types', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as  )
+                    print thing
+                end sub
+            `);
+
+            program.setFile<XmlFile>('components/MyNode.xml',
+                trim`<?xml version="1.0" encoding="utf-8" ?>
+                <component name="MyNode" extends="Group">
+                    <interface>
+                        <field id="text" type="string"/>
+                    </interface>
+                </component>`);
+            program.validate();
+            //  sub foo(thing as | )
+            const completions = program.getCompletions('source/main.bs', util.createPosition(1, 34));
+            expectCompletionsIncludes(completions, [{
+                label: 'roSGNodeMyNode',
+                kind: CompletionItemKind.Interface
+            }]);
+        });
+
+        it('only shows intrinsic/native types in brightscript', () => {
+            program.setFile('source/main.brs', `
+                sub foo(thing as  )
+                    print thing
+                end sub
+            `);
+            program.validate();
+            //  sub foo(thing as | )
+            const completions = program.getCompletions('source/main.brs', util.createPosition(1, 34));
+            expectCompletionsIncludes(completions, [{
+                label: 'integer',
+                kind: CompletionItemKind.Keyword
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'function',
+                kind: CompletionItemKind.Keyword
+            }]);
+            expectCompletionsExcludes(completions, [{
+                label: 'roSGNode'
+            }]);
+        });
+
+    });
+
+    describe('interfaces', () => {
+
+        it('finds members of interfaces', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeInterface )
+                    print thing.
+                end sub
+
+
+                interface SomeInterface
+                    name as string
+                    data
+                    function doStuff()
+                end interface
+            `);
+            program.validate();
+            //  print thing.|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'data',
+                kind: CompletionItemKind.Field
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'doStuff',
+                kind: CompletionItemKind.Method
+            }]);
+
+        });
+
+        it('finds optional members of interfaces', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeInterface )
+                    print thing.
+                end sub
+
+
+                interface SomeInterface
+                    optional name as string
+                    optional data
+                    optional function doStuff()
+                end interface
+            `);
+            program.validate();
+            //  print thing.|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'data',
+                kind: CompletionItemKind.Field
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'doStuff',
+                kind: CompletionItemKind.Method
+            }]);
+
+        });
+
+    });
+
+    describe('typed variables', () => {
+        it('shows variables of type interface as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeInterface)
+                    print thi|
+                end sub
+
+                interface SomeInterface
+                    optional name as string
+                    optional data
+                    optional function doStuff()
+                end interface
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('shows variables of type class as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeKlass)
+                    print thi|
+                end sub
+
+                class SomeKlass
+                    name as string
+                    data
+                    function doStuff()
+                    end function
+                end class
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('shows variables of type enum as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as SomeEnum)
+                    print thi|
+                end sub
+
+                enum SomeEnum
+                    up
+                    down
+                end end
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+        it('shows variables of type function as CompletionItemKind.Variable', () => {
+            program.setFile('source/main.bs', `
+                sub foo(thing as function)
+                    print thi|
+                end sub
+            `);
+            program.validate();
+            //  print thi|
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'thing',
+                kind: CompletionItemKind.Variable
+            }]);
+        });
+
+    });
+
+    describe('brighterscript vs brightscript', () => {
+        it('should not include transpiled versions of symbols in brighterscript code', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    sub beta()
+                        print "hello"
+                    end sub
+
+                    sub gamma()
+                        ' completions here should NOT have Alpha_beta or Alpha_gamma
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            //  | ' completions here
+            const completions = program.getCompletions('source/main.bs', util.createPosition(6, 25));
+            expectCompletionsExcludes(completions, [{
+                label: 'Alpha_beta',
+                kind: CompletionItemKind.Function
+            }, {
+                label: 'Alpha_gamma',
+                kind: CompletionItemKind.Function
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'Alpha',
+                kind: CompletionItemKind.Module
+            }]);
+        });
+
+        it('should include transpiled versions of symbols in brightscript code', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    sub beta()
+                        print "hello"
+                    end sub
+
+                    sub gamma()
+                        print "gamma"
+                    end sub
+                end namespace
+            `);
+            program.setFile('source/other.brs', `
+                sub inBrsFile()
+                      ' completions here should have Alpha_beta and Alpha_gamma
+                end sub
+            `);
+            program.validate();
+            //  | ' completions here
+            const completions = program.getCompletions('source/other.brs', util.createPosition(2, 21));
+            expectCompletionsIncludes(completions, [{
+                label: 'Alpha_beta',
+                kind: CompletionItemKind.Function
+            }, {
+                label: 'Alpha_gamma',
+                kind: CompletionItemKind.Function
+            }]);
+            expectCompletionsExcludes(completions, [{
+                label: 'Alpha',
+                kind: CompletionItemKind.Module
+            }]);
+        });
+
+        it('should not include namespaces in brightscript code', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                end namespace
+            `);
+            program.setFile('source/other.brs', `
+                sub inBrsFile()
+                      ' completions here should have Alpha_beta and Alpha_gamma
+                end sub
+            `);
+            program.validate();
+            //  | ' completions here
+            const completions = program.getCompletions('source/other.brs', util.createPosition(2, 21));
+            expectCompletionsExcludes(completions, [{
+                label: 'Alpha',
+                kind: CompletionItemKind.Module
+            }]);
+        });
+    });
+
+    describe('global values', () => {
+        it('should include true, false', () => {
+            program.setFile('source/main.bs', `
+                sub foo()
+                    fooValue =
+                end sub
+            `);
+            program.validate();
+            // fooValue =  |
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 32));
+            expectCompletionsIncludes(completions, [{
+                label: 'true',
+                kind: CompletionItemKind.Value
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'false',
+                kind: CompletionItemKind.Value
+            }]);
+        });
+
+        it('should include invalid', () => {
+            program.setFile('source/main.bs', `
+                sub foo()
+                    fooValue =
+                end sub
+            `);
+            program.validate();
+            // fooValue =  |
+            const completions = program.getCompletions('source/main.bs', util.createPosition(2, 32));
+            expectCompletionsIncludes(completions, [{
+                label: 'invalid',
+                kind: CompletionItemKind.Value
+            }]);
+        });
+    });
+
+    describe('accessibility values', () => {
+        it('include appropriate accessible members', () => {
+            program.setFile('source/main.bs', `
+                class Accessibility
+                    private name
+                    protected age
+                    public id
+
+                    sub someMethod()
+                        m. ' In class method
+                    end sub
+                end class
+
+                sub foo(klass as Accessibility)
+                    klass. ' outside class method
+                end sub
+            `);
+            program.validate();
+            // m.| ' In class method
+            let completions = program.getCompletions('source/main.bs', util.createPosition(7, 26));
+            expectCompletionsIncludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'age',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'id',
+                kind: CompletionItemKind.Field
+            }]);
+
+            // klass.|  ' outside class method
+            completions = program.getCompletions('source/main.bs', util.createPosition(12, 26));
+            expectCompletionsExcludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'age',
+                kind: CompletionItemKind.Field
+            }]);
+            expectCompletionsIncludes(completions, [{
+                label: 'id',
+                kind: CompletionItemKind.Field
+            }]);
+        });
+
+
+        it('includes private members on non-m variables when appropriate', () => {
+            program.setFile('source/main.bs', `
+                class Accessibility
+                    private name
+                    protected age
+                    public id
+
+                    sub foo(notM as Accessibility)
+                        notM. ' In class method
+                    end sub
+                end class
+            `);
+            program.validate();
+            // m.| ' In class method
+            let completions = program.getCompletions('source/main.bs', util.createPosition(7, 29));
+            expectCompletionsIncludes(completions, [{
+                label: 'age',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'id',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }]);
+        });
+
+        it('includes protected members on sub classes', () => {
+            program.setFile('source/main.bs', `
+                class Accessibility
+                    private name
+                    protected age
+                    public id
+                end class
+
+                class AccessToo extends Accessibility
+                    sub foo()
+                        m. ' In class method
+                    end sub
+                end class
+            `);
+            program.validate();
+            // m.| ' In class method
+            let completions = program.getCompletions('source/main.bs', util.createPosition(9, 26));
+            expectCompletionsIncludes(completions, [{
+                label: 'age',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'id',
+                kind: CompletionItemKind.Field
+            }]);
+            expectCompletionsExcludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }]);
+        });
+    });
+
+    describe('alias', () => {
+        it('includes aliases', () => {
+            program.setFile('source/main.bs', `
+                alias APerson = Person
+                alias APi = Pi
+
+                namespace alpha
+                    sub test()
+                        print
+                    end sub
+
+                    sub pi()
+                        print "Magnum"
+                    end sub
+
+                    enum Person
+                        tall
+                        short
+                    end enum
+                end namespace
+
+                function Person()
+                    return "John Doe"
+                end function
+
+                const PI = 3.14
+            `);
+            program.validate();
+            //     print |
+            let completions = program.getCompletions('source/main.bs', util.createPosition(6, 31));
+            expectCompletionsIncludes(completions, [{
+                label: 'APi',
+                kind: CompletionItemKind.Constant
+            }, {
+                label: 'APerson',
+                kind: CompletionItemKind.Function
+            }]);
+        });
+
+
+        it('includes runtime and typetime symbols on RHS', () => {
+            program.setFile('source/main.bs', `
+                alias myAlias = a
+
+                function getPersonName()
+                    return "John Doe"
+                end function
+
+                const PI = 3.14
+
+                interface SomeInterface
+                    name as string
+                end interface
+            `);
+            program.validate();
+            //   alias myAlias = a|
+            let completions = program.getCompletions('source/main.bs', util.createPosition(1, 33));
+            expectCompletionsIncludes(completions, [{
+                label: 'getPersonName',
+                kind: CompletionItemKind.Function
+            }, {
+                label: 'PI',
+                kind: CompletionItemKind.Constant
+            }, {
+                label: 'SomeInterface',
+                kind: CompletionItemKind.Interface
+            }]);
+        });
+
+    });
+
+    describe('type statement', () => {
+        it('includes type members', () => {
+            program.setFile('source/main.bs', `
+                sub greet(p as Programmer)
+                    print p.
+                end sub
+
+                interface Person
+                    name as string
+                    age as integer
+                end interface
+
+                interface Employee
+                    name as string
+                    age as integer
+                    employeeId as integer
+                end interface
+
+                type Programmer = Person or Employee
+            `);
+            program.validate();
+            //   print p.|
+            let completions = program.getCompletions('source/main.bs', util.createPosition(2, 29));
+            expect(completions.length).to.eql(2);
+            expectCompletionsIncludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'age',
+                kind: CompletionItemKind.Field
+            }]);
+        });
+    });
+
+    describe('incomplete statements', () => {
+
+        it('should complete after if', () => {
+            program.setFile('source/main.bs', `
+                interface Person
+                    name as string
+                end interface
+
+                sub checkName(p as Person)
+                    if p.
+                end sub
+            `);
+            program.validate();
+            //   if p.
+            let completions = program.getCompletions('source/main.bs', util.createPosition(6, 26));
+            expectCompletionsIncludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }]);
+            expect(completions.length).to.eql(1);
+        });
+    });
+
+    describe('compound types', () => {
+        it('includes only common members of union types', () => {
+            program.setFile('source/main.bs', `
+                interface Person
+                    name as string
+                    age as integer
+                end interface
+
+                interface Employee
+                    name as string
+                    employeeId as integer
+                end interface
+
+                sub greet(p as Person or Employee)
+                    print p.
+                end sub
+            `);
+            program.validate();
+            //   print p.|
+            let completions = program.getCompletions('source/main.bs', util.createPosition(12, 29));
+            expect(completions.length).to.eql(1);
+            expectCompletionsIncludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }]);
+        });
+
+        it('includes all members of intersection types', () => {
+            program.setFile('source/main.bs', `
+                interface Person
+                    name as string
+                    age as integer
+                end interface
+
+                interface Employee
+                    name as string
+                    employeeId as integer
+                end interface
+
+                sub greet(p as Person and Employee)
+                    print p.
+                end sub
+            `);
+            program.validate();
+            //   print p.|
+            let completions = program.getCompletions('source/main.bs', util.createPosition(12, 29));
+            expect(completions.length).to.eql(3);
+            expectCompletionsIncludes(completions, [{
+                label: 'name',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'age',
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'employeeId',
+                kind: CompletionItemKind.Field
+            }]);
+        });
+
+        it('includes AA members when it is an intersection with an AA', () => {
+            program.setFile('source/main.bs', `
+                interface Person
+                    name as string
+                    age as integer
+                end interface
+
+                sub greet(p as Person and roAssociativeArray)
+                    print p.
+                end sub
+            `);
+            program.validate();
+            //   print p.|
+            let completions = program.getCompletions('source/main.bs', util.createPosition(7, 29));
+            expect(completions.length).to.at.least(4);
+            expectCompletionsIncludes(completions, [{
+                label: 'name', // from Person
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'age', // from Person
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'Append', // from roAssociativeArray
+                kind: CompletionItemKind.Method
+            }, {
+                label: 'Count', // from roAssociativeArray
+                kind: CompletionItemKind.Method
+            }]);
+        });
+
+        it('includes members from non-dynamic when it is an intersection with dynamic', () => {
+            program.setFile('source/main.bs', `
+                interface Person
+                    name as string
+                    age as integer
+                end interface
+
+                sub greet(p as Person and dynamic)
+                    print p.
+                end sub
+            `);
+            program.validate();
+            //   print p.|
+            let completions = program.getCompletions('source/main.bs', util.createPosition(7, 29));
+            expect(completions.length).to.at.least(2);
+            expectCompletionsIncludes(completions, [{
+                label: 'name', // from Person
+                kind: CompletionItemKind.Field
+            }, {
+                label: 'age', // from Person
+                kind: CompletionItemKind.Field
+            }]);
+        });
+    });
+});
diff --git a/src/bscPlugin/completions/CompletionsProcessor.ts b/src/bscPlugin/completions/CompletionsProcessor.ts
index 3cec6b9cb..117ac1578 100644
--- a/src/bscPlugin/completions/CompletionsProcessor.ts
+++ b/src/bscPlugin/completions/CompletionsProcessor.ts
@@ -1,9 +1,30 @@
-import { isBrsFile, isXmlScope } from '../../astUtils/reflection';
-import type { ProvideCompletionsEvent } from '../../interfaces';
-import { TokenKind } from '../../lexer/TokenKind';
+import { isAliasStatement, isBrsFile, isCallableType, isClassStatement, isClassType, isComponentType, isConstStatement, isEnumMemberType, isEnumType, isFunctionExpression, isInterfaceType, isMethodStatement, isNamespaceStatement, isNamespaceType, isNativeType, isTypedFunctionType, isTypeStatementType, isXmlFile, isXmlScope } from '../../astUtils/reflection';
+import type { ExtraSymbolData, FileReference, ProvideCompletionsEvent } from '../../interfaces';
+import type { BscFile } from '../../files/BscFile';
+import { AllowedTriviaTokens, DeclarableTypes, Keywords, TokenKind } from '../../lexer/TokenKind';
 import type { XmlScope } from '../../XmlScope';
 import { util } from '../../util';
-import { firstBy } from 'thenby';
+import type { Scope } from '../../Scope';
+import { ParseMode } from '../../parser/Parser';
+import type { CompletionItem, Position } from 'vscode-languageserver';
+import { CompletionItemKind, TextEdit } from 'vscode-languageserver';
+import type { BscSymbol } from '../../SymbolTable';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import type { XmlFile } from '../../files/XmlFile';
+import type { Program } from '../../Program';
+import type { BrsFile } from '../../files/BrsFile';
+import type { FunctionScope } from '../../FunctionScope';
+import { BooleanType } from '../../types/BooleanType';
+import { InvalidType } from '../../types/InvalidType';
+import type { BscType } from '../../types/BscType';
+import type { AstNode } from '../../parser/AstNode';
+import type { ClassStatement, FunctionStatement, NamespaceStatement, AliasStatement } from '../../parser/Statement';
+import type { Token } from '../../lexer/Token';
+import { createIdentifier } from '../../astUtils/creators';
+import type { FunctionExpression } from '../../parser/Expression';
+import { LogLevel } from '../../Logger';
+
+const SCOPES_FOR_COMPLETION = 3;
 
 export class CompletionsProcessor {
     constructor(
@@ -13,58 +34,667 @@ export class CompletionsProcessor {
     }
 
     public process() {
-        let completionsArray = [];
-        if (isBrsFile(this.event.file) && this.event.file.isPositionNextToTokenKind(this.event.position, TokenKind.Callfunc)) {
-            const xmlScopes = this.event.program.getScopes().filter((s) => isXmlScope(s)) as XmlScope[];
-            // is next to a @. callfunc invocation - must be an interface method.
-            //TODO refactor this to utilize the actual variable's component type (when available)
-            for (const scope of xmlScopes) {
-                let fileLinks = this.event.program.getStatementsForXmlFile(scope);
-                for (let fileLink of fileLinks) {
-                    let pushItem = scope.createCompletionFromFunctionStatement(fileLink.item);
-                    if (!completionsArray.includes(pushItem.label)) {
-                        completionsArray.push(pushItem.label);
-                        this.event.completions.push(pushItem);
-                    }
+        let file = this.event.file;
+        this.event.program.logger.time(LogLevel.log, ['Processing completions'], () => {
+
+            // Find the scopes for this file - Only process the first few scopes
+            const scopesToProcess = this.getScopesForCompletion();
+
+            //get the completions from all scopes for this file
+            let completionResults: CompletionItem[] = [];
+            let globalResults: CompletionItem[] = [];
+
+            if (isXmlFile(file)) {
+                completionResults = this.getXmlFileCompletions(this.event.position, file);
+            } else if (isBrsFile(file)) {
+                //handle script import completions
+                let scriptImport = util.getScriptImportAtPosition(file.ownScriptImports, this.event.position);
+                if (scriptImport) {
+                    this.event.completions.push(...this.getScriptImportCompletions(file.program, file.pkgPath, scriptImport));
+                    return;
                 }
+
+                const results = this.getBrsFileCompletions(this.event.position, file, scopesToProcess);
+                completionResults = results.scoped;
+                globalResults = results.global;
             }
-            //no other result is possible in this case
-            return;
-        }
 
-        //find the scopes for this file (sort by name so these results are always consistent)
-        let scopesForFile = this.event.program.getScopesForFile(this.event.file).sort(firstBy(x => x.name));
+            //push any global results to the completions array
+            this.event.completions.push(...globalResults);
 
-        //if there are no scopes, include the global scope so we at least get the built-in functions
-        scopesForFile = scopesForFile.length > 0 ? scopesForFile : [this.event.program.globalScope];
+            //only keep completions common to every scope for this file (the global results are not considered in this filter and will always be included)
+            let allCompletions = completionResults.flat();
+            let keyCounts = new Map<string, number>();
+            for (let completion of allCompletions) {
+                let key = `${completion.label}-${completion.kind}`;
+                keyCounts.set(key, keyCounts.has(key) ? keyCounts.get(key) + 1 : 1);
+                if (keyCounts.get(key) === scopesToProcess.length) {
+                    this.event.completions.push(completion);
+                }
+            }
+        });
+    }
+
+    private getScopesForCompletion() {
+        //the scopes for this file
+        let scopesForFile = this.event.scopes ?? [];
+
+        // //if there are no scopes, include the global scope so we at least get the built-in functions
+        // if (this.event.program) {
+        //     scopesForFile = scopesForFile.length > 0 ? scopesForFile : [];
+        // }
 
         // Only process the first few scopes. This might result in missing completions,
         // but it's better than wasting TONS of cycles building essentially the same completions over and over
-        const scopesToProcess = scopesForFile.slice(0, 3);
+        const scopesToProcess = scopesForFile.slice(0, SCOPES_FOR_COMPLETION);
 
         // always include the source scope if applicable to this file
         let sourceScope = scopesForFile.find(x => x.name === 'source');
         if (sourceScope && !scopesToProcess.includes(sourceScope)) {
-            //replace the first scope with the source scope so we always process exactly 3 scopes
+            //replace the first scope with the source scope so we process a consistent number of scopes if possible
             scopesToProcess[0] = sourceScope;
         }
+        return scopesToProcess;
+    }
+
+
+    /**
+     * Get all available completions for the specified position
+     * @param position the position to get completions
+     */
+    public getXmlFileCompletions(position: Position, file: XmlFile): CompletionItem[] {
+        let scriptImport = util.getScriptImportAtPosition(file.scriptTagImports, position);
+        if (scriptImport) {
+            return this.getScriptImportCompletions(file.program, file.pkgPath, scriptImport);
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * Get a list of all script imports, relative to the specified pkgPath
+     * @param program - reference to the program
+     * @param sourcePkgPath - the pkgPath of the source that wants to resolve script imports
+     * @param scriptImport - example script import
+     */
+    public getScriptImportCompletions(program: Program, sourcePkgPath: string, scriptImport: FileReference) {
+        let lowerSourcePkgPath = sourcePkgPath.toLowerCase();
+
+        let result = [] as CompletionItem[];
+        /**
+         * hashtable to prevent duplicate results
+         */
+        let resultPkgPaths = {} as Record<string, boolean>;
+
+        //restrict to only .brs files
+        for (let key in program.files) {
+            let file = program.files[key];
+            const ext = util.getExtension(file.srcPath);
+            if (
+                //is a BrightScript or BrighterScript file
+                (ext === '.bs' || ext === '.brs') &&
+                //this file is not the current file
+                lowerSourcePkgPath !== file.pkgPath.toLowerCase()
+            ) {
+                //add the relative path
+                let relativePath = util.getRelativePath(sourcePkgPath, file.destPath).replace(/\\/g, '/');
+                let pkgPathStandardized = file.pkgPath.replace(/\\/g, '/');
+                let filePkgPath = `pkg:/${pkgPathStandardized}`;
+                let importPkgPath = util.getImportPackagePath(file.srcPath, filePkgPath);
+                let lowerFilePkgPath = filePkgPath.toLowerCase();
+                if (!resultPkgPaths[lowerFilePkgPath]) {
+                    resultPkgPaths[lowerFilePkgPath] = true;
+
+                    result.push({
+                        label: relativePath,
+                        detail: file.srcPath,
+                        kind: CompletionItemKind.File,
+                        textEdit: {
+                            newText: relativePath,
+                            range: scriptImport.filePathRange
+                        }
+                    });
+
+                    //add the absolute path
+                    result.push({
+                        label: importPkgPath,
+                        detail: file.srcPath,
+                        kind: CompletionItemKind.File,
+                        textEdit: {
+                            newText: importPkgPath,
+                            range: scriptImport.filePathRange
+                        }
+                    });
+                }
+            }
+        }
+        return result;
+    }
+
+
+    /**
+     * Get completions available at the given cursor. This aggregates all values from this file and the current scope.
+     */
+    public getBrsFileCompletions(position: Position, file: BrsFile, scopesToProcess: Scope[]): { global: CompletionItem[]; scoped: CompletionItem[] } {
+        let result = [] as CompletionItem[];
+        const currentTokenByFilePosition = file.getTokenAt(position);
+        const currentToken = currentTokenByFilePosition ?? file.getTokenAt(file.getClosestExpression(position)?.location?.range.start);
+
+        const emptyResult = { global: [], scoped: [] };
+
+        if (!currentToken) {
+            return emptyResult;
+        }
+        const tokenKind = currentToken?.kind;
+
+        //if cursor is after a comment, disable completions
+        if (this.isPostionInComment(file, position)) {
+            return emptyResult;
+        }
+
+        let expression: AstNode;
+        let shouldLookForMembers = false;
+        let shouldLookForCallFuncMembers = false;
+        let symbolTableLookupFlag = SymbolTypeFlag.runtime;
+        let beforeDotToken: Token;
+
+        if (file.tokenFollows(currentToken, TokenKind.Goto)) {
+            let functionScope = file.getFunctionScopeAtPosition(position);
+            return { global: [], scoped: this.getLabelCompletion(functionScope) };
+        }
+
+        if (this.isTokenAdjacentTo(file, currentToken, TokenKind.Dot)) {
+            const dotToken = this.getAdjacentToken(file, currentToken, TokenKind.Dot);
+            beforeDotToken = file.getTokenBefore(dotToken);
+            expression = file.getClosestExpression(beforeDotToken?.location?.range.end);
+            shouldLookForMembers = true;
+        } else if (this.isTokenAdjacentTo(file, currentToken, TokenKind.Callfunc)) {
+            const dotToken = this.getAdjacentToken(file, currentToken, TokenKind.Callfunc);
+            beforeDotToken = file.getTokenBefore(dotToken);
+            expression = file.getClosestExpression(beforeDotToken?.location?.range.end);
+            shouldLookForCallFuncMembers = true;
+        } else if (this.isTokenAdjacentTo(file, currentToken, TokenKind.As)) {
+            if (file.parseMode === ParseMode.BrightScript) {
+                return { global: NativeTypeCompletions, scoped: [] };
+            }
+            expression = file.getClosestExpression(this.event.position);
+            symbolTableLookupFlag = SymbolTypeFlag.typetime;
+        } else if (this.isTokenAdjacentTo(file, currentToken, TokenKind.Equal)) {
+            expression = file.getClosestExpression(this.event.position);
+            if (expression?.findAncestor<AliasStatement>(isAliasStatement)) {
+                // allow runtime and typetime lookups in alias statements
+                // eslint-disable-next-line no-bitwise
+                symbolTableLookupFlag = SymbolTypeFlag.runtime | SymbolTypeFlag.typetime;
+            }
+        } else {
+            expression = file.getClosestExpression(this.event.position);
+        }
+
+        if (isFunctionExpression(expression)) {
+            // if completion is the last character of the function, use the completions of the body of the function
+            expression = expression.body;
+        }
+
+        if (!expression) {
+            return emptyResult;
+        }
+
+        const tokenBefore = file.getTokenBefore(file.getClosestToken(expression.location?.range?.start));
+
+        // helper to check get correct symbol tables for look ups
+        function getSymbolTableForLookups() {
+            if (shouldLookForMembers) {
+                let type = expression.getType({ flags: SymbolTypeFlag.runtime });
+                if (isEnumType(type) && !isEnumType(expression.getType({ flags: SymbolTypeFlag.typetime }))) {
+                    // enum members are registered in the symbol table as enum type
+                    // an enum type should ONLY use the enum type's members when called directly
+                    // since this is not a typetime enum, the actual type is actually an enum member!
+                    type = type.defaultMemberType;
+                }
+                // Make sure built in interfaces are added.
+                if (type.isResolvable()) {
+                    type.addBuiltInInterfaces();
+                }
+                return type?.getMemberTable();
+            } else if (shouldLookForCallFuncMembers) {
+                let type = expression.getType({ flags: SymbolTypeFlag.runtime });
+                if (isComponentType(type)) {
+                    // it's a component and you're doing a callFunc - only let it do functions from that table
+                    return type.getCallFuncTable();
+                }
+                // this is not a component type - there should be no callfunc members
+                return undefined;
+            }
+            const symbolTableToUse = expression.getSymbolTable();
+            return symbolTableToUse;
+        }
+
+        const areMembers = (shouldLookForMembers || shouldLookForCallFuncMembers);
+        const notMembers = !areMembers;
+        const isAfterNew = tokenBefore?.kind === TokenKind.New;
+        const shouldLookInNamespace: NamespaceStatement = notMembers && expression.findAncestor(isNamespaceStatement);
+
+        const containingClassStmt = expression.findAncestor<ClassStatement>(isClassStatement);
+        const containingNamespace = expression.findAncestor<NamespaceStatement>(isNamespaceStatement);
+        const containingNamespaceName = containingNamespace?.getName(ParseMode.BrighterScript);
+        const containingFunctionExpression = expression.findAncestor<FunctionExpression>(isFunctionExpression);
+        const tokenIsLiteralString = (tokenKind === TokenKind.StringLiteral || tokenKind === TokenKind.TemplateStringQuasi);
+
+        const globalCompletions: CompletionItem[] = [];
+        if (!tokenIsLiteralString && notMembers && !isAfterNew && this.event.program?.globalScope) {
+            let globalSymbols: BscSymbol[] = this.event.program.globalScope.symbolTable.getAllSymbols(symbolTableLookupFlag) ?? [];
+            if (symbolTableLookupFlag === SymbolTypeFlag.runtime) {
+                globalSymbols.push(...this.getGlobalValues());
+            }
+            globalCompletions.push(...this.getSymbolsCompletion(globalSymbols));
+        }
+
+        for (const scope of scopesToProcess) {
+            if (tokenKind === TokenKind.StringLiteral || tokenKind === TokenKind.TemplateStringQuasi) {
+                result.push(...this.getStringLiteralCompletions(scope, currentToken));
+                continue;
+            }
+            scope.linkSymbolTable();
+            const symbolTable = getSymbolTableForLookups();
+            let currentSymbols: BscSymbol[] = [];
+
+            if (areMembers) {
+                currentSymbols = symbolTable?.getAllSymbols(symbolTableLookupFlag) ?? [];
+                const tokenType = expression.getType({ flags: SymbolTypeFlag.runtime });
+                if (isClassType(tokenType)) {
+                    currentSymbols = currentSymbols.filter((symbol) => {
+                        if (symbol.name === 'new') {
+                            // don't return the constructor as a property
+                            return false;
+                        }
+                        return this.isMemberAccessible(scope, symbol, containingClassStmt, containingNamespaceName);
+                    });
+                }
+            } else {
+                currentSymbols = symbolTable?.getOwnSymbols(symbolTableLookupFlag) ?? [];
+                if (containingFunctionExpression) {
+                    if (symbolTable !== containingFunctionExpression.body.symbolTable) {
+                        // this is a pocket table - get all symbols defined in full function
+                        currentSymbols.push(...containingFunctionExpression.body.getSymbolTable().getOwnSymbols(symbolTableLookupFlag));
+                    }
+                    currentSymbols.push(...containingFunctionExpression.getSymbolTable().getOwnSymbols(symbolTableLookupFlag));
+                }
+
+                if (shouldLookInNamespace) {
+                    const nsNameParts = shouldLookInNamespace.getNameParts();
+                    let nameSpaceTypeSofar: BscType;
+                    let nsNameLookupTable = scope.symbolTable;
+                    for (const namePart of nsNameParts) {
+                        nameSpaceTypeSofar = nsNameLookupTable?.getSymbolType(namePart.text, { flags: symbolTableLookupFlag });
+                        if (isNamespaceType(nameSpaceTypeSofar)) {
+                            nsNameLookupTable = nameSpaceTypeSofar.getMemberTable();
+                        } else {
+                            break;
+                        }
+                    }
+                    if (isNamespaceType(nameSpaceTypeSofar)) {
+                        currentSymbols.push(...nameSpaceTypeSofar.getMemberTable().getAllSymbols(symbolTableLookupFlag));
+                    }
+                }
+                currentSymbols.push(...this.getScopeSymbolCompletions(file, scope, symbolTableLookupFlag));
+            }
+
+            let ignoreAllPropertyNames = false;
+
+            if (isAfterNew) {
+                //we are after a new keyword; so we can only be namespaces that have a class or classes at this point
+                currentSymbols = currentSymbols.filter(symbol => isClassType(symbol.type) || this.isNamespaceTypeWithMemberType(symbol.type, isClassType));
+                ignoreAllPropertyNames = true;
+            }
+
+            result.push(...this.getSymbolsCompletion(currentSymbols, areMembers));
+            if (shouldLookForMembers && currentSymbols.length === 0 && !ignoreAllPropertyNames) {
+                // could not find members of actual known types.. just try everything
+                result.push(...this.getPropertyNameCompletions(scope),
+                    ...this.getAllClassMemberCompletions(scope).values());
+            } else if (shouldLookForCallFuncMembers && currentSymbols.length === 0) {
+                // could not find members of actual known types.. just try everything
+                result.push(...this.getCallFuncNameCompletions(scope));
+            }
+            scope.unlinkSymbolTable();
+        }
+        return { global: globalCompletions, scoped: result };
+    }
+
+    private getScopeSymbolCompletions(file: BrsFile, scope: Scope, symbolTableLookupFlag: SymbolTypeFlag) {
+        // get all scope available symbols
+
+        const scopeSymbols = file.parseMode === ParseMode.BrighterScript
+            ? [...scope.symbolTable.getOwnSymbols(symbolTableLookupFlag), ...scope.allNamespaceTypeTable.getOwnSymbols(symbolTableLookupFlag)]
+            : scope.symbolTable.getOwnSymbols(symbolTableLookupFlag);
+
+        const fileSymbols = file.ast.getSymbolTable().getOwnSymbols(symbolTableLookupFlag);
+        scopeSymbols.push(...fileSymbols);
+
+        const scopeAvailableSymbols = scopeSymbols.filter(sym => {
+            if (file.parseMode === ParseMode.BrighterScript) {
+                // eslint-disable-next-line no-bitwise
+                if (sym.flags & SymbolTypeFlag.postTranspile) {
+                    // underscored symbols should not be available in Brighterscript files
+                    return false;
+                }
+            } else if (file.parseMode === ParseMode.BrightScript) {
+                if (isNamespaceType(sym.type)) {
+                    return false;
+                }
+            }
+            return true;
+        });
+
+        return scopeAvailableSymbols;
+    }
+
+    private getSymbolsCompletion(symbols: BscSymbol[], areMembers = false): CompletionItem[] {
+        return symbols.map(symbol => {
+            // if this is low priority, sort it at the end of the list
+            const sortText = symbol.data?.completionPriority ? 'z'.repeat(symbol.data?.completionPriority) + symbol.name : undefined;
+            return {
+                label: symbol.name,
+                kind: this.getCompletionKindFromSymbol(symbol, areMembers),
+                detail: symbol?.type?.toString(),
+                documentation: this.getDocumentation(symbol),
+                sortText: sortText
+            };
+        });
+    }
+
+    private getDocumentation(symbol: BscSymbol) {
+        if (symbol.data?.description) {
+            return symbol.data?.description;
+        }
+        return util.getNodeDocumentation(symbol.data?.definingNode);
+    }
+
+
+    private getCompletionKindFromSymbol(symbol: BscSymbol, areMembers = false) {
+        let type = symbol?.type;
+        if (isTypeStatementType(type)) {
+            type = type.wrappedType;
+        }
+        const extraData = symbol?.data;
+        let definingNode = extraData?.definingNode;
+        let isAlias = extraData?.isAlias;
+        let isInstance = extraData?.isInstance;
+
+        if (isAliasStatement(extraData?.definingNode)) {
+            isAlias = true;
+            const aliasExtraData: ExtraSymbolData = {};
+            type = extraData.definingNode.value.getType({ flags: symbol.flags, data: aliasExtraData });
+            definingNode = aliasExtraData?.definingNode;
+        }
+
+        if (isConstStatement(definingNode)) {
+            return CompletionItemKind.Constant;
+        } else if (isClassType(type) && !isInstance) {
+            return CompletionItemKind.Class;
+        } else if (isCallableType(type)) {
+            const finalTypeNameLower = type?.toString().split('.').pop().toLowerCase();
+            const symbolNameLower = symbol?.name.toLowerCase();
+            let nameMatchesType = symbolNameLower === finalTypeNameLower;
+            if (isTypedFunctionType(type) && !nameMatchesType) {
+                if (symbolNameLower === type.name?.replace(/\./gi, '_').toLowerCase()) {
+                    nameMatchesType = true;
+                }
+            }
+            if (nameMatchesType || isAlias) {
+                return areMembers ? CompletionItemKind.Method : CompletionItemKind.Function;
+            }
+        } else if (isInterfaceType(type) && !isInstance) {
+            return CompletionItemKind.Interface;
+        } else if (isEnumType(type) && !isInstance) {
+            return CompletionItemKind.Enum;
+        } else if (isEnumMemberType(type)) {
+            return CompletionItemKind.EnumMember;
+        } else if (isNamespaceType(type)) {
+            return CompletionItemKind.Module;
+        } else if (isComponentType(type) && (!isInstance)) {
+            return CompletionItemKind.Interface;
+        }
+        if (areMembers) {
+            return CompletionItemKind.Field;
+        }
+        const lowerSymbolName = symbol.name.toLowerCase();
+        if (lowerSymbolName === 'true' ||
+            lowerSymbolName === 'false' ||
+            lowerSymbolName === 'invalid') {
+            return CompletionItemKind.Value;
+
+        }
+        const tokenIdentifier = util.tokenToBscType(createIdentifier(symbol.name));
+        if (isNativeType(tokenIdentifier)) {
+            return CompletionItemKind.Keyword;
+
+        }
+        return CompletionItemKind.Variable;
+    }
+
+    private isNamespaceTypeWithMemberType(nsType: BscType, predicate: (t: BscType) => boolean): boolean {
+        if (!isNamespaceType(nsType)) {
+            return false;
+        }
+        const members = nsType.memberTable.getAllSymbols(SymbolTypeFlag.runtime);
+        for (const member of members) {
+            if (predicate(member.type)) {
+                return true;
+            } else if (isNamespaceType(member.type)) {
+                if (this.isNamespaceTypeWithMemberType(member.type, predicate)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+
+    }
+
+    private isMemberAccessible(scope: Scope, member: BscSymbol, containingClassStmt: ClassStatement, containingNamespaceName: string): boolean {
+        // eslint-disable-next-line no-bitwise
+        const isPrivate = member.flags & SymbolTypeFlag.private;
+        // eslint-disable-next-line no-bitwise
+        const isProtected = member.flags & SymbolTypeFlag.protected;
+
+        if (!containingClassStmt || !(isPrivate || isProtected)) {
+            // not in a class - no private or protected members allowed
+            return !(isPrivate || isProtected);
+        }
+        const containingClassName = containingClassStmt.getName(ParseMode.BrighterScript);
+        const classStmtThatDefinedMember = member.data?.definingNode?.findAncestor<ClassStatement>(isClassStatement);
+        if (isPrivate) {
+            return containingClassStmt === classStmtThatDefinedMember;
 
-        //get the completions from all scopes for this file
-        let allCompletions = util.flatMap(
-            scopesToProcess.map(scope => {
-                return this.event.file.getCompletions(this.event.position, scope);
-            }),
-            c => c
-        );
+        } else if (isProtected) {
+            const ancestorClasses = scope.getClassHierarchy(containingClassName, containingNamespaceName).map(link => link.item);
+            return ancestorClasses.includes(classStmtThatDefinedMember);
+        }
+        return true;
+    }
+
+    private getLabelCompletion(functionScope: FunctionScope) {
+        return functionScope.labelStatements.map(label => ({
+            label: label.name,
+            kind: CompletionItemKind.Reference
+        }));
+    }
+
+    public createCompletionFromFunctionStatement(statement: FunctionStatement, completionKind: CompletionItemKind = CompletionItemKind.Function): CompletionItem {
+        const funcType = statement.getType({ flags: SymbolTypeFlag.runtime });
+        return {
+            label: statement.getName(ParseMode.BrighterScript),
+            kind: completionKind,
+            detail: funcType.toString(),
+            documentation: util.getNodeDocumentation(statement)
+        };
+    }
+
+    private getStringLiteralCompletions(scope: Scope, currentToken: Token) {
+        const match = /^("?)(pkg|libpkg):/.exec(currentToken.text);
+        let result = [] as CompletionItem[];
+        if (match) {
+            // Get file path locations
+            const [, openingQuote, fileProtocol] = match;
+            //include every absolute file path from this scope
+            for (const file of scope.getAllFiles()) {
+                const pkgPath = `${fileProtocol}:/${file.pkgPath.replace(/\\/g, '/')}`;
+                result.push({
+                    label: pkgPath,
+                    textEdit: TextEdit.replace(
+                        util.createRange(
+                            currentToken.location?.range.start.line,
+                            //+1 to step past the opening quote
+                            currentToken.location?.range.start.character + (openingQuote ? 1 : 0),
+                            currentToken.location?.range.end.line,
+                            //-1 to exclude the closing quotemark (or the end character if there is no closing quotemark)
+                            currentToken.location?.range.end.character + (currentToken.text.endsWith('"') ? -1 : 0)
+                        ),
+                        pkgPath
+                    ),
+                    kind: CompletionItemKind.File
+                });
+            }
+            return result;
+        } else {
+            //do nothing. we don't want to show completions inside of strings...
+            return [];
+        }
+    }
+
+
+    /**
+     * Scan all files for property names, and return them as completions
+     */
+    public getPropertyNameCompletions(scope: Scope) {
+        let results = [] as CompletionItem[];
+        scope.enumerateBrsFiles((file) => {
+            results.push(...file.propertyNameCompletions);
+        });
+        return results;
+    }
+
+    public getAllClassMemberCompletions(scope: Scope) {
+        let results = new Map<string, CompletionItem>();
+        let filesSearched = new Set<BscFile>();
+        for (const file of scope.getAllFiles()) {
+            if (isBrsFile(file) && !filesSearched.has(file)) {
+                // eslint-disable-next-line @typescript-eslint/dot-notation
+                for (let cs of file['_cachedLookups'].classStatements) {
+                    for (let s of [...cs.methods, ...cs.fields]) {
+                        if (!results.has(s.tokens.name.text) && s.tokens.name.text.toLowerCase() !== 'new') {
+                            results.set(s.tokens.name.text, {
+                                label: s.tokens.name.text,
+                                kind: isMethodStatement(s) ? CompletionItemKind.Method : CompletionItemKind.Field
+                            });
+                        }
+                    }
+                }
+            }
+            filesSearched.add(file);
+        }
+        return results;
+    }
 
-        //only keep completions common to every scope for this file
-        let keyCounts = new Map<string, number>();
-        for (let completion of allCompletions) {
-            let key = `${completion.label}-${completion.kind}`;
-            keyCounts.set(key, keyCounts.has(key) ? keyCounts.get(key) + 1 : 1);
-            if (keyCounts.get(key) === scopesToProcess.length) {
-                this.event.completions.push(completion);
+    /**
+     * Scan all xmlScopes for call funcs
+     */
+    public getCallFuncNameCompletions(scope: Scope) {
+        let completionsArray = [] as CompletionItem[];
+        let completetionsLabels = [];
+        const xmlScopes = this.event.program.getScopes().filter((s) => isXmlScope(s)) as XmlScope[];
+        // is next to a @. callfunc invocation - must be an component interface method.
+
+        for (const scope of xmlScopes) {
+            let fileLinks = this.event.program.getStatementsForXmlFile(scope);
+            for (let fileLink of fileLinks) {
+                let pushItem = this.createCompletionFromFunctionStatement(fileLink.item, CompletionItemKind.Method);
+                if (!completetionsLabels.includes(pushItem.label)) {
+                    completetionsLabels.push(pushItem.label);
+                    completionsArray.push(pushItem);
+                }
             }
         }
+        //no other result is possible in this case
+        return completionsArray;
+    }
+
+
+    private getGlobalValues(): BscSymbol[] {
+        return [
+            {
+                name: 'true',
+                type: BooleanType.instance,
+                flags: SymbolTypeFlag.runtime,
+                data: {}
+            },
+            {
+                name: 'false',
+                type: BooleanType.instance,
+                flags: SymbolTypeFlag.runtime,
+                data: {}
+            },
+            {
+                name: 'invalid',
+                type: InvalidType.instance,
+                flags: SymbolTypeFlag.runtime,
+                data: {}
+            }
+        ];
+    }
+
+    private isPostionInComment(file: BrsFile, position: Position) {
+        const currentToken = file.getCurrentOrNextTokenAt(position);
+        const tokenKind = currentToken?.kind;
+        if (!currentToken) {
+            return true;
+        }
+        if (tokenKind === TokenKind.Comment) {
+            return true;
+        }
+
+        const nextNonComment = file.getNextTokenByPredicate(currentToken, (t: Token) => !AllowedTriviaTokens.includes(t.kind), 1);
+        const firstComment = nextNonComment?.leadingTrivia.find(t => t.kind === TokenKind.Comment);
+        if (firstComment && util.comparePosition(position, firstComment?.location?.range.start) >= 0) {
+            return true;
+        }
+        return false;
+    }
+
+    private isTokenAdjacentTo(file: BrsFile, currentToken: Token, targetKind: TokenKind) {
+        return file.getPreviousToken(currentToken)?.kind === targetKind || file.isTokenNextToTokenKind(currentToken, targetKind);
+    }
+
+    private getAdjacentToken(file: BrsFile, currentToken: Token, targetKind: TokenKind) {
+        return currentToken.kind === targetKind ? currentToken : file.getTokenBefore(currentToken, targetKind);
     }
 }
+
+/**
+ * List of completions for all valid keywords/reserved words.
+ * Build this list once because it won't change for the lifetime of this process
+ */
+export const KeywordCompletions = Object.keys(Keywords)
+    //remove any keywords with whitespace
+    .filter(x => !x.includes(' '))
+    //create completions
+    .map(x => {
+        return {
+            label: x,
+            kind: CompletionItemKind.Keyword
+        } as CompletionItem;
+    });
+
+
+/**
+ * List of completions for all valid intrinsic types.
+ * Build this list once because it won't change for the lifetime of this process
+ */
+export const NativeTypeCompletions = DeclarableTypes
+    //create completions
+    .map(x => {
+        return {
+            label: x.toLowerCase(),
+            kind: CompletionItemKind.Keyword
+        } as CompletionItem;
+    });
diff --git a/src/bscPlugin/definition/DefinitionProvider.spec.ts b/src/bscPlugin/definition/DefinitionProvider.spec.ts
index ae43ef351..87a9f9f67 100644
--- a/src/bscPlugin/definition/DefinitionProvider.spec.ts
+++ b/src/bscPlugin/definition/DefinitionProvider.spec.ts
@@ -50,14 +50,14 @@ describe('DefinitionProvider', () => {
                 m.customButton@.clickCustomButton()
             end sub
         `);
-        //   m.customButton@.click|CustomButon()
         expect(
+            //   m.customButton@.click|CustomButon()
             program.getDefinition(brsFile.srcPath, util.createPosition(2, 37))
         ).to.eql([{
-            uri: URI.file(customButtonXml.srcPath).toString(),
-            range: util.createRange(4, 21, 4, 57)
+            uri: util.pathToUri(customButtonXml.srcPath),
+            range: util.createRange(4, 36, 4, 53)
         }, {
-            uri: URI.file(customButtonBrs.srcPath).toString(),
+            uri: util.pathToUri(customButtonBrs.srcPath),
             range: util.createRange(1, 21, 1, 38)
         }]);
     });
@@ -90,7 +90,7 @@ describe('DefinitionProvider', () => {
         expect(
             program.getDefinition(main.srcPath, util.createPosition(4, 24))
         ).to.eql([{
-            uri: URI.file(main.srcPath).toString(),
+            uri: util.pathToUri(main.srcPath),
             range: util.createRange(2, 16, 2, 22)
         }]);
     });
diff --git a/src/bscPlugin/definition/DefinitionProvider.ts b/src/bscPlugin/definition/DefinitionProvider.ts
index 69b6a8318..837ed3a49 100644
--- a/src/bscPlugin/definition/DefinitionProvider.ts
+++ b/src/bscPlugin/definition/DefinitionProvider.ts
@@ -1,4 +1,4 @@
-import { isBrsFile, isClassStatement, isDottedGetExpression, isImportStatement, isNamespaceStatement, isXmlFile, isXmlScope } from '../../astUtils/reflection';
+import { isBrsFile, isClassStatement, isDottedGetExpression, isImportStatement, isNamespaceStatement, isVariableExpression, isXmlFile, isXmlScope } from '../../astUtils/reflection';
 import type { BrsFile } from '../../files/BrsFile';
 import type { ProvideDefinitionEvent } from '../../interfaces';
 import { TokenKind } from '../../lexer/TokenKind';
@@ -6,7 +6,6 @@ import type { Location } from 'vscode-languageserver-protocol';
 import type { ClassStatement, FunctionStatement, NamespaceStatement } from '../../parser/Statement';
 import { ParseMode } from '../../parser/Parser';
 import util from '../../util';
-import { URI } from 'vscode-uri';
 import { WalkMode, createVisitor } from '../../astUtils/visitors';
 import type { Token } from '../../lexer/Token';
 import type { XmlFile } from '../../files/XmlFile';
@@ -56,32 +55,39 @@ export class DefinitionProvider {
             const constant = scope?.getConstFileLink(fullName, containingNamespace);
             if (constant) {
                 this.event.definitions.push(
-                    util.createLocation(
-                        URI.file(constant.file.srcPath).toString(),
-                        constant.item.tokens.name.range
-                    )
+                    constant.item.tokens.name?.location
                 );
                 return;
             }
-            if (isDottedGetExpression(expression)) {
+            if (isDottedGetExpression(expression) || isVariableExpression(expression)) {
 
                 const enumLink = scope.getEnumFileLink(fullName, containingNamespace);
                 if (enumLink) {
                     this.event.definitions.push(
-                        util.createLocation(
-                            URI.file(enumLink.file.srcPath).toString(),
-                            enumLink.item.tokens.name.range
-                        )
+                        enumLink.item.tokens.name.location
                     );
                     return;
                 }
                 const enumMemberLink = scope.getEnumMemberFileLink(fullName, containingNamespace);
                 if (enumMemberLink) {
                     this.event.definitions.push(
-                        util.createLocation(
-                            URI.file(enumMemberLink.file.srcPath).toString(),
-                            enumMemberLink.item.tokens.name.range
-                        )
+                        enumMemberLink.item.tokens.name.location
+                    );
+                    return;
+                }
+
+                const interfaceFileLink = scope.getInterfaceFileLink(fullName, containingNamespace);
+                if (interfaceFileLink) {
+                    this.event.definitions.push(
+                        interfaceFileLink.item.tokens.name.location
+                    );
+                    return;
+                }
+
+                const classFileLink = scope.getClassFileLink(fullName, containingNamespace);
+                if (classFileLink) {
+                    this.event.definitions.push(
+                        classFileLink.item.tokens.name.location
                     );
                     return;
                 }
@@ -90,21 +96,21 @@ export class DefinitionProvider {
 
         let textToSearchFor = token.text.toLowerCase();
 
-        const previousToken = file.getTokenAt({ line: token.range.start.line, character: token.range.start.character });
+        const previousToken = file.getTokenAt({ line: token.location?.range.start.line, character: token.location?.range.start.character });
 
         if (previousToken?.kind === TokenKind.Callfunc) {
             for (const scope of this.event.program.getScopes()) {
                 //does this xml file declare this function in its interface?
                 if (isXmlScope(scope)) {
-                    const apiFunc = scope.xmlFile.ast?.component?.api?.functions?.find(x => x.name.toLowerCase() === textToSearchFor); // eslint-disable-line @typescript-eslint/no-loop-func
+                    const apiFunc = scope.xmlFile.ast?.componentElement?.interfaceElement?.functions?.find(x => x.name.toLowerCase() === textToSearchFor); // eslint-disable-line @typescript-eslint/no-loop-func
                     if (apiFunc) {
                         this.event.definitions.push(
-                            util.createLocation(util.pathToUri(scope.xmlFile.srcPath), apiFunc.range)
+                            util.createLocationFromRange(util.pathToUri(scope.xmlFile.srcPath), apiFunc.getAttribute('name').tokens.value.location?.range)
                         );
                         const callable = scope.getAllCallables().find((c) => c.callable.name.toLowerCase() === textToSearchFor); // eslint-disable-line @typescript-eslint/no-loop-func
                         if (callable) {
                             this.event.definitions.push(
-                                util.createLocation(util.pathToUri((callable.callable.file as BrsFile).srcPath), callable.callable.functionStatement.name.range)
+                                util.createLocationFromRange(util.pathToUri((callable.callable.file as BrsFile).srcPath), callable.callable.functionStatement.tokens.name.location?.range)
                             );
                         }
                     }
@@ -116,12 +122,12 @@ export class DefinitionProvider {
         // eslint-disable-next-line @typescript-eslint/dot-notation
         let classToken = file['getTokenBefore'](token, TokenKind.Class);
         if (classToken) {
-            let cs = file.parser.ast.findChild<ClassStatement>((klass) => isClassStatement(klass) && klass.classKeyword.range === classToken.range);
+            let cs = file.parser.ast.findChild<ClassStatement>((klass) => isClassStatement(klass) && klass.tokens.class.location?.range === classToken.location?.range);
             if (cs?.parentClassName) {
                 const nameParts = cs.parentClassName.getNameParts();
                 let extendedClass = file.getClassFileLink(nameParts[nameParts.length - 1], nameParts.slice(0, -1).join('.'));
                 if (extendedClass) {
-                    this.event.definitions.push(util.createLocation(util.pathToUri(extendedClass.file.srcPath), extendedClass.item.range));
+                    this.event.definitions.push(util.createLocationFromRange(util.pathToUri(extendedClass.file.srcPath), extendedClass.item.location?.range));
                 }
             }
             return;
@@ -133,8 +139,8 @@ export class DefinitionProvider {
                 const importedFile = this.event.program.getFile(pkgPath);
                 if (importedFile) {
                     this.event.definitions.push(
-                        util.createLocation(
-                            URI.file(importedFile.srcPath).toString(),
+                        util.createLocationFromRange(
+                            util.pathToUri(importedFile.srcPath),
                             util.createRange(1, 0, 1, 0)
                         )
                     );
@@ -160,7 +166,7 @@ export class DefinitionProvider {
                 //we found a variable declaration with this token text!
                 if (varDeclaration.name.toLowerCase() === textToSearchFor) {
                     const uri = util.pathToUri(file.srcPath);
-                    this.event.definitions.push(util.createLocation(uri, varDeclaration.nameRange));
+                    this.event.definitions.push(util.createLocationFromRange(uri, varDeclaration.nameRange));
                 }
             }
             // eslint-disable-next-line @typescript-eslint/dot-notation
@@ -168,7 +174,7 @@ export class DefinitionProvider {
                 for (const label of functionScope.labelStatements) {
                     if (label.name.toLocaleLowerCase() === textToSearchFor) {
                         const uri = util.pathToUri(file.srcPath);
-                        this.event.definitions.push(util.createLocation(uri, label.nameRange));
+                        this.event.definitions.push(util.createLocationFromRange(uri, label.nameRange));
                     }
                 }
             }
@@ -178,7 +184,7 @@ export class DefinitionProvider {
         //look through all files in scope for matches
         for (const scope of scopesForFile) {
             for (const file of scope.getAllFiles()) {
-                if (isXmlFile(file) || filesSearched.has(file)) {
+                if (!isBrsFile(file) || filesSearched.has(file)) {
                     continue;
                 }
                 filesSearched.add(file);
@@ -195,7 +201,7 @@ export class DefinitionProvider {
                     FunctionStatement: (statement: FunctionStatement) => {
                         if (statement.getName(file.parseMode).toLowerCase() === textToSearchFor) {
                             const uri = util.pathToUri(file.srcPath);
-                            this.event.definitions.push(util.createLocation(uri, statement.range));
+                            this.event.definitions.push(util.createLocationFromRange(uri, statement.location?.range));
                         }
                     }
                 }), {
@@ -220,9 +226,9 @@ export class DefinitionProvider {
         const statementHandler = (statement: NamespaceStatement) => {
             if (!location && statement.getName(ParseMode.BrighterScript).toLowerCase() === namespaceName) {
                 const namespaceItemStatementHandler = (statement: ClassStatement | FunctionStatement) => {
-                    if (!location && statement.name.text.toLowerCase() === endName) {
+                    if (!location && statement.tokens.name.text.toLowerCase() === endName) {
                         const uri = util.pathToUri(file.srcPath);
-                        location = util.createLocation(uri, statement.range);
+                        location = util.createLocationFromRange(uri, statement.location?.range);
                     }
                 };
 
@@ -251,7 +257,7 @@ export class DefinitionProvider {
             isXmlFile(file) &&
             file.parentComponent &&
             file.parentComponentName &&
-            util.rangeContains(file.parentComponentName.range, this.event.position)
+            util.rangeContains(file.parentComponentName.location?.range, this.event.position)
         ) {
             this.event.definitions.push({
                 range: util.createRange(0, 0, 0, 0),
diff --git a/src/bscPlugin/fileProviders/FileProvider.ts b/src/bscPlugin/fileProviders/FileProvider.ts
new file mode 100644
index 000000000..f76bf21de
--- /dev/null
+++ b/src/bscPlugin/fileProviders/FileProvider.ts
@@ -0,0 +1,57 @@
+import type { ProvideFileEvent } from '../../interfaces';
+import chalk from 'chalk';
+import { LogLevel } from '../../Logger';
+
+export class FileProvider {
+    constructor(
+        private event: ProvideFileEvent
+    ) { }
+
+    public process() {
+        //if the event already has a file for this path, assume some other plugin has processed this event already
+        if (this.event.files.find(x => x.srcPath === this.event.srcPath)) {
+            return;
+        }
+
+        switch (this.event.srcExtension) {
+            case '.brs':
+            case '.bs':
+                return this.handleBrsFile();
+            case '.xml':
+                return this.handleXmlFile();
+            default:
+            //TODO handle other file types
+        }
+    }
+
+    private get logger() {
+        return this.event.program.logger;
+    }
+
+    private handleBrsFile() {
+        const file = this.event.fileFactory.BrsFile(this.event);
+        const text = this.event.data.value.toString();
+
+        this.logger.time(LogLevel.debug, ['parse', chalk.green(this.event.srcPath)], () => {
+            file.parse(text);
+        });
+
+        this.event.files.push(file);
+    }
+
+    private handleXmlFile() {
+        //only process files from the components folder (Roku will only parse xml files in the components folder)
+        if (!/^(pkg:\/)?components[\/\\]/i.exec(this.event.destPath)) {
+            return;
+        }
+        const text = this.event.data.value.toString();
+        //add the file to the program
+        const file = this.event.fileFactory.XmlFile(this.event);
+
+        this.logger.time(LogLevel.debug, ['parse', chalk.green(this.event.srcPath)], () => {
+            file.parse(text);
+        });
+
+        this.event.files.push(file);
+    }
+}
diff --git a/src/bscPlugin/hover/HoverProcessor.spec.ts b/src/bscPlugin/hover/HoverProcessor.spec.ts
index ff0c7383e..40443f9d3 100644
--- a/src/bscPlugin/hover/HoverProcessor.spec.ts
+++ b/src/bscPlugin/hover/HoverProcessor.spec.ts
@@ -2,10 +2,15 @@ import { expect } from '../../chai-config.spec';
 import { Program } from '../../Program';
 import { util } from '../../util';
 import { createSandbox } from 'sinon';
-import { rootDir } from '../../testHelpers.spec';
+import { expectZeroDiagnostics, rootDir, trim } from '../../testHelpers.spec';
+import { HoverProcessor } from './HoverProcessor';
+import { createIdentifier, createIntegerLiteral } from '../../astUtils/creators';
+import type { BrsFile } from '../../files/BrsFile';
 let sinon = createSandbox();
 
 const fence = (code: string) => util.mdFence(code, 'brightscript');
+const commentSep = `\n***\n`;
+
 
 describe('HoverProcessor', () => {
     let program: Program;
@@ -28,13 +33,23 @@ describe('HoverProcessor', () => {
             end sub
         `);
         //get the hover
-        program.getHover(file.pathAbsolute, util.createPosition(1, 20));
+        program.getHover(file.srcPath, util.createPosition(1, 20));
         //the onGetHover function from `test-plugin` should always get called because
         //BscPlugin should never short-circuit the event
         expect(mock.called).to.be.true;
     });
 
     describe('BrsFile', () => {
+        it('getConstHover does not crash on expression with missing range', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', ``);
+
+            const processor = new HoverProcessor({} as any);
+            const expression = createIntegerLiteral('1');
+            expect(
+                processor['getConstHover'](createIdentifier('hello'), file, program.getScopeByName('source'), expression)
+            ).to.eql(undefined);
+        });
+
         it('works for param types', () => {
             const file = program.setFile('source/main.brs', `
                 sub DoSomething(name as string)
@@ -43,14 +58,15 @@ describe('HoverProcessor', () => {
                     end function
                 end sub
             `);
+            program.validate();
 
             //hover over the `name = 1` line
-            let hover = program.getHover(file.pathAbsolute, util.createPosition(2, 24))[0];
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 24))[0];
             expect(hover).to.exist;
             expect(hover.range).to.eql(util.createRange(2, 20, 2, 24));
 
             //hover over the `name` parameter declaration
-            hover = program.getHover(file.pathAbsolute, util.createPosition(1, 34))[0];
+            hover = program.getHover(file.srcPath, util.createPosition(1, 34))[0];
             expect(hover).to.exist;
             expect(hover.range).to.eql(util.createRange(1, 32, 1, 36));
         });
@@ -64,9 +80,9 @@ describe('HoverProcessor', () => {
                 end sub
             `);
             //hover over the `as`
-            expect(program.getHover(file.pathAbsolute, util.createPosition(1, 31))).to.be.empty;
+            expect(program.getHover(file.srcPath, util.createPosition(1, 31))).to.be.empty;
             //hover over the `string`
-            expect(program.getHover(file.pathAbsolute, util.createPosition(1, 36))).to.be.empty;
+            expect(program.getHover(file.srcPath, util.createPosition(1, 36))).to.be.empty;
         });
 
         it('finds declared function', () => {
@@ -78,11 +94,29 @@ describe('HoverProcessor', () => {
                 end function
             `);
 
-            let hover = program.getHover(file.pathAbsolute, util.createPosition(1, 28))[0];
+            let hover = program.getHover(file.srcPath, util.createPosition(1, 28))[0];
             expect(hover).to.exist;
 
             expect(hover.range).to.eql(util.createRange(1, 25, 1, 29));
-            expect(hover.contents).to.eql(fence('function Main(count? as dynamic) as dynamic'));
+            expect(hover.contents).to.eql([fence('function Main(count? as integer) as dynamic')]);
+        });
+
+        it('finds declared namespace function', () => {
+            let file = program.setFile('source/main.brs', `
+            namespace mySpace
+                function Main(count = 1)
+                    firstName = "bob"
+                    age = 21
+                    shoeSize = 10
+                end function
+            end namespace
+            `);
+
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 28))[0];
+            expect(hover).to.exist;
+
+            expect(hover.range).to.eql(util.createRange(2, 25, 2, 29));
+            expect(hover.contents).to.eql([fence('function mySpace.Main(count? as integer) as dynamic')]);
         });
 
         it('finds variable function hover in same scope', () => {
@@ -94,11 +128,43 @@ describe('HoverProcessor', () => {
                     sayMyName()
                 end sub
             `);
-
-            let hover = program.getHover(file.pathAbsolute, util.createPosition(5, 24))[0];
+            program.validate();
+            let hover = program.getHover(file.srcPath, util.createPosition(5, 24))[0];
 
             expect(hover.range).to.eql(util.createRange(5, 20, 5, 29));
-            expect(hover.contents).to.eql(fence('sub sayMyName(name as string) as void'));
+            expect(hover.contents).to.eql([fence('sub sayMyName(name as string) as void')]);
+        });
+
+        it('does not crash when hovering on built-in functions', () => {
+            let file = program.setFile('source/main.brs', `
+                function doUcase(text)
+                    return ucase(text)
+                end function
+            `);
+            let commentSep = `\n***\n`;
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 30))[0];
+            expect(hover.contents).to.eql([`${fence('function ucase(s as string) as string')}${commentSep}Converts the string to all upper case.`]);
+        });
+
+        it('does not crash when hovering on object method call', () => {
+            let file = program.setFile('source/main.brs', `
+                function getInstr(url, text)
+                    return url.instr(text)
+                end function
+
+                function getInstrTyped(urlStr as string, text)
+                    return urlStr.instr(text)
+                end function
+            `);
+            program.validate();
+            // return url.ins|tr(text)
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 35))[0];
+            expect(hover.contents).to.eql(['```brightscript\ninstr as dynamic\n```']);
+
+            // return urlStr.ins|tr(text)
+            hover = program.getHover(file.srcPath, util.createPosition(6, 38))[0];
+            expect(hover.contents[0]).to.include('```brightscript\nfunction string.instr(substringOrStart_index as string or integer, substring? as string) as integer\n```');
+            expect(hover.contents[0]).to.include('OVERLOADED METHOD');
         });
 
         it('finds function hover in file scope', () => {
@@ -108,22 +174,17 @@ describe('HoverProcessor', () => {
                 end sub
 
                 sub sayMyName()
-
                 end sub
             `);
-
-            let hover = program.getHover(file.pathAbsolute, util.createPosition(2, 25))[0];
+            program.validate();
+            //sayM|yName()
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 25))[0];
 
             expect(hover.range).to.eql(util.createRange(2, 20, 2, 29));
-            expect(hover.contents).to.eql(fence('sub sayMyName() as void'));
+            expect(hover.contents).to.eql([fence('sub sayMyName() as void')]);
         });
 
         it('finds function hover in scope', () => {
-            let rootDir = process.cwd();
-            program = new Program({
-                rootDir: rootDir
-            });
-
             let mainFile = program.setFile('source/main.brs', `
                 sub Main()
                     sayMyName()
@@ -137,9 +198,9 @@ describe('HoverProcessor', () => {
             `);
             program.validate();
 
-            let hover = program.getHover(mainFile.pathAbsolute, util.createPosition(2, 25))[0];
-            expect(hover?.range).to.eql(util.createRange(2, 20, 2, 29));
-            expect(hover?.contents).to.eql(fence('sub sayMyName(name as string) as void'));
+            let hover = program.getHover(mainFile.srcPath, util.createPosition(2, 25))[0];
+            expect(hover.range).to.eql(util.createRange(2, 20, 2, 29));
+            expect(hover.contents).to.eql([fence('sub sayMyName(name as string) as void')]);
         });
 
         it('finds top-level constant value', () => {
@@ -153,7 +214,7 @@ describe('HoverProcessor', () => {
             // print SOM|E_VALUE
             let hover = program.getHover('source/main.bs', util.createPosition(2, 29))[0];
             expect(hover?.range).to.eql(util.createRange(2, 26, 2, 36));
-            expect(hover?.contents).to.eql(fence('const SOME_VALUE = true'));
+            expect(hover?.contents).to.eql([fence('const SOME_VALUE = true as boolean')]);
         });
 
         it('finds top-level constant in assignment expression', () => {
@@ -168,7 +229,7 @@ describe('HoverProcessor', () => {
             // value += SOME|_VALUE
             let hover = program.getHover('source/main.bs', util.createPosition(3, 33))[0];
             expect(hover?.range).to.eql(util.createRange(3, 29, 3, 39));
-            expect(hover?.contents).to.eql(fence('const SOME_VALUE = "value"'));
+            expect(hover?.contents).to.eql([fence('const SOME_VALUE = "value" as string')]);
         });
 
         it('finds namespaced constant in assignment expression', () => {
@@ -185,7 +246,7 @@ describe('HoverProcessor', () => {
             // value += SOME|_VALUE
             let hover = program.getHover('source/main.bs', util.createPosition(3, 47))[0];
             expect(hover?.range).to.eql(util.createRange(3, 43, 3, 53));
-            expect(hover?.contents).to.eql(fence('const someNamespace.SOME_VALUE = "value"'));
+            expect(hover?.contents).to.eql([fence('const someNamespace.SOME_VALUE = "value" as string')]);
         });
 
         it('finds namespaced constant value', () => {
@@ -201,7 +262,21 @@ describe('HoverProcessor', () => {
             // print name.SOM|E_VALUE
             let hover = program.getHover('source/main.bs', util.createPosition(2, 34))[0];
             expect(hover?.range).to.eql(util.createRange(2, 31, 2, 41));
-            expect(hover?.contents).to.eql(fence('const name.SOME_VALUE = true'));
+            expect(hover?.contents).to.eql([fence('const name.SOME_VALUE = true as boolean')]);
+        });
+
+        it('finds constant value that is an array', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    print SOME_VALUE
+                end sub
+                const SOME_VALUE = [] as function[]
+            `);
+            program.validate();
+            // print SOM|E_VALUE
+            let hover = program.getHover('source/main.bs', util.createPosition(2, 30))[0];
+            expect(hover?.range).to.eql(util.createRange(2, 26, 2, 36));
+            expect(hover?.contents).to.eql([fence('const SOME_VALUE = [] as Array<function>')]);
         });
 
         it('finds deep namespaced constant value', () => {
@@ -217,7 +292,881 @@ describe('HoverProcessor', () => {
             // print name.sp.a.c.e.SOM|E_VALUE
             let hover = program.getHover('source/main.bs', util.createPosition(2, 43))[0];
             expect(hover?.range).to.eql(util.createRange(2, 40, 2, 50));
-            expect(hover?.contents).to.eql(fence('const name.sp.a.c.e.SOME_VALUE = true'));
+            expect(hover?.contents).to.eql([fence('const name.sp.a.c.e.SOME_VALUE = true as boolean')]);
+        });
+
+        it('finds namespaced class types', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    myKlass = new name.Klass()
+                    runNoop(myKlass)
+                end sub
+
+                sub runNoop(myKlass as name.Klass)
+                    myKlass.noop()
+                end sub
+
+                namespace name
+                    class Klass
+                        sub noop()
+                        end sub
+                    end class
+                end namespace
+            `);
+            program.validate();
+            // run|Noop(myKlass)
+            let hover = program.getHover('source/main.bs', util.createPosition(3, 24))[0];
+            expect(hover?.range).to.eql(util.createRange(3, 20, 3, 27));
+            expect(hover?.contents).to.eql([fence('sub runNoop(myKlass as name.Klass) as void')]);
+            // myKl|ass.noop()
+            hover = program.getHover('source/main.bs', util.createPosition(7, 25))[0];
+            expect(hover?.range).to.eql(util.createRange(7, 20, 7, 27));
+            expect(hover?.contents).to.eql([fence('myKlass as name.Klass')]);
+            //  sub no|op()
+            hover = program.getHover('source/main.bs', util.createPosition(12, 31))[0];
+            expect(hover?.contents).to.eql([fence('sub name.Klass.noop() as void')]);
+        });
+
+        it('finds local variables that shadow namespaces', () => {
+            program.setFile('source/main.bs', `
+                sub foo1(alpha as string)
+                    print alpha.toStr() ' in foo1()
+                end sub
+
+                sub foo2()
+                    alpha = 123
+                    print alpha.toStr() ' in foo2()
+                end sub
+
+                namespace alpha
+                    function toStr()
+                        return "alpha"
+                    end function
+                end namespace
+            `);
+            program.validate();
+            //  sub foo1(alp|ha as string)
+            let hover = program.getHover('source/main.bs', util.createPosition(1, 29))[0];
+            expect(hover?.contents).to.eql([fence('alpha as string')]);
+            // print alp|ha.toStr() ' in foo1()
+            hover = program.getHover('source/main.bs', util.createPosition(2, 30))[0];
+            expect(hover?.contents).to.eql([fence('alpha as string')]);
+            //  alp|ha = 123
+            hover = program.getHover('source/main.bs', util.createPosition(6, 23))[0];
+            expect(hover?.contents).to.eql([fence('alpha as integer')]);
+            //  print alp|ha.toStr() ' in foo2()
+            hover = program.getHover('source/main.bs', util.createPosition(7, 30))[0];
+            expect(hover?.contents).to.eql([fence('alpha as integer')]);
+        });
+
+        it('finds types properly', () => {
+            program.setFile('source/main.bs', `
+                class Person
+                end class
+
+                sub doWork(age as integer, name as string, guy as Person)
+                end sub
+            `);
+            program.validate();
+            // a|ge as integer
+            let hover = program.getHover('source/main.bs', util.createPosition(4, 29))[0];
+            expect(hover?.range).to.eql(util.createRange(4, 27, 4, 30));
+            expect(hover?.contents).to.eql([fence('age as integer')]);
+            // age as int|eger
+            hover = program.getHover('source/main.bs', util.createPosition(4, 39))[0];
+            // no hover on base types
+            expect(hover).to.be.undefined;
+            // n|ame as string
+            hover = program.getHover('source/main.bs', util.createPosition(4, 46))[0];
+            expect(hover?.range).to.eql(util.createRange(4, 43, 4, 47));
+            expect(hover?.contents).to.eql([fence('name as string')]);
+            // name as st|ring
+            hover = program.getHover('source/main.bs', util.createPosition(4, 54))[0];
+            // no hover on base types
+            expect(hover).to.be.undefined;
+            // gu|y as Person
+            hover = program.getHover('source/main.bs', util.createPosition(4, 60))[0];
+            expect(hover?.range).to.eql(util.createRange(4, 59, 4, 62));
+            expect(hover?.contents).to.eql([fence('guy as Person')]);
+            // guy as Pe|rson
+            hover = program.getHover('source/main.bs', util.createPosition(4, 69))[0];
+            expect(hover?.contents).to.eql([fence('class Person')]);
+        });
+
+        it('finds namespaces properly', () => {
+            program.setFile('source/main.bs', `
+                namespace Name1
+                   namespace Name2
+                      const hi = "hello"
+                   end namespace
+                end namespace
+
+                sub doWork()
+                   print Name1.Name2.hi
+                end sub
+            `);
+            program.validate();
+            // print Name1.Nam|e2.hi
+            let hover = program.getHover('source/main.bs', util.createPosition(8, 36))[0];
+            expect(hover?.contents).to.eql([fence('namespace Name1.Name2')]);
+        });
+
+        it('finds enum properly', () => {
+            program.setFile('source/main.bs', `
+                enum Direction
+                    up
+                    down
+                end enum
+
+                sub doWork()
+                   print Direction.up
+                end sub
+            `);
+            program.validate();
+            // print Dire|ction.up
+            let hover = program.getHover('source/main.bs', util.createPosition(7, 30))[0];
+            expect(hover?.contents).to.eql([fence('enum Direction')]);
+            // print Direction.u|p
+            hover = program.getHover('source/main.bs', util.createPosition(7, 37))[0];
+            expect(hover?.contents).to.eql([fence('Direction.up as Direction')]);
+        });
+
+        it('finds types hover with comment', () => {
+            program.setFile('source/main.bs', `
+                ' this is a class comment
+                ' it is more than one line
+                class Person
+                end class
+
+                ' does some work
+                sub doWork(age as integer, name as string, guy as Person)
+                end sub
+            `);
+            program.validate();
+
+            // gu|y as Person
+            let hover = program.getHover('source/main.bs', util.createPosition(7, 60))[0];
+            expect(hover?.range).to.eql(util.createRange(7, 59, 7, 62));
+            expect(hover?.contents).to.eql([`${fence('guy as Person')}${commentSep}this is a class comment\nit is more than one line`]);
+            // guy as Pe|rson
+            hover = program.getHover('source/main.bs', util.createPosition(7, 69))[0];
+            expect(hover?.contents).to.eql([`${fence('class Person')}${commentSep}this is a class comment\nit is more than one line`]);
+        });
+
+        it('finds types from assignments defined in different file', () => {
+            program.setFile(`source/main.bs`, `
+                sub main()
+                    thing = new MyKlass()
+                    useKlass(thing)
+                    someVal = getValue()
+                    print someVal
+                end sub
+
+                sub useKlass(thing as MyKlass)
+                    print thing
+                end sub
+            `);
+            program.setFile(`source/MyKlass.bs`, `
+                class MyKlass
+                end class
+            `);
+
+            program.setFile(`source/util.bs`, `
+                function getValue() as string
+                    return "hello"
+                end function
+            `);
+            program.validate();
+            //th|ing = new MyKlass()
+            let hover = program.getHover('source/main.bs', util.createPosition(2, 24))[0];
+            expect(hover?.range).to.eql(util.createRange(2, 20, 2, 25));
+            expect(hover?.contents).to.eql([fence('thing as MyKlass')]);
+            //print some|Val
+            hover = program.getHover('source/main.bs', util.createPosition(5, 31))[0];
+            expect(hover?.range).to.eql(util.createRange(5, 26, 5, 33));
+            expect(hover?.contents).to.eql([fence('someVal as string')]);
+        });
+
+        it('hovers of functions include comments', () => {
+            program.setFile(`source/main.bs`, `
+                sub main()
+                    thing = new MyKlass()
+                    useKlass(thing)
+                end sub
+
+                ' Prints a MyKlass.name
+                sub useKlass(thing as MyKlass)
+                    print thing.getName()
+                end sub
+
+                ' A sample class
+                class MyKlass
+                    name as string
+
+                    ' Gets the name of this thing
+                    function getName() as string
+                        return m.name
+                    end function
+
+                    ' Wraps another function
+                    function getNameWrap() as string
+                        return m.getName()
+                    end function
+                end class
+            `);
+            program.validate();
+            let commentSep = `\n***\n`;
+            //th|ing = new MyKlass()
+            let hover = program.getHover('source/main.bs', util.createPosition(2, 24))[0];
+            expect(hover?.contents).to.eql([`${fence('thing as MyKlass')}`]);
+            //thing = new MyK|lass()
+            hover = program.getHover('source/main.bs', util.createPosition(2, 37))[0];
+            expect(hover?.contents).to.eql([`${fence('class MyKlass')}${commentSep}A sample class`]);
+            //use|Klass(thing)
+            hover = program.getHover('source/main.bs', util.createPosition(3, 24))[0];
+            expect(hover?.contents).to.eql([`${fence('sub useKlass(thing as MyKlass) as void')}${commentSep}Prints a MyKlass.name`]);
+            //print thing.getN|ame()
+            hover = program.getHover('source/main.bs', util.createPosition(8, 37))[0];
+            expect(hover?.contents).to.eql([`${fence('function MyKlass.getName() as string')}${commentSep}Gets the name of this thing`]);
+        });
+
+        it('finds globalCallables with documentation', () => {
+            let mainFile = program.setFile('source/main.brs', `
+                sub Main()
+                    print lcase("HELLO")
+                end sub
+            `);
+            program.validate();
+            //    print lc|ase("HELLO")
+            let hover = program.getHover(mainFile.srcPath, util.createPosition(2, 29))[0];
+            expect(hover.contents).to.eql([`${fence('function lcase(s as string) as string')}${commentSep}Converts the string to all lower case.`]);
+        });
+
+        it('finds functions as params', () => {
+            program.setFile('source/main.brs', `
+                function getStrLength(name as string) as integer
+                    return len(name)
+                end function
+
+                sub tryManyParams(someFunc as function)
+                    print someFunc(1, 2, "hello", "world")
+                end sub
+
+                sub test()
+                    tryManyParams(getStrLength)
+                end sub
+            `);
+            program.validate();
+            // print some|Func(1, 2, "hello", "world")
+            let hover = program.getHover('source/main.brs', util.createPosition(6, 31))[0];
+            expect(hover?.range).to.eql(util.createRange(6, 26, 6, 34));
+            expect(hover?.contents).to.eql([fence('someFunc as function')]);
+        });
+
+        it('keeps unresolved types as type names', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething(thing as UnknownType)
+                    print thing
+                end sub
+            `);
+            program.validate();
+            // print thi|ng
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 30))[0];
+            expect(hover?.range).to.eql(util.createRange(2, 26, 2, 31));
+            expect(hover?.contents).eql([fence('thing as UnknownType')]);
+        });
+
+        it('says members on dynamic are dynamic', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething(thing)
+                    print thing.member
+                end sub
+            `);
+            program.validate();
+
+            // print thing.mem|ber
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 36))[0];
+            expect(hover?.range).to.eql(util.createRange(2, 32, 2, 38));
+            expect(hover?.contents).eql([fence('member as dynamic')]);
+        });
+
+        it('should recognize consistent type after function call in binary op', () => {
+            let file = program.setFile('source/main.bs', `
+                function arrayToString(items as object) as string
+                    description = "["
+                    for each item in items
+                        description += utils.toString(item) + ", "
+                    end for
+                    description += "]"
+                    return description
+                end function
+            `);
+            program.setFile('source/utils.bs', `
+                namespace utils
+                    function toString(thing as dynamic) as string
+                        return "hello"
+                    end function
+                end namespace
+            `);
+            program.validate();
+            // return myS|tring
+            let hover = program.getHover(file.srcPath, util.createPosition(7, 31))[0];
+            expect(hover?.contents).eql([fence('description as string')]);
+        });
+
+
+        it('should provide correct hover for LHS of assignment', () => {
+            let file = program.setFile('source/main.bs', `
+                function getFloat() as float
+                    return 123
+                end function
+
+                sub doStuff()
+                    myFloat = getFloat()
+                end sub
+            `);
+            program.validate();
+            //     myF|loat = getFloat()
+            let hover = program.getHover(file.srcPath, util.createPosition(6, 24))[0];
+            expect(hover?.contents).eql([fence('myFloat as float')]);
+
+        });
+
+        it('should provide correct hover for members of classes', () => {
+            let file = program.setFile('source/main.bs', `
+                class SomeKlass
+                    name as string
+                    other as OtherKlass
+                    myLabel as roSGNodeLabel
+                end class
+
+                class OtherKlass
+                    size as integer
+                end class
+            `);
+            program.validate();
+            //     na|me as string
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 24))[0];
+            expect(hover?.contents).eql([fence('SomeKlass.name as string')]);
+            //    ot|her as OtherKlass
+            hover = program.getHover(file.srcPath, util.createPosition(3, 24))[0];
+            expect(hover?.contents).eql([fence('SomeKlass.other as OtherKlass')]);
+            //     my|Label as RoSGNodeLabel
+            hover = program.getHover(file.srcPath, util.createPosition(4, 24))[0];
+            expect(hover?.contents).eql([fence('SomeKlass.myLabel as roSGNodeLabel')]);
+        });
+
+        it('should provide correct hover for members of interfaces', () => {
+            let file = program.setFile('source/main.bs', `
+                interface SomeIFace
+                    name as string
+                    other as OtherIFace
+                    myLabel as roSGNodeLabel
+                end interface
+
+                interface OtherIFace
+                    size as integer
+                end interface
+            `);
+            program.validate();
+            //     na|me as string
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 24))[0];
+            expect(hover?.contents).eql([fence('SomeIFace.name as string')]);
+            //    ot|her as OtherIFace
+            hover = program.getHover(file.srcPath, util.createPosition(3, 24))[0];
+            expect(hover?.contents).eql([fence('SomeIFace.other as OtherIFace')]);
+            //     my|Label as RoSGNodeLabel
+            hover = program.getHover(file.srcPath, util.createPosition(4, 24))[0];
+            expect(hover?.contents).eql([fence('SomeIFace.myLabel as roSGNodeLabel')]);
+        });
+
+        it('should include leading trivia of member field hover', () => {
+            let file = program.setFile('source/main.bs', `
+                interface SomeIFace
+                    ' Some description
+                    name as string
+                    other as OtherIFace
+                    myLabel as roSGNodeLabel
+                end interface
+            `);
+            program.validate();
+
+            //     na|me as string
+            let hover = program.getHover(file.srcPath, util.createPosition(3, 24))[0];
+            expect(hover?.contents).to.eql([`${fence('SomeIFace.name as string')}${commentSep}Some description`]);
+        });
+
+        it('should include leading trivia of enum member field hover', () => {
+            let file = program.setFile('source/main.bs', `
+                enum Direction
+                    ' Go Up
+                    up  = "up"
+                    down =  "down"
+                end enum
+            `);
+            program.validate();
+            //    u|p  = "up"
+            let hover = program.getHover(file.srcPath, util.createPosition(3, 22))[0];
+            expect(hover?.contents).to.eql([`${fence('Direction.up as Direction')}${commentSep}Go Up`]);
+        });
+
+        it('should have correct hovers for loop-items of for-loops', () => {
+            let file = program.setFile('source/main.bs', `
+                sub test()
+                    for index = 0 to 10
+                        print index
+                    end for
+                end sub
+            `);
+            program.validate();
+            //    for in|dex = 0 to 10
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 27))[0];
+            expect(hover?.contents).to.eql([fence('index as integer')]);
+        });
+
+        it('should have correct hovers for loop-items of for-each-loops', () => {
+            let file = program.setFile('source/main.bs', `
+                sub test()
+                    numbers = [1,2,3]
+                    for each number in numbers
+                        print number
+                    end for
+                end sub
+            `);
+            program.validate();
+            //    for each number in num|bers
+            let hover = program.getHover(file.srcPath, util.createPosition(3, 43))[0];
+            expect(hover?.contents).to.eql([fence('numbers as Array<integer>')]);
+            //    for each num|ber in numbers
+            hover = program.getHover(file.srcPath, util.createPosition(3, 33))[0];
+            expect(hover?.contents).to.eql([fence('number as integer')]);
+            //    for each number i|n numbers
+            hover = program.getHover(file.srcPath, util.createPosition(3, 38))[0];
+            expect(hover?.contents).to.be.undefined;
+        });
+
+        it('should have correct hovers for loop-items of for-each-loops', () => {
+            let file = program.setFile('source/main.bs', `
+                sub test(strArray)
+                    for each thing as string in strArray
+                        print thing
+                    end for
+                end sub
+            `);
+            program.validate();
+            //    for each thing as string in str|Array
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 52))[0];
+            expect(hover?.contents).to.eql([fence('strArray as dynamic')]);
+            //    print th|ing
+            hover = program.getHover(file.srcPath, util.createPosition(3, 33))[0];
+            expect(hover?.contents).to.eql([fence('thing as string')]);
+        });
+
+        it('should show unresolved members as invalid', () => {
+            const file = program.setFile('source/main.bs', `
+                    interface MyIFace
+                        name as string
+                    end interface
+
+                    sub doSomething(thing as MyIFace)
+                        print thing.member
+                    end sub
+                `);
+            program.validate();
+
+            // print thing.mem|ber
+            let hover = program.getHover(file.srcPath, util.createPosition(6, 40))[0];
+            expect(hover?.contents).eql([fence('MyIFace.member as invalid')]);
+        });
+
+        it('has m as an AA in inline function', () => {
+            const file = program.setFile('source/main.bs', `
+                class Test
+                    sub method()
+                        stub = function()
+                            m.whatever = false
+                        end function
+                    end sub
+                end class
+            `);
+            program.validate();
+
+            // |m.whatever = false
+            let hover = program.getHover(file.srcPath, util.createPosition(4, 29))[0];
+            expect(hover?.contents).eql([fence('m as roAssociativeArray')]);
+            // m.what|ever = false
+            hover = program.getHover(file.srcPath, util.createPosition(4, 35))[0];
+            expect(hover?.contents).eql([fence('whatever as dynamic')]);
+        });
+
+        it('should include leading Trivia of inline interface members', () => {
+            const file = program.setFile('source/main.bs', `
+                ' @param input from doc comment
+                sub fooFunc(input as {
+                    ' description of name prop
+                    name as string
+                })
+                    print input.name
+                end sub
+            `);
+            program.validate();
+
+            // print input.na|me
+            let hover = program.getHover(file.srcPath, util.createPosition(6, 35))[0];
+            expect(hover?.contents).to.eql([`${fence('{name as string}.name as string')}${commentSep}description of name prop`]);
+            // print in|put.name
+            hover = program.getHover(file.srcPath, util.createPosition(6, 29))[0];
+            expect(hover?.contents).to.eql([`${fence('input as {name as string}')}${commentSep}from doc comment`]);
+        });
+
+        it('should show the expansion of a type statement type', () => {
+            const file = program.setFile('source/main.bs', `
+                type MyType = {
+                    name as string
+                    age as integer
+                }
+
+                sub fooFunc(input as MyType)
+                    print input.name
+                end sub
+            `);
+            program.validate();
+
+            // print input.na|me
+            let hover = program.getHover(file.srcPath, util.createPosition(7, 35))[0];
+            expect(hover?.contents).to.eql([fence('MyType.name as string')]);
+            // print in|put.name
+            hover = program.getHover(file.srcPath, util.createPosition(7, 29))[0];
+            expect(hover?.contents).to.eql([fence('input as MyType')]);
+        });
+
+        it('should show type statement type when hovering on the type name in the parameter list', () => {
+            const file = program.setFile('source/main.bs', `
+                type MyType = {
+                    name as string
+                    age as integer
+                }
+
+                sub fooFunc(input as MyType)
+                    print input.name
+                end sub
+            `);
+            program.validate();
+
+            // sub fooFunc(input as MyT|ype)
+            let hover = program.getHover(file.srcPath, util.createPosition(6, 41))[0];
+            expect(hover?.contents).to.eql([fence('type MyType')]);
+        });
+
+        it('should show a hover on a typed function type parameter', () => {
+            const file = program.setFile('source/main.bs', `
+                sub fooFunc(callback as function(name as string) as integer)
+                    callback("hello")
+                end sub
+            `);
+            program.validate();
+
+            // callback as func|tion(name as string) as integer
+            let hover = program.getHover(file.srcPath, util.createPosition(1, 45))[0];
+            expect(hover?.contents).to.eql([fence('function (name as string) as integer')]);
+            // call|back as function(name as string) as integer
+            hover = program.getHover(file.srcPath, util.createPosition(1, 33))[0];
+            expect(hover?.contents).to.eql([fence('function callback(name as string) as integer')]);
+        });
+
+        it('should show a proper hover on inline anon functions', () => {
+            const file = program.setFile('source/main.bs', `
+                sub fooFunc()
+                    callback = function(arg as string) as integer
+                        return arg.len()
+                    end function
+                    print callback("hello")
+                end sub
+            `);
+            program.validate();
+
+            // callback = fun|ction(arg as string) as integer
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 34))[0];
+            expect(hover?.contents).to.eql([fence('function (arg as string) as integer')]);
+            // print call|back("hello")
+            hover = program.getHover(file.srcPath, util.createPosition(5, 30))[0];
+            expect(hover?.contents).to.eql([fence('function callback(arg as string) as integer')]);
+        });
+
+        it('should show a proper hover on inline anon functions', () => {
+            const file = program.setFile('source/main.bs', `
+                sub useFunc(myFunc as function(num as integer) as string)
+                    print myFunc(123)
+                end sub
+
+                sub otherFunc()
+                    useFunc(function(a, b = invalid) as string
+                        print a
+                        print b
+                        return ""
+                    end function)
+                end sub
+            `);
+            program.validate();
+
+            //  useFunc(fun|ction(a, b = invalid) as string
+            let hover = program.getHover(file.srcPath, util.createPosition(6, 34))[0];
+            expect(hover?.contents).to.eql([fence('function (a as dynamic, b? as dynamic) as string')]);
+        });
+    });
+
+    describe('callFunc', () => {
+
+        it('should get hovers on @callfunc invocations', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                     <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            const file = program.setFile('components/Widget.bs', `
+                sub foo()
+                    top = m.top as roSgNodeWidget
+                    print top@.someFunc("3.14")
+                end sub
+
+                function someFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            // print top@.some|Func("3.14")
+            let hover = program.getHover(file.srcPath, util.createPosition(3, 35))[0];
+            expect(hover?.contents).eql([fence('function roSGNodeWidget@.someFunc(input as string) as float')]);
+        });
+
+        it('should include documentation on @callfunc hovers', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                     <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            const file = program.setFile('components/Widget.bs', `
+                sub foo()
+                    top = m.top as roSgNodeWidget
+                    print top@.someFunc("3.14")
+                end sub
+
+                ' Some Cool function
+                function someFunc(input as string) as float
+                    return input.toFloat()
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            // print top@.some|Func("3.14")
+            let hover = program.getHover(file.srcPath, util.createPosition(3, 35))[0];
+            expect(hover?.contents[0]).include('Some Cool function');
+        });
+
+    });
+
+    describe('multiple definition locations', () => {
+
+        it('gets hover on assignment node', () => {
+            const file = program.setFile('source/util.bs', `
+                sub test(obj as Data)
+                    myVar = obj.name ' setting type to string
+                end sub
+
+                interface Data
+                    name as string
+                end interface
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            //  my|Var = obj.name
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 22))[0];
+            expect(hover?.contents).eql([fence(`myVar as string`)]);
+        });
+
+        it('shows correct type in all locations', () => {
+            const file = program.setFile('source/util.bs', `
+                sub test()
+                    myVar = "hello" ' setting type to string
+                    print 1; myVar
+                    myVar = "hello".len()  ' setting type to integer
+                    print 2; myVar
+                    myVar = sqr(33)  ' setting type to float
+                    print 3; myVar
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            // print 1; my|Var
+            let hover = program.getHover(file.srcPath, util.createPosition(3, 31))[0];
+            expect(hover?.contents).eql([fence(`myVar as string`)]);
+
+            // my|Var = "hello".len()
+            hover = program.getHover(file.srcPath, util.createPosition(4, 23))[0];
+            expect(hover?.contents).eql([fence(`myVar as integer`)]);
+
+            // print 2; my|Var
+            hover = program.getHover(file.srcPath, util.createPosition(7, 31))[0];
+            expect(hover?.contents).eql([fence(`myVar as float`)]);
+        });
+
+        it('reusing same variable for multiple types', () => {
+            const file = program.setFile('source/util.bs', `
+                namespace stringUtil
+                    function pad(x as string or integer) as string
+                        return "0"+x.toStr()
+                    end function
+                end namespace
+
+                ' Formats a timestamp into a user friendly string.
+                ' @param {Integer} time - The unix time stamp to format.
+                ' @param {String} meridiemStyle - A style key to be wrapped around the meridiem for MultiStyleLabels.
+                ' @return {String} - The formatted time
+                function formatTime(time as integer, meridiemStyle = "" as string) as string
+                    dateObj = createObject("roDateTime")
+                    deviceInfo = createObject("roDeviceInfo")
+                    dateObj.fromSeconds(time)
+                    hour = dateObj.getHours()
+                    minutes = dateObj.getMinutes()
+
+                    ' Get the Meridiem value
+                    if hour > 11 then
+                        meridiem = "pm"
+                    else
+                        meridiem = "am"
+                    end if
+
+                    if meridiemStyle <> "" then
+                        meridiem = "<" + meridiemStyle + ">" + meridiem + "</" + meridiemStyle + ">"
+                    end if
+
+                    minutes = stringUtil.pad(minutes)
+
+                    if deviceInfo.getClockFormat() = "24h" then
+                        hour = stringUtil.pad(hour)
+                        ' "22:01" | "01:01"
+                        return substitute("{0}:{1}", hour as string, minutes as string)
+                    else
+                        hour = hour mod 12
+                        if hour = 0 then hour = 12
+                        ' "10:01 AM" | "1:01 AM"
+                        return substitute("{0}:{1} {2}", hour.toStr(), minutes as string, meridiem)
+                    end if
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            // ho|ur = stringUtil.pad(hour)
+            let hover = program.getHover(file.srcPath, util.createPosition(32, 27))[0];
+            expect(hover?.contents).eql([fence(`hour as string`)]);
+
+            // ho|ur = hour mod 12
+            hover = program.getHover(file.srcPath, util.createPosition(36, 27))[0];
+            expect(hover?.contents).eql([fence(`hour as integer`)]);
+        });
+
+        it('reusing same variable for multiple types - multiple hovers', () => {
+            const file = program.setFile('source/util.bs', `
+                function foo(toggle as boolean) as string
+                    someVar = "hello"
+                    print someVar; 1
+                    if toggle
+                        print someVar; 2
+                        someVar = 1
+                        print someVar; 3
+                    else
+                        print someVar; 4
+                        someVar = 0
+                        print someVar; 5
+                    end if
+                    print someVar; 6
+                    return someVar.toStr()
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            // some|Var = "hello"
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 25))[0];
+            expect(hover?.contents).eql([fence(`someVar as string`)]);
+
+            // print some|Var; 1
+            hover = program.getHover(file.srcPath, util.createPosition(3, 31))[0];
+            expect(hover?.contents).eql([fence(`someVar as string`)]);
+            // print some|Var; 2
+            hover = program.getHover(file.srcPath, util.createPosition(5, 35))[0];
+            expect(hover?.contents).eql([fence(`someVar as string`)]);
+            // some|Var = 1
+            hover = program.getHover(file.srcPath, util.createPosition(6, 29))[0];
+            expect(hover?.contents).eql([fence(`someVar as integer`)]);
+            // print some|Var; 3
+            hover = program.getHover(file.srcPath, util.createPosition(7, 35))[0];
+            expect(hover?.contents).eql([fence(`someVar as integer`)]);
+            // print some|Var; 4
+            hover = program.getHover(file.srcPath, util.createPosition(9, 35))[0];
+            expect(hover?.contents).eql([fence(`someVar as string`)]);
+            // some|Var = 0
+            hover = program.getHover(file.srcPath, util.createPosition(10, 29))[0];
+            expect(hover?.contents).eql([fence(`someVar as integer`)]);
+            // print some|Var; 5
+            hover = program.getHover(file.srcPath, util.createPosition(11, 35))[0];
+            expect(hover?.contents).eql([fence(`someVar as integer`)]);
+            // print some|Var; 6
+            hover = program.getHover(file.srcPath, util.createPosition(13, 31))[0];
+            expect(hover?.contents).eql([fence(`someVar as integer`)]);
+            // return some|Var.toStr()
+            hover = program.getHover(file.srcPath, util.createPosition(14, 32))[0];
+            expect(hover?.contents).eql([fence(`someVar as integer`)]);
+        });
+
+    });
+
+    describe('doc type definitions', () => {
+
+        it('should show correct hover for params', () => {
+            const file = program.setFile('source/test.bs', `
+                namespace alpha
+                    '@param {DataType} data
+                    sub printName(data)
+                        print data.name
+                    end sub
+
+                    interface DataType
+                        name as string
+                    end interface
+                end namespace
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            // sub printName(da|ta)
+            let hover = program.getHover(file.srcPath, util.createPosition(3, 37))[0];
+            expect(hover?.contents).eql([fence('data as alpha.DataType')]);
+        });
+
+
+        it('should include doc comment descriptions in hover for params', () => {
+            const file = program.setFile('source/test.bs', `
+                '@param {string} data A cool JSON string of data
+                sub printName(data)
+                    print data
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            // sub printName(da|ta)
+            let hover = program.getHover(file.srcPath, util.createPosition(2, 33))[0];
+            expect(hover?.contents).eql([`${fence('data as string')}${commentSep}A cool JSON string of data`]);
         });
     });
 });
diff --git a/src/bscPlugin/hover/HoverProcessor.ts b/src/bscPlugin/hover/HoverProcessor.ts
index 3c2052c6d..a65cda2a0 100644
--- a/src/bscPlugin/hover/HoverProcessor.ts
+++ b/src/bscPlugin/hover/HoverProcessor.ts
@@ -1,12 +1,21 @@
-import { isBrsFile, isFunctionType, isXmlFile } from '../../astUtils/reflection';
+import { isAssignmentStatement, isBrsFile, isCallfuncExpression, isClassStatement, isDottedGetExpression, isEnumMemberStatement, isEnumStatement, isEnumType, isForStatement, isInheritableType, isInterfaceStatement, isMemberField, isNamespaceStatement, isNamespaceType, isNewExpression, isTypedFunctionType, isTypeStatement, isTypeStatementType, isXmlFile } from '../../astUtils/reflection';
 import type { BrsFile } from '../../files/BrsFile';
 import type { XmlFile } from '../../files/XmlFile';
-import type { Hover, ProvideHoverEvent } from '../../interfaces';
+import type { ExtraSymbolData, Hover, ProvideHoverEvent, TypeChainEntry } from '../../interfaces';
 import type { Token } from '../../lexer/Token';
 import { TokenKind } from '../../lexer/TokenKind';
 import { BrsTranspileState } from '../../parser/BrsTranspileState';
 import { ParseMode } from '../../parser/Parser';
 import util from '../../util';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import type { AstNode, Expression } from '../../parser/AstNode';
+import type { Scope } from '../../Scope';
+import type { FunctionScope } from '../../FunctionScope';
+import type { BscType } from '../../types/BscType';
+import type { ClassStatement, EnumStatement, FieldStatement, InterfaceFieldStatement, InterfaceStatement } from '../../parser/Statement';
+
+const fence = (code: string) => util.mdFence(code, 'brightscript');
+
 
 export class HoverProcessor {
     public constructor(
@@ -30,21 +39,24 @@ export class HoverProcessor {
         }
     }
 
-    private buildContentsWithDocs(text: string, startingToken: Token) {
+    private buildContentsWithDocsFromDescription(text: string, docs: string) {
         const parts = [text];
-        const docs = this.getTokenDocumentation((this.event.file as BrsFile).parser.tokens, startingToken);
         if (docs) {
             parts.push('***', docs);
         }
         return parts.join('\n');
     }
 
-    private getBrsFileHover(file: BrsFile): Hover | undefined {
-        const scope = this.event.scopes[0];
-        const fence = (code: string) => util.mdFence(code, 'brightscript');
-        //get the token at the position
-        let token = file.getTokenAt(this.event.position);
+    private buildContentsWithDocsFromExpression(text: string, expression: AstNode) {
+        const parts = [text];
+        const docs = util.getNodeDocumentation(expression);
+        if (docs) {
+            parts.push('***', docs);
+        }
+        return parts.join('\n');
+    }
 
+    private isValidTokenForHover(token: Token) {
         let hoverTokenTypes = [
             TokenKind.Identifier,
             TokenKind.Function,
@@ -54,105 +66,182 @@ export class HoverProcessor {
         ];
 
         //throw out invalid tokens and the wrong kind of tokens
-        if (!token || !hoverTokenTypes.includes(token.kind)) {
-            return undefined;
-        }
+        return (token && hoverTokenTypes.includes(token.kind));
+    }
 
-        const expression = file.getClosestExpression(this.event.position);
-        if (expression?.range) {
-            let containingNamespace = file.getNamespaceStatementForPosition(expression.range.start)?.getName(ParseMode.BrighterScript);
-            const fullName = util.getAllDottedGetParts(expression)?.map(x => x.text).join('.');
-
-            //find a constant with this name
-            const constant = scope?.getConstFileLink(fullName, containingNamespace);
-            if (constant) {
-                const constantValue = util.sourceNodeFromTranspileResult(null, null, null, constant.item.value.transpile(new BrsTranspileState(file))).toString();
-                return {
-                    contents: this.buildContentsWithDocs(fence(`const ${constant.item.fullName} = ${constantValue}`), constant.item.tokens.const),
-                    range: token.range
-                };
-            }
+    private getConstHover(token: Token, file: BrsFile, scope: Scope, expression: Expression) {
+        let containingNamespace = file.getNamespaceStatementForPosition(expression?.location?.range?.start)?.getName(ParseMode.BrighterScript);
+        const fullName = util.getAllDottedGetParts(expression)?.map(x => x.text).join('.');
+
+        //find a constant with this name
+        const constant = scope?.getConstFileLink(fullName, containingNamespace);
+        if (constant) {
+            const constantValue = util.sourceNodeFromTranspileResult(null, null, null, constant.item.value.transpile(new BrsTranspileState(file))).toString();
+            const constantType = constant.item.getType({ flags: SymbolTypeFlag.runtime });
+            return this.buildContentsWithDocsFromExpression(fence(`const ${constant.item.fullName} = ${constantValue} as ${constantType.toString()}`), constant.item);
         }
+    }
 
+    private getLabelHover(token: Token, functionScope: FunctionScope) {
         let lowerTokenText = token.text.toLowerCase();
-
-        //look through local variables first
-        {
-            //get the function scope for this position (if exists)
-            let functionScope = file.getFunctionScopeAtPosition(this.event.position);
-            if (functionScope) {
-                //find any variable with this name
-                for (const varDeclaration of functionScope.variableDeclarations) {
-                    //we found a variable declaration with this token text!
-                    if (varDeclaration.name.toLowerCase() === lowerTokenText) {
-                        let typeText: string;
-                        if (isFunctionType(varDeclaration.type)) {
-                            typeText = varDeclaration.type.toString();
-                        } else {
-                            typeText = `${varDeclaration.name} as ${varDeclaration.type.toString()}`;
-                        }
-                        return {
-                            range: token.range,
-                            //append the variable name to the front for scope
-                            contents: fence(typeText)
-                        };
-                    }
-                }
-                for (const labelStatement of functionScope.labelStatements) {
-                    if (labelStatement.name.toLocaleLowerCase() === lowerTokenText) {
-                        return {
-                            range: token.range,
-                            contents: fence(`${labelStatement.name}: label`)
-                        };
-                    }
-                }
+        for (const labelStatement of functionScope.labelStatements) {
+            if (labelStatement.name.toLocaleLowerCase() === lowerTokenText) {
+                return fence(`${labelStatement.name}: label`);
             }
         }
+    }
 
-        //look through all callables in relevant scopes
-        for (let scope of this.event.scopes) {
-            let callable = scope.getCallableByName(lowerTokenText);
-            if (callable) {
-                return {
-                    range: token.range,
-                    contents: this.buildContentsWithDocs(fence(callable.type.toString()), callable.functionStatement?.func?.functionType)
-                };
+    private getCustomTypeHover(expressionType: BscType, extraData: ExtraSymbolData) {
+        let declarationText = '';
+        let exprTypeString = expressionType.toString();
+        let firstToken: Token;
+        if (extraData?.definingNode) {
+            if (isClassStatement(extraData.definingNode)) {
+                firstToken = extraData.definingNode.tokens.class;
+                declarationText = firstToken?.text ?? TokenKind.Class;
+            } else if (isInterfaceStatement(extraData.definingNode)) {
+                firstToken = extraData.definingNode.tokens.interface;
+                declarationText = firstToken?.text ?? TokenKind.Interface;
+            } else if (isNamespaceStatement(extraData.definingNode)) {
+                firstToken = extraData.definingNode.tokens.namespace;
+                exprTypeString = extraData.definingNode.getName(ParseMode.BrighterScript);
+                declarationText = firstToken?.text ?? TokenKind.Namespace;
+            } else if (isEnumStatement(extraData.definingNode)) {
+                firstToken = extraData.definingNode.tokens.enum;
+                exprTypeString = extraData.definingNode.fullName;
+                declarationText = firstToken?.text ?? TokenKind.Enum;
+            } else if (isTypeStatementType(expressionType) && isTypeStatement(extraData.definingNode)) {
+                firstToken = extraData.definingNode.tokens.type;
+                declarationText = (firstToken?.text ?? 'type');
+                exprTypeString = expressionType.toString();
             }
         }
+        const innerText = `${declarationText} ${exprTypeString}`.trim();
+        let result = fence(innerText);
+        return result;
     }
 
-    /**
-     * Combine all the documentation found before a token (i.e. comment tokens)
-     */
-    private getTokenDocumentation(tokens: Token[], token?: Token) {
-        const comments = [] as Token[];
-        if (!token) {
-            return undefined;
+    private getMemberHover(memberExpression: FieldStatement | InterfaceFieldStatement, expressionType: BscType) {
+        let nameText = `${(memberExpression.parent as ClassStatement | InterfaceStatement)?.getName(ParseMode.BrighterScript)}.${memberExpression.tokens.name.text}`;
+        let exprTypeString = expressionType.isResolvable() ? expressionType.toString() : 'invalid';
+        const innerText = `${nameText} as ${exprTypeString}`.trim();
+        let result = fence(innerText);
+        return result;
+    }
+
+    private getBrsFileHover(file: BrsFile): Hover {
+        //get the token at the position
+        let token = file.getTokenAt(this.event.position);
+
+        if (!this.isValidTokenForHover(token)) {
+            return null;
         }
-        const idx = tokens?.indexOf(token);
-        if (!idx || idx === -1) {
-            return undefined;
+        const expression = file.getClosestExpression(this.event.position);
+        if (!expression) {
+            return null;
         }
-        for (let i = idx - 1; i >= 0; i--) {
-            const token = tokens[i];
-            //skip whitespace and newline chars
-            if (token.kind === TokenKind.Comment) {
-                comments.push(token);
-            } else if (token.kind === TokenKind.Newline || token.kind === TokenKind.Whitespace) {
-                //skip these tokens
-                continue;
-
-                //any other token means there are no more comments
-            } else {
-                break;
+        const hoverContents: string[] = [];
+        for (let scope of this.event.scopes) {
+            try {
+                scope.linkSymbolTable();
+                const constHover = this.getConstHover(token, file, scope, expression);
+                if (constHover) {
+                    hoverContents.push(constHover);
+                    continue;
+                }
+                //get the function scope for this position (if exists)
+                let functionScope = file.getFunctionScopeAtPosition(this.event.position);
+                if (functionScope) {
+                    const labelHover = this.getLabelHover(token, functionScope);
+                    if (labelHover) {
+                        hoverContents.push(labelHover);
+                        continue;
+                    }
+                }
+                const isInTypeExpression = util.isInTypeExpression(expression);
+                const typeFlag = isInTypeExpression ? SymbolTypeFlag.typetime : SymbolTypeFlag.runtime;
+                const typeChain: TypeChainEntry[] = [];
+                const extraData = {} as ExtraSymbolData;
+                let exprType: BscType;
+
+                if (isAssignmentStatement(expression) && token === expression.tokens.name) {
+                    if (isForStatement(expression.parent) && expression.parent.counterDeclaration === expression) {
+                        // for loop counter variable - its type is always integer
+                        exprType = expression.value.getType({ flags: typeFlag, typeChain: typeChain, data: extraData, statementIndex: expression.statementIndex });
+                    } else {
+                        // if this is an assignment, but we're really interested in the value AFTER the assignment
+                        exprType = expression.getSymbolTable().getSymbolType(expression.tokens.name.text, { flags: typeFlag, typeChain: typeChain, data: extraData, statementIndex: expression.statementIndex + 1 });
+                    }
+                } else {
+                    exprType = expression.getType({ flags: typeFlag, typeChain: typeChain, data: extraData, ignoreCall: isCallfuncExpression(expression) });
+                }
+
+                const processedTypeChain = util.processTypeChain(typeChain);
+                const fullName = processedTypeChain.fullNameOfItem || token.text;
+                // if the type chain has dynamic in it, then just say the token text
+                let exprNameString = !processedTypeChain.containsDynamic ? fullName : token.text;
+                if (isTypedFunctionType(exprType)) {
+                    exprNameString = processedTypeChain.fullNameOfItem;
+                }
+                const useCustomTypeHover = isInTypeExpression || expression?.findAncestor(isNewExpression);
+                let hoverContent = '';
+                let descriptionNode;
+                if (useCustomTypeHover && (isInheritableType(exprType) || isTypeStatementType(exprType))) {
+                    hoverContent = this.getCustomTypeHover(exprType, extraData);
+                } else if (isMemberField(expression)) {
+                    hoverContent = this.getMemberHover(expression, exprType);
+                    descriptionNode = expression;
+                } else if (isEnumMemberStatement(expression)) {
+                    hoverContent = fence(`${(expression.parent as EnumStatement)?.name}.${expression.tokens.name.text} as ${exprType.toString()}`.trim());
+                    descriptionNode = expression;
+                } else if (isNamespaceType(exprType) ||
+                    isEnumType(expression.getType({ flags: SymbolTypeFlag.typetime }))) {
+                    hoverContent = this.getCustomTypeHover(exprType, extraData);
+                } else {
+                    const variableName = !isTypedFunctionType(exprType) ? `${exprNameString} as ` : '';
+                    if (isTypedFunctionType(exprType)) {
+                        exprType.setName(exprNameString);
+                    }
+                    let exprTypeString = exprType.toString();
+                    if (!exprType.isResolvable()) {
+                        if (isDottedGetExpression(expression)) {
+                            exprTypeString = 'invalid';
+                        }
+                    }
+                    hoverContent = fence(`${variableName}${exprTypeString}`);
+                }
+                const modifiers = [];
+                // eslint-disable-next-line no-bitwise
+                if (extraData?.flags && extraData?.flags & SymbolTypeFlag.optional) {
+                    modifiers.push(TokenKind.Optional);
+                }
+                if (modifiers.length > 0) {
+                    hoverContent += `\n * (${modifiers.join(', ').toLowerCase()})* `;
+                }
+
+                if (descriptionNode) {
+                    hoverContent = this.buildContentsWithDocsFromExpression(hoverContent, descriptionNode);
+                } else if (extraData.description) {
+                    hoverContent = this.buildContentsWithDocsFromDescription(hoverContent, extraData.description);
+                } else if (extraData.definingNode) {
+                    hoverContent = this.buildContentsWithDocsFromExpression(hoverContent, extraData.definingNode);
+                }
+                hoverContents.push(hoverContent);
+
+            } finally {
+                scope?.unlinkSymbolTable();
             }
         }
-        if (comments.length > 0) {
-            return comments.reverse().map(x => x.text.replace(/^('|rem)/i, '')).join('\n');
-        }
+        return {
+            range: token?.location.range,
+            contents: hoverContents
+        };
     }
 
-    private getXmlFileHover(file: XmlFile): Hover | undefined {
+    /**
+     * @param file the file
+     */
+    private getXmlFileHover(file: XmlFile) {
         //TODO add xml hovers
         return undefined;
     }
diff --git a/src/bscPlugin/references/ReferencesProvider.ts b/src/bscPlugin/references/ReferencesProvider.ts
index 27afd8480..b964c77ec 100644
--- a/src/bscPlugin/references/ReferencesProvider.ts
+++ b/src/bscPlugin/references/ReferencesProvider.ts
@@ -40,13 +40,13 @@ export class ReferencesProvider {
                 processedFiles.add(file);
                 file.ast.walk(createVisitor({
                     AssignmentStatement: (s) => {
-                        if (s.name?.text?.toLowerCase() === searchFor) {
-                            this.event.references.push(util.createLocation(util.pathToUri(file.srcPath), s.name.range));
+                        if (s.tokens.name?.text?.toLowerCase() === searchFor) {
+                            this.event.references.push(util.createLocationFromRange(util.pathToUri(file.srcPath), s.tokens.name.location?.range));
                         }
                     },
                     VariableExpression: (e) => {
-                        if (e.name.text.toLowerCase() === searchFor) {
-                            this.event.references.push(util.createLocation(util.pathToUri(file.srcPath), e.range));
+                        if (e.tokens.name.text.toLowerCase() === searchFor) {
+                            this.event.references.push(util.createLocationFromRange(util.pathToUri(file.srcPath), e.location?.range));
                         }
                     }
                 }), {
diff --git a/src/bscPlugin/selectionRanges/SelectionRangesProcessor.spec.ts b/src/bscPlugin/selectionRanges/SelectionRangesProcessor.spec.ts
index 83d5eaf3e..fe88f32b0 100644
--- a/src/bscPlugin/selectionRanges/SelectionRangesProcessor.spec.ts
+++ b/src/bscPlugin/selectionRanges/SelectionRangesProcessor.spec.ts
@@ -50,7 +50,7 @@ describe('SelectionRangesProcessor', () => {
     function getSelectionRange(code: string, line: number, character: number) {
         const file = program.setFile('source/main.brs', code);
         program.validate();
-        const ranges = program.getSelectionRanges(file.pathAbsolute, [util.createPosition(line, character)]);
+        const ranges = program.getSelectionRanges(file.srcPath, [util.createPosition(line, character)]);
         return ranges[0];
     }
 
@@ -252,7 +252,7 @@ describe('SelectionRangesProcessor', () => {
         const file = program.setFile('source/multi.brs', code);
         program.validate();
 
-        const ranges = program.getSelectionRanges(file.pathAbsolute, [
+        const ranges = program.getSelectionRanges(file.srcPath, [
             util.createPosition(1, 4), // cursor on 'a'
             util.createPosition(2, 4) // cursor on 'b'
         ]);
@@ -298,7 +298,7 @@ describe('SelectionRangesProcessor', () => {
         const file = program.setFile('source/empty.brs', code);
         program.validate();
         // position far past the last line — should not throw
-        const ranges = program.getSelectionRanges(file.pathAbsolute, [util.createPosition(99, 0)]);
+        const ranges = program.getSelectionRanges(file.srcPath, [util.createPosition(99, 0)]);
         expect(Array.isArray(ranges)).to.be.true;
     });
 
@@ -346,7 +346,7 @@ describe('SelectionRangesProcessor', () => {
         const file = program.setFile('source/plugin.brs', code);
         program.validate();
 
-        const ranges = program.getSelectionRanges(file.pathAbsolute, [util.createPosition(0, 4)]);
+        const ranges = program.getSelectionRanges(file.srcPath, [util.createPosition(0, 4)]);
         // The bsc plugin should push a range, and the test plugin pushed another
         expect(ranges.length).to.be.at.least(2);
         const hasCustom = ranges.some(r => r.range.start.line === 0 && r.range.end.character === 10);
diff --git a/src/bscPlugin/selectionRanges/SelectionRangesProcessor.ts b/src/bscPlugin/selectionRanges/SelectionRangesProcessor.ts
index 3acdbe6dc..a7d6b8755 100644
--- a/src/bscPlugin/selectionRanges/SelectionRangesProcessor.ts
+++ b/src/bscPlugin/selectionRanges/SelectionRangesProcessor.ts
@@ -30,7 +30,8 @@ export class SelectionRangesProcessor {
 
         // Find the deepest AST node containing this position
         const innerNode = file.ast.findChildAtPosition(position);
-        if (!innerNode?.range) {
+        const innerNodeRange = innerNode?.location?.range;
+        if (!innerNodeRange) {
             return undefined;
         }
 
@@ -42,8 +43,9 @@ export class SelectionRangesProcessor {
         // the JS/TS smart-select behaviour — we look up the exact lexer token at the
         // cursor position and use its range as the initial step.
         const token = file.getTokenAt(position);
-        if (token?.range && !rangesEqual(token.range, innerNode.range)) {
-            ranges.push(token.range);
+        const tokenRange = token?.location?.range;
+        if (tokenRange && !rangesEqual(tokenRange, innerNodeRange)) {
+            ranges.push(tokenRange);
         }
 
         // Walk up the AST parent chain, collecting each node's range.
@@ -51,7 +53,7 @@ export class SelectionRangesProcessor {
         // only child statement, or an ExpressionStatement === its expression).
         let node: AstNode | undefined = innerNode;
         while (node) {
-            const nodeRange = node.range;
+            const nodeRange = node.location?.range;
             if (nodeRange && !rangesEqual(nodeRange, ranges[ranges.length - 1])) {
                 ranges.push(nodeRange);
             }
diff --git a/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts b/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts
index 7dc8702e3..cdc656012 100644
--- a/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts
+++ b/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.spec.ts
@@ -1,13 +1,13 @@
 import { expect } from '../../chai-config.spec';
 import { SemanticTokenModifiers, SemanticTokenTypes } from 'vscode-languageserver-protocol';
 import type { BrsFile } from '../../files/BrsFile';
-import type { BscFile, SemanticToken } from '../../interfaces';
+import type { BscFile } from '../../files/BscFile';
+import type { SemanticToken } from '../../interfaces';
 import { Program } from '../../Program';
 import { expectZeroDiagnostics } from '../../testHelpers.spec';
 import { util } from '../../util';
 import { rootDir } from '../../testHelpers.spec';
 
-
 describe('BrsFileSemanticTokensProcessor', () => {
     let program: Program;
     beforeEach(() => {
@@ -19,7 +19,23 @@ describe('BrsFileSemanticTokensProcessor', () => {
         program.dispose();
     });
 
-    function expectSemanticTokens(file: BscFile, tokens: SemanticToken[], validateDiagnostics = true) {
+    /**
+     * Ensure the specified tokens are present in the full list
+     */
+    function expectSemanticTokensIncludes(file: BscFile, expected: Array<SemanticToken | [SemanticTokenTypes, number, number, number, number, SemanticTokenModifiers[]?]>, validateDiagnostics = true) {
+        const result = getSemanticTokenResults(file, expected, validateDiagnostics);
+        expect(result.actual).to.include.members(result.expected);
+    }
+
+    /**
+     * Ensure that the full list of tokens exactly equals the expected list
+     */
+    function expectSemanticTokens(file: BscFile, expected: Array<SemanticToken | [SemanticTokenTypes, number, number, number, number, SemanticTokenModifiers[]?]>, validateDiagnostics = true) {
+        const result = getSemanticTokenResults(file, expected, validateDiagnostics);
+        expect(result.actual).to.eql(result.expected);
+    }
+
+    function getSemanticTokenResults(file: BscFile, expected: Array<SemanticToken | [SemanticTokenTypes, number, number, number, number, SemanticTokenModifiers[]?]>, validateDiagnostics = true) {
         program.validate();
         if (validateDiagnostics) {
             expectZeroDiagnostics(program);
@@ -29,21 +45,30 @@ describe('BrsFileSemanticTokensProcessor', () => {
         );
 
         //sort modifiers
-        for (const collection of [result, tokens]) {
-            for (const token of collection) {
+        for (let collection of [result, expected]) {
+            for (let i = 0; i < collection.length; i++) {
+                if (Array.isArray(collection[i])) {
+                    const parts = collection[i];
+                    collection[i] = {
+                        tokenType: parts[0],
+                        range: util.createRange(parts[1], parts[2], parts[3], parts[4]),
+                        tokenModifiers: parts[5] ?? []
+                    };
+                }
+                let token = collection[i] as SemanticToken;
                 token.tokenModifiers ??= [];
                 token.tokenModifiers.sort();
             }
         }
 
-        expect(
-            result
-        ).to.eql(
-            util.sortByRange(
-                tokens
-            )
-        );
-        return result;
+        function stringify(token: SemanticToken) {
+            return `${token.tokenType}|${util.rangeToString(token.range)}|${token.tokenModifiers?.join(',')}`;
+        }
+
+        return {
+            actual: result.map(x => stringify(x)),
+            expected: (expected as SemanticToken[]).map(x => stringify(x))
+        };
     }
 
     it('matches each namespace section for class', () => {
@@ -52,6 +77,7 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 sub new()
                     m.alien = new Humanoids.Aliens.Alien()
                 end sub
+                public alien
             end class
 
             namespace Humanoids.Aliens
@@ -59,16 +85,14 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end class
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(3, 34, 3, 43),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(3, 44, 3, 50),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(3, 51, 3, 56),
-            tokenType: SemanticTokenTypes.class
-        }]);
+        expectSemanticTokensIncludes(file, [
+            //m.alien = new |Humanoids|.Aliens.Alien()
+            [SemanticTokenTypes.namespace, 3, 34, 3, 43],
+            //m.alien = new Humanoids.|Aliens|.Alien()
+            [SemanticTokenTypes.namespace, 3, 44, 3, 50],
+            //m.alien = new Humanoids.Aliens.|Alien|()
+            [SemanticTokenTypes.class, 3, 51, 3, 56]
+        ]);
     });
 
     it('matches each namespace section for namespaced function calls', () => {
@@ -81,16 +105,28 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end function
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 16, 2, 25),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 26, 2, 32),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 33, 2, 39),
-            tokenType: SemanticTokenTypes.function
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // |Humanoids|.Aliens.Invade("earth")
+            [SemanticTokenTypes.namespace, 2, 16, 2, 25],
+            // Humanoids.|Aliens|.Invade("earth")
+            [SemanticTokenTypes.namespace, 2, 26, 2, 32],
+            // Humanoids.Aliens.|Invade|("earth")
+            [SemanticTokenTypes.function, 2, 33, 2, 39]
+        ]);
+    });
+
+    it('matches class name in assignment statement', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            sub test()
+                ctor = Person
+            end sub
+            class Person
+            end class
+        `);
+        expectSemanticTokensIncludes(file, [
+            // ctor = |Person|
+            [SemanticTokenTypes.class, 2, 23, 2, 29]
+        ]);
     });
 
     it('matches namespace-relative parts', () => {
@@ -104,15 +140,12 @@ describe('BrsFileSemanticTokensProcessor', () => {
             namespace alpha.lineHeight
             end namespace
         `);
-        expectSemanticTokens(file, [{
+        expectSemanticTokensIncludes(file, [
             //|lineHeight| = 1
-            range: util.createRange(3, 20, 3, 30),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
+            [SemanticTokenTypes.variable, 3, 20, 3, 30],
             //print |lineHeight|
-            range: util.createRange(4, 26, 4, 36),
-            tokenType: SemanticTokenTypes.namespace
-        }], false);
+            [SemanticTokenTypes.variable, 4, 26, 4, 36]
+        ], false);
     });
 
     it('matches namespace-relative parts in parameters', () => {
@@ -124,14 +157,13 @@ describe('BrsFileSemanticTokensProcessor', () => {
             namespace alpha.lineHeight
             end namespace
         `);
-        expectSemanticTokens(file, [{
+        expectSemanticTokensIncludes(file, [
             //sub test(|lineHeight| as integer)
-            range: util.createRange(2, 25, 2, 35),
-            tokenType: SemanticTokenTypes.namespace
-        }], false);
+            [SemanticTokenTypes.parameter, 2, 25, 2, 35]
+        ], false);
     });
 
-    it('matches namespace-relative parts in parameters', () => {
+    it('matches parameters variable names', () => {
         const file = program.setFile<BrsFile>('source/main.bs', `
             namespace designSystem
                 function getIcon(image = "" as string, size = -1 as float) as object
@@ -141,11 +173,12 @@ describe('BrsFileSemanticTokensProcessor', () => {
             namespace designSystem.size
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            //sub test(|lineHeight| as integer)
-            range: util.createRange(2, 55, 2, 59),
-            tokenType: SemanticTokenTypes.namespace
-        }], false);
+        expectSemanticTokensIncludes(file, [
+            // function getIcon(|image| = "" as string, size = -1 as float) as object
+            [SemanticTokenTypes.parameter, 2, 33, 2, 38],
+            // function getIcon(image = "" as string, |size| = -1 as float) as object
+            [SemanticTokenTypes.parameter, 2, 55, 2, 59]
+        ], false);
     });
 
     it('matches each namespace section for namespaced function assignment', () => {
@@ -158,16 +191,14 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end function
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 25, 2, 34),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 35, 2, 41),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 42, 2, 48),
-            tokenType: SemanticTokenTypes.function
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // action = |Humanoids|.Aliens.Invade
+            [SemanticTokenTypes.namespace, 2, 25, 2, 34],
+            // action = Humanoids.|Aliens|.Invade
+            [SemanticTokenTypes.namespace, 2, 35, 2, 41],
+            // action = Humanoids.Aliens.|Invade|
+            [SemanticTokenTypes.function, 2, 42, 2, 48]
+        ]);
     });
 
     it('matches each namespace section for namespaced function as function parameter', () => {
@@ -180,20 +211,16 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end function
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            //`type` function call
-            range: util.createRange(2, 29, 2, 33),
-            tokenType: SemanticTokenTypes.function
-        }, {
-            range: util.createRange(2, 34, 2, 43),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 44, 2, 50),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 51, 2, 57),
-            tokenType: SemanticTokenTypes.function
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // actionName = |type|(Humanoids.Aliens.Invade)
+            [SemanticTokenTypes.function, 2, 29, 2, 33],
+            // actionName = type(|Humanoids|.Aliens.Invade)
+            [SemanticTokenTypes.namespace, 2, 34, 2, 43],
+            // actionName = type(Humanoids.|Aliens|.Invade)
+            [SemanticTokenTypes.namespace, 2, 44, 2, 50],
+            // actionName = type(Humanoids.Aliens.|Invade|)
+            [SemanticTokenTypes.function, 2, 51, 2, 57]
+        ]);
     });
 
     it('matches each namespace section for namespaced function in print statement', () => {
@@ -206,43 +233,27 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end function
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 22, 2, 31),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 32, 2, 38),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 39, 2, 45),
-            tokenType: SemanticTokenTypes.function
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // print |Humanoids|.Aliens.Invade
+            [SemanticTokenTypes.namespace, 2, 22, 2, 31],
+            // print Humanoids.|Aliens|.Invade
+            [SemanticTokenTypes.namespace, 2, 32, 2, 38],
+            // print Humanoids.Aliens.|Invade|
+            [SemanticTokenTypes.function, 2, 39, 2, 45]
+        ]);
     });
 
-    it('matches each namespace section for enums', () => {
+    it('matches each namespace section for namespace declaration', () => {
         const file = program.setFile<BrsFile>('source/main.bs', `
-            sub main()
-                print Earthlings.Species.Human.Male
-            end sub
-            namespace Earthlings.Species
-                enum Human
-                    Male
-                    Female
-                end enum
+            namespace Sentients.Humanoids
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 22, 2, 32),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 33, 2, 40),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 41, 2, 46),
-            tokenType: SemanticTokenTypes.enum
-        }, {
-            range: util.createRange(2, 47, 2, 51),
-            tokenType: SemanticTokenTypes.enumMember
-        }]);
+        expectSemanticTokens(file, [
+            // namespace |Sentients|.Humanoids
+            [SemanticTokenTypes.namespace, 1, 22, 1, 31],
+            // namespace Sentients.|Humanoids|
+            [SemanticTokenTypes.namespace, 1, 32, 1, 41]
+        ]);
     });
 
     it('matches each namespace section for enum', () => {
@@ -258,19 +269,16 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end enum
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 22, 2, 31),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 32, 2, 41),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 42, 2, 54),
-            tokenType: SemanticTokenTypes.enum
-        }, {
-            range: util.createRange(2, 55, 2, 60),
-            tokenType: SemanticTokenTypes.enumMember
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // print |Sentients|.Humanoids.HumanoidType.Cylon
+            [SemanticTokenTypes.namespace, 2, 22, 2, 31],
+            // print Sentients.|Humanoids|.HumanoidType.Cylon
+            [SemanticTokenTypes.namespace, 2, 32, 2, 41],
+            // print Sentients.Humanoids.|HumanoidType|.Cylon
+            [SemanticTokenTypes.enum, 2, 42, 2, 54],
+            // print Sentients.Humanoids.HumanoidType.|Cylon|
+            [SemanticTokenTypes.enumMember, 2, 55, 2, 60]
+        ]);
     });
 
     it('matches enums in if statements', () => {
@@ -288,16 +296,14 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end enum
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 19, 2, 28),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 29, 2, 41),
-            tokenType: SemanticTokenTypes.enum
-        }, {
-            range: util.createRange(2, 42, 2, 47),
-            tokenType: SemanticTokenTypes.enumMember
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // if |Humanoids|.HumanoidType.Cylon = "Cylon" then
+            [SemanticTokenTypes.namespace, 2, 19, 2, 28],
+            // if Humanoids.|HumanoidType|.Cylon = "Cylon" then
+            [SemanticTokenTypes.enum, 2, 29, 2, 41],
+            // if Humanoids.HumanoidType.|Cylon| = "Cylon" then
+            [SemanticTokenTypes.enumMember, 2, 42, 2, 47]
+        ]);
     });
 
     it('matches enum with invalid member name', () => {
@@ -313,13 +319,12 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end enum
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 22, 2, 31),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 32, 2, 44),
-            tokenType: SemanticTokenTypes.enum
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // print |Humanoids|.HumanoidType.INVALID_VALUE 'bs:disable-line
+            [SemanticTokenTypes.namespace, 2, 22, 2, 31],
+            // print Humanoids.|HumanoidType|.INVALID_VALUE 'bs:disable-line
+            [SemanticTokenTypes.enum, 2, 32, 2, 44]
+        ]);
     });
 
     it('matches class with invalid stuff after it', () => {
@@ -333,16 +338,39 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 end class
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 30, 2, 39),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 40, 2, 46),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(2, 47, 2, 52),
-            tokenType: SemanticTokenTypes.class
-        }]);
+        expectSemanticTokensIncludes(file, [
+            // m.alien = new |Humanoids|.Aliens.Alien.NOT_A_CLASS() 'bs:disable-line
+            [SemanticTokenTypes.namespace, 2, 30, 2, 39],
+            // m.alien = new Humanoids.|Aliens|.Alien.NOT_A_CLASS() 'bs:disable-line
+            [SemanticTokenTypes.namespace, 2, 40, 2, 46],
+            // m.alien = new Humanoids.Aliens.|Alien|.NOT_A_CLASS() 'bs:disable-line
+            [SemanticTokenTypes.class, 2, 47, 2, 52]
+        ]);
+    });
+
+    it('matches aliases', () => {
+        program.setFile('source/alpha.bs', `
+            namespace alpha
+                sub test()
+                end sub
+            end namespace
+        `);
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            alias alpha2 = alpha
+            sub main()
+                print alpha2.test()
+            end sub
+        `);
+        expectSemanticTokensIncludes(file, [
+            // alias |alpha2| = alpha
+            [SemanticTokenTypes.namespace, 1, 18, 1, 24],
+            // alias alpha2 = |alpha|
+            [SemanticTokenTypes.namespace, 1, 27, 1, 32],
+            // print |alpha2|.test()
+            [SemanticTokenTypes.namespace, 3, 22, 3, 28],
+            // print alpha2.|test|()
+            [SemanticTokenTypes.function, 3, 29, 3, 33]
+        ]);
     });
 
     it('matches consts', () => {
@@ -356,26 +384,22 @@ describe('BrsFileSemanticTokensProcessor', () => {
                 const FIRST_NAME = "bob"
             end namespace
         `);
-        expectSemanticTokens(file, [{
-            range: util.createRange(2, 22, 2, 29),
-            tokenType: SemanticTokenTypes.variable,
-            tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-        }, {
-            range: util.createRange(3, 22, 3, 26),
-            tokenType: SemanticTokenTypes.namespace
-        }, {
-            range: util.createRange(3, 27, 3, 37),
-            tokenType: SemanticTokenTypes.variable,
-            tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-        }, {
-            range: util.createRange(5, 18, 5, 25),
-            tokenType: SemanticTokenTypes.variable,
-            tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-        }, {
-            range: util.createRange(7, 22, 7, 32),
-            tokenType: SemanticTokenTypes.variable,
-            tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-        }]);
+        expectSemanticTokens(file, [
+            // sub |init|()
+            [SemanticTokenTypes.function, 1, 16, 1, 20],
+            // print |API_URL|
+            [SemanticTokenTypes.variable, 2, 22, 2, 29, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]],
+            // print |info|.FIRST_NAME
+            [SemanticTokenTypes.namespace, 3, 22, 3, 26],
+            // print info.|FIRST_NAME|
+            [SemanticTokenTypes.variable, 3, 27, 3, 37, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]],
+            // const |API_URL| = "some_url"
+            [SemanticTokenTypes.variable, 5, 18, 5, 25, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]],
+            // namespace |info|
+            [SemanticTokenTypes.namespace, 6, 22, 6, 26],
+            // const |FIRST_NAME| = "bob"
+            [SemanticTokenTypes.variable, 7, 22, 7, 32, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]]
+        ]);
     });
 
     it('matches consts in assignment expressions', () => {
@@ -391,35 +415,182 @@ describe('BrsFileSemanticTokensProcessor', () => {
             const API_URL = "url"
         `);
         expectSemanticTokens(file, [
+            // sub |main|()
+            [SemanticTokenTypes.function, 1, 16, 1, 20],
+            // |value| = ""
+            [SemanticTokenTypes.variable, 2, 16, 2, 21],
+            // |value| += constants.API_KEY
+            [SemanticTokenTypes.variable, 3, 16, 3, 21],
             // value += |constants|.API_KEY
-            {
-                range: util.createRange(3, 25, 3, 34),
-                tokenType: SemanticTokenTypes.namespace
-            },
+            [SemanticTokenTypes.namespace, 3, 25, 3, 34],
             // value += constants.|API_KEY|
-            {
-                range: util.createRange(3, 35, 3, 42),
-                tokenType: SemanticTokenTypes.variable,
-                tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-            },
+            [SemanticTokenTypes.variable, 3, 35, 3, 42, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]],
+            // |value| += API_URL
+            [SemanticTokenTypes.variable, 4, 16, 4, 21],
             // value += |API_URL|
-            {
-                range: util.createRange(4, 25, 4, 32),
-                tokenType: SemanticTokenTypes.variable,
-                tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-            },
+            [SemanticTokenTypes.variable, 4, 25, 4, 32, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]],
+            // namespace |constants|
+            [SemanticTokenTypes.namespace, 6, 22, 6, 31],
             // const |API_KEY| = "test"
-            {
-                range: util.createRange(7, 22, 7, 29),
-                tokenType: SemanticTokenTypes.variable,
-                tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-            },
+            [SemanticTokenTypes.variable, 7, 22, 7, 29, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]],
             //const |API_URL| = "url"
-            {
-                range: util.createRange(9, 18, 9, 25),
-                tokenType: SemanticTokenTypes.variable,
-                tokenModifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]
-            }
+            [SemanticTokenTypes.variable, 9, 18, 9, 25, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]]
+        ]);
+    });
+
+    it('matches new statement of non-class', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            sub init()
+                m.alien = new Humanoids.Aliens.Alien.NOT_A_CLASS() 'bs:disable-line
+            end sub
+
+            namespace Humanoids.Aliens
+                class Alien
+                end class
+            end namespace
+        `);
+        expectSemanticTokens(file, [
+            // sub |init|()
+            [SemanticTokenTypes.function, 1, 16, 1, 20],
+            // m.alien = new |Humanoids|.Aliens.Alien.NOT_A_CLASS() 'bs:disable-line
+            [SemanticTokenTypes.namespace, 2, 30, 2, 39],
+            // m.alien = new Humanoids.|Aliens|.Alien.NOT_A_CLASS() 'bs:disable-line
+            [SemanticTokenTypes.namespace, 2, 40, 2, 46],
+            // m.alien = new Humanoids.Aliens.|Alien|.NOT_A_CLASS() 'bs:disable-line
+            [SemanticTokenTypes.class, 2, 47, 2, 52],
+            // namespace |Humanoids|.Aliens
+            [SemanticTokenTypes.namespace, 5, 22, 5, 31],
+            // namespace Humanoids.|Aliens|
+            [SemanticTokenTypes.namespace, 5, 32, 5, 38],
+            // class |Alien|
+            [SemanticTokenTypes.class, 6, 22, 6, 27]
+        ]);
+    });
+
+    it('matches interface names', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            interface Human
+                name as string
+            end interface
+
+            namespace Humanoids
+                interface Alien
+                    name as string
+                end interface
+            end namespace
+        `);
+        expectSemanticTokensIncludes(file, [
+            // interface |Human|
+            [SemanticTokenTypes.interface, 1, 22, 1, 27],
+            // interface |Alien|
+            [SemanticTokenTypes.interface, 6, 26, 6, 31]
+        ]);
+    });
+
+    it('marks setPort as deprecated', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            sub main()
+                url = createObject("roUrlTransfer") as roUrlTransfer
+                url.setPort(80)
+            end sub
+        `);
+        program.validate();
+        expectSemanticTokensIncludes(file, [
+            // url.|setPort|(80)
+            [SemanticTokenTypes.method, 3, 20, 3, 27, [SemanticTokenModifiers.deprecated]]
+        ], false);
+    });
+
+    it('does not color variable of type roSGNode as a type', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            sub main()
+                node = CreateObject("roSGNode", "ContentNode")
+                node.id = "content"
+            end sub
+        `);
+        program.validate();
+        expectSemanticTokensIncludes(file, [
+            // |node|.id = "content"
+            [SemanticTokenTypes.variable, 3, 16, 3, 20]
+        ], false);
+    });
+
+    it('does not color variable when it is an instance of an interface', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            sub main(video as Movie)
+                video.url = "http://example.com"
+            end sub
+            interface Movie
+                url as string
+            end interface
+        `);
+        program.validate();
+        expectSemanticTokensIncludes(file, [
+            // |video|.url = "http://example.com"
+            [SemanticTokenTypes.variable, 2, 16, 2, 21]
+        ], false);
+    });
+
+    it('works for `new` statement', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            class Person
+                sub speak()
+                end sub
+            end class
+            sub test()
+                dude = new Person()
+                dude.speak()
+            end sub
+        `);
+        expectSemanticTokens(file, [
+            // class |Person|
+            [SemanticTokenTypes.class, 1, 18, 1, 24],
+            // sub |test|()
+            [SemanticTokenTypes.function, 5, 16, 5, 20],
+            // |dude| = new Person()
+            [SemanticTokenTypes.variable, 6, 16, 6, 20],
+            // dude = new |Person|()
+            [SemanticTokenTypes.class, 6, 27, 6, 33],
+            // |dude|.speak()
+            [SemanticTokenTypes.variable, 7, 16, 7, 20],
+            // dude.|speak|()
+            [SemanticTokenTypes.method, 7, 21, 7, 26]
+        ]);
+    });
+
+    it('ignores primitive types in type expressions', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            sub test(data as string)
+                x as string = data
+            end sub
+        `);
+        expectSemanticTokens(file, [
+            // sub |test|(data as string)
+            [SemanticTokenTypes.function, 1, 16, 1, 20],
+            // sub test(|data| as string)
+            [SemanticTokenTypes.parameter, 1, 21, 1, 25],
+            // |x| as string = data
+            [SemanticTokenTypes.variable, 2, 16, 2, 17],
+            // x as string = |data|
+            [SemanticTokenTypes.variable, 2, 30, 2, 34]
+        ]);
+    });
+
+    it('ignores dynamic and function in type expressions', () => {
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            sub test(data as dynamic, func as function)
+                func(data)
+            end sub
+        `);
+        expectSemanticTokens(file, [
+            // sub |test|(data as dynamic, func as function)
+            [SemanticTokenTypes.function, 1, 16, 1, 20],
+            // sub test(|data| as dynamic, func as function)
+            [SemanticTokenTypes.parameter, 1, 21, 1, 25],
+            // sub test(data as dynamic, |func| as function)
+            [SemanticTokenTypes.parameter, 1, 38, 1, 42],
+            // |func|(data)
+            [SemanticTokenTypes.function, 2, 16, 2, 20]
         ]);
     });
 });
diff --git a/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts b/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts
index 64bf516be..52a55a920 100644
--- a/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts
+++ b/src/bscPlugin/semanticTokens/BrsFileSemanticTokensProcessor.ts
@@ -1,132 +1,167 @@
-import type { Range } from 'vscode-languageserver-protocol';
 import { SemanticTokenModifiers } from 'vscode-languageserver-protocol';
 import { SemanticTokenTypes } from 'vscode-languageserver-protocol';
-import { isCallExpression, isCustomType, isNamespaceStatement, isNewExpression } from '../../astUtils/reflection';
+import { isCallableType, isClassType, isComponentType, isConstStatement, isDottedGetExpression, isDynamicType, isEnumMemberType, isEnumType, isFunctionExpression, isFunctionStatement, isInterfaceType, isNamespaceType, isPrimitiveType, isVariableExpression } from '../../astUtils/reflection';
 import type { BrsFile } from '../../files/BrsFile';
-import type { OnGetSemanticTokensEvent } from '../../interfaces';
-import type { Locatable } from '../../lexer/Token';
-import { ParseMode } from '../../parser/Parser';
-import type { NamespaceStatement } from '../../parser/Statement';
+import type { ExtraSymbolData, ProvideSemanticTokensEvent, SemanticToken, TypeChainEntry } from '../../interfaces';
+import type { Locatable, Token } from '../../lexer/Token';
 import util from '../../util';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import type { BscType } from '../../types/BscType';
+import { WalkMode, createVisitor } from '../../astUtils/visitors';
+import type { AstNode } from '../../parser/AstNode';
 
 export class BrsFileSemanticTokensProcessor {
     public constructor(
-        public event: OnGetSemanticTokensEvent<BrsFile>
+        public event: ProvideSemanticTokensEvent<BrsFile>
     ) {
 
     }
 
     public process() {
-        this.handleClasses();
-        this.handleConstDeclarations();
-        this.iterateNodes();
-    }
-
-    private handleConstDeclarations() {
-        for (const stmt of this.event.file.parser.references.constStatements) {
-            this.addToken(stmt.tokens.name, SemanticTokenTypes.variable, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]);
+        const scope = this.event.scopes[0];
+        this.result.clear();
+        if (scope) {
+            scope.linkSymbolTable();
         }
-    }
 
-    private handleClasses() {
-
-        const classes = [] as Array<{ className: string; namespaceName: string; range: Range }>;
-
-        //classes used in function param types
-        for (const func of this.event.file.parser.references.functionExpressions) {
-            for (const parm of func.parameters) {
-                if (isCustomType(parm.type)) {
-                    const namespace = parm.findAncestor<NamespaceStatement>(isNamespaceStatement);
-                    classes.push({
-                        className: parm.typeToken.text,
-                        namespaceName: namespace?.getName(ParseMode.BrighterScript),
-                        range: parm.typeToken.range
-                    });
-                }
+        this.event.file.ast.walk(createVisitor({
+            VariableExpression: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            AssignmentStatement: (node) => {
+                this.addToken(node.tokens.name, SemanticTokenTypes.variable);
+            },
+            DottedGetExpression: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            ConstStatement: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            AliasStatement: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            ClassStatement: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            InterfaceStatement: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            EnumStatement: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            FunctionStatement: (node) => {
+                this.tryAddToken(node, node.tokens.name);
+            },
+            FunctionParameterExpression: (node) => {
+                this.addToken(node.tokens.name, SemanticTokenTypes.parameter);
+            },
+            TypeStatement: (node) => {
+                this.tryAddToken(node, node.tokens.name);
             }
-        }
+        }), {
+            walkMode: WalkMode.visitAllRecursive
+        });
 
-        for (const cls of classes) {
-            if (
-                cls.className.length > 0 &&
-                //only highlight classes that are in scope
-                this.event.scopes.some(x => x.hasClass(cls.className, cls.namespaceName))
-            ) {
-                const tokens = util.splitGetRange('.', cls.className, cls.range);
-                this.addTokens(tokens.reverse(), SemanticTokenTypes.class, SemanticTokenTypes.namespace);
-            }
+        if (scope) {
+            scope.unlinkSymbolTable();
         }
+
+        //add all tokens to the event
+        this.event.semanticTokens.push(
+            ...this.result.values()
+        );
     }
 
+    private result = new Map<string, SemanticToken>();
+
+
     /**
-     * Add tokens for each locatable item in the list.
-     * Each locatable is paired with a token type. If there are more locatables than token types, all remaining locatables are given the final token type
+     * Add the given token and node IF we have a resolvable type
      */
-    private addTokens(locatables: Locatable[], ...semanticTokenTypes: SemanticTokenTypes[]) {
-        for (let i = 0; i < locatables.length; i++) {
-            const locatable = locatables[i];
-            //skip items that don't have a location
-            if (locatable?.range) {
-                this.addToken(
-                    locatables[i],
-                    //use the type at the index, or the last type if missing
-                    semanticTokenTypes[i] ?? semanticTokenTypes[semanticTokenTypes.length - 1]
-                );
+    private tryAddToken(node: AstNode, token: Token) {
+        const extraData = {} as ExtraSymbolData;
+        const chain = [] as TypeChainEntry[];
+        // eslint-disable-next-line no-bitwise
+        const symbolType = node.getType({ flags: SymbolTypeFlag.runtime, data: extraData, typeChain: chain });
+        if (symbolType?.isResolvable()) {
+            let info = this.getSemanticTokenInfo(node, symbolType, extraData);
+            if (info) {
+                //mark as deprecated if applicable
+                if ((extraData.flags & SymbolTypeFlag.deprecated)) { // eslint-disable-line no-bitwise
+                    info.modifiers ??= [];
+                    info.modifiers.push(SemanticTokenModifiers.deprecated);
+                }
+                this.addToken(token, info.type, info.modifiers);
             }
         }
     }
 
     private addToken(locatable: Locatable, type: SemanticTokenTypes, modifiers: SemanticTokenModifiers[] = []) {
-        this.event.semanticTokens.push({
-            range: locatable.range,
+        //only keep a single token per range. Last-in wins
+        this.result.set(util.rangeToString(locatable.location.range), {
+            range: locatable.location.range,
             tokenType: type,
             tokenModifiers: modifiers
         });
     }
 
-    private iterateNodes() {
-        const scope = this.event.scopes[0];
-
-        //if this file has no scopes, there's nothing else we can do about this
-        if (!scope) {
-            return;
-        }
-
-        const nodes = [
-            ...this.event.file.parser.references.expressions,
-            //make a new VariableExpression to wrap the name. This is a hack, we could probably do it better
-            ...this.event.file.parser.references.assignmentStatements,
-            ...this.event.file.parser.references.functionExpressions.map(x => x.parameters).flat()
-        ];
+    private getSemanticTokenInfo(node: AstNode, type: BscType, extraData: ExtraSymbolData): { type: SemanticTokenTypes; modifiers?: SemanticTokenModifiers[] } {
+        const isInTypeExpression = util.isInTypeExpression(node);
 
-        for (let node of nodes) {
-            //lift the callee from call expressions to handle namespaced function calls
-            if (isCallExpression(node)) {
-                node = node.callee;
-            } else if (isNewExpression(node)) {
-                node = node.call.callee;
+        if (isConstStatement(extraData?.definingNode)) {
+            return { type: SemanticTokenTypes.variable, modifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static] };
+            // non-instances of classes should be colored like classes
+        } else if (isClassType(type) && extraData.isInstance !== true) {
+            return { type: SemanticTokenTypes.class };
+            //function statements and expressions
+        } else if (!isInTypeExpression && isCallableType(type)) {
+            //if the typetime type is a class, then color this like a class
+            const typetimeType = node.getType({ flags: SymbolTypeFlag.typetime });
+            if (isClassType(typetimeType)) {
+                return { type: SemanticTokenTypes.class };
             }
-            const containingNamespaceNameLower = node.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript).toLowerCase();
-            const tokens = util.getAllDottedGetParts(node);
-            const processedNames: string[] = [];
-            for (const token of tokens ?? []) {
-                processedNames.push(token.text?.toLowerCase());
-                const entityName = processedNames.join('.');
-
-                if (scope.getEnumMemberFileLink(entityName, containingNamespaceNameLower)) {
-                    this.addToken(token, SemanticTokenTypes.enumMember);
-                } else if (scope.getEnum(entityName, containingNamespaceNameLower)) {
-                    this.addToken(token, SemanticTokenTypes.enum);
-                } else if (scope.getClass(entityName, containingNamespaceNameLower)) {
-                    this.addToken(token, SemanticTokenTypes.class);
-                } else if (scope.getCallableByName(entityName)) {
-                    this.addToken(token, SemanticTokenTypes.function);
-                } else if (scope.getNamespace(entityName, containingNamespaceNameLower)) {
-                    this.addToken(token, SemanticTokenTypes.namespace);
-                } else if (scope.getConstFileLink(entityName, containingNamespaceNameLower)) {
-                    this.addToken(token, SemanticTokenTypes.variable, [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static]);
+            //if this is a function statement or expression, treat it as a function
+            if (isFunctionExpression(node) || isFunctionStatement(node)) {
+                return { type: SemanticTokenTypes.function };
+            }
+            if (
+                //if this is a standalone function
+                isVariableExpression(node) ||
+                //if this is a dottedGet, and the LHS is a namespace, treat it as a function.
+                (isDottedGetExpression(node) && isNamespaceType(node.obj.getType({ flags: SymbolTypeFlag.typetime })))
+            ) {
+                if (!isDynamicType(type)) {
+                    return { type: SemanticTokenTypes.function };
                 }
+
+                //all others should be treated as methods
+            } else {
+                return { type: SemanticTokenTypes.method };
+            }
+        } else if (isInterfaceType(type) && extraData.isInstance !== true) {
+            return { type: SemanticTokenTypes.interface };
+        } else if (isComponentType(type) && extraData.isInstance !== true) {
+            return { type: SemanticTokenTypes.class };
+        } else if (isEnumType(type)) {
+            return { type: SemanticTokenTypes.enum };
+        } else if (isEnumMemberType(type)) {
+            return { type: SemanticTokenTypes.enumMember };
+        } else if (isNamespaceType(type)) {
+            return { type: SemanticTokenTypes.namespace };
+            //this is separate from the checks above because we want to resolve alias lookups before turning this variable into a const
+        } else if (isConstStatement(node)) {
+            return { type: SemanticTokenTypes.variable, modifiers: [SemanticTokenModifiers.readonly, SemanticTokenModifiers.static] };
+        } else if (isInTypeExpression && isPrimitiveType(type)) {
+            // primitive types in type expressions should be already properly colored. do not add a semantic token
+            return undefined;
+        } else if (!isInTypeExpression && isVariableExpression(node)) {
+            if (/m/i.test(node.tokens?.name?.text)) {
+                //don't color `m` variables
+            } else {
+                return { type: SemanticTokenTypes.variable };
             }
+        } else {
+            //we don't know what it is...return undefined to prevent creating a semantic token
         }
     }
 }
diff --git a/src/bscPlugin/serialize/BslibInjector.spec.ts b/src/bscPlugin/serialize/BslibInjector.spec.ts
new file mode 100644
index 000000000..25f643233
--- /dev/null
+++ b/src/bscPlugin/serialize/BslibInjector.spec.ts
@@ -0,0 +1,47 @@
+import { createSandbox } from 'sinon';
+import * as fsExtra from 'fs-extra';
+import { Program } from '../../Program';
+import { tempDir, rootDir } from '../../testHelpers.spec';
+import { BslibManager } from './BslibManager';
+import { expect } from 'chai';
+const sinon = createSandbox();
+
+describe('BslibInjector', () => {
+
+    let program: Program;
+
+    beforeEach(() => {
+        fsExtra.emptyDirSync(tempDir);
+        program = new Program({ rootDir: rootDir, sourceMap: true });
+    });
+    afterEach(() => {
+        sinon.restore();
+        program.dispose();
+    });
+
+    describe('isBslibPkgPath', () => {
+        it('works for valid paths', () => {
+            expect(
+                BslibManager.isBslibPkgPath('source/bslib.brs')
+            ).to.be.true;
+            expect(
+                BslibManager.isBslibPkgPath('source/roku_modules/bslib/bslib.brs')
+            ).to.be.true;
+            expect(
+                BslibManager.isBslibPkgPath('source/roku_modules/rokucommunity_bslib/bslib.brs')
+            ).to.be.true;
+        });
+
+        it('works for invalid paths', () => {
+            expect(
+                BslibManager.isBslibPkgPath('source/bslib2.brs')
+            ).to.be.false;
+            expect(
+                BslibManager.isBslibPkgPath('source/roku_modules/1bslib/bslib.brs')
+            ).to.be.false;
+            expect(
+                BslibManager.isBslibPkgPath('source/roku_modules/rokucommunity_bslib/3bslib.brs')
+            ).to.be.false;
+        });
+    });
+});
diff --git a/src/bscPlugin/serialize/BslibManager.ts b/src/bscPlugin/serialize/BslibManager.ts
new file mode 100644
index 000000000..16440f0f1
--- /dev/null
+++ b/src/bscPlugin/serialize/BslibManager.ts
@@ -0,0 +1,46 @@
+import type { BeforeBuildProgramEvent } from '../../interfaces';
+import { standardizePath as s } from '../../util';
+import { source as bslibSource } from '@rokucommunity/bslib';
+import { Cache } from '../../Cache';
+import { BrsFile } from '../../files/BrsFile';
+import type { FunctionStatement } from '../../parser/Statement';
+import type { Editor } from '../../astUtils/Editor';
+const bslibSrcPath = s`${require.resolve('@rokucommunity/bslib')}/dist/source/bslib.brs`;
+export class BslibManager {
+
+    private cache = new Cache();
+
+    public addBslibFileIfMissing(event: BeforeBuildProgramEvent) {
+        //is bslib present in the program? If not, add it now just for this build cycle
+        const exists = !!event.files.find(x => {
+            return BslibManager.isBslibPkgPath(x.pkgPath);
+        });
+        if (!exists) {
+            const file = this.cache.getOrAdd('bslib', () => {
+                const file = new BrsFile({
+                    srcPath: bslibSrcPath,
+                    destPath: event.program.bslibPkgPath,
+                    pkgPath: event.program.bslibPkgPath,
+                    program: event.program
+                });
+                file.parse(bslibSource);
+                return file;
+            });
+            event.files.push(file);
+        }
+    }
+
+    public static applyPrefixIfMissing(statement: FunctionStatement, editor: Editor, prefix: string) {
+        //add the bslib prefix if the function does not start with bslib_ or rokucommunity_bslib_
+        if (!/^(rokucommunity_)?bslib_/i.test(statement.tokens.name.text)) {
+            editor.setProperty(statement.tokens.name, 'text', `${prefix}_${statement.tokens.name.text}`);
+        }
+    }
+
+    /**
+     * Is the pkgPath a support path to bslib?
+     */
+    public static isBslibPkgPath(pkgPath: string) {
+        return /(source[\\\/]bslib.brs)|(source[\\\/]roku_modules[\\\/](rokucommunity_)?bslib)[\\\/]bslib.brs$/i.test(pkgPath);
+    }
+}
diff --git a/src/bscPlugin/serialize/FileSerializer.ts b/src/bscPlugin/serialize/FileSerializer.ts
new file mode 100644
index 000000000..16ee43a14
--- /dev/null
+++ b/src/bscPlugin/serialize/FileSerializer.ts
@@ -0,0 +1,85 @@
+import { isAssetFile, isBrsFile, isXmlFile } from '../../astUtils/reflection';
+import type { AssetFile } from '../../files/AssetFile';
+import type { BrsFile } from '../../files/BrsFile';
+import type { XmlFile } from '../../files/XmlFile';
+import type { SerializedFile, SerializeFileEvent } from '../../interfaces';
+import { util } from '../../util';
+
+export class FileSerializer {
+    constructor(
+        private event: SerializeFileEvent
+    ) {
+
+    }
+
+    public async process() {
+        //if there's already a result for this file, do nothing
+        if (this.event.result.has(this.event.file)) {
+            return;
+        }
+        this.event.scope?.linkSymbolTable();
+        if (isBrsFile(this.event.file)) {
+            await this.serializeBrsFile(this.event.file);
+        } else if (isXmlFile(this.event.file)) {
+            await this.serializeXmlFile(this.event.file);
+        } else if (isAssetFile(this.event.file)) {
+            this.serializeAssetFile(this.event.file);
+        }
+        this.event.scope?.unlinkSymbolTable();
+    }
+
+    private async serializeBrsFile(file: BrsFile) {
+        const result: SerializedFile[] = [];
+        const serialized = file.serialize();
+
+        if (typeof serialized.code === 'string') {
+            result.push({
+                pkgPath: file.pkgPath,
+                data: Buffer.from(serialized.code)
+            });
+        }
+        if (serialized.map) {
+            //chain a prebuild input map (co-located .map or sourceMappingURL comment) onto the
+            //output map so positions trace all the way back to the original source
+            const chainedMap = await util.chainInputSourceMap(serialized.map, file);
+            result.push({
+                pkgPath: file.pkgPath + '.map',
+                data: Buffer.from(chainedMap)
+            });
+        }
+        if (typeof serialized.typedef === 'string') {
+            result.push({
+                pkgPath: file.pkgPath.replace(/\.brs$/i, '.d.bs'),
+                data: Buffer.from(serialized.typedef)
+            });
+        }
+
+        this.event.result.set(file, result);
+    }
+
+    private async serializeXmlFile(file: XmlFile) {
+        const result: SerializedFile[] = [];
+        const serialized = file.serialize();
+        if (typeof serialized.code === 'string') {
+            result.push({
+                pkgPath: file.pkgPath,
+                data: Buffer.from(serialized.code)
+            });
+        }
+        if (serialized.map) {
+            const chainedMap = await util.chainInputSourceMap(serialized.map, file);
+            result.push({
+                pkgPath: file.pkgPath + '.map',
+                data: Buffer.from(chainedMap)
+            });
+        }
+        this.event.result.set(file, result);
+    }
+
+    private serializeAssetFile(file: AssetFile) {
+        this.event.result.set(file, [{
+            pkgPath: file.pkgPath,
+            data: file.data.value
+        }]);
+    }
+}
diff --git a/src/bscPlugin/symbols/DocumentSymbolProcessor.spec.ts b/src/bscPlugin/symbols/DocumentSymbolProcessor.spec.ts
index 6d6ce291d..07b8cdb8e 100644
--- a/src/bscPlugin/symbols/DocumentSymbolProcessor.spec.ts
+++ b/src/bscPlugin/symbols/DocumentSymbolProcessor.spec.ts
@@ -45,8 +45,9 @@ describe('DocumentSymbolProcessor', () => {
             for (let i = 0; i < nameTokenPath.length - 1; i++) {
                 node = node[nameTokenPath[i]];
             }
-            delete node[nameTokenPath[nameTokenPath.length - 1]];
 
+            const lastTokenPath = nameTokenPath[nameTokenPath.length - 1];
+            delete node[lastTokenPath];
             expectSymbols(
                 program.getDocumentSymbols('source/main.brs'),
                 expected
@@ -57,20 +58,20 @@ describe('DocumentSymbolProcessor', () => {
         testMissingToken(`
             sub alpha()
             end sub
-        `, ['name']);
+        `, ['tokens', 'name']);
 
         //class name is missing
         testMissingToken(`
             class alpha
             end class
-        `, ['name']);
+        `, ['tokens', 'name']);
 
         //class field name is missing
         testMissingToken(`
             class alpha
                 name as string
             end class
-        `, ['body', '0', 'name'], {
+        `, ['body', '0', 'tokens', 'name'], {
             alpha: SymbolKind.Class
         });
 
@@ -80,7 +81,7 @@ describe('DocumentSymbolProcessor', () => {
                 sub test()
                 end sub
             end class
-        `, ['body', '0', 'name'], {
+        `, ['body', '0', 'tokens', 'name'], {
             alpha: SymbolKind.Class
         });
 
diff --git a/src/bscPlugin/symbols/WorkspaceSymbolProcessor.spec.ts b/src/bscPlugin/symbols/WorkspaceSymbolProcessor.spec.ts
index 4e6f30a56..2142cc102 100644
--- a/src/bscPlugin/symbols/WorkspaceSymbolProcessor.spec.ts
+++ b/src/bscPlugin/symbols/WorkspaceSymbolProcessor.spec.ts
@@ -90,20 +90,20 @@ describe('WorkspaceSymbolProcessor', () => {
         testMissingToken(`
             sub alpha()
             end sub
-        `, ['name']);
+        `, ['tokens', 'name']);
 
         //class name is missing
         testMissingToken(`
             class alpha
             end class
-        `, ['name']);
+        `, ['tokens', 'name']);
 
         //class field name is missing
         testMissingToken(`
             class alpha
                 name as string
             end class
-        `, ['body', '0', 'name'], [
+        `, ['body', '0', 'tokens', 'name'], [
             ['alpha', SymbolKind.Class]
         ]);
 
@@ -113,7 +113,7 @@ describe('WorkspaceSymbolProcessor', () => {
                 sub test()
                 end sub
             end class
-        `, ['body', '0', 'name'], [
+        `, ['body', '0', 'tokens', 'name'], [
             ['alpha', SymbolKind.Class]
         ]);
 
diff --git a/src/bscPlugin/symbols/symbolUtils.ts b/src/bscPlugin/symbols/symbolUtils.ts
index 416ff6c81..d1c1b740f 100644
--- a/src/bscPlugin/symbols/symbolUtils.ts
+++ b/src/bscPlugin/symbols/symbolUtils.ts
@@ -97,58 +97,58 @@ function getSymbolsFromAstNode(node: AstNode): SymbolInfo[] {
 
     node.walk(createVisitor({
         FunctionStatement: (statement) => {
-            if (statement.name?.text) {
-                addSymbol(statement, statement.name.text, SymbolKind.Function, statement.range, statement.name.range);
+            if (statement.tokens.name?.text) {
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Function, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         ClassStatement: (statement, parent) => {
-            if (statement.name?.text) {
-                addSymbol(statement, statement.name.text, SymbolKind.Class, statement.range, statement.name.range);
+            if (statement.tokens.name?.text) {
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Class, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         FieldStatement: (statement, parent) => {
-            if (statement.name?.text) {
-                addSymbol(statement, statement.name.text, SymbolKind.Field, statement.range, statement.name.range);
+            if (statement.tokens.name?.text) {
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Field, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         MethodStatement: (statement, parent) => {
-            if (statement.name?.text) {
-                addSymbol(statement, statement.name.text, SymbolKind.Method, statement.range, statement.name.range);
+            if (statement.tokens.name?.text) {
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Method, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         InterfaceStatement: (statement, parent) => {
             if (statement.tokens.name?.text) {
-                addSymbol(statement, statement.tokens.name.text, SymbolKind.Interface, statement.range, statement.tokens.name.range);
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Interface, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         InterfaceFieldStatement: (statement, parent) => {
             if (statement.tokens.name?.text) {
-                addSymbol(statement, statement.tokens.name.text, SymbolKind.Field, statement.range, statement.tokens.name.range);
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Field, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         InterfaceMethodStatement: (statement, parent) => {
             if (statement.tokens.name?.text) {
-                addSymbol(statement, statement.tokens.name.text, SymbolKind.Method, statement.range, statement.tokens.name.range);
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Method, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         ConstStatement: (statement) => {
             if (statement.tokens.name?.text) {
-                addSymbol(statement, statement.tokens.name.text, SymbolKind.Constant, statement.range, statement.tokens.name.range);
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Constant, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         NamespaceStatement: (statement) => {
             if (statement.nameExpression) {
-                addSymbol(statement, statement.nameExpression.getNameParts().pop(), SymbolKind.Namespace, statement.range, statement.nameExpression.range);
+                addSymbol(statement, statement.getNameParts().pop().text, SymbolKind.Namespace, statement.location?.range, statement.nameExpression.location?.range);
             }
         },
         EnumStatement: (statement) => {
             if (statement.tokens.name?.text) {
-                addSymbol(statement, statement.tokens.name.text, SymbolKind.Enum, statement.range, statement.tokens.name.range);
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.Enum, statement.location?.range, statement.tokens.name.location?.range);
             }
         },
         EnumMemberStatement: (statement) => {
             if (statement.tokens.name?.text) {
-                addSymbol(statement, statement.tokens.name.text, SymbolKind.EnumMember, statement.range, statement.tokens.name.range);
+                addSymbol(statement, statement.tokens.name.text, SymbolKind.EnumMember, statement.location?.range, statement.tokens.name.location?.range);
             }
         }
     }), {
diff --git a/src/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.ts b/src/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.ts
deleted file mode 100644
index b74ab300c..000000000
--- a/src/bscPlugin/transpile/BrsFilePreTranspileProcessor.spec.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { createSandbox } from 'sinon';
-import * as fsExtra from 'fs-extra';
-import { Program } from '../../Program';
-import { standardizePath as s } from '../../util';
-import { tempDir, rootDir } from '../../testHelpers.spec';
-import { LogLevel, createLogger } from '../../logging';
-import PluginInterface from '../../PluginInterface';
-const sinon = createSandbox();
-
-describe('BrsFile', () => {
-
-    let program: Program;
-
-    beforeEach(() => {
-        fsExtra.emptyDirSync(tempDir);
-        const logger = createLogger({
-            logLevel: LogLevel.warn
-        });
-        program = new Program({ rootDir: rootDir, sourceMap: true }, logger, new PluginInterface([], {
-            logger: logger,
-            suppressErrors: false
-        }));
-    });
-
-    afterEach(() => {
-        sinon.restore();
-        program.dispose();
-    });
-
-    describe('BrsFilePreTranspileProcessor', () => {
-        it('does not crash when operating on a file not included by any scope', async () => {
-            program.setFile('components/lib.brs', `
-                enum Direction
-                    up
-                    down
-                    left
-                    right
-                end enum
-                sub doSomething()
-                    a = { b: "c"}
-                    print a.b
-                    print Direction.up
-                end sub
-            `);
-            await program.transpile([], s`${tempDir}/out`);
-        });
-    });
-});
diff --git a/src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts b/src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts
deleted file mode 100644
index 503f3cf81..000000000
--- a/src/bscPlugin/transpile/BrsFilePreTranspileProcessor.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-import { createAssignmentStatement, createBlock, createDottedSetStatement, createIfStatement, createIndexedSetStatement, createToken } from '../../astUtils/creators';
-import { isAssignmentStatement, isBinaryExpression, isBlock, isBody, isBrsFile, isDottedGetExpression, isDottedSetStatement, isGroupingExpression, isIndexedGetExpression, isIndexedSetStatement, isLiteralExpression, isNamespaceStatement, isUnaryExpression, isVariableExpression } from '../../astUtils/reflection';
-import { createVisitor, WalkMode } from '../../astUtils/visitors';
-import type { BrsFile } from '../../files/BrsFile';
-import type { BeforeFileTranspileEvent } from '../../interfaces';
-import type { Token } from '../../lexer/Token';
-import { TokenKind } from '../../lexer/TokenKind';
-import type { Expression, Statement } from '../../parser/AstNode';
-import type { TernaryExpression } from '../../parser/Expression';
-import { LiteralExpression } from '../../parser/Expression';
-import { ParseMode } from '../../parser/Parser';
-import type { ConstStatement, IfStatement, NamespaceStatement } from '../../parser/Statement';
-import type { Scope } from '../../Scope';
-import util from '../../util';
-
-export class BrsFilePreTranspileProcessor {
-    public constructor(
-        private event: BeforeFileTranspileEvent<BrsFile>
-    ) {
-    }
-
-    public process() {
-        if (isBrsFile(this.event.file)) {
-            this.iterateExpressions();
-        }
-    }
-
-    private iterateExpressions() {
-        const scope = this.event.program.getFirstScopeForFile(this.event.file);
-        //TODO move away from this loop and use a visitor instead
-        for (let expression of this.event.file.parser.references.expressions) {
-            if (expression) {
-                if (isUnaryExpression(expression)) {
-                    this.processExpression(expression.right, scope);
-                } else {
-                    this.processExpression(expression, scope);
-                }
-            }
-        }
-        const walkMode = WalkMode.visitExpressionsRecursive;
-        const visitor = createVisitor({
-            TernaryExpression: (ternaryExpression) => {
-                this.processTernaryExpression(ternaryExpression, visitor, walkMode);
-            }
-        });
-        this.event.file.ast.walk(visitor, { walkMode: walkMode });
-    }
-
-    private processTernaryExpression(ternaryExpression: TernaryExpression, visitor: ReturnType<typeof createVisitor>, walkMode: WalkMode) {
-        function getOwnerAndKey(statement: Statement) {
-            const parent = statement.parent;
-            if (isBlock(parent) || isBody(parent)) {
-                let idx = parent.statements.indexOf(statement);
-                if (idx > -1) {
-                    return { owner: parent.statements, key: idx };
-                }
-            }
-        }
-
-        //if the ternary expression is part of a simple assignment, rewrite it as an `IfStatement`
-        let parent = ternaryExpression.findAncestor(x => !isGroupingExpression(x));
-        let operator: Token;
-        //operators like `+=` will cause the RHS to be a BinaryExpression  due to how the parser handles this. let's do a little magic to detect this situation
-        if (
-            //parent is a binary expression
-            isBinaryExpression(parent) &&
-            (
-                (isAssignmentStatement(parent.parent) && isVariableExpression(parent.left) && parent.left.name === parent.parent.name) ||
-                (isDottedSetStatement(parent.parent) && isDottedGetExpression(parent.left) && parent.left.name === parent.parent.name) ||
-                (isIndexedSetStatement(parent.parent) && isIndexedGetExpression(parent.left) && parent.left.index === parent.parent.index)
-            )
-        ) {
-            //keep the correct operator (i.e. `+=`)
-            operator = parent.operator;
-            //use the outer parent and skip this BinaryExpression
-            parent = parent.parent;
-        }
-        let ifStatement: IfStatement;
-
-        if (isAssignmentStatement(parent)) {
-            ifStatement = createIfStatement({
-                if: createToken(TokenKind.If, 'if', ternaryExpression.questionMarkToken.range),
-                condition: ternaryExpression.test,
-                then: createToken(TokenKind.Then, 'then', ternaryExpression.questionMarkToken.range),
-                thenBranch: createBlock({
-                    statements: [
-                        createAssignmentStatement({
-                            name: parent.name,
-                            equals: operator ?? parent.equals,
-                            value: ternaryExpression.consequent
-                        })
-                    ]
-                }),
-                else: createToken(TokenKind.Else, 'else', ternaryExpression.questionMarkToken.range),
-                elseBranch: createBlock({
-                    statements: [
-                        createAssignmentStatement({
-                            name: parent.name,
-                            equals: operator ?? parent.equals,
-                            value: ternaryExpression.alternate
-                        })
-                    ]
-                }),
-                endIf: createToken(TokenKind.EndIf, 'end if', ternaryExpression.questionMarkToken.range)
-            });
-        } else if (isDottedSetStatement(parent)) {
-            ifStatement = createIfStatement({
-                if: createToken(TokenKind.If, 'if', ternaryExpression.questionMarkToken.range),
-                condition: ternaryExpression.test,
-                then: createToken(TokenKind.Then, 'then', ternaryExpression.questionMarkToken.range),
-                thenBranch: createBlock({
-                    statements: [
-                        createDottedSetStatement({
-                            obj: parent.obj,
-                            name: parent.name,
-                            equals: operator ?? parent.equals,
-                            value: ternaryExpression.consequent
-                        })
-                    ]
-                }),
-                else: createToken(TokenKind.Else, 'else', ternaryExpression.questionMarkToken.range),
-                elseBranch: createBlock({
-                    statements: [
-                        createDottedSetStatement({
-                            obj: parent.obj,
-                            name: parent.name,
-                            equals: operator ?? parent.equals,
-                            value: ternaryExpression.alternate
-                        })
-                    ]
-                }),
-                endIf: createToken(TokenKind.EndIf, 'end if', ternaryExpression.questionMarkToken.range)
-            });
-            //if this is an indexedSetStatement, and the ternary expression is NOT an index
-        } else if (isIndexedSetStatement(parent) && parent.index !== ternaryExpression && !parent.additionalIndexes?.includes(ternaryExpression)) {
-            ifStatement = createIfStatement({
-                if: createToken(TokenKind.If, 'if', ternaryExpression.questionMarkToken.range),
-                condition: ternaryExpression.test,
-                then: createToken(TokenKind.Then, 'then', ternaryExpression.questionMarkToken.range),
-                thenBranch: createBlock({
-                    statements: [
-                        createIndexedSetStatement({
-                            obj: parent.obj,
-                            openingSquare: parent.openingSquare,
-                            index: parent.index,
-                            closingSquare: parent.closingSquare,
-                            equals: operator ?? parent.equals,
-                            value: ternaryExpression.consequent,
-                            additionalIndexes: parent.additionalIndexes
-                        })
-                    ]
-                }),
-                else: createToken(TokenKind.Else, 'else', ternaryExpression.questionMarkToken.range),
-                elseBranch: createBlock({
-                    statements: [
-                        createIndexedSetStatement({
-                            obj: parent.obj,
-                            openingSquare: parent.openingSquare,
-                            index: parent.index,
-                            closingSquare: parent.closingSquare,
-                            equals: operator ?? parent.equals,
-                            value: ternaryExpression.alternate,
-                            additionalIndexes: parent.additionalIndexes
-                        })
-                    ]
-                }),
-                endIf: createToken(TokenKind.EndIf, 'end if', ternaryExpression.questionMarkToken.range)
-            });
-        }
-
-        if (ifStatement) {
-            let { owner, key } = getOwnerAndKey(parent as Statement) ?? {};
-            if (owner && key !== undefined) {
-                this.event.editor.setProperty(owner, key, ifStatement);
-            }
-            //we've injected an ifStatement, so now we need to trigger a walk to handle any nested ternary expressions
-            ifStatement.walk(visitor, { walkMode: walkMode });
-        }
-    }
-
-    /**
-     * Given a string optionally separated by dots, find an enum related to it.
-     * For example, all of these would return the enum: `SomeNamespace.SomeEnum.SomeMember`, SomeEnum.SomeMember, `SomeEnum`
-     */
-    private getEnumInfo(name: string, containingNamespace: string, scope: Scope | undefined) {
-
-        //do we have an enum MEMBER reference? (i.e. SomeEnum.someMember or SomeNamespace.SomeEnum.SomeMember)
-        let memberLink = scope?.getEnumMemberFileLink(name, containingNamespace);
-        if (memberLink) {
-            const value = memberLink.item.getValue();
-            return {
-                enum: memberLink.item.parent,
-                value: new LiteralExpression(createToken(
-                    //just use float literal for now...it will transpile properly with any literal value
-                    value.startsWith('"') ? TokenKind.StringLiteral : TokenKind.FloatLiteral,
-                    value
-                ))
-            };
-        }
-
-        //do we have an enum reference? (i.e. SomeEnum or SomeNamespace.SomeEnum)
-        let enumLink = scope?.getEnumFileLink(name, containingNamespace);
-
-        if (enumLink) {
-            return {
-                enum: enumLink.item
-            };
-        }
-
-    }
-
-    /**
-     * Recursively resolve a const or enum value until we get to the final resolved expression
-     * Returns an object with the resolved value and a flag indicating if a circular reference was detected
-     */
-    private resolveConstValue(value: Expression, scope: Scope | undefined, containingNamespace: string | undefined, visited = new Set<string>()): { value: Expression; isCircular: boolean } {
-        // If it's already a literal, return it as-is
-        if (isLiteralExpression(value)) {
-            return { value: value, isCircular: false };
-        }
-
-        // If it's a variable expression, try to resolve it as a const or enum
-        if (isVariableExpression(value)) {
-            const entityName = value.name.text.toLowerCase();
-
-            // Prevent infinite recursion by tracking visited constants
-            if (visited.has(entityName)) {
-                return { value: value, isCircular: true }; // Return the original value to avoid infinite loop
-            }
-            visited.add(entityName);
-
-            // Try to resolve as const first
-            const constStatement = scope?.getConstFileLink(entityName, containingNamespace)?.item;
-            if (constStatement) {
-                // Recursively resolve the const value
-                return this.resolveConstValue(constStatement.value, scope, containingNamespace, visited);
-            }
-
-            // Try to resolve as enum member
-            const enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
-            if (enumInfo?.value) {
-                // Enum values are already resolved to literals by getEnumInfo
-                return { value: enumInfo.value, isCircular: false };
-            }
-        }
-
-        // If it's a dotted get expression (e.g., namespace.const or namespace.enum.member), try to resolve it
-        if (isDottedGetExpression(value)) {
-            const parts = util.splitExpression(value);
-            const processedNames: string[] = [];
-
-            for (let part of parts) {
-                if (isVariableExpression(part) || isDottedGetExpression(part)) {
-                    processedNames.push(part?.name?.text?.toLowerCase());
-                } else {
-                    return { value: value, isCircular: false }; // Can't resolve further
-                }
-            }
-
-            const entityName = processedNames.join('.');
-
-            // Prevent infinite recursion
-            if (visited.has(entityName)) {
-                return { value: value, isCircular: true };
-            }
-            visited.add(entityName);
-
-            // Try to resolve as const first
-            const constStatement = scope?.getConstFileLink(entityName, containingNamespace)?.item;
-            if (constStatement) {
-                // Recursively resolve the const value
-                return this.resolveConstValue(constStatement.value, scope, containingNamespace, visited);
-            }
-
-            // Try to resolve as enum member
-            const enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
-            if (enumInfo?.value) {
-                // Enum values are already resolved to literals by getEnumInfo
-                return { value: enumInfo.value, isCircular: false };
-            }
-        }
-
-        // Return the value as-is if we can't resolve it further
-        return { value: value, isCircular: false };
-    }
-
-    private processExpression(ternaryExpression: Expression, scope: Scope | undefined) {
-        let containingNamespace = this.event.file.getNamespaceStatementForPosition(ternaryExpression.range.start)?.getName(ParseMode.BrighterScript);
-        this.processExpressionInNamespace(ternaryExpression, scope, containingNamespace, new Set<ConstStatement>());
-    }
-
-    private processExpressionInNamespace(expression: Expression, scope: Scope | undefined, containingNamespace: string | undefined, visitedConsts: Set<ConstStatement>) {
-        const parts = util.splitExpression(expression);
-
-        const processedNames: string[] = [];
-        for (let part of parts) {
-            let entityName: string;
-            if (isVariableExpression(part) || isDottedGetExpression(part)) {
-                processedNames.push(part?.name?.text?.toLocaleLowerCase());
-                entityName = processedNames.join('.');
-            } else {
-                return;
-            }
-
-            let value: Expression;
-            let isCircular = false;
-
-            //did we find a const? transpile the value
-            let constStatement = scope?.getConstFileLink(entityName, containingNamespace)?.item;
-            if (constStatement) {
-                // Recursively resolve the const value to its final form
-                const resolved = this.resolveConstValue(constStatement.value, scope, containingNamespace);
-                value = resolved.value;
-                isCircular = resolved.isCircular;
-            } else {
-                //did we find an enum member? transpile that
-                let enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
-                if (enumInfo?.value) {
-                    value = enumInfo.value;
-                }
-            }
-
-            if (value && !isCircular) {
-                //If the const's value is a complex expression (e.g. an aa literal containing
-                //enum refs), recursively process inner refs so they're inlined too. Without
-                //this step, cross-file const usage leaves nested enum/const refs unresolved
-                //because the consumer file's pre-transpile pass never visits the inlined
-                //value's children (they live in the const's defining file).
-                if (constStatement && !isLiteralExpression(value)) {
-                    //if we're already inlining this const upstream, skip both the recursive
-                    //walk AND the transpile override. Setting the override here would still
-                    //create a transpile-time cycle (the value contains a ref back to a const
-                    //that has been overridden to re-inline this same value).
-                    if (visitedConsts.has(constStatement)) {
-                        return;
-                    }
-                    this.processInlinedConstValue(value, scope, constStatement, visitedConsts);
-                }
-
-                //override the transpile for this item.
-                this.event.editor.setProperty(part, 'transpile', (state) => {
-                    if (isLiteralExpression(value)) {
-                        return value.transpile(state);
-                    } else {
-                        //wrap non-literals with parens to prevent on-device compile errors
-                        return ['(', ...value.transpile(state), ')'];
-                    }
-                });
-                //we are finished handling this expression
-                return;
-            }
-        }
-    }
-
-    private processInlinedConstValue(value: Expression, scope: Scope | undefined, constStatement: ConstStatement, visitedConsts: Set<ConstStatement>) {
-        //skip if we've already walked this const's value during the current outer
-        //inline. This guards against unbounded recursion when consts have circular
-        //aggregate references (const A = { x: B }; const B = { y: A }) and avoids
-        //redundant work for diamond reference graphs.
-        if (visitedConsts.has(constStatement)) {
-            return;
-        }
-        visitedConsts.add(constStatement);
-        const innerNamespace = constStatement.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript);
-        value.walk(createVisitor({
-            VariableExpression: (varExpr) => {
-                if (isDottedGetExpression(varExpr.parent)) {
-                    return;
-                }
-                this.processExpressionInNamespace(varExpr, scope, innerNamespace, visitedConsts);
-            },
-            DottedGetExpression: (dottedExpr) => {
-                if (isDottedGetExpression(dottedExpr.parent)) {
-                    return;
-                }
-                this.processExpressionInNamespace(dottedExpr, scope, innerNamespace, visitedConsts);
-            }
-        }), { walkMode: WalkMode.visitExpressionsRecursive });
-    }
-}
diff --git a/src/bscPlugin/transpile/BrsFileTranspileProcessor.spec.ts b/src/bscPlugin/transpile/BrsFileTranspileProcessor.spec.ts
new file mode 100644
index 000000000..cd1ef9f0a
--- /dev/null
+++ b/src/bscPlugin/transpile/BrsFileTranspileProcessor.spec.ts
@@ -0,0 +1,92 @@
+import { createSandbox } from 'sinon';
+import * as fsExtra from 'fs-extra';
+import { Program } from '../../Program';
+import { standardizePath as s } from '../../util';
+import { tempDir, rootDir } from '../../testHelpers.spec';
+import { expect } from 'chai';
+import { Parser } from '../../parser/Parser';
+import { isFunctionStatement } from '../../astUtils/reflection';
+import type { FunctionStatement } from '../../parser/Statement';
+const sinon = createSandbox();
+
+describe('BrsFileTranspileProcessor', () => {
+
+    let program: Program;
+
+    beforeEach(() => {
+        fsExtra.emptyDirSync(tempDir);
+        program = new Program({ rootDir: rootDir, sourceMap: true });
+    });
+    afterEach(() => {
+        sinon.restore();
+        program.dispose();
+    });
+
+    it('does not crash when operating on a file not included by any scope', async () => {
+        program.setFile('components/lib.brs', `
+            sub doSomething()
+                a = { b: "c"}
+                print a.b
+            end sub
+        `);
+        await program.build({ outDir: s`${tempDir}/out` });
+    });
+
+    it('properly prefixes functions from bslib', async () => {
+        program.options.outDir = s`${tempDir}/staging`;
+        program.setFile('source/main.bs', `
+            sub main()
+                print true ? true : false
+            end sub
+        `);
+        program.validate();
+        await program.build();
+        expect(
+            fsExtra.readFileSync(`${program.options.outDir}/source/bslib.brs`).toString()
+        ).to.include('bslib_toString');
+    });
+
+    it('properly prefixes functions from bslib when found in roku_modules as `bslib`', async () => {
+        program.options.outDir = s`${tempDir}/staging`;
+        program.setFile('source/main.bs', `
+            sub main()
+                print true ? true : false
+            end sub
+        `);
+        program.setFile('source/roku_modules/bslib/bslib.brs', `
+            function bslib_toString()
+            end function
+        `);
+        program.validate();
+        await program.build();
+
+        const parser = Parser.parse(
+            fsExtra.readFileSync(s`${program.options.outDir}/source/roku_modules/bslib/bslib.brs`).toString()
+        );
+        expect(
+            parser.ast.findChildren<FunctionStatement>(isFunctionStatement).map(x => x.tokens.name.text)
+        ).to.include('bslib_toString');
+    });
+
+    it('properly prefixes functions from bslib when found in roku_modules as `rokucommunity_bslib`', async () => {
+        program.options.outDir = s`${tempDir}/staging`;
+        program.setFile('source/main.bs', `
+            sub main()
+                print true ? true : false
+            end sub
+        `);
+        program.setFile('source/roku_modules/rokucommunity_bslib/bslib.brs', `
+            function rokucommunity_bslib_toString()
+            end function
+        `);
+        program.validate();
+        await program.build();
+
+        const parser = Parser.parse(
+            fsExtra.readFileSync(s`${program.options.outDir}/source/roku_modules/rokucommunity_bslib/bslib.brs`).toString()
+        );
+        expect(
+            parser.ast.findChildren<FunctionStatement>(isFunctionStatement).map(x => x.tokens.name.text)
+        ).to.include('rokucommunity_bslib_toString');
+    });
+});
diff --git a/src/bscPlugin/transpile/BrsFileTranspileProcessor.ts b/src/bscPlugin/transpile/BrsFileTranspileProcessor.ts
new file mode 100644
index 000000000..3fa92812d
--- /dev/null
+++ b/src/bscPlugin/transpile/BrsFileTranspileProcessor.ts
@@ -0,0 +1,543 @@
+import { createAssignmentStatement, createBlock, createDottedSetStatement, createIfStatement, createIndexedSetStatement, createToken } from '../../astUtils/creators';
+import type { Editor } from '../../astUtils/Editor';
+import { isDottedGetExpression, isLiteralExpression, isVariableExpression, isUnaryExpression, isAliasStatement, isCallExpression, isCallfuncExpression, isEnumType, isAssignmentStatement, isBlock, isBody, isDottedSetStatement, isGroupingExpression, isIndexedSetStatement, isAugmentedAssignmentStatement, isNamespaceStatement } from '../../astUtils/reflection';
+import { createVisitor, WalkMode } from '../../astUtils/visitors';
+import type { BrsFile } from '../../files/BrsFile';
+import type { ExtraSymbolData, OnPrepareFileEvent } from '../../interfaces';
+import { TokenKind } from '../../lexer/TokenKind';
+import type { Expression, Statement } from '../../parser/AstNode';
+import type { TernaryExpression } from '../../parser/Expression';
+import { LiteralExpression, VariableExpression } from '../../parser/Expression';
+import { ParseMode } from '../../parser/Parser';
+import type { ConstStatement, NamespaceStatement } from '../../parser/Statement';
+import { AugmentedAssignmentStatement, type AliasStatement, type IfStatement } from '../../parser/Statement';
+import type { Scope } from '../../Scope';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import util from '../../util';
+import { BslibManager } from '../serialize/BslibManager';
+
+export class BrsFilePreTranspileProcessor {
+    public constructor(
+        private event: OnPrepareFileEvent<BrsFile>
+    ) {
+    }
+
+    public process() {
+        this.iterateExpressions();
+        //apply prefixes to bslib
+        if (BslibManager.isBslibPkgPath(this.event.file.pkgPath)) {
+            this.applyBslibPrefixesIfMissing(this.event.file, this.event.editor);
+        }
+    }
+
+    public applyBslibPrefixesIfMissing(file: BrsFile, editor: Editor) {
+        file.ast.walk(createVisitor({
+            FunctionStatement: (statement) => {
+                BslibManager.applyPrefixIfMissing(statement, editor, this.event.program.bslibPrefix);
+            }
+        }), {
+            walkMode: WalkMode.visitAllRecursive
+        });
+    }
+
+    private iterateExpressions() {
+        const scope = this.event.program.getFirstScopeForFile(this.event.file);
+        //TODO move away from this loop and use a visitor instead
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        for (let expression of this.event.file['_cachedLookups'].expressions) {
+            if (expression) {
+                if (isUnaryExpression(expression)) {
+                    this.processExpression(expression.right, scope);
+                } else {
+                    this.processExpression(expression, scope);
+                }
+            }
+        }
+        const walkMode = WalkMode.visitExpressionsRecursive;
+        const visitor = createVisitor({
+            TernaryExpression: (ternaryExpression) => {
+                this.processTernaryExpression(ternaryExpression, visitor, walkMode);
+            }
+        });
+        this.event.file.ast.walk(visitor, { walkMode: walkMode });
+    }
+
+
+    private processTernaryExpression(ternaryExpression: TernaryExpression, visitor: ReturnType<typeof createVisitor>, walkMode: WalkMode) {
+        function getOwnerAndKey(statement: Statement) {
+            const parent = statement.parent;
+            if (isBlock(parent) || isBody(parent)) {
+                let idx = parent.statements.indexOf(statement);
+                if (idx > -1) {
+                    return { owner: parent.statements, key: idx };
+                }
+            }
+        }
+
+        //if the ternary expression is part of a simple assignment, rewrite it as an `IfStatement`
+        let parent = ternaryExpression.findAncestor(x => !isGroupingExpression(x));
+        let ifStatement: IfStatement;
+
+        if (isAssignmentStatement(parent)) {
+            ifStatement = createIfStatement({
+                if: createToken(TokenKind.If, 'if', ternaryExpression.tokens.questionMark.location),
+                condition: ternaryExpression.test,
+                then: createToken(TokenKind.Then, 'then', ternaryExpression.tokens.questionMark.location),
+                thenBranch: createBlock({
+                    statements: [
+                        createAssignmentStatement({
+                            name: parent.tokens.name,
+                            equals: parent.tokens.equals,
+                            value: ternaryExpression.consequent
+                        })
+                    ]
+                }),
+                else: createToken(TokenKind.Else, 'else', ternaryExpression.tokens.questionMark.location),
+                elseBranch: createBlock({
+                    statements: [
+                        createAssignmentStatement({
+                            name: util.cloneToken(parent.tokens.name),
+                            equals: util.cloneToken(parent.tokens.equals),
+                            value: ternaryExpression.alternate
+                        })
+                    ]
+                }),
+                endIf: createToken(TokenKind.EndIf, 'end if', ternaryExpression.tokens.questionMark.location)
+            });
+        } else if (isDottedSetStatement(parent)) {
+            ifStatement = createIfStatement({
+                if: createToken(TokenKind.If, 'if', ternaryExpression.tokens.questionMark.location),
+                condition: ternaryExpression.test,
+                then: createToken(TokenKind.Then, 'then', ternaryExpression.tokens.questionMark.location),
+                thenBranch: createBlock({
+                    statements: [
+                        createDottedSetStatement({
+                            obj: parent.obj,
+                            name: parent.tokens.name,
+                            equals: parent.tokens.equals,
+                            value: ternaryExpression.consequent
+                        })
+                    ]
+                }),
+                else: createToken(TokenKind.Else, 'else', ternaryExpression.tokens.questionMark.location),
+                elseBranch: createBlock({
+                    statements: [
+                        createDottedSetStatement({
+                            obj: parent.obj.clone(),
+                            name: util.cloneToken(parent.tokens.name),
+                            equals: util.cloneToken(parent.tokens.equals),
+                            value: ternaryExpression.alternate
+                        })
+                    ]
+                }),
+                endIf: createToken(TokenKind.EndIf, 'end if', ternaryExpression.tokens.questionMark.location)
+            });
+
+            //if this is an indexedSetStatement, and the ternary expression is NOT an index
+        } else if (isIndexedSetStatement(parent) && !parent.indexes?.includes(ternaryExpression)) {
+            ifStatement = createIfStatement({
+                if: createToken(TokenKind.If, 'if', ternaryExpression.tokens.questionMark.location),
+                condition: ternaryExpression.test,
+                then: createToken(TokenKind.Then, 'then', ternaryExpression.tokens.questionMark.location),
+                thenBranch: createBlock({
+                    statements: [
+                        createIndexedSetStatement({
+                            obj: parent.obj,
+                            openingSquare: parent.tokens.openingSquare,
+                            indexes: parent.indexes,
+                            closingSquare: parent.tokens.closingSquare,
+                            equals: parent.tokens.equals,
+                            value: ternaryExpression.consequent
+                        })
+                    ]
+                }),
+                else: createToken(TokenKind.Else, 'else', ternaryExpression.tokens.questionMark.location),
+                elseBranch: createBlock({
+                    statements: [
+                        createIndexedSetStatement({
+                            obj: parent.obj,
+                            openingSquare: util.cloneToken(parent.tokens.openingSquare),
+                            indexes: parent.indexes?.map(x => x.clone()),
+                            closingSquare: util.cloneToken(parent.tokens.closingSquare),
+                            equals: util.cloneToken(parent.tokens.equals),
+                            value: ternaryExpression.alternate
+                        })
+                    ]
+                }),
+                endIf: createToken(TokenKind.EndIf, 'end if', ternaryExpression.tokens.questionMark.location)
+            });
+        } else if (isAugmentedAssignmentStatement(parent)) {
+            ifStatement = createIfStatement({
+                if: createToken(TokenKind.If, 'if', ternaryExpression.tokens.questionMark.location),
+                condition: ternaryExpression.test,
+                then: createToken(TokenKind.Then, 'then', ternaryExpression.tokens.questionMark.location),
+                thenBranch: createBlock({
+                    statements: [
+                        new AugmentedAssignmentStatement({
+                            item: parent.item,
+                            operator: parent.tokens.operator,
+                            value: ternaryExpression.consequent
+                        })
+                    ]
+                }),
+                else: createToken(TokenKind.Else, 'else', ternaryExpression.tokens.questionMark.location),
+                elseBranch: createBlock({
+                    statements: [
+                        new AugmentedAssignmentStatement({
+                            item: parent.item.clone(),
+                            operator: parent.tokens.operator,
+                            value: ternaryExpression.alternate
+                        })
+                    ]
+                }),
+                endIf: createToken(TokenKind.EndIf, 'end if', ternaryExpression.tokens.questionMark.location)
+            });
+        }
+
+        if (ifStatement) {
+            let { owner, key } = getOwnerAndKey(parent as Statement) ?? {};
+            if (owner && key !== undefined) {
+                this.event.editor.setProperty(owner, key, ifStatement);
+            }
+            //we've injected an ifStatement, so now we need to trigger a walk to handle any nested ternary expressions
+            ifStatement.walk(visitor, { walkMode: walkMode });
+        }
+    }
+
+    /**
+     * Given a string optionally separated by dots, find an enum related to it.
+     * For example, all of these would return the enum: `SomeNamespace.SomeEnum.SomeMember`, SomeEnum.SomeMember, `SomeEnum`
+     */
+    private getEnumInfo(name: string, containingNamespace: string, scope: Scope) {
+        //look for the enum directly
+        let result = scope?.getEnumFileLink(name, containingNamespace);
+
+        if (result) {
+            return {
+                enum: result.item
+            };
+        }
+        //assume we've been given the enum.member syntax, so pop the member and try again
+        const parts = name.toLowerCase().split('.');
+        const memberName = parts.pop();
+
+        result = scope?.getEnumFileLink(parts.join('.'), containingNamespace);
+        if (result) {
+            const value = result.item.getMemberValue(memberName);
+            return {
+                enum: result.item,
+                value: new LiteralExpression({
+                    value: createToken(
+                        //just use float literal for now...it will transpile properly with any literal value
+                        value?.startsWith('"') ? TokenKind.StringLiteral : TokenKind.FloatLiteral,
+                        value
+                    )
+                })
+            };
+        }
+    }
+
+    /**
+     * Given a string optionally separated by dots, find an namespace Member related to it.
+     */
+    private getNamespaceInfo(name: string, scope: Scope) {
+        //look for the namespace directly
+        let result = scope?.getNamespace(name);
+
+        if (result) {
+            return {
+                namespace: result
+            };
+        }
+        //assume we've been given the namespace.member syntax, so pop the member and try again
+        const parts = name.toLowerCase().split('.');
+        const memberName = parts.pop();
+
+        result = scope?.getNamespace(parts.join('.'));
+        if (result) {
+            const memberType = result.symbolTable?.getSymbolType(memberName, { flags: SymbolTypeFlag.runtime });
+            if (memberType && !isEnumType(memberType)) {
+                return {
+                    namespace: result,
+                    value: new VariableExpression({
+                        name: createToken(TokenKind.Identifier, parts.join('_') + '_' + memberName)
+                    })
+                };
+            }
+        }
+    }
+
+    /**
+     * Recursively resolve a const or enum value until we get to the final resolved expression
+     * Returns an object with the resolved value and a flag indicating if a circular reference was detected
+     */
+    private resolveConstValue(value: Expression, scope: Scope | undefined, containingNamespace: string | undefined, visited = new Set<string>()): { value: Expression; isCircular: boolean } {
+        // If it's already a literal, return it as-is
+        if (isLiteralExpression(value)) {
+            return { value: value, isCircular: false };
+        }
+
+        // If it's a variable expression, try to resolve it as a const or enum
+        if (isVariableExpression(value)) {
+            const entityName = value.tokens.name.text.toLowerCase();
+
+            // Prevent infinite recursion by tracking visited constants
+            if (visited.has(entityName)) {
+                return { value: value, isCircular: true }; // Return the original value to avoid infinite loop
+            }
+            visited.add(entityName);
+
+            // Try to resolve as const first
+            const constStatement = scope?.getConstFileLink(entityName, containingNamespace)?.item;
+            if (constStatement) {
+                // Recursively resolve the const value
+                return this.resolveConstValue(constStatement.value, scope, containingNamespace, visited);
+            }
+
+            // Try to resolve as enum member
+            const enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
+            if (enumInfo?.value) {
+                // Enum values are already resolved to literals by getEnumInfo
+                return { value: enumInfo.value, isCircular: false };
+            }
+        }
+
+        // If it's a dotted get expression (e.g., namespace.const or namespace.enum.member), try to resolve it
+        if (isDottedGetExpression(value)) {
+            const parts = util.splitExpression(value);
+            const processedNames: string[] = [];
+
+            for (let part of parts) {
+                if (isVariableExpression(part) || isDottedGetExpression(part)) {
+                    processedNames.push(part?.tokens.name?.text?.toLowerCase());
+                } else {
+                    return { value: value, isCircular: false }; // Can't resolve further
+                }
+            }
+
+            const entityName = processedNames.join('.');
+
+            // Prevent infinite recursion
+            if (visited.has(entityName)) {
+                return { value: value, isCircular: true };
+            }
+            visited.add(entityName);
+
+            // Try to resolve as const first
+            const constStatement = scope?.getConstFileLink(entityName, containingNamespace)?.item;
+            if (constStatement) {
+                // Recursively resolve the const value
+                return this.resolveConstValue(constStatement.value, scope, containingNamespace, visited);
+            }
+
+            // Try to resolve as enum member
+            const enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
+            if (enumInfo?.value) {
+                // Enum values are already resolved to literals by getEnumInfo
+                return { value: enumInfo.value, isCircular: false };
+            }
+        }
+
+        // Return the value as-is if we can't resolve it further
+        return { value: value, isCircular: false };
+    }
+
+    private processExpression(expression: Expression, scope: Scope | undefined, visitedConsts: Set<ConstStatement> = new Set()) {
+        if (expression.findAncestor(isAliasStatement)) {
+            // skip any changes in an Alias Statement
+            return;
+        }
+        let containingNamespaceStmt = this.event.file.getNamespaceStatementForPosition(expression.location?.range.start);
+        let containingNamespace = containingNamespaceStmt?.getName(ParseMode.BrighterScript);
+
+        const parts = util.splitExpression(expression);
+        const processedNames: string[] = [];
+        let isAlias = false;
+        let isCall = isCallExpression(expression) || isCallfuncExpression(expression);
+        for (let part of parts) {
+            let entityName: string;
+
+            let firstPart = part === parts[0];
+            let actualNameExpression = firstPart ? this.replaceAlias(part) : part;
+            let currentPartIsAlias = actualNameExpression !== part;
+            isAlias = isAlias || currentPartIsAlias;
+
+            if (currentPartIsAlias) {
+                entityName = util.getAllDottedGetPartsAsString(actualNameExpression);
+                processedNames.push(entityName);
+                containingNamespace = '';
+            } else if (isVariableExpression(part) || isDottedGetExpression(part)) {
+                processedNames.push(part?.tokens.name?.text?.toLowerCase());
+                entityName = processedNames.join('.');
+            } else {
+                return;
+            }
+
+            if (!currentPartIsAlias && firstPart && util.isVariableShadowingSomething(entityName, part)) {
+                // this expression starts with a variable that has been redefined, so skip it
+                return;
+            }
+
+            let value: Expression;
+            let isCircular = false;
+
+            let constStatement = scope?.getConstFileLink(entityName, containingNamespace)?.item;
+            let enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
+            let namespaceInfo = isAlias && this.getNamespaceInfo(entityName, scope);
+            if (constStatement) {
+                // Recursively resolve the const value to its final form
+                const resolved = this.resolveConstValue(constStatement.value, scope, containingNamespace);
+                value = resolved.value;
+                isCircular = resolved.isCircular;
+            } else if (enumInfo?.value) {
+                //did we find an enum member? transpile that
+                value = enumInfo.value;
+
+            } else if (namespaceInfo?.value) {
+                // use the transpiled namespace member
+                value = namespaceInfo.value;
+
+            } else if (currentPartIsAlias && !(enumInfo || namespaceInfo)) {
+                // this was an aliased expression that is NOT am enum  or namespace
+                value = actualNameExpression;
+            }
+
+            if (value && !isCircular) {
+                //If the const's value is a complex expression (e.g. an aa literal containing
+                //enum refs), recursively process inner refs so they're inlined too. Without
+                //this step, cross-file const usage leaves nested enum/const refs unresolved
+                //because the consumer file's pre-transpile pass never visits the inlined
+                //value's children (they live in the const's defining file).
+                if (constStatement && !isLiteralExpression(value)) {
+                    if (visitedConsts.has(constStatement)) {
+                        return;
+                    }
+                    this.processInlinedConstValue(value, scope, constStatement, visitedConsts);
+                }
+
+                //override the transpile for this item.
+                this.event.editor.setProperty(part, 'transpile', (state) => {
+
+                    if (isLiteralExpression(value) || isCall) {
+                        return value.transpile(state);
+                    } else {
+                        //wrap non-literals with parens to prevent on-device compile errors
+                        return ['(', ...value.transpile(state), ')'];
+                    }
+                });
+                //we are finished handling this expression
+                return;
+            }
+        }
+    }
+
+    private processInlinedConstValue(value: Expression, scope: Scope | undefined, constStatement: ConstStatement, visitedConsts: Set<ConstStatement>) {
+        //skip if we've already walked this const's value during the current outer
+        //inline. Guards against unbounded recursion for circular aggregate references
+        //(const A = { x: B }; const B = { y: A }) and avoids redundant work for
+        //diamond reference graphs.
+        if (visitedConsts.has(constStatement)) {
+            return;
+        }
+        visitedConsts.add(constStatement);
+        const innerNamespace = constStatement.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript);
+        value.walk(createVisitor({
+            VariableExpression: (varExpr) => {
+                if (isDottedGetExpression(varExpr.parent)) {
+                    return;
+                }
+                this.processExpressionForInlinedValue(varExpr, scope, innerNamespace, visitedConsts);
+            },
+            DottedGetExpression: (dottedExpr) => {
+                if (isDottedGetExpression(dottedExpr.parent)) {
+                    return;
+                }
+                this.processExpressionForInlinedValue(dottedExpr, scope, innerNamespace, visitedConsts);
+            }
+        }), { walkMode: WalkMode.visitExpressionsRecursive });
+    }
+
+    /**
+     * Mirrors processExpression but treats `containingNamespace` as the namespace of the
+     * const that produced this inlined value (not the consumer file's namespace), since
+     * the expression we're rewriting was authored in the const's file.
+     */
+    private processExpressionForInlinedValue(expression: Expression, scope: Scope | undefined, containingNamespace: string | undefined, visitedConsts: Set<ConstStatement>) {
+        const parts = util.splitExpression(expression);
+        const processedNames: string[] = [];
+        for (let part of parts) {
+            let entityName: string;
+            if (isVariableExpression(part) || isDottedGetExpression(part)) {
+                processedNames.push(part?.tokens.name?.text?.toLowerCase());
+                entityName = processedNames.join('.');
+            } else {
+                return;
+            }
+
+            let value: Expression;
+            let isCircular = false;
+            const constStatement = scope?.getConstFileLink(entityName, containingNamespace)?.item;
+            if (constStatement) {
+                const resolved = this.resolveConstValue(constStatement.value, scope, containingNamespace);
+                value = resolved.value;
+                isCircular = resolved.isCircular;
+            } else {
+                const enumInfo = this.getEnumInfo(entityName, containingNamespace, scope);
+                if (enumInfo?.value) {
+                    value = enumInfo.value;
+                }
+            }
+
+            if (value && !isCircular) {
+                if (constStatement && !isLiteralExpression(value)) {
+                    if (visitedConsts.has(constStatement)) {
+                        return;
+                    }
+                    this.processInlinedConstValue(value, scope, constStatement, visitedConsts);
+                }
+                this.event.editor.setProperty(part, 'transpile', (state) => {
+                    if (isLiteralExpression(value)) {
+                        return value.transpile(state);
+                    }
+                    return ['(', ...value.transpile(state), ')'];
+                });
+                return;
+            }
+        }
+    }
+
+
+    private replaceAlias(expression: Expression) {
+        let alias: AliasStatement;
+        let potentiallyAliased = expression;
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        const fileAliasStatements = this.event.file['_cachedLookups'].aliasStatements;
+
+        if (fileAliasStatements.length === 0) {
+            return expression;
+        }
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        let potentialAliasedTextsLower = fileAliasStatements.map(stmt => stmt.tokens.name.text.toLowerCase());
+
+        if (isVariableExpression(potentiallyAliased) && potentialAliasedTextsLower.includes(potentiallyAliased.getName().toLowerCase())) {
+            //check if it is an alias
+            let data = {} as ExtraSymbolData;
+
+            potentiallyAliased.getSymbolTable().getSymbolType(potentiallyAliased.getName(), {
+                data: data,
+                // eslint-disable-next-line no-bitwise
+                flags: SymbolTypeFlag.runtime | SymbolTypeFlag.typetime
+            });
+
+            if (data.isAlias && isAliasStatement(data.definingNode)) {
+                alias = data.definingNode;
+
+            }
+        }
+
+        if (alias && isVariableExpression(potentiallyAliased)) {
+            return alias.value;
+        }
+        return expression;
+    }
+}
diff --git a/src/bscPlugin/transpile/XmlFilePreTranspileProcessor.ts b/src/bscPlugin/transpile/XmlFilePreTranspileProcessor.ts
new file mode 100644
index 000000000..5fcd735ab
--- /dev/null
+++ b/src/bscPlugin/transpile/XmlFilePreTranspileProcessor.ts
@@ -0,0 +1,115 @@
+import { createSGScript } from '../../astUtils/creators';
+import { isXmlFile } from '../../astUtils/reflection';
+import { isSGScript } from '../../astUtils/xml';
+import type { XmlFile } from '../../files/XmlFile';
+import type { AfterPrepareFileEvent } from '../../interfaces';
+import type { SGScript } from '../../parser/SGTypes';
+import util from '../../util';
+
+export class XmlFilePreTranspileProcessor {
+    public constructor(
+        private event: AfterPrepareFileEvent<XmlFile>
+    ) {
+    }
+
+    public process() {
+        if (!isXmlFile(this.event.file)) {
+            return;
+        }
+
+        //insert any missing script imports
+        this.injectScriptImports();
+
+        //transform any brighterscript `type` attributes to `brightscript`
+        for (const script of this.event.file.ast?.componentElement?.scriptElements ?? []) {
+            const type = script.getAttribute('type');
+            if (/text\/brighterscript/i.test(type?.value)) {
+                this.event.editor.setProperty(
+                    type,
+                    'value',
+                    type.value.replace(/text\/brighterscript/i, 'text/brightscript')
+                );
+            }
+
+            //replace `.bs` extensions with `.brs`
+            const uri = script.getAttribute('uri');
+            if (/\.bs/i.test(uri?.value)) {
+                this.event.editor.setProperty(
+                    uri,
+                    'value',
+                    uri.value.replace(/\.bs/i, '.brs')
+                );
+            }
+        }
+    }
+
+    /**
+     * Inject any missing scripts into the xml file
+     */
+    private injectScriptImports() {
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        const extraImportScripts = this.event.file['getMissingImportsForTranspile']().map(uri => {
+            return createSGScript({
+                type: 'text/brightscript',
+                uri: util.sanitizePkgPath(uri.replace(/\.bs$/, '.brs'))
+            });
+        });
+
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        const [, publishableScripts] = this.checkScriptsForPublishableImports([
+            ...this.event.file.ast.componentElement?.scriptElements ?? [],
+            ...extraImportScripts
+        ]);
+
+        //force bslib to be the last script in the list
+        const idx = publishableScripts.findIndex(x => x.uri?.endsWith('bslib.brs'));
+        if (idx > -1) {
+            const [bslib] = publishableScripts.splice(idx, 1);
+            publishableScripts.push(bslib);
+        }
+
+        const elements = this.event.file.ast.componentElement.elements;
+        //remove any unreferenced scripts
+        let set = new Set(publishableScripts);
+        for (let i = elements.length - 1; i >= 0; i--) {
+            const element = elements[i];
+            if (isSGScript(element)) {
+                if (set.has(element as SGScript)) {
+                    set.delete(element as SGScript);
+                } else {
+                    this.event.editor.arraySplice(elements, i, 1);
+                }
+            }
+        }
+
+        //add new scripts after the LAST `<script>` tag that was created explicitly by the user, or at the top of the component if it has no scripts
+        let lastScriptIndex = util.findLastIndex(this.event.file.ast.componentElement.elements, x => x.tokens.startTagName.text.toLowerCase() === 'script');
+        lastScriptIndex = lastScriptIndex >= 0
+            ? lastScriptIndex + 1
+            : 0;
+        for (const element of set) {
+            this.event.editor.arraySplice(elements, lastScriptIndex++, 0, element);
+        }
+    }
+
+    private checkScriptsForPublishableImports(scripts: SGScript[]): [boolean, SGScript[]] {
+        const { program } = this.event;
+        if (!program.options.pruneEmptyCodeFiles) {
+            return [false, scripts];
+        }
+        const publishableScripts = scripts.filter(script => {
+            const uriAttributeValue = script.uri || '';
+            const pkgMapPath = util.getPkgPathFromTarget(this.event.file.pkgPath, uriAttributeValue);
+            let file = program.getFile(pkgMapPath);
+            if (!file && pkgMapPath.endsWith(program.bslibPkgPath)) {
+                return true;
+            }
+            if (!file && pkgMapPath.endsWith('.brs')) {
+                file = program.getFile(pkgMapPath.replace(/\.brs$/, '.bs'));
+            }
+            return !(file?.canBePruned);
+        });
+        return [publishableScripts.length !== scripts.length, publishableScripts];
+    }
+
+}
diff --git a/src/bscPlugin/validation/BrsFileAfterValidator.ts b/src/bscPlugin/validation/BrsFileAfterValidator.ts
new file mode 100644
index 000000000..1ee236ab2
--- /dev/null
+++ b/src/bscPlugin/validation/BrsFileAfterValidator.ts
@@ -0,0 +1,21 @@
+import { isBrsFile } from '../../astUtils/reflection';
+
+import type { BrsFile } from '../../files/BrsFile';
+import type { AfterValidateFileEvent } from '../../interfaces';
+
+
+export class BrsFileAfterValidator {
+    constructor(
+        public event: AfterValidateFileEvent<BrsFile>
+    ) {
+    }
+
+    public process() {
+        if (isBrsFile(this.event.file)) {
+            const unlinkGlobalSymbolTable = this.event.file.parser.symbolTable.pushParentProvider(() => this.event.program.globalScope.symbolTable);
+            this.event.file.processSymbolInformation();
+            unlinkGlobalSymbolTable();
+        }
+
+    }
+}
diff --git a/src/bscPlugin/validation/BrsFileValidator.spec.ts b/src/bscPlugin/validation/BrsFileValidator.spec.ts
index ceadd3adb..75ead0a50 100644
--- a/src/bscPlugin/validation/BrsFileValidator.spec.ts
+++ b/src/bscPlugin/validation/BrsFileValidator.spec.ts
@@ -1,17 +1,34 @@
 import { expect } from '../../chai-config.spec';
 import type { BrsFile } from '../../files/BrsFile';
-import type { AALiteralExpression, DottedGetExpression } from '../../parser/Expression';
-import type { ClassStatement, FunctionStatement, NamespaceStatement, PrintStatement } from '../../parser/Statement';
+import type { AALiteralExpression, DottedGetExpression, FunctionExpression } from '../../parser/Expression';
+import type { AssignmentStatement, ClassStatement, ForEachStatement, FunctionStatement, NamespaceStatement, PrintStatement } from '../../parser/Statement';
 import { DiagnosticMessages } from '../../DiagnosticMessages';
-import { expectDiagnostics, expectZeroDiagnostics } from '../../testHelpers.spec';
+import { expectDiagnostics, expectHasDiagnostics, expectTypeToBe, expectZeroDiagnostics, rootDir } from '../../testHelpers.spec';
 import { Program } from '../../Program';
-import { isClassStatement, isNamespaceStatement } from '../../astUtils/reflection';
-import util from '../../util';
+import { isAssignmentStatement, isClassStatement, isForEachStatement, isFunctionExpression, isFunctionParameterExpression, isFunctionStatement, isNamespaceStatement, isPrintStatement, isReturnStatement } from '../../astUtils/reflection';
+import { util, standardizePath as s } from '../../util';
+import { WalkMode, createVisitor } from '../../astUtils/visitors';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import { ClassType } from '../../types/ClassType';
+import { FloatType } from '../../types/FloatType';
+import { IntegerType } from '../../types/IntegerType';
+import { InterfaceType } from '../../types/InterfaceType';
+import { StringType } from '../../types/StringType';
+import { ArrayType } from '../../types/ArrayType';
+import { DynamicType } from '../../types/DynamicType';
+import { TypedFunctionType } from '../../types/TypedFunctionType';
+import { ParseMode } from '../../parser/Parser';
+import type { ExtraSymbolData } from '../../interfaces';
+import { AssociativeArrayType } from '../../types/AssociativeArrayType';
+import { EnumType } from '../../types';
+import { TypeStatementType } from '../../types/TypeStatementType';
 
 describe('BrsFileValidator', () => {
     let program: Program;
     beforeEach(() => {
-        program = new Program({});
+        program = new Program({
+            rootDir: rootDir
+        });
     });
 
     it('links dotted get expression parents', () => {
@@ -35,7 +52,7 @@ describe('BrsFileValidator', () => {
         expect(aaLiteral.parent).to.equal(beta);
     });
 
-    it('links NamespacedVariableNameExpression dotted get parents', () => {
+    it('links namespace name dotted get parents', () => {
         const { ast } = program.setFile<BrsFile>('source/main.bs', `
             namespace alpha.bravo
                 class Delta extends alpha.bravo.Charlie
@@ -118,10 +135,10 @@ describe('BrsFileValidator', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('class'),
-            range: util.createRange(2, 16, 2, 27)
+            location: { range: util.createRange(2, 16, 2, 27) }
         }, {
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('class'),
-            range: util.createRange(5, 20, 5, 30)
+            location: { range: util.createRange(5, 20, 5, 30) }
         }]);
     });
 
@@ -161,10 +178,10 @@ describe('BrsFileValidator', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('enum'),
-            range: util.createRange(2, 16, 2, 26)
+            location: { range: util.createRange(2, 16, 2, 26) }
         }, {
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('enum'),
-            range: util.createRange(6, 20, 6, 29)
+            location: { range: util.createRange(6, 20, 6, 29) }
         }]);
     });
 
@@ -199,10 +216,10 @@ describe('BrsFileValidator', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('function'),
-            range: util.createRange(2, 16, 2, 30)
+            location: { range: util.createRange(2, 16, 2, 30) }
         }, {
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('function'),
-            range: util.createRange(5, 20, 5, 33)
+            location: { range: util.createRange(5, 20, 5, 33) }
         }]);
     });
 
@@ -223,7 +240,7 @@ describe('BrsFileValidator', () => {
         expectZeroDiagnostics(program);
     });
 
-    it('flags classes in wrong locations', () => {
+    it('flags namespaces in wrong locations', () => {
         program.setFile('source/main.bs', `
             function test()
                 namespace Alpha
@@ -237,10 +254,10 @@ describe('BrsFileValidator', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('namespace'),
-            range: util.createRange(2, 16, 2, 31)
+            location: { range: util.createRange(2, 16, 2, 31) }
         }, {
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('namespace'),
-            range: util.createRange(5, 20, 5, 34)
+            location: { range: util.createRange(5, 20, 5, 34) }
         }]);
     });
 
@@ -280,10 +297,10 @@ describe('BrsFileValidator', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('interface'),
-            range: util.createRange(2, 16, 2, 31)
+            location: { range: util.createRange(2, 16, 2, 31) }
         }, {
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('interface'),
-            range: util.createRange(6, 20, 6, 34)
+            location: { range: util.createRange(6, 20, 6, 34) }
         }]);
     });
 
@@ -313,181 +330,1475 @@ describe('BrsFileValidator', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('const'),
-            range: util.createRange(2, 16, 2, 27)
+            location: { range: util.createRange(2, 16, 2, 27) }
         }, {
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('const'),
-            range: util.createRange(4, 20, 4, 30)
+            location: { range: util.createRange(4, 20, 4, 30) }
         }]);
     });
 
-    describe('function return values', () => {
+    describe('for each', () => {
+        it('handles getting default type of array of AAs with reference types', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                function test()
+                    settings = []
+                    screensData = [
+                        { id: "home", actions: [Actions.TrackUser1, Actions.Next], listMode: ListModes.Avatar },
+                        { id: "home", actions: [Actions.TrackUser1, Actions.Next], listMode: ListModes.Small },
+                        { id: "test", actions: [Actions.TrackUser2, Actions.Next], listMode: ListModes.Profile },
+                        { id: "autoplay", actions: [Actions.TrackUser2, Actions.Next], listMode: ListModes.Large }
+                    ]
 
-        it('catches sub with return value', () => {
-            program.setFile('source/main.brs', `
-                sub test()
-                    return true
+                    for each screenData in screensData
+                        if screenData.id = "test"
+                            settings.push(screenData)
+                        end if
+                    end for
+                    return settings
+                end function
+
+                enum Actions
+                    TrackUser1
+                    TrackUser2
+                    Next
+                end enum
+
+                enum ListModes
+                    Avatar
+                    Small
+                    Profile
+                    Large
+                end enum
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            const forStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+            const insideFor = forStmt.body.statements[0];
+            const screensDataType = insideFor.getSymbolTable().getSymbolType('screensData', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(screensDataType, ArrayType);
+            const screenDataType = insideFor.getSymbolTable().getSymbolType('screenData', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(screenDataType, AssociativeArrayType);
+        });
+
+        it('handles getting default type of array of reference types', () => {
+            const mainFile = program.setFile<BrsFile>('source/main.bs', `
+                function test()
+                    result = []
+                    actions = [Actions.TrackUser1, Actions.Next2]
+
+                    for each action in actions
+                        if action = Actions.Next2
+                            actions.push(action)
+                        end if
+                    end for
+                    return result
+                end function
+
+                enum Actions
+                    TrackUser1
+                    TrackUser2
+                    Next2
+                end enum
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+            const forStmt = mainFile.ast.findChild<ForEachStatement>(isForEachStatement);
+            const insideFor = forStmt.body.statements[0];
+            const actionsType = insideFor.getSymbolTable().getSymbolType('actions', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(actionsType, ArrayType);
+            const actionType = insideFor.getSymbolTable().getSymbolType('action', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(actionType, DynamicType);
+        });
+    });
+
+
+    describe('typecast statement', () => {
+        it('allows being at start of file', () => {
+            program.setFile('source/main.bs', `
+                typecast m as object
+
+                sub noop()
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
-                range: util.createRange(2, 20, 2, 31)
-            }]);
+            expectZeroDiagnostics(program);
         });
 
-        it('catches sub as void with return value', () => {
-            program.setFile('source/main.brs', `
-                sub test() as void
-                    return true
+        it('has diagnostic if more than one usage per block for the same variable', () => {
+            program.setFile('source/main.bs', `
+                typecast m as object
+                typecast m as integer
+
+                sub noop()
+                    typecast m as object
+                    typecast m as string
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
-                range: util.createRange(2, 20, 2, 31)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.unexpectedStatementLocation('typecast', 'at the top of the file or beginning of block or namespace').message,
+                DiagnosticMessages.unexpectedStatementLocation('typecast', 'at the top of the file or beginning of block or namespace').message
+            ]);
         });
 
-        it('catches function as void with return value', () => {
-            program.setFile('source/main.brs', `
-                function test() as void
-                    return true
-                end function
+        it('has diagnostic if typecasting variables other than m outside a block', () => {
+            program.setFile('source/main.bs', `
+                typecast alpha.beta.notM as object ' error
+                typecast alsoNotM as object ' error
+
+                const notM = "also not m"
+
+                sub noop(notM)
+                    typecast notM as object ' no error
+                end sub
+
+                sub foo()
+                    typecast M as object ' no error!
+                end sub
+
+                namespace alpha.beta
+                    const notM = "namespaced not m"
+                end namespace
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.voidFunctionMayNotReturnValue('function'),
-                range: util.createRange(2, 20, 2, 31)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.invalidTypecastStatementApplication('alpha.beta.notM', false).message,
+                DiagnosticMessages.invalidTypecastStatementApplication('alsoNotM', false).message
+            ]);
         });
 
-        it('catches sub as <type> without return value', () => {
-            program.setFile('source/main.brs', `
-                sub test() as integer
-                    return
+        it('has diagnostic if typecasting non-variables inside a block', () => {
+            program.setFile('source/main.bs', `
+                sub noop(notM)
+                    typecast alpha.beta.notM as object ' error
                 end sub
+
+                namespace alpha.beta
+                    const notM = "namespaced not m"
+                end namespace
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('sub'),
-                range: util.createRange(2, 20, 2, 26)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.invalidTypecastStatementApplication('alpha.beta.notM', true).message
+            ]);
         });
 
-        it('catches function without return value', () => {
-            program.setFile('source/main.brs', `
-                function test()
-                    return
-                end function
+        it('has diagnostic if not first in file', () => {
+            program.setFile('source/main.bs', `
+                sub noop()
+                end sub
+
+                typecast m as object
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
-                range: util.createRange(2, 20, 2, 26)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.unexpectedStatementLocation('typecast', 'at the top of the file or beginning of block or namespace').message
+            ]);
         });
 
-        it('catches function as <type> without return value', () => {
-            program.setFile('source/main.brs', `
-                function test() as integer
-                    return
-                end function
+        it('allows being at start of function ', () => {
+            program.setFile('source/main.bs', `
+                interface Thing
+                    value as integer
+                end interface
+
+                sub noop()
+                    typecast m as Thing
+                    print m.value
+                end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
-                range: util.createRange(2, 20, 2, 26)
-            }]);
+            expectZeroDiagnostics(program);
         });
 
-        it('catches anon sub with return value', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    test = sub()
-                        return true
-                    end sub
+        it('has diagnostic when not at start of block', () => {
+            program.setFile('source/main.bs', `
+                interface Thing
+                    value as integer
+                end interface
+
+                sub noop()
+                    print m.value
+                    typecast m as Thing
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
-                range: util.createRange(3, 24, 3, 35)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.unexpectedStatementLocation('typecast', 'at the top of the file or beginning of block or namespace').message
+            ]);
         });
 
-        it('catches sub as void with return value', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    test = sub() as void
-                        return true
+        it('sets the type of m', () => {
+            program.setFile('source/types.bs', `
+                interface Thing1
+                    value as integer
+                end interface
+
+                interface Thing2
+                    value as string
+                end interface
+
+                interface Thing3
+                    value as float
+                end interface
+            `);
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                import "types.bs"
+                typecast m as Thing1
+
+                sub func1()
+                    x = m.value
+                    print x
+                end sub
+
+                sub func2()
+                    typecast m as Thing2
+                    x = m.value
+                    print x
+                end sub
+
+                sub func3()
+                    aa = {
+                        innerFunc: sub()
+                            typecast m as Thing3
+                            x = m.value
+                            print x
+                        end sub
+                    }
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const assigns = [] as Array<AssignmentStatement>;
+
+            // find places in AST where "x" is assigned
+            file.ast.walk(createVisitor({
+                AssignmentStatement: (stmt) => {
+                    if (stmt.tokens.name.text.toLowerCase() === 'x') {
+                        assigns.push(stmt);
+                    }
+                }
+            }), { walkMode: WalkMode.visitAllRecursive });
+
+            // func1 - uses file level typecast
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+            expect(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }).toString()).to.eq('Thing1');
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), IntegerType);
+
+            // func2 - uses func level typecast
+            expectTypeToBe(assigns[1].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+            expect(assigns[1].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }).toString()).to.eq('Thing2');
+            expectTypeToBe(assigns[1].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), StringType);
+
+            // func3 - uses innerFunc level typecast
+            expectTypeToBe(assigns[2].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+            expect(assigns[2].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }).toString()).to.eq('Thing3');
+            expectTypeToBe(assigns[2].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), FloatType);
+        });
+
+        it('should allow classes to override m typecast', () => {
+            program.setFile('source/types.bs', `
+                interface Thing1
+                    value as integer
+                end interface
+            `);
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                import "types.bs"
+                typecast m as Thing1
+
+                class TestKlass
+                    value as string
+
+                    sub method1()
+                        x = m.value
+                        print x
+                    end sub
+
+                    sub method2()
+                        typecast m as Thing1
+                        x = m.value
+                        print x
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const assigns = [] as Array<AssignmentStatement>;
+
+            // find places in AST where "x" is assigned
+            file.ast.walk(createVisitor({
+                AssignmentStatement: (stmt) => {
+                    if (stmt.tokens.name.text.toLowerCase() === 'x') {
+                        assigns.push(stmt);
+                    }
+                }
+            }), { walkMode: WalkMode.visitAllRecursive });
+
+            // method1 - uses class 'm'
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), ClassType);
+            expect(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }).toString()).to.eq('TestKlass');
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), StringType);
+
+            // method2 - uses func level typecast
+            expectTypeToBe(assigns[1].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+            expect(assigns[1].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }).toString()).to.eq('Thing1');
+            expectTypeToBe(assigns[1].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), IntegerType);
+        });
+
+        it('has diagnostic when used in a class', () => {
+            program.setFile('source/main.bs', `
+                class TestKlass
+                    typecast m as object
+
+                    value as string
+
+                    sub method1()
+                        x = m.value
+                        print x
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectHasDiagnostics(program);
+        });
+
+        it('is allowed in namespace', () => {
+            program.setFile('source/types.bs', `
+                interface Thing1
+                    value as integer
+                end interface
+            `);
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                import "types.bs"
+
+                namespace Alpha.Beta
+                    typecast m as Thing1
+
+                    sub method1()
+                        x = m.value
+                        print x
                     end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            // find places in AST where "x" is assigned
+            const assigns = [] as Array<AssignmentStatement>;
+            file.ast.walk(createVisitor({
+                AssignmentStatement: (stmt) => {
+                    if (stmt.tokens.name.text.toLowerCase() === 'x') {
+                        assigns.push(stmt);
+                    }
+                }
+            }), { walkMode: WalkMode.visitAllRecursive });
+
+            // method1 - uses Thing1 'm'
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }), InterfaceType);
+            expect(assigns[0].getSymbolTable().getSymbolType('m', { flags: SymbolTypeFlag.runtime }).toString()).to.eq('Thing1');
+            expectTypeToBe(assigns[0].getSymbolTable().getSymbolType('x', { flags: SymbolTypeFlag.runtime }), IntegerType);
+        });
+
+        it('sets the the type of a variable in an if block', () => {
+            program.setFile('source/types.bs', `
+                function isInt(x as dynamic) as boolean
+                    return x <> invalid and GetInterface(x, "ifInt") <> invalid
+                end function
+            `);
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                import "types.bs"
+
+                sub addOne(input)
+                    if isInt(input)
+                        typecast input as integer
+                        inside =  input + 1
+                        print inside
+                    end if
+
+                    outside = input
+                    print outside
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
-                range: util.createRange(3, 24, 3, 35)
-            }]);
+            expectZeroDiagnostics(program);
+            const assigns = file.ast.findChildren(isAssignmentStatement);
+            // inside IF
+            const insideType = assigns[0].getSymbolTable().getSymbolType('inside', { flags: SymbolTypeFlag.runtime });
+            const inputType = assigns[0].getSymbolTable().getSymbolType('input', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(inputType, IntegerType);
+            expectTypeToBe(insideType, IntegerType);
+
+            // outside IF - should not be affected by typecast
+            const outsideType = assigns[1].getSymbolTable().getSymbolType('outside', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe(outsideType, DynamicType);
         });
 
-        it('catches function as void with return value', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    test = function() as void
-                        return true
-                    end function
+        it('dissalows typecasting the same variable more than once in the same block', () => {
+            program.setFile('source/main.bs', `
+                sub addOne(input)
+                    if true
+                        typecast input as integer
+                        typecast input as string
+                    end if
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.voidFunctionMayNotReturnValue('function'),
-                range: util.createRange(3, 24, 3, 35)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.unexpectedStatementLocation('typecast', 'at the top of the file or beginning of block or namespace').message
+            ]);
         });
 
-        it('catches sub as <type> without return value', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    test = sub() as integer
-                        return
-                    end sub
+        it('disallows typecasting types', () => {
+            program.setFile('source/main.bs', `
+                sub addOne(input)
+                    typecast string as integer
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('sub'),
-                range: util.createRange(3, 24, 3, 30)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.invalidTypecastStatementApplication('string', true).message
+            ]);
         });
+    });
 
-        it('catches function without return value', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    test = function()
-                        return
-                    end function
+
+    describe('alias statement', () => {
+        it('allows being at start of file', () => {
+            program.setFile('source/main.bs', `
+                alias x = lcase
+                sub noop()
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
-                range: util.createRange(3, 24, 3, 30)
-            }]);
+            expectZeroDiagnostics(program);
         });
 
-        it('catches function as <type> without return value', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    test = function() as integer
-                        return
+        it('no diagnostic if more than one usage per block', () => {
+            program.setFile('source/main.bs', `
+                alias x = lcase
+                alias y = Str
+                sub noop()
+                   print x(y(1))
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('has diagnostic if used not at top of file', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    alias x = lcase
+                    sub noop()
+                        alias y = str
+                        print "hello"
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.unexpectedStatementLocation('alias', 'at the top of the file').message,
+                DiagnosticMessages.unexpectedStatementLocation('alias', 'at the top of the file').message
+            ]);
+        });
+
+        it('sets the type of the name', () => {
+            program.setFile('source/types.bs', `
+                interface Thing1
+                    value as string
+                end interface
+                namespace alpha.beta
+                    function piAsStr()
+                        return "3.14"
+                    end function
+                    const eulerAsStr = "2.78"
+                end namespace
+                function lowercase(text as string) as string
+                    return lcase(text)
+                end function
+            `);
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                import "types.bs"
+                alias t = Thing1
+                alias p = alpha.beta.piAsStr
+                alias e = alpha.beta.eulerAsStr
+                alias l = lowercase
+                namespace ns1.ns2
+                    function lowercase(x as integer) as integer
+                        return x
                     end function
+                    sub func1(usedAsType as t)
+                        x = usedAsType.value
+                        print
+                        print l(x)
+                        print l(p())
+                        print l(e)
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            let func: FunctionExpression;
+
+            // find places in AST where "x" is assigned
+            file.ast.walk(createVisitor({
+                FunctionStatement: (stmt) => {
+                    if (stmt.getName(ParseMode.BrighterScript) === 'ns1.ns2.func1') {
+                        func = stmt.func;
+                    }
+                }
+            }), { walkMode: WalkMode.visitAllRecursive });
+
+            const symbolTable = func.getSymbolTable();
+
+            expectTypeToBe(symbolTable.getSymbolType('t', { flags: SymbolTypeFlag.typetime }), InterfaceType);
+            const tType = symbolTable.getSymbolType('t', { flags: SymbolTypeFlag.typetime }) as InterfaceType;
+            expect(tType.name).to.eq('Thing1');
+            expectTypeToBe(symbolTable.getSymbolType('p', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+            expectTypeToBe(symbolTable.getSymbolType('e', { flags: SymbolTypeFlag.runtime }), StringType);
+            expectTypeToBe(symbolTable.getSymbolType('l', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        });
+
+        it('has diagnostic when rhs not found', () => {
+            program.setFile('source/main.bs', `
+                alias x = notThere
+                sub noop()
                 end sub
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
-                range: util.createRange(3, 24, 3, 30)
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('notThere').message
+            ]);
+        });
+
+    });
+
+    describe('type statement', () => {
+        it('allows being at top of ast', () => {
+            program.setFile('source/main.bs', `
+                type x = string
+                sub noop(input as x)
+                    print input
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('no diagnostic if more than one usage per block', () => {
+            program.setFile('source/main.bs', `
+                type x = string
+                type y = integer
+                sub noop(input as x) as y
+                   return input.len()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('has diagnostic if used not at top of file', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    sub noop()
+                        type y = string
+                        print "hello"
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('type').message
+            ]);
+        });
+
+        it('sets the type of the name', () => {
+            program.setFile('source/types.bs', `
+                interface Thing1
+                    value as string
+                end interface
+                namespace alpha.beta
+                    enum someEnum
+                        up = "up"
+                        down = "down"
+                    end enum
+                end namespace
+            `);
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                import "types.bs"
+                type t = Thing1
+                type t2 = alpha.beta.someEnum
+
+                namespace ns1.ns2
+                    function getDirection(x as t) as t2
+                        if x.value = "go up" then
+                            return alpha.beta.someEnum.up
+                        else
+                            return alpha.beta.someEnum.down
+                        end if
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            let func: FunctionExpression;
+
+            // find places in AST where "x" is assigned
+            file.ast.walk(createVisitor({
+                FunctionStatement: (stmt) => {
+                    if (stmt.getName(ParseMode.BrighterScript) === 'ns1.ns2.getDirection') {
+                        func = stmt.func;
+                    }
+                }
+            }), { walkMode: WalkMode.visitAllRecursive });
+
+            const symbolTable = func.getSymbolTable();
+
+            expectTypeToBe(symbolTable.getSymbolType('t', { flags: SymbolTypeFlag.typetime }), TypeStatementType);
+            const tType = symbolTable.getSymbolType('t', { flags: SymbolTypeFlag.typetime }) as TypeStatementType;
+            expect(tType.name).to.eq('t');
+            expectTypeToBe(tType.wrappedType, InterfaceType);
+            expect((tType.wrappedType as InterfaceType).name).to.eq('Thing1');
+
+            expectTypeToBe(symbolTable.getSymbolType('t2', { flags: SymbolTypeFlag.typetime }), TypeStatementType);
+            const t2Type = symbolTable.getSymbolType('t2', { flags: SymbolTypeFlag.typetime }) as TypeStatementType;
+            expectTypeToBe(t2Type.wrappedType, EnumType);
+            expect((t2Type.wrappedType as EnumType).name).to.eq('alpha.beta.someEnum');
+        });
+
+        it('has diagnostic when rhs not found', () => {
+            program.setFile('source/main.bs', `
+                type x = notThere
+                sub noop()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('notThere').message
+            ]);
+        });
+
+    });
+
+    describe('conditional compile', () => {
+        it('allows top level definitions inside #if block', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                #const debug = true
+                #if debug
+                function f()
+                    return 3.14
+                end function
+                #end if
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('does not allow top level definitions inside #if block inside a function', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                #const debug = true
+                function f()
+                    #if debug
+                    namespace alpha
+                    end namespace
+                    #end if
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel('namespace')
+            ]);
+        });
+
+        it('shows diagnostic for #error', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                #const debug = true
+                function f()
+                    #if debug
+                    #error This is a conditional compile error
+                    #end if
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.hashError('This is a conditional compile error')
+            ]);
+        });
+
+        it('does not show diagnostic for #error when inside false CC block', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                #const debug = false
+                function f()
+                    #if debug
+                    #error This is a conditional compile error
+                    #end if
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+    describe('types', () => {
+        it('sets assignments of invalid as dynamic', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub test()
+                    channel = invalid
+                    if true
+                        channel = {
+                            height: 123
+                        }
+                    end if
+
+                    height = 0
+                    if channel <> invalid then
+                        height += channel.height
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const func = file.ast.statements[0].findChild<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive });
+            const table = func.body.getSymbolTable();
+            const data = {} as ExtraSymbolData;
+            const channelType = table.getSymbolType('channel', { flags: SymbolTypeFlag.runtime, data: data });
+            expectTypeToBe(channelType, DynamicType);
+        });
+
+        it('sets default arg of invalid as dynamic', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub test(channel = invalid)
+                    if true
+                        channel = {
+                            height: 123
+                        }
+                    end if
+
+                    height = 0
+                    if channel <> invalid then
+                        height += channel.height
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const func = file.ast.statements[0].findChild<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive });
+            const table = func.body.getSymbolTable();
+            const data = {} as ExtraSymbolData;
+            const channelType = table.getSymbolType('channel', { flags: SymbolTypeFlag.runtime, data: data });
+            expectTypeToBe(channelType, DynamicType);
+        });
+    });
+
+    describe('instances of types', () => {
+        it('sets assigned variables as instances', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+            sub makeKlass()
+                x = new Klass()
+            end sub
+
+            class Klass
+            end class
+        `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const func = file.ast.statements[0].findChild<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive });
+            const table = func.body.getSymbolTable();
+            const data = {} as ExtraSymbolData;
+            const xType = table.getSymbolType('x', { flags: SymbolTypeFlag.runtime, data: data });
+            expectTypeToBe(xType, ClassType);
+            expect(data.isInstance).to.be.true;
+            expect(table.isSymbolTypeInstance('x')).to.be.true;
+        });
+
+        it('sets params as instances', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+            sub makeKlass(x as Klass, n = x.name)
+            end sub
+
+            class Klass
+                name as string
+            end class
+        `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const func = file.ast.statements[0].findChild<FunctionExpression>(isFunctionExpression, { walkMode: WalkMode.visitAllRecursive });
+            const table = func.getSymbolTable();
+            const data = {} as ExtraSymbolData;
+            const xType = table.getSymbolType('x', { flags: SymbolTypeFlag.runtime, data: data });
+            expectTypeToBe(xType, ClassType);
+            expect(data.isInstance).to.be.true;
+            expect(table.isSymbolTypeInstance('x')).to.be.true;
+            const nType = table.getSymbolType('n', { flags: SymbolTypeFlag.runtime, data: data });
+            expectTypeToBe(nType, StringType);
+            expect(data.isInstance).to.be.true;
+            expect(table.isSymbolTypeInstance('n')).to.be.true;
+        });
+
+        it('allows super as instance', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+            class SuperKlass
+                name as string
+                sub new(name as string)
+                    m.name = name
+                end sub
+            end class
+
+            class Klass extends SuperKlass
+                sub new()
+                    super("hello")
+                end sub
+
+                function getName()
+                    return super.name
+                end function
+            end class
+        `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            const klass = file.ast.statements[1] as ClassStatement;
+            const newTable = klass.methods[0].func.body.getSymbolTable();
+            let data = {} as ExtraSymbolData;
+            const newSuperType = newTable.getSymbolType('super', { flags: SymbolTypeFlag.runtime, data: data });
+            expectTypeToBe(newSuperType, ClassType);
+            expect(data.isInstance).to.be.true;
+
+            const getNameTable = klass.methods[0].func.body.getSymbolTable();
+            data = {} as ExtraSymbolData;
+            const getNameSuperType = getNameTable.getSymbolType('super', { flags: SymbolTypeFlag.runtime, data: data });
+            expectTypeToBe(getNameSuperType, ClassType);
+            expect(data.isInstance).to.be.true;
+        });
+    });
+
+    describe('types in comments', () => {
+
+        describe('@param', () => {
+            it('uses @param type in brs file', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @param {string} name
+                    function sayHello(name)
+                        print "Hello " + name
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                let data = {} as ExtraSymbolData;
+                expectTypeToBe(
+                    file.ast.findChild(isFunctionParameterExpression).getType({
+                        flags: SymbolTypeFlag.runtime, data: data
+                    }),
+                    StringType
+                );
+                data = {};
+                const printSymbolTable = file.ast.findChild(isPrintStatement).getSymbolTable();
+                expectTypeToBe(
+                    printSymbolTable.getSymbolType('name', {
+                        flags: SymbolTypeFlag.runtime, data: data
+                    }),
+                    StringType
+                );
+                expect(data.isFromDocComment).to.be.true;
+            });
+
+            it('handles no type in @param tag', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @param  name
+                    function sayHello(name)
+                        print "Hello " + name
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                let data = {} as ExtraSymbolData;
+                expectTypeToBe(
+                    file.ast.findChild(isFunctionParameterExpression).getType({
+                        flags: SymbolTypeFlag.runtime, data: data
+                    }),
+                    DynamicType
+                );
+                data = {};
+                const printSymbolTable = file.ast.findChild(isPrintStatement).getSymbolTable();
+                expectTypeToBe(
+                    printSymbolTable.getSymbolType('name', {
+                        flags: SymbolTypeFlag.runtime, data: data
+                    }),
+                    DynamicType
+                );
+            });
+
+            it('uses @param type in brs file that can refer to a custom type', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @param {Klass} myClass
+                    function sayHello(myClass)
+                        print "Hello " + myClass.name
+                    end function
+                `);
+                program.setFile<BrsFile>('source/klass.bs', `
+                    class Klass
+                        name as string
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                const funcParamExpr = file.ast.findChild(isFunctionParameterExpression);
+                expectTypeToBe(
+                    funcParamExpr.getType({
+                        flags: SymbolTypeFlag.typetime, data: data
+                    }),
+                    ClassType
+                );
+                const myClassType = file.ast.findChild(isPrintStatement).getSymbolTable().getSymbolType('myClass', {
+                    flags: SymbolTypeFlag.runtime, data: data
+                });
+                expectTypeToBe(myClassType, ClassType);
+                expectTypeToBe(myClassType.getMemberType('name', { flags: SymbolTypeFlag.runtime }), StringType);
+                expect(data.isFromDocComment).to.be.true;
+            });
+
+            it('uses @param type in brs file that can refer to a built in type', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @param {roDeviceInfo} info
+                    function sayHello(info)
+                        print "Hello " + info.getModel()
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                expectTypeToBe(
+                    file.ast.findChild(isFunctionParameterExpression).getType({
+                        flags: SymbolTypeFlag.typetime, data: data
+                    }),
+                    InterfaceType
+                );
+                const infoType = file.ast.findChild(isPrintStatement).getSymbolTable().getSymbolType('info', {
+                    flags: SymbolTypeFlag.runtime, data: data
+                });
+                expectTypeToBe(infoType, InterfaceType);
+                expectTypeToBe(infoType.getMemberType('getModel', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+                expect(data.isFromDocComment).to.be.true;
+            });
+
+            it('allows jsdoc comment style /** prefix', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' /**
+                    ' * @param {string} info
+                    ' */
+                    function sayHello(info)
+                        print "Hello " + info
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                expectTypeToBe(
+                    file.ast.findChild(isFunctionParameterExpression).getType({
+                        flags: SymbolTypeFlag.runtime, data: data
+                    }),
+                    StringType
+                );
+                const infoType = file.ast.findChild(isPrintStatement).getSymbolTable().getSymbolType('info', {
+                    flags: SymbolTypeFlag.runtime, data: data
+                });
+                expectTypeToBe(infoType, StringType);
+                expect(data.isFromDocComment).to.be.true;
+            });
+
+            it('ignores types it cannot find', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @param {TypeNotThere} info
+                    function sayHello(info)
+                        print "Hello " + info.prop
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('TypeNotThere').message
+                ]);
+                const data = {} as ExtraSymbolData;
+                expectTypeToBe(
+                    file.ast.findChild(isFunctionParameterExpression).getType({
+                        flags: SymbolTypeFlag.runtime, data: data
+                    }),
+                    DynamicType
+                );
+                const infoType = file.ast.findChild(isPrintStatement).getSymbolTable().getSymbolType('info', {
+                    flags: SymbolTypeFlag.runtime, data: data
+                });
+                expectTypeToBe(infoType, DynamicType);
+                expect(data.isFromDocComment).to.be.true;
+            });
+
+            it('allows built-in type in @param in Brightscript mode', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @param {roAssociativeArray} thing
+                    function sayHello(thing)
+                        print "Hello " + thing.name
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                let data = {} as ExtraSymbolData;
+                expectTypeToBe(
+                    file.ast.findChild(isFunctionParameterExpression).getType({
+                        flags: SymbolTypeFlag.runtime, data: data
+                    }),
+                    InterfaceType
+                );
+                data = {};
+                const printSymbolTable = file.ast.findChild(isPrintStatement).getSymbolTable();
+                const thingType = printSymbolTable.getSymbolType('thing', {
+                    flags: SymbolTypeFlag.runtime, data: data
+                });
+                expectTypeToBe(thingType, InterfaceType);
+                expect(thingType.toString()).to.eql('roAssociativeArray');
+                expect(data.isFromDocComment).to.be.true;
+            });
+        });
+
+        describe('@return', () => {
+            it('uses @return type in brs file', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @return {string}
+                    function getPie()
+                        return "pumpkin"
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                const funcStmt = file.ast.findChild(isFunctionStatement);
+                const funcType = funcStmt.getType({ flags: SymbolTypeFlag.runtime, data: data });
+                expectTypeToBe(funcType, TypedFunctionType);
+                const returnType = (funcType as TypedFunctionType).returnType;
+                expectTypeToBe(returnType, StringType);
+            });
+
+            it('allows unknown type when using @return tag', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @return {TypeNotThere}
+                    function getPie()
+                        return "pumpkin"
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('TypeNotThere').message
+                ]);
+                const data = {} as ExtraSymbolData;
+                const funcStmt = file.ast.findChild(isFunctionStatement);
+                const funcType = funcStmt.getType({ flags: SymbolTypeFlag.runtime, data: data });
+                expectTypeToBe(funcType, TypedFunctionType);
+                const returnType = (funcType as TypedFunctionType).returnType;
+                expectTypeToBe(returnType, DynamicType);
+            });
+
+            it('validates return statements against @return tag with valid type', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @return {integer}
+                    function getPie()
+                        return "pumpkin"
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.returnTypeMismatch('string', 'integer').message
+                ]);
+                const data = {} as ExtraSymbolData;
+                const funcStmt = file.ast.findChild(isFunctionStatement);
+                const funcType = funcStmt.getType({ flags: SymbolTypeFlag.runtime, data: data });
+                expectTypeToBe(funcType, TypedFunctionType);
+                const returnType = (funcType as TypedFunctionType).returnType;
+                expectTypeToBe(returnType, IntegerType);
+            });
+
+            it('checks return statements against @return tag with valid custom type', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    ' @return {alpha.Klass}
+                    function getPie()
+                        return alpha_Klass()
+                    end function
+                `);
+                program.setFile<BrsFile>('source/klass.bs', `
+                    namespace alpha
+                        class Klass
+                            name as string
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                const funcStmt = file.ast.findChild(isFunctionStatement);
+                const funcType = funcStmt.getType({ flags: SymbolTypeFlag.typetime, data: data });
+                expectTypeToBe(funcType, TypedFunctionType);
+                const returnType = (funcType as TypedFunctionType).returnType;
+                expectTypeToBe(returnType, ClassType);
+            });
+
+            it('validates return statements against @return tag with valid custom type', () => {
+                program.setFile<BrsFile>('source/main.brs', `
+                    ' @return {alpha.Klass}
+                    function getPie()
+                        return "foo"
+                    end function
+                `);
+                program.setFile<BrsFile>('source/klass.bs', `
+                    namespace alpha
+                        class Klass
+                            name as string
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.returnTypeMismatch('string', 'alpha.Klass').message
+                ]);
+            });
+        });
+
+        describe('@type', () => {
+            it('uses @type type in brs file', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    function getPie() as string
+                        ' @type {string}
+                        pieType = getFruit()
+                        return pieType
+                    end function
+
+                    function getFruit()
+                        return "apple"
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                const funcStmt = file.ast.findChild(isFunctionStatement);
+                const returnStmt = funcStmt.findChild(isReturnStatement);
+                const varType = returnStmt.getSymbolTable().getSymbolType('pieType', { flags: SymbolTypeFlag.runtime, data: data });
+                expectTypeToBe(varType, StringType);
+            });
+
+            it('allows unknown type when using @type tag', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+
+                    function getValue()
+                        ' @type {unknown}
+                        something = {}
+                        return something
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('unknown').message
+                ]);
+                const data = {} as ExtraSymbolData;
+                const funcStmt = file.ast.findChild(isFunctionStatement);
+                const funcType = funcStmt.getType({ flags: SymbolTypeFlag.runtime, data: data });
+                expectTypeToBe(funcType, TypedFunctionType);
+                const returnType = (funcType as TypedFunctionType).returnType;
+                expectTypeToBe(returnType, DynamicType);
+            });
+
+            it('treats variable as type given in @type', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    function getModelName()
+                        ' @type {roDeviceInfo}
+                        info = getData()
+                        return info.getModel()
+                    end function
+
+                    function getData()
+                        return {}
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                const assignStmt = file.ast.findChild(isAssignmentStatement);
+                const infoType = assignStmt.getSymbolTable().getSymbolType('info', { flags: SymbolTypeFlag.runtime, data: data });
+                expectTypeToBe(infoType, InterfaceType);
+                expect(infoType.toString()).to.eq('roDeviceInfo');
+                expect(data.isFromDocComment).to.be.true;
+            });
+
+        });
+
+        // Skipped until we can figure out how to handle @var tags
+        describe.skip('@var', () => {
+            it('uses @var type in brs file to define types of variables', () => {
+                const file = program.setFile<BrsFile>('source/main.brs', `
+                    function getPie() as string
+                        ' @var {string} someDate
+                        if m.top.isTrue
+                            someDate = getDate()
+                        else
+                            someDate = m.date2
+                        end if
+
+                        if m.someProp
+                            someDate = m.someProp.date
+                        end if
+
+                        return someDate
+                    end function
+
+                    function getDate()
+                        return "Dec 25"
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+                const data = {} as ExtraSymbolData;
+                const funcStmt = file.ast.findChild(isFunctionStatement);
+                const returnStmt = funcStmt.findChild(isReturnStatement);
+                const varType = returnStmt.getSymbolTable().getSymbolType('someDate', { flags: SymbolTypeFlag.runtime, data: data });
+                expectTypeToBe(varType, StringType);
+            });
+        });
+    });
+
+    describe('try/catch', () => {
+        it('allows omitting the exception variable in standard brightscript mode', () => {
+            program.setFile('source/main.brs', `
+                sub new()
+                    try
+                        print "hello"
+                    catch
+                        print "error"
+                    end try
+                end sub
+            `);
+            expectZeroDiagnostics(program);
+        });
+
+        it('shows diagnostic when omitting the exception variable in standard brightscript mode', () => {
+            program.setFile('source/main.brs', `
+                sub new()
+                    try
+                        print "hello"
+                    catch
+                        print "error"
+                    end try
+                end sub
+            `);
+            expectDiagnostics(program, []);
+        });
+
+        it('shows diagnostics when using  when omitting the exception variable in standard brightscript mode', () => {
+            program.setFile('source/main.brs', `
+                sub new()
+                    try
+                        print "hello"
+                    catch
+                        print "error"
+                    end try
+                end sub
+            `);
+            expectDiagnostics(program, []);
+        });
+    });
+
+    describe('function return values', () => {
+        it('catches sub with return value', () => {
+            program.setFile('source/main.brs', `
+                sub test()
+                    return true
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
+                    location: util.createLocation(2, 20, 2, 31, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('boolean', 'void', {})
+            ]);
+        });
+
+        it('catches sub as void with return value', () => {
+            program.setFile('source/main.brs', `
+                sub test() as void
+                    return true
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
+                    location: util.createLocation(2, 20, 2, 31, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('boolean', 'void', {})
+            ]);
+        });
+
+        it('catches function as void with return value', () => {
+            program.setFile('source/main.brs', `
+                function test() as void
+                    return true
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.voidFunctionMayNotReturnValue('function'),
+                    location: util.createLocation(2, 20, 2, 31, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('boolean', 'void', {})
+            ]);
+        });
+
+        it('catches sub as <type> without return value', () => {
+            program.setFile('source/main.brs', `
+                sub test() as integer
+                    return
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.nonVoidFunctionMustReturnValue('sub'),
+                    location: util.createLocation(2, 20, 2, 26, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('void', 'integer', {})
+            ]);
+        });
+
+        it('catches function without return value', () => {
+            program.setFile('source/main.brs', `
+                function test()
+                    return
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [{
+                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
+                location: util.createLocation(2, 20, 2, 26, s`${rootDir}/source/main.brs`)
+            }]);
+        });
+
+        it('catches function as <type> without return value', () => {
+            program.setFile('source/main.brs', `
+                function test() as integer
+                    return
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
+                    location: util.createLocation(2, 20, 2, 26, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('void', 'integer', {})
+            ]);
+        });
+
+        it('catches anon sub with return value', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    test = sub()
+                        return true
+                    end sub
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
+                    location: util.createLocation(3, 24, 3, 35, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('boolean', 'void', {})]
+            );
+        });
+
+        it('catches sub as void with return value', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    test = sub() as void
+                        return true
+                    end sub
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.voidFunctionMayNotReturnValue('sub'),
+                    location: util.createLocation(3, 24, 3, 35, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('boolean', 'void', {})
+            ]);
+        });
+
+        it('catches function as void with return value', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    test = function() as void
+                        return true
+                    end function
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.voidFunctionMayNotReturnValue('function'),
+                    location: util.createLocation(3, 24, 3, 35, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('boolean', 'void', {})
+            ]);
+        });
+
+        it('catches sub as <type> without return value', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    test = sub() as integer
+                        return
+                    end sub
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.nonVoidFunctionMustReturnValue('sub'),
+                    location: util.createLocation(3, 24, 3, 30, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('void', 'integer', {})
+            ]);
+        });
+
+        it('catches function without return value', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    test = function()
+                        return
+                    end function
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [{
+                ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
+                location: util.createLocation(3, 24, 3, 30, s`${rootDir}/source/main.brs`)
+            }]);
+        });
+
+        it('catches function as <type> without return value', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    test = function() as integer
+                        return
+                    end function
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                {
+                    ...DiagnosticMessages.nonVoidFunctionMustReturnValue('function'),
+                    location: util.createLocation(3, 24, 3, 30, s`${rootDir}/source/main.brs`)
+                },
+                DiagnosticMessages.returnTypeMismatch('void', 'integer', {})
+            ]);
         });
     });
 
diff --git a/src/bscPlugin/validation/BrsFileValidator.ts b/src/bscPlugin/validation/BrsFileValidator.ts
index 9d99ae8fc..fa8fd4ffd 100644
--- a/src/bscPlugin/validation/BrsFileValidator.ts
+++ b/src/bscPlugin/validation/BrsFileValidator.ts
@@ -1,66 +1,93 @@
-import { isAliasStatement, isBody, isClassStatement, isCommentStatement, isConstStatement, isDottedGetExpression, isDottedSetStatement, isEnumStatement, isForEachStatement, isForStatement, isFunctionExpression, isFunctionStatement, isImportStatement, isIndexedGetExpression, isIndexedSetStatement, isInterfaceStatement, isLibraryStatement, isLiteralExpression, isNamespaceStatement, isTypecastStatement, isTypeStatement, isUnaryExpression, isWhileStatement } from '../../astUtils/reflection';
+import { isAliasStatement, isBlock, isBody, isClassStatement, isConditionalCompileConstStatement, isConditionalCompileErrorStatement, isConditionalCompileStatement, isConstStatement, isDottedGetExpression, isDottedSetStatement, isEnumStatement, isForEachStatement, isForStatement, isFunctionExpression, isFunctionStatement, isIfStatement, isImportStatement, isIndexedGetExpression, isIndexedSetStatement, isInterfaceStatement, isInvalidType, isLibraryStatement, isLiteralExpression, isMethodStatement, isNamespaceStatement, isTypecastExpression, isTypecastStatement, isTypedFunctionTypeExpression, isTypeStatement, isUnaryExpression, isVariableExpression, isVoidType, isWhileStatement } from '../../astUtils/reflection';
 import { createVisitor, WalkMode } from '../../astUtils/visitors';
 import { DiagnosticMessages } from '../../DiagnosticMessages';
 import type { BrsFile } from '../../files/BrsFile';
-import type { OnFileValidateEvent } from '../../interfaces';
+import type { ExtraSymbolData, ValidateFileEvent } from '../../interfaces';
 import { TokenKind } from '../../lexer/TokenKind';
 import type { AstNode, Expression, Statement } from '../../parser/AstNode';
 import { CallExpression, type FunctionExpression, type LiteralExpression } from '../../parser/Expression';
 import { ParseMode } from '../../parser/Parser';
-import type { ContinueStatement, EnumMemberStatement, EnumStatement, ForEachStatement, ForStatement, ImportStatement, LibraryStatement, WhileStatement } from '../../parser/Statement';
+import type { ContinueStatement, EnumMemberStatement, EnumStatement, ForEachStatement, ForStatement, ImportStatement, LibraryStatement, Body, WhileStatement, TypecastStatement, Block, AliasStatement, IfStatement, ConditionalCompileStatement } from '../../parser/Statement';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import { AssociativeArrayType } from '../../types/AssociativeArrayType';
 import { DynamicType } from '../../types/DynamicType';
-import { InterfaceType } from '../../types/InterfaceType';
 import util from '../../util';
 import type { Range } from 'vscode-languageserver';
+import type { Token } from '../../lexer/Token';
+import type { BrightScriptDoc } from '../../parser/BrightScriptDocParser';
+import brsDocParser from '../../parser/BrightScriptDocParser';
+import { TypeStatementType } from '../../types/TypeStatementType';
 import * as semver from 'semver';
 
 export class BrsFileValidator {
     constructor(
-        public event: OnFileValidateEvent<BrsFile>
+        public event: ValidateFileEvent<BrsFile>
     ) {
     }
 
+
     public process() {
+        const unlinkGlobalSymbolTable = this.event.file.parser.symbolTable.pushParentProvider(() => this.event.program.globalScope.symbolTable);
+
         util.validateTooDeepFile(this.event.file);
+
+        // Invalidate cache on this file
+        // It could have potentially changed before this from plugins, after this, it will not change
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        this.event.file['_cachedLookups'].invalidate();
+
+        // make a copy of the bsConsts, because they might be added to
+        const bsConstsBackup = new Map<string, boolean>(this.event.file.ast.getBsConsts());
+
         this.walk();
         this.flagTopLevelStatements();
         //only validate the file if it was actually parsed (skip files containing typedefs)
         if (!this.event.file.hasTypedef) {
-            this.validateImportStatements();
+            this.validateTopOfFileStatements();
+            this.validateTypecastStatements();
         }
+
+        this.event.file.ast.bsConsts = bsConstsBackup;
+        unlinkGlobalSymbolTable();
     }
 
     /**
      * Walk the full AST
      */
     private walk() {
+        const isBrighterscript = this.event.file.parser.options.mode === ParseMode.BrighterScript;
+
         const visitor = createVisitor({
             MethodStatement: (node) => {
                 //add the `super` symbol to class methods
-                node.func.body.symbolTable.addSymbol('super', undefined, DynamicType.instance);
+                if (isClassStatement(node.parent) && node.parent.hasParentClass()) {
+                    const data: ExtraSymbolData = {};
+                    const parentClassType = node.parent.parentClassName.getType({ flags: SymbolTypeFlag.typetime, data: data });
+                    node.func.body.getSymbolTable().addSymbol('super', { ...data, isInstance: true }, parentClassType, SymbolTypeFlag.runtime);
+                }
             },
             CallfuncExpression: (node) => {
                 if (node.args.length > 5) {
-                    this.event.file.addDiagnostic({
+                    this.event.program.diagnostics.register({
                         ...DiagnosticMessages.callfuncHasToManyArgs(node.args.length),
-                        range: node.methodName.range
+                        location: node.tokens.methodName.location
                     });
                 }
             },
             DottedGetExpression: (node) => {
-                if (node.dot?.kind === TokenKind.QuestionDot) {
-                    this.validateMinFirmwareVersionForOptionalChaining(node.dot.range);
+                if (node.tokens.dot?.kind === TokenKind.QuestionDot) {
+                    this.validateMinFirmwareVersionForOptionalChaining(node.tokens.dot?.location?.range);
                 }
             },
             IndexedGetExpression: (node) => {
-                if (node.questionDotToken || node.openingSquare?.kind === TokenKind.QuestionLeftSquare) {
-                    const range = node.questionDotToken?.range ?? node.openingSquare?.range;
+                if (node.tokens.questionDot || node.tokens.openingSquare?.kind === TokenKind.QuestionLeftSquare) {
+                    const range = node.tokens.questionDot?.location?.range ?? node.tokens.openingSquare?.location?.range;
                     this.validateMinFirmwareVersionForOptionalChaining(range);
                 }
             },
             CallExpression: (node) => {
-                if (node.openingParen?.kind === TokenKind.QuestionLeftParen) {
-                    this.validateMinFirmwareVersionForOptionalChaining(node.openingParen.range);
+                if (node.tokens.openingParen?.kind === TokenKind.QuestionLeftParen) {
+                    this.validateMinFirmwareVersionForOptionalChaining(node.tokens.openingParen?.location?.range);
                 }
             },
             EnumStatement: (node) => {
@@ -68,24 +95,54 @@ export class BrsFileValidator {
 
                 this.validateEnumDeclaration(node);
 
-                //register this enum declaration
-                if (node.tokens.name) {
-                    node.parent.getSymbolTable()?.addSymbol(node.tokens.name.text, node.tokens.name.range, DynamicType.instance);
+                if (!node.tokens.name) {
+                    return;
                 }
+                //register this enum declaration
+                const nodeType = node.getType({ flags: SymbolTypeFlag.typetime });
+                // eslint-disable-next-line no-bitwise
+                node.parent.getSymbolTable()?.addSymbol(node.tokens.name.text, { definingNode: node }, nodeType, SymbolTypeFlag.typetime | SymbolTypeFlag.runtime);
             },
             ClassStatement: (node) => {
-                this.validateDeclarationLocations(node, 'class', () => util.createBoundingRange(node.classKeyword, node.name));
+                if (!node?.tokens?.name) {
+                    return;
+                }
+                this.validateDeclarationLocations(node, 'class', () => util.createBoundingRange(node.tokens.class, node.tokens.name));
 
                 //register this class
-                if (node.name) {
-                    node.parent.getSymbolTable()?.addSymbol(node.name.text, node.name.range, DynamicType.instance);
+                const nodeType = node.getType({ flags: SymbolTypeFlag.typetime });
+                node.getSymbolTable().addSymbol('m', { definingNode: node, isInstance: true }, nodeType, SymbolTypeFlag.runtime);
+                // eslint-disable-next-line no-bitwise
+                node.parent.getSymbolTable()?.addSymbol(node.tokens.name?.text, { definingNode: node }, nodeType, SymbolTypeFlag.typetime | SymbolTypeFlag.runtime);
+
+                if (node.findAncestor(isNamespaceStatement)) {
+                    //add the transpiled name for namespaced constructors to the root symbol table
+                    const transpiledClassConstructor = node.getName(ParseMode.BrightScript);
+
+                    this.event.file.parser.ast.symbolTable.addSymbol(
+                        transpiledClassConstructor,
+                        { definingNode: node },
+                        node.getConstructorType(),
+                        // eslint-disable-next-line no-bitwise
+                        SymbolTypeFlag.runtime | SymbolTypeFlag.postTranspile
+                    );
                 }
             },
             AssignmentStatement: (node) => {
+                if (!node?.tokens?.name) {
+                    return;
+                }
+                if (isForStatement(node.parent) && node.parent.counterDeclaration === node) {
+                    // for loop variable variable is added to the block symbol table elsewhere
+                    return;
+                }
+                const data: ExtraSymbolData = {};
                 //register this variable
-                if (node.name) {
-                    node.parent.getSymbolTable()?.addSymbol(node.name.text, node.name.range, DynamicType.instance);
+                let nodeType = node.getType({ flags: SymbolTypeFlag.runtime, data: data });
+                if (isInvalidType(nodeType) || isVoidType(nodeType)) {
+                    nodeType = DynamicType.instance;
                 }
+                node.parent.getSymbolTable()?.addSymbol(node.tokens.name.text, { definingNode: node, isInstance: true, isFromDocComment: data.isFromDocComment, isFromCallFunc: data.isFromCallFunc }, nodeType, SymbolTypeFlag.runtime);
             },
             DottedSetStatement: (node) => {
                 this.validateNoOptionalChainingInVarSet(node, [node.obj]);
@@ -94,78 +151,143 @@ export class BrsFileValidator {
                 this.validateNoOptionalChainingInVarSet(node, [node.obj]);
             },
             ForEachStatement: (node) => {
-                //register the for loop variable
-                node.parent.getSymbolTable()?.addSymbol(node.item.text, node.item.range, DynamicType.instance);
+                //registering the for loop variable happens in the visitor for Block, since the loop variable is scoped to the loop body
             },
             NamespaceStatement: (node) => {
-                this.validateDeclarationLocations(node, 'namespace', () => util.createBoundingRange(node.keyword, node.nameExpression));
-
-                if (node.name) {
-                    node.parent.getSymbolTable().addSymbol(
-                        node.name.split('.')[0],
-                        node.nameExpression.range,
-                        DynamicType.instance
-                    );
+                if (!node?.nameExpression) {
+                    return;
                 }
+                this.validateDeclarationLocations(node, 'namespace', () => util.createBoundingRange(node.tokens.namespace, node.nameExpression));
+                //Namespace Types are added at the Scope level - This is handled when the SymbolTables get linked
             },
             FunctionStatement: (node) => {
-                this.validateDeclarationLocations(node, 'function', () => util.createBoundingRange(node.func.functionType, node.name));
-                if (node.name?.text) {
+                this.validateDeclarationLocations(node, 'function', () => util.createBoundingRange(node.func.tokens.functionType, node.tokens.name));
+                const funcType = node.getType({ flags: SymbolTypeFlag.typetime });
+
+                if (node.tokens.name?.text) {
                     node.parent.getSymbolTable().addSymbol(
-                        node.name.text,
-                        node.name.range,
-                        DynamicType.instance
+                        node.tokens.name.text,
+                        { definingNode: node },
+                        funcType,
+                        SymbolTypeFlag.runtime
                     );
                 }
 
                 const namespace = node.findAncestor(isNamespaceStatement);
                 //this function is declared inside a namespace
                 if (namespace) {
+                    namespace.getSymbolTable().addSymbol(
+                        node.tokens.name?.text,
+                        { definingNode: node },
+                        funcType,
+                        SymbolTypeFlag.runtime
+                    );
+                    if (!node.tokens?.name) {
+                        return;
+                    }
                     //add the transpiled name for namespaced functions to the root symbol table
                     const transpiledNamespaceFunctionName = node.getName(ParseMode.BrightScript);
-                    const funcType = node.func.getFunctionType();
-                    funcType.setName(transpiledNamespaceFunctionName);
-
-                    if (node.name) {
-                        this.event.file.parser.ast.symbolTable.addSymbol(
-                            transpiledNamespaceFunctionName,
-                            node.name.range,
-                            funcType
-                        );
-                    }
+
+                    this.event.file.parser.ast.symbolTable.addSymbol(
+                        transpiledNamespaceFunctionName,
+                        { definingNode: node },
+                        funcType,
+                        // eslint-disable-next-line no-bitwise
+                        SymbolTypeFlag.runtime | SymbolTypeFlag.postTranspile
+                    );
                 }
             },
             FunctionExpression: (node) => {
-                if (!node.symbolTable.hasSymbol('m')) {
-                    node.symbolTable.addSymbol('m', undefined, DynamicType.instance);
+                const funcSymbolTable = node.getSymbolTable();
+                const isInlineFunc = !(isFunctionStatement(node.parent) || isMethodStatement(node.parent));
+                if (isInlineFunc) {
+                    // symbol table should not include any symbols from parent func
+                    funcSymbolTable.pushParentProvider(() => node.findAncestor<Body>(isBody).getSymbolTable());
+                }
+                if (!funcSymbolTable?.hasSymbol('m', SymbolTypeFlag.runtime) || isInlineFunc) {
+                    if (!isTypecastStatement(node.body?.statements?.[0])) {
+                        // if this is an inline function, or if the function body does not start with a typecast statement, add the `m` symbol to the function scope. If the function body starts with a typecast statement, the `m` symbol will be added in the visitor for TypecastStatement, and it will be typed as the type from the typecast statement
+                        funcSymbolTable?.addSymbol('m', { isInstance: true }, new AssociativeArrayType(), SymbolTypeFlag.runtime);
+                    }
                 }
                 this.validateFunctionParameterCount(node);
             },
             FunctionParameterExpression: (node) => {
-                if (node.name) {
-                    const paramName = node.name.text;
-                    const symbolTable = node.getSymbolTable();
-                    symbolTable?.addSymbol(paramName, node.name.range, node.type);
+                if (isTypedFunctionTypeExpression(node.parent)) {
+                    return;
+                }
+                const paramName = node.tokens?.name?.text;
+                if (!paramName) {
+                    return;
                 }
+                const data: ExtraSymbolData = {};
+                const nodeType = node.getType({ flags: SymbolTypeFlag.typetime, data: data });
+                // add param symbol at expression level, so it can be used as default value in other params
+                const funcExpr = node.findAncestor<FunctionExpression>(isFunctionExpression);
+                const funcSymbolTable = funcExpr?.getSymbolTable();
+                const extraSymbolData: ExtraSymbolData = {
+                    definingNode: node,
+                    isInstance: true,
+                    isFromDocComment: data.isFromDocComment,
+                    description: data.description
+                };
+                funcSymbolTable?.addSymbol(paramName, extraSymbolData, nodeType, SymbolTypeFlag.runtime);
+
+                //also add param symbol at block level, as it may be redefined, and if so, should show a union
+                funcExpr.body.getSymbolTable()?.addSymbol(paramName, extraSymbolData, nodeType, SymbolTypeFlag.runtime);
             },
             InterfaceStatement: (node) => {
-                this.validateDeclarationLocations(node, 'interface', () => util.createBoundingRange(node.tokens.interface, node.tokens.name));
-                if (node.tokens.name) {
-                    node.parent?.getSymbolTable()?.addSymbol(node.tokens.name.text, node.tokens.name.range, new InterfaceType(new Map()));
+                if (!node.tokens.name) {
+                    return;
                 }
+                this.validateDeclarationLocations(node, 'interface', () => util.createBoundingRange(node.tokens.interface, node.tokens.name));
+
+                const nodeType = node.getType({ flags: SymbolTypeFlag.typetime });
+                // eslint-disable-next-line no-bitwise
+                node.parent.getSymbolTable().addSymbol(node.tokens.name.text, { definingNode: node }, nodeType, SymbolTypeFlag.typetime);
             },
             ConstStatement: (node) => {
-                this.validateDeclarationLocations(node, 'const', () => util.createBoundingRange(node.tokens.const, node.tokens.name));
-                if (node.tokens.name) {
-                    node.parent.getSymbolTable().addSymbol(node.tokens.name.text, node.tokens.name.range, DynamicType.instance);
+                if (!node.tokens.name) {
+                    return;
                 }
+                this.validateDeclarationLocations(node, 'const', () => util.createBoundingRange(node.tokens.const, node.tokens.name));
+                const nodeType = node.getType({ flags: SymbolTypeFlag.runtime });
+                node.parent.getSymbolTable().addSymbol(node.tokens.name.text, { definingNode: node, isInstance: true }, nodeType, SymbolTypeFlag.runtime);
             },
             CatchStatement: (node) => {
-                node.parent.getSymbolTable().addSymbol(node.exceptionVariable.text, node.exceptionVariable.range, DynamicType.instance);
+                //brs and bs both support variableExpression for the exception variable
+                if (isVariableExpression(node.exceptionVariableExpression)) {
+                    node.parent.getSymbolTable().addSymbol(
+                        node.exceptionVariableExpression.getName(),
+                        { definingNode: node, isInstance: true },
+                        //TODO I think we can produce a slightly more specific type here (like an AA but with the known exception properties)
+                        DynamicType.instance,
+                        SymbolTypeFlag.runtime
+                    );
+                    //brighterscript allows catch without an exception variable
+                } else if (isBrighterscript && !node.exceptionVariableExpression) {
+                    //this is fine
+
+                    //brighterscript allows a typecast expression here
+                } else if (isBrighterscript && isTypecastExpression(node.exceptionVariableExpression) && isVariableExpression(node.exceptionVariableExpression.obj)) {
+                    node.parent.getSymbolTable().addSymbol(
+                        node.exceptionVariableExpression.obj.getName(),
+                        { definingNode: node, isInstance: true },
+                        node.exceptionVariableExpression.getType({ flags: SymbolTypeFlag.runtime }),
+                        SymbolTypeFlag.runtime
+                    );
+
+                    //no other expressions are allowed here
+                } else {
+                    this.event.program.diagnostics.register({
+                        ...DiagnosticMessages.expectedExceptionVarToFollowCatch(),
+                        location: node.exceptionVariableExpression?.location ?? node.tokens.catch?.location
+                    });
+                }
             },
             DimStatement: (node) => {
-                if (node.identifier) {
-                    node.parent.getSymbolTable().addSymbol(node.identifier.text, node.identifier.range, DynamicType.instance);
+                if (node.tokens.name) {
+                    node.parent.getSymbolTable().addSymbol(node.tokens.name.text, { definingNode: node, isInstance: true }, node.getType({ flags: SymbolTypeFlag.runtime }), SymbolTypeFlag.runtime);
                 }
             },
             ReturnStatement: (node) => {
@@ -173,30 +295,122 @@ export class BrsFileValidator {
                 //these situations cannot have a value next to `return`
                 if (
                     //`function as void`, `sub as void`
-                    func?.returnTypeToken?.kind === TokenKind.Void ||
+                    (isVariableExpression(func?.returnTypeExpression?.expression) && func.returnTypeExpression.expression.tokens.name.text?.toLowerCase() === 'void') ||
                     //`sub` <without return value>
-                    (func.functionType?.kind === TokenKind.Sub && !func.returnTypeToken)
+                    (func.tokens.functionType?.kind === TokenKind.Sub && !func.returnTypeExpression)
                 ) {
                     //there may not be a return value
                     if (node.value) {
-                        this.event.file.addDiagnostic({
-                            ...DiagnosticMessages.voidFunctionMayNotReturnValue(func.functionType?.text),
-                            range: node.range
+                        this.event.program.diagnostics.register({
+                            ...DiagnosticMessages.voidFunctionMayNotReturnValue(func.tokens.functionType?.text),
+                            location: node.location
                         });
                     }
 
                 } else {
                     //there MUST be a return value
                     if (!node.value) {
-                        this.event.file.addDiagnostic({
-                            ...DiagnosticMessages.nonVoidFunctionMustReturnValue(func?.functionType?.text),
-                            range: node.range
+                        this.event.program.diagnostics.register({
+                            ...DiagnosticMessages.nonVoidFunctionMustReturnValue(func?.tokens.functionType?.text),
+                            location: node.location
                         });
                     }
                 }
             },
             ContinueStatement: (node) => {
                 this.validateContinueStatement(node);
+            },
+            TypecastStatement: (node) => {
+                const obj = node.typecastExpression.obj;
+                if (isVariableExpression(obj)) {
+                    node.parent.getSymbolTable().addSymbol(obj.tokens.name.text, { definingNode: node, doNotMerge: true, isInstance: true }, node.getType({ flags: SymbolTypeFlag.typetime }), SymbolTypeFlag.runtime);
+                }
+            },
+            ConditionalCompileConstStatement: (node) => {
+                const assign = node.assignment;
+                const constNameLower = assign.tokens.name?.text.toLowerCase();
+                const astBsConsts = this.event.file.ast.bsConsts;
+                if (isLiteralExpression(assign.value)) {
+                    astBsConsts.set(constNameLower, assign.value.tokens.value.text.toLowerCase() === 'true');
+                } else if (isVariableExpression(assign.value)) {
+                    if (this.validateConditionalCompileConst(assign.value.tokens.name)) {
+                        astBsConsts.set(constNameLower, astBsConsts.get(assign.value.tokens.name.text.toLowerCase()));
+                    }
+                }
+            },
+            ConditionalCompileStatement: (node) => {
+                this.validateConditionalCompileConst(node.tokens.condition);
+            },
+            ConditionalCompileErrorStatement: (node) => {
+                this.event.program.diagnostics.register({
+                    ...DiagnosticMessages.hashError(node.tokens.message.text),
+                    location: node.location
+                });
+            },
+            AliasStatement: (node) => {
+                // eslint-disable-next-line no-bitwise
+                const targetType = node.value.getType({ flags: SymbolTypeFlag.typetime | SymbolTypeFlag.runtime });
+
+                // eslint-disable-next-line no-bitwise
+                node.parent.getSymbolTable().addSymbol(node.tokens.name.text, { definingNode: node, doNotMerge: true, isAlias: true }, targetType, SymbolTypeFlag.runtime | SymbolTypeFlag.typetime);
+
+            },
+            TypeStatement: (node) => {
+                this.validateDeclarationLocations(node, 'type', () => util.createBoundingRange(node.tokens.type, node.tokens.name));
+                const wrappedNodeType = node.getType({ flags: SymbolTypeFlag.runtime });
+                const typeStmtType = new TypeStatementType(node.tokens.name.text, wrappedNodeType);
+                node.parent.getSymbolTable().addSymbol(node.tokens.name.text, { definingNode: node, isFromTypeStatement: true }, typeStmtType, SymbolTypeFlag.typetime);
+
+            },
+            IfStatement: (node) => {
+                this.setUpComplementSymbolTables(node, isIfStatement);
+            },
+            Block: (node) => {
+                const blockSymbolTable = node.symbolTable;
+                if (node.findAncestor<Block>(isFunctionExpression)) {
+                    // this block is in a function. order matters!
+                    blockSymbolTable.isOrdered = true;
+                }
+                if (!isFunctionExpression(node.parent) && node.parent) {
+                    node.symbolTable.name = `Block-${node.parent.kind}@${node.location?.range?.start?.line}`;
+                    // we're a block inside another block (or body). This block is a pocket in the bigger block
+                    node.parent.getSymbolTable().addPocketTable({
+                        index: node.parent.statementIndex,
+                        table: blockSymbolTable,
+                        // code always flows through ConditionalCompiles, because we walk according to defined BSConsts
+                        willAlwaysBeExecuted: isConditionalCompileStatement(node.parent)
+                    });
+
+                    if (isForStatement(node.parent)) {
+                        const counterDecl = node.parent.counterDeclaration;
+                        const loopVar = counterDecl.tokens.name;
+                        const loopVarType = counterDecl.getType({ flags: SymbolTypeFlag.runtime });
+                        blockSymbolTable.addSymbol(loopVar.text, { isInstance: true }, loopVarType, SymbolTypeFlag.runtime);
+
+                    } else if (isForEachStatement(node.parent)) {
+                        const loopVarType = node.parent.getLoopVariableType({ flags: SymbolTypeFlag.runtime });
+                        blockSymbolTable.addSymbol(node.parent.tokens.item.text, { isInstance: true }, loopVarType, SymbolTypeFlag.runtime);
+                    }
+                }
+            },
+            AstNode: (node) => {
+                //check for doc comments
+                if (!node.leadingTrivia || node.leadingTrivia.length === 0) {
+                    return;
+                }
+                const doc = brsDocParser.parseNode(node);
+                if (doc.tags.length === 0) {
+                    return;
+                }
+
+                let funcExpr = node.findAncestor<FunctionExpression>(isFunctionExpression);
+                if (funcExpr) {
+                    // handle comment tags inside a function expression
+                    this.processDocTagsInFunction(doc, node, funcExpr);
+                } else {
+                    //handle comment tags outside of a function expression
+                    this.processDocTagsAtTopLevel(doc, node);
+                }
             }
         });
 
@@ -207,6 +421,33 @@ export class BrsFileValidator {
         });
     }
 
+    private processDocTagsInFunction(doc: BrightScriptDoc, node: AstNode, funcExpr: FunctionExpression) {
+        //TODO: Handle doc tags that influence the function they're in
+
+        // For example, declaring variable types:
+        // const symbolTable = funcExpr.body.getSymbolTable();
+
+        // for (const varTag of doc.getAllTags(BrsDocTagKind.Var)) {
+        //     const varName = (varTag as BrsDocParamTag).name;
+        //     const varTypeStr = (varTag as BrsDocParamTag).type;
+        //     const data: ExtraSymbolData = {};
+        //     const type = doc.getTypeFromContext(varTypeStr, node, { flags: SymbolTypeFlag.typetime, fullName: varTypeStr, data: data, tableProvider: () => symbolTable });
+        //     if (type) {
+        //         symbolTable.addSymbol(varName, { ...data, isFromDocComment: true }, type, SymbolTypeFlag.runtime);
+        //     }
+        // }
+    }
+
+    private processDocTagsAtTopLevel(doc: BrightScriptDoc, node: AstNode) {
+        //TODO:
+        // - handle import statements?
+        // - handle library statements?
+        // - handle typecast statements?
+        // - handle alias statements?
+        // - handle const statements?
+        // - allow interface definitions?
+    }
+
     /**
      * Validate that a statement is defined in one of these specific locations
      *  - the root of the AST
@@ -215,13 +456,24 @@ export class BrsFileValidator {
      */
     private validateDeclarationLocations(statement: Statement, keyword: string, rangeFactory?: () => (Range | undefined)) {
         //if nested inside a namespace, or defined at the root of the AST (i.e. in a body that has no parent)
-        if (isNamespaceStatement(statement.parent?.parent) || (isBody(statement.parent) && !statement.parent?.parent)) {
+        const isOkDeclarationLocation = (parentNode) => {
+            return isNamespaceStatement(parentNode?.parent) || (isBody(parentNode) && !parentNode?.parent);
+        };
+        if (isOkDeclarationLocation(statement.parent)) {
             return;
         }
+
+        // is this in a top levelconditional compile?
+        if (isConditionalCompileStatement(statement.parent?.parent)) {
+            if (isOkDeclarationLocation(statement.parent.parent.parent)) {
+                return;
+            }
+        }
+
         //the statement was defined in the wrong place. Flag it.
-        this.event.file.addDiagnostic({
+        this.event.program.diagnostics.register({
             ...DiagnosticMessages.keywordMustBeDeclaredAtNamespaceLevel(keyword),
-            range: rangeFactory?.() ?? statement.range
+            location: rangeFactory ? util.createLocationFromFileRange(this.event.file, rangeFactory()) : statement.location
         });
     }
 
@@ -229,9 +481,9 @@ export class BrsFileValidator {
         if (func.parameters.length > CallExpression.MaximumArguments) {
             //flag every parameter over the limit
             for (let i = CallExpression.MaximumArguments; i < func.parameters.length; i++) {
-                this.event.file.addDiagnostic({
+                this.event.program.diagnostics.register({
                     ...DiagnosticMessages.tooManyCallableParameters(func.parameters.length, CallExpression.MaximumArguments),
-                    range: func.parameters[i].name.range
+                    location: func.parameters[i]?.tokens.name?.location ?? func.parameters[i]?.location ?? func.location
                 });
             }
         }
@@ -240,7 +492,7 @@ export class BrsFileValidator {
     private validateEnumDeclaration(stmt: EnumStatement) {
         const members = stmt.getMembers();
         //the enum data type is based on the first member value
-        const enumValueKind = (members.find(x => x.value)?.value as LiteralExpression)?.token?.kind ?? TokenKind.IntegerLiteral;
+        const enumValueKind = (members.find(x => x.value)?.value as LiteralExpression)?.tokens?.value?.kind ?? TokenKind.IntegerLiteral;
         const memberNames = new Set<string>();
         for (const member of members) {
             const memberNameLower = member.name?.toLowerCase();
@@ -249,9 +501,9 @@ export class BrsFileValidator {
              * flag duplicate member names
              */
             if (memberNames.has(memberNameLower)) {
-                this.event.file.addDiagnostic({
+                this.event.program.diagnostics.register({
                     ...DiagnosticMessages.duplicateIdentifier(member.name),
-                    range: member.range
+                    location: member.location
                 });
             } else {
                 memberNames.add(memberNameLower);
@@ -266,24 +518,24 @@ export class BrsFileValidator {
         let memberValueKind: TokenKind;
         let memberValue: Expression;
         if (isUnaryExpression(member.value)) {
-            memberValueKind = (member.value?.right as LiteralExpression)?.token?.kind;
+            memberValueKind = (member.value?.right as LiteralExpression)?.tokens?.value?.kind;
             memberValue = member.value?.right;
         } else {
-            memberValueKind = (member.value as LiteralExpression)?.token?.kind;
+            memberValueKind = (member.value as LiteralExpression)?.tokens?.value?.kind;
             memberValue = member.value;
         }
-        const range = (memberValue ?? member)?.range;
+        const range = (memberValue ?? member)?.location?.range;
         if (
             //is integer enum, has value, that value type is not integer
             (enumValueKind === TokenKind.IntegerLiteral && memberValueKind && memberValueKind !== enumValueKind) ||
             //has value, that value is not a literal
             (memberValue && !isLiteralExpression(memberValue))
         ) {
-            this.event.file.addDiagnostic({
+            this.event.program.diagnostics.register({
                 ...DiagnosticMessages.enumValueMustBeType(
                     enumValueKind.replace(/literal$/i, '').toLowerCase()
                 ),
-                range: range
+                location: util.createLocationFromFileRange(this.event.file, range)
             });
         }
 
@@ -293,27 +545,39 @@ export class BrsFileValidator {
             if (memberValueKind) {
                 //member value is same as enum
                 if (memberValueKind !== enumValueKind) {
-                    this.event.file.addDiagnostic({
+                    this.event.program.diagnostics.register({
                         ...DiagnosticMessages.enumValueMustBeType(
                             enumValueKind.replace(/literal$/i, '').toLowerCase()
                         ),
-                        range: range
+                        location: util.createLocationFromFileRange(this.event.file, range)
                     });
                 }
 
                 //default value missing
             } else {
-                this.event.file.addDiagnostic({
-                    file: this.event.file,
+                this.event.program.diagnostics.register({
                     ...DiagnosticMessages.enumValueIsRequired(
                         enumValueKind.replace(/literal$/i, '').toLowerCase()
                     ),
-                    range: range
+                    location: util.createLocationFromFileRange(this.event.file, range)
                 });
             }
         }
     }
 
+
+    private validateConditionalCompileConst(ccConst: Token) {
+        const isBool = ccConst.kind === TokenKind.True || ccConst.kind === TokenKind.False;
+        if (!isBool && !this.event.file.ast.bsConsts.has(ccConst.text.toLowerCase())) {
+            this.event.program.diagnostics.register({
+                ...DiagnosticMessages.hashConstDoesNotExist(),
+                location: ccConst.location
+            });
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Find statements defined at the top level (or inside a namespace body) that are not allowed to be there
      */
@@ -330,74 +594,137 @@ export class BrsFileValidator {
                     !isClassStatement(statement) &&
                     !isEnumStatement(statement) &&
                     !isInterfaceStatement(statement) &&
-                    !isCommentStatement(statement) &&
                     !isLibraryStatement(statement) &&
                     !isImportStatement(statement) &&
                     !isConstStatement(statement) &&
                     !isTypecastStatement(statement) &&
+                    !isConditionalCompileConstStatement(statement) &&
+                    !isConditionalCompileErrorStatement(statement) &&
+                    !isConditionalCompileStatement(statement) &&
                     !isAliasStatement(statement) &&
                     !isTypeStatement(statement)
                 ) {
-                    this.event.file.addDiagnostic({
+                    this.event.program.diagnostics.register({
                         ...DiagnosticMessages.unexpectedStatementOutsideFunction(),
-                        range: statement.range
+                        location: statement.location
                     });
                 }
             }
         }
     }
 
-    private validateImportStatements() {
-        let topOfFileIncludeStatements = [] as Array<LibraryStatement | ImportStatement>;
+    private isAllowedAtTopOfFile(statement: Statement): statement is LibraryStatement | ImportStatement | TypecastStatement | AliasStatement {
+        return isLibraryStatement(statement) || isImportStatement(statement) || isTypecastStatement(statement) || isAliasStatement(statement);
+    }
+
+    private getTopOfFileStatements() {
+        let topOfFileIncludeStatements = [] as Array<LibraryStatement | ImportStatement | TypecastStatement | AliasStatement>;
         for (let stmt of this.event.file.parser.ast.statements) {
-            //skip comments
-            if (isCommentStatement(stmt)) {
-                continue;
-            }
             //if we found a non-library statement, this statement is not at the top of the file
-            if (isLibraryStatement(stmt) || isImportStatement(stmt)) {
+            if (this.isAllowedAtTopOfFile(stmt)) {
                 topOfFileIncludeStatements.push(stmt);
             } else {
                 //break out of the loop, we found all of our library statements
                 break;
             }
         }
+        return topOfFileIncludeStatements;
+    }
+
+    private validateTopOfFileStatements() {
+        let topOfFileStatements = this.getTopOfFileStatements();
 
         let statements = [
             // eslint-disable-next-line @typescript-eslint/dot-notation
-            ...this.event.file['_parser'].references.libraryStatements,
+            ...this.event.file['_cachedLookups'].libraryStatements,
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            ...this.event.file['_cachedLookups'].importStatements,
             // eslint-disable-next-line @typescript-eslint/dot-notation
-            ...this.event.file['_parser'].references.importStatements
+            ...this.event.file['_cachedLookups'].aliasStatements
         ];
         for (let result of statements) {
             //if this statement is not one of the top-of-file statements,
             //then add a diagnostic explaining that it is invalid
-            if (!topOfFileIncludeStatements.includes(result)) {
+            if (!topOfFileStatements.includes(result)) {
                 if (isLibraryStatement(result)) {
-                    this.event.file.diagnostics.push({
-                        ...DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile(),
-                        range: result.range,
-                        file: this.event.file
+                    this.event.program.diagnostics.register({
+                        ...DiagnosticMessages.unexpectedStatementLocation('library', 'at the top of the file'),
+                        location: result.location
                     });
                 } else if (isImportStatement(result)) {
-                    this.event.file.diagnostics.push({
-                        ...DiagnosticMessages.importStatementMustBeDeclaredAtTopOfFile(),
-                        range: result.range,
-                        file: this.event.file
+                    this.event.program.diagnostics.register({
+                        ...DiagnosticMessages.unexpectedStatementLocation('import', 'at the top of the file'),
+                        location: result.location
+                    });
+                } else if (isAliasStatement(result)) {
+                    this.event.program.diagnostics.register({
+                        ...DiagnosticMessages.unexpectedStatementLocation('alias', 'at the top of the file'),
+                        location: result.location
                     });
                 }
             }
         }
     }
 
+    private validateTypecastStatements() {
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        for (let typecastStmt of this.event.file['_cachedLookups'].typecastStatements) {
+            let isBadTypecastObj = false;
+
+            const block = typecastStmt.findAncestor<Body | Block>(node => (isBody(node) || isBlock(node)));
+            const resultVarStr = util.getAllDottedGetPartsAsString(typecastStmt.typecastExpression.obj);
+            const hasFunctionAncestor = !!typecastStmt.findAncestor(isFunctionExpression);
+            if (!isVariableExpression(typecastStmt.typecastExpression.obj)) {
+                isBadTypecastObj = true;
+            } else if (!hasFunctionAncestor && resultVarStr.toLowerCase() !== 'm') {
+                // only 'm' can be typecast outside of a function body
+                isBadTypecastObj = true;
+            } else if (block.getSymbolTable().hasSymbol(resultVarStr, SymbolTypeFlag.typetime)) {
+                // can only typecast runtime symbols
+                isBadTypecastObj = true;
+            }
+
+            if (isBadTypecastObj) {
+                this.event.program.diagnostics.register({
+                    ...DiagnosticMessages.invalidTypecastStatementApplication(resultVarStr, hasFunctionAncestor),
+                    location: typecastStmt.typecastExpression.obj.location
+                });
+            }
+
+            let isFirst = true;
+            for (let i = 0; i < typecastStmt.statementIndex; i++) {
+                const targetStatement = block.statements[i];
+                // allow multiple typecast statements at the top of a block or namespace, but no other statements before them
+                isFirst = isFirst && this.isAllowedAtTopOfFile(targetStatement);
+                if (isTypecastStatement(targetStatement) && targetStatement !== typecastStmt) {
+                    // do not allow multiple typecast statements that typecast the same variable, even if they are at the top of the block/namespace
+                    const otherResultVarStr = util.getAllDottedGetPartsAsString(targetStatement.typecastExpression.obj);
+                    if (otherResultVarStr.toLowerCase() === resultVarStr.toLowerCase()) {
+                        isFirst = false;
+                    }
+                }
+                if (!isFirst) {
+                    break;
+                }
+            }
+
+            if (!isFirst) {
+                this.event.program.diagnostics.register({
+                    ...DiagnosticMessages.unexpectedStatementLocation('typecast', 'at the top of the file or beginning of block or namespace'),
+                    location: typecastStmt.location
+                });
+            }
+        }
+    }
+
     private validateContinueStatement(statement: ContinueStatement) {
         const validateLoopTypeMatch = (expectedLoopType: TokenKind) => {
             //coerce ForEach to For
             expectedLoopType = expectedLoopType === TokenKind.ForEach ? TokenKind.For : expectedLoopType;
             const actualLoopType = statement.tokens.loopType;
             if (actualLoopType && expectedLoopType?.toLowerCase() !== actualLoopType.text?.toLowerCase()) {
-                this.event.file.addDiagnostic({
-                    range: statement.tokens.loopType.range,
+                this.event.program.diagnostics.register({
+                    location: statement.tokens.loopType.location,
                     ...DiagnosticMessages.expectedToken(expectedLoopType)
                 });
             }
@@ -409,7 +736,7 @@ export class BrsFileValidator {
                 validateLoopTypeMatch(node.tokens.while.kind);
                 return true;
             } else if (isForStatement(node)) {
-                validateLoopTypeMatch(node.forToken.kind);
+                validateLoopTypeMatch(node.tokens.for.kind);
                 return true;
             } else if (isForEachStatement(node)) {
                 validateLoopTypeMatch(node.tokens.forEach.kind);
@@ -418,8 +745,8 @@ export class BrsFileValidator {
         });
         //flag continue statements found outside of a loop
         if (!parent) {
-            this.event.file.addDiagnostic({
-                range: statement.range,
+            this.event.program.diagnostics.register({
+                location: statement.location,
                 ...DiagnosticMessages.illegalContinueStatement()
             });
         }
@@ -435,25 +762,25 @@ export class BrsFileValidator {
             const node = nodes.shift();
             if (
                 // a?.b = true or a.b?.c = true
-                ((isDottedSetStatement(node) || isDottedGetExpression(node)) && node.dot?.kind === TokenKind.QuestionDot) ||
+                ((isDottedSetStatement(node) || isDottedGetExpression(node)) && node.tokens.dot?.kind === TokenKind.QuestionDot) ||
                 // a.b?[2] = true
-                (isIndexedGetExpression(node) && (node?.questionDotToken?.kind === TokenKind.QuestionDot || node.openingSquare?.kind === TokenKind.QuestionLeftSquare)) ||
+                (isIndexedGetExpression(node) && (node?.tokens.questionDot?.kind === TokenKind.QuestionDot || node.tokens.openingSquare?.kind === TokenKind.QuestionLeftSquare)) ||
                 // a?[1] = true
-                (isIndexedSetStatement(node) && node.openingSquare?.kind === TokenKind.QuestionLeftSquare)
+                (isIndexedSetStatement(node) && node.tokens.openingSquare?.kind === TokenKind.QuestionLeftSquare)
             ) {
                 //try to highlight the entire left-hand-side expression if possible
                 let range: Range;
                 if (isDottedSetStatement(parent)) {
-                    range = util.createBoundingRange(parent.obj, parent.dot, parent.name);
+                    range = util.createBoundingRange(parent.obj?.location, parent.tokens.dot, parent.tokens.name);
                 } else if (isIndexedSetStatement(parent)) {
-                    range = util.createBoundingRange(parent.obj, parent.openingSquare, parent.index, parent.closingSquare);
+                    range = util.createBoundingRange(parent.obj?.location, parent.tokens.openingSquare, ...parent.indexes, parent.tokens.closingSquare);
                 } else {
-                    range = node.range;
+                    range = node.location?.range;
                 }
 
-                this.event.file.addDiagnostic({
+                this.event.program.diagnostics.register({
                     ...DiagnosticMessages.noOptionalChainingInLeftHandSideOfAssignment(),
-                    range: range
+                    location: util.createLocationFromFileRange(this.event.file, range)
                 });
             }
 
@@ -465,6 +792,18 @@ export class BrsFileValidator {
         }
     }
 
+    private setUpComplementSymbolTables(node: IfStatement | ConditionalCompileStatement, predicate: (node: AstNode) => boolean) {
+        if (isBlock(node.elseBranch)) {
+            const elseTable = node.elseBranch.symbolTable;
+            let currentNode = node;
+            while (predicate(currentNode)) {
+                const thenBranch = (currentNode as IfStatement | ConditionalCompileStatement).thenBranch;
+                elseTable.complementOtherTable(thenBranch.symbolTable);
+                currentNode = currentNode.parent as IfStatement | ConditionalCompileStatement;
+            }
+        }
+    }
+
     /**
      * The minimum Roku firmware version that introduced optional chaining support (Roku OS 11).
      * Optional chaining is NOT transpiled by BrighterScript, so this restriction applies to both
@@ -485,13 +824,13 @@ export class BrsFileValidator {
         }
         const coercedMinVersion = semver.coerce(minFirmwareVersion);
         if (coercedMinVersion && semver.lt(coercedMinVersion, BrsFileValidator.OPTIONAL_CHAINING_MIN_VERSION)) {
-            this.event.file.addDiagnostic({
+            this.event.program.diagnostics.register({
                 ...DiagnosticMessages.featureRequiresMinFirmwareVersion(
                     'optional chaining',
                     BrsFileValidator.OPTIONAL_CHAINING_MIN_VERSION,
                     minFirmwareVersion
                 ),
-                range: range
+                location: util.createLocationFromFileRange(this.event.file, range)
             });
         }
     }
diff --git a/src/bscPlugin/validation/ProgramValidator.ts b/src/bscPlugin/validation/ProgramValidator.ts
index cf56d9766..f5eed5c46 100644
--- a/src/bscPlugin/validation/ProgramValidator.ts
+++ b/src/bscPlugin/validation/ProgramValidator.ts
@@ -1,10 +1,14 @@
 import { isBrsFile } from '../../astUtils/reflection';
 import { DiagnosticMessages } from '../../DiagnosticMessages';
-import type { Program } from '../../Program';
+import type { AfterValidateProgramEvent } from '../../interfaces';
 import util from '../../util';
 
+export const ProgramValidatorDiagnosticsTag = 'ProgramValidator';
+
 export class ProgramValidator {
-    constructor(private program: Program) { }
+    constructor(
+        private event: AfterValidateProgramEvent
+    ) { }
 
     public process() {
         this.flagScopelessBrsFiles();
@@ -14,23 +18,22 @@ export class ProgramValidator {
      * Flag any files that are included in 0 scopes.
      */
     private flagScopelessBrsFiles() {
-        for (const key in this.program.files) {
-            const file = this.program.files[key];
+        for (const key in this.event.program.files) {
+            const file = this.event.program.files[key];
 
             if (
                 //if this isn't a brs file, skip
                 !isBrsFile(file) ||
                 //if the file is included in at least one scope, skip
-                this.program.getFirstScopeForFile(file)
+                this.event.program.getFirstScopeForFile(file)
             ) {
                 continue;
             }
 
-            this.program.addDiagnostics([{
+            this.event.program.diagnostics.register({
                 ...DiagnosticMessages.fileNotReferencedByAnyOtherFile(),
-                file: file,
-                range: util.createRange(0, 0, 0, Number.MAX_VALUE)
-            }]);
+                location: util.createLocationFromFileRange(file, util.createRange(0, 0, 0, Number.MAX_VALUE))
+            }, { tags: [ProgramValidatorDiagnosticsTag] });
         }
     }
 }
diff --git a/src/bscPlugin/validation/ScopeValidator.spec.ts b/src/bscPlugin/validation/ScopeValidator.spec.ts
new file mode 100644
index 000000000..140a12689
--- /dev/null
+++ b/src/bscPlugin/validation/ScopeValidator.spec.ts
@@ -0,0 +1,7051 @@
+import * as sinonImport from 'sinon';
+import { DiagnosticMessages } from '../../DiagnosticMessages';
+import { Program } from '../../Program';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectTypeToBe, expectZeroDiagnostics, trim } from '../../testHelpers.spec';
+import { expect } from 'chai';
+import type { TypeCompatibilityData } from '../../interfaces';
+import { IntegerType } from '../../types/IntegerType';
+import { StringType } from '../../types/StringType';
+import type { BrsFile } from '../../files/BrsFile';
+import { FloatType, InterfaceType, TypedFunctionType, VoidType, BooleanType, ArrayType } from '../../types';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import { AssociativeArrayType } from '../../types/AssociativeArrayType';
+import undent from 'undent';
+import * as fsExtra from 'fs-extra';
+import { tempDir, rootDir } from '../../testHelpers.spec';
+import { isReturnStatement } from '../../astUtils/reflection';
+import { ScopeValidator } from './ScopeValidator';
+import type { ReturnStatement } from '../../parser/Statement';
+import { Logger } from '@rokucommunity/logger';
+
+describe('ScopeValidator', () => {
+
+    let sinon = sinonImport.createSandbox();
+    let program: Program;
+
+    beforeEach(() => {
+        fsExtra.emptyDirSync(tempDir);
+        program = new Program({
+            rootDir: rootDir
+        });
+        program.createSourceScope();
+    });
+
+    afterEach(() => {
+        sinon.restore();
+        program.dispose();
+    });
+
+    it('validateReturnStatement does not crash', () => {
+        program.options.autoImportComponentScript = true;
+        program.setFile('components/Component.xml', trim`
+            <component name="Test" extends="Group">
+            </component>
+        `);
+        const file = program.setFile<BrsFile>('components/Component.bs', trim`
+            function test()
+                return {
+                    method: function()
+                        return true
+                    end function
+                }
+            end function
+        `);
+        const returnStatement = file.ast.findChild<ReturnStatement>(isReturnStatement);
+        delete returnStatement.parent;
+        const validator = new ScopeValidator();
+        //should not crash
+        validator['validateReturnStatement'](file, returnStatement);
+    });
+
+    describe('mismatchArgumentCount', () => {
+        it('detects calling functions with too many arguments', () => {
+            program.setFile('source/file.brs', `
+                sub a()
+                end sub
+                sub b()
+                    a(1)
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(0, 1).message
+            ]);
+        });
+
+        it('detects calling class constructors with too many arguments', () => {
+            program.setFile('source/main.bs', `
+                    function noop0()
+                    end function
+
+                    function noop1(p1)
+                    end function
+
+                    sub main()
+                       noop0(1)
+                       noop1(1,2)
+                       noop1()
+                    end sub
+                `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(0, 1),
+                DiagnosticMessages.mismatchArgumentCount(1, 2),
+                DiagnosticMessages.mismatchArgumentCount(1, 0)
+            ]);
+        });
+
+        it('detects calling functions with too few arguments', () => {
+            program.setFile('source/file.brs', `
+                    sub a(name)
+                    end sub
+                    sub b()
+                        a()
+                    end sub
+                `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(1, 0)
+            ]);
+        });
+
+        it('allows skipping optional parameter', () => {
+            program.setFile('source/file.brs', `
+                    sub a(name="Bob")
+                    end sub
+                    sub b()
+                        a()
+                    end sub
+                `);
+            program.validate();
+            //should have an error
+            expectZeroDiagnostics(program);
+        });
+
+        it('shows expected parameter range in error message', () => {
+            program.setFile('source/file.brs', `
+                    sub a(age, name="Bob")
+                    end sub
+                    sub b()
+                        a()
+                    end sub
+                `);
+            program.validate();
+            //should have an error
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount('1-2', 0)
+            ]);
+        });
+
+        it('handles expressions as arguments to a function', () => {
+            program.setFile('source/file.brs', `
+                    sub a(age, name="Bob")
+                    end sub
+                    sub b()
+                        a("cat" + "dog" + "mouse")
+                    end sub
+                `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('Catches extra arguments for expressions as arguments to a function', () => {
+            program.setFile('source/file.brs', `
+                    sub a(age)
+                    end sub
+                    sub b()
+                        a(m.lib.movies[0], 1)
+                    end sub
+                `);
+            program.validate();
+            //should have an error
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(1, 2)
+            ]);
+        });
+
+
+        it('allows any number of parameters in a function used as an argument', () => {
+            program.setFile('source/file.brs', `
+                    sub tryManyParams(someFunc as function)
+                        someFunc(1, 2, "hello", "world")
+                    end sub
+                `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('checks for at least the number of non-optional args on variadic (callFunc) functions', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.brs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.brs', `
+                sub someFunc(input as object)
+                    print input
+                end sub
+            `);
+            program.setFile('source/util.bs', `
+                sub useCallFunc(input as roSGNodeWidget)
+                    input.callFunc()
+                end sub
+            `);
+            program.validate();
+            //should have an error
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount('1-63', 0)
+            ]);
+        });
+
+        it('any number number of args on variadic (callFunc) functions', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.brs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.brs', `
+                sub someFunc(input as object)
+                    print input
+                end sub
+            `);
+            program.setFile('source/util.bs', `
+                sub useCallFunc(input as roSGNodeWidget, funcToCall as string)
+                    input.callFunc(funcToCall, 1, 2, 3, {})
+                end sub
+            `);
+            program.validate();
+            // no error, because we can't know what function you're actually calling
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('checks for target args count on callfunc', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.brs"/>
+                    <interface>
+                        <function name="someFunc" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/Widget.brs', `
+                sub someFunc(input as object)
+                    print input
+                end sub
+            `);
+            program.setFile('source/util.bs', `
+                sub useCallFunc(input as roSGNodeWidget)
+                    input.callFunc("someFunc", 1, 2, 3, {})
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(2, 5)
+            ]);
+        });
+
+        it('validates against scope-defined func in inner namespace, when outer namespace has same named func', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    sub foo()
+                    end sub
+
+                    namespace beta
+                        sub bar()
+                            foo()
+                        end sub
+                    end namespace
+                end namespace
+
+                function foo(x as integer) as integer
+                    return x
+                end function
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(1, 0).message
+            ]);
+        });
+
+        it('validates against functions defined in intersection types', () => {
+            program.setFile('source/main.bs', `
+                interface IFirst
+                    num as integer
+                end interface
+                interface ISecond
+                    function doThing2(a as integer, b as string) as void
+                end interface
+
+                sub main(thing as IFirst and ISecond)
+                    thing.doThing2(thing.num)
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(2, 1).message
+            ]);
+        });
+
+        it('validates against typed functions types', () => {
+            program.setFile('source/main.bs', `
+                sub main(cb as function(num as integer, name as string) as void)
+                    cb(1)
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(2, 1).message
+            ]);
+        });
+
+        it('validates against typed functions types from type statements', () => {
+            program.setFile('source/main.bs', `
+                type Callback = function(num as integer, name as string) as void
+                sub main(cb as Callback)
+                    cb(1)
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.mismatchArgumentCount(2, 1).message
+            ]);
+        });
+    });
+
+    describe('argumentTypeMismatch', () => {
+        it('param `as object` supports all known types', () => {
+            program.setFile('source/file.bs', `
+                sub main()
+                    consoleLog(Direction.up)
+                    consoleLog(true)
+                    consoleLog(main)
+                    consoleLog(1.2)
+                    consoleLog({} as Video)
+                    consoleLog("test")
+                end sub
+
+                sub consoleLog(thing as object)
+                    print thing
+                end sub
+
+                interface Video
+                    url as string
+                end interface
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('`as object` var can be passed to various param types', () => {
+            program.setFile('source/file.bs', `
+                sub main()
+                    obj = {} as object
+
+                    printBoolean(obj)
+                    printClass(obj)
+                    printDouble(obj)
+                    printEnum(obj)
+                    printFloat(obj)
+                    printFunction(obj)
+                    printInteger(obj)
+                    printInterface(obj)
+                    printLongInteger(obj)
+                    printString(obj)
+                end sub
+
+                sub printBoolean(value as boolean)
+                    print value
+                end sub
+
+                class Person
+                    name as string
+                end class
+
+                sub printClass(value as Person)
+                    print value
+                end sub
+
+                sub printDouble(value as double)
+                    print value
+                end sub
+
+                enum Direction
+                    up = "up"
+                end enum
+
+                sub printEnum(value as Direction)
+                    print value
+                end sub
+
+                sub printFloat(value as float)
+                    print value
+                end sub
+
+                sub printFunction(value as function)
+                    print value
+                    print value(1)
+                end sub
+
+                interface Video
+                    url as string
+                end interface
+
+                sub printInterface(value as Video)
+                    print value
+                end sub
+
+                sub printInteger(value as integer)
+                    print value
+                end sub
+
+                sub printLongInteger(value as LongInteger)
+                    print value
+                end sub
+
+                sub printString(value as string)
+                    print value
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('treats string enums as strings when assigned to string vars', () => {
+            program.setFile('source/file.bs', `
+                sub main()
+                    printDirection(Direction.up)
+                end sub
+
+                sub printDirection(theDirection as string)
+                    print theDirection
+                end sub
+
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('does not treat strings as a string enum', () => {
+            program.setFile('source/file.bs', `
+                sub main()
+                    printDirection("up")
+                end sub
+
+                sub printDirection(theDirection as Direction)
+                    print theDirection
+                end sub
+
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('string', 'Direction').message
+            ]);
+        });
+
+        it('supports passing enum type as enum type', () => {
+            program.setFile('source/file.bs', `
+                sub test(theDirection as Direction)
+                    printDirection(theDirection)
+                end sub
+
+                sub printDirection(theDirection as Direction)
+                    print theDirection
+                end sub
+
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+            ]);
+        });
+
+        it('Catches argument type mismatches on function calls', () => {
+            program.setFile('source/file.brs', `
+                    sub a(age as integer)
+                    end sub
+                    sub b()
+                        a("hello")
+                    end sub
+                `);
+            program.validate();
+            //should have an error
+            expect(program.getDiagnostics().map(x => x.message)).to.include(
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            );
+        });
+
+        it('Catches argument type mismatches on function calls for functions defined in another file', () => {
+            program.setFile('source/file.brs', `
+                    sub a(age as integer)
+                    end sub
+                `);
+            program.setFile('source/file2.brs', `
+                    sub b()
+                        a("hello")
+                        foo = "foo"
+                        a(foo)
+                    end sub
+                `);
+            program.validate();
+            //should have an error
+            expect(program.getDiagnostics().map(x => x.message)).to.include(
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            );
+        });
+
+        it('catches argument type mismatches on function calls within namespaces', () => {
+            program.setFile('source/file.bs', `
+                    namespace Name.Space
+                        sub a(param as integer)
+                            print param
+                        end sub
+
+                        sub b()
+                            a("hello")
+                            foo = "foo"
+                            a(foo)
+                        end sub
+                    end namespace
+                    `);
+            program.validate();
+            //should have an error
+            expect(program.getDiagnostics().map(x => x.message)).to.include(
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            );
+        });
+
+        it('catches argument type mismatches on function calls as arguments', () => {
+            program.setFile('source/file1.bs', `
+                        sub a(param as string)
+                            print param
+                        end sub
+
+                        function getNum() as integer
+                            return 1
+                        end function
+
+                        sub b()
+                            a(getNum())
+                        end sub
+                    `);
+            program.validate();
+            //should have an error
+            expect(program.getDiagnostics().map(x => x.message)).to.include(
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message
+            );
+        });
+
+
+        it('catches argument type mismatches on function calls within namespaces across files', () => {
+            program.setFile('source/file1.bs', `
+                    namespace Name.Space
+                        function getNum() as integer
+                            return 1
+                        end function
+
+                        function getStr() as string
+                            return "hello"
+                        end function
+                    end namespace
+                    `);
+            program.setFile('source/file2.bs', `
+                    namespace Name.Space
+                        sub needsInt(param as integer)
+                            print param
+                        end sub
+
+                        sub someFunc()
+                            needsInt(getStr())
+                            needsInt(getNum())
+                        end sub
+                    end namespace
+                    `);
+            program.validate();
+            //should have an error
+            expect(program.getDiagnostics().length).to.equal(1);
+            expect(program.getDiagnostics().map(x => x.message)).to.include(
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            );
+        });
+
+        it('correctly validates correct parameters that are class members', () => {
+            program.setFile('source/main.bs', `
+                class PiHolder
+                    pi = 3.14
+                    function getPi() as float
+                        return m.pi
+                    end function
+                end class
+
+                sub takesFloat(fl as float)
+                end sub
+
+                sub someFunc()
+                    holder = new PiHolder()
+                    takesFloat(holder.pi)
+                    takesFloat(holder.getPI())
+                end sub`);
+            program.validate();
+            //should have no error
+            expectZeroDiagnostics(program);
+        });
+
+        it('correctly validates wrong parameters that are class members', () => {
+            program.setFile('source/main.bs', `
+                class PiHolder
+                    pi = 3.14
+                    name = "hello"
+                    function getPi() as float
+                        return m.pi
+                    end function
+                end class
+
+                sub takesFloat(fl as float)
+                end sub
+
+                sub someFunc()
+                    holder = new PiHolder()
+                    takesFloat(holder.name)
+                    takesFloat(Str(holder.getPI()))
+                end sub`);
+            program.validate();
+            //should have error: holder.name is string
+            expect(program.getDiagnostics().length).to.equal(2);
+            expect(program.getDiagnostics().map(x => x.message)).to.include(
+                DiagnosticMessages.argumentTypeMismatch('string', 'float').message
+            );
+        });
+
+        it('correctly validates correct parameters that are interface members', () => {
+            program.setFile('source/main.bs', `
+                interface IPerson
+                    height as float
+                    name as string
+                    function getWeight() as float
+                    function getAddress() as string
+                end interface
+
+                sub takesFloat(fl as float)
+                end sub
+
+                sub someFunc(person as IPerson)
+                    takesFloat(person.height)
+                    takesFloat(person.getWeight())
+                end sub`);
+            program.validate();
+            //should have no error
+            expectZeroDiagnostics(program);
+        });
+
+        it('correctly validates wrong parameters that are interface members', () => {
+            program.setFile('source/main.bs', `
+                    interface IPerson
+                        isAlive as boolean
+                        function getAddress() as string
+                    end interface
+
+                    sub takesFloat(fl as float)
+                    end sub
+
+                    sub someFunc(person as IPerson)
+                        takesFloat(person.isAlive)
+                        takesFloat(person.getAddress())
+                    end sub
+                `);
+            program.validate();
+            //should have 2 errors: person.name is string (not float) and person.getAddress() is object (not float)
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('boolean', 'float').message,
+                DiagnosticMessages.argumentTypeMismatch('string', 'float').message
+            ]);
+        });
+
+        it('`as object` param allows all types', () => {
+            program.setFile('source/main.bs', `
+                    sub takesObject(obj as Object)
+                    end sub
+
+                    sub main()
+                        takesObject(true)
+                        takesObject(1)
+                        takesObject(1.2)
+                        takesObject(1.2#)
+                        takesObject("text")
+                        takesObject({})
+                        takesObject([])
+                    end sub
+                `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows conversions for arguments', () => {
+            program.setFile('source/main.bs', `
+                sub takesFloat(fl as float)
+                end sub
+
+                sub someFunc()
+                    takesFloat(1)
+                end sub`);
+            program.validate();
+            //should have no error
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows subclasses as arguments', () => {
+            program.setFile('source/main.bs', `
+
+                class Animal
+                end class
+
+                class Dog extends Animal
+                end class
+
+                class Retriever extends Dog
+                end class
+
+                class Lab extends Retriever
+                end class
+
+                sub takesAnimal(thing as Animal)
+                end sub
+
+                sub someFunc()
+                    fido = new Lab()
+                    takesAnimal(fido)
+                end sub`);
+            program.validate();
+            //should have no error
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows subclasses from namespaces as arguments', () => {
+            program.setFile('source/main.bs', `
+
+                class Outside
+                end class
+
+                class ChildOutExtendsInside extends NS.Inside
+                end class
+
+                namespace NS
+                    class Inside
+                    end class
+
+                    class ChildInExtendsOutside extends Outside
+                    end class
+
+                    class ChildInExtendsInside extends Inside
+                        sub methodTakesInside(i as Inside)
+                        end sub
+                    end class
+
+                    sub takesInside(klass as Inside)
+                    end sub
+
+                    sub testFuncInNamespace()
+                        takesOutside(new Outside())
+                        takesOutside(new NS.ChildInExtendsOutside())
+
+                        ' These call NS.takesInside
+                        takesInside(new NS.Inside())
+                        takesInside(new Inside())
+                        takesInside(new NS.ChildInExtendsInside())
+                        takesInside(new ChildInExtendsInside())
+                        takesInside(new ChildOutExtendsInside())
+
+                        child = new ChildInExtendsInside()
+                        child.methodTakesInside(new Inside())
+                        child.methodTakesInside(new ChildInExtendsInside())
+                        child.methodTakesInside(new ChildOutExtendsInside())
+                    end sub
+
+                end namespace
+
+                sub takesOutside(klass as Outside)
+                end sub
+
+                sub takesInside(klass as NS.Inside)
+                end sub
+
+                sub testFunc()
+                    takesOutside(new Outside())
+                    takesOutside(new NS.ChildInExtendsOutside())
+
+                    takesInside(new NS.Inside())
+                    takesInside(new NS.ChildInExtendsInside())
+                    takesInside(new ChildOutExtendsInside())
+
+                    NS.takesInside(new NS.Inside())
+                    NS.takesInside(new NS.ChildInExtendsInside())
+                    NS.takesInside(new ChildOutExtendsInside())
+
+                    child = new NS.ChildInExtendsInside()
+                    child.methodTakesInside(new NS.Inside())
+                    child.methodTakesInside(new NS.ChildInExtendsInside())
+                    child.methodTakesInside(new ChildOutExtendsInside())
+                end sub`);
+            program.validate();
+            //should have no error
+            expectZeroDiagnostics(program);
+        });
+
+        it('respects union types', () => {
+            program.setFile('source/main.bs', `
+                sub takesStringOrKlass(p as string or Klass)
+                end sub
+
+                class Klass
+                end class
+
+                sub someFunc()
+                    myKlass = new Klass()
+                    takesStringOrKlass("test")
+                    takesStringOrKlass(myKlass)
+                    takesStringOrKlass(1)
+                end sub`);
+            program.validate();
+            //should have error when passed an integer
+            expect(program.getDiagnostics().length).to.equal(1);
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string or Klass').message
+            ]);
+        });
+
+
+        it('validates functions assigned to variables', () => {
+            program.setFile('source/main.bs', `
+                sub someFunc()
+                    myFunc = function(i as integer, s as string)
+                        print i+1
+                        print s.len()
+                    end function
+                    myFunc("hello", 2)
+                end sub`);
+            program.validate();
+            //should have error when passed incorrect types
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message,
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message
+            ]);
+        });
+
+        it('allows any parameter types in a function passed as an argument', () => {
+            program.setFile('source/file.brs', `
+                    function getStrLength(name as string) as integer
+                        return len(name)
+                    end function
+
+                    sub tryManyParams(someFunc as function)
+                        print someFunc(1, 2, "hello", "world")
+                    end sub
+
+                    sub test()
+                        tryManyParams(getStrLength)
+                    end sub
+                `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows a inline function as an argument of type function', () => {
+            program.setFile('source/file.brs', `
+                    sub tryManyParams(someFunc as function)
+                        print someFunc(1, 2, "hello", "world")
+                    end sub
+
+                    sub test()
+                        tryManyParams(sub (i as integer)
+                            print i
+                        end sub)
+                    end sub
+                `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates when a non-function is used as an argument expecting a function', () => {
+            program.setFile('source/file.brs', `
+                    sub tryManyParams(someFunc as function)
+                        print someFunc(1, 2, "hello", "world")
+                    end sub
+
+                    sub test()
+                        notAFunction = 3.14
+                        tryManyParams(notAFunction)
+                    end sub
+                `);
+            program.validate();
+            //should have an error that the argument is not a function
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float', 'function').message
+            ]);
+        });
+
+        it('allows a class constructor to be passed as arg to param typed `as function`', () => {
+            program.setFile('source/file.bs', `
+                sub callSomeFunc(someFunc as function)
+                    someFunc()
+                end sub
+
+                class MyKlass
+                end class
+
+                sub doStuff()
+                callSomeFunc(MyKlass)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows a namespaced class constructor to be passed as arg to param typed `as function`', () => {
+            program.setFile('source/file.bs', `
+                sub callSomeFunc(someFunc as function)
+                    someFunc()
+                end sub
+
+                namespace Alpha
+                    class MyKlass
+                    end class
+
+                    sub doStuff()
+                        callSomeFunc(MyKlass)
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows any variable to passed as argument to an untyped param with default type invalid', () => {
+            program.setFile('source/util.brs', `
+                sub doSomething(x = invalid)
+                    print x
+                end sub
+
+                sub tests()
+                    doSomething(1)
+                    doSomething(1.1)
+                    doSomething("Hello")
+                    doSomething(true)
+                    doSomething({test: true})
+                end sub
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows calling future function and save to same variable', () => {
+            program.setFile('source/util.brs', `
+                function getSomeInt() as integer
+                    numVal = getUntypedNum()
+                    numVal = cInt(numVal)
+                    return numVal
+                end function
+
+                function getUntypedNum()
+                    return 1
+                end function
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows union types of all compatible types as arg', () => {
+            program.setFile('source/util.bs', `
+                sub printIntNum(num as float or double or integer)
+                    print cInt(num)
+                end sub
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows function calls of built-in members of primitives', () => {
+            program.setFile('source/util.brs', `
+                sub doSomething()
+                    myStr = "Hello World"
+                    myStr = myStr.replace("World", "You")
+                    print myStr
+                end sub
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates union types of all compatible types as arg - when some do not work', () => {
+            program.setFile('source/util.bs', `
+                sub printIntNum(maybeNum as float or string)
+                    print cInt(maybeNum)
+                end sub
+            `);
+            program.validate();
+            //should have no errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float or string', 'float').message
+            ]);
+        });
+
+        it('validates function calls of built-in members of primitives', () => {
+            program.setFile('source/util.brs', `
+                sub doSomething()
+                    myStr = "Hello World"
+                    notAString = 3.14
+                    myStr = myStr.replace("World", notAString)
+                    print myStr
+                end sub
+            `);
+            program.validate();
+            //should have error - 2nd param should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float', 'string').message
+            ]);
+        });
+
+        it('validates method calls of classes', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                    sub test(input as string)
+                    end sub
+                end class
+
+                sub doSomething()
+                    k = new Klass()
+                    k.test(3.14)
+                end sub
+            `);
+            program.validate();
+            //should have error - param should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float', 'string').message
+            ]);
+        });
+
+        it('validates inside method calls of classes', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                    sub test(input as string)
+                    end sub
+
+                    sub otherTest()
+                        m.test(3.14)
+                    end sub
+                end class
+            `);
+            program.validate();
+            //should have error - param should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float', 'string').message
+            ]);
+        });
+
+        it('validates calls of a constructor', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                   sub new(name as string)
+                   end sub
+                end class
+
+                sub createKlass()
+                    k = new Klass(3.14)
+                end sub
+            `);
+            program.validate();
+            //should have error - param should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float', 'string').message
+            ]);
+        });
+
+        it('validates super calls in a constructor', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                   sub new(name as string)
+                   end sub
+                end class
+
+                class SubKlass extends Klass
+                    sub new()
+                        super(3.14)
+                    end sub
+                end class
+            `);
+            program.validate();
+            //should have error - param should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float', 'string').message
+            ]);
+        });
+
+        it('validates super calls in a class methods', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                   sub test(name as string)
+                   end sub
+                end class
+
+                class SubKlass extends Klass
+                    sub test2()
+                        super.test(3.14)
+                    end sub
+                end class
+            `);
+            program.validate();
+            //should have error - param should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('float', 'string').message
+            ]);
+        });
+
+
+        it('validates a function passed as an arg', () => {
+            program.setFile('source/util.bs', `
+                sub foo()
+                    getPi = function()
+                        return 3.14
+                    end function
+                    bar(getPi)
+                end sub
+
+
+                sub bar(num as integer)
+                    print num
+                end sub
+            `);
+            program.validate();
+            //should have error - param should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('function () as dynamic', 'integer').message
+            ]);
+        });
+
+
+        it('allows AAs that match an interface to be passed as args', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    takesMyIface({beta: "hello", charlie: "world"})
+                end sub
+
+                sub takesMyIface(iFace as MyIFace)
+                end sub
+
+                interface MyIFace
+                    beta as string
+                    charlie as string
+                end interface
+            `);
+            program.validate();
+            //should have error
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates empty AAs that are passed as args to param expecting interface', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    takesMyIface({})
+                end sub
+
+                sub takesMyIface(iFace as MyIFace)
+                end sub
+
+                interface MyIFace
+                    beta as string
+                    charlie as string
+                end interface
+            `);
+            program.validate();
+            //should have error
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', 'MyIFace', {
+                    missingFields: [{ name: 'beta', expectedType: StringType.instance }, { name: 'charlie', expectedType: StringType.instance }]
+                }).message
+            ]);
+        });
+
+        it('includes data on missing fields', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    takesMyIface({charlie: "hello"})
+                end sub
+
+                sub takesMyIface(iFace as MyIFace)
+                end sub
+
+                interface MyIFace
+                    beta as string
+                    charlie as integer
+                end interface
+            `);
+            program.validate();
+
+            //should have error
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', 'MyIFace', {
+                    missingFields: [{ name: 'beta', expectedType: StringType.instance }],
+                    fieldMismatches: [{ name: 'charlie', expectedType: IntegerType.instance, actualType: StringType.instance }]
+                }).message
+            ]);
+
+            //The aa should have 'beta' and 'charlie' properties of type string and integer
+            const diagnostics = program.getDiagnostics();
+            expect(diagnostics.length).to.eq(1);
+            const data: TypeCompatibilityData = diagnostics[0].data;
+            expect(data.missingFields.length).to.eq(1);
+            expect(data.missingFields[0].name).to.eq('beta');
+            expectTypeToBe(data.missingFields[0].expectedType, StringType);
+            expect(data.fieldMismatches.length).to.eq(1);
+            expect(data.fieldMismatches[0].name).to.eq('charlie');
+            expectTypeToBe(data.fieldMismatches[0].expectedType, IntegerType);
+            expectTypeToBe(data.fieldMismatches[0].actualType, StringType);
+        });
+
+        it('allows interfaces that have a superset of properties', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    takesMyIface({alpha: true, beta: "hello", charlie: 1})
+                end sub
+
+                sub takesMyIface(iFace as MyIFace)
+                end sub
+
+                interface MyIFace
+                    beta as string
+                    charlie as integer
+                end interface
+            `);
+            program.validate();
+
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows interfaces that have a superset of properties', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(otherFace as MyOtherFace)
+                    takesMyIface(otherFace)
+                end sub
+
+                sub takesMyIface(iFace as MyIFace)
+                end sub
+
+                interface MyIFace
+                    beta as string
+                    charlie as integer
+                end interface
+
+                interface MyOtherFace
+                    alpha as boolean
+                    beta as string
+                    charlie as integer
+                end interface
+            `);
+            program.validate();
+
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('includes data on missing fields', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    takesMyIface({charlie: "hello"})
+                end sub
+
+                sub takesMyIface(iFace as MyIFace)
+                end sub
+
+                interface MyIFace
+                    beta as string
+                    charlie as integer
+                end interface
+            `);
+            program.validate();
+
+            //should have error
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', 'MyIFace', {
+                    missingFields: [{ name: 'beta', expectedType: StringType.instance }],
+                    fieldMismatches: [{ name: 'charlie', expectedType: IntegerType.instance, actualType: StringType.instance }]
+                }).message
+            ]);
+
+            //The aa should have 'beta' and 'charlie' properties of type string and integer
+            const diagnostics = program.getDiagnostics();
+            expect(diagnostics.length).to.eq(1);
+            const data: TypeCompatibilityData = diagnostics[0].data;
+            expect(data.missingFields.length).to.eq(1);
+            expect(data.missingFields[0].name).to.eq('beta');
+            expectTypeToBe(data.missingFields[0].expectedType, StringType);
+            expect(data.fieldMismatches.length).to.eq(1);
+            expect(data.fieldMismatches[0].name).to.eq('charlie');
+            expectTypeToBe(data.fieldMismatches[0].expectedType, IntegerType);
+            expectTypeToBe(data.fieldMismatches[0].actualType, StringType);
+        });
+
+        it('allows a non-built-in void function as an argument', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                sub voidFunc() as void
+                end sub
+
+                sub doPrint(x)
+                    print x
+                end sub
+
+                sub useVoidAsArg()
+                    doPrint(voidFunc()) ' will print "invalid"
+                end sub
+                `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates a built-in void function as an argument', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                sub doPrint(x)
+                    print x
+                end sub
+
+                sub useVoidAsArg()
+                    arr = [1,2,3]
+                    doPrint(arr.push(4))
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('uninitialized', 'dynamic').message
+            ]);
+        });
+
+        describe('default params', () => {
+            it('generalizes EnumMembers to their parent types', () => {
+                program.setFile('source/util.bs', `
+                    sub takesEnum(enumVal = Direction.South)
+                        print enumVal
+                    end sub
+
+                    sub callTestFunc()
+                        takesEnum(Direction.North)
+                    end sub
+
+                    enum Direction
+                        North
+                        South
+                    end enum
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('works with future declared types', () => {
+                program.setFile('source/util.bs', `
+                    sub takesKlass(klassInstance = new Klass())
+                        print klassInstance
+                    end sub
+
+                    sub callTestFunc()
+                        takesKlass()
+                        myKlass = new Klass()
+                        takesKlass(myKlass)
+                    end sub
+
+                    class Klass
+                        name as string
+                    end class
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates against future declared types', () => {
+                program.setFile('source/util.bs', `
+                    sub takesKlass(klassInstance = new Klass())
+                        print klassInstance
+                    end sub
+
+                    sub callTestFunc()
+                        myOKlass = new OtherKlass()
+                        takesKlass(myOKlass)
+                    end sub
+
+                    class Klass
+                        name as string
+                    end class
+
+                     class OtherKlass
+                        name as integer
+                    end class
+                `);
+                program.validate();
+                //should have no errors
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('OtherKlass', 'Klass').message
+                ]);
+            });
+
+            it('validates against future declared types in different namespace', () => {
+                program.setFile('source/util.bs', `
+                    sub takesKlass(klassInstance = new alpha.beta.Klass())
+                        print klassInstance
+                    end sub
+
+                    sub callTestFunc()
+                        myOKlass = new alpha.beta.OtherKlass()
+                        takesKlass(myOKlass)
+                    end sub
+
+                    namespace alpha.beta
+                        class Klass
+                            name as string
+                        end class
+
+                        class OtherKlass
+                            name as integer
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                //should have no errors
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('alpha.beta.OtherKlass', 'alpha.beta.Klass').message
+                ]);
+            });
+
+            it('should correctly be able to modify an array with enum initial values', () => {
+                program.setFile<BrsFile>('source/util.bs', `
+                    function alsoGoEast(path = [Direction.North, Direction.South])
+                        path.Push(Direction.East) ' "path" should be typed as Array<Direction>
+                        return path
+                    end function
+
+                    enum Direction
+                        North = "North"
+                        South = "South"
+                        East = "East"
+                        West = "West"
+                    end  enum
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+
+        describe('array compatibility', () => {
+            it('accepts dynamic when assigning to a roArray', () => {
+                program.setFile('source/util.bs', `
+                    sub takesArray(arr as roArray)
+                    end sub
+
+                    sub doStuff(someArray)
+                        takesArray(someArray)
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('accepts roArray when assigning to a roArray', () => {
+                program.setFile('source/util.bs', `
+                    sub takesArray(arr as roArray)
+                    end sub
+
+                    sub doStuff(someArray as roArray)
+                        takesArray(someArray)
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('accepts typed arrays when assigning to a roArray', () => {
+                program.setFile('source/util.bs', `
+                    sub takesArray(arr as roArray)
+                    end sub
+
+                    sub doStuff(someArray as dynamic[])
+                        takesArray(someArray)
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+
+            it('accepts roArray when assigning to dynamic[]', () => {
+                program.setFile('source/util.bs', `
+                    sub takesArray(arr as dynamic[])
+                    end sub
+
+                    sub doStuff(someArray as roArray)
+                        takesArray(someArray)
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('accepts roArray when assigning to typed array', () => {
+                program.setFile('source/util.bs', `
+                    sub takesArray(arr as string[])
+                    end sub
+
+                    sub doStuff(someArray as roArray)
+                        takesArray(someArray)
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates when typed array types are incompatible', () => {
+                program.setFile('source/util.bs', `
+                    sub takesArray(arr as string[])
+                    end sub
+
+                    sub doStuff(someArray as integer[])
+                        takesArray(someArray)
+                    end sub
+                `);
+                program.validate();
+                //should have errors
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('Array<integer>', 'Array<string>').message
+                ]);
+            });
+
+            it('accepts when typed array types are compatible', () => {
+                program.setFile('source/util.bs', `
+                    sub takesArray(arr as float[])
+                    end sub
+
+                    sub doStuff(someArray as integer[])
+                        takesArray(someArray)
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+        });
+
+        describe('interface with optional properties', () => {
+
+            it('allows using interfaces with optional props', () => {
+                program.setFile('source/util.bs', `
+                    function takesIFace(iface as MyIFace) as string
+                        if invalid <> iface.name
+                            return iface.name
+                        else if invalid <> iface.data
+                            return FormatJson(iface.data)
+                        end if
+                        return "no"
+                    end function
+
+                    sub doStuff(iface as MyIFace)
+                        print takesIFace(iface)
+                    end sub
+
+                    interface MyIFace
+                        optional name as string
+                        optional data
+                    end interface
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows using passing AAs with missing optional properties', () => {
+                program.setFile('source/util.bs', `
+                    function takesIFace(iface as MyIFace) as string
+                        if invalid <> iface.name
+                            return iface.name
+                        else if invalid <> iface.data
+                            return FormatJson(iface.data)
+                        end if
+                        return "no"
+                    end function
+
+                    sub doStuff(iface as MyIFace)
+                        print takesIFace({name: "Hello"})
+                    end sub
+
+                    interface MyIFace
+                        optional name as string
+                        optional data
+                    end interface
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('disallows using AAs with bad types for optional properties', () => {
+                program.setFile('source/util.bs', `
+                    function takesIFace(iface as MyIFace) as string
+                        if invalid <> iface.name
+                            return iface.name
+                        else if invalid <> iface.data
+                            return FormatJson(iface.data)
+                        end if
+                        return "no"
+                    end function
+
+                    sub doStuff(iface as MyIFace)
+                        print takesIFace({name: 3.14})
+                    end sub
+
+                    interface MyIFace
+                        optional name as string
+                        optional data
+                    end interface
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', 'MyIFace', {
+                        fieldMismatches: [{ name: 'name', expectedType: StringType.instance, actualType: FloatType.instance }]
+                    }).message
+                ]);
+            });
+
+            it('disallows passing classes with bad types for optional properties', () => {
+                program.setFile('source/util.bs', `
+                    function takesIFace(iface as MyIFace) as string
+                        if invalid <> iface.name
+                            return iface.name
+                        else if invalid <> iface.data
+                            return FormatJson(iface.data)
+                        end if
+                        return "no"
+                    end function
+
+                    sub doStuff(iface as MyIFace)
+                        k = new MyKlass()
+                        print takesIFace(k)
+                    end sub
+
+                    interface MyIFace
+                        optional name as string
+                        optional data
+                    end interface
+
+                    class MyKlass
+                        name as float
+                    end class
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('MyKlass', 'MyIFace', {
+                        fieldMismatches: [{ name: 'name', expectedType: StringType.instance, actualType: FloatType.instance }]
+                    }).message
+                ]);
+            });
+
+            it('allows passing classes as args for interfaces with optional properties', () => {
+                program.setFile('source/util.bs', `
+                    function takesIFace(iface as MyIFace) as string
+                        if invalid <> iface.name
+                            return iface.name
+                        else if invalid <> iface.data
+                            return FormatJson(iface.data)
+                        end if
+                        return "no"
+                    end function
+
+                    sub doStuff(iface as MyIFace)
+                        k = new MyKlass()
+                        k2 = new MyKlass2()
+                        print takesIFace(k)
+                        print takesIFace(k2)
+                    end sub
+
+                    interface MyIFace
+                        optional name as string
+                        optional data
+                    end interface
+
+                    class MyKlass
+                        data = {}
+                    end class
+
+                    class MyKlass2
+                        data = "test"
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+
+        it('recursive types are allowed', () => {
+            program.setFile('source/util.bs', `
+                interface ChainNode
+                    name as string
+                    next as ChainNode
+                end interface
+
+                function getChain(cNode as ChainNode) as string
+                    output = cNode.name
+                    if cNode.next <> invalid
+                        output += " - " + getChain(cNode.next)
+                    end if
+                    return output
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('recursive types are allowed as array members', () => {
+            program.setFile('source/util.bs', `
+                interface ChainNode
+                    name as string
+                    nextItems as ChainNode[]
+                end interface
+
+                function getChain(cNode as ChainNode) as string
+                    output = cNode.name
+                    for each item in cNode.nextItems
+                        output += " - " + getChain(item)
+                    end for
+                    return output
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('deeply recursive types are allowed', () => {
+            program.setFile('source/util.bs', `
+                interface ChainNode
+                    name as string
+                    nextItem as ChainNodeWrapper
+                end interface
+
+                interface ChainNodeWrapper
+                    node as ChainNode
+                end interface
+
+                function getChain(cNode as ChainNode) as string
+                    output = cNode.name
+                    if cNode.nextItem <> invalid
+                        output += " - " + getChain(cNode.nextItem.node)
+                    end if
+                    return output
+                end function
+
+                sub useChain()
+                    chain3 = {name: "C", nextItem: invalid}
+                    wrapper3 = {node: chain3}
+                    chain2 = {name: "B", nextItem: wrapper3}
+                    wrapper2 = {node: chain2}
+                    chain1 = {name: "A", nextItem: wrapper2}
+
+                    print getChain(chain1)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('allowed arg type conversions', () => {
+            it('allows numbers passed to a function that accepts booleans', () => {
+                program.setFile('source/util.bs', `
+                    sub takesBool(input as boolean)
+                    end sub
+
+                    sub tryNums()
+                        pi = 3.14
+                        takesBool(1)
+                        takesBool(-1)
+                        takesBool(123.456)
+                        takesBool(23!)
+                        takesBool(&hABCD)
+                        takesBool(1.22#)
+                        takesBool(pi)
+                        takesBool(0)
+                        takesBool(true)
+                        takesBool(false)
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+
+        it('allows boxed types', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                function takesBoxedLongInt(x as roLongInteger)
+                    return 123456& + x
+                end function
+
+                function takesLongInt(x as longInteger)
+                    return 123456& + x
+                end function
+
+                sub test()
+                    long = 123456&
+                    boxedLong = createObject("roLongInteger")
+                    print takesBoxedLongInt(long)
+                    print takesBoxedLongInt(boxedLong)
+                    print takesLongInt(long)
+                    print takesLongInt(boxedLong)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('AA args with string literal keys', () => {
+            it('finds keys with string literal names', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    interface Data
+                        id
+                    end interface
+
+                    sub takesData(datum as Data)
+                    end sub
+
+                    sub usesData()
+                    takesData({"id": 1234})
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates keys with string literal names, but type is incorrect', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    interface Data
+                        id as string
+                    end interface
+
+                    sub takesData(datum as Data)
+                    end sub
+
+                    sub usesData()
+                    takesData({"id": 1234})
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', 'Data', {
+                        fieldMismatches: [{ name: 'id', expectedType: StringType.instance, actualType: IntegerType.instance }]
+                    }).message
+                ]);
+            });
+        });
+
+        describe('inline interfaces', () => {
+            it('allows function param with compatible interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    sub takesInline(datum as {name as string})
+                    end sub
+
+                    sub callsTakesInline()
+                        takesInline({age: 123, name: "test"})
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates function param with incompatible interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    sub takesInline(datum as {name as string})
+                    end sub
+
+                    sub callsTakesInline()
+                        takesInline({name: 123})
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', '{name as string}', {
+                        fieldMismatches: [{ name: 'name', expectedType: StringType.instance, actualType: IntegerType.instance }]
+                    }).message
+                ]);
+            });
+        });
+
+        describe('type statement types', () => {
+            it('allows compatible type statement types to be passed to functions expecting normal types', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    type number = integer or float
+
+                    sub takesNumber(x as number)
+                        takesInteger(x)
+                    end sub
+
+                    sub takesInteger(x as integer)
+                        print x
+                      end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('disallows incompatible type statement types to be passed to functions expecting normal types', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    type whatever = float or string
+
+                    sub takesNumber(x as whatever)
+                        takesInteger(x)
+                    end sub
+
+                    sub takesInteger(x as integer)
+                        print x
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('whatever', 'integer').message
+                ]);
+            });
+        });
+
+        it('allows using invalid as argument for typed array params', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                sub takesIntArray(arr as integer[])
+                end sub
+
+                sub takesStrArray(arr as string[])
+                end sub
+
+                sub test()
+                    takesIntArray(invalid)
+                    takesStrArray(invalid)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('intersection types', () => {
+
+            it('validates against functions defined in intersection types', () => {
+                program.setFile('source/main.bs', `
+                    interface IFirst
+                        num as integer
+                    end interface
+                    interface ISecond
+                        function doThing2(a as integer, b as string) as void
+                    end interface
+
+                    sub main(thing as IFirst and ISecond)
+                        thing.doThing2(thing.num, false) ' b should be a string
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('boolean', 'string').message
+                ]);
+            });
+
+            it('allows passing AAs that satisfy intersection types', () => {
+                program.setFile('source/main.bs', `
+                    interface IFirst
+                        num as integer
+                    end interface
+                    interface ISecond
+                        function doThing2(a as integer, b as string) as void
+                    end interface
+
+                    sub main()
+                        thing = {
+                            num: 123,
+                            doThing2: function(a as integer, b as string) as void
+                                print a
+                                print b
+                            end function
+                        }
+                        usesThing(thing)
+                    end sub
+
+                    sub usesThing(thing as IFirst and ISecond)
+                        thing.doThing2(thing.num, "hello")
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates passing AAs that do not satisfy intersection types', () => {
+                program.setFile('source/main.bs', `
+                    interface IFirst
+                        num as integer
+                    end interface
+                    interface ISecond
+                        function doThing2(a as integer, b as string) as void
+                    end interface
+
+                    sub main()
+                        thing = {
+                            num: false,
+                            doThing2: function(a as integer, b as boolean) as void
+                                print a
+                                print b
+                            end function
+                        }
+                        usesThing(thing)
+                    end sub
+
+                    sub usesThing(thing as IFirst and ISecond)
+                    end sub
+                `);
+                program.validate();
+                const expectedDoThing2 = new TypedFunctionType(VoidType.instance);
+                expectedDoThing2.name = 'doThing2';
+                expectedDoThing2.addParameter('a', IntegerType.instance, false);
+                expectedDoThing2.addParameter('b', StringType.instance, false);
+
+                const actualDoThing2 = new TypedFunctionType(VoidType.instance);
+                actualDoThing2.addParameter('a', IntegerType.instance, false);
+                actualDoThing2.addParameter('b', BooleanType.instance, false);
+                expectDiagnostics(program,
+                    [
+                        DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', 'IFirst and ISecond', {
+                            fieldMismatches: [
+                                { name: 'num', expectedType: IntegerType.instance, actualType: BooleanType.instance },
+                                { name: 'doThing2', expectedType: expectedDoThing2, actualType: actualDoThing2 }
+                            ]
+                        }).message
+                    ]);
+            });
+
+            it('accepts a valid intersection when parameter is a union with an intersection', () => {
+                program.setFile('source/main.bs', `
+                    sub fooA(x as {a as integer} and {b as string} or {c as float})
+                        ' noop
+                    end sub
+
+
+                    sub fooB(y as object)
+                        fooA({a: 32, b: y})
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates an incomplete intersection when parameter is a union with an intersection', () => {
+                program.setFile('source/main.bs', `
+                    sub fooA(x as {a as integer} and {b as string} or {c as float})
+                        ' noop
+                    end sub
+
+
+                    sub fooB(y as object)
+                        fooA({a: 32})
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', '({a as integer} and {b as string}) or {c as float}', {
+                        missingFields: [
+                            { name: 'b', expectedType: StringType.instance },
+                            { name: 'c', expectedType: FloatType.instance }
+                        ]
+                    }).message
+                ]);
+            });
+
+            it('accepts a valid intersection when parameter is an intersection with a union', () => {
+                program.setFile('source/main.bs', `
+                    sub fooA(x as {a as integer} and ({b as string} or {c as float}))
+                        ' noop
+                    end sub
+
+
+                    sub fooB(y as dynamic)
+                        fooA({a: 32, b: y}) ' meets first half of union
+                        fooA({a: 32, c: y}) ' meets second half of union
+                        fooA({a: 32, b: "hello", c: 2.178}) ' meets both halves of union
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates an incomplete intersection when parameter is an intersection with a union', () => {
+                program.setFile('source/main.bs', `
+                    sub fooA(x as {a as integer} and ({b as string} or {c as float}))
+                        ' noop
+                    end sub
+
+
+                    sub fooB(y as object)
+                        fooA({a: 32})
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', '{a as integer} and ({b as string} or {c as float})', {
+                        missingFields: [
+                            { name: 'b', expectedType: StringType.instance },
+                            { name: 'c', expectedType: FloatType.instance }
+                        ]
+                    }).message
+                ]);
+            });
+        });
+
+        describe('typed function type expressions', () => {
+            it('allows using typed function type expressions correctly', () => {
+                program.setFile('source/main.bs', `
+                    sub main(myFunc as function(num as integer) as string)
+                        print myFunc(123)
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates using typed function type expressions incorrectly', () => {
+                program.setFile('source/main.bs', `
+                    sub main(myFunc as function(num as integer) as string)
+                        print myFunc("123")
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates using typed function type expressions from type statements', () => {
+                program.setFile('source/main.bs', `
+                    type MyFuncType = function(num as integer) as string
+
+                    sub main(myFunc as MyFuncType)
+                        print myFunc("123")
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates using typed function type expressions from type statements', () => {
+                program.setFile('source/main.bs', `
+                    type MyFuncType = function(num as integer) as string
+
+                    sub main(myFunc as MyFuncType)
+                        print myFunc("123")
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates using typed function type expressions returned from other functions', () => {
+                program.setFile('source/main.bs', `
+                    function getFunc() as function(num as integer) as string
+                        return function(x as integer) as string
+                            return "hello " + x.toStr()
+                        end function
+                    end function
+
+                    sub main()
+                        myFunc = getFunc()
+                        print myFunc("123")
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates using typed function type expressions with complex arguments', () => {
+                program.setFile('source/main.bs', `
+                    type MyFuncType = function(arg1 as {id as integer}, arg2 as IFace) as string
+
+                    interface IFace
+                        name as string
+                        data as float[]
+                    end interface
+
+                    sub main(myFunc as MyFuncType)
+                        print myFunc({id: "123"}, {name: false})
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', '{id as integer}', {
+                        fieldMismatches: [
+                            { name: 'id', expectedType: IntegerType.instance, actualType: StringType.instance }
+                        ]
+                    }).message,
+                    DiagnosticMessages.argumentTypeMismatch('roAssociativeArray', 'IFace', {
+                        fieldMismatches: [
+                            { name: 'name', expectedType: StringType.instance, actualType: BooleanType.instance }
+                        ],
+                        missingFields: [
+                            { name: 'data', expectedType: new ArrayType(FloatType.instance) }
+                        ]
+                    }).message
+                ]);
+            });
+
+            it('validates passing an incompatible typed function type expression as an argument', () => {
+                program.setFile('source/main.bs', `
+                    sub useFunc(myFunc as function(num as integer) as string)
+                        print myFunc(123)
+                    end sub
+
+                    sub otherFunc()
+                        useFunc(function(a, b) as void
+                                print a
+                                print b
+                            end function)
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('function (a as dynamic, b as dynamic) as void', 'function (num as integer) as string', {
+                        expectedParamCount: 1,
+                        actualParamCount: 2
+                    }).message
+                ]);
+            });
+
+            it('allows passing a function with additional optional parameters', () => {
+                program.setFile('source/main.bs', `
+                    type MyFuncType1 = function(num as integer) as string
+                    sub useFunc(myFunc as MyFuncType1)
+                        print myFunc(123)
+                    end sub
+                    sub otherFunc()
+                        useFunc(function(a as integer,  b = "" as string) as string
+                                print a
+                                print b
+                                return "hello"
+                            end function)
+                    end sub
+               `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('check if a passed in function has the right number and type of optional parameters', () => {
+                program.setFile('source/main.bs', `
+                    type MyFuncType1 = function(num as integer, s = "" as string) as string
+
+                    sub useFunc(myFunc as MyFuncType1)
+                        print myFunc(123)
+                        print myFunc(123, "test")
+                    end sub
+
+                    sub otherFunc()
+                        useFunc(function(a as integer) as string
+                                print a
+                                return "hello"
+                            end function)
+                    end sub
+                 `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.argumentTypeMismatch('function (a as integer) as string', 'MyFuncType1', {
+                        expectedParamCount: 2,
+                        actualParamCount: 1
+                    }).message
+                ]);
+            });
+
+            it('allows a passed in function that has the right number and type of optional parameters', () => {
+                program.setFile('source/main.bs', `
+                    type MyFuncType1 = function(num as integer, s = "" as string) as string
+
+                    sub useFunc(myFunc as MyFuncType1)
+                        print myFunc(123)
+                        print myFunc(123, "test")
+                    end sub
+
+                    sub otherFunc()
+                        useFunc(function(a as integer, s = "hello" as string) as string
+                                print a
+                                return "hello"
+                            end function)
+                    end sub
+                 `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows passing a function that itself has function-typed parameters', () => {
+                program.setFile('source/main.bs', `
+                    type CallbackType = function(x as integer) as void
+
+                    function main(fnWrap as function(callback as CallbackType) as void)
+                        myCallback = function(x as integer) as void
+                            print x
+                        end function
+                        fnWrap(myCallback)
+                    end function
+                    `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+
+            it('handles recursive function type expressions', () => {
+                program.setFile('source/main.bs', `
+                    type RecursiveFuncType = function(x as integer) as RecursiveFuncType
+                    function main(fn as RecursiveFuncType)
+                        if m.x > 0
+                            nextFn = fn(m.x - 1)
+                            main(nextFn)
+                        end if
+                    end function
+                 `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+    });
+
+    describe('cannotFindName', () => {
+
+        it('finds variables from assignments from member functions of primitive types', () => {
+            program.setFile('source/util.brs', `
+                function lcaseTrim(str)
+                    trimmedLowerStr = lcase(str).trim()
+                    print trimmedLowerStr
+                end function
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates when lhs of compound assignment does not exist', () => {
+            program.setFile('source/util.brs', `
+                sub main()
+                    expected += chr(10) + " version=""2.0"""
+                end sub
+            `);
+            program.validate();
+            //should have error - cannot find "expected"
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('expected').message
+            ]);
+        });
+
+        it('does not have a diagnostic for using a variable the result of an assignment with unresolved value', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    myValue = UndeclaredValue
+                    if myValue > 0
+                        print "hello"
+                    end if
+                end sub
+            `);
+            program.validate();
+            //should have only 1 error - cannot find "UndeclaredValue"
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('UndeclaredValue').message
+            ]);
+        });
+
+        it('detects assigning to an unknown field in a class', () => {
+            program.setFile('source/main.bs', `
+                class Klass
+                    sub new()
+                        m.unknown = "hello"
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('unknown', 'Klass.unknown', 'Klass')
+            ]);
+        });
+
+        it('detects assigning to an unknown field in a primitive', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    myStr = "hello"
+                    myStr.length = 2
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('length', 'string.length', 'string')
+            ]);
+        });
+
+        it('allows assigning to an unknown field in an AA', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    myAA = {}
+                    myAA.unknown = 4
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows setting a member of an overriden member of an aa', () => {
+            program.setFile('source/main.bs', `
+                sub makeAA()
+                    myAA = {}
+                    addItemsToAA(myAA)
+                    myAA.items.value = "other string"
+                end sub
+
+                sub addItemsToAA(someAA)
+                    someAA.items = {value: "some string"}
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows accessing a member of an overriden member of an aa', () => {
+            program.setFile('source/main.bs', `
+                sub makeAA()
+                    myAA = {}
+                    addItemsToAA(myAA)
+                    print myAA.items.value.len()
+                end sub
+
+                sub addItemsToAA(someAA)
+                    someAA.items = {value: "some string"}
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows using a member of an overriden member of an aa in a different way', () => {
+            program.setFile('source/main.bs', `
+                sub makeAA()
+                    myAA = {}
+                    addItemsToAA(myAA)
+                    for each item in myAA.items 'bs:disable-line not-iterable
+                        print item
+                    end for
+                end sub
+
+                sub addItemsToAA(someAA)
+                    someAA.items = [0, 1, 2, 3]
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('does not show a diagnostic when using a function param with unknown type', () => {
+            program.setFile('source/main.bs', `
+                function test(item as Whatever)
+                    return {data: item}
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('Whatever')
+            ]);
+        });
+
+        it('does not show a diagnostic when using a variable declared with unknown type cast', () => {
+            program.setFile('source/main.bs', `
+                function test()
+                    item = {} as Whatever
+                    return {data: item}
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('Whatever')
+            ]);
+        });
+
+        it('does not show a diagnostic when using a variable declared with unknown type', () => {
+            program.setFile('source/main.bs', `
+                function test()
+                    item as Whatever = {}
+                    return {data: item}
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('Whatever')
+            ]);
+        });
+
+        it('allows function default params to reference earlier params', () => {
+            program.setFile('source/main.bs', `
+                function test(param1 as integer, param2 = param1 + 2)
+                    print param1; param2
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('has diagnostic when function default params reference unknown', () => {
+            program.setFile('source/main.bs', `
+                function test(param1 as integer, param2 = paramX + 2)
+                    print param1; param2
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('paramX').message
+            ]);
+        });
+
+        it('has diagnostic when function default params reference variable from inside function', () => {
+            program.setFile('source/main.bs', `
+                function test(param1 as integer, param2 = paramX + 2)
+                    paramX = 3
+                    print param1; param2
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('paramX').message
+            ]);
+        });
+
+        it('has diagnostic when trying to use a method on an union that does not exist in one type', () => {
+            program.setFile('source/main.bs', `
+                function typeHoverTest(x as string or integer)
+                    value = x.len()
+                    return value
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindFunction('len', null, '(string or integer)').message
+            ]);
+        });
+
+        it('does not have diagnostic when accessing unknown member of union in Brightscript mode, when variable is a param', () => {
+            program.setFile('source/main.brs', `
+                function typeHoverTest(x as string)
+                    x = x.len()
+                    return x
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('does not have diagnostic when accessing unknown member of union in Brightscript mode, when variable is defined in block', () => {
+            program.setFile('source/main.brs', `
+                function typeHoverTest()
+                    x = "hello"
+                    x = x.len()
+                    return x
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('does not have diagnostic when accessing unknown member of node in Brightscript mode', () => {
+            program.setFile('source/main.brs', `
+                ' @param {roSGNode} node
+                function testNodeMember(node)
+                    x = node.whatever
+                    return x
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('does not have diagnostic when accessing unknown member of contentnode in Brightscript mode', () => {
+            program.setFile('source/main.brs', `
+                ' @param {roSgNodeCOntentNode} node
+                function testNodeMember(node)
+                    x = node.whatever
+                    return x
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('does not have diagnostic when accessing unknown member of created node  in Brightscript mode', () => {
+            program.setFile('source/main.brs', `
+                ' @param {string} nodeSubtype
+                function testNodeMember(nodeSubtype)
+                    x = createObject("roSgNode",nodeSubtype)
+                    x.whatever = true
+                    return x
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows anything on m in an anonymous function', () => {
+            program.setFile('source/main.bs', `
+                function test()
+                    stub = function()
+                        m.something = true
+                    end function
+                    return stub
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows anything on m in an anonymous function in a class method', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    function test()
+                        stub = function()
+                            m.something = true
+                        end function
+                        return stub
+                    end function
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('has error when referencing something in outer namespace directly', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    sub foo()
+                    end sub
+
+                    namespace beta
+                        sub bar()
+                            foo()
+                        end sub
+                    end namespace
+                end namespace
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindFunction('foo').message
+            ]);
+        });
+
+        it('allows referencing something in outer namespace with namespace in front', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    sub foo()
+                    end sub
+
+                    namespace beta
+                        sub bar()
+                            alpha.foo()
+                        end sub
+                    end namespace
+                end namespace
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows referencing scope-defined func in inner namespace, when outer namespace has same named func', () => {
+            program.setFile('source/main.bs', `
+                namespace alpha
+                    sub foo()
+                    end sub
+
+                    namespace beta
+                        sub bar()
+                            foo(1)
+                        end sub
+                    end namespace
+                end namespace
+
+                function foo(x as integer) as integer
+                    return x
+                end function
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('has an diagnostic when using a variable defined in parent function', () => {
+            program.setFile('source/main.bs', `
+                function parentFunction()
+                    parentVar = "test"
+
+                    innerFunction = sub()
+                        ' Attempting to use parentVar from the parent function scope
+                        print parentVar ' This should trigger a diagnostic
+                        otherFunc() ' this is fine
+                    end sub
+
+                    innerFunction()
+                end function
+
+                sub otherFunc()
+                    print "hello"
+                end sub
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('parentVar')
+            ]);
+        });
+
+        it('has an diagnostic when using a param from  parent function', () => {
+            program.setFile('source/main.bs', `
+                function parentFunction(outerVal)
+                    parentVar = "test"
+
+                    innerFunction = sub(inner)
+                        print inner + outer
+                    end sub
+
+                    innerFunction(2)
+                end function
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('outer')
+            ]);
+        });
+
+        it('allows method call on hex literal', () => {
+            program.setFile('source/main.bs', `
+                function test()
+                    x = &HFF.toStr()
+                    return x
+                end function
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('allows method call on hex literal', () => {
+            program.setFile('source/main.bs', `
+                function test()
+                    x = &HFF.toStr()
+                    return x
+                end function
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('has no validation errors with print statement with hex followed by dot <number>', () => {
+            program.setFile('source/main.bs', `
+                sub test()
+                    print &hFF.123.456.5678
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows access of properties of union with invalid', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                sub test()
+                    channel = invalid
+                    if true
+                        channel = {
+                            height: 123
+                        }
+                    end if
+
+                    height = 0
+                    if channel <> invalid then
+                        height += channel.height
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+        });
+
+        it('sets default arg of invalid as dynamic', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                sub test(channel = invalid)
+                    if true
+                        channel = {
+                            height: 123
+                        }
+                    end if
+
+                    height = 0
+                    if channel <> invalid then
+                        height += channel.height
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+        });
+
+        it('sets assignment of function returning invalid as dynamic', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                sub test()
+                    channel = noReturn()
+                    if true
+                        channel = {
+                            height: 123
+                        }
+                    end if
+
+                    height = 0
+                    if channel <> invalid then
+                        height += channel.height
+                    end if
+                end sub
+
+                sub noReturn()
+                    print "hello"
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates accessing a bad member on a type statement type', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                type numberOrString = integer or string
+
+                function test(x as numberOrString)
+                    print x.nonExistentMember
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('nonExistentMember', 'numberOrString.nonExistentMember', 'numberOrString')
+            ]);
+        });
+
+        describe('inline interfaces', () => {
+            it('finds members of inline interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    sub takesInline(datum as {name as string})
+                        print datum.name.split(",")
+                    end sub
+
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates using invalid member name', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    sub takesInline(datum as {name as string})
+                        print datum.notThere.split(",")
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('notThere', '{name as string}.notThere', '{name as string}')
+                ]);
+            });
+        });
+
+        describe('intersection types', () => {
+            it('finds members from intersection types', () => {
+                program.setFile('source/main.bs', `
+                    interface IFirst
+                        num as integer
+                    end interface
+                    interface ISecond
+                        function doThing2(a as integer, b as string) as void
+                    end interface
+
+                    sub main(thing as IFirst and ISecond)
+                        print thing.num
+                        thing.doThing2(thing.num, "hello")
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('finds random members of intersections with AA types', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    sub printData(data as {customData as string} and roAssociativeArray)
+                        x = data.someDynamicKey
+                        y = data.customData
+                        print x
+                        print y
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+
+            it('handles type statements that are intersections of classes and AA', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    sub printData(data as MyKlassAA)
+                        x = data.customData
+                        data.append({
+                            newKey: "newValue"
+                        })
+                        print x
+                        y = data.newKey
+                        print y
+                    end sub
+
+
+                    type MyKlassAA = MyKlass and roAssociativeArray
+
+                    class MyKlass
+                        customData as string
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates missing members from intersection types', () => {
+                program.setFile('source/main.bs', `
+                    interface IFirst
+                        num as integer
+                    end interface
+                    interface ISecond
+                        function doThing2(a as integer, b as string) as void
+                    end interface
+
+                    sub main(thing as IFirst and ISecond)
+                        print thing.nonExistentMember
+                        thing.doThing2(thing.num, "hello")
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotFindName('nonExistentMember', '(IFirst and ISecond).nonExistentMember', '(IFirst and ISecond)')
+                ]);
+            });
+        });
+    });
+
+    describe('itemCannotBeUsedAsVariable', () => {
+        it('detects assigning to a member of a namespace outside the namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    const Name = "Alpha"
+                end namespace
+
+                sub main()
+                    Alpha.name = "Beta"
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')
+            ]);
+        });
+
+        it('validates when trying to print a namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    const Name = "Alpha"
+                end namespace
+
+                sub main()
+                    print alpha
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')
+            ]);
+        });
+
+        it('validates when trying to pass a namespace as an arg', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    const Name = "Alpha"
+                end namespace
+
+                sub main()
+                    someFunc(alpha)
+                end sub
+
+                sub someFunc(arg)
+                    print sub
+                end sub
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, [
+                DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')
+            ]);
+        });
+
+        it('detects assigning to a member of a namespace inside the namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    const Name = "Alpha"
+
+                    sub inAlpha()
+                        alpha.name = "Beta"
+                    end sub
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')
+            ]);
+        });
+
+
+        it('detects assigning to a member of a namespace outside the namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    class Klass
+                    end class
+                end namespace
+
+                sub main()
+                    myKlass = new Alpha.Klass()
+                    Alpha.klass = myKlass
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')
+            ]);
+        });
+
+        it('detects assigning to a member of a namespace outside the namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace Alpha
+                    class Klass
+                        function new()
+                        end function
+
+                        function init()
+                            Alpha.innerFunc = someFunc
+                        end function
+                    end class
+
+                    sub innerFunc()
+                    end sub
+                end namespace
+
+                sub someFunc()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')
+            ]);
+        });
+
+        it('validates when a class member is accessed from a class directly', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                    name as string
+                end class
+
+                sub doStuff()
+                    print klass.name ' only valid use of "Klass" is as a constructor: "new Klass()", or as a function
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('name', 'function.name', 'function')
+            ]);
+        });
+
+        it('validates when a class member is accessed from a class directly when class has a namespace', () => {
+            program.setFile('source/util.bs', `
+                namespace Alpha
+                    class Klass
+                        name as string
+                    end class
+                end namespace
+
+                sub doStuff()
+                    print alpha.klass.name ' only valid use of "Klass" is as a constructor: "new Klass()"
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('name', 'function.name', 'function')
+            ]);
+        });
+
+        it('validates when new is is used on a class instance', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                    name as string
+                end class
+
+                sub doStuff(someKlass as Klass)
+                    print new someKlass()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.expressionIsNotConstructable('someKlass')
+            ]);
+        });
+
+        it('allows when a class name is used as field name', () => {
+            program.setFile('source/util.bs', `
+                class Klass
+                    name as string
+                end class
+
+                class OtherKlass
+                    klass as Klass
+
+                    sub foo()
+                        print m.klass.name
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows when a class name from a namespace is used as field name', () => {
+            program.setFile('source/util.bs', `
+                namespace Alpha
+                    class Klass
+                        name as string
+                    end class
+                end namespace
+
+                class OtherKlass
+                    klass as Alpha.Klass
+
+                    sub foo()
+                        m.klass = new Alpha.Klass()
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+    describe('returnTypeMismatch', () => {
+        it('finds when a function returns a type that is not what was declared', () => {
+            program.setFile('source/util.bs', `
+                function getPi() as float
+                    return "apple" ' get it?
+                end function
+            `);
+            program.validate();
+            //should have error - return value should be a float, not a string
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('string', 'float').message
+            ]);
+        });
+
+        it('finds all return statements that do not match', () => {
+            program.setFile('source/util.bs', `
+                function getPi(kind as integer) as float
+                    if kind = 1
+                        return "apple"
+                    else if kind = 2
+                        return false
+                    else if kind = 3
+                        return new Pie("lemon")
+                    end if
+                    return 3.14
+                end function
+
+                class Pie
+                   kind as string
+                   sub new(kind as string)
+                       m.kind = kind
+                   end sub
+                end class
+            `);
+            program.validate();
+            //should have error - return value should be a float, not whatever else
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('string', 'float').message,
+                DiagnosticMessages.returnTypeMismatch('boolean', 'float').message,
+                DiagnosticMessages.returnTypeMismatch('Pie', 'float').message
+            ]);
+        });
+
+
+        it('allows returning compatible types', () => {
+            program.setFile('source/util.bs', `
+                function getPi() as float
+                    return 3 ' integers are compatible with floats
+                end function
+
+                function getPie() as Pie
+                    return new Tart("lemon") ' Tart extends Pie
+                end function
+
+                class Pie
+                    kind as string
+                    sub new(kind as string)
+                        m.kind = kind
+                    end sub
+                end class
+
+                class Tart extends Pie
+                    size = "small"
+                end class
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('detects return types on void functions (subs)', () => {
+            program.setFile('source/util.bs', `
+                sub sayHello(name as string)
+                    return "hello " + name ' return should be void in subs
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.voidFunctionMayNotReturnValue('sub').message,
+                DiagnosticMessages.returnTypeMismatch('string', 'void').message
+            ]);
+        });
+
+        it('detects return types on void functions', () => {
+            program.setFile('source/util.bs', `
+                function sayHello(name as string) as void
+                    return "hello " + name ' return should be void in subs
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('string', 'void').message,
+                DiagnosticMessages.voidFunctionMayNotReturnValue('function').message
+            ]);
+        });
+
+        it('allows returning enums with the default type that matches the declared return type', () => {
+            program.setFile('source/util.bs', `
+                enum MyEnum
+                    val1
+                    val2
+                end enum
+
+                function getInt() as integer
+                    return MyEnum.val1
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows returning enums passed as a param with the default type that matches the declared return type', () => {
+            program.setFile('source/util.bs', `
+                enum MyEnum
+                    val1
+                    val2
+                end enum
+
+                function getInt(enumVal as MyEnum) as integer
+                    return enumVal
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows returning enums with the default type that matches the declared return type for string enums', () => {
+            program.setFile('source/util.bs', `
+                enum MyEnum
+                    val1 = "hello"
+                    val2 = "world"
+                end enum
+
+                function getInt() as string
+                    return MyEnum.val1
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('flags returning enums with the default type that does not matches the declared return type', () => {
+            program.setFile('source/util.bs', `
+                enum MyEnum
+                    val1 = "hello"
+                    val2 = "world"
+                end enum
+
+                function getInt() as integer
+                    return MyEnum.val1
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('MyEnum', 'integer').message
+            ]);
+        });
+
+        it('flags returning enums passed as params with the default type that does not matches the declared return type', () => {
+            program.setFile('source/util.bs', `
+                enum MyEnum
+                    val1 = "hello"
+                    val2 = "world"
+                end enum
+
+                function getInt(enumVal as MyEnum) as integer
+                    return enumVal
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('MyEnum', 'integer').message
+            ]);
+        });
+
+        it('flags returning enums type', () => {
+            program.setFile('source/util.bs', `
+                enum MyEnum
+                    val1 = "hello"
+                    val2 = "world"
+                end enum
+
+
+                function getInt() as integer
+                    return MyEnum
+                end function
+            `);
+            program.validate();
+            expect(program.getDiagnostics().length).to.be.greaterThan(0);
+        });
+
+        it('allows returning an Enum', () => {
+            program.setFile('source/util.bs', `
+                enum MyEnum
+                    val1 = "hello"
+                    val2 = "world"
+                end enum
+
+
+                function getInt() as MyEnum
+                    return MyEnum.val1
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('allows AA with overidden props to meet interface', () => {
+            program.setFile('source/code.bs', `
+                namespace alpha.beta
+                    interface Stream
+                        thumbnailTiler as Thumbnail
+                    end interface
+
+                    interface Thumbnail
+                        count as integer
+                    end interface
+
+                    function createStreamObject() as Stream
+                        return {
+                            thumbnailTiler: {
+                                count: 1
+                            }
+                        }
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows AA with inside AA to be validated properly', () => {
+            program.setFile('source/code.bs', `
+                namespace alpha.beta
+                    interface Stream
+                        thumbnailTiler as Thumbnail
+                    end interface
+
+                    interface Thumbnail
+                        count as integer
+                    end interface
+
+                    function createStreamObject() as Stream
+                        return {
+                            thumbnailTiler: {
+                                count: "hello"
+                            }
+                        }
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('roAssociativeArray', 'alpha.beta.Stream', {
+                    fieldMismatches: [{ name: 'thumbnailTiler', expectedType: new InterfaceType('alpha.beta.Thumbnail'), actualType: new AssociativeArrayType() }]
+                }).message
+            ]);
+        });
+
+        it('allows function with no return types with void return value', () => {
+            program.setFile('source/util.bs', `
+                function doSomething()
+                    return
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nonVoidFunctionMustReturnValue('function').message
+            ]);
+        });
+
+        it('allows function with dynamic return types with void return value ', () => {
+            program.setFile('source/util.bs', `
+                function doSomething() as dynamic
+                    return
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.nonVoidFunctionMustReturnValue('function').message
+            ]);
+        });
+
+
+        it('validates for sub with return types with no return value', () => {
+            program.setFile('source/util.bs', `
+                sub doSomething() as integer
+                    return
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('void', 'integer').message,
+                DiagnosticMessages.nonVoidFunctionMustReturnValue('sub').message
+            ]);
+        });
+
+        it('validates for function with void return types with non-void return value', () => {
+            program.setFile('source/util.bs', `
+                function doSomething() as void
+                    return 123
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('integer', 'void').message,
+                DiagnosticMessages.voidFunctionMayNotReturnValue('function').message
+            ]);
+        });
+
+        it('allows empty return when return as void', () => {
+            program.setFile('source/util.bs', `
+                function doNothing1() as void
+                    return
+                end function
+
+                sub doNothing2() as void
+                    return
+                end sub
+
+                sub doNothing3() as void
+                end sub
+
+                sub doNothing4()
+                    return
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows boxed types', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                function getBoxedLongInt() as roLongInteger
+                    return 123456&
+                end function
+
+                function getLongInt() as longInteger
+                    x = createObject("roLongInteger")
+                    return x
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows returning a function call', () => {
+            const spy = sinon.spy(Logger.prototype, 'error');
+            program.setFile<BrsFile>('source/main.bs', `
+                function abc(func as function) as dynamic
+                    return func()
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(
+                spy.getCalls().map(x => (x.args?.[0] as string)?.toString()).filter(x => x?.includes('Error when calling plugin'))
+            ).to.eql([]);
+        });
+
+        it('allows returning a roFunction call', () => {
+            const spy = sinon.spy(Logger.prototype, 'error');
+            program.setFile<BrsFile>('source/main.bs', `
+                function abc(func as roFunction) as dynamic
+                    return func()
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(
+                spy.getCalls().map(x => (x.args?.[0] as string)?.toString()).filter(x => x?.includes('Error when calling plugin'))
+            ).to.eql([]);
+        });
+
+        it('allows returning a call on an object type', () => {
+            const spy = sinon.spy(Logger.prototype, 'error');
+            program.setFile<BrsFile>('source/main.bs', `
+                function abc(func as object) as dynamic
+                    return func()
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(
+                spy.getCalls().map(x => (x.args?.[0] as string)?.toString()).filter(x => x?.includes('Error when calling plugin'))
+            ).to.eql([]);
+        });
+
+        it('allows calling func returned from other func', () => {
+            const spy = sinon.spy(Logger.prototype, 'error');
+            program.setFile<BrsFile>('source/calc.bs', `
+                sub otherFuncFirst()
+                  ' forces getOperation to be referenceType called from ReferenceType
+                end sub
+
+                function calc(a as dynamic, b as dynamic, op as string) as dynamic
+                    op = getOperation(op)
+                    return op(1, 2)
+                end function
+
+                function getOperation(name as string) as object
+                    return {
+                        "sum": function(a as dynamic, b as dynamic) as dynamic
+                            return a + b
+                        end function
+                    }[name]
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(
+                spy.getCalls().map(x => (x.args?.[0] as string)?.toString()).filter(x => x?.includes('Error when calling plugin'))
+            ).to.eql([]);
+        });
+
+        it('allows returning something that matches a type statement type', () => {
+            program.setFile('source/util.bs', `
+                interface Person
+                    name as string
+                    age as integer
+                end interface
+
+                type Wrapped = Person
+
+                function getWrapped() as Wrapped
+                    return {
+                        name: "Alice",
+                        age: 30
+                    }
+                 end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('inline interfaces', () => {
+            it('allows returning an Associative Array that meets the interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    function takesInline() as  {id as string}
+                        return { id: "test" }
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows returning a Node that meets the interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    function takesInline() as  {id as string}
+                        return createObject("roSGNode", "Poster")
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates returning an AA that does not meet the interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    function takesInline() as {id as integer}
+                        return {id: "hello"}
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.returnTypeMismatch('roAssociativeArray', '{id as integer}', {
+                        fieldMismatches: [{ name: 'id', expectedType: IntegerType.instance, actualType: StringType.instance }]
+                    }).message
+                ]);
+            });
+        });
+        it('allows returning invalid instead of typed array', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                function getNumbers() as integer[]
+                    return invalid
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        describe('intersection types', () => {
+
+            it('validates when type is intersection of primitive', () => {
+                program.setFile('source/main.bs', `
+                    function foo() as {id as string} and string
+                        return {id: "test"}
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.returnTypeMismatch('roAssociativeArray', '{id as string} and string').message
+                ]);
+            });
+
+            it('allows passing AAs that satisfy intersection types', () => {
+                program.setFile('source/main.bs', `
+                    interface IFirst
+                        num as integer
+                    end interface
+                    interface ISecond
+                        function doThing2(a as integer, b as string) as void
+                    end interface
+
+                    function getThing() as IFirst and ISecond
+                        thing = {
+                            num: 123,
+                            doThing2: function(a as integer, b as string) as void
+                                print a
+                                print b
+                            end function
+                        }
+                        return thing
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates passing AAs that do not satisfy intersection types', () => {
+                program.setFile('source/main.bs', `
+                    interface IFirst
+                        num as integer
+                    end interface
+                    interface ISecond
+                        function doThing2(a as integer, b as string) as void
+                    end interface
+
+                    function getThing() as IFirst and ISecond
+                        thing = {
+                            num: false,
+                            doThing2: function(a as integer, b as boolean) as void
+                                print a
+                                print b
+                            end function
+                        }
+                        return thing
+                    end function
+                `);
+                program.validate();
+                const expectedDoThing2 = new TypedFunctionType(VoidType.instance);
+                expectedDoThing2.name = 'doThing2';
+                expectedDoThing2.addParameter('a', IntegerType.instance, false);
+                expectedDoThing2.addParameter('b', StringType.instance, false);
+
+                const actualDoThing2 = new TypedFunctionType(VoidType.instance);
+                actualDoThing2.addParameter('a', IntegerType.instance, false);
+                actualDoThing2.addParameter('b', BooleanType.instance, false);
+                expectDiagnostics(program,
+                    [
+                        DiagnosticMessages.returnTypeMismatch('roAssociativeArray', 'IFirst and ISecond', {
+                            fieldMismatches: [
+                                { name: 'num', expectedType: IntegerType.instance, actualType: BooleanType.instance },
+                                { name: 'doThing2', expectedType: expectedDoThing2, actualType: actualDoThing2 }
+                            ]
+                        }).message
+                    ]);
+            });
+        });
+
+        describe('function return types', () => {
+            it('should allow returning a function that matches the return type', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    function getFunc() as function() as string
+                        return function() as string
+                            return "hello"
+                        end function
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+
+            it('should not allow returning a function that does not match the return type', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    function getFunc() as function() as string
+                        return function() as integer
+                            return 123
+                        end function
+                    end function
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.returnTypeMismatch('function () as integer', 'function () as string', {
+                        returnTypeMismatch: {
+                            expectedType: StringType.instance,
+                            actualType: IntegerType.instance
+                        }
+                    }).message
+                ]);
+            });
+
+            it('can have a function type as a parameter to a function type', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    function test(func as function(arg1 as function() as integer) as integer) as integer
+                        return func(function() as integer
+                            return 123
+                        end function)
+                    end function
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+        });
+    });
+
+    describe('returnTypeCoercionMismatch', () => {
+        it('allows functions, subs, and "function as void/dynamic" to not have return statements', () => {
+            program.setFile('source/util.bs', `
+                function noTypeSpecified()
+                end function
+
+                function voidTypeSpecified() as void
+                end function
+
+                sub subVoidTypeSpecified()
+                end sub
+
+                function dynamicTypeSpecified() as dynamic
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('detects when a function does not have a return statement', () => {
+            program.setFile('source/util.bs', `
+                function doSomething() as string
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeCoercionMismatch().message
+            ]);
+        });
+
+        it('allows when a function does not have a return statement, but type coercsion is okay', () => {
+            program.setFile('source/util.bs', `
+                interface Whatever
+                    name as string
+                end interface
+
+                function doSomething() as Whatever
+                end function
+
+                function doSomething2() as object
+                end function
+
+                function doSomething3() as integer
+                end function
+
+                function doSomething4() as float
+                end function
+
+                function doSomething5() as boolean
+                end function
+
+            `);
+            program.validate();
+            // all these are ok
+            expectZeroDiagnostics(program);
+        });
+
+        it('detects when a namespaced function does not have a return statement', () => {
+            program.setFile('source/util.bs', `
+                namespace alpha
+                    function doSomething() as string
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeCoercionMismatch().message
+            ]);
+        });
+
+        it('detects when an inline function does not have a return statement', () => {
+            program.setFile('source/util.bs', `
+                function outer() as string
+                    inner = function () as string
+                        print "no return!"
+                    end function
+                    return inner()
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeCoercionMismatch().message
+            ]);
+        });
+
+        it('detects when an outer function does not have a return statement', () => {
+            program.setFile('source/util.bs', `
+                function outer() as string
+                    inner = function() as string
+                        return "abc"
+                    end function
+                    print inner()
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeCoercionMismatch().message
+            ]);
+        });
+
+        it('detects when a outer function has a return statement in a branch', () => {
+            program.setFile('source/util.bs', `
+                function hasBranch(x) as string
+                    if x = 1
+                        return "1"
+                    else
+                        return "2"
+                    end if
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('works for sub with return types with missing return', () => {
+            program.setFile('source/util.bs', `
+                sub doSomething() as string
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeCoercionMismatch().message
+            ]);
+        });
+
+
+        it('works for sub with return types', () => {
+            program.setFile('source/util.bs', `
+                sub doSomething() as string
+                    return "1"
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('ignores .d.bs files', () => {
+            program.setFile('source/util.d.bs', `
+                function doSomething() as string
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+    describe('assignmentTypeMismatch', () => {
+        it('finds when the type of the lhs is not compatible with the expected type', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(thing as iThing)
+                    thing.name = 123
+                end sub
+
+                interface iThing
+                    name as string
+                end interface
+            `);
+            program.validate();
+            //should have error - assignment value should be a string, not a float
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('integer', 'string').message
+            ]);
+        });
+
+
+        it('allows setting a member with correct type that is a union type', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(thing as iThing)
+                    thing.name = 123
+                end sub
+
+                interface iThing
+                    name as string or integer
+                end interface
+            `);
+            program.validate();
+            //should have no error - assignment value should be a string, not a float
+            expectZeroDiagnostics(program);
+        });
+
+        it('finds when the rhs type is not compatible with the lhs, which is a union type', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(thing as iThing)
+                    thing.name = false
+                end sub
+
+                interface iThing
+                    name as string or integer
+                end interface
+            `);
+            program.validate();
+            //should have error - assignment value should be a string or integer, not a boolean
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('boolean', 'string or integer').message
+            ]);
+        });
+
+        it('validates when trying to assign to a class method', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(myThing as Thing)
+                    myThing.getPi = 3.14
+                end sub
+
+                class Thing
+                    function getPi() as float
+                        return 3.14
+                    end function
+                end class
+            `);
+            program.validate();
+            //should have error
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('float', 'function getPi() as float').message
+            ]);
+        });
+
+        it('disallows adding new properties to a class', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(myThing as Thing)
+                    myThing.getPi = 3.14
+                end sub
+
+                class Thing
+                end class
+            `);
+            program.validate();
+            expectDiagnostics(program, [DiagnosticMessages.cannotFindName('getPi', 'Thing.getPi', 'Thing')]);
+        });
+
+        it('validates class constructors', () => {
+            program.setFile('source/util.bs', `
+                class Video
+                    sub new(url as integer)
+                        m.url = url 'this should be a compile error
+                    end sub
+                    public url as string
+                end class
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('integer', 'string').message
+            ]);
+        });
+
+        it('validates when assigning to a sgNode', () => {
+            program.setFile('source/util.bs', `
+                sub setLabelText(label as roSGNodeLabel)
+                    label.text = 1234
+                end sub
+
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('integer', 'string').message
+            ]);
+        });
+
+        it('allows an assignment to a variable when the declared type does match the rhs type', () => {
+            program.setFile('source/util.bs', `
+                sub setX(value)
+                    x as integer = value ' value is dynamic
+                end sub
+
+                sub setY()
+                    y as integer = len("hello") ' len returns an integer
+                end sub
+            `);
+            program.validate();
+            //should have errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates an assignment to a variable when the declared type does not match the rhs type', () => {
+            program.setFile('source/util.bs', `
+                sub setLabelText(label as roSGNodeLabel)
+                    x as integer = label.text
+                end sub
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+            ]);
+        });
+
+
+        it('allows an assignment to a class field with enum initial value', () => {
+            program.setFile('source/util.bs', `
+                sub setDirection(k as Klass, d as Direction)
+                    k.dir = Direction.South
+                    k.dir = d
+                end sub
+
+                class Klass
+                    dir = Direction.north
+                end class
+
+                enum Direction
+                    north
+                    south
+                end enum
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates an assignment to a class field with enum initial value', () => {
+            program.setFile('source/util.bs', `
+                sub setDirection(k as Klass)
+                    k.dir = "NOT a direction"
+                end sub
+
+                class Klass
+                    dir = Direction.north
+                end class
+
+                enum Direction
+                    north
+                    south
+                end enum
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('string', 'Direction').message
+            ]);
+        });
+
+        describe('Component fields', () => {
+            it('allows assigning string to font fields', () => {
+                program.setFile('source/util.bs', `
+                    sub setLabelFont(label as roSGNodeLabel)
+                        label.font = "font:LargeSystemFont"
+                        label.font.size = 50
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows assigning strings to node fields', () => {
+                program.setFile('source/util.bs', `
+                    sub setPosterPosition(node as roSGNodePoster)
+                        node.translation = "[100, 200]"
+                        node.bitmapMargins = "this is not an aa" ' TODO: this *should* be a diagnostic
+                    end sub
+                `);
+                program.validate();
+                //should have no errors
+                expectZeroDiagnostics(program);
+            });
+
+            it('disallows assigning non-correct type to node fields', () => {
+                program.setFile('source/util.bs', `
+                    sub setId(node as roSgNode)
+                        node.id = 123
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('integer', 'string').message
+                ]);
+            });
+
+            it('allows assigning arrays to appropriate node fields', () => {
+                program.setFile('source/util.bs', `
+                    sub setPosition(node as roSGNodePoster)
+                        node.translation = [100, 200]
+                        node.bitmapMargins = {left: 0, right: 100, top: 0, bottom: 200}
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+
+            it('allows assigning to rect2d fields', () => {
+                program.setFile('components/widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <interface>
+                            <field id="rectangle" type="rect2d" />
+                        </interface>
+                    </component>
+                `);
+
+                program.setFile('source/util.bs', `
+                    sub test()
+                        node = createObject("roSGNode", "Widget")
+                        myRectangle =  {x: 0, y: 0, width: 100, height: 100}
+                        node.rectangle = myRectangle
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows assigning to rect2dArray fields', () => {
+                program.setFile('components/widget.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget" extends="Group">
+                        <interface>
+                            <field id="rectangles" type="rect2dArray" />
+                        </interface>
+                    </component>
+                `);
+
+                program.setFile('source/util.bs', `
+                    sub test()
+                        node = createObject("roSGNode", "Widget")
+                        myRectangles =  [
+                            {x: 0, y: 0, width: 100, height: 100},
+                            {x: 100, y: 100, width: 200, height: 200},
+                        ]
+                        node.rectangles = myRectangles
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows assigning to roSGNodeTargetSet.targetRects fields', () => {
+                program.setFile('source/util.bs', `
+                    sub test()
+                        targetSet = createObject("roSGNode", "TargetSet")
+                        targets = [
+                            {x: 0, y: 0, width: 100, height: 100},
+                            {x: 100, y: 100, width: 200, height: 200},
+                        ]
+                        targetSet.targetRects = targets
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('has diagnostic if invalid data is assigned to roSGNodeTargetSet.targetRects fields', () => {
+                program.setFile('source/util.bs', `
+                    sub test()
+                        targetSet = createObject("roSGNode", "TargetSet")
+                        targets = ["hello", "world"]
+                        targetSet.targetRects = targets
+                    end sub
+                `);
+
+                // make up the assignability data for the diagnostic:
+                const rectType = new AssociativeArrayType();
+                rectType.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+                rectType.addMember('width', null, FloatType.instance, SymbolTypeFlag.runtime);
+                rectType.addMember('x', null, FloatType.instance, SymbolTypeFlag.runtime);
+                rectType.addMember('y', null, FloatType.instance, SymbolTypeFlag.runtime);
+                const typeCompatData = {} as TypeCompatibilityData;
+                rectType.isTypeCompatible(StringType.instance, typeCompatData);
+                typeCompatData.actualType = StringType.instance;
+                typeCompatData.expectedType = rectType;
+
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('Array<string>', 'Array<roAssociativeArray>', typeCompatData).message
+                ]);
+            });
+        });
+
+        describe('inline interfaces', () => {
+            it('allows assigning an Associative Array that meets the interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    interface Iface
+                        inlineMember as {name as string}
+                    end interface
+
+                    sub takesInline(someIface as Iface)
+                        someIface.inlineMember = {name: "test"}
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates assigning an AA that does not meet the interface', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                    interface Iface
+                        inlineMember as {name as string}
+                    end interface
+
+                    sub takesInline(someIface as Iface)
+                        someIface.inlineMember = {name: 123}
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('roAssociativeArray', '{name as string}', {
+                        fieldMismatches: [{ name: 'name', expectedType: StringType.instance, actualType: IntegerType.instance }]
+                    }).message
+                ]);
+            });
+            it('allows assigning invalid to typed arrays', () => {
+                program.setFile<BrsFile>('source/main.bs', `
+                sub test()
+                    intArray as integer[] = invalid
+                    strArray as string[] = invalid
+                end sub
+            `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+
+        describe('for loops', () => {
+            it('allows using the loop variable inside the loop', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        for each item in [1, 2, 3]
+                            x as integer = item + 2
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('validates the loop variable usage', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        for each item in ["test"]
+                            x as integer = item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates assignment of for loop variable to non-number', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        for i = "test" to 8 ' can't set loop var to string
+                            print i
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates for loop step of non-number', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        for i = 1 to 8 step "two"' can't set step to string
+                            print i
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates for loop final value of non-number', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        for i = 1 to "eight" step 2 ' can't set final value to string
+                            print i
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates for loop with types from different places', () => {
+                program.setFile('source/main.bs', `
+
+                    function getInt() as integer
+                        return 2
+                    end function
+
+                    namespace TestNamespace
+                        const ONE = 1
+                    end namespace
+
+                    sub main(data as string[])
+                        for i = TestNamespace.ONE to data.count() step getInt()
+                            print i
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+
+            it('validates assignment of for each loop variable for array literal', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        for each item as integer in ["test"] 'can't set loop var to integer, if given string
+                            print item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates assignment of for each loop variable for typed array', () => {
+                program.setFile('source/main.bs', `
+                    sub main(data as string[])
+                        for each item as integer in data 'can't set loop var to integer, if given string
+                            print item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('validates assignment of for each loop variable for roByteArray', () => {
+                program.setFile('source/main.bs', `
+                    sub main(data as roByteArray)
+                        for each item as string in data 'can't set loop var to string, byte arrays are integers
+                            print item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('integer', 'string').message
+                ]);
+            });
+
+            it('validates assignment of for each loop variable for AAs', () => {
+                program.setFile('source/main.bs', `
+                    sub main(data as roAssociativeArray)
+                        for each item as integer in data 'can't set loop var to integer, associative arrays give keys
+                            print item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.assignmentTypeMismatch('string', 'integer').message
+                ]);
+            });
+
+            it('allows assignment of for each loop variable as string for union of AAs and string array', () => {
+                program.setFile('source/main.bs', `
+                    sub main(data as roAssociativeArray or string[])
+                        for each item as string in data
+                            print item
+                        end for
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('allows assignment of for each loop variable from array of type statement types of union of custom components', () => {
+
+                program.setFile('components/widget1.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget1" extends="Group">
+                        <interface>
+                            <field id="someField" type="string" />
+                        </interface>
+                    </component>
+                `);
+
+                program.setFile('components/widget2.xml', trim`
+                    <?xml version="1.0" encoding="utf-8" ?>
+                    <component name="Widget2" extends="Group">
+                        <interface>
+                            <field id="someField" type="integer" />
+                        </interface>
+                    </component>
+                `);
+
+
+                program.setFile('source/main.bs', `
+                    sub main(data as thing[])
+                        for each item in data
+                            print item.someField
+                        end for
+                    end sub
+
+
+                    type thing = roSGNodeWidget1 or roSGNodeWidget2
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+    });
+
+    describe('operatorTypeMismatch', () => {
+        it('finds when the type of the lhs is not compatible with the rhs type', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    a = 1 + true
+                    b = "hello" * 2
+                end sub
+
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('+', 'integer', 'boolean').message,
+                DiagnosticMessages.operatorTypeMismatch('*', 'string', 'integer').message
+            ]);
+        });
+
+        it('allows when the type of the lhs is compatible with the rhs type', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    a = 10 << 1
+                    b = "hello" + "world"
+                    c = 78 / 34
+                    d = 100 \\ 5
+                    thing = new Klass()
+                    e = thing <> invalid
+                end sub
+
+                class Klass
+                end class
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows tests against invalid', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    thing = new Klass()
+                    x = thing <> invalid
+                end sub
+
+                class Klass
+                end class
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('disallows equality tests of classes', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    thing = new Klass()
+                    thing2 = new Klass()
+                    x = thing = thing2
+                end sub
+
+                class Klass
+                end class
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('=', 'Klass', 'Klass').message
+            ]);
+        });
+
+        it('disallows operations between dynamic and custom types', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(input)
+                    thing = new Klass()
+                    x = thing + input
+                end sub
+
+                class Klass
+                end class
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('+', 'Klass', 'dynamic').message
+            ]);
+        });
+
+        it('allows valid operations on enum members', () => {
+            program.setFile('source/util.bs', `
+                sub makeEasterly(d as Direction)
+                    print d + "e"
+                    print Direction.north + "east"
+                end sub
+
+                function getTax(itemAmt as ItemCost) as Float
+                    return itemAmt * 1.15
+                end function
+
+                enum Direction
+                    north = "n"
+                    south = "s"
+                end enum
+
+                enum ItemCost
+                    x = 99.99
+                    y = 29.99
+                end enum
+
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('finds invalid operations on enum members', () => {
+            program.setFile('source/util.bs', `
+                enum Direction
+                    north = "n"
+                    south = "s"
+                end enum
+
+                sub makeEasterly(d as Direction)
+                    print d + 2
+                    print 3.14 * Direction.north
+                end sub
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('+', 'Direction', 'integer').message,
+                DiagnosticMessages.operatorTypeMismatch('*', 'float', 'Direction').message
+            ]);
+        });
+
+        it('validates unary operators', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    x = - "hello world"
+                end sub
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('-', 'string').message
+            ]);
+        });
+
+        it('allows unary on dynamic and union types', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(x)
+                    y = -x
+                    print y
+                end sub
+
+                sub doOtherStuff(x as float or integer)
+                    y = -x
+                    print y
+                end sub
+
+                sub doEventMoreStuff(x as boolean or dynamic)
+                    if not x
+                        print "ok"
+                    end if
+                end sub
+            `);
+            program.validate();
+            //should have no errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates augmented assignments', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(x as integer)
+                    x += "hello"
+                    print x
+                end sub
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('+=', 'integer', 'string').message
+            ]);
+        });
+
+        it('validates increment statements', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff(x as string)
+                    x++
+                    print x
+                end sub
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('++', 'string').message
+            ]);
+        });
+
+        it('deals with adding int, bool and invalid', () => {
+            program.setFile('source/util.bs', `
+                sub doStuff()
+                    print 1 + (true + invalid)
+                end sub
+
+            `);
+            program.validate();
+            //should have errors
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('+', 'boolean', 'invalid').message
+            ]);
+        });
+
+        it('allows using return of a void func as a variable', () => {
+            program.setFile<BrsFile>('source/main.brs', `
+                sub voidFunc() as void
+                end sub
+
+                sub test()
+                    x = voidFunc()
+                    if x = invalid
+                        print "invalid"
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates using return of a built-in void func as a variable', () => {
+            program.setFile<BrsFile>('source/main.brs', `
+                sub test()
+                    arr = [1,2,3]
+                    x = arr.push(4)
+                    if x = invalid
+                        print "invalid"
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('=', 'uninitialized', 'invalid').message
+            ]);
+        });
+
+        it('allows string comparisons with object', () => {
+            program.setFile<BrsFile>('source/main.brs', `
+                sub test(x as object)
+                    if x <> "test"
+                        print x
+                    end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows boxed types', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                function math(a as rolonginteger, b as longinteger)
+                    c = a + b
+                    c = a - b
+                    c = a * b
+                    c = a / b
+                    c = a \\ b
+
+                    d = a mod b
+                    d = a ^ b
+
+                    a++
+                    a--
+                    a += 1
+                    a -= 1
+                    a *= 1
+                    a /= 1
+                    a \= 1
+                    a <<= 1
+                    a >>= 1
+
+                    ? 1 << (2 as roInt)
+                    ? (1 as roInt) << 2
+                    ? a and b
+                    ? a or b
+
+                    j = a = b
+                    j = a <> b
+                    j = a < b
+                    j = a <= b
+                    j = a > b
+                    j = a >= b
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows unions of compatible types', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                function test(s as string or roString, i as integer or longinteger)
+                    s1 = s + "test"
+                    s2 = "test" + s
+
+                    i1 = i + 5
+                    i2 = 5 + i
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows type statement type of compatible types', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                type number = integer or float
+                type MyString = string or roString
+
+                function test(s as MyString, i as number)
+                    s1 = s + "test"
+                    s2 = "test" + s
+
+                    i1 = i + 5
+                    i2 = 5 + i
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+    describe('memberAccessibilityMismatch', () => {
+        it('should flag when accessing a private member', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    private name as string
+                end class
+
+                sub foo(x as SomeKlass)
+                    print x.name
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('name', SymbolTypeFlag.private, 'SomeKlass')
+            ]);
+        });
+
+
+        it('should allow accessing a private member in a class', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    private name as string
+
+                    sub foo(x as SomeKlass)
+                        print x.name
+                        print m.name
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should flag when calling a private method outside the class', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    private sub sayHello()
+                        print "Hello"
+                    end sub
+                end class
+
+                sub foo(x as SomeKlass)
+                    x.sayHello()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('sayHello', SymbolTypeFlag.private, 'SomeKlass')
+            ]);
+        });
+
+        it('should allow calling a private method in a class', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    private sub sayHello()
+                        print "Hello"
+                    end sub
+
+                    sub foo(x as SomeKlass)
+                        x.sayHello()
+                        m.sayHello()
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should not allow accessing a private member in a subclass', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    private name as string
+                end class
+
+                class SubKlass extends SomeKlass
+                    sub foo()
+                        print m.name
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('name', SymbolTypeFlag.private, 'SomeKlass')
+            ]);
+        });
+
+        it('should flag when setting a value on a private member', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    private name as string
+                end class
+
+                sub foo(x as SomeKlass)
+                    x.name = "foo"
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('name', SymbolTypeFlag.private, 'SomeKlass')
+            ]);
+        });
+
+        it('should flag when accessing a protected member', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    protected name as string
+                end class
+
+                sub foo(x as SomeKlass)
+                    print x.name
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('name', SymbolTypeFlag.protected, 'SomeKlass')
+            ]);
+        });
+
+        it('should allow accessing a protected member in a class', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    protected name as string
+
+                    sub foo(x as SomeKlass)
+                        print x.name
+                        print m.name
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should flag when calling a protected method outside the class', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    protected sub sayHello()
+                        print "Hello"
+                    end sub
+                end class
+
+                class SubKlass extends SomeKlass
+                end class
+
+                sub foo(x as SomeKlass, y as SubKlass)
+                    x.sayHello()
+                    y.sayHello()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('sayHello', SymbolTypeFlag.protected, 'SomeKlass'),
+                DiagnosticMessages.memberAccessibilityMismatch('sayHello', SymbolTypeFlag.protected, 'SomeKlass')
+            ]);
+        });
+
+        it('should allow calling a protected method in a class', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    protected sub sayHello()
+                        print "Hello"
+                    end sub
+                end class
+
+                class SubKlass extends SomeKlass
+                    sub foo(x as SomeKlass, y as SubKlass)
+                        m.sayHello()
+                        x.sayHello()
+                        y.sayHello()
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should allow accessing a protected member in a subclass', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    protected name as string
+                end class
+
+                class SubKlass extends SomeKlass
+                    sub foo()
+                        print m.name
+                    end sub
+                end class
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should flag when setting a value on a protected member', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    protected name as string
+                end class
+
+                class SubKlass extends SomeKlass
+                end class
+
+                sub foo(x as SubKlass)
+                    x.name = "foo"
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('name', SymbolTypeFlag.protected, 'SomeKlass')
+            ]);
+        });
+
+        it('should flag when trying to use an inaccessible member in the middle of a chain', () => {
+            program.setFile('source/main.bs', `
+                class SomeKlass
+                    protected name as string
+                end class
+
+                sub foo(x as SomeKlass)
+                    print x.name.len()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.memberAccessibilityMismatch('name', SymbolTypeFlag.protected, 'SomeKlass')
+            ]);
+        });
+
+        describe('with namespaces', () => {
+            it('protected members are accessible', () => {
+                program.setFile('source/main.bs', `
+                    namespace AccessibilityTest
+                        class MyClass
+                            private data as roAssociativeArray = {}
+                            sub new()
+                                m.data.AddReplace("key", "value")
+                            end sub
+
+                            protected sub printData()
+                                print m.data
+                            end sub
+                        end class
+
+                        class SubClass extends MyClass
+                            sub foo()
+                                m.printData()
+                            end sub
+                        end class
+                    end namespace
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+        });
+
+    });
+
+    describe('cannotFindTypeInDocComment', () => {
+        it('validates types it cannot find in @param', () => {
+            program.setFile<BrsFile>('source/main.brs', `
+                    ' @param {TypeNotThere} info
+                    function sayHello(info)
+                        print "Hello " + info.prop
+                    end function
+                `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('TypeNotThere').message
+            ]);
+        });
+
+        it('validates types it cannot find in @return', () => {
+            program.setFile<BrsFile>('source/main.brs', `
+                    ' @return {TypeNotThere} info
+                    function sayHello(info)
+                        return {data: info.prop}
+                    end function
+                `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('TypeNotThere').message
+            ]);
+        });
+
+        it('validates types it cannot find in @type', () => {
+            program.setFile<BrsFile>('source/main.brs', `
+                    function sayHello(info)
+                        ' @type {TypeNotThere}
+                        value = info.prop
+                    end function
+                `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('TypeNotThere').message
+            ]);
+        });
+
+    });
+
+    describe('circularReferenceDetected', () => {
+        it('finds circular references in consts', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                const A = B ' this is circular-reference
+                const B = C ' this is circular-reference
+                const C = A ' this is circular-reference
+                sub main()
+                    print A ' this is circular-reference
+                end sub
+            `);
+            program.validate();
+            //v1's circular detection reports both the full 3-cycle (A->B->C->A and its
+            //rotations) and the pair-wise B<->C cycle that emerges once each const is
+            //resolved through the next.
+            expectDiagnostics(program, [
+                DiagnosticMessages.circularReferenceDetected(['A', 'B', 'C', 'A']).message,
+                DiagnosticMessages.circularReferenceDetected(['B', 'C', 'A', 'B']).message,
+                DiagnosticMessages.circularReferenceDetected(['B', 'C', 'B']).message,
+                DiagnosticMessages.circularReferenceDetected(['B', 'C', 'B']).message,
+                DiagnosticMessages.circularReferenceDetected(['B', 'C', 'B']).message,
+                DiagnosticMessages.circularReferenceDetected(['C', 'A', 'B', 'C']).message,
+                DiagnosticMessages.circularReferenceDetected(['C', 'B', 'C']).message
+            ]);
+        });
+    });
+
+    describe('revalidation', () => {
+
+        it('revalidates when a enum defined in a different namespace changes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace Alpha
+                    function printEnum(enumVal as Alpha.Beta.Charlie.SomeEnum) as string
+                        return enumVal.toStr()
+                    end function
+                end namespace
+            `);
+
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace Alpha.Beta.Charlie
+                    enum SomeEnum
+                        val1 = 1
+                        val2 = 2
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace Alpha.Beta.Charlie
+                    enum ChangedEnum
+                        val1 = 1
+                        val2 = 2
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, [DiagnosticMessages.cannotFindName('SomeEnum', null, 'Alpha.Beta.Charlie', 'namespace').message]);
+        });
+
+        it('revalidates when a class defined in a different namespace changes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                namespace Alpha
+                    function printEnum(myKlass as Alpha.Beta.Charlie.SomeClass) as string
+                        return myKlass.getValue()
+                    end function
+                end namespace
+            `);
+
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace Alpha.Beta.Charlie
+                    class SomeClass
+                        private myValue as string
+                        function getValue() as string
+                            return m.myValue
+                        end function
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+            program.setFile<BrsFile>('source/file2.bs', `
+                namespace Alpha.Beta.Charlie
+                    class SomeClass
+                        private myValue as string
+                        function getValue(lowerCase as boolean) as string
+                            if lowerCase
+                                return lcase(m.myValue)
+                            end if
+                            return m.myValue
+                        end function
+                    end class
+                end namespace
+            `);
+            program.validate();
+            expectDiagnosticsIncludes(program, [DiagnosticMessages.mismatchArgumentCount(1, 0).message]);
+        });
+
+        it('validates only parts of files that need revalidation on scope validation', () => {
+            function validateFile(file: BrsFile) {
+                const validateFileEvent = {
+                    program: program,
+                    file: file
+                };
+                //emit an event to allow plugins to contribute to the file validation process
+                program.plugins.emit('validateFile', validateFileEvent);
+                program.plugins.emit('afterValidateFile', validateFileEvent);
+            }
+
+            const commonContents = `
+                sub noValidationForEachScope()
+                    k = new KlassInSameFile()
+                    print k.value
+                end sub
+
+                class KlassInSameFile
+                    value = 1
+                end class
+            `;
+
+            let commonBs: BrsFile = program.setFile('source/common.bs', commonContents);
+            validateFile(commonBs);
+            expect(commonBs.validationSegmenter.segmentsForValidation.length).to.eq(2); // 1 func,  1 classField
+            expect(commonBs.validationSegmenter.unresolvedSegmentsSymbols.size).to.eq(0);
+            commonBs.validationSegmenter.validatedSegments.forEach(x => expect(x).to.be.false);
+            expect(commonBs.validationSegmenter.singleValidationSegments.size).to.eq(2); // no references needed to other files
+
+            let common2Contents = `
+                sub doesValidationForEachScope()
+                    k = new KlassInDiffFile()
+                    print k.value
+                end sub
+
+                function alsoNoValidationForEachScope() as integer
+                    return 1
+                end function
+            `;
+            let common2Bs: BrsFile = program.setFile('source/common2.bs', common2Contents);
+            validateFile(common2Bs);
+            expect(common2Bs.validationSegmenter.segmentsForValidation.length).to.eq(2); // 2 func
+            expect(common2Bs.validationSegmenter.unresolvedSegmentsSymbols.size).to.eq(1);
+            commonBs.validationSegmenter.validatedSegments.forEach(x => expect(x).to.be.false);
+            expect(common2Bs.validationSegmenter.singleValidationSegments.size).to.eq(1); // alsoNoValidationForEachScope() does not reference other files
+
+            let klassContents = `
+                class KlassInDiffFile
+                    value = 2
+                end class
+            `;
+
+            let klassBs: BrsFile = program.setFile('source/klass.bs', klassContents);
+            validateFile(klassBs);
+            expect(klassBs.validationSegmenter.segmentsForValidation.length).to.eq(1); //  1 classField
+            expect(klassBs.validationSegmenter.unresolvedSegmentsSymbols.size).to.eq(0);
+            klassBs.validationSegmenter.validatedSegments.forEach(x => expect(x).to.be.false);
+            expect(klassBs.validationSegmenter.singleValidationSegments.size).to.eq(1); // does not reference other files
+
+            const widgetFileContents = `
+                sub init()
+                    noValidationForEachScope()
+                    doesValidationForEachScope()
+                end sub
+
+                sub anotherFunction()
+                    print "hello"
+                end sub
+            `;
+            let widgetBs: BrsFile = program.setFile('components/Widget.bs', widgetFileContents);
+
+            validateFile(widgetBs);
+            expect(widgetBs.validationSegmenter.segmentsForValidation.length).to.eq(2); // 2 funcs
+            expect(widgetBs.validationSegmenter.unresolvedSegmentsSymbols.size).to.eq(1); // 1 func (init)
+            widgetBs.validationSegmenter.validatedSegments.forEach(x => expect(x).to.be.false);
+            expect(widgetBs.validationSegmenter.singleValidationSegments.size).to.eq(1); // 1 func (anotherFunction)
+
+            const diffKlassContent = `
+                class KlassInDiffFile
+                    value = 3
+                end class
+            `;
+            let diffKlassBs: BrsFile = program.setFile('components/diffKlass.bs', diffKlassContent);
+            validateFile(diffKlassBs);
+            expect(diffKlassBs.validationSegmenter.segmentsForValidation.length).to.eq(1); //  1 classField
+            expect(diffKlassBs.validationSegmenter.unresolvedSegmentsSymbols.size).to.eq(0);
+            diffKlassBs.validationSegmenter.validatedSegments.forEach(x => expect(x).to.be.false);
+            expect(diffKlassBs.validationSegmenter.singleValidationSegments.size).to.eq(1);
+
+
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <script uri="pkg:/source/common.bs"/>
+                    <script uri="pkg:/source/common2.bs"/>
+                    <script uri="diffKlass.bs"/>
+                </component>
+            `);
+
+            //reset files
+            commonBs = program.setFile('source/common.bs', commonContents);
+            common2Bs = program.setFile('source/common2.bs', common2Contents);
+            klassBs = program.setFile('source/klass.bs', klassContents);
+            widgetBs = program.setFile('components/Widget.bs', widgetFileContents);
+            diffKlassBs = program.setFile('components/diffKlass.bs', diffKlassContent);
+
+            program.validate();
+            // all segments should be validated
+            [commonBs, common2Bs, klassBs, widgetBs, diffKlassBs].forEach(file => {
+                expect(file.validationSegmenter.validatedSegments.size).to.gte(file.validationSegmenter.segmentsForValidation.length);
+                file.validationSegmenter.validatedSegments.forEach(x => expect(x).to.be.true);
+            });
+
+            expectZeroDiagnostics(program);
+            program.setFile('components/Widget.bs', widgetFileContents);
+            program.validate();
+            // Widget.bs has changed. it needs to totally re-validated
+            // and other files in the scope need to revalidate only the unresolved segments - should be source/common2.bs
+            // TODO: how to test this?
+            program.validate();
+            program.setFile('components/diffKlass.bs', diffKlassContent);
+            // diffKlass.bs has changed. it needs to totally re-validated
+            // no other files in scope reference it .. no other files need revalidation
+            // TODO: how to test this?
+            program.validate();
+            program.setFile('source/common.bs', commonContents);
+            // common.bs has changed. it needs to totally re-validated
+            // in source scope, common2.bs still has unresolves, it needs revalidation
+            // in widget scope, widget.bs references it
+            // TODO: how to test this?
+            program.validate();
+        });
+
+        it('diagnostics stay when file changes', () => {
+            program.options.autoImportComponentScript = true;
+            program.setFile('components/playerInterfaces.bs', `
+                interface MediaObject
+                    optional url as string
+                end interface
+            `);
+            program.setFile('components/player.xml', `
+                <component name="Player" extends="Group">
+                </component>
+            `);
+            program.setFile('components/player.bs', `
+                import "playerInterfaces.bs"
+                import "playerUtils.bs"
+                sub test()
+                    media = {} as MediaObject
+                    print media.missingBool1
+                end sub
+            `);
+            const playerUtilsCode = `
+                import "playerInterfaces.bs"
+                function test1(media as MediaObject) as boolean
+                    print media.missingBool2
+                    return true
+                end function
+            `;
+
+            program.setFile('components/playerUtils.bs', playerUtilsCode);
+            program.validate();
+            //we have both diagnostics
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('missingBool1', undefined, 'MediaObject').message,
+                DiagnosticMessages.cannotFindName('missingBool2', undefined, 'MediaObject').message
+            ]);
+
+            //add the last file again with no changes thus "opening" it.
+            program.setFile('components/playerUtils.bs', playerUtilsCode);
+            program.validate();
+            //we STILL have both diagnostics
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('missingBool1', undefined, 'MediaObject').message,
+                DiagnosticMessages.cannotFindName('missingBool2', undefined, 'MediaObject').message
+            ]);
+        });
+
+        it('rechecks source when member type of import changes', () => {
+            // notice that width is wrongly typed as a boolean
+            program.setFile('source/type1.bs', `
+                interface SubType
+                    value as string
+                end interface
+            `);
+
+            program.setFile('source/type2.bs', `
+                interface ParentType
+                    child as Subtype
+                end interface
+            `);
+
+            program.setFile('source/main.bs', `
+                sub foo(input as ParentType)
+                    input.child.value = 1
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('integer', 'string').message
+            ]);
+
+            // fix width field type to integer
+            program.setFile('source/type1.bs', `
+                interface SubType
+                    value as integer
+                end interface
+            `);
+            program.validate();
+
+            // there should be no more errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('rechecks component source when xml changes', () => {
+            // notice that width is wrongly typed as a boolean
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <field id="width" type="boolean" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                interface IWidget
+                    top as roSGNodeWidget
+                    data as roAssociativeArray
+                end interface
+
+                sub init()
+                    (m as IWidget).top.width =  100
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('integer', 'boolean').message
+            ]);
+
+            // fix width field type to integer
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <field id="width" type="integer" />
+                    </interface>
+                </component>
+            `);
+            program.validate();
+
+            // there should be no more errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('rechecks complete file when type of typecasted m changes indirectly', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <interface>
+                        <field id="width" type="boolean" />
+                    </interface>
+                </component>
+            `);
+
+
+            // notice that width is wrongly typed as a boolean
+            program.setFile('components/WidgetContainer.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="WidgetContainer" extends="Group">
+                    <script uri="WidgetContainer.bs"/>
+                </component>
+            `);
+            program.setFile('components/WidgetContainerTypes.bs', `
+                interface IWidgetContainer
+                    top as roSGNodeWidgetContainer
+                    widget as roSGNodeWidget
+                end interface
+            `);
+
+            program.setFile('components/WidgetContainer.bs', `
+                import "WidgetContainerTypes.bs"
+                typecast m as IWidgetContainer
+
+                sub init()
+                    m.widget.width =  100
+                end sub
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('integer', 'boolean').message
+            ]);
+
+            // fix width field type to integer
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <interface>
+                        <field id="width" type="integer" />
+                    </interface>
+                </component>
+            `);
+            program.validate();
+
+            // there should be no more errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('rechecks file using callfunc when exported function type of xml changes', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="foo" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub foo(input as string)
+                    print input
+                end sub
+            `);
+
+
+            program.setFile('source/callFoo.bs', `
+                sub callFoo(widget as roSGNodeWidget)
+                    widget@.foo(123) ' foo expects string
+                end sub
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message
+            ]);
+
+            // fix function
+            program.setFile('components/Widget.bs', `
+                sub foo(input as integer)
+                    print input
+                end sub
+            `);
+            program.validate();
+
+            // there should be no more errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('rechecks complete file when type of typecasted m  in same file changes indirectly', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <interface>
+                        <field id="width" type="boolean" />
+                    </interface>
+                </component>
+            `);
+
+
+            // notice that width is wrongly typed as a boolean
+            program.setFile('components/WidgetContainer.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="WidgetContainer" extends="Group">
+                    <script uri="WidgetContainer.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/WidgetContainer.bs', `
+                typecast m as IWidgetContainer
+
+                 interface IWidgetContainer
+                    top as roSGNodeWidgetContainer
+                    widget as roSGNodeWidget
+                end interface
+
+                sub init()
+                    m.widget.width =  100
+                end sub
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.assignmentTypeMismatch('integer', 'boolean').message
+            ]);
+
+            // fix width field type to integer
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <interface>
+                        <field id="width" type="integer" />
+                    </interface>
+                </component>
+            `);
+            program.validate();
+
+            // there should be no more errors
+            expectZeroDiagnostics(program);
+        });
+
+        it('recognizes when the type of a for-each loop variable changes', () => {
+            program.setFile<BrsFile>('source/file1.bs', `
+                interface FooFace
+                    prop as string
+                end interface
+            `);
+
+            program.setFile<BrsFile>('source/file2.bs', `
+                function loopFooFace(input as FooFace[])
+                    out = ""
+                    for each ff in input
+                        out += ff.prop
+                    end for
+                    return out
+                end function
+            `);
+            program.validate();
+            //currently no error
+            expectZeroDiagnostics(program);
+
+            // change FooFace.prop to not work in other file
+            program.setFile<BrsFile>('source/file1.bs', `
+                interface FooFace
+                    prop as integer
+                end interface
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.operatorTypeMismatch('+=', 'string', 'integer')
+            ]);
+
+            // change FooFace.prop to back to working
+            program.setFile<BrsFile>('source/file1.bs', `
+                interface FooFace
+                    prop as string
+                end interface
+            `);
+            program.validate();
+            //currently no error
+            expectZeroDiagnostics(program);
+        });
+    });
+
+
+    describe('preprocessor', () => {
+        it('should process class inheritance correctly', () => {
+            fsExtra.outputFileSync(`${rootDir}/manifest`, undent`
+                bs_const=DEBUG=true
+            `);
+            program.setFile('source/myClass.bs', `
+                namespace MyNamespace
+                    class MyClass1
+                        function new()
+                        end function
+                    end class
+                end namespace
+            `);
+
+            program.setFile('source/myClass2.bs', `
+                #if DEBUG
+                    namespace MyNamespace
+                        class MyClass2 extends MyClass1
+                            function new()
+                                super()
+                            end function
+                        end class
+                    end namespace
+                #end if
+            `);
+
+            program.setFile('source/main.bs', `
+                sub main()
+                    #if DEBUG
+                        m.test = new MyNamespace.MyClass2()
+                    #end if
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('should find assignments in conditional compile blocks', () => {
+            fsExtra.outputFileSync(`${rootDir}/manifest`, undent`
+                bs_const=DEBUG=true
+            `);
+
+            program.setFile('source/main.bs', `
+                sub main()
+                    dbg = invalid
+                    #if DEBUG
+                        dbg = "DEBUG"
+                    #end if
+
+                    print dbg
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('should find types defined in condition compile blocks', () => {
+            fsExtra.outputFileSync(`${rootDir}/manifest`, undent`
+                bs_const=DEBUG=true
+            `);
+            program.setFile('source/debugInterfaces.bs', `
+                #if DEBUG
+                    interface DebugInfo
+                        name as string
+                    end interface
+                #end if
+            `);
+
+            program.setFile('source/main.bs', `
+                sub main()
+                    #if DEBUG
+                        info as DebugInfo = {name: "main.bs"}
+                        printDebugInfo(info)
+                    #else
+                        printDebugInfo(info)
+                    #end if
+                end sub
+
+                #if DEBUG
+                    sub printDebugInfo(info as DebugInfo)
+                        print info.name
+                    end sub
+                #end if
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+    describe('notCallable', () => {
+        it('finds when trying to call on a non-function', () => {
+            program.setFile('source/test.bs', `
+                sub someFunc(widget as roSGNodePoster)
+                    print widget.width()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.notCallable('widget.width').message
+            ]);
+        });
+
+        it('allows trying to call a dynamic', () => {
+            program.setFile('source/test.bs', `
+                sub someFunc(widget)
+                    print widget()
+                    print widget.whatever()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows trying to call a function param', () => {
+            program.setFile('source/test.bs', `
+                sub someFunc(widget as function)
+                    print widget()
+                    print widget().whatever()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('finds other non-callables', () => {
+            program.setFile('source/test.bs', `
+                sub someFunc(input as float)
+                    print input()
+                    a = "hello"
+                    print a()
+                    print 12345()
+                    print "string"()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.notCallable('input').message,
+                DiagnosticMessages.notCallable('a').message,
+                DiagnosticMessages.notCallable('12345').message,
+                DiagnosticMessages.notCallable('"string"').message
+            ]);
+        });
+
+        it('allows calling an object type', () => {
+            program.setFile<BrsFile>('source/calc.bs', `
+                function someFunc(otherFunc as object) as dynamic
+                    return otherFunc()
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+    describe('callFunc', () => {
+        it('allows access to member of return type when return type is custom node', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getOther" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getOther(name as string) as roSgNodeOther
+                    other =  createObject("roSgNode", "Other")
+                    other.myValue = name
+                    return other
+                end function
+            `);
+
+            program.setFile('components/Other.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Other" extends="Group">
+                    <interface>
+                        <field id="myValue" type="string" />
+                    </interface>
+                </component>
+            `);
+
+
+            program.setFile('components/MainScene.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="MainScene" extends="Scene">
+                    <script uri="MainScene.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/MainScene.bs', `
+                sub someFunc(widget as roSGNodeWidget)
+                    otherNode = widget@.getOther("3.14")
+                    print otherNode.myValue
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows access to member of return type when return type is custom type', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getOther" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/types.bs', `
+                interface SomeIFace
+                   myValue as string
+                end interface
+            `);
+
+            program.setFile('components/Widget.bs', `
+                import "pkg:/components/types.bs"
+
+                function getOther(name as string) as SomeIFace
+                    other = {myValue: name} as SomeIface
+                    other.myValue = name
+                    return other
+                end function
+            `);
+
+            program.setFile('components/MainScene.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="MainScene" extends="Scene">
+                    <script uri="MainScene.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/MainScene.bs', `
+                sub someFunc(widget as roSGNodeWidget)
+                    otherNode = widget@.getOther("3.14")
+                    print otherNode.myValue
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows access to custom type member of return type when return type is custom type', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getOther" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/types.bs', `
+                interface SomeIFace
+                   subFace as SubIface
+                end interface
+
+                interface SubIface
+                    myValue as string
+                end interface
+            `);
+
+            program.setFile('components/Widget.bs', `
+                import "pkg:/components/types.bs"
+
+                function getOther(name as string) as SomeIFace
+                    other = {subFace: {myValue: name}} as SomeIface
+                    return other
+                end function
+            `);
+
+            program.setFile('components/MainScene.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="MainScene" extends="Scene">
+                    <script uri="MainScene.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/MainScene.bs', `
+                sub someFunc(widget as roSGNodeWidget)
+                    otherNode = widget@.getOther("3.14")
+                    print otherNode.subFace.myValue
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('correctly finds error with using unknown member of callfunc return type when return type is custom type', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getOther" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/types.bs', `
+                interface SomeIFace
+                   subFace as SubIface
+                end interface
+
+                interface SubIface
+                    myValue as string
+                end interface
+            `);
+
+            program.setFile('components/Widget.bs', `
+                import "pkg:/components/types.bs"
+
+                function getOther(name as string) as SomeIFace
+                    other = {subFace: {myValue: name}} as SomeIface
+                    return other
+                end function
+            `);
+
+            program.setFile('components/MainScene.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="MainScene" extends="Scene">
+                    <script uri="MainScene.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/MainScene.bs', `
+                sub someFunc(widget as roSGNodeWidget)
+                    otherNode = widget@.getOther("3.14")
+                    print otherNode.subFace.notIncluded
+                end sub
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('notIncluded', 'SubIface.notIncluded', 'SubIface').message
+            ]);
+        });
+
+        it('catches when a non-component type has callfunc invocation', () => {
+            program.setFile('source/test.bs', `
+                sub printName(widget as integer)
+                    print widget@.toStr()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('toStr', 'integer@.toStr', 'integer').message
+            ]);
+        });
+
+        it('allows to types that reference themselves', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getList" />
+                    </interface>
+                </component>
+            `);
+            program.setFile('components/types.bs', `
+                interface LinkedList
+                    value as integer
+                    optional data as roAssociativeArray
+                    optional next as LinkedList
+                end interface
+            `);
+
+            program.setFile('components/Widget.bs', `
+                import "pkg:/components/types.bs"
+
+                function getList() as LinkedList
+                    list  = {
+                        value: 1,
+                        next: {
+                            value: 2,
+                            next: {
+                                value: 3
+                            }
+                        }
+                    } as LinkedList
+                    return list
+                end function
+            `);
+
+            program.setFile('components/MainScene.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="MainScene" extends="Scene">
+                    <script uri="MainScene.bs"/>
+                </component>
+            `);
+
+            program.setFile('components/MainScene.bs', `
+                sub someFunc(widget as roSGNodeWidget)
+                    list = widget@.getList()
+                    print list.next.next.value
+                end sub
+            `);
+
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('finds invalid func name of callfunc()', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub printName(widget as roSGNodeWidget)
+                    print widget.callFunc("whatever")
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('whatever', 'roSGNodeWidget@.whatever', 'roSGNodeWidget').message
+            ]);
+        });
+
+        it('finds invalid func name of @ callfunc invocation', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub printName(widget as roSGNodeWidget)
+                    print widget@.whatever()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('whatever', 'roSGNodeWidget@.whatever', 'roSGNodeWidget').message
+            ]);
+        });
+
+        it('catches func name of callfunc() with spaces', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub printName(widget as roSGNodeWidget)
+                    print widget.callFunc("whatever the name is")
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('whatever the name is', 'roSGNodeWidget@.whatever the name is', 'roSGNodeWidget').message
+            ]);
+        });
+
+        it('validates arg type of callfunc()', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName(name as string, count as integer) as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub printName(widget as roSGNodeWidget)
+                    print widget.callFunc("getName", 12, "not int")
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message,
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            ]);
+        });
+
+        it('has no error on plain roSGNode', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc(nodeName as string)
+                    node = createObject("roSgNode", nodeName)
+                    node.callfunc("someFunc", 1, 2, 3)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('has error on regular builtIn types', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc()
+                    node = createObject("roSgNode", "Rectangle")
+                    node.callfunc("someFunc", 1, 2, 3)
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', 'roSGNodeRectangle@.someFunc', 'roSGNodeRectangle')
+            ]);
+        });
+
+        it('allows callfunc on flexible types', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc(obj as object, dyn as dynamic, node as roSGNode)
+                    obj.callfunc("testFunc")
+                    obj@.testFunc()
+
+                    dyn.callfunc("testFunc")
+                    dyn@.testFunc()
+
+                    node.callfunc("testFunc")
+                    node@.testFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows callfunc on components from component library', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc()
+                    fromComponentLibrary = CreateObject("roSGNode", "library:SomeComponent")
+                    fromComponentLibrary@.someFunc()
+                    fromComponentLibrary.callfunc("someFunc")
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows callfunc on the dynamic result of a function call', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc(nodeName)
+                    getNode(nodeName)@.someCallFunc(1,2,3)
+                end sub
+
+                function getNode(nodeType)
+                    return CreateObject("roSGNode", nodeType)
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates callfunc on a known result of a function call', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName(name as string, count as integer) as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc()
+                    getWidget()@.getName("someStr", "not an int")
+                end sub
+
+                function getWidget() as roSGNodeWidget
+                    return CreateObject("roSGNode", "Widget")
+                end function
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            ]);
+        });
+
+        it('validates callfunc on a known result of a callfunc call', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                        <function name="getSelf" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName(name as string, count as integer) as string
+                    return "John Doe"
+                end function
+
+                function getSelf() as roSGNodeWidget
+                    return m.top
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(widget as roSGNodeWidget)
+                    widget@.getSelf()@.getName("someStr", "not an int")
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            ]);
+        });
+
+        it('respects return value of as callfunc functions', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getInt" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub getInt() as integer
+                    return 1
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(widget as roSGNodeWidget)
+                    takesInt(widget@.getInt())
+                end sub
+
+                sub takesInt(number as integer)
+                    print number
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('respects return value of as callfunc functions - negative case', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getInt" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub getInt() as integer
+                    return 1
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(widget as roSGNodeWidget)
+                    takesString(widget@.getInt())
+                end sub
+
+                sub takesString(word as string)
+                    print word
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message
+            ]);
+        });
+
+        it('allows return value of as void functions to be dynamic', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="noop" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub noop()
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(widget as roSGNodeWidget)
+                    takesAny(widget@.noop())
+                end sub
+
+                sub takesAny(anything)
+                    print anything
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows callfunc operator on dynamic type', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc(anything)
+                    anything@.someFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows callfunc operator on roSGNode type', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSGNode)
+                    node@.someFunc()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+
+        it('disallows callfunc operator on non-callfuncable type', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc(i as integer, s as string, b as boolean)
+                    i@.someFunc()
+                    s@.someFunc()
+                    b@.someFunc()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', null, 'integer').message,
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', null, 'string').message,
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', null, 'boolean').message
+            ]);
+        });
+
+
+        it('disallows callfunc operator on non-callfuncable type', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc(i as integer, s as string, b as boolean)
+                    i@.someFunc()
+                    s@.someFunc()
+                    b@.someFunc()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', null, 'integer').message,
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', null, 'string').message,
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', null, 'boolean').message
+            ]);
+        });
+
+        it('allows callfunc operator on union of dynamic types', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc()
+                    u = invalid
+                    if rnd(0) > 0.5
+                        u = getComponent1()
+                    else
+                        u = getComponent2()
+                    end if
+
+                    u@.someFunc()
+                end sub
+            `);
+
+            program.setFile('source/test2.bs', `
+                function getComponent1() as dynamic
+                    return 2 ' unknown to be integer outside of function
+                end function
+            `);
+
+            program.setFile('source/test3.bs', `
+                function getComponent2() as dynamic
+                    return 3 ' unknown to be integer outside of function
+                end function
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('disallows callfunc operator on union of non-callfuncable types', () => {
+            program.setFile('source/test.bs', `
+                sub doCallfunc()
+                    if rnd(0) > 0.5
+                        u = 1
+                    else
+                        u = "hello"
+                    end if
+
+                    u@.someFunc()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('someFunc', null, 'integer or string').message
+            ]);
+        });
+
+        it('allows callfunc on union of known components, with valid func', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSGNodeWidget or roSGNodeWidget2)
+                    node@.getName()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('disallows callfunc on union of known components, with invalid func', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="getNumber" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                function getNumber() as float
+                    return 3.14
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSGNodeWidget or roSGNodeWidget2)
+                    node@.getName()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindCallFuncFunction('getName', '', 'roSGNodeWidget or roSGNodeWidget2').message
+            ]);
+        });
+
+        it('uses return type of union of functions', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getData" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getData() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="getData" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                function getData() as float
+                    return 3.14
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSGNodeWidget or roSGNodeWidget2)
+                    takesFloat(node@.getData())
+                end sub
+
+                sub takesFloat(x as float)
+                    print x
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('string or float', 'float').message
+            ]);
+        });
+
+        it('disallows callfunc on union with incompatible func types', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="doStuff" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub doStuff(input as string)
+                    print "hello " + input
+                end sub
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="doStuff" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                sub doStuff(input as float)
+                    print input + 3.14
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSGNodeWidget or roSGNodeWidget2, input)
+                    node@.doStuff(input)
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.incompatibleSymbolDefinition('node@.doStuff', {
+                    isUnion: true,
+                    data: {
+                        expectedType: new TypedFunctionType(VoidType.instance).setName('doStuff').setSub(true).addParameter('input', FloatType.instance, false),
+                        actualType: new TypedFunctionType(VoidType.instance).setName('doStuff').setSub(true).addParameter('input', FloatType.instance, false),
+                        parameterMismatches: [{ index: 0, data: { expectedType: StringType.instance, actualType: FloatType.instance } }]
+                    }
+                }).message
+            ]);
+        });
+
+        it('disallows callfunc on union with incompatible func types, that have the same signature', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="doStuff" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                interface MyStuff
+                    data as boolean
+                end interface
+
+                sub doStuff(input as MyStuff)
+                    print "hello " + input.data.toStr()
+                end sub
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="doStuff" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                interface MyStuff
+                    data as integer
+                end interface
+
+                sub doStuff(input as MyStuff)
+                    print input.data + 3.14
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSGNodeWidget or roSGNodeWidget2, input)
+                    node@.doStuff(input)
+                end sub
+            `);
+            program.validate();
+            const stuff1IFace = new InterfaceType('MyStuff');
+            const stuff2IFace = new InterfaceType('MyStuff');
+
+            expectDiagnostics(program, [
+                DiagnosticMessages.incompatibleSymbolDefinition('node@.doStuff', {
+                    isUnion: true,
+                    data: {
+                        expectedType: new TypedFunctionType(VoidType.instance).setName('doStuff').setSub(true).addParameter('input', stuff1IFace, false),
+                        actualType: new TypedFunctionType(VoidType.instance).setName('doStuff').setSub(true).addParameter('input', stuff2IFace, false),
+                        parameterMismatches: [{ index: 0, data: { expectedType: stuff1IFace, actualType: stuff2IFace } }]
+                    }
+                }).message
+            ]);
+        });
+
+        it('allows callfunc on intersection of callfuncable types', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="getName" />
+                        <function name="getAge" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                function getName() as string
+                    return "John Doe"
+                end function
+
+                function getAge() as integer
+                    return 42
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSGNodeWidget and roSGNodeWidget2)
+                    n = node@.getName()
+                    a = node@.getAge()
+                    takesStringAndInt(n, a)
+                end sub
+
+                sub takesStringAndInt(name as string, age as integer)
+                    print name + age.toStr()
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('validates callfunc on intersection', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName(s as string) as string
+                    return "John Doe" + s
+                end function
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="getAge" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                function getAge(y as integer) as integer
+                    return 42 + y
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSgNodeWidget and roSgNodeWidget2)
+                    n = node@.getName(123)
+                    a = node@.getAge("123")
+                    takesStringAndInt(n, a)
+                end sub
+
+                sub takesStringAndInt(name as string, age as integer)
+                    print name + age.toStr()
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message,
+                DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
+            ]);
+        });
+
+        it('validates callfunc on intersection of nodes with incompatible functions', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                function getName(s as string) as string
+                    return "John Doe" + s
+                end function
+            `);
+
+            program.setFile('components/Widget2.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget2" extends="Group">
+                    <script uri="Widget2.bs"/>
+                    <interface>
+                        <function name="getName" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget2.bs', `
+                function getName(y as integer) as integer
+                    return 42 + y
+                end function
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(node as roSgNodeWidget and roSgNodeWidget2)
+                    n = node@.getName(123)
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.notCallable('node@.getName').message
+            ]);
+        });
+    });
+
+    describe('notIterable', () => {
+        it('allows iteration over array', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff()
+                    arr = [1, 2, 3]
+                    for each item in arr
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows iteration over roArray', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff()
+                    arr = createObject("roArray", 10, true)
+                    for each item in arr
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows iteration over roList', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff()
+                    list = createObject("roList")
+                    for each item in list
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows iteration over AA', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff()
+                    aa = { a: 1, b: 2, c: 3 }
+                    for each item in aa
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows iteration over byteArray', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff(bytes as roByteArray)
+                    for each item in bytes
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows iteration over roXMLList', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff(list as roXMLList)
+                    for each item in list
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('reports error when using for each on non-iterable type', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff()
+                    for each item in 123
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program.diagnostics, [
+                DiagnosticMessages.notIterable('integer').message
+            ]);
+        });
+
+        it('allows a union of iterable types to be iterated over', () => {
+            program.setFile('source/test.bs', `
+                sub doStuff(items as roList or roArray)
+                    for each item in items
+                        print item
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows a union of typed arrays to be iterated over', () => {
+            program.setFile('source/test.bs', `
+                sub setAllText(text as string, labels as roSGNodeLabel[] or roSGNodeMultiStyleLabel[])
+                    for each label in labels
+                        label.text = text
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows a type statement of a typed array to be iterated over', () => {
+            program.setFile('source/test.bs', `
+
+                type StringArray = string[]
+
+                sub printAllText(text as StringArray)
+                    for each t in text
+                        print t
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows a type statement of a typed array to be iterated over', () => {
+            program.setFile('source/test.bs', `
+
+                type StringArray = string[]
+
+                sub printAllText(text as StringArray)
+                    for each t in text
+                        print t
+                    end for
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+});
diff --git a/src/bscPlugin/validation/ScopeValidator.ts b/src/bscPlugin/validation/ScopeValidator.ts
index b5692b3fd..15bd2f884 100644
--- a/src/bscPlugin/validation/ScopeValidator.ts
+++ b/src/bscPlugin/validation/ScopeValidator.ts
@@ -1,31 +1,67 @@
-import { URI } from 'vscode-uri';
-import { isBrsFile, isCallExpression, isDottedGetExpression, isLiteralExpression, isNamespaceStatement, isVariableExpression, isXmlScope } from '../../astUtils/reflection';
-import { Cache } from '../../Cache';
+import * as path from 'path';
+import { DiagnosticTag, type Range } from 'vscode-languageserver';
+import { isAliasStatement, isArrayType, isAssignmentStatement, isAssociativeArrayType, isBinaryExpression, isBooleanTypeLike, isBrsFile, isCallExpression, isCallFuncableTypeLike, isCallableType, isCallfuncExpression, isClassStatement, isClassType, isComponentType, isCompoundType, isDottedGetExpression, isDynamicType, isEnumMemberType, isEnumType, isFunctionExpression, isFunctionParameterExpression, isIterableType, isLiteralExpression, isNamespaceStatement, isNamespaceType, isNewExpression, isNumberTypeLike, isObjectType, isPrimitiveType, isReferenceType, isReturnStatement, isStringTypeLike, isTypeStatementType, isTypedFunctionType, isUnionType, isVariableExpression, isVoidType, isXmlScope } from '../../astUtils/reflection';
+import type { DiagnosticInfo } from '../../DiagnosticMessages';
 import { DiagnosticMessages } from '../../DiagnosticMessages';
 import type { BrsFile } from '../../files/BrsFile';
-import type { BscFile, BsDiagnostic, OnScopeValidateEvent } from '../../interfaces';
-import type { ConstStatement, EnumStatement, NamespaceStatement } from '../../parser/Statement';
-import util from '../../util';
+import type { BsDiagnostic, CallableContainer, ExtraSymbolData, FileReference, GetTypeOptions, ValidateScopeEvent, TypeChainEntry, TypeChainProcessResult, TypeCompatibilityData } from '../../interfaces';
+import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import type { AssignmentStatement, AugmentedAssignmentStatement, ClassStatement, ConstStatement, DottedSetStatement, ForEachStatement, ForStatement, IncrementStatement, NamespaceStatement, ReturnStatement } from '../../parser/Statement';
+import { util } from '../../util';
 import { nodes, components } from '../../roku-types';
 import type { BRSComponentData } from '../../roku-types';
 import type { Token } from '../../lexer/Token';
-import { TokenKind } from '../../lexer/TokenKind';
-import type { Scope } from '../../Scope';
-import type { DiagnosticRelatedInformation } from 'vscode-languageserver';
+import { AstNodeKind } from '../../parser/AstNode';
+import type { AstNode } from '../../parser/AstNode';
 import type { Expression } from '../../parser/AstNode';
-import type { VariableExpression, DottedGetExpression } from '../../parser/Expression';
-import { ParseMode } from '../../parser/Parser';
+import type { VariableExpression, DottedGetExpression, BinaryExpression, UnaryExpression, NewExpression, LiteralExpression, FunctionExpression, CallfuncExpression, AAIndexedMemberExpression } from '../../parser/Expression';
+import { CallExpression } from '../../parser/Expression';
 import { createVisitor, WalkMode } from '../../astUtils/visitors';
+import type { BscType } from '../../types/BscType';
+import type { BscFile } from '../../files/BscFile';
+import { InsideSegmentWalkMode } from '../../AstValidationSegmenter';
+import { TokenKind } from '../../lexer/TokenKind';
+import { ParseMode } from '../../parser/Parser';
+import { BsClassValidator } from '../../validators/ClassValidator';
+import { globalCallableMap } from '../../globalCallables';
+import type { XmlScope } from '../../XmlScope';
+import type { XmlFile } from '../../files/XmlFile';
+import { SGFieldTypes } from '../../parser/SGTypes';
+import { DynamicType } from '../../types/DynamicType';
+import { BscTypeKind } from '../../types/BscTypeKind';
+import type { BrsDocWithType } from '../../parser/BrightScriptDocParser';
+import brsDocParser from '../../parser/BrightScriptDocParser';
+import type { Location } from 'vscode-languageserver';
+import { InvalidType } from '../../types/InvalidType';
+import { VoidType } from '../../types/VoidType';
+import { LogLevel } from '../../Logger';
+import { Stopwatch } from '../../Stopwatch';
+import chalk from 'chalk';
+import { IntegerType } from '../../types/IntegerType';
+import type { Scope } from '../../Scope';
 
 /**
  * The lower-case names of all platform-included scenegraph nodes
  */
-const platformNodeNames = new Set(Object.values(nodes).map(x => x.name.toLowerCase()));
-const platformComponentNames = new Set(Object.values(components).map(x => x.name.toLowerCase()));
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+const platformNodeNames = nodes ? new Set((Object.values(nodes) as { name: string }[]).map(x => x?.name.toLowerCase())) : new Set();
+const platformComponentNames = components ? new Set((Object.values(components) as { name: string }[]).map(x => x?.name.toLowerCase())) : new Set();
+
+const enum ScopeValidatorDiagnosticTag {
+    Imports = 'ScopeValidatorImports',
+    NamespaceCollisions = 'ScopeValidatorNamespaceCollisions',
+    DuplicateFunctionDeclaration = 'ScopeValidatorDuplicateFunctionDeclaration',
+    FunctionCollisions = 'ScopeValidatorFunctionCollisions',
+    Classes = 'ScopeValidatorClasses',
+    XMLInterface = 'ScopeValidatorXML',
+    XMLImports = 'ScopeValidatorXMLImports',
+    Default = 'ScopeValidator',
+    Segment = 'ScopeValidatorSegment'
+}
 
 /**
  * A validator that handles all scope validations for a program validation cycle.
- * You should create ONE of these to handle all scope events between beforeProgramValidate and afterProgramValidate,
+ * You should create ONE of these to handle all scope events between beforeValidateProgram and afterValidateProgram,
  * and call reset() before using it again in the next cycle
  */
 export class ScopeValidator {
@@ -33,104 +69,358 @@ export class ScopeValidator {
     /**
      * The event currently being processed. This will change multiple times throughout the lifetime of this validator
      */
-    private event: OnScopeValidateEvent;
+    private event: ValidateScopeEvent;
 
-    public processEvent(event: OnScopeValidateEvent) {
+    private segmentsMetrics = new Map<string, { segments: number; time: string }>();
+    private validationKindsMetrics = new Map<string, { timeMs: number; count: number }>();
+
+    public processEvent(event: ValidateScopeEvent) {
         this.event = event;
-        this.walkFiles();
-        this.detectDuplicateEnums();
-        this.detectCircularConstReferences();
+        if (this.event.program.globalScope === this.event.scope) {
+            return;
+        }
+        const logger = this.event.program.logger;
+        const metrics = {
+            fileWalkTime: '',
+            flagDuplicateFunctionTime: '',
+            classValidationTime: '',
+            scriptImportValidationTime: '',
+            xmlValidationTime: '',
+            circularConstTime: ''
+        };
+        this.segmentsMetrics.clear();
+        this.validationKindsMetrics.clear();
+        const validationStopwatch = new Stopwatch();
+
+        logger.time(LogLevel.debug, ['Validating scope', this.event.scope.name], () => {
+            metrics.fileWalkTime = validationStopwatch.getDurationTextFor(() => {
+                this.walkFiles();
+            }).durationText;
+            this.currentSegmentBeingValidated = null;
+            metrics.flagDuplicateFunctionTime = validationStopwatch.getDurationTextFor(() => {
+                this.flagDuplicateFunctionDeclarations();
+            }).durationText;
+            metrics.scriptImportValidationTime = validationStopwatch.getDurationTextFor(() => {
+                this.validateScriptImportPaths();
+            }).durationText;
+            metrics.classValidationTime = validationStopwatch.getDurationTextFor(() => {
+                this.validateClasses();
+            }).durationText;
+            metrics.xmlValidationTime = validationStopwatch.getDurationTextFor(() => {
+                if (isXmlScope(this.event.scope)) {
+                    //detect when the child imports a script that its ancestor also imports
+                    this.diagnosticDetectDuplicateAncestorScriptImports(this.event.scope);
+                    //validate component interface
+                    this.validateXmlInterface(this.event.scope);
+                }
+            }).durationText;
+            metrics.circularConstTime = validationStopwatch.getDurationTextFor(() => {
+                this.detectCircularConstReferences();
+            }).durationText;
+        });
+        logger.debug(this.event.scope.name, 'segment metrics:');
+        let totalSegments = 0;
+        for (const [filePath, metric] of this.segmentsMetrics) {
+            this.event.program.logger.debug(' - ', filePath, metric.segments, metric.time);
+            totalSegments += metric.segments;
+        }
+        logger.debug(this.event.scope.name, 'total segments validated', totalSegments);
+        this.logValidationMetrics(metrics);
+    }
+
+    // eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
+    private logValidationMetrics(metrics: { [key: string]: number | string }) {
+        let logs = [] as string[];
+        for (let key in metrics) {
+            logs.push(`${key}=${chalk.yellow(metrics[key].toString())}`);
+        }
+        this.event.program.logger.debug(`Validation Metrics (Scope: ${this.event.scope.name}): ${logs.join(', ')}`);
+        let kindsLogs = [] as string[];
+        const kindsArray = Array.from(this.validationKindsMetrics.keys()).sort();
+        for (let key of kindsArray) {
+            const timeData = this.validationKindsMetrics.get(key);
+            kindsLogs.push(`${key}=${chalk.yellow(timeData.timeMs.toFixed(3).toString()) + 'ms'} (${timeData.count})`);
+        }
+        this.event.program.logger.debug(`Validation Walk Metrics (Scope: ${this.event.scope.name}): ${kindsLogs.join(', ')}`);
     }
 
     public reset() {
         this.event = undefined;
-        this.onceCache.clear();
-        this.multiScopeCache.clear();
     }
 
     private walkFiles() {
-        this.event.scope.enumerateOwnFiles((file) => {
-            if (isBrsFile(file)) {
-                this.iterateFileExpressions(file);
-                this.validateCreateObjectCalls(file);
-                this.validateComputedAAKeys(file);
+        const hasChangeInfo = this.event.changedFiles && this.event.changedSymbols;
+
+        //do many per-file checks for every file in this (and parent) scopes
+        this.event.scope.enumerateBrsFiles((file) => {
+            if (!isBrsFile(file)) {
+                return;
+            }
+
+            const thisFileHasChanges = this.event.changedFiles.includes(file);
+
+            if (thisFileHasChanges || this.doesFileProvideChangedSymbol(file, this.event.changedSymbols)) {
+                this.diagnosticDetectFunctionCollisions(file);
             }
         });
-    }
+        const fileWalkStopWatch = new Stopwatch();
 
-    private validateComputedAAKeys(file: BrsFile) {
-        const { scope } = this.event;
-        file.ast.walk(createVisitor({
-            AAIndexedMemberExpression: (member) => {
-                // Direct string literal (e.g. ["my-key"]) is valid
-                if (isLiteralExpression(member.key)) {
-                    if (member.key.token.kind !== TokenKind.StringLiteral) {
-                        this.addMultiScopeDiagnostic({
-                            file: file,
-                            ...DiagnosticMessages.computedAAKeyMustBeStringExpression(),
-                            range: member.key.range
-                        });
-                    }
+        this.event.scope.enumerateOwnFiles((file) => {
+            if (isBrsFile(file)) {
+
+                if (this.event.program.diagnostics.shouldFilterFile(file)) {
                     return;
                 }
-                const parts = util.getDottedGetPath(member.key);
-                if (parts.length === 0) {
-                    this.addMultiScopeDiagnostic({
-                        file: file,
-                        ...DiagnosticMessages.computedPropertyKeyMustBeConstantExpression(),
-                        range: member.key.range
-                    });
+
+                fileWalkStopWatch.reset();
+                fileWalkStopWatch.start();
+
+                const fileUri = util.pathToUri(file.srcPath);
+                const thisFileHasChanges = this.event.changedFiles.includes(file);
+
+                const hasUnvalidatedSegments = file.validationSegmenter.hasUnvalidatedSegments();
+
+                if (hasChangeInfo && !hasUnvalidatedSegments) {
                     return;
                 }
-                const enclosingNamespace = member.key.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript)?.toLowerCase();
-                const entityName = parts.map(p => p.name.text.toLowerCase()).join('.');
-                // Check enum member
-                const memberLink = scope.getEnumMemberFileLink(entityName, enclosingNamespace);
-                if (memberLink) {
-                    const value = memberLink.item.getValue();
-                    if (!value?.startsWith('"')) {
-                        this.addMultiScopeDiagnostic({
-                            file: file,
-                            ...DiagnosticMessages.computedAAKeyMustBeStringExpression(),
-                            range: member.key.range
+
+                const validationVisitor = createVisitor({
+                    VariableExpression: (varExpr) => {
+                        this.addValidationKindMetric('VariableExpression', () => {
+                            this.validateVariableAndDottedGetExpressions(file, varExpr);
+                        });
+                    },
+                    DottedGetExpression: (dottedGet) => {
+                        this.addValidationKindMetric('DottedGetExpression', () => {
+                            this.validateVariableAndDottedGetExpressions(file, dottedGet);
+                        });
+                    },
+                    CallExpression: (functionCall) => {
+                        this.addValidationKindMetric('CallExpression', () => {
+                            this.validateCallExpression(file, functionCall);
+                            this.validateCreateObjectCall(file, functionCall);
+                            this.validateComponentMethods(file, functionCall);
+                        });
+                    },
+                    CallfuncExpression: (functionCall) => {
+                        this.addValidationKindMetric('CallfuncExpression', () => {
+                            this.validateCallFuncExpression(file, functionCall);
+                        });
+                    },
+                    ReturnStatement: (returnStatement) => {
+                        this.addValidationKindMetric('ReturnStatement', () => {
+                            this.validateReturnStatement(file, returnStatement);
+                        });
+                    },
+                    DottedSetStatement: (dottedSetStmt) => {
+                        this.addValidationKindMetric('DottedSetStatement', () => {
+                            this.validateDottedSetStatement(file, dottedSetStmt);
+                        });
+                    },
+                    BinaryExpression: (binaryExpr) => {
+                        this.addValidationKindMetric('BinaryExpression', () => {
+                            this.validateBinaryExpression(file, binaryExpr);
+                        });
+                    },
+                    UnaryExpression: (unaryExpr) => {
+                        this.addValidationKindMetric('UnaryExpression', () => {
+                            this.validateUnaryExpression(file, unaryExpr);
+                        });
+                    },
+                    AssignmentStatement: (assignStmt) => {
+                        this.addValidationKindMetric('AssignmentStatement', () => {
+                            this.validateAssignmentStatement(file, assignStmt);
+                            // Note: this also includes For statements
+                            this.detectShadowedLocalVar(file, {
+                                expr: assignStmt,
+                                name: assignStmt.tokens.name.text,
+                                type: this.getNodeTypeWrapper(file, assignStmt, { flags: SymbolTypeFlag.runtime }),
+                                nameRange: assignStmt.tokens.name.location?.range
+                            });
+                        });
+                    },
+                    AugmentedAssignmentStatement: (binaryExpr) => {
+                        this.addValidationKindMetric('AugmentedAssignmentStatement', () => {
+                            this.validateBinaryExpression(file, binaryExpr);
+                        });
+                    },
+                    IncrementStatement: (stmt) => {
+                        this.addValidationKindMetric('IncrementStatement', () => {
+                            this.validateIncrementStatement(file, stmt);
+                        });
+                    },
+                    NewExpression: (newExpr) => {
+                        this.addValidationKindMetric('NewExpression', () => {
+                            this.validateNewExpression(file, newExpr);
+                        });
+                    },
+                    ForEachStatement: (forEachStmt) => {
+                        this.addValidationKindMetric('ForEachStatement', () => {
+                            this.detectShadowedLocalVar(file, {
+                                expr: forEachStmt,
+                                name: forEachStmt.tokens.item.text,
+                                type: this.getNodeTypeWrapper(file, forEachStmt, { flags: SymbolTypeFlag.runtime }),
+                                nameRange: forEachStmt.tokens.item.location?.range
+                            });
+                            this.validateForEachStatement(file, forEachStmt);
+                        });
+                    },
+                    FunctionParameterExpression: (funcParam) => {
+                        this.addValidationKindMetric('FunctionParameterExpression', () => {
+                            this.detectShadowedLocalVar(file, {
+                                expr: funcParam,
+                                name: funcParam.tokens.name.text,
+                                type: this.getNodeTypeWrapper(file, funcParam, { flags: SymbolTypeFlag.runtime }),
+                                nameRange: funcParam.tokens.name.location?.range
+                            });
+                        });
+                    },
+                    FunctionExpression: (func) => {
+                        if (file.isTypedef) {
+                            return;
+                        }
+                        this.addValidationKindMetric('FunctionExpression', () => {
+                            this.validateFunctionExpressionForReturn(func);
+                        });
+                    },
+                    ForStatement: (forStmt) => {
+                        this.addValidationKindMetric('ForStatement', () => {
+                            this.validateForStatement(file, forStmt);
+                        });
+                    },
+                    AAIndexedMemberExpression: (member) => {
+                        this.addValidationKindMetric('AAIndexedMemberExpression', () => {
+                            this.validateAAIndexedMemberExpression(file, member);
+                        });
+                    },
+                    AstNode: (node) => {
+                        //check for doc comments
+                        if (!node.leadingTrivia || node.leadingTrivia.filter(triviaToken => triviaToken.kind === TokenKind.Comment).length === 0) {
+                            return;
+                        }
+                        this.addValidationKindMetric('AstNode', () => {
+                            this.validateDocComments(node);
                         });
                     }
-                    return;
+                });
+                // validate only what's needed in the file
+
+                const segmentsToWalkForValidation = thisFileHasChanges
+                    ? file.validationSegmenter.getAllUnvalidatedSegments()
+                    : file.validationSegmenter.getSegmentsWithChangedSymbols(this.event.changedSymbols);
+
+                let segmentsValidated = 0;
+
+                if (thisFileHasChanges) {
+                    // clear all ScopeValidatorSegment diagnostics for this file
+                    this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, fileUri: fileUri, tag: ScopeValidatorDiagnosticTag.Segment });
                 }
-                // Check const — follow the chain to find the root literal type
-                const constLink = scope.getConstFileLink(entityName, enclosingNamespace);
-                if (constLink) {
-                    if (!this.constResolvesToString(constLink.item.value, enclosingNamespace, scope)) {
-                        this.addMultiScopeDiagnostic({
-                            file: file,
-                            ...DiagnosticMessages.computedAAKeyMustBeStringExpression(),
-                            range: member.key.range
-                        });
+
+
+                for (const segment of segmentsToWalkForValidation) {
+                    if (!thisFileHasChanges && !file.validationSegmenter.checkIfSegmentNeedsRevalidation(segment, this.event.changedSymbols)) {
+                        continue;
                     }
-                    return;
+                    this.currentSegmentBeingValidated = segment;
+                    if (!thisFileHasChanges) {
+                        // just clear the affected diagnostics
+                        this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, fileUri: fileUri, segment: segment, tag: ScopeValidatorDiagnosticTag.Segment });
+                    }
+                    segmentsValidated++;
+                    segment.walk(validationVisitor, {
+                        walkMode: InsideSegmentWalkMode
+                    });
+                    file.markSegmentAsValidated(segment);
+                    this.currentSegmentBeingValidated = null;
                 }
+                fileWalkStopWatch.stop();
+                const timeString = fileWalkStopWatch.getDurationText();
+                this.segmentsMetrics.set(file.pkgPath, { segments: segmentsValidated, time: timeString });
+            }
+        });
+    }
+
+    private addValidationKindMetric(name: string, funcToTime: () => void) {
+        if (!this.validationKindsMetrics.has(name)) {
+            this.validationKindsMetrics.set(name, { timeMs: 0, count: 0 });
+        }
+        const timeData = this.validationKindsMetrics.get(name);
+        const validationKindStopWatch = new Stopwatch();
+        validationKindStopWatch.start();
+        funcToTime();
+        validationKindStopWatch.stop();
+        this.validationKindsMetrics.set(name, { timeMs: timeData.timeMs + validationKindStopWatch.totalMilliseconds, count: timeData.count + 1 });
+    }
+
+
+    private validateAAIndexedMemberExpression(file: BrsFile, member: AAIndexedMemberExpression) {
+        const scope = this.event.scope;
+        // Direct string literal (e.g. ["my-key"]) is valid
+        if (isLiteralExpression(member.key)) {
+            if (member.key.tokens.value.kind !== TokenKind.StringLiteral) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.computedAAKeyMustBeStringExpression(),
+                    location: member.key.location
+                });
+            }
+            return;
+        }
+        const parts = util.getAllDottedGetParts(member.key);
+        //getAllDottedGetParts returns undefined for keys that aren't dotted-get / variable
+        //chains (e.g. arithmetic expressions like `[1 + 2]: "value"`). Those are not
+        //compile-time constants, so the diagnostic still applies.
+        if (!parts || parts.length === 0) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.computedPropertyKeyMustBeConstantExpression(),
+                location: member.key.location
+            });
+            return;
+        }
+        const enclosingNamespace = member.key.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript)?.toLowerCase();
+        const entityName = parts.map(p => p.text.toLowerCase()).join('.');
+        // Check enum member
+        const memberLink = scope.getEnumMemberFileLink(entityName, enclosingNamespace);
+        if (memberLink) {
+            const value = memberLink.item.getValue();
+            if (!value?.startsWith('"')) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.computedAAKeyMustBeStringExpression(),
+                    location: member.key.location
+                });
+            }
+            return;
+        }
+        // Check const — follow the chain to find the root literal type
+        const constLink = scope.getConstFileLink(entityName, enclosingNamespace);
+        if (constLink) {
+            if (!this.constResolvesToString(constLink.item.value, enclosingNamespace, scope)) {
                 this.addMultiScopeDiagnostic({
-                    file: file,
-                    ...DiagnosticMessages.computedPropertyKeyMustBeConstantExpression(),
-                    range: member.key.range
+                    ...DiagnosticMessages.computedAAKeyMustBeStringExpression(),
+                    location: member.key.location
                 });
             }
-        }), { walkMode: WalkMode.visitAllRecursive });
+            return;
+        }
+        this.addMultiScopeDiagnostic({
+            ...DiagnosticMessages.computedPropertyKeyMustBeConstantExpression(),
+            location: member.key.location
+        });
     }
 
+
     /**
      * Recursively resolve a const/enum reference to determine if its ultimate value is a string.
      * Returns true only if the value is confirmed to be a string.
      */
     private constResolvesToString(value: Expression, enclosingNamespace: string, scope: Scope, visited = new Set<string>()): boolean {
         if (isLiteralExpression(value)) {
-            return value.token.kind === TokenKind.StringLiteral;
+            return value.tokens.value.kind === TokenKind.StringLiteral;
         }
-        const parts = util.getDottedGetPath(value);
+        const parts = util.getAllDottedGetParts(value);
         if (parts.length === 0) {
             return false;
         }
-        const entityName = parts.map(p => p.name.text.toLowerCase()).join('.');
+        const entityName = parts.map(p => p.text.toLowerCase()).join('.');
         if (visited.has(entityName)) {
             return false; // circular reference — cannot confirm string
         }
@@ -146,210 +436,64 @@ export class ScopeValidator {
         return false;
     }
 
-    private expressionsByFile = new Cache<BrsFile, Readonly<ExpressionInfo>[]>();
-    private iterateFileExpressions(file: BrsFile) {
-        const { scope } = this.event;
-        //build an expression collection ONCE per file
-        const expressionInfos = this.expressionsByFile.getOrAdd(file, () => {
-            const result: DeepWriteable<ExpressionInfo[]> = [];
-            const expressions = [
-                ...file.parser.references.expressions,
-                //all class "extends <whatever>" expressions
-                ...file.parser.references.classStatements.map(x => x.parentClassName?.expression),
-                //all interface "extends <whatever>" expressions
-                ...file.parser.references.interfaceStatements.map(x => x.parentInterfaceName?.expression)
-            ];
-            for (let expression of expressions) {
-                if (!expression) {
-                    continue;
-                }
-
-                //walk left-to-right on every expression, only keep the ones that start with VariableExpression, and then keep subsequent DottedGet parts
-                const parts = util.getDottedGetPath(expression);
 
-                if (parts.length > 0) {
-                    result.push({
-                        parts: parts,
-                        expression: expression,
-                        enclosingNamespaceNameLower: expression.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript)?.toLowerCase()
-                    });
-                }
-            }
-            return result as unknown as Readonly<ExpressionInfo>[];
-        });
+    private doesFileProvideChangedSymbol(file: BrsFile, changedSymbols: Map<SymbolTypeFlag, Set<string>>) {
+        if (!changedSymbols) {
+            return true;
+        }
+        for (const flag of [SymbolTypeFlag.runtime, SymbolTypeFlag.typetime]) {
+            const providedSymbolKeysFlag = file.providedSymbols.symbolMap.get(flag).keys();
+            const changedSymbolSetForFlag = changedSymbols.get(flag);
 
-        outer:
-        for (const info of expressionInfos) {
-            const symbolTable = info.expression.getSymbolTable();
-            const firstPart = info.parts[0];
-            const firstNamespacePart = info.parts[0].name.text;
-            const firstNamespacePartLower = firstNamespacePart?.toLowerCase();
-            //get the namespace container (accounting for namespace-relative as well)
-            const namespaceContainer = scope.getNamespace(firstNamespacePartLower, info.enclosingNamespaceNameLower);
-
-            //flag all unknown left-most variables
-            if (
-                !symbolTable?.hasSymbol(firstPart.name?.text) &&
-                !namespaceContainer
-            ) {
-                //flag functions differently than all other variables
-                if (isCallExpression(firstPart.parent) && firstPart.parent.callee === firstPart) {
-                    this.addMultiScopeDiagnostic({
-                        file: file as BscFile,
-                        ...DiagnosticMessages.cannotFindFunction(firstPart.name?.text),
-                        range: firstPart.name.range
-                    });
-                } else {
-                    this.addMultiScopeDiagnostic({
-                        file: file as BscFile,
-                        ...DiagnosticMessages.cannotFindName(firstPart.name?.text),
-                        range: firstPart.name.range
-                    });
+            for (let providedKey of providedSymbolKeysFlag) {
+                if (changedSymbolSetForFlag.has(providedKey)) {
+                    return true;
                 }
-                //skip to the next expression
-                continue;
-            }
-
-            const enumStatement = scope.getEnum(firstNamespacePartLower, info.enclosingNamespaceNameLower);
-
-            //if this isn't a namespace, skip it
-            if (!namespaceContainer && !enumStatement) {
-                continue;
             }
+        }
+        return false;
+    }
 
-            //catch unknown namespace items
-            let entityName = firstNamespacePart;
-            let entityNameLower = firstNamespacePart.toLowerCase();
-            for (let i = 1; i < info.parts.length; i++) {
-                const part = info.parts[i];
-                entityName += '.' + part.name.text;
-                entityNameLower += '.' + part.name.text.toLowerCase();
+    private currentSegmentBeingValidated: AstNode;
 
-                //if this is an enum member, stop validating here to prevent errors further down the chain
-                if (scope.getEnumMemberFileLink(entityName, info.enclosingNamespaceNameLower)) {
-                    break;
-                }
 
-                if (
-                    !scope.getEnumMap().has(entityNameLower) &&
-                    !scope.getClassMap().has(entityNameLower) &&
-                    !scope.getConstMap().has(entityNameLower) &&
-                    !scope.getCallableByName(entityNameLower) &&
-                    !scope.getNamespace(entityNameLower, info.enclosingNamespaceNameLower)
-                ) {
-                    //if this looks like an enum, provide a nicer error message
-                    const theEnum = this.getEnum(scope, entityNameLower)?.item;
-                    if (theEnum) {
-                        this.addMultiScopeDiagnostic({
-                            file: file,
-                            ...DiagnosticMessages.unknownEnumValue(part.name.text?.split('.').pop(), theEnum.fullName),
-                            range: part.name.range,
-                            relatedInformation: [{
-                                message: 'Enum declared here',
-                                location: util.createLocation(
-                                    URI.file(file.srcPath).toString(),
-                                    theEnum.tokens.name.range
-                                )
-                            }]
-                        });
-                    } else {
-                        //flag functions differently than all other variables
-                        if (isCallExpression(firstPart.parent) && firstPart.parent.callee === firstPart) {
-                            this.addMultiScopeDiagnostic({
-                                ...DiagnosticMessages.cannotFindFunction(part.name.text, entityName),
-                                range: part.name.range,
-                                file: file
-                            });
-                        } else {
-                            this.addMultiScopeDiagnostic({
-                                ...DiagnosticMessages.cannotFindName(part.name.text, entityName),
-                                range: part.name.range,
-                                file: file
-                            });
-                        }
-                    }
-                    //no need to add another diagnostic for future unknown items
-                    continue outer;
-                }
-            }
-            //if the full expression is a namespace path, this is an illegal statement because namespaces don't exist at runtme
-            if (scope.getNamespace(entityNameLower, info.enclosingNamespaceNameLower)) {
-                this.addMultiScopeDiagnostic({
-                    ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
-                    range: info.expression.range,
-                    file: file
-                }, 'When used in scope');
-            }
-        }
+    private isTypeKnown(exprType: BscType) {
+        let isKnownType = exprType?.isResolvable();
+        return isKnownType;
     }
 
-    /**
-     * Given a string optionally separated by dots, find an enum related to it.
-     * For example, all of these would return the enum: `SomeNamespace.SomeEnum.SomeMember`, SomeEnum.SomeMember, `SomeEnum`
-     */
-    private getEnum(scope: Scope, name: string) {
-        //look for the enum directly
-        let result = scope.getEnumMap().get(name);
+    private getCircularReference(exprType: BscType) {
+        if (exprType?.isResolvable()) {
+            return { isCircularReference: false };
+        }
+        if (isReferenceType(exprType)) {
 
-        //assume we've been given the enum.member syntax, so pop the member and try again
-        if (!result) {
-            const parts = name.split('.');
-            parts.pop();
-            result = scope.getEnumMap().get(parts.join('.'));
+            const info = exprType.getCircularReferenceInfo();
+            return info;
         }
-        return result;
+        return { isCircularReference: false };
     }
 
+
     /**
-     * Flag duplicate enums
+     * If this is the lhs of an assignment, we don't need to flag it as unresolved
      */
-    private detectDuplicateEnums() {
-        const diagnostics: BsDiagnostic[] = [];
-        const enumLocationsByName = new Cache<string, Array<{ file: BrsFile; statement: EnumStatement }>>();
-        this.event.scope.enumerateBrsFiles((file) => {
-            for (const enumStatement of file.parser.references.enumStatements) {
-                const fullName = enumStatement.fullName;
-                const nameLower = fullName?.toLowerCase();
-                if (nameLower?.length > 0) {
-                    enumLocationsByName.getOrAdd(nameLower, () => []).push({
-                        file: file,
-                        statement: enumStatement
-                    });
-                }
-            }
-        });
-
-        //now that we've collected all enum declarations, flag duplicates
-        for (const enumLocations of enumLocationsByName.values()) {
-            //sort by srcPath to keep the primary enum location consistent
-            enumLocations.sort((a, b) => {
-                const pathA = a.file?.srcPath;
-                const pathB = b.file?.srcPath;
-                if (pathA < pathB) {
-                    return -1;
-                } else if (pathA > pathB) {
-                    return 1;
-                }
-                return 0;
-            });
-            const primaryEnum = enumLocations.shift();
-            const fullName = primaryEnum.statement.fullName;
-            for (const duplicateEnumInfo of enumLocations) {
-                diagnostics.push({
-                    ...DiagnosticMessages.duplicateEnumDeclaration(this.event.scope.name, fullName),
-                    file: duplicateEnumInfo.file,
-                    range: duplicateEnumInfo.statement.tokens.name.range,
-                    relatedInformation: [{
-                        message: 'Enum declared here',
-                        location: util.createLocation(
-                            URI.file(primaryEnum.file.srcPath).toString(),
-                            primaryEnum.statement.tokens.name.range
-                        )
-                    }]
-                });
-            }
+    private hasValidDeclaration(expression: Expression, exprType: BscType, definingNode?: AstNode) {
+        if (!isVariableExpression(expression)) {
+            return false;
         }
-        this.event.scope.addDiagnostics(diagnostics);
+        let assignmentAncestor: AssignmentStatement;
+        if (isAssignmentStatement(definingNode) && definingNode.tokens.equals.kind === TokenKind.Equal) {
+            // this symbol was defined in a "normal" assignment (eg. not a compound assignment)
+            assignmentAncestor = definingNode;
+            return assignmentAncestor?.tokens.name?.text.toLowerCase() === expression?.tokens.name?.text.toLowerCase();
+        } else if (isFunctionParameterExpression(definingNode)) {
+            // this symbol was defined in a function param
+            return true;
+        } else {
+            assignmentAncestor = expression?.findAncestor(isAssignmentStatement);
+        }
+        return assignmentAncestor?.tokens.name === expression?.tokens.name && isUnionType(exprType);
     }
 
     /**
@@ -364,7 +508,6 @@ export class ScopeValidator {
      */
     private detectCircularConstReferences() {
         const scope = this.event.scope;
-        const diagnostics: BsDiagnostic[] = [];
 
         const followConstRef = (
             expression: Expression,
@@ -377,7 +520,7 @@ export class ScopeValidator {
                 if (!isVariableExpression(part) && !isDottedGetExpression(part)) {
                     return;
                 }
-                processedNames.push(part.name?.text?.toLowerCase());
+                processedNames.push(part.tokens.name?.text?.toLowerCase());
                 const link = scope.getConstFileLink(processedNames.join('.'), namespace);
                 if (link) {
                     walkConst(link.item, link.file, chain);
@@ -394,10 +537,9 @@ export class ScopeValidator {
             const cycleStart = chain.indexOf(constStatement);
             if (cycleStart >= 0) {
                 const items = chain.slice(cycleStart).map(c => c.fullName).concat(constStatement.fullName);
-                diagnostics.push({
-                    ...DiagnosticMessages.circularReferenceDetected(items, scope.name),
-                    file: file,
-                    range: constStatement.tokens.name.range
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.circularReferenceDetected(items),
+                    location: constStatement.tokens.name.location
                 });
                 return;
             }
@@ -430,7 +572,6 @@ export class ScopeValidator {
         for (const [, link] of scope.getConstMap()) {
             walkConst(link.item, link.file, []);
         }
-        scope.addDiagnostics(diagnostics);
     }
 
     /**
@@ -439,130 +580,1254 @@ export class ScopeValidator {
      * what these calls are supposed to look like, and this is a very common thing for brs devs to do, so just
      * do this manually for now.
      */
-    protected validateCreateObjectCalls(file: BrsFile) {
-        const diagnostics: BsDiagnostic[] = [];
+    protected validateCreateObjectCall(file: BrsFile, call: CallExpression) {
 
-        for (const call of file?.functionCalls ?? []) {
-            //skip non CreateObject function calls
-            if (call.name?.toLowerCase() !== 'createobject' || !isLiteralExpression(call?.args[0]?.expression)) {
-                continue;
+        //skip non CreateObject function calls
+        const callName = util.getAllDottedGetPartsAsString(call.callee)?.toLowerCase();
+        if (callName !== 'createobject' || !isLiteralExpression(call?.args[0])) {
+            return;
+        }
+        const firstParamToken = (call?.args[0] as LiteralExpression)?.tokens?.value;
+        const firstParamStringValue = firstParamToken?.text?.replace(/"/g, '');
+        if (!firstParamStringValue) {
+            return;
+        }
+        const firstParamStringValueLower = firstParamStringValue.toLowerCase();
+
+        //if this is a `createObject('roSGNode'` call, only support known sg node types
+        if (firstParamStringValueLower === 'rosgnode' && isLiteralExpression(call?.args[1])) {
+            const componentName: Token = call?.args[1]?.tokens.value;
+            this.checkComponentName(componentName);
+            if (call?.args.length !== 2) {
+                // roSgNode should only ever have 2 args in `createObject`
+                this.addDiagnostic({
+                    ...DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, [2], call?.args.length),
+                    location: call.location
+                });
             }
-            const firstParamToken = (call?.args[0]?.expression as any)?.token;
-            const firstParamStringValue = firstParamToken?.text?.replace(/"/g, '');
-            //if this is a `createObject('roSGNode'` call, only support known sg node types
-            if (firstParamStringValue?.toLowerCase() === 'rosgnode' && isLiteralExpression(call?.args[1]?.expression)) {
-                const componentName: Token = (call?.args[1]?.expression as any)?.token;
-                //don't validate any components with a colon in their name (probably component libraries, but regular components can have them too).
-                if (componentName?.text?.includes(':')) {
-                    continue;
-                }
-                //add diagnostic for unknown components
-                const unquotedComponentName = componentName?.text?.replace(/"/g, '');
-                if (unquotedComponentName && !platformNodeNames.has(unquotedComponentName.toLowerCase()) && !this.event.program.getComponent(unquotedComponentName)) {
-                    this.addDiagnosticOnce({
-                        file: file as BscFile,
-                        ...DiagnosticMessages.unknownRoSGNode(unquotedComponentName),
-                        range: componentName.range
-                    });
-                } else if (call?.args.length !== 2) {
-                    // roSgNode should only ever have 2 args in `createObject`
-                    this.addDiagnosticOnce({
-                        file: file as BscFile,
-                        ...DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, [2], call?.args.length),
-                        range: call.range
-                    });
-                }
-            } else if (!platformComponentNames.has(firstParamStringValue.toLowerCase())) {
-                this.addDiagnosticOnce({
-                    file: file as BscFile,
-                    ...DiagnosticMessages.unknownBrightScriptComponent(firstParamStringValue),
-                    range: firstParamToken.range
+        } else if (!platformComponentNames.has(firstParamStringValueLower)) {
+            this.addDiagnostic({
+                ...DiagnosticMessages.unknownBrightScriptComponent(firstParamStringValue),
+                location: firstParamToken.location
+            });
+        } else {
+            // This is valid brightscript component
+            // Test for invalid arg counts
+            const brightScriptComponent: BRSComponentData = components[firstParamStringValueLower];
+            // Valid arg counts for createObject are 1+ number of args for constructor
+            let validArgCounts = brightScriptComponent?.constructors.map(cnstr => cnstr.params.length + 1);
+            if (validArgCounts.length === 0) {
+                // no constructors for this component, so createObject only takes 1 arg
+                validArgCounts = [1];
+            }
+            if (!validArgCounts.includes(call?.args.length)) {
+                // Incorrect number of arguments included in `createObject()`
+                this.addDiagnostic({
+                    ...DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, validArgCounts, call?.args.length),
+                    location: call.location
                 });
-            } else {
-                // This is valid brightscript component
-                // Test for invalid arg counts
-                const brightScriptComponent: BRSComponentData = components[firstParamStringValue.toLowerCase()];
-                // Valid arg counts for createObject are 1+ number of args for constructor
-                let validArgCounts = brightScriptComponent.constructors.map(cnstr => cnstr.params.length + 1);
-                if (validArgCounts.length === 0) {
-                    // no constructors for this component, so createObject only takes 1 arg
-                    validArgCounts = [1];
-                }
-                if (!validArgCounts.includes(call?.args.length)) {
-                    // Incorrect number of arguments included in `createObject()`
-                    this.addDiagnosticOnce({
-                        file: file as BscFile,
-                        ...DiagnosticMessages.mismatchCreateObjectArgumentCount(firstParamStringValue, validArgCounts, call?.args.length),
-                        range: call.range
-                    });
-                }
+            }
 
-                // Test for deprecation
-                if (brightScriptComponent.isDeprecated) {
-                    this.addDiagnosticOnce({
-                        file: file as BscFile,
-                        ...DiagnosticMessages.deprecatedBrightScriptComponent(firstParamStringValue, brightScriptComponent.deprecatedDescription),
-                        range: call.range
-                    });
-                }
+            // Test for deprecation
+            if (brightScriptComponent?.isDeprecated) {
+                this.addDiagnostic({
+                    ...DiagnosticMessages.itemIsDeprecated(firstParamStringValue, brightScriptComponent.deprecatedDescription),
+                    location: call.location
+                });
             }
         }
-        this.event.scope.addDiagnostics(diagnostics);
-    }
 
-    /**
-     * Adds a diagnostic to the first scope for this key. Prevents duplicate diagnostics
-     * for diagnostics where scope isn't important. (i.e. CreateObject validations)
-     */
-    private addDiagnosticOnce(diagnostic: BsDiagnostic) {
-        this.onceCache.getOrAdd(`${diagnostic.code}-${diagnostic.message}-${util.rangeToString(diagnostic.range)}`, () => {
-            this.event.scope.addDiagnostics([diagnostic]);
-            return true;
-        });
     }
-    private onceCache = new Cache<string, boolean>();
 
-    private addDiagnostic(diagnostic: BsDiagnostic) {
-        this.event.scope.addDiagnostics([diagnostic]);
+    private checkComponentName(componentName: Token) {
+        //don't validate any components with a colon in their name (probably component libraries, but regular components can have them too).
+        if (!componentName || componentName?.text?.includes(':')) {
+            return;
+        }
+        //add diagnostic for unknown components
+        const unquotedComponentName = componentName?.text?.replace(/"/g, '');
+        if (unquotedComponentName && !platformNodeNames.has(unquotedComponentName.toLowerCase()) && !this.event.program.getComponent(unquotedComponentName)) {
+            this.addDiagnostic({
+                ...DiagnosticMessages.unknownRoSGNode(unquotedComponentName),
+                location: componentName.location
+            });
+        }
     }
 
     /**
-     * Add a diagnostic (to the first scope) that will have `relatedInformation` for each affected scope
+     * Validate every method call to `component.callfunc()`, `component.createChild()`, etc.
      */
-    private addMultiScopeDiagnostic(diagnostic: BsDiagnostic, message = 'Not defined in scope') {
-        diagnostic = this.multiScopeCache.getOrAdd(`${diagnostic.file?.srcPath}-${diagnostic.code}-${diagnostic.message}-${util.rangeToString(diagnostic.range)}`, () => {
-            if (!diagnostic.relatedInformation) {
-                diagnostic.relatedInformation = [];
+    protected validateComponentMethods(file: BrsFile, call: CallExpression) {
+        const lowerMethodNamesChecked = ['callfunc', 'createchild'];
+        if (!isDottedGetExpression(call.callee)) {
+            return;
+        }
+
+        const callName = call.callee.tokens?.name?.text?.toLowerCase();
+        if (!callName || !lowerMethodNamesChecked.includes(callName) || !isLiteralExpression(call?.args[0])) {
+            return;
+        }
+
+        const callerType = call.callee.obj?.getType({ flags: SymbolTypeFlag.runtime });
+        if (!isCallFuncableTypeLike(callerType)) {
+            return;
+        }
+        const firstArgToken = call?.args[0]?.tokens.value;
+        if (callName === 'createchild') {
+            this.checkComponentName(firstArgToken);
+        } else if (callName === 'callfunc' && !util.isGenericNodeType(callerType)) {
+            const funcType = util.getCallFuncType(call, firstArgToken, { flags: SymbolTypeFlag.runtime, ignoreCall: true });
+            if (!funcType?.isResolvable()) {
+                const functionName = firstArgToken.text.replace(/"/g, '');
+                const functionFullname = `${callerType.toString()}@.${functionName}`;
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.cannotFindCallFuncFunction(functionName, functionFullname, callerType.toString()),
+                    location: firstArgToken?.location
+                });
+            } else {
+                this.validateFunctionCall(file, call, funcType, firstArgToken.location, call.args, 1);
             }
-            this.addDiagnostic(diagnostic);
-            return diagnostic;
-        });
-        const info = {
-            message: `${message} '${this.event.scope.name}'`
-        } as DiagnosticRelatedInformation;
-        if (isXmlScope(this.event.scope) && this.event.scope.xmlFile?.srcPath) {
-            info.location = util.createLocation(
-                URI.file(this.event.scope.xmlFile.srcPath).toString(),
-                this.event.scope?.xmlFile?.ast?.component?.getAttribute('name')?.value.range ?? util.createRange(0, 0, 0, 10)
-            );
-        } else {
-            info.location = util.createLocation(
-                URI.file(diagnostic.file.srcPath).toString(),
-                diagnostic.range
-            );
         }
-        diagnostic.relatedInformation.push(info);
     }
 
-    private multiScopeCache = new Cache<string, BsDiagnostic>();
-}
 
-interface ExpressionInfo {
-    parts: Readonly<[VariableExpression, ...DottedGetExpression[]]>;
-    expression: Readonly<Expression>;
+    private validateCallExpression(file: BrsFile, expression: CallExpression) {
+        const getTypeOptions = { flags: SymbolTypeFlag.runtime, data: {} };
+        let funcType = this.getNodeTypeWrapper(file, expression?.callee, getTypeOptions);
+        if (funcType?.isResolvable() && isClassType(funcType)) {
+            // We're calling a class - get the constructor
+            funcType = funcType.getMemberType('new', getTypeOptions);
+        }
+        const callErrorLocation = expression?.callee?.location;
+        return this.validateFunctionCall(file, expression.callee, funcType, callErrorLocation, expression.args);
+
+    }
+
+    private validateCallFuncExpression(file: BrsFile, expression: CallfuncExpression) {
+        const callerType = expression.callee?.getType({ flags: SymbolTypeFlag.runtime });
+        if (isDynamicType(callerType)) {
+            return;
+        }
+        const methodToken = expression.tokens.methodName;
+        const methodName = methodToken?.text ?? '';
+        if (!methodName) {
+            return;
+        }
+        const functionFullname = `${callerType.toString()}@.${methodName}`;
+        const callErrorLocation = expression.location;
+        if (util.isGenericNodeType(callerType) || isObjectType(callerType) || isDynamicType(callerType)) {
+            // ignore "general" node
+            return;
+        }
+
+        const funcType = util.getCallFuncType(expression, methodToken, { flags: SymbolTypeFlag.runtime, ignoreCall: true });
+        if (!funcType?.isResolvable()) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.cannotFindCallFuncFunction(methodName, functionFullname, callerType.toString()),
+                location: callErrorLocation
+            });
+        }
+
+        return this.validateFunctionCall(file, expression, funcType, callErrorLocation, expression.args);
+    }
+
     /**
-     * The full namespace name that encloses this expression
+     * Detect calls to functions with the incorrect number of parameters, or wrong types of arguments
      */
-    enclosingNamespaceNameLower?: string;
+    private validateFunctionCall(file: BrsFile, callee: Expression, funcType: BscType, callErrorLocation: Location, args: Expression[], argOffset = 0) {
+        while (isTypeStatementType(funcType)) {
+            funcType = funcType.wrappedType;
+        }
+        if (!funcType?.isResolvable() || !isCallableType(funcType) || isCompoundType(funcType)) {
+            const funcName = util.getAllDottedGetPartsAsString(callee, ParseMode.BrighterScript, isCallfuncExpression(callee) ? '@.' : '.');
+            if (isUnionType(funcType)) {
+                if (!util.isUnionOfFunctions(funcType) && !isCallfuncExpression(callee)) {
+                    // union of func and non func. not callable
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.notCallable(funcName),
+                        location: callErrorLocation
+                    });
+                    return;
+                }
+                const callablesInUnion = funcType.types.filter(isCallableType);
+                const funcsInUnion = callablesInUnion.filter(isTypedFunctionType);
+                if (funcsInUnion.length < callablesInUnion.length) {
+                    // potentially a non-typed func in union
+                    // cannot validate
+                    return;
+                }
+                // check all funcs to see if they work
+                for (let i = 1; i < funcsInUnion.length; i++) {
+                    const compatibilityData: TypeCompatibilityData = {};
+                    if (!funcsInUnion[0].isTypeCompatible(funcsInUnion[i], compatibilityData)) {
+                        if (!compatibilityData.returnTypeMismatch) {
+                            // param differences!
+                            this.addMultiScopeDiagnostic({
+                                ...DiagnosticMessages.incompatibleSymbolDefinition(
+                                    funcName,
+                                    { isUnion: true, data: compatibilityData }),
+                                location: callErrorLocation
+                            });
+                            return;
+                        }
+                    }
+                }
+                // The only thing different was return type
+                funcType = util.getFunctionTypeFromUnion(funcType);
+
+            }
+            if (funcType && !isCallableType(funcType) && !isReferenceType(funcType)) {
+                const globalFuncWithVarName = globalCallableMap.get(funcName.toLowerCase());
+                if (globalFuncWithVarName) {
+                    funcType = globalFuncWithVarName.type;
+                } else {
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.notCallable(funcName),
+                        location: callErrorLocation
+                    });
+                    return;
+                }
+
+            }
+        }
+
+        if (!isTypedFunctionType(funcType)) {
+            // non typed function. nothing to check
+            return;
+        }
+
+        //get min/max parameter count for callable
+        let minParams = 0;
+        let maxParams = 0;
+        for (let param of funcType.params) {
+            maxParams++;
+            //optional parameters must come last, so we can assume that minParams won't increase once we hit
+            //the first isOptional
+            if (param.isOptional !== true) {
+                minParams++;
+            }
+        }
+        if (funcType.isVariadic) {
+            // function accepts variable number of arguments
+            maxParams = CallExpression.MaximumArguments;
+        }
+        const argsForCall = argOffset < 1 ? args : args.slice(argOffset);
+
+        let expCallArgCount = argsForCall.length;
+        if (expCallArgCount > maxParams || expCallArgCount < minParams) {
+            let minMaxParamsText = minParams === maxParams ? maxParams + argOffset : `${minParams + argOffset}-${maxParams + argOffset}`;
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.mismatchArgumentCount(minMaxParamsText, expCallArgCount + argOffset),
+                location: callErrorLocation
+            });
+        }
+        let paramIndex = 0;
+        for (let arg of argsForCall) {
+            const data = {} as ExtraSymbolData;
+            let argType = this.getNodeTypeWrapper(file, arg, { flags: SymbolTypeFlag.runtime, data: data });
+
+            const paramType = funcType.params[paramIndex]?.type;
+            if (!paramType) {
+                // unable to find a paramType -- maybe there are more args than params
+                break;
+            }
+
+            if (isCallableType(paramType) && isClassType(argType) && isClassStatement(data.definingNode)) {
+                argType = data.definingNode.getConstructorType();
+            }
+
+            const compatibilityData: TypeCompatibilityData = {};
+            const isAllowedArgConversion = this.checkAllowedArgConversions(paramType, argType);
+            if (!isAllowedArgConversion && !paramType?.isTypeCompatible(argType, compatibilityData)) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.argumentTypeMismatch(argType?.toString() ?? 'unknown', paramType?.toString() ?? 'unknown', compatibilityData),
+                    location: arg.location
+                });
+            }
+            paramIndex++;
+        }
+    }
+
+    private checkAllowedArgConversions(paramType: BscType, argType: BscType): boolean {
+        if (isNumberTypeLike(argType) && isBooleanTypeLike(paramType)) {
+            return true;
+        }
+        return false;
+    }
+
+
+    /**
+     * Detect return statements with incompatible types vs. declared return type
+     */
+    private validateReturnStatement(file: BrsFile, returnStmt: ReturnStatement) {
+        const data: ExtraSymbolData = {};
+        const getTypeOptions = { flags: SymbolTypeFlag.runtime, data: data };
+        let funcType = returnStmt.findAncestor(isFunctionExpression)?.getType({ flags: SymbolTypeFlag.typetime });
+        if (isTypedFunctionType(funcType)) {
+            let actualReturnType = returnStmt?.value
+                ? this.getNodeTypeWrapper(file, returnStmt?.value, getTypeOptions)
+                : VoidType.instance;
+            const compatibilityData: TypeCompatibilityData = {};
+
+            // `return` statement by itself in non-built-in function will actually result in `invalid`
+            const valueReturnType = isVoidType(actualReturnType) ? InvalidType.instance : actualReturnType;
+
+            if (funcType.returnType.isResolvable()) {
+                if (!returnStmt?.value && isVoidType(funcType.returnType)) {
+                    // allow empty return when function is return `as void`
+                    // eslint-disable-next-line no-useless-return
+                    return;
+                } else if (!funcType.returnType.isTypeCompatible(valueReturnType, compatibilityData)) {
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.returnTypeMismatch(actualReturnType.toString(), funcType.returnType.toString(), compatibilityData),
+                        location: returnStmt.value?.location ?? returnStmt.location
+                    });
+                }
+            }
+        }
+    }
+
+    /**
+     * Detect assigned type different from expected member type
+     */
+    private validateDottedSetStatement(file: BrsFile, dottedSetStmt: DottedSetStatement) {
+        const typeChainExpectedLHS = [] as TypeChainEntry[];
+        const getTypeOpts = { flags: SymbolTypeFlag.runtime };
+
+        const expectedLHSType = this.getNodeTypeWrapper(file, dottedSetStmt, { ...getTypeOpts, data: {}, typeChain: typeChainExpectedLHS });
+        const actualRHSType = this.getNodeTypeWrapper(file, dottedSetStmt?.value, getTypeOpts);
+        const compatibilityData: TypeCompatibilityData = {};
+        const typeChainScan = util.processTypeChain(typeChainExpectedLHS);
+        // check if anything in typeChain is an AA - if so, just allow it
+        if (typeChainExpectedLHS.find(typeChainItem => isAssociativeArrayType(typeChainItem.type))) {
+            // something in the chain is an AA
+            // treat members as dynamic - they could have been set without the type system's knowledge
+            return;
+        }
+        if (!expectedLHSType || !expectedLHSType?.isResolvable()) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan)),
+                location: typeChainScan?.location
+            });
+            return;
+        }
+
+        let accessibilityIsOk = this.checkMemberAccessibility(file, dottedSetStmt, typeChainExpectedLHS);
+
+        //Most Component fields can be set with strings
+        //TODO: be more precise about which fields can actually accept strings
+        //TODO: if RHS is a string literal, we can do more validation to make sure it's the correct type
+        if (isComponentType(dottedSetStmt.obj?.getType({ flags: SymbolTypeFlag.runtime }))) {
+            if (isStringTypeLike(actualRHSType)) {
+                return;
+            }
+        }
+
+        if (accessibilityIsOk && !expectedLHSType?.isTypeCompatible(actualRHSType, compatibilityData)) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.assignmentTypeMismatch(actualRHSType?.toString() ?? 'unknown', expectedLHSType?.toString() ?? 'unknown', compatibilityData),
+                location: dottedSetStmt.location
+            });
+        }
+    }
+
+    /**
+     * Detect when declared type does not match rhs type
+     */
+    private validateAssignmentStatement(file: BrsFile, assignStmt: AssignmentStatement) {
+        if (!assignStmt?.typeExpression) {
+            // nothing to check
+            return;
+        }
+
+        const typeChainExpectedLHS = [];
+        const getTypeOpts = { flags: SymbolTypeFlag.runtime };
+        const expectedLHSType = this.getNodeTypeWrapper(file, assignStmt.typeExpression, { ...getTypeOpts, data: {}, typeChain: typeChainExpectedLHS });
+        const actualRHSType = this.getNodeTypeWrapper(file, assignStmt.value, getTypeOpts);
+        const compatibilityData: TypeCompatibilityData = {};
+        if (!expectedLHSType || !expectedLHSType.isResolvable()) {
+            // LHS is not resolvable... handled elsewhere
+        } else if (!expectedLHSType?.isTypeCompatible(actualRHSType, compatibilityData)) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.assignmentTypeMismatch(actualRHSType.toString(), expectedLHSType.toString(), compatibilityData),
+                location: assignStmt.location
+            });
+        }
+    }
+
+    /**
+     * Detect invalid use of a binary operator
+     */
+    private validateBinaryExpression(file: BrsFile, binaryExpr: BinaryExpression | AugmentedAssignmentStatement) {
+        const getTypeOpts = { flags: SymbolTypeFlag.runtime };
+
+        if (util.isInTypeExpression(binaryExpr)) {
+            return;
+        }
+
+        let leftType = isBinaryExpression(binaryExpr)
+            ? this.getNodeTypeWrapper(file, binaryExpr.left, getTypeOpts)
+            : this.getNodeTypeWrapper(file, binaryExpr.item, getTypeOpts);
+        let rightType = isBinaryExpression(binaryExpr)
+            ? this.getNodeTypeWrapper(file, binaryExpr.right, getTypeOpts)
+            : this.getNodeTypeWrapper(file, binaryExpr.value, getTypeOpts);
+
+        if (!leftType || !rightType || !leftType.isResolvable() || !rightType.isResolvable()) {
+            // Can not find the type. error handled elsewhere
+            return;
+        }
+
+        let leftTypeToTest = leftType;
+        let rightTypeToTest = rightType;
+
+        if (isEnumMemberType(leftType) || isEnumType(leftType)) {
+            leftTypeToTest = leftType.underlyingType;
+        }
+        if (isEnumMemberType(rightType) || isEnumType(rightType)) {
+            rightTypeToTest = rightType.underlyingType;
+        }
+
+        if (isUnionType(leftType) || isUnionType(rightType)) {
+            // TODO: it is possible to validate based on innerTypes, but more complicated
+            // Because you need to verify each combination of types
+            return;
+        }
+        const opResult = util.binaryOperatorResultType(leftTypeToTest, binaryExpr.tokens.operator, rightTypeToTest);
+
+        if (!opResult) {
+            // if the result was dynamic or void, that means there wasn't a valid operation
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.operatorTypeMismatch(binaryExpr.tokens.operator.text, leftType.toString(), rightType.toString()),
+                location: binaryExpr.location
+            });
+        }
+    }
+
+    /**
+     * Detect invalid use of a Unary operator
+     */
+    private validateUnaryExpression(file: BrsFile, unaryExpr: UnaryExpression) {
+        const getTypeOpts = { flags: SymbolTypeFlag.runtime };
+
+        let rightType = this.getNodeTypeWrapper(file, unaryExpr.right, getTypeOpts);
+
+        if (!rightType.isResolvable()) {
+            // Can not find the type. error handled elsewhere
+            return;
+        }
+        let rightTypeToTest = rightType;
+        if (isEnumMemberType(rightType)) {
+            rightTypeToTest = rightType.underlyingType;
+        }
+
+        if (isUnionType(rightTypeToTest)) {
+            // TODO: it is possible to validate based on innerTypes, but more complicated
+            // Because you need to verify each combination of types
+
+        } else if (isDynamicType(rightTypeToTest) || isObjectType(rightTypeToTest)) {
+            // operand is basically "any" type... ignore;
+
+        } else if (isPrimitiveType(rightType)) {
+            const opResult = util.unaryOperatorResultType(unaryExpr.tokens.operator, rightTypeToTest);
+            if (!opResult) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.operatorTypeMismatch(unaryExpr.tokens.operator.text, rightType.toString()),
+                    location: unaryExpr.location
+                });
+            }
+        } else {
+            // rhs is not a primitive, so no binary operator is allowed
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.operatorTypeMismatch(unaryExpr.tokens.operator.text, rightType.toString()),
+                location: unaryExpr.location
+            });
+        }
+    }
+
+    private validateIncrementStatement(file: BrsFile, incStmt: IncrementStatement) {
+        const getTypeOpts = { flags: SymbolTypeFlag.runtime };
+
+        let rightType = this.getNodeTypeWrapper(file, incStmt.value, getTypeOpts);
+
+        if (!rightType.isResolvable()) {
+            // Can not find the type. error handled elsewhere
+            return;
+        }
+
+        if (isUnionType(rightType)) {
+            // TODO: it is possible to validate based on innerTypes, but more complicated
+            // because you need to verify each combination of types
+        } else if (isDynamicType(rightType) || isObjectType(rightType)) {
+            // operand is basically "any" type... ignore
+        } else if (isNumberTypeLike(rightType)) {
+            // operand is a number.. this is ok
+        } else {
+            // rhs is not a number, so no increment operator is not allowed
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.operatorTypeMismatch(incStmt.tokens.operator.text, rightType.toString()),
+                location: incStmt.location
+            });
+        }
+    }
+
+
+    validateVariableAndDottedGetExpressions(file: BrsFile, expression: VariableExpression | DottedGetExpression) {
+        if (isDottedGetExpression(expression.parent)) {
+            // We validate dottedGetExpressions at the top-most level
+            return;
+        }
+        if (isVariableExpression(expression)) {
+            if (isAssignmentStatement(expression.parent) && expression.parent.tokens.name === expression.tokens.name) {
+                // Don't validate LHS of assignments
+                return;
+            } else if (isNamespaceStatement(expression.parent)) {
+                return;
+            }
+        }
+
+        let symbolType = SymbolTypeFlag.runtime;
+        let oppositeSymbolType = SymbolTypeFlag.typetime;
+        const isUsedAsType = util.isInTypeExpression(expression);
+        if (isUsedAsType) {
+            // This is used in a TypeExpression - only look up types from SymbolTable
+            symbolType = SymbolTypeFlag.typetime;
+            oppositeSymbolType = SymbolTypeFlag.runtime;
+
+            //roku built-in type names (rosgnode*, ifArray, etc.) aren't tracked in any
+            //symbol table; skip cannot-find-name validation when used as a type.
+            if (isVariableExpression(expression) && util.isBuiltInType(expression.tokens.name.text)) {
+                return;
+            }
+        }
+
+        // Do a complete type check on all DottedGet and Variable expressions
+        // this will create a diagnostic if an invalid member is accessed
+        const typeChain: TypeChainEntry[] = [];
+        const typeData = {} as ExtraSymbolData;
+        let exprType = this.getNodeTypeWrapper(file, expression, {
+            flags: symbolType,
+            typeChain: typeChain,
+            data: typeData
+        });
+
+        const hasValidDeclaration = this.hasValidDeclaration(expression, exprType, typeData?.definingNode);
+
+        //include a hint diagnostic if this type is marked as deprecated
+        if (typeData.flags & SymbolTypeFlag.deprecated) { // eslint-disable-line no-bitwise
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.itemIsDeprecated(),
+                location: expression.tokens.name.location,
+                tags: [DiagnosticTag.Deprecated]
+            });
+        }
+
+        if (!this.isTypeKnown(exprType) && !hasValidDeclaration) {
+            if (this.getNodeTypeWrapper(file, expression, { flags: oppositeSymbolType, isExistenceTest: true })?.isResolvable()) {
+                const oppoSiteTypeChain = [];
+                const invalidlyUsedResolvedType = this.getNodeTypeWrapper(file, expression, { flags: oppositeSymbolType, typeChain: oppoSiteTypeChain, isExistenceTest: true });
+                const typeChainScan = util.processTypeChain(oppoSiteTypeChain);
+                if (isUsedAsType) {
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.itemCannotBeUsedAsType(typeChainScan.fullChainName),
+                        location: expression.location
+                    });
+                } else if (invalidlyUsedResolvedType && !isReferenceType(invalidlyUsedResolvedType)) {
+                    if (!isAliasStatement(expression.parent)) {
+                        // alias rhs CAN be a type!
+                        this.addMultiScopeDiagnostic({
+                            ...DiagnosticMessages.itemCannotBeUsedAsVariable(invalidlyUsedResolvedType.toString()),
+                            location: expression.location
+                        });
+                    }
+                } else {
+                    const typeChainScan = util.processTypeChain(typeChain);
+                    //if this is a function call, provide a different diagnostic code
+                    if (isCallExpression(typeChainScan.astNode.parent) && typeChainScan.astNode.parent.callee === expression) {
+                        this.addMultiScopeDiagnostic({
+                            ...DiagnosticMessages.cannotFindFunction(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan)),
+                            location: typeChainScan?.location
+                        });
+                    } else {
+                        this.addMultiScopeDiagnostic({
+                            ...DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan)),
+                            location: typeChainScan?.location
+                        });
+                    }
+                }
+
+            } else if (!(typeData?.isFromDocComment)) {
+                // only show "cannot find... " errors if the type is not defined from a doc comment
+                const typeChainScan = util.processTypeChain(typeChain);
+                const circularReferenceInfo = this.getCircularReference(exprType);
+                if (isCallExpression(typeChainScan.astNode.parent) && typeChainScan.astNode.parent.callee === expression) {
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.cannotFindFunction(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan)),
+                        location: typeChainScan?.location
+                    });
+                } else if (circularReferenceInfo?.isCircularReference) {
+                    let diagnosticDetail = util.getCircularReferenceDiagnosticDetail(circularReferenceInfo, typeChainScan.fullNameOfItem);
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.circularReferenceDetected(diagnosticDetail),
+                        location: typeChainScan?.location
+                    });
+                } else {
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.cannotFindName(typeChainScan.itemName, typeChainScan.fullNameOfItem, typeChainScan.itemParentTypeName, this.getParentTypeDescriptor(typeChainScan)),
+                        location: typeChainScan?.location
+                    });
+                }
+
+            }
+        }
+        if (isUsedAsType) {
+            return;
+        }
+
+        const containingNamespace = expression.findAncestor<NamespaceStatement>(isNamespaceStatement);
+        const containingNamespaceName = containingNamespace?.getName(ParseMode.BrighterScript);
+
+        if (!(isCallExpression(expression.parent) && isNewExpression(expression.parent?.parent))) {
+            const classUsedAsVarEntry = this.checkTypeChainForClassUsedAsVar(typeChain, containingNamespaceName);
+            const isClassInNamespace = containingNamespace?.getSymbolTable().hasSymbol(typeChain[0].name, SymbolTypeFlag.runtime);
+            if (classUsedAsVarEntry && !isClassInNamespace) {
+
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.itemCannotBeUsedAsVariable(classUsedAsVarEntry.toString()),
+                    location: expression.location
+                });
+                return;
+            }
+        }
+
+        const lastTypeInfo = typeChain[typeChain.length - 1];
+        const parentTypeInfo = typeChain[typeChain.length - 2];
+
+        this.checkMemberAccessibility(file, expression, typeChain);
+
+        if (isNamespaceType(exprType) && !isAliasStatement(expression.parent)) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
+                location: expression.location
+            });
+        } else if (isEnumType(exprType) && !isAliasStatement(expression.parent)) {
+            const enumStatement = this.event.scope.getEnum(util.getAllDottedGetPartsAsString(expression));
+            if (enumStatement) {
+                // there's an enum with this name
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.itemCannotBeUsedAsVariable('enum'),
+                    location: expression.location
+                });
+            }
+        } else if (isDynamicType(exprType) && isEnumType(parentTypeInfo?.type) && isDottedGetExpression(expression)) {
+            const enumFileLink = this.event.scope.getEnumFileLink(util.getAllDottedGetPartsAsString(expression.obj));
+            const typeChainScanForItem = util.processTypeChain(typeChain);
+            const typeChainScanForParent = util.processTypeChain(typeChain.slice(0, -1));
+            if (enumFileLink) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.cannotFindName(lastTypeInfo?.name, typeChainScanForItem.fullChainName, typeChainScanForParent.fullNameOfItem, 'enum'),
+                    location: lastTypeInfo?.location,
+                    relatedInformation: [{
+                        message: 'Enum declared here',
+                        location: util.createLocationFromRange(
+                            util.pathToUri(enumFileLink?.file.srcPath),
+                            enumFileLink?.item?.tokens.name.location?.range
+                        )
+                    }]
+                });
+            }
+        }
+    }
+
+    private checkTypeChainForClassUsedAsVar(typeChain: TypeChainEntry[], containingNamespaceName: string) {
+        const ignoreKinds = [AstNodeKind.TypecastExpression, AstNodeKind.NewExpression];
+        let lowerNameSoFar = '';
+        let classUsedAsVar;
+        let isFirst = true;
+        for (let i = 0; i < typeChain.length - 1; i++) { // do not look at final entry - we CAN use the constructor as a variable
+            const tce = typeChain[i];
+            lowerNameSoFar += `${lowerNameSoFar ? '.' : ''}${tce.name.toLowerCase()}`;
+            if (!isNamespaceType(tce.type)) {
+                if (isFirst && containingNamespaceName) {
+                    lowerNameSoFar = `${containingNamespaceName.toLowerCase()}.${lowerNameSoFar}`;
+                }
+                if (!tce.astNode || ignoreKinds.includes(tce.astNode.kind)) {
+                    break;
+                } else if (isClassType(tce.type) && lowerNameSoFar.toLowerCase() === tce.type.name.toLowerCase()) {
+                    classUsedAsVar = tce.type;
+                }
+                break;
+            }
+            isFirst = false;
+        }
+
+        return classUsedAsVar;
+    }
+
+    /**
+     * Adds diagnostics for accibility mismatches
+     *
+     * @param file file
+     * @param expression containing expression
+     * @param typeChain type chain to check
+     * @returns true if member accesiibility is okay
+     */
+    private checkMemberAccessibility(file: BscFile, expression: Expression, typeChain: TypeChainEntry[]) {
+        for (let i = 0; i < typeChain.length - 1; i++) {
+            const parentChainItem = typeChain[i];
+            const childChainItem = typeChain[i + 1];
+            if (isClassType(parentChainItem.type)) {
+                const containingClassStmt = expression.findAncestor<ClassStatement>(isClassStatement);
+                const classStmtThatDefinesChildMember = childChainItem.data?.definingNode?.findAncestor<ClassStatement>(isClassStatement);
+                if (classStmtThatDefinesChildMember) {
+                    const definingClassName = classStmtThatDefinesChildMember.getName(ParseMode.BrighterScript);
+                    const inMatchingClassStmt = containingClassStmt?.getName(ParseMode.BrighterScript).toLowerCase() === parentChainItem.type.name.toLowerCase();
+                    // eslint-disable-next-line no-bitwise
+                    if (childChainItem.data.flags & SymbolTypeFlag.private) {
+                        if (!inMatchingClassStmt || childChainItem.data.memberOfAncestor) {
+                            this.addMultiScopeDiagnostic({
+                                ...DiagnosticMessages.memberAccessibilityMismatch(childChainItem.name, childChainItem.data.flags, definingClassName),
+                                location: expression.location
+                            });
+                            // there's an error... don't worry about the rest of the chain
+                            return false;
+                        }
+                    }
+
+                    // eslint-disable-next-line no-bitwise
+                    if (childChainItem.data.flags & SymbolTypeFlag.protected) {
+                        const containingClassName = containingClassStmt?.getName(ParseMode.BrighterScript);
+                        const containingNamespaceName = expression.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript);
+                        const ancestorClasses = this.event.scope.getClassHierarchy(containingClassName, containingNamespaceName).map(link => link.item);
+                        const isSubClassOfDefiningClass = ancestorClasses.includes(classStmtThatDefinesChildMember);
+
+                        if (!isSubClassOfDefiningClass) {
+                            this.addMultiScopeDiagnostic({
+                                ...DiagnosticMessages.memberAccessibilityMismatch(childChainItem.name, childChainItem.data.flags, definingClassName),
+                                location: expression.location
+                            });
+                            // there's an error... don't worry about the rest of the chain
+                            return false;
+                        }
+                    }
+                }
+
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Find all "new" statements in the program,
+     * and make sure we can find a class with that name
+     */
+    private validateNewExpression(file: BrsFile, newExpression: NewExpression) {
+        const newExprType = this.getNodeTypeWrapper(file, newExpression, { flags: SymbolTypeFlag.typetime });
+        if (isClassType(newExprType)) {
+            return;
+        }
+
+        let potentialClassName = newExpression.className.getName(ParseMode.BrighterScript);
+        const namespaceName = newExpression.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript);
+        let newableClass = this.event.scope.getClass(potentialClassName, namespaceName);
+
+        if (!newableClass) {
+            //try and find functions with this name.
+            let fullName = util.getFullyQualifiedClassName(potentialClassName, namespaceName);
+
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.expressionIsNotConstructable(fullName),
+                location: newExpression.className.location
+            });
+
+        }
+    }
+
+    private validateFunctionExpressionForReturn(func: FunctionExpression) {
+        const returnType = func?.returnTypeExpression?.getType({ flags: SymbolTypeFlag.typetime });
+
+        if (!returnType || !returnType.isResolvable() || isVoidType(returnType) || isDynamicType(returnType)) {
+            return;
+        }
+        const returns = func.body?.findChild<ReturnStatement>(isReturnStatement, { walkMode: WalkMode.visitAll });
+        if (!returns && isStringTypeLike(returnType)) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.returnTypeCoercionMismatch(returnType.toString()),
+                location: func.location
+            });
+        }
+    }
+
+    /**
+     * Create diagnostics for any duplicate function declarations
+     */
+    private flagDuplicateFunctionDeclarations() {
+        this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, tag: ScopeValidatorDiagnosticTag.DuplicateFunctionDeclaration });
+
+        //for each list of callables with the same name
+        for (let [lowerName, callableContainers] of this.event.scope.getCallableContainerMap()) {
+
+            let globalCallables = [] as CallableContainer[];
+            let nonGlobalCallables = [] as CallableContainer[];
+            let ownCallables = [] as CallableContainer[];
+            let ancestorNonGlobalCallables = [] as CallableContainer[];
+
+
+            for (let container of callableContainers) {
+                if (container.scope === this.event.program.globalScope) {
+                    globalCallables.push(container);
+                } else {
+                    nonGlobalCallables.push(container);
+                    if (container.scope === this.event.scope) {
+                        ownCallables.push(container);
+                    } else {
+                        ancestorNonGlobalCallables.push(container);
+                    }
+                }
+            }
+
+            //add info diagnostics about child shadowing parent functions
+            if (ownCallables.length > 0 && ancestorNonGlobalCallables.length > 0) {
+                for (let container of ownCallables) {
+                    //skip the init function (because every component will have one of those){
+                    if (lowerName !== 'init') {
+                        let shadowedCallable = ancestorNonGlobalCallables[ancestorNonGlobalCallables.length - 1];
+                        if (!!shadowedCallable && shadowedCallable.callable.file === container.callable.file) {
+                            //same file: skip redundant imports
+                            continue;
+                        }
+                        this.addMultiScopeDiagnostic({
+                            ...DiagnosticMessages.overridesAncestorFunction(
+                                container.callable.name,
+                                container.scope.name,
+                                shadowedCallable.callable.file.destPath,
+                                //grab the last item in the list, which should be the closest ancestor's version
+                                shadowedCallable.scope.name
+                            ),
+                            location: util.createLocationFromFileRange(container.callable.file, container.callable.nameRange)
+                        }, ScopeValidatorDiagnosticTag.DuplicateFunctionDeclaration);
+                    }
+                }
+            }
+
+            //add error diagnostics about duplicate functions in the same scope
+            if (ownCallables.length > 1) {
+
+                for (let callableContainer of ownCallables) {
+                    let callable = callableContainer.callable;
+                    const related = [];
+                    for (const ownCallable of ownCallables) {
+                        const thatNameRange = ownCallable.callable.nameRange;
+                        if (ownCallable.callable.nameRange !== callable.nameRange) {
+                            related.push({
+                                message: `Function declared here`,
+                                location: util.createLocationFromRange(
+                                    util.pathToUri(ownCallable.callable.file?.srcPath),
+                                    thatNameRange
+                                )
+                            });
+                        }
+                    }
+
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.duplicateFunctionImplementation(callable.name),
+                        location: util.createLocationFromFileRange(callable.file, callable.nameRange),
+                        relatedInformation: related
+                    }, ScopeValidatorDiagnosticTag.DuplicateFunctionDeclaration);
+                }
+            }
+        }
+    }
+
+    /**
+     * Verify that all of the scripts imported by each file in this scope actually exist, and have the correct case
+     */
+    private validateScriptImportPaths() {
+        this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, tag: ScopeValidatorDiagnosticTag.Imports });
+
+        let scriptImports = this.event.scope.getOwnScriptImports();
+        //verify every script import
+        for (let scriptImport of scriptImports) {
+            let referencedFile = this.event.scope.getFileByRelativePath(scriptImport.destPath);
+            //if we can't find the file
+            if (!referencedFile) {
+                //skip the default bslib file, it will exist at transpile time but should not show up in the program during validation cycle
+                if (scriptImport.destPath === this.event.program.bslibPkgPath) {
+                    continue;
+                }
+                let dInfo: DiagnosticInfo;
+                if (scriptImport.text.trim().length === 0) {
+                    dInfo = DiagnosticMessages.scriptSrcCannotBeEmpty();
+                } else {
+                    dInfo = DiagnosticMessages.referencedFileDoesNotExist();
+                }
+
+                this.addMultiScopeDiagnostic({
+                    ...dInfo,
+                    location: util.createLocationFromFileRange(scriptImport.sourceFile, scriptImport.filePathRange)
+                }, ScopeValidatorDiagnosticTag.Imports);
+                //if the character casing of the script import path does not match that of the actual path
+            } else if (scriptImport.destPath !== referencedFile.destPath) {
+                //preserve the original import shape (pkg:/... vs relative) when reporting the
+                //correct path so the quick-fix replacement matches what the user authored.
+                const correctUri = scriptImport.text.startsWith('pkg:/')
+                    ? util.sanitizePkgPath(referencedFile.destPath)
+                    : path.posix.relative(
+                        path.dirname(scriptImport.sourceFile.destPath).replace(/\\/g, '/'),
+                        referencedFile.destPath.replace(/\\/g, '/')
+                    );
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.scriptImportCaseMismatch(referencedFile.destPath, correctUri),
+                    location: util.createLocationFromFileRange(scriptImport.sourceFile, scriptImport.filePathRange)
+                }, ScopeValidatorDiagnosticTag.Imports);
+            }
+        }
+    }
+
+    /**
+     * Validate all classes defined in this scope
+     */
+    private validateClasses() {
+        this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, tag: ScopeValidatorDiagnosticTag.Classes });
+
+        let validator = new BsClassValidator(this.event.scope);
+        validator.validate();
+        for (const diagnostic of validator.diagnostics) {
+            this.addMultiScopeDiagnostic({
+                ...diagnostic
+            }, ScopeValidatorDiagnosticTag.Classes);
+        }
+    }
+
+
+    /**
+     * Find various function collisions
+     */
+    private diagnosticDetectFunctionCollisions(file: BrsFile) {
+        const fileUri = util.pathToUri(file.srcPath);
+        this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, fileUri: fileUri, tag: ScopeValidatorDiagnosticTag.FunctionCollisions });
+        for (let func of file.callables) {
+            const funcName = func.getName(ParseMode.BrighterScript);
+            const lowerFuncName = funcName?.toLowerCase();
+            if (lowerFuncName) {
+
+                //find function declarations with the same name as a stdlib function
+                if (globalCallableMap.has(lowerFuncName)) {
+                    this.addMultiScopeDiagnostic({
+                        ...DiagnosticMessages.scopeFunctionShadowedByBuiltInFunction(),
+                        location: util.createLocationFromRange(fileUri, func.nameRange)
+
+                    });
+                }
+            }
+        }
+    }
+
+    public detectShadowedLocalVar(file: BrsFile, varDeclaration: { expr: AstNode; name: string; type: BscType; nameRange: Range }) {
+        const varName = varDeclaration.name;
+        const lowerVarName = varName.toLowerCase();
+        const callableContainerMap = this.event.scope.getCallableContainerMap();
+        const containingNamespace = varDeclaration.expr?.findAncestor<NamespaceStatement>(isNamespaceStatement);
+        const localVarIsInNamespace = util.isVariableMemberOfNamespace(varDeclaration.name, varDeclaration.expr, containingNamespace);
+
+        const varIsFunction = () => {
+            return isCallableType(varDeclaration.type) && !isDynamicType(varDeclaration.type);
+        };
+
+        if (
+            //has same name as stdlib
+            globalCallableMap.has(lowerVarName)
+        ) {
+            //local var function with same name as stdlib function
+            if (varIsFunction()) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.localVarFunctionShadowsParentFunction('stdlib'),
+                    location: util.createLocationFromFileRange(file, varDeclaration.nameRange)
+                });
+            }
+        } else if (callableContainerMap.has(lowerVarName) && !localVarIsInNamespace) {
+            const callable = callableContainerMap.get(lowerVarName);
+            //is same name as a callable
+            if (varIsFunction()) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.localVarFunctionShadowsParentFunction('scope'),
+                    location: util.createLocationFromFileRange(file, varDeclaration.nameRange),
+                    relatedInformation: [{
+                        message: 'Function declared here',
+                        location: util.createLocationFromFileRange(
+                            callable[0].callable.file,
+                            callable[0].callable.nameRange
+                        )
+                    }]
+                });
+            } else {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.localVarShadowedByScopedFunction(),
+                    location: util.createLocationFromFileRange(file, varDeclaration.nameRange),
+                    relatedInformation: [{
+                        message: 'Function declared here',
+                        location: util.createLocationFromRange(
+                            util.pathToUri(callable[0].callable.file.srcPath),
+                            callable[0].callable.nameRange
+                        )
+                    }]
+                });
+            }
+            //has the same name as an in-scope class
+        } else if (!localVarIsInNamespace) {
+            const classStmtLink = this.event.scope.getClassFileLink(lowerVarName);
+            if (classStmtLink) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.localVarShadowedByScopedFunction(),
+                    location: util.createLocationFromFileRange(file, varDeclaration.nameRange),
+                    relatedInformation: [{
+                        message: 'Class declared here',
+                        location: util.createLocationFromRange(
+                            util.pathToUri(classStmtLink.file.srcPath),
+                            classStmtLink?.item.tokens.name.location?.range
+                        )
+                    }]
+                });
+            }
+        }
+    }
+
+    private validateForStatement(file: BrsFile, forStmt: ForStatement) {
+        const assignStmt = forStmt.counterDeclaration;
+        const assignValueType = this.getNodeTypeWrapper(file, assignStmt.value, { flags: SymbolTypeFlag.runtime, statementIndex: forStmt.statementIndex });
+        if (!IntegerType.instance.isTypeCompatible(assignValueType)) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.assignmentTypeMismatch(assignValueType.toString(), 'integer'),
+                location: assignStmt.location
+            });
+        }
+        if (forStmt.increment) {
+            const incrementValueType = this.getNodeTypeWrapper(file, forStmt.increment, { flags: SymbolTypeFlag.runtime, statementIndex: forStmt.statementIndex });
+            if (!IntegerType.instance.isTypeCompatible(incrementValueType)) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.assignmentTypeMismatch(incrementValueType.toString(), 'integer'),
+                    location: forStmt.increment.location
+                });
+            }
+        }
+        const finalValueType = this.getNodeTypeWrapper(file, forStmt.finalValue, { flags: SymbolTypeFlag.runtime, statementIndex: forStmt.statementIndex });
+        if (!IntegerType.instance.isTypeCompatible(finalValueType)) {
+            this.addMultiScopeDiagnostic({
+                ...DiagnosticMessages.assignmentTypeMismatch(finalValueType.toString(), 'integer'),
+                location: forStmt.finalValue.location
+            });
+        }
+    }
+
+    private validateForEachStatement(file: BrsFile, forEachStmt: ForEachStatement) {
+        const targetType = this.getNodeTypeWrapper(file, forEachStmt.target, { flags: SymbolTypeFlag.runtime, statementIndex: forEachStmt.statementIndex });
+        if (isDynamicType(targetType) || isObjectType(targetType)) {
+            // unable to determine type, skip further validation
+            return;
+        }
+
+        let targetItemType: BscType;
+
+        if (!isArrayType(targetType)) {
+            if (isIterableType(targetType)) {
+                // this is enumerable
+                targetItemType = util.getIteratorDefaultType(targetType);
+            } else {
+                // target is not an array nor enumerable
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.notIterable(targetType.toString()),
+                    location: forEachStmt.target.location
+                });
+                return;
+            }
+        } else {
+            targetItemType = targetType.defaultType;
+        }
+
+        const loopType = forEachStmt.getLoopVariableType({ flags: SymbolTypeFlag.runtime, statementIndex: forEachStmt.statementIndex });
+        if (forEachStmt.typeExpression && loopType?.isResolvable()) {
+
+            const data: TypeCompatibilityData = {};
+            if (!loopType.isTypeCompatible(targetItemType, data)) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.assignmentTypeMismatch(targetItemType.toString(), loopType.toString(), data),
+                    location: forEachStmt.typeExpression.location
+                });
+            }
+        }
+    }
+
+    private validateXmlInterface(scope: XmlScope) {
+        if (!scope.xmlFile.parser.ast?.componentElement?.interfaceElement) {
+            return;
+        }
+        this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, fileUri: util.pathToUri(scope.xmlFile?.srcPath), tag: ScopeValidatorDiagnosticTag.XMLInterface });
+
+        const iface = scope.xmlFile.parser.ast.componentElement.interfaceElement;
+        const callableContainerMap = scope.getCallableContainerMap();
+        //validate functions
+        for (const func of iface.functions) {
+            const name = func.name;
+            if (!name) {
+                this.addDiagnostic({
+                    ...DiagnosticMessages.xmlTagMissingAttribute(func.tokens.startTagName.text, 'name'),
+                    location: func.tokens.startTagName.location
+                }, ScopeValidatorDiagnosticTag.XMLInterface);
+            } else if (!callableContainerMap.has(name.toLowerCase())) {
+                this.addDiagnostic({
+                    ...DiagnosticMessages.xmlFunctionNotFound(name),
+                    location: func.getAttribute('name')?.tokens.value.location
+                }, ScopeValidatorDiagnosticTag.XMLInterface);
+            }
+        }
+        //validate fields
+        for (const field of iface.fields) {
+            const { id, type, onChange } = field;
+            if (!id) {
+                this.addDiagnostic({
+                    ...DiagnosticMessages.xmlTagMissingAttribute(field.tokens.startTagName.text, 'id'),
+                    location: field.tokens.startTagName.location
+                }, ScopeValidatorDiagnosticTag.XMLInterface);
+            }
+            if (!type) {
+                if (!field.alias) {
+                    this.addDiagnostic({
+                        ...DiagnosticMessages.xmlTagMissingAttribute(field.tokens.startTagName.text, 'type'),
+                        location: field.tokens.startTagName.location
+                    }, ScopeValidatorDiagnosticTag.XMLInterface);
+                }
+            } else if (!SGFieldTypes.includes(type.toLowerCase())) {
+                this.addDiagnostic({
+                    ...DiagnosticMessages.xmlInvalidFieldType(type),
+                    location: field.getAttribute('type')?.tokens.value.location
+                }, ScopeValidatorDiagnosticTag.XMLInterface);
+            }
+            if (onChange) {
+                if (!callableContainerMap.has(onChange.toLowerCase())) {
+                    this.addDiagnostic({
+                        ...DiagnosticMessages.xmlFunctionNotFound(onChange),
+                        location: field.getAttribute('onchange')?.tokens.value.location
+                    }, ScopeValidatorDiagnosticTag.XMLInterface);
+                }
+            }
+        }
+    }
+
+    private validateDocComments(node: AstNode) {
+        const doc = brsDocParser.parseNode(node);
+        for (const docTag of doc.tags) {
+            const docTypeTag = docTag as BrsDocWithType;
+            if (!docTypeTag.typeExpression || !docTypeTag.location) {
+                continue;
+            }
+            const foundType = docTypeTag.typeExpression?.getType({ flags: SymbolTypeFlag.typetime });
+            if (!foundType?.isResolvable()) {
+                this.addMultiScopeDiagnostic({
+                    ...DiagnosticMessages.cannotFindName(docTypeTag.typeString),
+                    location: brsDocParser.getTypeLocationFromToken(docTypeTag.token) ?? docTypeTag.location
+                });
+            }
+        }
+    }
+
+    /**
+     * Detect when a child has imported a script that an ancestor also imported
+     */
+    private diagnosticDetectDuplicateAncestorScriptImports(scope: XmlScope) {
+        this.event.program.diagnostics.clearByFilter({ scope: this.event.scope, fileUri: util.pathToUri(scope.xmlFile?.srcPath), tag: ScopeValidatorDiagnosticTag.XMLImports });
+        if (scope.xmlFile.parentComponent) {
+            //build a lookup of pkg paths -> FileReference so we can more easily look up collisions
+            let parentScriptImports = scope.xmlFile.getAncestorScriptTagImports();
+            let lookup = {} as Record<string, FileReference>;
+            for (let parentScriptImport of parentScriptImports) {
+                //keep the first occurance of a pkgPath. Parent imports are first in the array
+                if (!lookup[parentScriptImport.destPath]) {
+                    lookup[parentScriptImport.destPath] = parentScriptImport;
+                }
+            }
+
+            //add warning for every script tag that this file shares with an ancestor
+            for (let scriptImport of scope.xmlFile.scriptTagImports) {
+                let ancestorScriptImport = lookup[scriptImport.destPath];
+                if (ancestorScriptImport) {
+                    let ancestorComponent = ancestorScriptImport.sourceFile as XmlFile;
+                    let ancestorComponentName = ancestorComponent.componentName?.text ?? ancestorComponent.destPath;
+                    this.addDiagnostic({
+                        location: util.createLocationFromFileRange(scope.xmlFile, scriptImport.filePathRange),
+                        ...DiagnosticMessages.unnecessaryScriptImportInChildFromParent(ancestorComponentName)
+                    }, ScopeValidatorDiagnosticTag.XMLImports);
+                }
+            }
+        }
+    }
+
+    /**
+     * Wraps the AstNode.getType() method, so that we can do extra processing on the result based on the current file
+     * In particular, since BrightScript does not support Unions, and there's no way to cast them to something else
+     * if the result of .getType() is a union, and we're in a .brs (brightScript) file, treat the result as Dynamic
+     *
+     * Also, for BrightScript parse-mode, if .getType() returns a node type, do not validate unknown members.
+     *
+     * In most cases, this returns the result of node.getType()
+     *
+     * @param file the current file being processed
+     * @param node the node to get the type of
+     * @param getTypeOpts any options to pass to node.getType()
+     * @returns the processed result type
+     */
+    private getNodeTypeWrapper(file: BrsFile, node: AstNode, getTypeOpts: GetTypeOptions) {
+        const type = node?.getType(getTypeOpts);
+
+        if (file.parseMode === ParseMode.BrightScript) {
+            // this is a brightscript file
+            const typeChain = getTypeOpts.typeChain;
+            if (typeChain) {
+                const hasUnion = typeChain.reduce((hasUnion, tce) => {
+                    return hasUnion || isUnionType(tce.type);
+                }, false);
+                if (hasUnion) {
+                    // there was a union somewhere in the typechain
+                    return DynamicType.instance;
+                }
+            }
+            if (isUnionType(type)) {
+                //this is a union
+                return DynamicType.instance;
+            }
+
+            if (isComponentType(type)) {
+                // modify type to allow any member access for Node types
+                type.changeUnknownMemberToDynamic = true;
+            }
+        }
+
+        // by default return the result of node.getType()
+        return type;
+    }
+
+    private getParentTypeDescriptor(typeChainResult: TypeChainProcessResult) {
+        if (typeChainResult.itemParentTypeKind === BscTypeKind.NamespaceType) {
+            return 'namespace';
+        }
+        return 'type';
+    }
+
+    private addDiagnostic(diagnostic: BsDiagnostic, diagnosticTag?: string) {
+        diagnosticTag = diagnosticTag ?? (this.currentSegmentBeingValidated ? ScopeValidatorDiagnosticTag.Segment : ScopeValidatorDiagnosticTag.Default);
+        this.event.program.diagnostics.register(diagnostic, {
+            tags: [diagnosticTag],
+            segment: this.currentSegmentBeingValidated
+        });
+    }
+
+    /**
+     * Add a diagnostic (to the first scope) that will have `relatedInformation` for each affected scope
+     */
+    private addMultiScopeDiagnostic(diagnostic: BsDiagnostic, diagnosticTag?: string) {
+        diagnosticTag = diagnosticTag ?? (this.currentSegmentBeingValidated ? ScopeValidatorDiagnosticTag.Segment : ScopeValidatorDiagnosticTag.Default);
+        this.event.program.diagnostics.register(diagnostic, {
+            tags: [diagnosticTag],
+            segment: this.currentSegmentBeingValidated,
+            scope: this.event.scope
+        });
+    }
 }
-type DeepWriteable<T> = { -readonly [P in keyof T]: DeepWriteable<T[P]> };
diff --git a/src/bscPlugin/validation/XmlFileValidator.ts b/src/bscPlugin/validation/XmlFileValidator.ts
index 44912dced..4417becb9 100644
--- a/src/bscPlugin/validation/XmlFileValidator.ts
+++ b/src/bscPlugin/validation/XmlFileValidator.ts
@@ -1,18 +1,18 @@
 import { DiagnosticMessages } from '../../DiagnosticMessages';
 import type { XmlFile } from '../../files/XmlFile';
-import type { OnFileValidateEvent } from '../../interfaces';
+import type { ValidateFileEvent } from '../../interfaces';
 import type { SGAst } from '../../parser/SGTypes';
 import util from '../../util';
 
 export class XmlFileValidator {
     constructor(
-        public event: OnFileValidateEvent<XmlFile>
+        public event: ValidateFileEvent<XmlFile>
     ) {
     }
 
     public process() {
         util.validateTooDeepFile(this.event.file);
-        if (this.event.file.parser.ast.root) {
+        if (this.event.file.parser.ast.rootElement) {
             this.validateComponent(this.event.file.parser.ast);
         } else {
             //skip empty XML
@@ -20,46 +20,45 @@ export class XmlFileValidator {
     }
 
     private validateComponent(ast: SGAst) {
-        const { root, component } = ast;
-        if (!component) {
+        const { rootElement, componentElement } = ast;
+        if (!componentElement) {
             //not a SG component
-            this.event.file.diagnostics.push({
+            this.event.program.diagnostics.register({
                 ...DiagnosticMessages.xmlComponentMissingComponentDeclaration(),
-                range: root.range,
-                file: this.event.file
+                location: rootElement.location
             });
             return;
         }
 
         //component name/extends
-        if (!component.name) {
-            this.event.file.diagnostics.push({
+        if (!componentElement.name) {
+            this.event.program.diagnostics.register({
                 ...DiagnosticMessages.xmlComponentMissingNameAttribute(),
-                range: component.tag.range,
-                file: this.event.file
+                location: componentElement.tokens.startTagName.location
             });
         }
-        if (!component.extends) {
-            this.event.file.diagnostics.push({
+        if (!componentElement.extends) {
+            this.event.program.diagnostics.register({
                 ...DiagnosticMessages.xmlComponentMissingExtendsAttribute(),
-                range: component.tag.range,
-                file: this.event.file
+                location: componentElement.tokens.startTagName.location
             });
         }
 
-
-        //catch script imports with same path as the auto-imported codebehind file
-        const scriptTagImports = this.event.file.parser.references.scriptTagImports;
-        let explicitCodebehindScriptTag = this.event.file.program.options.autoImportComponentScript === true
-            ? scriptTagImports.find(x => this.event.file.possibleCodebehindPkgPaths.includes(x.pkgPath))
-            : undefined;
-        if (explicitCodebehindScriptTag) {
-            this.event.file.diagnostics.push({
-                ...DiagnosticMessages.unnecessaryCodebehindScriptImport(),
-                file: this.event.file,
-                range: explicitCodebehindScriptTag.filePathRange
-            });
+        //flag explicit script imports that match the auto-imported codebehind file
+        const file = this.event.file;
+        if (file.program?.options?.autoImportComponentScript === true) {
+            const codebehindPaths = file.possibleCodebehindDestPaths ?? [];
+            for (const scriptImport of file.parser.references.scriptTagImports) {
+                if (!scriptImport.destPath || !scriptImport.filePathRange) {
+                    continue;
+                }
+                if (codebehindPaths.includes(scriptImport.destPath)) {
+                    this.event.program.diagnostics.register({
+                        ...DiagnosticMessages.unnecessaryCodebehindScriptImport(),
+                        location: util.createLocationFromFileRange(file, scriptImport.filePathRange)
+                    });
+                }
+            }
         }
     }
-
 }
diff --git a/src/cli.ts b/src/cli.ts
index 2a6f51430..cc2ab1f22 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -18,28 +18,21 @@ const rl = readline.createInterface({
 let options = yargs
     .usage('$0', 'BrighterScript, a superset of Roku\'s BrightScript language')
     .help('help', 'View help information about this tool.')
-    .option('create-package', { type: 'boolean', defaultDescription: 'true', description: 'Creates a zip package. This setting is ignored when deploy is enabled.' })
-    .option('source-map', { type: 'boolean', defaultDescription: 'false', description: 'Enables generating sourcemap files, which allow debugging tools to show the original source code while running the emitted files.' })
-    .option('allow-brighterscript-in-brightscript', { alias: 'allow-brighter-script-in-bright-script', type: 'boolean', defaultDescription: 'false', description: 'Allow brighterscript features (classes, interfaces, etc...) to be included in BrightScript (`.brs`) files, and force those files to be transpiled..' })
+    .option('sourceMap', { type: 'boolean', defaultDescription: 'false', description: 'Enables generating sourcemap files, which allow debugging tools to show the original source code while running the emitted files.' })
+    .option('allowBrighterscriptInBrightscript', { type: 'boolean', defaultDescription: 'false', description: 'Allow brighterscript features (classes, interfaces, etc...) to be included in BrightScript (`.brs`) files, and force those files to be transpiled.' })
     .option('cwd', { type: 'string', description: 'Override the current working directory.' })
-    .option('copy-to-staging', { type: 'boolean', defaultDescription: 'true', description: 'Copy project files into the staging folder, ready to be packaged.' })
-    .option('diagnostic-level', { type: 'string', defaultDescription: '"warn"', description: 'Specify what diagnostic types should be printed to the console. Value can be "error", "warn", "hint", "info".' })
+    .option('noEmit', { type: 'boolean', defaultDescription: 'false', description: 'Do not generate any output files.' })
+    .option('diagnosticLevel', { type: 'string', defaultDescription: '"warn"', description: 'Specify what diagnostic types should be printed to the console. Value can be "error", "warn", "hint", "info".' })
     .option('plugins', { type: 'array', alias: 'plugin', description: 'A list of scripts or modules to add extra diagnostics or transform the AST.' })
-    .option('deploy', { type: 'boolean', defaultDescription: 'false', description: 'Deploy to a Roku device if compilation succeeds. When in watch mode, this will deploy on every change.' })
-    .option('emit-full-paths', { type: 'boolean', defaultDescription: 'false', description: 'Emit full paths to files when encountering diagnostics.' })
+    .option('emitFullPaths', { type: 'boolean', defaultDescription: 'false', description: 'Emit full paths to files when encountering diagnostics.' })
     .option('files', { type: 'array', description: 'The list of files (or globs) to include in your project. Be sure to wrap these in double quotes when using globs.' })
-    .option('host', { type: 'string', description: 'The host used when deploying to a Roku.' })
-    .option('ignore-error-codes', { type: 'array', description: 'A list of error codes that the compiler should NOT emit, even if encountered.' })
-    .option('no-project', { type: 'boolean', defaultDescription: 'false', description: 'When set, bsconfig.json loading is disabled', alias: ['noproject', 'noProject'] })
-    .option('log-level', { type: 'string', defaultDescription: '"log"', description: 'The log level. Value can be "error", "warn", "log", "info", "debug".' })
-    .option('out-file', { type: 'string', description: 'Path to the zip folder containing the bundled project. Defaults to `./out/[YOUR_ROOT_FOLDER_NAME].zip' })
-    .option('password', { type: 'string', description: 'The password for deploying to a Roku.' })
+    .option('ignoreErrorCodes', { type: 'array', description: 'A list of error codes that the compiler should NOT emit, even if encountered.' })
+    .option('noProject', { type: 'boolean', defaultDescription: 'false', description: 'When set, bsconfig.json loading is disabled', alias: ['noproject', 'noProject'] })
+    .option('logLevel', { type: 'string', defaultDescription: '"log"', description: 'The log level. Value can be "error", "warn", "log", "info", "debug".' })
     .option('project', { type: 'string', description: 'Path to a bsconfig.json project file.' })
-    .option('retain-staging-folder', { type: 'boolean', defaultDescription: 'false', description: 'Prevent the staging folder from being deleted after creating the package.' })
-    .option('root-dir', { type: 'string', description: 'Path to the root of your project files (where the manifest lives). Defaults to current directory.' })
-    .option('staging-folder-path', { type: 'string', description: 'The path where the files should be staged (right before being zipped up).' })
-    .option('username', { type: 'string', defaultDescription: '"rokudev"', description: 'The username for deploying to a Roku.' })
-    .option('source-root', { type: 'string', description: 'Override the root directory path where debugger should locate the source files. The location will be embedded in the source map to help debuggers locate the original source files. This only applies to files found within rootDir. This is useful when you want to preprocess files before passing them to BrighterScript, and want a debugger to open the original files.' })
+    .option('rootDir', { type: 'string', description: 'Path to the root of your project files (where the manifest lives). Defaults to current directory.' })
+    .option('outDir', { type: 'string', description: 'TODO Better description The path where the transpiled files should are placed.' })
+    .option('sourceRoot', { type: 'string', description: 'Override the root directory path where debugger should locate the source files. The location will be embedded in the source map to help debuggers locate the original source files. This only applies to files found within rootDir. This is useful when you want to preprocess files before passing them to BrighterScript, and want a debugger to open the original files.' })
     .option('watch', { type: 'boolean', defaultDescription: 'false', description: 'Watch input files.' })
     .option('require', { type: 'array', description: 'A list of modules to require() on startup. Useful for doing things like ts-node registration.' })
     .option('validate', { type: 'boolean', defaultDescription: 'true', description: 'Whether to run validation during the build. Setting to false skips all validation (diagnostics), which can speed up builds when diagnostics are already surfaced elsewhere (e.g. a running language server).' })
diff --git a/src/common/Sequencer.spec.ts b/src/common/Sequencer.spec.ts
index b8b338ec3..a61699c25 100644
--- a/src/common/Sequencer.spec.ts
+++ b/src/common/Sequencer.spec.ts
@@ -10,7 +10,7 @@ describe('Sequencer', () => {
             name: 'test',
             cancellationToken: cancellationTokenSource.token,
             minSyncDuration: 100
-        }).forEach([1, 2, 3], (i) => {
+        }).forEach('run', [1, 2, 3], (i) => {
             values.push(i);
             if (i === 2) {
                 cancellationTokenSource.cancel();
@@ -23,7 +23,7 @@ describe('Sequencer', () => {
     it('throws when returning a promise from runSync', () => {
         let error;
         try {
-            new Sequencer().once(() => {
+            new Sequencer().once('run', () => {
                 return Promise.resolve();
             }).runSync();
         } catch (e) {
@@ -34,7 +34,7 @@ describe('Sequencer', () => {
 
     it('waits for async actions to complete', async () => {
         const values = [];
-        await new Sequencer().forEach([1, 2, 3], async (i) => {
+        await new Sequencer().forEach('run', [1, 2, 3], async (i) => {
             await new Promise((resolve) => {
                 setTimeout(resolve, 10);
             });
@@ -47,7 +47,7 @@ describe('Sequencer', () => {
     it('runSync() calls cancel before throwing', () => {
         let cancelCalled = false;
         try {
-            new Sequencer().once(() => {
+            new Sequencer().once('run', () => {
                 throw new Error('crash');
             }).onCancel(() => {
                 cancelCalled = true;
@@ -62,7 +62,7 @@ describe('Sequencer', () => {
     it('run() calls cancel before throwing', async () => {
         let cancelCalled = false;
         try {
-            await new Sequencer().once(() => {
+            await new Sequencer().once('run', () => {
                 throw new Error('crash');
             }).onCancel(() => {
                 cancelCalled = true;
diff --git a/src/common/Sequencer.ts b/src/common/Sequencer.ts
index ecaca4e37..2cb6c782a 100644
--- a/src/common/Sequencer.ts
+++ b/src/common/Sequencer.ts
@@ -1,9 +1,12 @@
 import type { CancellationToken } from 'vscode-languageserver-protocol';
 import { util } from '../util';
 import { EventEmitter } from 'eventemitter3';
+import * as parseMilliseconds from 'parse-ms';
+import { performance } from 'perf_hooks';
 
 /**
  * Supports running a series of actions in sequence, either synchronously or asynchronously
+ * @private
  */
 export class Sequencer {
     constructor(
@@ -16,7 +19,6 @@ export class Sequencer {
             minSyncDuration?: number;
         }
     ) {
-
     }
 
     private get minSyncDuration() {
@@ -24,17 +26,32 @@ export class Sequencer {
     }
 
     // eslint-disable-next-line @typescript-eslint/ban-types
-    private actions: Array<{ args: any[]; func: Function }> = [];
+    private actions: Array<{
+        /**
+         * Label for this action. Is used for logging and metrics
+         */
+        label: string;
+        /**
+         * If this action is a member of a group (i.e. forEach calls), this is the label for the group which will be logged in addition to the label
+         */
+        groupLabel?: string;
+        args: any[];
+        func: (...args: any[]) => any;
+    }> = [];
 
-    public forEach<T>(itemsOrFactory: Iterable<T> | (() => Iterable<T>), func: (item: T) => any) {
+    public forEach<T>(label: string, itemsOrFactory: Iterable<T> | (() => Iterable<T>), func: (item: T) => any) {
         //register a single action for now, we will fetch the full list and register their actions later
         const primaryAction = {
             args: [],
+            label: label,
             func: (data) => {
                 const items = typeof itemsOrFactory === 'function' ? itemsOrFactory() : itemsOrFactory;
                 const actions: Sequencer['actions'] = [];
+                let i = 0;
                 for (const item of items) {
                     actions.push({
+                        label: label + `[${i++}]`,
+                        groupLabel: label,
                         args: [item],
                         func: func
                     });
@@ -65,10 +82,11 @@ export class Sequencer {
         return this;
     }
 
-    public once(func: () => any) {
+    public once(label: string, func: () => any) {
         this.actions.push({
             args: [],
-            func: func
+            func: func,
+            label: label
         });
         return this;
     }
@@ -88,9 +106,7 @@ export class Sequencer {
                     return this.handleCancel();
                 }
 
-                await Promise.resolve(
-                    action.func(...action.args)
-                );
+                await this.runActionAsync(action);
 
                 //if the cancellation token has asked us to cancel, then stop processing now
                 if (this.options?.cancellationToken?.isCancellationRequested) {
@@ -114,7 +130,9 @@ export class Sequencer {
                 if (this.options?.cancellationToken?.isCancellationRequested) {
                     return this.handleCancel();
                 }
-                const result = action.func(...action.args);
+
+                const result = this.runActionSync(action);
+
                 if (typeof result?.then === 'function') {
                     throw new Error(`Action returned a promise which is unsupported when running 'runSync'`);
                 }
@@ -129,6 +147,120 @@ export class Sequencer {
         }
     }
 
+    private async runActionAsync<T>(action: typeof this.actions[0]): Promise<T> {
+        //record the start time for this action
+        let perfBefore = performance.now();
+        try {
+            return await Promise.resolve(
+                action.func(...action.args)
+            );
+        } finally {
+            let perfAfter = performance.now();
+            this.incrementMetric(action.label, perfAfter - perfBefore, 1, !!action.groupLabel);
+            if (action.groupLabel) {
+                this.incrementMetric(action.groupLabel, perfAfter - perfBefore, 1);
+            }
+        }
+    }
+
+    private runActionSync<T>(action: typeof this.actions[0]) {
+        //record the start time for this action
+        let perfBefore = performance.now();
+        try {
+            return action.func(...action.args);
+        } finally {
+            let perfAfter = performance.now();
+            this.incrementMetric(action.label, perfAfter - perfBefore, 1, !!action.groupLabel);
+            if (action.groupLabel) {
+                this.incrementMetric(action.groupLabel, perfAfter - perfBefore, 1);
+            }
+        }
+    }
+
+    /**
+     * An object that collects timing information for our actions
+     */
+    public metrics = new Map<string, {
+        duration: number;
+        callCount: number;
+        isLoopIteration: boolean;
+    }>();
+
+    /**
+     * Get all the metrics in a text-based format (useful for logging)
+     */
+    public formatMetrics(options: { header: string; includeLoopIterations: boolean }) {
+        let results: Array<{ label: string; durationText: string; callText: string }> = [];
+        let total = 0;
+        for (const [label, metric] of this.metrics) {
+            //skip loop iterations if options say they should be skipped
+            if (metric.isLoopIteration && options?.includeLoopIterations !== true) {
+                continue;
+            }
+            //sum all the non-loop iterations (i.e. the one-off runs or grouped loop runs).
+            //this represents the total time spend running these tasks
+            if (!metric.isLoopIteration) {
+                total += metric.duration;
+            }
+            results.push({
+                label: label,
+                durationText: this.getDurationText(metric.duration),
+                callText: `${metric.callCount} calls`
+            });
+        }
+
+        let maxLabelLength = Math.max(...results.map(x => x.label.length));
+        let maxCallTextLength = Math.max(...results.map(x => x.callText.length));
+        let maxDurationLength = Math.max(...results.map(x => x.durationText.length));
+
+        results.push(
+            {
+                label: 'Total',
+                durationText: this.getDurationText(total),
+                callText: ''
+            }
+        );
+
+        return (options?.header ? options.header + '\n' : '') +
+            results.map(x => [
+                '    ' + (x.label ?? '').padEnd(maxLabelLength + 2, '-') +
+                (' ' + (x.durationText ?? '')).padStart(maxDurationLength + 2, '-') + ', ' +
+                (x.callText ?? '').padStart(maxCallTextLength, ' ')
+            ].join(', ')).join('\n');
+
+    }
+
+    private getDurationText(duration: number) {
+        let parts = parseMilliseconds(duration);
+        let fractionalMilliseconds = parseInt(duration.toFixed(3).toString().split('.')[1]);
+        let result = `${parts.minutes}m${parts.seconds.toString().padStart(2, '0')}s${parts.milliseconds.toString().padStart(3, '0')}.${fractionalMilliseconds.toString().padStart(3, '0')}ms`;
+        //remove leading zeros for minutes and seconds
+        result = result.replace(/^0+m/, '').replace(/^0+s/, '');
+        return result;
+    }
+
+    /**
+     * Bump the metric for the given key by the given duration and call count
+     * @param label the label of the action to have its metric incremented
+     * @param duration the amount of new duration to add to the existing duration
+     * @param callCount the amount of new calls to add to the existing call count
+     */
+    private incrementMetric(label: string, duration: number, callCount: number, isLoopIteration = false) {
+        let metric = this.metrics.get(label);
+        if (!metric) {
+            metric = {
+                duration: 0,
+                callCount: 0,
+                isLoopIteration: false
+            };
+            this.metrics.set(label, metric);
+        }
+        metric.duration += duration;
+        metric.callCount += callCount;
+        metric.isLoopIteration = isLoopIteration;
+    }
+
+
     private handleCancel() {
         console.log(`Cancelling sequence ${this.options?.name}`);
         this.emitter.emit('cancel');
diff --git a/src/diagnosticUtils.spec.ts b/src/diagnosticUtils.spec.ts
index f88491da4..733885676 100644
--- a/src/diagnosticUtils.spec.ts
+++ b/src/diagnosticUtils.spec.ts
@@ -22,11 +22,19 @@ describe('diagnosticUtils', () => {
     });
 
     describe('printDiagnostic', () => {
+        it('does not crash when file has no content', () => {
+            //print a diagnostic that has an AssetFile. It should not explode
+            diagnosticUtils.printDiagnostic(options, DiagnosticSeverity.Error, './temp/file.brs', [], {
+                message: 'Bad thing happened',
+                location: null, //important...this needs to be null for the test to pass,
+                code: 1234
+            } as any);
+        });
         it('does not crash when range is undefined', () => {
             //print a diagnostic that doesn't have a range...it should not explode
             diagnosticUtils.printDiagnostic(options, DiagnosticSeverity.Error, './temp/file.brs', [], {
                 message: 'Bad thing happened',
-                range: null, //important...this needs to be null for the test to pass,
+                location: null, //important...this needs to be null for the test to pass,
                 code: 1234
             } as any);
         });
@@ -35,7 +43,7 @@ describe('diagnosticUtils', () => {
             //print a diagnostic that doesn't have a range...it should not explode
             diagnosticUtils.printDiagnostic(options, DiagnosticSeverity.Error, undefined, [], {
                 message: 'Bad thing happened',
-                range: Range.create(0, 0, 2, 2),
+                location: Range.create(0, 0, 2, 2),
                 code: 1234
             } as any);
         });
@@ -242,7 +250,7 @@ describe('diagnosticUtils', () => {
 
         function testGetDiagnosticLine(range: Range, squigglyText: string, lineLength = 20) {
             expect(
-                diagnosticUtils.getDiagnosticLine({ range: range } as any, '1'.repeat(lineLength), color)
+                diagnosticUtils.getDiagnosticLine({ location: { range: range } } as any, '1'.repeat(lineLength), color)
             ).to.eql([
                 chalk.bgWhite(' ' + chalk.black((range.start.line + 1).toString()) + ' ') + ' ' + '1'.repeat(lineLength),
                 chalk.bgWhite(' ' + chalk.white(' '.repeat((range.start.line + 1).toString().length)) + ' ') + ' ' + squigglyText.padEnd(lineLength, ' ')
diff --git a/src/diagnosticUtils.ts b/src/diagnosticUtils.ts
index 0a8835039..ddf269a83 100644
--- a/src/diagnosticUtils.ts
+++ b/src/diagnosticUtils.ts
@@ -2,9 +2,11 @@ import type { Chalk } from 'chalk';
 import chalk from 'chalk';
 import type { BsConfig } from './BsConfig';
 import { DiagnosticSeverity } from 'vscode-languageserver';
-import type { BsDiagnostic } from '.';
+import type { BsDiagnostic } from './interfaces';
 import type { Range } from 'vscode-languageserver';
 
+export const MAX_RELATED_INFOS_COUNT = 3;
+
 /**
  * Prepare print diagnostic formatting options
  */
@@ -70,18 +72,20 @@ export function printDiagnostic(
     let severityText = severityTextMap[severity];
 
     console.log('');
+    const printableDiagnosticCode = diagnostic.code ? diagnostic.code.toString() : 'BS' + ((diagnostic as BsDiagnostic).legacyCode ?? '');
+
     console.log(
         chalk.cyan(filePath ?? '<unknown file>') +
         ':' +
         chalk.yellow(
-            diagnostic.range
-                ? (diagnostic.range.start.line + 1) + ':' + (diagnostic.range.start.character + 1)
+            diagnostic.location?.range
+                ? (diagnostic.location.range.start.line + 1) + ':' + (diagnostic.location.range.start.character + 1)
                 : 'line?:col?'
         ) +
         ' - ' +
         typeColor[severity](severityText) +
         ' ' +
-        chalk.grey('BS' + diagnostic.code) +
+        chalk.grey(printableDiagnosticCode) +
         ': ' +
         chalk.white(diagnostic.message)
     );
@@ -89,7 +93,7 @@ export function printDiagnostic(
 
     //Get the line referenced by the diagnostic. if we couldn't find a line,
     // default to an empty string so it doesn't crash the error printing below
-    let diagnosticLine = lines[diagnostic.range?.start?.line ?? -1] ?? '';
+    let diagnosticLine = lines[diagnostic.location?.range?.start?.line ?? -1] ?? '';
     console.log(
         getDiagnosticLine(diagnostic, diagnosticLine, typeColor[severity])
     );
@@ -99,8 +103,8 @@ export function printDiagnostic(
     let indent = '    ';
     for (let i = 0; i < relatedInfoList.length; i++) {
         let relatedInfo = relatedInfoList[i];
-        //only show the first 5 relatedInfo links
-        if (i < 5) {
+        //only show the first MAX_RELATED_INFOS_COUNT relatedInfo links
+        if (i < MAX_RELATED_INFOS_COUNT) {
             console.log('');
             console.log(
                 indent,
@@ -125,14 +129,14 @@ export function getDiagnosticLine(diagnostic: BsDiagnostic, diagnosticLine: stri
     let result = '';
 
     //only print the line information if we have some
-    if (diagnostic.range && diagnosticLine) {
-        const lineNumberText = chalk.bgWhite(' ' + chalk.black((diagnostic.range.start.line + 1).toString()) + ' ') + ' ';
-        const blankLineNumberText = chalk.bgWhite(' ' + chalk.white(' '.repeat((diagnostic.range.start.line + 1).toString().length)) + ' ') + ' ';
+    if (diagnostic.location?.range && diagnosticLine) {
+        const lineNumberText = chalk.bgWhite(' ' + chalk.black((diagnostic.location.range.start.line + 1).toString()) + ' ') + ' ';
+        const blankLineNumberText = chalk.bgWhite(' ' + chalk.white(' '.repeat((diagnostic.location.range.start.line + 1).toString().length)) + ' ') + ' ';
 
         //remove tabs in favor of spaces to make diagnostic printing more consistent
-        let leadingText = diagnosticLine.slice(0, diagnostic.range.start.character);
+        let leadingText = diagnosticLine.slice(0, diagnostic.location.range.start.character);
         let leadingTextNormalized = leadingText.replace(/\t/g, '    ');
-        let actualText = diagnosticLine.slice(diagnostic.range.start.character, diagnostic.range.end.character);
+        let actualText = diagnosticLine.slice(diagnostic.location.range.start.character, diagnostic.location.range.end.character);
         let actualTextNormalized = actualText.replace(/\t/g, '    ');
         let startIndex = leadingTextNormalized.length;
         let endIndex = leadingTextNormalized.length + actualTextNormalized.length;
diff --git a/src/examples/plugins/removePrint.ts b/src/examples/plugins/removePrint.ts
index 0e12461e9..e16d865b5 100644
--- a/src/examples/plugins/removePrint.ts
+++ b/src/examples/plugins/removePrint.ts
@@ -1,22 +1,20 @@
 import { isBrsFile } from '../../astUtils/reflection';
 import { createVisitor, WalkMode } from '../../astUtils/visitors';
-import type { BeforeFileTranspileEvent, Plugin } from '../../interfaces';
+import type { BeforePrepareFileEvent, Plugin } from '../../interfaces';
 
 export default function plugin() {
     return {
         name: 'removePrint',
-        beforeFileTranspile: (event: BeforeFileTranspileEvent) => {
+        beforePrepareFile: (event: BeforePrepareFileEvent) => {
             if (isBrsFile(event.file)) {
                 // visit functions bodies and replace `PrintStatement` nodes with `EmptyStatement`
-                for (const func of event.file.parser.references.functionExpressions) {
-                    func.body.walk(createVisitor({
-                        PrintStatement: (statement) => {
-                            event.editor.overrideTranspileResult(statement, '');
-                        }
-                    }), {
-                        walkMode: WalkMode.visitStatements
-                    });
-                }
+                event.file.ast.walk(createVisitor({
+                    PrintStatement: (statement) => {
+                        event.editor.overrideTranspileResult(statement, '');
+                    }
+                }), {
+                    walkMode: WalkMode.visitExpressionsRecursive
+                });
             }
         }
     } as Plugin;
diff --git a/src/files/AssetFile.ts b/src/files/AssetFile.ts
new file mode 100644
index 000000000..debc2c973
--- /dev/null
+++ b/src/files/AssetFile.ts
@@ -0,0 +1,39 @@
+import type { BscFile } from './BscFile';
+import { standardizePath as s } from '../util';
+import type { FileData } from './LazyFileData';
+import { LazyFileData } from './LazyFileData';
+
+export class AssetFile implements BscFile {
+    /**
+     * Create a new instance of this file
+     */
+    constructor(options: {
+        srcPath: string;
+        destPath: string;
+        pkgPath?: string;
+        /**
+         * The data for this file.
+         */
+        data?: FileData;
+    }) {
+        //spread the constructor args onto this object
+        Object.assign(this, options);
+        this.data = new LazyFileData(options.data);
+        this.srcPath = s`${this.srcPath}`;
+        this.destPath = s`${this.destPath}`;
+        this.pkgPath = s`${this.pkgPath ?? this.destPath}`;
+        this.dependencyGraphKey = this.pkgPath.toLowerCase();
+    }
+    public type = 'AssetFile';
+
+    public srcPath: string;
+    public destPath: string;
+    public pkgPath: string;
+
+    public dependencyGraphKey: string;
+
+    //mark this file as validated so it skips all validation checks
+    public isValidated = true;
+
+    public data: LazyFileData;
+}
diff --git a/src/files/BrsFile.Class.spec.ts b/src/files/BrsFile.Class.spec.ts
index d0ae89065..6e5c4a7cf 100644
--- a/src/files/BrsFile.Class.spec.ts
+++ b/src/files/BrsFile.Class.spec.ts
@@ -6,13 +6,15 @@ import { expect } from '../chai-config.spec';
 import { DiagnosticMessages } from '../DiagnosticMessages';
 import { Range } from 'vscode-languageserver';
 import { ParseMode } from '../parser/Parser';
-import { expectDiagnostics, expectZeroDiagnostics, getTestTranspile, trim } from '../testHelpers.spec';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectZeroDiagnostics, getTestTranspile, trim } from '../testHelpers.spec';
 import { standardizePath as s } from '../util';
 import * as fsExtra from 'fs-extra';
 import { BrsTranspileState } from '../parser/BrsTranspileState';
 import { doesNotThrow } from 'assert';
-import type { MethodStatement } from '../parser/Statement';
-import { tempDir, rootDir, stagingDir } from '../testHelpers.spec';
+import type { ClassStatement, MethodStatement } from '../parser/Statement';
+import { tempDir, rootDir, outDir } from '../testHelpers.spec';
+import { isClassStatement } from '../astUtils/reflection';
+import { WalkMode } from '../astUtils/visitors';
 
 let sinon = sinonImport.createSandbox();
 
@@ -23,7 +25,7 @@ describe('BrsFile BrighterScript classes', () => {
     beforeEach(() => {
         fsExtra.ensureDirSync(rootDir);
         fsExtra.emptyDirSync(tempDir);
-        program = new Program({ rootDir: rootDir, stagingDir: stagingDir });
+        program = new Program({ rootDir: rootDir, outDir: outDir });
     });
     afterEach(() => {
         sinon.restore();
@@ -45,7 +47,8 @@ describe('BrsFile BrighterScript classes', () => {
 
             end class
         `);
-        expect(file.parser.references.classStatements.map(x => x.getName(ParseMode.BrighterScript)).sort()).to.eql(['Animal', 'Duck']);
+        const classStatements = file.ast.findChildren<ClassStatement>(isClassStatement);
+        expect(classStatements.map(x => x.getName(ParseMode.BrighterScript)).sort()).to.eql(['Animal', 'Duck']);
     });
 
     it('does not cause errors with incomplete class statement', () => {
@@ -110,7 +113,7 @@ describe('BrsFile BrighterScript classes', () => {
         `);
         program.validate();
         expectZeroDiagnostics(program);
-        let duckClass = file.parser.references.classStatements.find(x => x.name.text.toLowerCase() === 'duck');
+        let duckClass = file.ast.findChildren<ClassStatement>(isClassStatement, { walkMode: WalkMode.visitStatements }).find(x => x.tokens.name.text.toLowerCase() === 'duck');
         expect(duckClass).to.exist;
         expect(duckClass!.memberMap['move']).to.exist;
     });
@@ -178,7 +181,7 @@ describe('BrsFile BrighterScript classes', () => {
                     end sub
                 end class
                 class Duck extends Bird
-                    sub new()
+                    sub new(name)
                         thing = { m: "m"}
                         print thing.m
                         name = "Donald" + "Duck"
@@ -193,30 +196,32 @@ describe('BrsFile BrighterScript classes', () => {
         it('allows non-`m` expressions and statements before the super call', () => {
             program.setFile('source/main.bs', `
                 class Bird
-                    sub new(name)
+                    name as string
+                    sub new(name as string)
+                        m.name = name
                     end sub
                 end class
                 class Duck extends Bird
                     sub new()
                         m.name = m.name + "Duck"
-                        super()
+                        super("Flappy")
                     end sub
                 end class
             `);
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall(),
-                range: Range.create(7, 24, 7, 25)
+                location: { range: Range.create(9, 24, 9, 25) }
             }, {
                 ...DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall(),
-                range: Range.create(7, 33, 7, 34)
+                location: { range: Range.create(9, 33, 9, 34) }
             }]);
         });
     });
 
     describe('transpile', () => {
         it('does not mess with AST when injecting `super()` call', async () => {
-            const file = program.setFile('source/classes.bs', `
+            const file = program.setFile<BrsFile>('source/classes.bs', `
                 class Parent
                 end class
 
@@ -227,33 +232,33 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             expect(
-                (file.ast as any).statements[1].body[0].func.body.statements[0].expression.callee.name.text
+                (file.ast as any).statements[1].body[0].func.body.statements[0].expression.callee.tokens.name.text
             ).to.eql('super');
-            await program.transpile([], stagingDir);
+            await program.getTranspiledFileContents(file.srcPath);
             expect(
-                (file.ast as any).statements[1].body[0].func.body.statements[0].expression.callee.name.text
+                (file.ast as any).statements[1].body[0].func.body.statements[0].expression.callee.tokens.name.text
             ).to.eql('super');
         });
 
-        it('follows correct sequence for property initializers', () => {
-            testTranspile(`
+        it('follows correct sequence for property initializers', async () => {
+            await testTranspile(`
                 class Animal
                     species1 = "Animal"
                     sub new()
-                        print "From Animal: " + m.species
+                        print "From Animal: " + m.species1
                     end sub
                 end class
                 class Duck extends Animal
                     species2 = "Duck"
                     sub new()
                         super()
-                        print "From Duck: " + m.species
+                        print "From Duck: " + m.species2
                     end sub
                 end class
             `, `
                 sub __Animal_method_new()
                     m.species1 = "Animal"
-                    print "From Animal: " + m.species
+                    print "From Animal: " + m.species1
                 end sub
                 function __Animal_builder()
                     instance = {}
@@ -268,7 +273,7 @@ describe('BrsFile BrighterScript classes', () => {
                 sub __Duck_method_new()
                     m.super0_new()
                     m.species2 = "Duck"
-                    print "From Duck: " + m.species
+                    print "From Duck: " + m.species2
                 end sub
                 function __Duck_builder()
                     instance = __Animal_builder()
@@ -284,8 +289,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, 'trim', 'source/main.bs');
         });
 
-        it('allows comments as first line of constructor', () => {
-            testTranspile(`
+        it('allows comments as first line of constructor', async () => {
+            await testTranspile(`
                 class Animal
                 end class
                 class Duck extends Animal
@@ -325,8 +330,8 @@ describe('BrsFile BrighterScript classes', () => {
             `);
         });
 
-        it('does not inject a call to super if one exists', () => {
-            testTranspile(`
+        it('does not inject a call to super if one exists', async () => {
+            await testTranspile(`
                 class Animal
                 end class
                 class Duck extends Animal
@@ -366,8 +371,8 @@ describe('BrsFile BrighterScript classes', () => {
             `);
         });
 
-        it('handles class inheritance inferred constructor calls', () => {
-            testTranspile(`
+        it('handles class inheritance inferred constructor calls', async () => {
+            await testTranspile(`
                 class Animal
                     className1 = "Animal"
                 end class
@@ -424,8 +429,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('works with namespaces', () => {
-            testTranspile(`
+        it('works with namespaces', async () => {
+            await testTranspile(`
                 namespace Birds.WaterFowl
                     class Duck
                     end class
@@ -462,8 +467,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('works for simple class', () => {
-            testTranspile(`
+        it('works for simple class', async () => {
+            await testTranspile(`
                 class Duck
                 end class
             `, `
@@ -482,8 +487,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('inherits the parameters of the last known constructor', () => {
-            testTranspile(`
+        it('inherits the parameters of the last known constructor', async () => {
+            await testTranspile(`
                 class Animal
                     sub new(p1)
                     end sub
@@ -495,6 +500,7 @@ describe('BrsFile BrighterScript classes', () => {
                         super(p1)
                         m.p2 = p2
                     end sub
+                    private p2 as dynamic
                 end class
                 class BabyDuck extends Duck
                 end class
@@ -527,6 +533,7 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
                 sub __Duck_method_new(p1, p2)
                     m.super1_new(p1)
+                    m.p2 = invalid
                     m.p2 = p2
                 end sub
                 function __Duck_builder()
@@ -557,8 +564,8 @@ describe('BrsFile BrighterScript classes', () => {
             `);
         });
 
-        it('registers the constructor and properly handles its parameters', () => {
-            testTranspile(`
+        it('registers the constructor and properly handles its parameters', async () => {
+            await testTranspile(`
                 class Duck
                     sub new(name as string, age as integer)
                     end sub
@@ -579,11 +586,14 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('properly handles child class constructor override and super calls', () => {
-            testTranspile(`
+        it('properly handles child class constructor override and super calls', async () => {
+            await testTranspile(`
                 class Animal
                     sub new(name as string)
                     end sub
+
+                    sub DoSomething()
+                    end sub
                 end class
 
                 class Duck extends Animal
@@ -595,9 +605,12 @@ describe('BrsFile BrighterScript classes', () => {
             `, `
                 sub __Animal_method_new(name as string)
                 end sub
+                sub __Animal_method_DoSomething()
+                end sub
                 function __Animal_builder()
                     instance = {}
                     instance.new = __Animal_method_new
+                    instance.DoSomething = __Animal_method_DoSomething
                     return instance
                 end function
                 function Animal(name as string)
@@ -623,8 +636,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('transpiles super in nested blocks', () => {
-            testTranspile(`
+        it('transpiles super in nested blocks', async () => {
+            await testTranspile(`
                 class Creature
                     sub new(name as string)
                     end sub
@@ -684,7 +697,7 @@ describe('BrsFile BrighterScript classes', () => {
             );
         });
 
-        it('properly transpiles classes from outside current namespace', () => {
+        it('properly transpiles classes from outside current namespace', async () => {
             addFile('source/Animals.bs', `
                 namespace Animals
                     class Duck
@@ -693,7 +706,7 @@ describe('BrsFile BrighterScript classes', () => {
                 class Bird
                 end class
             `);
-            testTranspile(`
+            await testTranspile(`
                 namespace Animals
                     sub init()
                         donaldDuck = new Duck()
@@ -710,8 +723,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('properly transpiles new statement for missing class ', () => {
-            testTranspile(`
+        it('properly transpiles new statement for missing class ', async () => {
+            await testTranspile(`
                 sub main()
                     bob = new Human()
                 end sub
@@ -722,14 +735,14 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs', false);
         });
 
-        it('new keyword transpiles correctly', () => {
+        it('new keyword transpiles correctly', async () => {
             addFile('source/Animal.bs', `
                 class Animal
                     sub new(name as string)
                     end sub
                 end class
             `);
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     a = new Animal("donald")
                 end sub
@@ -740,8 +753,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('calls super ', () => {
-            const { file } = testTranspile(`
+        it('calls super ', async () => {
+            const { file } = await testTranspile(`
                 class Parent
                     sub new()
                     end sub
@@ -783,8 +796,8 @@ describe('BrsFile BrighterScript classes', () => {
             expect(constructor.func.body.statements).to.be.lengthOf(0);
         });
 
-        it('adds field initializers', () => {
-            const { file } = testTranspile(`
+        it('adds field initializers', async () => {
+            const { file } = await testTranspile(`
                 class Person
                     sub new()
                     end sub
@@ -810,8 +823,8 @@ describe('BrsFile BrighterScript classes', () => {
             expect(constructor.func.body.statements).to.be.lengthOf(0);
         });
 
-        it('does not screw up local variable references', () => {
-            testTranspile(`
+        it('does not screw up local variable references', async () => {
+            await testTranspile(`
                 class Animal
                     sub new(name as string)
                         m.name = name
@@ -915,9 +928,11 @@ describe('BrsFile BrighterScript classes', () => {
                     smokey = Animal("Smokey")
                     smokey.move(1)
                     '> Bear moved 1 meters
+
                     donald = Duck("Donald")
                     donald.move(2)
                     '> Waddling...\\nDonald moved 2 meters
+
                     dewey = BabyDuck("Dewey")
                     dewey.move(3)
                     '> Waddling...\\nDewey moved 2 meters\\nFell over...I'm new at this
@@ -925,8 +940,8 @@ describe('BrsFile BrighterScript classes', () => {
             `, 'trim', 'source/main.bs');
         });
 
-        it('calculates the proper super index', () => {
-            testTranspile(`
+        it('calculates the proper super index', async () => {
+            await testTranspile(`
                 class Duck
                     public sub walk(meters as integer)
                         print "Walked " + meters.ToStr() + " meters"
@@ -979,8 +994,48 @@ describe('BrsFile BrighterScript classes', () => {
             `, 'trim', 'source/main.bs');
         });
 
-        it('works with enums as field initial values inside a namespace', () => {
-            testTranspile(`
+
+        it('adds namespacing to constructors on field definitions', async () => {
+            await testTranspile(`
+                namespace MyNS
+                    class KlassOne
+                        other = new KlassTwo()
+                    end class
+
+                    class KlassTwo
+                    end class
+                end namespace
+            `, `
+                sub __MyNS_KlassOne_method_new()
+                    m.other = MyNS_KlassTwo()
+                end sub
+                function __MyNS_KlassOne_builder()
+                    instance = {}
+                    instance.new = __MyNS_KlassOne_method_new
+                    return instance
+                end function
+                function MyNS_KlassOne()
+                    instance = __MyNS_KlassOne_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __MyNS_KlassTwo_method_new()
+                end sub
+                function __MyNS_KlassTwo_builder()
+                    instance = {}
+                    instance.new = __MyNS_KlassTwo_method_new
+                    return instance
+                end function
+                function MyNS_KlassTwo()
+                    instance = __MyNS_KlassTwo_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+
+        it('works with enums as field initial values inside a namespace', async () => {
+            await testTranspile(`
                 namespace MyNS
                     class HasEnumKlass
                         enumValue = MyEnum.A
@@ -1007,19 +1062,21 @@ describe('BrsFile BrighterScript classes', () => {
             `, 'trim', 'source/main.bs');
         });
 
-        it('allows enums as super args inside a namespace', () => {
-            testTranspile(`
+        it('allows enums as super args inside a namespace', async () => {
+            await testTranspile(`
                 namespace MyNS
                     class SubKlass extends SuperKlass
                         sub new()
                             super(MyEnum.B)
                         end sub
                     end class
+
                     class SuperKlass
-                        sub new(enumVal)
+                        sub new(enumVal as MyEnum)
                             print enumVal
                         end sub
                     end class
+
                     enum MyEnum
                         A = "A"
                         B = "B"
@@ -1040,7 +1097,7 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new()
                     return instance
                 end function
-                sub __MyNS_SuperKlass_method_new(enumVal)
+                sub __MyNS_SuperKlass_method_new(enumVal as dynamic)
                     print enumVal
                 end sub
                 function __MyNS_SuperKlass_builder()
@@ -1048,7 +1105,7 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new = __MyNS_SuperKlass_method_new
                     return instance
                 end function
-                function MyNS_SuperKlass(enumVal)
+                function MyNS_SuperKlass(enumVal as dynamic)
                     instance = __MyNS_SuperKlass_builder()
                     instance.new(enumVal)
                     return instance
@@ -1056,12 +1113,11 @@ describe('BrsFile BrighterScript classes', () => {
             `, 'trim', 'source/main.bs');
         });
 
-
-        it('works with enums as values referenced in a namespace directly', () => {
-            testTranspile(`
+        it('works with enums as values referenced in a namespace directly', async () => {
+            await testTranspile(`
                 namespace MyNS
                     class HasEnumKlass
-                        myArray = [true, true]
+                        myArray = [true, true] as boolean[]
                         sub new()
                             m.myArray[MyEnum.A] = true
                             m.myArray[MyEnum.B] = false
@@ -1094,11 +1150,11 @@ describe('BrsFile BrighterScript classes', () => {
             `, 'trim', 'source/main.bs');
         });
 
-        it('works with enums as values referenced in a namespace with namespace', () => {
-            testTranspile(`
+        it('works with enums as values referenced in a namespace with namespace', async () => {
+            await testTranspile(`
                 namespace MyNS
                     class HasEnumKlass
-                        myArray = [true, true]
+                        myArray = [true, true] as boolean[]
                         sub new()
                             m.myArray[MyNS.MyEnum.A] = true
                             m.myArray[MyNS.MyEnum.B] = false
@@ -1131,6 +1187,193 @@ describe('BrsFile BrighterScript classes', () => {
             `, 'trim', 'source/main.bs');
         });
 
+        it('allows namespaced class function as function parameters', async () => {
+            await testTranspile(`
+                namespace Alpha
+                    function foo()
+                        return 1
+                    end function
+
+                    function callSomeFunc(f as function)
+                        return f()
+                    end function
+
+                    sub callFoo()
+                        callSomeFunc(foo)
+                    end sub
+                end namespace
+            `, `
+                function Alpha_foo()
+                    return 1
+                end function
+
+                function Alpha_callSomeFunc(f as function)
+                    return f()
+                end function
+
+                sub Alpha_callFoo()
+                    Alpha_callSomeFunc(Alpha_foo)
+                end sub
+            `, 'trim', 'source/main.bs');
+        });
+
+        it('allows namespaced class constructors as function parameters', async () => {
+            await testTranspile(`
+                namespace Alpha
+                    class Button
+                    end class
+
+                    function callSomeFunc(f as function)
+                        return f()
+                    end function
+
+                    sub makeButton()
+                        callSomeFunc(Button)
+                    end sub
+                end namespace
+            `, `
+                sub __Alpha_Button_method_new()
+                end sub
+                function __Alpha_Button_builder()
+                    instance = {}
+                    instance.new = __Alpha_Button_method_new
+                    return instance
+                end function
+                function Alpha_Button()
+                    instance = __Alpha_Button_builder()
+                    instance.new()
+                    return instance
+                end function
+
+                function Alpha_callSomeFunc(f as function)
+                    return f()
+                end function
+
+                sub Alpha_makeButton()
+                    Alpha_callSomeFunc(Alpha_Button)
+                end sub
+            `, 'trim', 'source/main.bs');
+        });
+
+        it('allows class constructors as functions in array', async () => {
+            await testTranspile(`
+                namespace Alpha
+                    class Button
+                    end class
+
+                    class ButtonContainer
+                        private button = new Alpha.Button()
+
+                        sub new()
+                            m.init()
+                        end sub
+
+                        sub init()
+                            button = new Alpha.Button()
+                            items = [m.button, button, Alpha.Button]
+                        end sub
+                    end class
+                end namespace
+            `, `
+                sub __Alpha_Button_method_new()
+                end sub
+                function __Alpha_Button_builder()
+                    instance = {}
+                    instance.new = __Alpha_Button_method_new
+                    return instance
+                end function
+                function Alpha_Button()
+                    instance = __Alpha_Button_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __Alpha_ButtonContainer_method_new()
+                    m.button = Alpha_Button()
+                    m.init()
+                end sub
+                sub __Alpha_ButtonContainer_method_init()
+                    button = Alpha_Button()
+                    items = [
+                        m.button
+                        button
+                        Alpha_Button
+                    ]
+                end sub
+                function __Alpha_ButtonContainer_builder()
+                    instance = {}
+                    instance.new = __Alpha_ButtonContainer_method_new
+                    instance.init = __Alpha_ButtonContainer_method_init
+                    return instance
+                end function
+                function Alpha_ButtonContainer()
+                    instance = __Alpha_ButtonContainer_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+
+
+        it('puts leading comments from methods in correct place', async () => {
+            await testTranspile(`
+                    class Duck
+                        ' hatch from egg
+                        sub new()
+                        end sub
+                        ' it must be a duck
+                        sub quack()
+                            ' what does a duck say?
+                            print "quack"
+                        end sub
+                    end class
+                `, `
+                    ' hatch from egg
+                    sub __Duck_method_new()
+                    end sub
+                    ' it must be a duck
+                    sub __Duck_method_quack()
+                        ' what does a duck say?
+                        print "quack"
+                    end sub
+                    function __Duck_builder()
+                        instance = {}
+                        ' hatch from egg
+                        instance.new = __Duck_method_new
+                        ' it must be a duck
+                        instance.quack = __Duck_method_quack
+                        return instance
+                    end function
+                    function Duck()
+                        instance = __Duck_builder()
+                        instance.new()
+                        return instance
+                    end function
+                `, undefined, 'source/main.bs');
+        });
+
+        it('puts leading comments from fields in correct place', async () => {
+            await testTranspile(`
+                    class Duck
+                        ' what kind of duck?
+                        type as string = "mallard"
+                    end class
+                `, `
+                    sub __Duck_method_new()
+                        ' what kind of duck?
+                        m.type = "mallard"
+                    end sub
+                    function __Duck_builder()
+                        instance = {}
+                        instance.new = __Duck_method_new
+                        return instance
+                    end function
+                    function Duck()
+                        instance = __Duck_builder()
+                        instance.new()
+                        return instance
+                    end function
+                `, undefined, 'source/main.bs');
+        });
     });
 
     it('detects using `new` keyword on non-classes', () => {
@@ -1143,7 +1386,7 @@ describe('BrsFile BrighterScript classes', () => {
         `);
         program.validate();
         expectDiagnostics(program, [
-            DiagnosticMessages.expressionIsNotConstructable('sub')
+            DiagnosticMessages.expressionIsNotConstructable('quack')
         ]);
     });
 
@@ -1164,20 +1407,6 @@ describe('BrsFile BrighterScript classes', () => {
         ]);
     });
 
-    it.skip('detects calls to unknown m methods', () => {
-        program.setFile('source/main.bs', `
-            class Animal
-                sub new()
-                    m.methodThatDoesNotExist()
-                end sub
-            end class
-        `);
-        program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.methodDoesNotExistOnType('methodThatDoesNotExist', 'Animal')
-        ]);
-    });
-
     it('detects direct circular extends', () => {
         //direct
         program.setFile('source/Direct.bs', `
@@ -1191,14 +1420,14 @@ describe('BrsFile BrighterScript classes', () => {
         expect(
             program.getDiagnostics().map(x => x.message).sort()
         ).to.eql([
-            DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Child'], 'source').message,
-            DiagnosticMessages.circularReferenceDetected(['Parent', 'Child', 'Parent'], 'source').message
+            DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Child']).message,
+            DiagnosticMessages.circularReferenceDetected(['Parent', 'Child', 'Parent']).message
         ]);
     });
 
     it('detects indirect circular extends', () => {
         //direct
-        program.addOrReplaceFile('source/Indirect.bs', `
+        program.setFile('source/Indirect.bs', `
             class Parent extends Grandchild
             end class
 
@@ -1212,9 +1441,9 @@ describe('BrsFile BrighterScript classes', () => {
         expect(
             program.getDiagnostics().map(x => x.message).sort()
         ).to.eql([
-            DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Grandchild', 'Child'], 'source').message,
-            DiagnosticMessages.circularReferenceDetected(['Grandchild', 'Child', 'Parent', 'Grandchild'], 'source').message,
-            DiagnosticMessages.circularReferenceDetected(['Parent', 'Grandchild', 'Child', 'Parent'], 'source').message
+            DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Grandchild', 'Child']).message,
+            DiagnosticMessages.circularReferenceDetected(['Grandchild', 'Child', 'Parent', 'Grandchild']).message,
+            DiagnosticMessages.circularReferenceDetected(['Parent', 'Grandchild', 'Child', 'Parent']).message
         ]);
     });
 
@@ -1232,11 +1461,11 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             end class
         `);
-        await program.transpile([], stagingDir);
-        fsExtra.emptyDirSync(stagingDir);
-        await program.transpile([], stagingDir);
+        await program.build({ outDir: outDir });
+        fsExtra.emptyDirSync(outDir);
+        await program.build({ outDir: outDir });
         expect(
-            fsExtra.readFileSync(s`${stagingDir}/source/lib.brs`).toString().trimEnd()
+            fsExtra.readFileSync(s`${outDir}/source/lib.brs`).toString().trimEnd()
         ).to.eql(trim`
             sub __Being_method_new()
             end sub
@@ -1292,16 +1521,16 @@ describe('BrsFile BrighterScript classes', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.duplicateIdentifier('name'),
-            range: Range.create(3, 23, 3, 27)
+            location: { range: Range.create(3, 23, 3, 27) }
         }, {
             ...DiagnosticMessages.duplicateIdentifier('name'),
-            range: Range.create(4, 27, 4, 31)
+            location: { range: Range.create(4, 27, 4, 31) }
         }, {
             ...DiagnosticMessages.duplicateIdentifier('age'),
-            range: Range.create(8, 27, 8, 30)
+            location: { range: Range.create(8, 27, 8, 30) }
         }, {
             ...DiagnosticMessages.duplicateIdentifier('age'),
-            range: Range.create(10, 23, 10, 26)
+            location: { range: Range.create(10, 23, 10, 26) }
         }]);
     });
 
@@ -1318,7 +1547,7 @@ describe('BrsFile BrighterScript classes', () => {
         `);
         program.validate();
         expectDiagnostics(program, [
-            DiagnosticMessages.classChildMemberDifferentMemberTypeThanAncestor('method', 'field', 'Animal')
+            DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Animal', 'name', 'function name() as dynamic', 'dynamic')
         ]);
     });
 
@@ -1356,15 +1585,14 @@ describe('BrsFile BrighterScript classes', () => {
                 public owner as Person
             end class
             class Duck extends Bird
-                public age = 12.2 'should be integer but is float
+                public age = 12.2 'should be integer, but a float can be assigned to an int
                 public name = 12 'should be string but is integer
                 public owner as string
             end class
         `);
         program.validate();
         expectDiagnostics(program, [
-            DiagnosticMessages.cannotFindType('Person'),
-            DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'age', 'float', 'integer'),
+            DiagnosticMessages.cannotFindName('Person'),
             DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'name', 'integer', 'string'),
             DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'owner', 'string', 'Person')
         ]);
@@ -1453,7 +1681,7 @@ describe('BrsFile BrighterScript classes', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.cannotFindName('Animal'),
-                range: Range.create(1, 35, 1, 41)
+                location: { range: Range.create(1, 35, 1, 41) }
             }]);
         });
 
@@ -1504,9 +1732,9 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            expectDiagnostics(program, [
-                DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird')
-            ]);
+            expectDiagnostics(program, [{
+                ...DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird', 'Vertibrates', 'namespace')
+            }]);
         });
 
         it('namespaced parent class from inside namespace', () => {
@@ -1525,12 +1753,9 @@ describe('BrsFile BrighterScript classes', () => {
                 end namespace
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird'),
-                relatedInformation: [{
-                    message: `Not defined in scope 'source'`
-                }]
-            }]);
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird', 'Vertibrates', 'namespace').message
+            ]);
         });
     });
 
@@ -1546,8 +1771,9 @@ describe('BrsFile BrighterScript classes', () => {
             end sub
         `);
         program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.cannotFindName('Duck')
+        expectDiagnosticsIncludes(program, [
+            DiagnosticMessages.cannotFindFunction('Duck').message,
+            DiagnosticMessages.expressionIsNotConstructable('Duck')
         ]);
     });
 
@@ -1576,7 +1802,7 @@ describe('BrsFile BrighterScript classes', () => {
         `);
         program.validate();
         expectDiagnostics(program, [
-            DiagnosticMessages.cannotFindName('AnimalNotDefined', 'NameA.NameB.AnimalNotDefined')
+            DiagnosticMessages.cannotFindName('AnimalNotDefined', 'NameA.NameB.AnimalNotDefined', 'NameA.NameB', 'namespace')
         ]);
     });
 
@@ -1601,8 +1827,8 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.duplicateClassDeclaration('source', 'Animal')
+        expectDiagnosticsIncludes(program, [
+            DiagnosticMessages.nameCollision('Class', 'Class', 'Animal')
         ]);
     });
 
@@ -1616,24 +1842,29 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
         program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.duplicateClassDeclaration('source', 'NameA.NameB.Animal')
+        expectDiagnosticsIncludes(program, [
+            DiagnosticMessages.nameCollision('Class', 'Class', 'NameA.NameB.Animal').message
         ]);
     });
 
-    it('catches namespaced class name which is the same as a global class', () => {
+    it('allows namespaced class name which is the same as a global class', () => {
         program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Animal
+                    name as string
                 end class
+
+                sub printThisAnimalName(ani as Animal) ' this refers to NameA.NameB.Animal
+                    print ani.name
+                end sub
             end namespace
+
             class Animal
+                doesNotHaveName as string
             end class
         `);
         program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.namespacedClassCannotShareNamewithNonNamespacedClass('Animal').message
-        ]);
+        expectZeroDiagnostics(program);
     });
 
     it('catches class with same name as function', () => {
@@ -1645,7 +1876,8 @@ describe('BrsFile BrighterScript classes', () => {
         `);
         program.validate();
         expectDiagnostics(program, [
-            DiagnosticMessages.functionCannotHaveSameNameAsClass('Animal').message
+            DiagnosticMessages.nameCollision('Class', 'Function', 'Animal').message,
+            DiagnosticMessages.nameCollision('Function', 'Class', 'Animal').message
         ]);
     });
 
@@ -1657,8 +1889,9 @@ describe('BrsFile BrighterScript classes', () => {
             end sub
         `);
         program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.functionCannotHaveSameNameAsClass('animal').message
+        expectDiagnosticsIncludes(program, [
+            DiagnosticMessages.nameCollision('Class', 'Function', 'animal').message,
+            DiagnosticMessages.nameCollision('Function', 'Class', 'ANIMAL').message
         ]);
     });
 
@@ -1672,7 +1905,7 @@ describe('BrsFile BrighterScript classes', () => {
         `);
         program.validate();
         expectDiagnostics(program, [
-            DiagnosticMessages.localVarSameNameAsClass('Animal').message
+            DiagnosticMessages.localVarShadowedByScopedFunction().message
         ]);
     });
 
@@ -1708,7 +1941,7 @@ describe('BrsFile BrighterScript classes', () => {
         expectZeroDiagnostics(program);
     });
 
-    it('computes correct super index for grandchild class', () => {
+    it('computes correct super index for grandchild class', async () => {
         program.setFile('source/main.bs', `
             sub Main()
                 c = new App.ClassC()
@@ -1723,7 +1956,7 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
 
-        testTranspile(`
+        await testTranspile(`
             namespace App
                 class ClassC extends ClassB
                     sub new()
@@ -1749,13 +1982,13 @@ describe('BrsFile BrighterScript classes', () => {
         `, 'trim', 'source/App.ClassC.bs');
     });
 
-    it('computes correct super index for namespaced child class and global parent class', () => {
+    it('computes correct super index for namespaced child class and global parent class', async () => {
         program.setFile('source/ClassA.bs', `
             class ClassA
             end class
         `);
 
-        testTranspile(`
+        await testTranspile(`
             namespace App
                 class ClassB extends ClassA
                 end class
@@ -1784,7 +2017,8 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         doesNotThrow(() => {
-            file.parser.references.classStatements[0]['getParentClassIndex'](new BrsTranspileState(file));
+            const classStatements = file.ast.findChildren<ClassStatement>(isClassStatement);
+            classStatements[0]['getParentClassIndex'](new BrsTranspileState(file));
         });
     });
 
@@ -1814,8 +2048,8 @@ describe('BrsFile BrighterScript classes', () => {
         program.validate();
     });
 
-    it('extending namespaced class transpiles properly', () => {
-        testTranspile(`
+    it('extending namespaced class transpiles properly', async () => {
+        await testTranspile(`
             namespace App
                 class CoreClass
                     sub new()
@@ -1892,7 +2126,7 @@ describe('BrsFile BrighterScript classes', () => {
         `);
     });
 
-    it.skip('detects calling class constructors with too many parameters', () => {
+    it('detects calling class constructors with too many parameters', () => {
         program.setFile('source/main.bs', `
             class Parameterless
                 sub new()
diff --git a/src/files/BrsFile.spec.ts b/src/files/BrsFile.spec.ts
index 8afcff41a..3398220c3 100644
--- a/src/files/BrsFile.spec.ts
+++ b/src/files/BrsFile.spec.ts
@@ -1,33 +1,35 @@
 import { assert, expect } from '../chai-config.spec';
 import * as path from 'path';
 import * as sinonImport from 'sinon';
-import { CompletionItemKind, Position, Range } from 'vscode-languageserver';
-import type { BsDiagnostic, Callable, CommentFlag, VariableDeclaration } from '../interfaces';
+import { Position, Range } from 'vscode-languageserver';
+import type { Callable, CommentFlag, VariableDeclaration } from '../interfaces';
 import { Program } from '../Program';
-import { BooleanType } from '../types/BooleanType';
 import { DynamicType } from '../types/DynamicType';
-import { FunctionType } from '../types/FunctionType';
+import { TypedFunctionType } from '../types/TypedFunctionType';
 import { IntegerType } from '../types/IntegerType';
 import { StringType } from '../types/StringType';
 import { BrsFile } from './BrsFile';
 import { SourceMapConsumer } from 'source-map';
-import { Lexer } from '../lexer/Lexer';
-import { TokenKind, Keywords } from '../lexer/TokenKind';
+import { TokenKind } from '../lexer/TokenKind';
 import { DiagnosticMessages } from '../DiagnosticMessages';
-import type { StandardizedFileEntry } from 'roku-deploy';
 import util, { standardizePath as s } from '../util';
-import PluginInterface from '../PluginInterface';
-import { expectCompletionsIncludes, expectDiagnostics, expectDiagnosticsIncludes, expectHasDiagnostics, expectZeroDiagnostics, getTestGetTypedef, getTestTranspile, trim, trimMap } from '../testHelpers.spec';
+import { expectDiagnostics, expectHasDiagnostics, expectTypeToBe, expectZeroDiagnostics, expectDiagnosticsIncludes, getTestGetTypedef, getTestTranspile, trim, trimMap } from '../testHelpers.spec';
 import { ParseMode, Parser } from '../parser/Parser';
-import { createLogger } from '../logging';
-import { ImportStatement } from '../parser/Statement';
-import { createToken } from '../astUtils/creators';
+import { Block, FunctionStatement } from '../parser/Statement';
+import { ImportStatement, PrintStatement } from '../parser/Statement';
+import { createIdentifier, createStringLiteral, createToken } from '../astUtils/creators';
 import * as fsExtra from 'fs-extra';
-import { URI } from 'vscode-uri';
 import undent from 'undent';
 import { tempDir, rootDir } from '../testHelpers.spec';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { ClassType, EnumType, FloatType, InterfaceType } from '../types';
+import type { StandardizedFileEntry } from 'roku-deploy';
 import * as fileUrl from 'file-url';
-import { LiteralExpression } from '../parser/Expression';
+import type { AALiteralExpression } from '../parser/Expression';
+import { CallExpression, FunctionExpression, LiteralExpression } from '../parser/Expression';
+import { Logger } from '@rokucommunity/logger';
+import { isFunctionExpression, isAALiteralExpression, isBlock, isBrsFile } from '../astUtils/reflection';
+import { createVisitor, WalkMode } from '../astUtils/visitors';
 
 let sinon = sinonImport.createSandbox();
 
@@ -39,16 +41,61 @@ describe('BrsFile', () => {
     let testTranspile = getTestTranspile(() => [program, rootDir]);
     let testGetTypedef = getTestGetTypedef(() => [program, rootDir]);
 
+    function validateFile(...files: BrsFile[]) {
+        for (const file of files) {
+            program.plugins.emit('validateFile', { program: program, file: file });
+        }
+        for (const file of files) {
+            program.plugins.emit('afterValidateFile', { program: program, file: file });
+        }
+
+    }
+
     beforeEach(() => {
         fsExtra.emptyDirSync(tempDir);
         program = new Program({ rootDir: rootDir, sourceMap: true });
-        file = new BrsFile(srcPath, destPath, program);
+        file = new BrsFile({
+            srcPath: srcPath,
+            destPath: destPath,
+            program: program
+        });
     });
     afterEach(() => {
         sinon.restore();
         program.dispose();
     });
 
+    describe('constructor', () => {
+        it('calculates correct paths when no pkgPath specified', () => {
+            expect(
+                new BrsFile({
+                    srcPath: s`${rootDir}/source/main.bs`,
+                    destPath: s`source/main.bs`,
+                    program: program
+                })
+            ).to.include({
+                srcPath: s`${rootDir}/source/main.bs`,
+                destPath: s`source/main.bs`,
+                pkgPath: s`source/main.brs`
+            });
+        });
+
+        it('uses supplied pkgPath', () => {
+            expect(
+                new BrsFile({
+                    srcPath: s`${rootDir}/source/main.bs`,
+                    destPath: s`source/main.bs`,
+                    pkgPath: s`source/main.transpiled.brs`,
+                    program: program
+                })
+            ).to.include({
+                srcPath: s`${rootDir}/source/main.bs`,
+                destPath: s`source/main.bs`,
+                pkgPath: s`source/main.transpiled.brs`
+            });
+        });
+    });
+
     describe('dispose', () => {
         it('does not crash the program after it has been disposed', () => {
             const file = program.setFile('source/main.bs', `sub main(): end sub`);
@@ -92,7 +139,7 @@ describe('BrsFile', () => {
             program.validate();
             expectDiagnosticsIncludes(program, [
                 DiagnosticMessages.unexpectedToken('\n'),
-                DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                DiagnosticMessages.expectedStatement()
             ]);
         });
 
@@ -107,8 +154,8 @@ describe('BrsFile', () => {
             expectZeroDiagnostics(program);
         });
 
-        it('transpiles binary operator continuation in .bs files to a single line', () => {
-            testTranspile(`
+        it('transpiles binary operator continuation in .bs files to a single line', async () => {
+            await testTranspile(`
                 sub main()
                     result = 1 +
                              2
@@ -146,8 +193,8 @@ describe('BrsFile', () => {
             program.validate();
             expectDiagnosticsIncludes(program, [
                 DiagnosticMessages.unexpectedToken('\n'),
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
-                DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments'),
+                DiagnosticMessages.expectedStatement()
             ]);
         });
 
@@ -196,8 +243,8 @@ describe('BrsFile', () => {
             expectZeroDiagnostics(program);
         });
 
-        it('transpiles multi-line function call args in .bs files to a single line', () => {
-            testTranspile(`
+        it('transpiles multi-line function call args in .bs files to a single line', async () => {
+            await testTranspile(`
                 sub main()
                     foo(
                         1,
@@ -268,7 +315,7 @@ describe('BrsFile', () => {
             program.validate();
             expectDiagnosticsIncludes(program, [
                 DiagnosticMessages.unexpectedToken('\n'),
-                DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                DiagnosticMessages.expectedStatement()
             ]);
         });
 
@@ -303,8 +350,8 @@ describe('BrsFile', () => {
             program.validate();
             expectDiagnosticsIncludes(program, [
                 DiagnosticMessages.unexpectedToken('\n'),
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
-                DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments'),
+                DiagnosticMessages.expectedStatement()
             ]);
         });
 
@@ -332,7 +379,7 @@ describe('BrsFile', () => {
         program.validate();
         expectDiagnostics(program, [
             {
-                range: util.createRange(2, 22, 2, 31),
+                location: { range: util.createRange(2, 22, 2, 31) },
                 message: DiagnosticMessages.propAccessNotPermittedAfterFunctionCallInExpressionStatement('Property').message
             }
         ]);
@@ -349,7 +396,7 @@ describe('BrsFile', () => {
         program.validate();
         expectDiagnostics(program, [
             {
-                range: util.createRange(2, 22, 2, 34),
+                location: { range: util.createRange(2, 22, 2, 34) },
                 message: DiagnosticMessages.propAccessNotPermittedAfterFunctionCallInExpressionStatement('Index').message
             }
         ]);
@@ -366,7 +413,7 @@ describe('BrsFile', () => {
         program.validate();
         expectDiagnostics(program, [
             {
-                range: util.createRange(2, 22, 2, 31),
+                location: { range: util.createRange(2, 22, 2, 31) },
                 message: DiagnosticMessages.propAccessNotPermittedAfterFunctionCallInExpressionStatement('XML attribute').message
             }
         ]);
@@ -389,7 +436,7 @@ describe('BrsFile', () => {
     });
 
     it('flags namespaces used as variables', () => {
-        program.setFile('source/main.bs', `
+        const file = program.setFile('source/main.bs', `
             sub main()
                 alpha.beta.charlie.test()
                 print alpha
@@ -409,13 +456,13 @@ describe('BrsFile', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
-            range: util.createRange(3, 22, 3, 27)
+            location: util.createLocationFromFileRange(file, util.createRange(3, 22, 3, 27))
         }, {
             ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
-            range: util.createRange(4, 22, 4, 32)
+            location: util.createLocationFromFileRange(file, util.createRange(4, 22, 4, 32))
         }, {
             ...DiagnosticMessages.itemCannotBeUsedAsVariable('namespace'),
-            range: util.createRange(5, 22, 5, 40)
+            location: util.createLocationFromFileRange(file, util.createRange(5, 22, 5, 40))
         }]);
     });
 
@@ -436,6 +483,66 @@ describe('BrsFile', () => {
         expectZeroDiagnostics(program);
     });
 
+    it('flags enums used as variables', () => {
+        program.setFile('source/main.bs', `
+            enum Foo
+                bar
+                baz
+            end enum
+
+            sub main()
+                print getFooValue()
+                print getFoo()
+            end sub
+
+            function getFoo() as Foo
+                return Foo ' Error - cannot return an enum, just an enum value
+            end function
+
+            function getFooValue() as Foo
+                return Foo.bar
+            end function
+        `);
+        program.validate();
+        expectDiagnostics(program, [DiagnosticMessages.itemCannotBeUsedAsVariable('enum').message]);
+    });
+
+    it('does not crazy during validation with unique binary operator', () => {
+        //monitor the logging system, if we detect an error, this test fails
+        const spy = sinon.spy(Logger.prototype, 'error');
+        const file = program.setFile<BrsFile>('source/main.bs', `
+            namespace date
+                function timeElapsedInDay()
+                    time = 1
+                    if true then
+                        time = getInteger()
+                    end if
+                    clockSeconds = getInteger() + 1
+                    assumedMidnight = time - clockSeconds
+                    offset = assumedMidnight - 1
+                end function
+
+                function getInteger()
+                    return 1
+                end function
+            end namespace
+
+        `);
+        program.validate();
+        expectZeroDiagnostics(program);
+        expect(
+            spy.getCalls().map(x => (x.args?.[0] as string)?.toString()).filter(x => x?.includes('Error when calling plugin'))
+        ).to.eql([]);
+
+        // Check the result type too
+        const sourceScope = program.getScopeByName('source');
+        sourceScope.linkSymbolTable();
+        const timeElapsedFunc = file.ast.findChild<FunctionExpression>(isFunctionExpression);
+        const symbolTable = timeElapsedFunc.body.getSymbolTable();
+        const offsetType = symbolTable.getSymbolType('offset', { flags: SymbolTypeFlag.runtime });
+        expectTypeToBe(offsetType, IntegerType);
+    });
+
     it('supports the third parameter in CreateObject', () => {
         program.setFile('source/main.brs', `
             sub main()
@@ -478,32 +585,33 @@ describe('BrsFile', () => {
 
     it('sets needsTranspiled to true for .bs files', () => {
         //BrightScript
-        expect(new BrsFile(`${rootDir}/source/main.brs`, 'source/main.brs', program).needsTranspiled).to.be.false;
+        expect(new BrsFile({
+            srcPath: `${rootDir}/source/main.brs`,
+            destPath: 'source/main.brs',
+            program: program
+        })['needsTranspiled']).to.be.false;
         //BrighterScript
-        expect(new BrsFile(`${rootDir}/source/main.bs`, 'source/main.bs', program).needsTranspiled).to.be.true;
+        expect(new BrsFile({
+            srcPath: `${rootDir}/source/main.bs`,
+            destPath: 'source/main.bs',
+            program: program
+        })['needsTranspiled']).to.be.true;
     });
 
     it('computes new import statements after clearing parser references', () => {
         const file = program.setFile<BrsFile>('source/main.bs', ``);
         expect(file.ownScriptImports).to.be.empty;
         file.parser.ast.statements.push(
-            new ImportStatement(createToken(TokenKind.Import), createToken(TokenKind.StringLiteral, 'pkg:/source/lib.brs'))
+            new ImportStatement({
+                import: createToken(TokenKind.Import),
+                path: createToken(TokenKind.StringLiteral, 'pkg:/source/lib.brs')
+            })
         );
         expect(file.ownScriptImports).to.be.empty;
-        file.parser.invalidateReferences();
+        file['_cachedLookups'].invalidate();
         expect(file.ownScriptImports.map(x => x.text)).to.eql(['pkg:/source/lib.brs']);
     });
 
-    it('allows adding diagnostics', () => {
-        const expected: BsDiagnostic[] = [{
-            message: 'message',
-            file: undefined as any,
-            range: undefined as any
-        }];
-        file.addDiagnostics(expected);
-        expectDiagnostics(file, expected);
-    });
-
     describe('getPartialVariableName', () => {
         let entry = {
             src: `${rootDir}/source/lib.brs`,
@@ -588,268 +696,6 @@ describe('BrsFile', () => {
         });
     });
 
-    describe('getCompletions', () => {
-        it('does not crash for callfunc on a function call', () => {
-            const file = program.setFile('source/main.brs', `
-                sub main()
-                    getManager()@.
-                end sub
-            `);
-            expect(() => {
-                program.getCompletions(file.srcPath, util.createPosition(2, 34));
-            }).not.to.throw;
-        });
-
-        it('suggests pkg paths in strings that match that criteria', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    print "pkg:"
-                end sub
-            `);
-            const result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 31));
-            const names = result.map(x => x.label);
-            expect(names.sort()).to.eql([
-                'pkg:/source/main.brs'
-            ]);
-        });
-
-        it('suggests libpkg paths in strings that match that criteria', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    print "libpkg:"
-                end sub
-            `);
-            const result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 31));
-            const names = result.map(x => x.label);
-            expect(names.sort()).to.eql([
-                'libpkg:/source/main.brs'
-            ]);
-        });
-
-        it('suggests pkg paths in template strings', () => {
-            program.setFile('source/main.brs', `
-                sub main()
-                    print \`pkg:\`
-                end sub
-            `);
-            const result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 31));
-            const names = result.map(x => x.label);
-            expect(names.sort()).to.eql([
-                'pkg:/source/main.brs'
-            ]);
-        });
-
-        it('waits for the file to be processed before collecting completions', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main()
-                    print "hello"
-                    Say
-                end sub
-
-                sub SayHello()
-                end sub
-            `);
-
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 23));
-            let names = result.map(x => x.label);
-            expect(names).to.includes('Main');
-            expect(names).to.includes('SayHello');
-        });
-
-        it('includes every type of item at base level', () => {
-            program.setFile('source/main.bs', `
-                sub main()
-                    print
-                end sub
-                sub speak()
-                end sub
-                namespace stuff
-                end namespace
-                class Person
-                end class
-                enum Direction
-                end enum
-            `);
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 26)), [{
-                label: 'main',
-                kind: CompletionItemKind.Function
-            }, {
-                label: 'speak',
-                kind: CompletionItemKind.Function
-            }, {
-                label: 'stuff',
-                kind: CompletionItemKind.Module
-            }, {
-                label: 'Person',
-                kind: CompletionItemKind.Class
-            }, {
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
-        });
-
-        describe('namespaces', () => {
-            it('gets full namespace completions at any point through the leading identifier', () => {
-                program.setFile('source/main.bs', `
-                    sub main()
-                        foo.bar
-                    end sub
-
-                    namespace foo.bar
-                    end namespace
-
-                    class Person
-                    end class
-                `);
-
-                const result = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(2, 24)).map(x => x.label);
-                expect(result).includes('main');
-                expect(result).includes('foo');
-                expect(result).includes('Person');
-            });
-
-            it('gets namespace completions', () => {
-                program.setFile('source/main.bs', `
-                    namespace foo.bar
-                        function sayHello()
-                        end function
-                    end namespace
-
-                    sub Main()
-                        print "hello"
-                        foo.ba
-                        foo.bar.
-                    end sub
-                `);
-
-                let result = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(8, 30));
-                let names = result.map(x => x.label);
-                expect(names).to.includes('bar');
-
-                result = program.getCompletions(`${rootDir}/source/main.bs`, Position.create(9, 32));
-                names = result.map(x => x.label);
-                expect(names).to.includes('sayHello');
-            });
-        });
-
-        it('always includes `m`', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main()
-
-                end sub
-            `);
-
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 23));
-            let names = result.map(x => x.label);
-            expect(names).to.contain('m');
-        });
-
-        it('does not fail for missing previousToken', () => {
-            //add a single character to the file, and get completions after it
-            program.setFile('source/main.brs', `i`);
-            expect(() => {
-                program.getCompletions(`${rootDir}/source/main.brs`, Position.create(0, 1)).map(x => x.label);
-            }).not.to.throw;
-        });
-
-        it('includes all keywords`', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main()
-
-                end sub
-            `);
-
-            let keywords = Object.keys(Keywords).filter(x => !x.includes(' '));
-
-            //inside the function
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 23));
-            let names = result.map(x => x.label);
-            for (let keyword of keywords) {
-                expect(names).to.include(keyword);
-            }
-
-            //outside the function
-            result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(4, 8));
-            names = result.map(x => x.label);
-            for (let keyword of keywords) {
-                expect(names).to.include(keyword);
-            }
-        });
-
-        it('does not provide completions within a comment', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main()
-                    'some comment
-                end sub
-            `);
-
-            //inside the function
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 33));
-            expect(result).to.be.lengthOf(0);
-        });
-
-        it('does not provide duplicate entries for variables', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main()
-                    name = "bob"
-                    age = 12
-                    name = "john"
-                end sub
-            `);
-
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 23));
-
-            let count = result.reduce((total, x) => {
-                return x.label === 'name' ? total + 1 : total;
-            }, 0);
-            expect(count).to.equal(1);
-        });
-
-        it('does not include `as` and `string` text options when used in function params', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main(name as string)
-
-                end sub
-            `);
-
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 23));
-            expect(result.filter(x => x.kind === CompletionItemKind.Text)).not.to.contain('as');
-            expect(result.filter(x => x.kind === CompletionItemKind.Text)).not.to.contain('string');
-        });
-
-        it('does not provide intellisense results when inside a comment', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main(name as string)
-                    'this is a comment
-                end sub
-            `);
-
-            let results = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(2, 30));
-            expect(results).to.be.empty;
-        });
-
-        it('does provide intellisence for labels only after a goto keyword', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.setFile('source/main.brs', `
-                sub Main(name as string)
-                    something:
-                    goto \nend sub
-            `);
-
-            let results = program.getCompletions(`${rootDir}/source/main.brs`, Position.create(3, 25));
-            expect(results.length).to.equal(1);
-            expect(results[0]?.label).to.equal('something');
-        });
-
-    });
-
     describe('comment flags', () => {
         describe('bs:disable-next-line', () => {
             it('disables critical diagnostic issues', () => {
@@ -937,19 +783,17 @@ describe('BrsFile', () => {
                     sub main()
                         something = true 'bs:disable-line: LINT1005
                     end sub
-                `);
-                file.addDiagnostics([{
+                `) as BrsFile;
+                program.diagnostics.register({
                     code: 'LINT1005',
-                    file: file,
                     message: 'Something is not right',
-                    range: util.createRange(2, 16, 2, 26)
-                }]);
-                const scope = program.getScopesForFile(file)[0];
-                expectZeroDiagnostics(scope);
+                    location: util.createLocationFromFileRange(file, util.createRange(2, 16, 2, 26))
+                });
+                expectZeroDiagnostics(program);
             });
 
             it('adds diagnostics for unknown numeric diagnostic codes', () => {
-                program.setFile('source/main.brs', `
+                const file = program.setFile('source/main.brs', `
                     sub main()
                         print "hi" 'bs:disable-line: 123456 999999   aaaab
                     end sub
@@ -958,13 +802,25 @@ describe('BrsFile', () => {
                 program.validate();
                 expectDiagnostics(program, [{
                     ...DiagnosticMessages.unknownDiagnosticCode(123456),
-                    range: Range.create(2, 53, 2, 59)
+                    location: util.createLocationFromFileRange(file, Range.create(2, 53, 2, 59))
                 }, {
                     ...DiagnosticMessages.unknownDiagnosticCode(999999),
-                    range: Range.create(2, 60, 2, 66)
+                    location: util.createLocationFromFileRange(file, Range.create(2, 60, 2, 66))
                 }]);
             });
 
+            it('recognizes diagnostic names', () => {
+                let file = program.setFile<BrsFile>({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                    sub Main()
+                        'bs:disable-next-line: cannot-find-name
+                        name = unknown
+                    end sub
+                `);
+                expect(file.commentFlags[0]).to.exist;
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
         });
 
         describe('bs:disable-line', () => {
@@ -986,7 +842,7 @@ describe('BrsFile', () => {
             });
 
             it('works for specific codes', () => {
-                program.setFile('source/main.brs', `
+                const file = program.setFile('source/main.brs', `
                     sub main()
                         'should not have any errors
                         DoSomething(1) 'bs:disable-line:1002
@@ -1000,7 +856,7 @@ describe('BrsFile', () => {
                 program.validate();
 
                 expectDiagnostics(program, [{
-                    range: Range.create(5, 24, 5, 35)
+                    location: util.createLocationFromFileRange(file, Range.create(5, 24, 5, 35))
                 }]);
             });
 
@@ -1089,27 +945,61 @@ describe('BrsFile', () => {
         });
 
         it('supports labels and goto statements', () => {
-            let file = program.setFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub Main()
                     'multiple goto statements on one line
                     goto myLabel : goto myLabel
                     myLabel:
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports empty print statements', () => {
-            let file = program.setFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                    print
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         describe('conditional compile', () => {
-            it('supports whitespace-separated directives', () => {
+
+            it('transpiles conditional compilation directives', async () => {
+                await testTranspile(`
+                    sub main()
+                        #const thing = true
+                        #if thing
+                            print "if"
+                        #elseif false
+                            print "elseif"
+                            #error crash
+                        #else
+                            print "else"
+                        #endif
+                    end sub
+                `);
+            });
+
+
+            it('transpiles conditional compilation directives with not', async () => {
+                await testTranspile(`
+                    sub main()
+                        #const thing = true
+                        #if not thing
+                            print "if"
+                        #elseif not false
+                            print "elseif"
+                        #else
+                            #error crash
+                            print "else"
+                        #endif
+                    end sub
+                `);
+            });
+
+            it('supports whitespace-separated directives', async () => {
                 const file = program.setFile<BrsFile>('source/main.bs', `
                     sub main()
                         #\t const thing=true
@@ -1124,9 +1014,17 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 expectZeroDiagnostics(program);
-                testTranspile(file.fileContents, `
+                await testTranspile(file.fileContents, `
                     sub main()
-                        print "if"
+                        #\t const thing = true
+                        #\t if thing
+                            print "if"
+                        #\t elseif false
+                            print "elseif"
+                            #\t error crash
+                        #\t else
+                            print "else"
+                        #\t endif
                     end sub
                 `);
             });
@@ -1153,7 +1051,7 @@ describe('BrsFile', () => {
             });
 
             it('works for upper case keywords', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #CONST someFlag = true
                         #IF someFlag
@@ -1165,11 +1063,12 @@ describe('BrsFile', () => {
                         #ENDIF
                     end sub
                 `);
-                expectZeroDiagnostics(file);
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
             it('supports single-word #elseif and #endif', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -1179,11 +1078,12 @@ describe('BrsFile', () => {
                         #endif
                     end sub
                 `);
-                expectZeroDiagnostics(file);
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
             it('supports multi-word #else if and #end if', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -1193,82 +1093,98 @@ describe('BrsFile', () => {
                         #end if
                     end sub
                 `);
-                expectZeroDiagnostics(file);
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
             it('does not choke on invalid code inside a false conditional compile', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #if false
                             non-commented code here should not cause parse errors
                         #end if
                     end sub
                 `);
-                expectZeroDiagnostics(file);
+                program.validate();
+                expectZeroDiagnostics(program);
             });
 
             it('detects syntax error in #if', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #if true1
                             print "true"
                         #end if
                     end sub
                 `);
-                expectDiagnostics(file, [
-                    DiagnosticMessages.referencedConstDoesNotExist()
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.hashConstDoesNotExist()
+                ]);
+            });
+
+            it('detects syntax error in #if not', () => {
+                program.setFile('source/main.brs', `
+                    sub main()
+                        #if not true1
+                            print "true"
+                        #end if
+                    end sub
+                `);
+                program.validate();
+                expectDiagnostics(program, [
+                    DiagnosticMessages.hashConstDoesNotExist()
                 ]);
             });
 
             it('detects syntax error in #const', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #if %
                             print "true"
                         #end if
                     end sub
                 `);
-                expectDiagnostics(file, [
+                expectDiagnostics(program, [
                     DiagnosticMessages.unexpectedCharacter('%'),
                     DiagnosticMessages.invalidHashIfValue()
                 ]);
             });
 
             it('detects #const name using reserved word', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #const function = true
                     end sub
                 `);
-                expectDiagnostics(file, [
-                    DiagnosticMessages.constNameCannotBeReservedWord(),
-                    DiagnosticMessages.unexpectedToken('#const')
+                expectDiagnostics(program, [
+                    DiagnosticMessages.cannotUseReservedWordAsIdentifier('function')
                 ]);
             });
 
             it('detects syntax error in #const', () => {
-                let file = program.setFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         #const someConst = 123
                     end sub
                 `);
-                expectDiagnostics(file, [
+                expectDiagnostics(program, [
                     DiagnosticMessages.invalidHashConstValue()
                 ]);
             });
         });
 
         it('supports stop statement', () => {
-            let file = program.setFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                    stop
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports single-line if statements', () => {
-            let file = program.setFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     if 1 < 2: return true: end if
                     if 1 < 2: return true
@@ -1278,7 +1194,7 @@ describe('BrsFile', () => {
                     if true then : test = sub() : print "yes" : end sub : end if
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports line_num as global variable', () => {
@@ -1287,7 +1203,7 @@ describe('BrsFile', () => {
                     print LINE_NUM
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports many keywords as object property names', () => {
@@ -1354,7 +1270,7 @@ describe('BrsFile', () => {
                     person.new = true
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
         it('does not error on numeric literal type designators', () => {
             file.parse(`
@@ -1368,7 +1284,7 @@ describe('BrsFile', () => {
                     print 9876543210&
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('does not error when encountering sub with return type', () => {
@@ -1377,7 +1293,7 @@ describe('BrsFile', () => {
                     return
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('does not lose function scopes when mismatched end sub', () => {
@@ -1415,7 +1331,7 @@ describe('BrsFile', () => {
                     foo.bar = true and false or 3 > 4
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('does not error with boolean in RHS of set statement', () => {
@@ -1429,7 +1345,7 @@ describe('BrsFile', () => {
                     m.isTrue = m.isTrue = m.isTrue
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports variable names ending with type designators', () => {
@@ -1442,7 +1358,7 @@ describe('BrsFile', () => {
                   someHex& = 13
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports multiple spaces between two-word keywords', () => {
@@ -1455,7 +1371,7 @@ describe('BrsFile', () => {
                     end if
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('does not error with `stop` as object key', () => {
@@ -1469,7 +1385,7 @@ describe('BrsFile', () => {
                     return obj
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('does not error with `run` as object key', () => {
@@ -1483,7 +1399,7 @@ describe('BrsFile', () => {
                     return obj
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports assignment operators', () => {
@@ -1501,7 +1417,7 @@ describe('BrsFile', () => {
                     print x
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports `then` as object property', () => {
@@ -1514,17 +1430,18 @@ describe('BrsFile', () => {
                     promise.then()
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports function as parameter type', () => {
             file.parse(`
                 sub Main()
                     doWork = function(callback as function)
+                        callback()
                     end function
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports increment operator', () => {
@@ -1534,7 +1451,7 @@ describe('BrsFile', () => {
                     x++
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports decrement operator', () => {
@@ -1544,7 +1461,7 @@ describe('BrsFile', () => {
                     x--
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports writing numbers with decimal but no trailing digit', () => {
@@ -1554,7 +1471,7 @@ describe('BrsFile', () => {
                     print x
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports assignment operators against object properties', () => {
@@ -1577,7 +1494,7 @@ describe('BrsFile', () => {
                     print m.age
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         //skipped until `brs` supports this
@@ -1590,7 +1507,7 @@ describe('BrsFile', () => {
                     print x
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         //skipped until `brs` supports this
@@ -1603,7 +1520,7 @@ describe('BrsFile', () => {
                         print m.x
                     end function
                 `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports leading and trailing periods for numeric literals', () => {
@@ -1615,7 +1532,7 @@ describe('BrsFile', () => {
                     print pointOne
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports bitshift assignment operators on object properties accessed by array syntax', () => {
@@ -1627,7 +1544,7 @@ describe('BrsFile', () => {
                         print m.x
                     end function
                 `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('supports weird period AA accessor', () => {
@@ -1637,7 +1554,7 @@ describe('BrsFile', () => {
                     print m.["_uuid"]
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('adds error for library statements NOT at top of file', () => {
@@ -1649,7 +1566,7 @@ describe('BrsFile', () => {
             `);
             program.validate();
             expectDiagnostics(program, [
-                DiagnosticMessages.importStatementMustBeDeclaredAtTopOfFile()
+                DiagnosticMessages.unexpectedStatementLocation('import', 'at the top of the file')
             ]);
         });
 
@@ -1668,7 +1585,7 @@ describe('BrsFile', () => {
             `);
             program.validate();
             expectDiagnostics(program, [
-                DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile()
+                DiagnosticMessages.unexpectedStatementLocation('library', 'at the top of the file')
             ]);
         });
 
@@ -1680,7 +1597,7 @@ describe('BrsFile', () => {
             `);
             program.validate();
             expectDiagnostics(program, [
-                DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile()
+                DiagnosticMessages.unexpectedStatementLocation('library', 'at the top of the file')
             ]);
         });
 
@@ -1690,15 +1607,16 @@ describe('BrsFile', () => {
                     obj = {x:0 : y: 1}
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         it('succeeds when finding variables with "sub" in them', () => {
-            let file = program.setFile('source/main.brs', `
+            let file = program.setFile<BrsFile>('source/main.brs', `
                 function DoSomething()
                     return value.subType()
                 end function
             `);
+
             expect(file.callables[0]).to.deep.include({
                 file: file,
                 nameRange: Range.create(1, 25, 1, 36)
@@ -1714,7 +1632,11 @@ describe('BrsFile', () => {
         });
 
         it('finds line and column numbers for functions', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     print "A"
@@ -1732,7 +1654,11 @@ describe('BrsFile', () => {
         });
 
         it('throws an error if the file has already been parsed', () => {
-            let file = new BrsFile('abspath', 'relpath', program);
+            let file = new BrsFile({
+                srcPath: 'abspath',
+                destPath: 'relpath',
+                program: program
+            });
             file.parse(`'a comment`);
             try {
                 file.parse(`'a new comment`);
@@ -1743,7 +1669,11 @@ describe('BrsFile', () => {
         });
 
         it('finds and registers duplicate callables', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     print "A"
@@ -1761,27 +1691,12 @@ describe('BrsFile', () => {
             expect(file.callables[1].nameRange!.start.line).to.equal(5);
         });
 
-        it('finds function call line and column numbers', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
-            file.parse(`
-                function DoA()
-                    DoB("a")
-                end function
-                function DoB(a as string)
-                    DoC()
-                end function
-            `);
-            expect(file.functionCalls.length).to.equal(2);
-
-            expect(file.functionCalls[0].range).to.eql(Range.create(2, 20, 2, 28));
-            expect(file.functionCalls[0].nameRange).to.eql(Range.create(2, 20, 2, 23));
-
-            expect(file.functionCalls[1].range).to.eql(Range.create(5, 20, 5, 25));
-            expect(file.functionCalls[1].nameRange).to.eql(Range.create(5, 20, 5, 23));
-        });
-
         it('finds function calls that are unfinished', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     DoB("a"
@@ -1791,32 +1706,35 @@ describe('BrsFile', () => {
                 end function
             `);
             expectDiagnostics(file.parser.diagnostics, [
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
-                DiagnosticMessages.unexpectedToken('\n')
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments'),
+                DiagnosticMessages.expectedNewlineOrColon(),
+                DiagnosticMessages.unexpectedToken('end function'),
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments'),
+                DiagnosticMessages.expectedNewlineOrColon()
             ]);
-            expect(file.functionCalls.length).to.equal(2);
-
-            expect(file.functionCalls[0].range).to.eql(Range.create(2, 20, 2, 27));
-            expect(file.functionCalls[0].nameRange).to.eql(Range.create(2, 20, 2, 23));
-
-            expect(file.functionCalls[1].range).to.eql(Range.create(5, 20, 5, 24));
-            expect(file.functionCalls[1].nameRange).to.eql(Range.create(5, 20, 5, 23));
         });
 
         it('sanitizes brs errors', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoSomething
                 end function
             `);
-            expectHasDiagnostics(file);
-            expect(file.getDiagnostics()[0].file).to.equal(file);
-            expect(file.getDiagnostics()[0].range.start.line).to.equal(1);
+            expectHasDiagnostics(program);
+            expect(program.getDiagnostics()[0].location.uri).to.equal(util.pathToUri(file?.srcPath));
+            expect(program.getDiagnostics()[0].location.range.start.line).to.equal(1);
         });
 
         it('supports using the `next` keyword in a for loop', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub countit()
                     for each num in [1,2,3]
@@ -1824,12 +1742,16 @@ describe('BrsFile', () => {
                     next
                 end sub
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
         });
 
         //test is not working yet, but will be enabled when brs supports this syntax
         it('supports assigning functions to objects', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function main()
                     o = CreateObject("roAssociativeArray")
@@ -1838,13 +1760,32 @@ describe('BrsFile', () => {
                     end sub
                 end function
             `);
-            expectZeroDiagnostics(file);
+            expectZeroDiagnostics(program);
+        });
+
+        it('supports parameter types in functions in AA literals', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    aa = {
+                        name: "test"
+                        addInts: function(a as integer, b as integer) as integer
+                            return a + b
+                        end function
+                    }
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
         });
     });
 
     describe('findCallables', () => {
         it('finds range', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub Sum()
                     print "hello world"
@@ -1855,7 +1796,11 @@ describe('BrsFile', () => {
         });
 
         it('finds correct body range even with inner function', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub Sum()
                     sayHi = sub()
@@ -1869,7 +1814,11 @@ describe('BrsFile', () => {
         });
 
         it('finds callable parameters', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a, b, c)
 
@@ -1899,7 +1848,11 @@ describe('BrsFile', () => {
         });
 
         it('finds optional parameters', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a=2)
 
@@ -1911,11 +1864,15 @@ describe('BrsFile', () => {
                 isOptional: true,
                 isRestArgument: false
             });
-            expect(callable.params[0].type).instanceof(DynamicType);
+            expect(callable.params[0].type).instanceof(IntegerType);
         });
 
         it('finds parameter types', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a, b as integer, c as string)
 
@@ -1945,85 +1902,20 @@ describe('BrsFile', () => {
         });
     });
 
-    describe('findCallableInvocations', () => {
-        it('finds arguments with literal values', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
-            file.parse(`
-                function Sum()
-                    DoSomething("name", 12, true)
-                end function
-            `);
-            expect(file.functionCalls.length).to.equal(1);
-
-            const argsMap = file.functionCalls[0].args.map(arg => {
-                // disregard arg.expression, etc.
-                return { type: arg.type, range: arg.range, text: arg.text };
-            });
-            expect(argsMap).to.eql([{
-                type: new StringType(),
-                range: util.createRange(2, 32, 2, 38),
-                text: '"name"'
-            }, {
-                type: new IntegerType(),
-                range: util.createRange(2, 40, 2, 42),
-                text: '12'
-            }, {
-                type: new BooleanType(),
-                range: util.createRange(2, 44, 2, 48),
-                text: 'true'
-            }]);
-        });
-
-        it('finds function calls nested inside statements', () => {
-            program.setFile(`source/main.brs`, `
-                sub main()
-                    if true then
-                        DoesNotExist(1, 2)
-                    end if
-                end sub
-            `);
-            program.validate();
-            expectDiagnostics(program, [
-                DiagnosticMessages.cannotFindFunction('DoesNotExist')
-            ]);
-        });
-
-        it('finds arguments with variable values', () => {
-            let file = new BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
-            file.parse(`
-                function Sum()
-                    count = 1
-                    name = "John"
-                    isAlive = true
-                    DoSomething(count, name, isAlive)
-                end function
-            `);
-            expect(file.functionCalls.length).to.equal(1);
-            expect(file.functionCalls[0].args[0]).deep.include({
-                type: new DynamicType(),
-                text: 'count'
-            });
-            expect(file.functionCalls[0].args[1]).deep.include({
-                type: new DynamicType(),
-                text: 'name'
-            });
-            expect(file.functionCalls[0].args[2]).deep.include({
-                type: new DynamicType(),
-                text: 'isAlive'
-            });
-        });
-    });
-
     describe('findCallables', () => {
         //this test is to help with code coverage
         it('skips top-level statements', () => {
-            let file = new BrsFile('absolute', 'relative', program);
+            let file = new BrsFile({
+                srcPath: 'absolute',
+                destPath: 'relative',
+                program: program
+            });
             file.parse('name = "Bob"');
             expect(file.callables.length).to.equal(0);
         });
 
         it('finds return type', () => {
-            let file = program.setFile('source/main.brs', `
+            let file = program.setFile<BrsFile>('source/main.brs', `
                 function DoSomething() as string
                 end function
             `);
@@ -2095,21 +1987,21 @@ describe('BrsFile', () => {
                 lineIndex: 2,
                 name: 'sayHi'
             });
-            expect(file.functionScopes[0].variableDeclarations[0].type).instanceof(FunctionType);
+            expect(file.functionScopes[0].variableDeclarations[0].getType()).instanceof(TypedFunctionType);
 
             expect(file.functionScopes[1].variableDeclarations).to.be.length(1);
             expect(file.functionScopes[1].variableDeclarations[0]).to.deep.include(<VariableDeclaration>{
                 lineIndex: 3,
                 name: 'age'
             });
-            expect(file.functionScopes[1].variableDeclarations[0].type).instanceof(IntegerType);
+            expect(file.functionScopes[1].variableDeclarations[0].getType()).instanceof(IntegerType);
 
             expect(file.functionScopes[2].variableDeclarations).to.be.length(1);
             expect(file.functionScopes[2].variableDeclarations[0]).to.deep.include(<VariableDeclaration>{
                 lineIndex: 7,
                 name: 'name'
             });
-            expect(file.functionScopes[2].variableDeclarations[0].type).instanceof(StringType);
+            expect(file.functionScopes[2].variableDeclarations[0].getType()).instanceof(StringType);
         });
 
         it('finds variable declarations inside of if statements', () => {
@@ -2126,7 +2018,7 @@ describe('BrsFile', () => {
         });
 
         it('finds value from global return', () => {
-            let file = program.setFile('source/main.brs', `
+            let file = program.setFile<BrsFile>('source/main.brs', `
                 sub Main()
                    myName = GetName()
                 end sub
@@ -2135,29 +2027,34 @@ describe('BrsFile', () => {
                     return "bob"
                 end function
             `);
+            // Types are only guaranteed after validation
+            program.validate();
+            expectZeroDiagnostics(program);
 
             expect(file.functionScopes[0].variableDeclarations).to.be.length(1);
             expect(file.functionScopes[0].variableDeclarations[0]).to.deep.include(<VariableDeclaration>{
                 lineIndex: 2,
                 name: 'myName'
             });
-            expect(file.functionScopes[0].variableDeclarations[0].type).instanceof(StringType);
+            expectTypeToBe(file.functionScopes[0].variableDeclarations[0].getType(), StringType);
         });
 
         it('finds variable type from other variable', () => {
-            file.parse(`
+            let file = program.setFile<BrsFile>('source/main.brs', `
                 sub Main()
                    name = "bob"
                    nameCopy = name
                 end sub
             `);
+            // Types are only guaranteed after validation
+            program.validate();
 
             expect(file.functionScopes[0].variableDeclarations).to.be.length(2);
             expect(file.functionScopes[0].variableDeclarations[1]).to.deep.include(<VariableDeclaration>{
                 lineIndex: 3,
                 name: 'nameCopy'
             });
-            expect(file.functionScopes[0].variableDeclarations[1].type).instanceof(StringType);
+            expectTypeToBe(file.functionScopes[0].variableDeclarations[1].getType(), StringType);
         });
 
         it('sets proper range for functions', () => {
@@ -2176,7 +2073,7 @@ describe('BrsFile', () => {
     });
 
     it('handles mixed case `then` partions of conditionals', () => {
-        let mainFile = program.setFile('source/main.brs', `
+        program.setFile('source/main.brs', `
             sub Main()
                 if true then
                     print "works"
@@ -2184,340 +2081,24 @@ describe('BrsFile', () => {
             end sub
         `);
 
-        expect(mainFile.getDiagnostics()).to.be.lengthOf(0);
-        mainFile = program.setFile('source/main.brs', `
+        expectZeroDiagnostics(program);
+        program.setFile('source/main.brs', `
             sub Main()
                 if true Then
                     print "works"
                 end if
             end sub
         `);
-        expect(mainFile.getDiagnostics()).to.be.lengthOf(0);
+        expectZeroDiagnostics(program);
 
-        mainFile = program.setFile('source/main.brs', `
+        program.setFile('source/main.brs', `
             sub Main()
                 if true THEN
                     print "works"
                 end if
             end sub
         `);
-        expect(mainFile.getDiagnostics()).to.be.lengthOf(0);
-    });
-
-    describe('getHover', () => {
-        it('works for param types', () => {
-            let file = program.setFile('source/main.brs', `
-                sub DoSomething(name as string)
-                    name = 1
-                    sayMyName = function(name as string)
-                    end function
-                end sub
-            `);
-
-            //hover over the `name = 1` line
-            let hover = program.getHover(file.srcPath, Position.create(2, 24))[0];
-            expect(hover).to.exist;
-            expect(hover.range).to.eql(Range.create(2, 20, 2, 24));
-
-            //hover over the `name` parameter declaration
-            hover = program.getHover(file.srcPath, Position.create(1, 34))[0];
-            expect(hover).to.exist;
-            expect(hover.range).to.eql(Range.create(1, 32, 1, 36));
-        });
-
-        //ignore this for now...it's not a huge deal
-        it('does not match on keywords or data types', () => {
-            let file = program.setFile('source/main.brs', `
-                sub Main(name as string)
-                end sub
-                sub as()
-                end sub
-            `);
-            //hover over the `as`
-            expect(program.getHover(file.srcPath, Position.create(1, 31))).to.be.empty;
-            //hover over the `string`
-            expect(program.getHover(file.srcPath, Position.create(1, 36))).to.be.empty;
-        });
-
-        it('finds declared function', () => {
-            let file = program.setFile('source/main.brs', `
-                function Main(count = 1)
-                    firstName = "bob"
-                    age = 21
-                    shoeSize = 10
-                end function
-            `);
-
-            let hover = program.getHover(file.srcPath, Position.create(1, 28))[0];
-            expect(hover).to.exist;
-
-            expect(hover.range).to.eql(Range.create(1, 25, 1, 29));
-            expect(hover.contents).to.equal([
-                '```brightscript',
-                'function Main(count? as dynamic) as dynamic',
-                '```'
-            ].join('\n'));
-        });
-
-        it('finds declared namespace function', () => {
-            let file = program.setFile('source/main.brs', `
-            namespace mySpace
-                function Main(count = 1)
-                    firstName = "bob"
-                    age = 21
-                    shoeSize = 10
-                end function
-            end namespace
-            `);
-
-            let hover = program.getHover(file.srcPath, Position.create(2, 28))[0];
-            expect(hover).to.exist;
-
-            expect(hover.range).to.eql(Range.create(2, 25, 2, 29));
-            expect(hover.contents).to.equal([
-                '```brightscript',
-                'function Main(count? as dynamic) as dynamic',
-                '```'
-            ].join('\n'));
-        });
-
-        it('finds variable function hover in same scope', () => {
-            let file = program.setFile('source/main.brs', `
-                sub Main()
-                    sayMyName = sub(name as string)
-                    end sub
-
-                    sayMyName()
-                end sub
-            `);
-
-            let hover = program.getHover(file.srcPath, Position.create(5, 24))[0];
-
-            expect(hover.range).to.eql(Range.create(5, 20, 5, 29));
-            expect(hover.contents).to.equal([
-                '```brightscript',
-                'sub sayMyName(name as string) as void',
-                '```'
-            ].join('\n'));
-        });
-
-        it('does not crash when hovering on built-in functions', () => {
-            let file = program.setFile('source/main.brs', `
-                function doUcase(text)
-                    return ucase(text)
-                end function
-            `);
-
-            expect(
-                program.getHover(file.srcPath, Position.create(2, 30))[0].contents
-            ).to.equal([
-                '```brightscript',
-                'function UCase(s as string) as string',
-                '```'
-            ].join('\n'));
-        });
-
-        it('does not crash when hovering on object method call', () => {
-            let file = program.setFile('source/main.brs', `
-                function getInstr(url, text)
-                    return url.instr(text)
-                end function
-            `);
-
-            expect(
-                program.getHover(file.srcPath, Position.create(2, 35))[0].contents
-            ).to.equal([
-                '```brightscript',
-                //TODO this really shouldn't be returning the global function, but it does...so make sure it doesn't crash right now.
-                'function Instr(startOrText as dynamic, textOrSubstring as string, substring? as string) as integer',
-                '```'
-            ].join('\n'));
-        });
-
-        it('finds function hover in file scope', () => {
-            let file = program.setFile('source/main.brs', `
-                sub Main()
-                    sayMyName()
-                end sub
-
-                sub sayMyName()
-
-                end sub
-            `);
-
-            let hover = program.getHover(file.srcPath, Position.create(2, 25))[0];
-
-            expect(hover.range).to.eql(Range.create(2, 20, 2, 29));
-            expect(hover.contents).to.equal([
-                '```brightscript',
-                'sub sayMyName() as void',
-                '```'
-            ].join('\n'));
-        });
-
-        it('finds namespace function hover in file scope', () => {
-            let file = program.setFile('source/main.brs', `
-                namespace mySpace
-                sub Main()
-                    sayMyName()
-                end sub
-
-                sub sayMyName()
-
-                end sub
-                end namespace
-            `);
-
-            let hover = program.getHover(file.srcPath, Position.create(3, 25))[0];
-
-            expect(hover.range).to.eql(Range.create(3, 20, 3, 29));
-            expect(hover.contents).to.equal([
-                '```brightscript',
-                'sub sayMyName() as void',
-                '```'
-            ].join('\n'));
-        });
-
-        it('finds function hover in scope', () => {
-            let rootDir = process.cwd();
-            program = new Program({
-                rootDir: rootDir
-            });
-
-            let mainFile = program.setFile('source/main.brs', `
-                sub Main()
-                    sayMyName()
-                end sub
-            `);
-
-            program.setFile('source/lib.brs', `
-                sub sayMyName(name as string)
-
-                end sub
-            `);
-
-            let hover = program.getHover(mainFile.srcPath, Position.create(2, 25))[0];
-            expect(hover).to.exist;
-
-            expect(hover.range).to.eql(Range.create(2, 20, 2, 29));
-            expect(hover.contents).to.equal([
-                '```brightscript',
-                'sub sayMyName(name as string) as void',
-                '```'
-            ].join('\n'));
-        });
-
-        it('finds namespace function hover in scope', () => {
-            let rootDir = process.cwd();
-            program = new Program({
-                rootDir: rootDir
-            });
-
-            let mainFile = program.setFile('source/main.brs', `
-                sub Main()
-                    mySpace.sayMyName()
-                end sub
-            `);
-
-            program.setFile('source/lib.brs', `
-                namespace mySpace
-                    sub sayMyName(name as string)
-                    end sub
-                end namespace
-            `);
-
-            let hover = program.getHover(mainFile.srcPath, Position.create(2, 34))[0];
-            expect(hover).to.exist;
-
-            expect(hover.range).to.eql(Range.create(2, 28, 2, 37));
-            expect(hover.contents).to.equal([
-                '```brightscript',
-                'sub sayMyName(name as string) as void',
-                '```'
-            ].join('\n'));
-        });
-
-        it('includes markdown comments in hover.', () => {
-            let rootDir = process.cwd();
-            program = new Program({
-                rootDir: rootDir
-            });
-
-            const file = program.setFile('source/lib.brs', `
-                '
-                ' The main function
-                '
-                sub main()
-                    writeToLog("hello")
-                end sub
-
-                '
-                ' Prints a message to the log.
-                ' Works with *markdown* **content**
-                '
-                sub writeToLog(message as string)
-                    print message
-                end sub
-            `);
-
-            //hover over log("hello")
-            expect(
-                program.getHover(file.srcPath, Position.create(5, 22))[0].contents
-            ).to.equal([
-                '```brightscript',
-                'sub writeToLog(message as string) as void',
-                '```',
-                '***',
-                '',
-                ' Prints a message to the log.',
-                ' Works with *markdown* **content**',
-                ''
-            ].join('\n'));
-
-            //hover over sub ma|in()
-            expect(
-                trim(
-                    program.getHover(file.srcPath, Position.create(4, 22))[0].contents.toString()
-                )
-            ).to.equal(trim`
-                \`\`\`brightscript
-                sub main() as void
-                \`\`\`
-                ***
-
-                 The main function
-                `
-            );
-        });
-
-        it('handles mixed case `then` partions of conditionals', () => {
-            let mainFile = program.setFile('source/main.brs', `
-                sub Main()
-                    if true then
-                        print "works"
-                    end if
-                end sub
-            `);
-
-            expectZeroDiagnostics(mainFile);
-            mainFile = program.setFile('source/main.brs', `
-                sub Main()
-                    if true Then
-                        print "works"
-                    end if
-                end sub
-            `);
-            expectZeroDiagnostics(mainFile);
-
-            mainFile = program.setFile('source/main.brs', `
-                sub Main()
-                    if true THEN
-                        print "works"
-                    end if
-                end sub
-            `);
-            expectZeroDiagnostics(mainFile);
-        });
+        expectZeroDiagnostics(program);
     });
 
     it('does not throw when encountering incomplete import statement', () => {
@@ -2531,9 +2112,25 @@ describe('BrsFile', () => {
     });
 
     describe('transpile', () => {
+        it('does not crash when AA is missing closing curly token', async () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    aa = {}
+                end sub
+            `);
+            //delete the ending token `}`
+            const aa = file.ast.findChild<AALiteralExpression>(isAALiteralExpression);
+            delete (aa.tokens as any).close;
+
+            await testTranspile(file, `
+                sub main()
+                    aa = {}
+                end sub
+            `, undefined, undefined, false);
+        });
 
-        it('namespaced functions default param values in d.bs files are transpiled correctly', () => {
-            testGetTypedef(`
+        it('namespaced functions default param values in d.bs files are transpiled correctly', async () => {
+            await testGetTypedef(`
                namespace promises
                     function onThen(promise as dynamic, callback = promises.internal.defaultThenCallback as function, context = "__INVALID__" as object) as dynamic
                         return true
@@ -2555,8 +2152,8 @@ describe('BrsFile', () => {
             `);
         });
 
-        it('namespaced functions default param values in d.bs files are transpiled correctly', () => {
-            testGetTypedef(`
+        it('namespaced functions default param values in d.bs files are transpiled correctly', async () => {
+            await testGetTypedef(`
                 namespace alpha
                     function beta()
                     end function
@@ -2585,7 +2182,7 @@ describe('BrsFile', () => {
                             'comment
                             2
                         ]
-                        val = +3
+                        val = + m.val
                         print "hello"
                         'comment after print
                         num = 1
@@ -2659,8 +2256,8 @@ describe('BrsFile', () => {
                         print PKG_PATH
                         print LINE_NUM
                         print new Person()
-                        m@.someCallfunc()
-                        m@.someCallfunc(1, 2)
+                        m.node@.someCallfunc()
+                        m.node@.someCallfunc(1, 2)
                         print tag\`stuff\${LINE_NUM}\${LINE_NUM}\`
                         print 1 = 1 ? 1 : 2
                         print 1 = 1 ? m.one : m.two
@@ -2678,7 +2275,7 @@ describe('BrsFile', () => {
                         function charlie()
                         end function
                     end namespace
-                    sub test()
+                    sub test2()
                         ' alpha.charlie()
                     end sub
 
@@ -2713,8 +2310,8 @@ describe('BrsFile', () => {
                         print "pkg:/source/main.brs"
                         print LINE_NUM
                         print Person()
-                        m.callfunc("someCallfunc", invalid)
-                        m.callfunc("someCallfunc", 1, 2)
+                        m.node.callfunc("someCallfunc")
+                        m.node.callfunc("someCallfunc", 1, 2)
                         print tag(["stuff", "", ""], [LINE_NUM, LINE_NUM])
                         print bslib_ternary(1 = 1, 1, 2)
                         print (function(__bsCondition, m)
@@ -2746,7 +2343,7 @@ describe('BrsFile', () => {
                     function alpha_charlie()
                     end function
 
-                    sub test()
+                    sub test2()
                         ' alpha.charlie()
                     end sub
 
@@ -2788,7 +2385,7 @@ describe('BrsFile', () => {
             function doTest(source: string, expected = source) {
                 const file = program.setFile<BrsFile>('source/main.bs', '');
                 //override the parser with our locationless parser
-                file['_parser'] = Parser.parse(source, { mode: ParseMode.BrighterScript, trackLocations: false });
+                file['_parser'] = Parser.parse(source, { mode: ParseMode.BrighterScript, trackLocations: false, srcPath: s`${rootDir}/source/main.brs` });
                 program.getScopesForFile(file).forEach(x => x['cache'].clear());
                 program.validate();
                 expectZeroDiagnostics(program);
@@ -2799,31 +2396,84 @@ describe('BrsFile', () => {
                     undent(expected)
                 );
             }
-        });
 
-        it('transpilies libpkg:/ paths when encountered', () => {
-            program.setFile('source/lib.bs', `
-                import "libpkg:/source/numbers.bs"
-            `);
-            program.setFile('source/numbers.bs', `
-                sub test()
-                end sub
-            `);
-            testTranspile(`
-                <component name="TestButton" extends="Group">
-                    <script type="text/brightscript" uri="libpkg:/source/lib.bs"/>
-                </component>
-            `, `
-                <component name="TestButton" extends="Group">
-                    <script type="text/brightscript" uri="libpkg:/source/lib.brs" />
+            it('transpiles call expression when paren tokens are missing', async () => {
+                const file = program.setFile<BrsFile>('source/main.bs', `
+                    sub main()
+                    end sub
+                `);
+                const body = file.ast.findChild<Block>(isBlock);
+                body.statements.push(new CallExpression({
+                    callee: new LiteralExpression({ value: createIdentifier('lcase') }),
+                    args: [createStringLiteral('HELLO')]
+                }));
+
+                await testTranspile(file, `
+                    sub main()
+                        lcase("HELLO")
+                    end sub
+                `, undefined, undefined, false);
+            });
+
+            it('transpiles print expression when print token is missing', async () => {
+                const file = program.setFile<BrsFile>('source/main.bs', `
+                    sub main()
+                    end sub
+                `);
+                const body = file.ast.findChild<Block>(isBlock);
+                body.statements.push(new PrintStatement({
+                    expressions: [createStringLiteral('HELLO')]
+                }));
+
+                await testTranspile(file, `
+                    sub main()
+                        print "HELLO"
+                    end sub
+                `, undefined, undefined, false);
+            });
+
+
+            it('transpiles function expression when paren tokens are missing', async () => {
+                const file = program.setFile<BrsFile>('source/main.bs', `
+                `);
+                file.ast.statements.push(new FunctionStatement({
+                    func: new FunctionExpression({
+                        body: new Block({ statements: [] })
+                    }),
+                    name: createIdentifier('main')
+                }));
+
+                await testTranspile(file, `
+                    function main()
+                    end function
+                `, undefined, undefined, false);
+            });
+
+        });
+
+        it('transpilies libpkg:/ paths when encountered', async () => {
+            program.setFile('source/lib.bs', `
+                import "libpkg:/source/numbers.bs"
+            `);
+            program.setFile('source/numbers.bs', `
+                sub test()
+                end sub
+            `);
+            await testTranspile(`
+                <component name="TestButton" extends="Group">
+                    <script type="text/brightscript" uri="libpkg:/source/lib.bs"/>
+                </component>
+            `, `
+                <component name="TestButton" extends="Group">
+                    <script type="text/brightscript" uri="libpkg:/source/lib.brs" />
                     <script type="text/brightscript" uri="pkg:/source/numbers.brs" />
                     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
                 </component>
             `, undefined, 'components/TestButton.xml');
         });
 
-        it('excludes trailing commas in array literals', () => {
-            testTranspile(`
+        it('excludes trailing commas in array literals', async () => {
+            await testTranspile(`
                 sub main()
                     arr = [
                         1,
@@ -2852,7 +2502,7 @@ describe('BrsFile', () => {
             `);
         });
 
-        it('transpiles if statement keywords as provided', () => {
+        it('transpiles if statement keywords as provided', async () => {
             const code = `
                 sub main()
                     If True Then
@@ -2866,13 +2516,13 @@ describe('BrsFile', () => {
                     End If
                 end sub
             `;
-            testTranspile(code);
-            testTranspile(code.toLowerCase());
-            testTranspile(code.toUpperCase());
+            await testTranspile(code);
+            await testTranspile(code.toLowerCase());
+            await testTranspile(code.toUpperCase());
         });
 
-        it('does not transpile `then` tokens', () => {
-            testTranspile(`
+        it('does not transpile `then` tokens', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                         print true
@@ -2883,8 +2533,8 @@ describe('BrsFile', () => {
             `);
         });
 
-        it('honors spacing between multi-word tokens', () => {
-            testTranspile(`
+        it('honors spacing between multi-word tokens', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                         print true
@@ -2895,65 +2545,68 @@ describe('BrsFile', () => {
             `);
         });
 
-        it('handles when only some of the statements have `then`', () => {
-            testTranspile(`
-                function main()
+        it('handles when only some of the statements have `then`', async () => {
+            await testTranspile(`
+                sub main()
                     if true
                     else if true then
                     else if true
                     else if true then
                         if true then
-                            return true
+                            return
                         end if
                     end if
-                end function
+                end sub
             `);
         });
 
-        it('retains casing of parameter types', () => {
-            function test(type: string) {
-                testTranspile(`
+        it('retains casing of parameter types', async () => {
+            async function test(type: string) {
+                await testTranspile(`
                     sub one(a as ${type}, b as ${type.toUpperCase()}, c as ${type.toLowerCase()})
                     end sub
                 `);
             }
-            test('Boolean');
-            test('Double');
-            test('Dynamic');
-            test('Float');
-            test('Integer');
-            test('LongInteger');
-            test('Object');
-            test('String');
-        });
-
-        it('retains casing of return types', () => {
-            function test(type: string) {
-                testTranspile(`
+            await test('Boolean');
+            await test('Double');
+            await test('Dynamic');
+            await test('Float');
+            await test('Integer');
+            await test('LongInteger');
+            await test('Object');
+            await test('String');
+        });
+
+        it('retains casing of return types', async () => {
+            async function test(type: string, result: string) {
+                await testTranspile(`
                     sub one() as ${type}
+                        return ${result}
                     end sub
 
                     sub two() as ${type.toLowerCase()}
+                        return ${result}
                     end sub
 
                     sub three() as ${type.toUpperCase()}
+                        return ${result}
                     end sub
                 `);
             }
-            test('Boolean');
-            test('Double');
-            test('Dynamic');
-            test('Float');
-            test('Integer');
-            test('LongInteger');
-            test('Object');
-            test('String');
-            test('Void');
-        });
-
-        it('retains casing of literal types', () => {
-            function test(type: string) {
-                testTranspile(`
+            await test('Boolean', 'true');
+            await test('Double', '1.23');
+            await test('Dynamic', 'invalid');
+            await test('Float', '1.23');
+            await test('Integer', '123');
+            await test('LongInteger', '123');
+            await test('Object', '{}');
+            await test('String', '"test"');
+            await test('Void', '');
+        });
+
+        it('retains casing of literal types', async () => {
+            async function test(type: string) {
+                await testTranspile(`
                     sub main()
                         thing = ${type}
                         thing = ${type.toLowerCase()}
@@ -2961,13 +2614,13 @@ describe('BrsFile', () => {
                     end sub
                 `);
             }
-            test('Invalid');
-            test('True');
-            test('False');
+            await test('Invalid');
+            await test('True');
+            await test('False');
         });
         describe('throwStatement', () => {
-            it('transpiles properly', () => {
-                testTranspile(`
+            it('transpiles properly', async () => {
+                await testTranspile(`
                     sub main()
                         try
                             throw "some message"
@@ -2976,25 +2629,99 @@ describe('BrsFile', () => {
                     end sub
                 `);
             });
+
+            it('transpiles empty throw with "User-specified exception"', async () => {
+                await testTranspile(`
+                    sub main()
+                        try
+                            throw 'bs:disable-line
+                        catch e
+                        end try
+                    end sub
+                `, `
+                    sub main()
+                        try
+                            throw "User-specified exception"
+                        'bs:disable-line
+                        catch e
+                        end try
+                    end sub
+                `);
+            });
         });
 
         describe('try/catch', () => {
-            it('transpiles properly', () => {
-                testTranspile(`
+            it('transpiles properly', async () => {
+                await testTranspile(`
                     sub main()
                         try
                             print m.b.c
                         catch e
-                            print e
+                            print "crash"
+                        end try
+                    end sub
+                `);
+            });
+
+            it('recognizes the exception variable', async () => {
+                await testTranspile(`
+                    sub main()
+                        try
+                            print m.b.c
+                        catch e
+                            message = e.message
+                            print message
                         end try
                     end sub
                 `);
             });
+
+            it('supports omitting the exception variable in brighterscript mode (we auto-add it at transpile time)', async () => {
+                await testTranspile(`
+                    sub new()
+                        try
+                            print "hello"
+                        catch
+                            print "error"
+                        end try
+                    end sub
+                `, `
+                    sub new()
+                        try
+                            print "hello"
+                        catch e
+                            print "error"
+                        end try
+                    end sub
+                `, undefined, 'source/main.bs');
+            });
+
+            it('uses alternate name when `e` is already a local var', async () => {
+                await testTranspile(`
+                    sub new()
+                        e = "ello love"
+                        try
+                            print "hello"
+                        catch
+                            print "error"
+                        end try
+                    end sub
+                `, `
+                    sub new()
+                        e = "ello love"
+                        try
+                            print "hello"
+                        catch __bsc_error
+                            print "error"
+                        end try
+                    end sub
+                `, undefined, 'source/main.bs');
+            });
         });
 
         describe('namespaces', () => {
-            it('properly transpiles namespace functions for assignments', () => {
-                testTranspile(`
+            it('properly transpiles namespace functions for assignments', async () => {
+                await testTranspile(`
                     namespace NameA.NameB
                         sub Speak()
                         end sub
@@ -3016,8 +2743,8 @@ describe('BrsFile', () => {
                 `);
             });
 
-            it('transpiles namespace calls from within an array', () => {
-                testTranspile(`
+            it('transpiles namespace calls from within an array', async () => {
+                await testTranspile(`
                     namespace Vertibrates.Birds
                         function GetAllBirds()
                             return [
@@ -3048,8 +2775,8 @@ describe('BrsFile', () => {
                 `, undefined, 'components/NobodyImportsMe.bs', false);
             });
 
-            it('properly transpiles inferred namespace function for assignment', () => {
-                testTranspile(`
+            it('properly transpiles inferred namespace function for assignment', async () => {
+                await testTranspile(`
                     namespace NameA.NameB
                         sub Speak()
                         end sub
@@ -3068,1675 +2795,4007 @@ describe('BrsFile', () => {
                     end sub
                 `);
             });
-        });
-        it('includes all text to end of line for a non-terminated string', () => {
-            testTranspile(
-                'sub main()\n    name = "john \nend sub',
-                'sub main()\n    name = "john "\nend sub',
-                null as any,
-                'source/main.bs',
-                false
-            );
-        });
-        it('escapes quotes in string literals', () => {
-            testTranspile(`
-                sub main()
-                    expected += chr(10) + " version=""2.0"""
-                end sub
-            `);
-        });
-        it('keeps function parameter types in proper order', () => {
-            testTranspile(`
-                function CreateTestStatistic(name as string, result = "Success" as string, time = 0 as integer, errorCode = 0 as integer, errorMessage = "" as string) as object
-                end function
-            `);
-        });
 
-        it('discard parameter types when removeParameterTypes is true', () => {
-            program.options.removeParameterTypes = true;
-            testTranspile(`
-                sub one(a as integer, b = "" as string, c = invalid as dynamic)
-                end sub
-            `, `
-                sub one(a, b = "", c = invalid)
-                end sub
-            `);
-        });
+            it('does not prefix global function names', async () => {
+                await testTranspile(`
+                    namespace is
+                        function valid(thing) as boolean
+                            return invalid <> thing
+                        end function
 
-        it('discard return type when removeParameterTypes is true', () => {
-            program.options.removeParameterTypes = true;
-            testTranspile(`
-                function one() as string
-                    return ""
-                end function
-            `, `
-                function one()
-                    return ""
-                end function
-            `);
-        });
+                        function node(thing) as boolean
+                            return valid(thing) and valid(getInterface(thing, "ifSgNodeChildren"))
+                        end function
+                    end namespace`, `
+                    function is_valid(thing) as boolean
+                        return invalid <> thing
+                    end function
 
-        it('does not remove `as void` when removeParameterTypes is true', () => {
-            program.options.removeParameterTypes = true;
-            testTranspile(`
-                function one() as void
-                    return
-                end function
-            `, `
-                function one() as void
-                    return
-                end function
-            `);
-        });
+                    function is_node(thing) as boolean
+                        return is_valid(thing) and is_valid(getInterface(thing, "ifSgNodeChildren"))
+                    end function`
+                );
+            });
 
-        it('does not remove `as <type>` for sub when removeParameterTypes is true', () => {
-            program.options.removeParameterTypes = true;
-            testTranspile(`
-                sub one() as string
-                    return "hello"
-                end sub
-            `, `
-                sub one() as string
-                    return "hello"
-                end sub
-            `);
-        });
+            it('does not prefix unnamespaced function names', async () => {
+                await testTranspile(`
+                    function valid(thing) as boolean
+                        return invalid <> thing
+                    end function
 
-        it('does not remove `as boolean` from onKeyEvent when removeParameterTypes is true', () => {
-            program.options.removeParameterTypes = true;
-            testTranspile(`
-                function onKeyEvent(p1) as boolean
-                    return true
-                end function
+                    namespace is
+                          function node(thing) as boolean
+                            return valid(thing) and valid(getInterface(thing, "ifSgNodeChildren"))
+                        end function
+                    end namespace`, `
+                    function valid(thing) as boolean
+                        return invalid <> thing
+                    end function
+                    function is_node(thing) as boolean
+                        return valid(thing) and valid(getInterface(thing, "ifSgNodeChildren"))
+                    end function`
+                );
+            });
 
-                function somethingElse() as string
-                    return "hello"
-                end function
-            `, `
-                function onKeyEvent(p1) as boolean
-                    return true
-                end function
+            it('does not prefix unnamespaced function names in deep namespace', async () => {
+                await testTranspile(`
+                     namespace is.a.deep.namespace
+                        function valid(thing) as boolean
+                            return invalid <> thing
+                        end function
 
-                function somethingElse()
-                    return "hello"
-                end function
-            `);
-        });
+                        function node(thing) as boolean
+                            return valid(thing) and valid(getInterface(thing, "ifSgNodeChildren"))
+                        end function
+                    end namespace`, `
+                    function is_a_deep_namespace_valid(thing) as boolean
+                        return invalid <> thing
+                    end function
 
-        it('transpiles local var assignment operators', () => {
-            testTranspile(`
-                sub main()
-                    count = 0
-                    count += 1
-                    count -= 1
-                    count *= 1
-                    count /= 1
-                    count \\= 1
-                    count <<= 1
-                    count >>= 1
-                end sub
-            `);
-        });
+                    function is_a_deep_namespace_node(thing) as boolean
+                        return is_a_deep_namespace_valid(thing) and is_a_deep_namespace_valid(getInterface(thing, "ifSgNodeChildren"))
+                    end function`
+                );
+            });
 
-        it('transpiles AA property assignment operators', () => {
-            testTranspile(`
-                sub main()
-                    person = {
-                        count: 0
-                    }
-                    person.count += 1
-                end sub
-            `);
-        });
+            it('transpiles namespaced functions when used as variables', async () => {
+                await testTranspile(`
+                    namespace Vertibrates.Birds
+                        function GetAllBirds()
+                            return [
+                                GetDuck(),
+                                GetGoose()
+                            ]
+                        end function
 
-        it('transpiles AA indexed assignment operators', () => {
-            testTranspile(`
-                sub main()
-                    person = {
-                        count: 0
-                    }
-                    person["count"] += 1
-                end sub
-            `);
-        });
+                        function GetDuck()
+                        end function
 
-        it('relative-referenced namespaced functions get prefixed', () => {
-            testTranspile(`
-                namespace Vertibrates.Birds
-                    function GetAllBirds()
+                        function GetGoose()
+                        end function
+
+                        function Test()
+                            duckGetter = Vertibrates.Birds.GetDuck
+                            gooseGetter = GetGoose
+                        end function
+                    end namespace`, `
+                    function Vertibrates_Birds_GetAllBirds()
                         return [
-                            GetDuck(),
-                            GetGoose()
+                            Vertibrates_Birds_GetDuck()
+                            Vertibrates_Birds_GetGoose()
                         ]
                     end function
 
-                    function GetDuck()
+                    function Vertibrates_Birds_GetDuck()
                     end function
 
-                    function GetGoose()
+                    function Vertibrates_Birds_GetGoose()
                     end function
-                end namespace
-            `, `
-                function Vertibrates_Birds_GetAllBirds()
-                    return [
-                        Vertibrates_Birds_GetDuck()
-                        Vertibrates_Birds_GetGoose()
-                    ]
-                end function
-
-                function Vertibrates_Birds_GetDuck()
-                end function
 
-                function Vertibrates_Birds_GetGoose()
-                end function
-            `, 'trim', 'source/main.bs');
+                    function Vertibrates_Birds_Test()
+                        duckGetter = Vertibrates_Birds_GetDuck
+                        gooseGetter = Vertibrates_Birds_GetGoose
+                    end function
+               `);
+            });
         });
 
-        it('transpiles namespaced functions', () => {
-            testTranspile(`
-                namespace NameA
-                    sub alert()
+        describe('shadowing', () => {
+
+            it('does not add underscores when variable shadows namespace', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        function toStr()
+                            return "ALPHA"
+                        end function
+
+                        sub foo()
+                            alpha = 1
+                            print alpha.toStr()
+                        end sub
+                    end namespace
+                `, `
+                    function alpha_toStr()
+                        return "ALPHA"
+                    end function
+
+                    sub alpha_foo()
+                        alpha = 1
+                        print alpha.toStr()
                     end sub
-                end namespace
-                namespace NameA.NameB
-                    sub alert()
+                `);
+            });
+
+            it('does not add underscores when parameter shadows namespace', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        function toStr()
+                            return "ALPHA"
+                        end function
+                    end namespace
+
+                    sub foo(alpha)
+                        print alpha.toStr()
                     end sub
-                end namespace
-            `, `
-                sub NameA_alert()
-                end sub
-                sub NameA_NameB_alert()
-                end sub
-            `, 'trim', 'source/main.bs');
-        });
+                `, `
+                    function alpha_toStr()
+                        return "ALPHA"
+                    end function
 
-        it('transpiles dim', () => {
-            function doTest(code: string) {
-                testTranspile(`
-                    sub main()
-                        requestList = []
-                        ${code}
+                    sub foo(alpha)
+                        print alpha.toStr()
                     end sub
+                `);
+            });
+
+            it('does not add underscores when var shadows namespaced func, used as an argument', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        function foo()
+                        end function
+
+                        function bar()
+                            foo = 1
+                            m.data = []
+                            m.data.push(foo)
+                        end function
+                    end namespace
                 `, `
-                    sub main()
-                        requestList = []
-                        ${code}
+                    function alpha_foo()
+                    end function
+
+                    function alpha_bar()
+                        foo = 1
+                        m.data = []
+                        m.data.push(foo)
+                    end function
+                `);
+            });
+
+            it('does not add underscores when inline func var shadows namespaced func, used as an argument', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        function foo()
+                        end function
+
+                        function bar()
+                            foo = function()
+                                return 1
+                            end function
+                            m.data = []
+                            m.data.push(foo)
+                        end function
+                    end namespace
+                `, `
+                    function alpha_foo()
+                    end function
+
+                    function alpha_bar()
+                        foo = function()
+                            return 1
+                        end function
+                        m.data = []
+                        m.data.push(foo)
+                    end function
+                `);
+            });
+
+            it('does not add underscores when param shadows namespaced func, used as an argument', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        function foo()
+                        end function
+
+                        function bar(foo)
+                            m.data = []
+                            m.data.push(foo)
+                        end function
+                    end namespace
+                `, `
+                    function alpha_foo()
+                    end function
+
+                    function alpha_bar(foo)
+                        m.data = []
+                        m.data.push(foo)
+                    end function
+                `);
+            });
+
+            it('does not add underscores when param shadows namespaced class, used as an argument', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        class foo
+                        end class
+
+                        function bar(foo)
+                            m.data = []
+                            m.data.push(foo)
+                        end function
+                    end namespace
+                `, `
+                    sub __alpha_foo_method_new()
                     end sub
+                    function __alpha_foo_builder()
+                        instance = {}
+                        instance.new = __alpha_foo_method_new
+                        return instance
+                    end function
+                    function alpha_foo()
+                        instance = __alpha_foo_builder()
+                        instance.new()
+                        return instance
+                    end function
+
+                    function alpha_bar(foo)
+                        m.data = []
+                        m.data.push(foo)
+                    end function
                 `);
-            }
-            doTest(`Dim c[5]`);
-            doTest(`Dim c[5, 4]`);
-            doTest(`Dim c[5, 4, 6]`);
-            doTest(`Dim requestData[requestList.count()]`);
-            doTest(`Dim requestData[1, requestList.count()]`);
-            doTest(`Dim requestData[1, requestList.count(), 2]`);
-            doTest(`Dim requestData[requestList[2]]`);
-            doTest(`Dim requestData[1, requestList[2]]`);
-            doTest(`Dim requestData[1, requestList[2], 2]`);
-            doTest(`Dim requestData[requestList["2"]]`);
-            doTest(`Dim requestData[1, requestList["2"]]`);
-            doTest(`Dim requestData[1, requestList["2"], 2]`);
-            doTest(`Dim requestData[1, StrToI("1"), 2]`);
-            testTranspile(`
-                function getValue(param1)
-                end function
+            });
 
-                sub main()
-                    requestList = []
-                    Dim requestData[1, getValue({
-                        key: "value"
-                    }), 2]
-                end sub
-            `);
+            it('does not insert const value when param shadows namespaced const', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        const foo = 1222
+
+                        function bar(foo)
+                            print foo
+                        end function
+                    end namespace
+                `, `
+                    function alpha_bar(foo)
+                        print foo
+                    end function
+                `);
+            });
+
+            it('does not insert const value when param shadows const', async () => {
+                await testTranspile(`
+                    const foo = 1222
+
+                    function bar(foo)
+                        print foo
+                    end function
+                `, `
+                    function bar(foo)
+                        print foo
+                    end function
+                `);
+            });
+
+            it('does not insert enum value when param shadows namespaced const', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        enum foo
+                            up
+                            down
+                        end enum
+
+                        function bar(foo)
+                            print foo.whatever
+                        end function
+                    end namespace
+                `, `
+                    function alpha_bar(foo)
+                        print foo.whatever
+                    end function
+                `);
+            });
+
+            it('inserts const value when using namespaced const defined in other namespace statement', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        const foo = 1222
+                    end namespace
+
+                    namespace alpha
+                        function bar()
+                            print foo
+                        end function
+                    end namespace
+                `, `
+                    function alpha_bar()
+                        print 1222
+                    end function
+                `);
+            });
+
+            it('does not replace variable arg that shadows namespace name', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        const foo = 1222
+                    end namespace
+
+                    function bar(alpha)
+                        print alpha.foo
+                    end function
+                `, `
+                    function bar(alpha)
+                        print alpha.foo
+                    end function
+                `);
+            });
+
+            it('does not replace defined variable that shadows namespace name', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        const foo = 1222
+                    end namespace
+
+                    function bar()
+                        alpha = {
+                            foo: 1
+                        }
+                        print alpha.foo
+                    end function
+                `, `
+                    function bar()
+                        alpha = {
+                            foo: 1
+                        }
+                        print alpha.foo
+                    end function
+                `);
+            });
         });
 
-        it('handles multi-index multi-dimensional arrays', () => {
-            testTranspile(`
-                sub main()
-                    myMultiArray = [[[[[[[[["hello"]]]]]]]]]
-                    myMultiArray[0][0][0][0][0][0][0][0][0] = "goodbye"
-                    print myMultiArray[0, 0, 0, 0, 0, 0, 0, 0, 0]
-                end sub
-            `, `
+        it('includes all text to end of line for a non-terminated string', async () => {
+            await testTranspile(
+                'sub main()\n    name = "john \nend sub',
+                'sub main()\n    name = "john "\nend sub',
+                null as any,
+                'source/main.bs',
+                false
+            );
+        });
+        it('escapes quotes in string literals', async () => {
+            await testTranspile(`
                 sub main()
-                    myMultiArray = [
-                        [
-                            [
-                                [
-                                    [
-                                        [
-                                            [
-                                                [
-                                                    [
-                                                        "hello"
-                                                    ]
-                                                ]
-                                            ]
-                                        ]
-                                    ]
-                                ]
-                            ]
-                        ]
-                    ]
-                    myMultiArray[0][0][0][0][0][0][0][0][0] = "goodbye"
-                    print myMultiArray[0, 0, 0, 0, 0, 0, 0, 0, 0]
+                    expected = "Hello"
+                    expected += chr(10) + " version=""2.0"""
                 end sub
             `);
         });
+        it('keeps function parameter types in proper order', async () => {
+            await testTranspile(`
+                function CreateTestStatistic(name as string, result = "Success" as string, time = 0 as integer, errorCode = 0 as integer, errorMessage = "" as string) as object
+                    return {}
+                end function
+            `);
+        });
 
-        it('transpiles calls to fully-qualified namespaced functions', () => {
-            testTranspile(`
-                namespace NameA
-                    sub alert()
-                    end sub
-                end namespace
-                namespace NameA.NameB
-                    sub alert()
-                    end sub
-                end namespace
-                sub main()
-                    NameA.alert()
-                    NameA.NameB.alert()
+        it('discard parameter types when removeParameterTypes is true', async () => {
+            program.options.removeParameterTypes = true;
+            await testTranspile(`
+                sub one(a as integer, b = "" as string, c = invalid as dynamic)
                 end sub
             `, `
-                sub NameA_alert()
-                end sub
-                sub NameA_NameB_alert()
-                end sub
-
-                sub main()
-                    NameA_alert()
-                    NameA_NameB_alert()
+                sub one(a, b = "", c = invalid)
                 end sub
-            `, 'trim', 'source/main.bs');
-        });
-
-        it('keeps end-of-line comments with their line', () => {
-            testTranspile(`
-                function DoSomething() 'comment 1
-                    name = "bob" 'comment 2
-                end function 'comment 3
             `);
         });
 
-        it('works for functions', () => {
-            testTranspile(`
-                function DoSomething()
-                    'lots of empty white space
-                    'that will be removed during transpile
-
-
-
+        it('discard return type when removeParameterTypes is true', async () => {
+            program.options.removeParameterTypes = true;
+            await testTranspile(`
+                function one() as string
+                    return ""
                 end function
             `, `
-                function DoSomething()
-                    'lots of empty white space
-                    'that will be removed during transpile
+                function one()
+                    return ""
                 end function
             `);
         });
 
-        it('keeps empty AAs and arrays on same line', () => {
-            testTranspile(`
-                sub a()
-                    person = {}
-                    stuff = []
-                end sub
-        `, null as any, 'trim');
-        });
-
-        it('does not add leading or trailing newlines', () => {
-            testTranspile(`function abc()\nend function`, undefined, 'none');
+        it('does not remove `as void` when removeParameterTypes is true', async () => {
+            program.options.removeParameterTypes = true;
+            await testTranspile(`
+                function one() as void
+                    return
+                end function
+            `, `
+                function one() as void
+                    return
+                end function
+            `);
         });
 
-        it('generates proper sourcemap comment', () => {
-            program.options.sourceMap = true;
-            const file = program.setFile('source/main.bs', `
-                sub main()
+        it('does not remove `as <type>` for sub when removeParameterTypes is true', async () => {
+            program.options.removeParameterTypes = true;
+            await testTranspile(`
+                sub one() as string
+                    return "hello"
                 end sub
-            `);
-            expect(file.transpile().code).to.eql(undent`
-                sub main()
+            `, `
+                sub one() as string
+                    return "hello"
                 end sub
-                '//# sourceMappingURL=./main.brs.map
             `);
         });
 
-        it('includes sourcemap.name property', () => {
-            program.options.sourceMap = true;
-            const file = program.setFile('source/main.bs', `
+        it('does not remove `as boolean` from onKeyEvent when removeParameterTypes is true', async () => {
+            program.options.removeParameterTypes = true;
+            await testTranspile(`
+                function onKeyEvent(p1) as boolean
+                    return true
+                end function
+
+                function somethingElse() as string
+                    return "hello"
+                end function
+            `, `
+                function onKeyEvent(p1) as boolean
+                    return true
+                end function
+
+                function somethingElse()
+                    return "hello"
+                end function
+            `);
+        });
+
+        it('transpiles local var assignment operators', async () => {
+            await testTranspile(`
                 sub main()
+                    count = 0
+                    count += 1
+                    count -= 1
+                    count *= 1
+                    count /= 1
+                    count \\= 1
+                    count <<= 1
+                    count >>= 1
                 end sub
             `);
-            expect(file.transpile().map.toJSON().file).to.eql('main.brs');
         });
 
-        it('sourcemap sources array contains absolute path by default', () => {
-            program.options.sourceMap = true;
-            const file = program.setFile('source/main.bs', `
+        it('transpiles AA property assignment operators', async () => {
+            await testTranspile(`
                 sub main()
+                    person = {
+                        count: 0
+                    }
+                    person.count += 1
                 end sub
             `);
-            const map = file.transpile().map.toJSON();
-            expect(map.sources).to.have.lengthOf(1);
-            expect(path.isAbsolute(map.sources[0])).to.be.true;
-            expect(s`${map.sources[0]}`).to.eql(s`${rootDir}/source/main.bs`);
         });
 
-        it('handles sourcemap edge case', async () => {
-            let source =
-                'sub main()\n' +
-                '\n' +
-                '    print 1\n' +
-                '\n' +
-                'end sub';
-            program.options.sourceMap = true;
-            let result = testTranspile(source, `sub main()\n    print 1\nend sub`, 'none', 'source/main.bs');
-            //load the source map
-            let location = await SourceMapConsumer.with(result.map.toJSON(), null, (consumer) => {
-                return consumer.generatedPositionFor({
-                    line: 3,
-                    column: 0,
-                    source: s`${rootDir}/source/main.bs`,
-                    bias: SourceMapConsumer.LEAST_UPPER_BOUND
-                });
-            });
-            expect(location.line).to.eql(2);
-            expect(location.column).eql(4);
+        it('transpiles AA indexed assignment operators', async () => {
+            await testTranspile(`
+                sub main()
+                    person = {
+                        count: 0
+                    }
+                    person["count"] += 1
+                end sub
+            `);
         });
 
-        it('computes correct locations for sourcemap', async () => {
-            let source = `function abc(name)\n    firstName = name\nend function`;
-            let tokens = Lexer.scan(source).tokens
-                //remove newlines and EOF
-                .filter(x => x.kind !== TokenKind.Eof && x.kind !== TokenKind.Newline);
+        it('relative-referenced namespaced functions get prefixed', async () => {
+            await testTranspile(`
+                namespace Vertibrates.Birds
+                    function GetAllBirds()
+                        return [
+                            GetDuck(),
+                            GetGoose()
+                        ]
+                    end function
 
-            program.options.sourceMap = true;
-            let result = testTranspile(source, source, 'none');
-            //load the source map
-            await SourceMapConsumer.with(result.map.toString(), null, (consumer) => {
-                let tokenResult = tokens.map(token => ({
-                    kind: token.kind,
-                    start: token.range.start
-                }));
-                let sourcemapResult = tokens.map(token => {
-                    let originalPosition = consumer.originalPositionFor({
-                        //convert token 0-based line to source-map 1-based line for the lookup
-                        line: token.range.start.line + 1,
-                        column: token.range.start.character
-                    });
-                    return {
-                        kind: token.kind,
-                        start: Position.create(
-                            //convert source-map 1-based line to token 0-based line
-                            originalPosition.line! - 1,
-                            originalPosition.column!
-                        )
-                    };
-                });
-                expect(sourcemapResult).to.eql(tokenResult);
-            });
+                    function GetDuck()
+                    end function
+
+                    function GetGoose()
+                    end function
+                end namespace
+            `, `
+                function Vertibrates_Birds_GetAllBirds()
+                    return [
+                        Vertibrates_Birds_GetDuck()
+                        Vertibrates_Birds_GetGoose()
+                    ]
+                end function
+
+                function Vertibrates_Birds_GetDuck()
+                end function
+
+                function Vertibrates_Birds_GetGoose()
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+
+        it('transpiles namespaced functions', async () => {
+            await testTranspile(`
+                namespace NameA
+                    sub alert()
+                    end sub
+                end namespace
+                namespace NameA.NameB
+                    sub alert()
+                    end sub
+                end namespace
+            `, `
+                sub NameA_alert()
+                end sub
+                sub NameA_NameB_alert()
+                end sub
+            `, 'trim', 'source/main.bs');
         });
 
-        it('handles empty if block', () => {
-            testTranspile(`
+        it('transpiles dim', async () => {
+            async function doTest(code: string) {
+                await testTranspile(`
+                    sub main()
+                        requestList = []
+                        ${code}
+                    end sub
+                `, `
+                    sub main()
+                        requestList = []
+                        ${code}
+                    end sub
+                `);
+            }
+            await doTest(`Dim c[5]`);
+            await doTest(`Dim c[5, 4]`);
+            await doTest(`Dim c[5, 4, 6]`);
+            await doTest(`Dim requestData[requestList.count()]`);
+            await doTest(`Dim requestData[1, requestList.count()]`);
+            await doTest(`Dim requestData[1, requestList.count(), 2]`);
+            await doTest(`Dim requestData[requestList[2]]`);
+            await doTest(`Dim requestData[1, requestList[2]]`);
+            await doTest(`Dim requestData[1, requestList[2], 2]`);
+            await doTest(`Dim requestData[requestList["2"]]`);
+            await doTest(`Dim requestData[1, requestList["2"]]`);
+            await doTest(`Dim requestData[1, requestList["2"], 2]`);
+            await doTest(`Dim requestData[1, StrToI("1"), 2]`);
+            await testTranspile(`
+                function getValue(param1)
+                end function
+
                 sub main()
-                    if true then
-                    end if
-                    if true then
-                    else
-                        print "else"
-                    end if
-                    if true then
-                    else if true then
-                        print "else"
-                    end if
-                    if true then
-                    else if true then
-                        print "elseif"
-                    else
-                        print "else"
-                    end if
+                    requestList = []
+                    Dim requestData[1, getValue({
+                        key: "value"
+                    }), 2]
                 end sub
             `);
         });
 
-        it('handles empty elseif block', () => {
-            testTranspile(`
+        it('handles multi-index multi-dimensional arrays', async () => {
+            await testTranspile(`
                 sub main()
-                    if true then
-                        print "if"
-                    else if true then
-                    end if
-                    if true then
-                        print "if"
-                    else if true then
-                    else if true then
-                    end if
+                    myMultiArray = [[[[[[[[["hello"]]]]]]]]]
+                    myMultiArray[0][0][0][0][0][0][0][0][0] = "goodbye"
+                    print myMultiArray[0, 0, 0, 0, 0, 0, 0, 0, 0]
+                end sub
+            `, `
+                sub main()
+                    myMultiArray = [
+                        [
+                            [
+                                [
+                                    [
+                                        [
+                                            [
+                                                [
+                                                    [
+                                                        "hello"
+                                                    ]
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                    myMultiArray[0][0][0][0][0][0][0][0][0] = "goodbye"
+                    print myMultiArray[0, 0, 0, 0, 0, 0, 0, 0, 0]
                 end sub
             `);
         });
 
-        it('handles empty else block', () => {
-            testTranspile(`
+        it('transpiles calls to fully-qualified namespaced functions', async () => {
+            await testTranspile(`
+                namespace NameA
+                    sub alert()
+                    end sub
+                end namespace
+                namespace NameA.NameB
+                    sub alert()
+                    end sub
+                end namespace
+                sub main()
+                    NameA.alert()
+                    NameA.NameB.alert()
+                end sub
+            `, `
+                sub NameA_alert()
+                end sub
+                sub NameA_NameB_alert()
+                end sub
+
                 sub main()
-                    if true then
-                        print "if"
-                    else
-                    end if
-                    if true then
-                        print "if"
-                    else if true then
-                        print "elseif"
-                    else
-                    end if
+                    NameA_alert()
+                    NameA_NameB_alert()
                 end sub
-            `);
+            `, 'trim', 'source/main.bs');
         });
 
-        it('handles else block with a leading comment', () => {
-            testTranspile(`
+        it('does not crash on undefined trivia', async () => {
+            //plugin that mangles trivia collections
+            program.plugins.add({
+                name: 'test-plugin',
+                prepareFile: (event) => {
+                    if (isBrsFile(event.file)) {
+                        //delete trivia from the eof token
+                        event.file.parser.eofToken.leadingTrivia = [];
+                        event.file.ast.walk(createVisitor({
+                            AstNode: (node) => {
+                                //delete all trivia from the node
+                                for (let i = 0; i < (node.leadingTrivia.length ?? 0); i++) {
+                                    delete node.leadingTrivia[i];
+                                }
+                                for (let i = 0; i < (node.endTrivia.length ?? 0); i++) {
+                                    delete node.endTrivia[i];
+                                }
+                            }
+                        }), {
+                            walkMode: WalkMode.visitAllRecursive
+                        });
+                        console.log('trivia removed');
+                    }
+                }
+            });
+
+            //ensure plugin errors are not suppressed
+            program.plugins['suppressErrors'] = false;
+
+            await testTranspile(`
+                'comment 1
+                sub main() 'comment 2
+                    'comment 3
+                    'comment 4
+                    print "main" 'comment 5
+                end sub 'comment 6
+                'comment 7
+            `, `
                 sub main()
-                    if true then
-                        print "if"
-                    else
-                        ' leading comment
-                        print "else"
-                    end if
+                    print "main"
                 end sub
-            `);
+            `, undefined, 'source/main.bs');
         });
 
-        it('works for function parameters', () => {
-            testTranspile(`
-                function DoSomething(name, age as integer, text as string)
-                end function
+        it('includes annotation comments for class', async () => {
+            await testTranspile(`
+                'comment1
+                @annotation
+                'comment2
+                @annotation()
+                'comment3
+                class Beta
+                end class
             `, `
-                function DoSomething(name, age as integer, text as string)
+                sub __Beta_method_new()
+                end sub
+                function __Beta_builder()
+                    instance = {}
+                    instance.new = __Beta_method_new
+                    return instance
                 end function
-            `);
+                'comment1
+                'comment2
+                'comment3
+                function Beta()
+                    instance = __Beta_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, undefined, 'source/main.bs');
         });
 
-        it('adds newlines between top-level statements', () => {
-            testTranspile(`
-                function a()
+        it('includes annotation comments for function', async () => {
+            await testTranspile(`
+                'comment1
+                @annotation
+                'comment2
+                @annotation()
+                'comment3
+                function alpha()
                 end function
-
-                function b()
+            `, `
+                'comment1
+                'comment2
+                'comment3
+                function alpha()
                 end function
-            `);
+            `, undefined, 'source/main.bs');
         });
 
-        it('properly indents nested AA literals', () => {
-            testTranspile(`
-                sub doSomething()
-                    grandparent = {
-                        parent: {
-                            child: {
-                                grandchild: {
-                                    name: "baby"
-                                }
-                            }
-                        }
-                    }
+        it('includes annotation comments for enum', async () => {
+            await testTranspile(`
+                'comment1
+                @annotation
+                'comment2
+                @annotation()
+                'comment3
+                enum Direction
+                    up = "up"
+                end enum
+            `, `
+                'comment1
+                'comment2
+                'comment3
+            `, undefined, 'source/main.bs');
+        });
+
+        it('includes annotation comments for const', async () => {
+            await testTranspile(`
+                'comment1
+                @annotation
+                'comment2
+                @annotation()
+                'comment3
+                const direction = "up"
+            `, `
+                'comment1
+                'comment2
+                'comment3
+            `, undefined, 'source/main.bs');
+        });
+
+        it('includes annotation comments for empty namespaces', async () => {
+            await testTranspile(`
+                'comment1
+                @annotation
+                'comment2
+                @annotation()
+                'comment3
+                namespace alpha
+                    'comment4
+                    @annotation
+                    'comment5
+                    @annotation()
+                    'comment6
+                    namespace beta
+                    end namespace
+                end namespace
+            `, `
+                'comment1
+                'comment2
+                'comment3
+                'comment4
+                'comment5
+                'comment6
+            `, undefined, 'source/main.bs');
+        });
+
+        it('includes comments above namespaced method call', async () => {
+            await testTranspile(`
+                sub main()
+                    'do nothing
+                    utils.noop()
                 end sub
-            `);
+                namespace utils
+                    sub noop()
+                    end sub
+                end namespace
+            `, `
+                sub main()
+                    'do nothing
+                    utils_noop()
+                end sub
+                sub utils_noop()
+                end sub
+            `, undefined, 'source/main.bs');
         });
 
-        it('does not add comma after final object property even when comments are present', () => {
-            testTranspile(`
-                sub doSomething()
-                    person = {
-                        age: 12 'comment
-                        name: "child"
-                    }
-                    person = {
-                        age: 12 'comment
-                        name: "child" 'comment
-                    }
-                    person = {
-                        age: 12 'comment
-                        name: "child"
-                        'comment
-                    }
-                    person = {
-                        age: 12 'comment
-                        name: "child" 'comment
-                        'comment
-                    }
+        it('includes comments above inferred namespace function call', async () => {
+            await testTranspile(`
+                namespace utils
+                    sub test()
+                        'do nothing
+                        noop()
+                    end sub
+                    sub noop()
+                    end sub
+                end namespace
+            `, `
+                sub utils_test()
+                    'do nothing
+                    utils_noop()
                 end sub
+
+                sub utils_noop()
+                end sub
+            `, undefined, 'source/main.bs');
+        });
+
+        it('keeps end-of-line comments with their line', async () => {
+            await testTranspile(`
+                function DoSomething() 'comment 1
+                    name = "bob" 'comment 2
+                end function 'comment 3
             `);
         });
 
-        it('works for a complex function with comments all over the place', () => {
-            testTranspile(`
-                'import some library
-                library "v30/bslCore.brs" 'comment
+        it('works for functions', async () => {
+            await testTranspile(`
+                function DoSomething()
+                    'lots of empty white space
+                    'that will be removed during transpile
+                    'since there are newlines below this comment one newline will be preserved
+
+
 
-                'a function that does something
-                function doSomething(age as integer, name = "bob") 'comment
-                    person = { 'comment
-                        name: "parent" 'comment
-                        "age": 12
-                        'comment as whole line
-                        child: { 'comment
-                            name: "child" 'comment
-                        }
-                    }
-                    person.name = "john" 'comment
-                    person.child.name = "baby" 'comment
-                    person["name"] = person.child["name"] 'comment
-                    age = 12 + 2 'comment
-                    name = "tim" 'comment
-                    age = 12 'comment
-                    while true 'comment
-                        age = age + 1 'comment
-                        exit while 'comment
-                    end while 'comment
-                    while age < 12 or age < 15 'comment
-                        age++ 'comment
-                        exit while 'comment
-                    end while 'comment
-                    if true or 1 = 1 or name = "tim" then 'comment
-                        print false 'comment
-                    else if false or "cat" = "dog" or true then 'comment
-                        print "true" 'comment
-                    else 'comment
-                        print "else" 'comment
-                    end if 'comment
-                    someBool = (true or false) or ((true) or (false)) 'comment
-                    mylabel: 'comment
-                    goto mylabel 'comment
-                    age++ 'comment
-                    age-- 'comment
-                    end 'comment
-                    stop 'comment
-                    indexes = [ 'comment
-                        'comment on its own line
-                        1 'comment
-                        2 'comment
-                        3 'comment
-                    ] 'comment
-                    firstIndex = indexes[0] 'comment
-                    for each idx in indexes 'comment
-                        indexes[idx] = idx + 1 'comment
-                    end for 'comment
-                    if not true then 'comment
-                        print "false" 'comment
-                    end if 'comment 'comment
-                    for i = 0 to 10 step 1 'comment
-                        name = "bob" 'comment
-                        age = 12 'comment
-                        exit for 'comment
-                    end for 'comment
-                    callback = function(name, age as integer, cb as Function) as integer 'comment
-                        returnValue = 12 'comment
-                        return returnValue 'comment
-                    end function 'comment
-                    print "a"; "b"; 3 'comment
-                    a(1, 2, 3) 'comment
-                    person.functionCall(1, 2, 3) 'comment
-                    if true then 'comment
-                        level = 1 'comment
-                        if false then 'comment
-                            level = 2 'comment
-                            if true or false then 'comment
-                                level = 3 'comment
-                                if false and true then 'comment
-                                    level = 4 'comment
-                                end if 'comment
-                            end if 'comment
-                        end if 'comment
-                    end if 'comment
                 end function
+            `, `
+                function DoSomething()
+                    'lots of empty white space
+                    'that will be removed during transpile
+                    'since there are newlines below this comment one newline will be preserved
 
-                function a(p1, p2, p3) 'comment
-                end function 'comment
+                end function
             `);
         });
 
-        it('simple mapped files include a reference to the source map', () => {
-            let file = program.setFile('source/logger.brs', trim`
-                sub logInfo()
+        it('keeps empty AAs and arrays on same line', async () => {
+            await testTranspile(`
+                sub a()
+                    person = {}
+                    stuff = []
                 end sub
-            `);
-            file.needsTranspiled = false;
-            const { code } = file.transpile();
-            expect(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+        `, null as any, 'trim');
         });
 
-        it('AST generated files include a reference to the source map', () => {
-            let file = program.setFile('source/logger.brs', trim`
-                sub logInfo()
-                end sub
-            `);
-            file.needsTranspiled = true;
-            const { code } = file.transpile();
-            expect(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+        it('does not add leading or trailing newlines', async () => {
+            await testTranspile(`function abc()\nend function`, undefined, 'none');
         });
 
-        it('replaces custom types in parameter types and return types', () => {
-            program.setFile('source/SomeKlass.bs', `
-                class SomeKlass
-                end class
+        it('generates proper sourcemap comment', () => {
+            program.options.sourceMap = true;
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                end sub
             `);
-            testTranspile(`
-                function foo() as SomeKlass
-                    return new SomeKlass()
-                end function
-
-                sub bar(obj as SomeKlass)
+            expect(file.transpile().code).to.eql(undent`
+                sub main()
                 end sub
-            `, `
-                function foo() as object
-                    return SomeKlass()
-                end function
+                '//# sourceMappingURL=./main.brs.map
+            `);
+        });
 
-                sub bar(obj as object)
+        it('includes sourcemap.name property', () => {
+            program.options.sourceMap = true;
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
                 end sub
             `);
+            expect(file.transpile().map.toJSON().file).to.eql('main.brs');
         });
 
-    });
+        it('sourcemap sources array contains absolute path by default', () => {
+            program.options.sourceMap = true;
+            const file = program.setFile('source/main.bs', `
+                sub main()
+                end sub
+            `) as any;
+            const map = file.transpile().map.toJSON();
+            expect(map.sources).to.have.lengthOf(1);
+            expect(path.isAbsolute(map.sources[0])).to.be.true;
+            expect(s`${map.sources[0]}`).to.eql(s`${rootDir}/source/main.bs`);
+        });
 
-    describe('callfunc operator', () => {
-        describe('transpile', () => {
-            it('does not produce diagnostics', () => {
-                program.setFile('source/main.bs', `
-                    sub test()
-                        someNode = createObject("roSGNode", "Rectangle")
-                        someNode@.someFunction(test.value)
-                    end sub
-                `);
-                program.validate();
-                expectZeroDiagnostics(program);
+        it('handles sourcemap edge case', async () => {
+            let source =
+                'sub main()\n' +
+                '\n' +
+                '    print 1\n' +
+                '\n' +
+                'end sub';
+            program.options.sourceMap = true;
+            let result = await testTranspile(source, `sub main()\n    print 1\nend sub`, 'none', 'source/main.bs');
+            //load the source map
+            let location = await SourceMapConsumer.with(result.map, null, (consumer) => {
+                return consumer.generatedPositionFor({
+                    line: 3,
+                    column: 0,
+                    source: s`${rootDir}/source/main.bs`,
+                    bias: SourceMapConsumer.LEAST_UPPER_BOUND
+                });
             });
+            expect(location.line).to.eql(2);
+            expect(location.column).eql(4);
+        });
 
-            it('sets invalid on empty callfunc', () => {
-                testTranspile(`
+        describe('jump statements', () => {
+            it('handles exit for', async () => {
+                await testTranspile(`
                     sub main()
-                        node = invalid
-                        node@.doSomething()
-                        m.top.node@.doSomething()
-                        m.top.node@.doSomething(1)
+                        for i = 1 to 10
+                            exit for
+                        end for
                     end sub
-                `, `
+                `);
+            });
+
+            it('handles exit while', async () => {
+                await testTranspile(`
                     sub main()
-                        node = invalid
-                        node.callfunc("doSomething", invalid)
-                        m.top.node.callfunc("doSomething", invalid)
-                        m.top.node.callfunc("doSomething", 1)
+                        while true
+                            exit while
+                        end while
                     end sub
                 `);
             });
 
-            it('includes original arguments', () => {
-                testTranspile(`
+            it('handles exitWhile (one word)', async () => {
+                await testTranspile(`
                     sub main()
-                        node = invalid
-                        node@.doSomething(1, true, m.top.someVal)
+                        while true
+                            exitWhile
+                        end while
                     end sub
-                `, `
+                `);
+            });
+
+            it('transpiles case correctly', async () => {
+                await testTranspile(`
                     sub main()
-                        node = invalid
-                        node.callfunc("doSomething", 1, true, m.top.someVal)
+                        for i = 1 to 10
+                            eXiT fOr
+                        end for
+                        while true
+                            exIt whILE
+                        end while
+                        while true
+                            eXitWhile
+                        end while
                     end sub
                 `);
             });
         });
-    });
 
-    describe('transform callback', () => {
-        function parseFileWithCallback(ext: string, onParsed: () => void) {
-            const rootDir = process.cwd();
-            const program = new Program({
-                rootDir: rootDir
-            });
-            program.plugins.add({
-                name: 'transform callback',
-                afterFileParse: onParsed
-            });
-            file = program.setFile(`source/file${ext}`, `
-                sub Sum()
-                    print "hello world"
-                end sub
-            `);
-            expect(file.extension).to.equal(ext);
-            return file;
-        }
 
-        it('called for BRS file', () => {
-            const onParsed = sinon.spy();
-            parseFileWithCallback('.brs', onParsed);
-            expect(onParsed.callCount).to.equal(1);
-        });
+        describe('sourcemap validation', () => {
+            it('computes correct source and position in sourcemap', async () => {
+                program.options.sourceMap = true;
 
-        it('called for BR file', () => {
-            const onParsed = sinon.spy();
-            parseFileWithCallback('.bs', onParsed);
-            expect(onParsed.callCount).to.equal(1);
-        });
-    });
+                const file = program.setFile<BrsFile>('source/main.bs', `function abc(name)\n    firstName = name\nend function`);
+                let i = 0;
+                //remove newlines and EOF
+                //set each token to a different file
+                for (const token of file.parser.tokens) {
+                    token.location.uri = util.pathToUri(s`${rootDir}/source/file${i++}.bs`);
+                }
 
-    describe('typedefKey', () => {
-        it('works for .brs files', () => {
-            expect(
-                s((program.setFile<BrsFile>('source/main.brs', '')).typedefKey)
-            ).to.equal(
-                s`${rootDir.toLowerCase()}/source/main.d.bs`
-            );
-        });
-        it('returns undefined for files that should not have a typedef', () => {
-            expect((program.setFile<BrsFile>('source/main.bs', '')).typedefKey).to.be.undefined;
+                const result = await program.getTranspiledFileContents(file.srcPath);
+                const tokens = file.parser.tokens.filter(x => x.kind !== TokenKind.Eof && x.kind !== TokenKind.Newline);
+
+                //load the source map
+                await SourceMapConsumer.with(result.map.toString(), null, (consumer) => {
+                    let sourcemapResult = tokens.map(token => {
+                        let originalPosition = consumer.originalPositionFor({
+                            //convert token 0-based line to source-map 1-based line for the lookup
+                            line: token.location?.range.start.line + 1,
+                            column: token.location?.range.start.character
+                        });
+                        return {
+                            kind: token.kind,
+                            start: Position.create(
+                                //convert source-map 1-based line to token 0-based line
+                                originalPosition.line! - 1,
+                                originalPosition.column!
+                            ),
+                            source: originalPosition.source
+                        };
+                    });
+                    expect(sourcemapResult).to.eql(
+                        tokens.map(token => ({
+                            kind: token.kind,
+                            start: token.location?.range.start,
+                            source: util.uriToPath(token.location.uri)
+                        }))
+                    );
+                });
+            });
 
-            expect((program.setFile<BrsFile>('source/main.d.bs', '')).typedefKey).to.be.undefined;
+            it('supports merging AST from one file into another', async () => {
+                program.options.sourceMap = true;
 
-            const xmlFile = program.setFile<BrsFile>('components/comp.xml', '');
-            expect(xmlFile.typedefKey).to.be.undefined;
-        });
-    });
+                const alpha = program.setFile<BrsFile>('source/alpha.bs', `
+                    function alpha()
+                        print "alpha"
+                    end function
+                `);
+                const beta = program.setFile<BrsFile>('source/beta.bs', `
+                    function beta()
+                        print "beta"
+                    end function
+                `);
+                //merge alpha into beta
+                beta.ast.statements.push(alpha.ast.statements[0]);
 
+                const result = await program.getTranspiledFileContents(beta.srcPath);
+                expect(result.code).to.eql(undent`
+                    function beta()
+                        print "beta"
+                    end function
 
-    describe('type definitions', () => {
-        it('only exposes defined functions even if source has more', () => {
-            //parse the .brs file first so it doesn't know about the typedef
-            program.setFile<BrsFile>('source/main.brs', `
-                sub main()
-                end sub
-                sub speak()
-                end sub
-            `);
+                    function alpha()
+                        print "alpha"
+                    end function
+                    '//# sourceMappingURL=./beta.brs.map
+                `);
 
-            program.setFile('source/main.d.bs', `
+                //load the source map
+                await SourceMapConsumer.with(result.map.toString(), null, (consumer) => {
+
+                    //prin|t "beta"
+                    doTest(1, 8, s`${rootDir}/source/beta.bs`, 2, 24);
+                    //prin|t "alpha"
+                    doTest(5, 8, s`${rootDir}/source/alpha.bs`, 2, 24);
+
+                    function doTest(destLine: number, destChar: number, srcPath: string, sourceLine: number, sourceChar: number) {
+                        let originalPosition = consumer.originalPositionFor({
+                            //convert token 0-based line to source-map 1-based line for the lookup
+                            line: destLine + 1,
+                            column: destChar
+                        });
+                        expect({
+                            start: Position.create(
+                                //convert source-map 1-based line to token 0-based line
+                                originalPosition.line! - 1,
+                                originalPosition.column!
+                            ),
+                            source: originalPosition.source
+                        }).to.eql({
+                            start: Position.create(
+                                //convert source-map 1-based line to token 0-based line
+                                sourceLine,
+                                sourceChar
+                            ),
+                            source: srcPath
+                        });
+                    }
+                });
+            });
+
+        });
+
+        it('handles empty if block', async () => {
+            await testTranspile(`
                 sub main()
+                    if true then
+                    end if
+                    if true then
+                    else
+                        print "else"
+                    end if
+                    if true then
+                    else if true then
+                        print "else"
+                    end if
+                    if true then
+                    else if true then
+                        print "elseif"
+                    else
+                        print "else"
+                    end if
                 end sub
             `);
-
-            const sourceScope = program.getScopeByName('source');
-            const functionNames = sourceScope.getAllCallables().map(x => x.callable.name);
-            expect(functionNames).to.include('main');
-            expect(functionNames).not.to.include('speak');
         });
 
-        it('reacts to typedef file changes', () => {
-            let file = program.setFile<BrsFile>('source/main.brs', `
+        it('handles empty elseif block', async () => {
+            await testTranspile(`
                 sub main()
-                end sub
-                sub speak()
+                    if true then
+                        print "if"
+                    else if true then
+                    end if
+                    if true then
+                        print "if"
+                    else if true then
+                    else if true then
+                    end if
                 end sub
             `);
-            expect(file.hasTypedef).to.be.false;
-            expect(file.typedefFile).not.to.exist;
+        });
 
-            program.setFile('source/main.d.bs', `
+        it('handles empty else block', async () => {
+            await testTranspile(`
                 sub main()
+                    if true then
+                        print "if"
+                    else
+                    end if
+                    if true then
+                        print "if"
+                    else if true then
+                        print "elseif"
+                    else
+                    end if
                 end sub
             `);
-            expect(file.hasTypedef).to.be.true;
-            expect(file.typedefFile).to.exist;
+        });
 
-            //add replace file, does it still find the typedef
-            file = program.setFile<BrsFile>('source/main.brs', `
+        it('handles else block with a leading comment', async () => {
+            await testTranspile(`
                 sub main()
-                end sub
-                sub speak()
+                    if true then
+                        print "if"
+                    else
+                        ' leading comment
+                        print "else"
+                    end if
                 end sub
             `);
-            expect(file.hasTypedef).to.be.true;
-            expect(file.typedefFile).to.exist;
-
-            program.removeFile(s`${rootDir}/source/main.d.bs`);
-
-            expect(file.hasTypedef).to.be.false;
-            expect(file.typedefFile).not.to.exist;
         });
-    });
-
-    describe('typedef', () => {
-        it('includes enum and interface types', () => {
-            testGetTypedef(`
-                interface Foo
-                    field as string
-                end interface
-
-                enum Bar
-                    value
-                end enum
 
-                function baz(parameter as Foo) as Bar
-                    return Bar.value
+        it('works for function parameters', async () => {
+            await testTranspile(`
+                function DoSomething(name, age as integer, text as string)
                 end function
             `, `
-                interface Foo
-                    field as string
-                end interface
-
-                enum Bar
-                    value
-                end enum
-                function baz(parameter as Foo) as Bar
+                function DoSomething(name, age as integer, text as string)
                 end function
             `);
         });
 
-        it('sets typedef path properly', () => {
-            expect((program.setFile<BrsFile>('source/main1.brs', '')).typedefKey).to.equal(s`${rootDir}/source/main1.d.bs`.toLowerCase());
-            expect((program.setFile<BrsFile>('source/main2.d.bs', '')).typedefKey).to.equal(undefined);
-            expect((program.setFile<BrsFile>('source/main3.bs', '')).typedefKey).to.equal(undefined);
-            //works for dest with `.brs` extension
-            expect((program.setFile<BrsFile>({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefKey).to.equal(undefined);
-        });
-
-        it('does not link when missing from program', () => {
-            const file = program.setFile<BrsFile>('source/main.brs', ``);
-            expect(file.typedefFile).not.to.exist;
-        });
+        it('adds newlines between top-level statements', async () => {
+            await testTranspile(`
+                function a()
+                end function
 
-        it('links typedef when added BEFORE .brs file', () => {
-            const typedef = program.setFile<BrsFile>('source/main.d.bs', ``);
-            const file = program.setFile<BrsFile>('source/main.brs', ``);
-            expect(file.typedefFile).to.equal(typedef);
+                function b()
+                end function
+            `);
         });
 
-        it('links typedef when added AFTER .brs file', () => {
-            const file = program.setFile<BrsFile>('source/main.brs', ``);
-            const typedef = program.setFile<BrsFile>('source/main.d.bs', ``);
-            expect(file.typedefFile).to.eql(typedef);
+        it('properly indents nested AA literals', async () => {
+            await testTranspile(`
+                sub doSomething()
+                    grandparent = {
+                        parent: {
+                            child: {
+                                grandchild: {
+                                    name: "baby"
+                                }
+                            }
+                        }
+                    }
+                end sub
+            `);
         });
 
-        it('removes typedef link when typedef is removed', () => {
-            const typedef = program.setFile<BrsFile>('source/main.d.bs', ``);
-            const file = program.setFile<BrsFile>('source/main.brs', ``);
-            program.removeFile(typedef.srcPath);
-            expect(file.typedefFile).to.be.undefined;
+        it('does not add comma after final object property even when comments are present', async () => {
+            await testTranspile(`
+                sub doSomething()
+                    person = {
+                        age: 12 'comment
+                        name: "child"
+                    }
+                    person = {
+                        age: 12 'comment
+                        name: "child" 'comment
+                    }
+                    person = {
+                        age: 12 'comment
+                        name: "child"
+                        'comment
+                    }
+                    person = {
+                        age: 12 'comment
+                        name: "child" 'comment
+                        'comment
+                    }
+                end sub
+            `);
         });
-    });
 
-    describe('getTypedef', () => {
-        function testTypedef(original: string, expected: string) {
-            let file = program.setFile<BrsFile>('source/main.brs', original);
-            program.validate();
-            expect(file.getTypedef().trimEnd()).to.eql(expected);
-        }
+        it('keeps spaces in between comments when a statement ends in a comment ', async () => {
+            await testTranspile(`
+                sub foo()
+                end sub 'comment
 
-        it('includes namespace on extend class names', () => {
-            testTypedef(`
-                namespace AnimalKingdom
-                    class Bird
-                    end class
-                    class Duck extends Bird
-                    end class
-                end namespace
-            `, trim`
-                namespace AnimalKingdom
-                    class Bird
-                        sub new()
-                        end sub
-                    end class
-                    class Duck extends AnimalKingdom.Bird
-                        sub new()
-                        end sub
-                    end class
-                end namespace
+                'a function that does something
+                sub foo2()
+                end sub
             `);
         });
 
-        it('strips function body', () => {
-            testTypedef(`
-                sub main(param1 as string)
-                    print "main"
+
+        it('keeps comment in correct place in empty function', async () => {
+            await testTranspile(`
+                sub noop1()
                 end sub
-            `, trim`
-                sub main(param1 as string)
+
+                sub noop2() 'comment in empty function
                 end sub
             `);
         });
 
-        it('includes annotations', () => {
-            testTypedef(`
-                namespace test
-                    @an
-                    @anFunc("value")
+        it('works for a complex function with comments all over the place', async () => {
+            await testTranspile(`
+                'import some library
+                library "v30/bslCore.brs" 'comment
+
+                'a function that does something
+                function doSomething(age as integer, name = "bob") 'comment
+                    person = { 'comment
+                        name: "parent" 'comment
+                        "age": 12
+                        'comment as whole line
+                        child: { 'comment
+                            name: "child" 'comment
+                        }
+                    }
+                    person.name = "john" 'comment
+                    person.child.name = "baby" 'comment
+                    person["name"] = person.child["name"] 'comment
+                    age = 12 + 2 'comment
+                    name = "tim" 'comment
+                    age = 12 'comment
+                    while true 'comment
+                        age = age + 1 'comment
+                        exit while 'comment
+                    end while 'comment
+                    while age < 12 or age < 15 'comment
+                        age++ 'comment
+                        exit while 'comment
+                    end while 'comment
+                    if true or 1 = 1 or name = "tim" then 'comment
+                        print false 'comment
+                    else if false or "cat" = "dog" or true then 'comment
+                        print "true" 'comment
+                    else 'comment
+                        print "else" 'comment
+                    end if 'comment
+                    someBool = (true or false) or ((true) or (false)) 'comment
+                    mylabel: 'comment
+                    goto mylabel 'comment
+                    age++ 'comment
+                    age-- 'comment
+                    end 'comment
+                    stop 'comment
+                    indexes = [ 'comment
+                        'comment on its own line
+                        1 'comment
+                        2 'comment
+                        3 'comment
+                    ] 'comment
+                    firstIndex = indexes[0] 'comment
+                    for each idx in indexes 'comment
+                        indexes[idx] = idx + 1 'comment
+                    end for 'comment
+                    if not true then 'comment
+                        print "false" 'comment
+                    end if 'comment 'comment
+                    for i = 0 to 10 step 1 'comment
+                        name = "bob" 'comment
+                        age = 12 'comment
+                        exit for 'comment
+                    end for 'comment
+                    callback = function(name, age as integer, cb as Function) as integer 'comment
+                        returnValue = 12 'comment
+                        return returnValue 'comment
+                    end function 'comment
+                    print "a"; "b"; 3 'comment
+                    a(1, 2, 3) 'comment
+                    person.functionCall(1, 2, 3) 'comment
+                    if true then 'comment
+                        level = 1 'comment
+                        if false then 'comment
+                            level = 2 'comment
+                            if true or false then 'comment
+                                level = 3 'comment
+                                if false and true then 'comment
+                                    level = 4 'comment
+                                end if 'comment
+                            end if 'comment
+                        end if 'comment
+                    end if 'comment
+                end function
+
+                function a(p1, p2, p3) 'comment
+                end function 'comment
+            `);
+        });
+
+        it('simple mapped files include a reference to the source map', () => {
+            let file = program.setFile<BrsFile>('source/logger.brs', trim`
+                sub logInfo()
+                end sub
+            `);
+            file['needsTranspiled'] = false;
+            const { code } = file.transpile();
+            expect(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+        });
+
+        it('AST generated files include a reference to the source map', () => {
+            let file = program.setFile<BrsFile>('source/logger.brs', trim`
+                sub logInfo()
+                end sub
+            `);
+            file['needsTranspiled'] = true;
+            const { code } = file.transpile();
+            expect(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+        });
+
+        it('replaces custom types in parameter types and return types', async () => {
+            program.setFile('source/SomeKlass.bs', `
+                class SomeKlass
+                end class
+            `);
+            await testTranspile(`
+                function foo() as SomeKlass
+                    return new SomeKlass()
+                end function
+
+                sub bar(obj as SomeKlass)
+                end sub
+            `, `
+                function foo() as dynamic
+                    return SomeKlass()
+                end function
+
+                sub bar(obj as dynamic)
+                end sub
+            `);
+        });
+
+        it('allows typecasts wrapped in parens', async () => {
+            program.setFile('source/SomeKlass.bs', `
+                class SomeKlass
+                end class
+            `);
+            await testTranspile(`
+                sub foo(obj as SomeKlass)
+                    (obj as roAssociativeArray).append({key:"value"})
+                    print 3 + (obj as roAssociativeArray).count()
+                end sub
+            `, `
+                sub foo(obj as dynamic)
+                    obj.append({
+                        key: "value"
+                    })
+                    print 3 + obj.count()
+                end sub
+            `);
+        });
+
+        it('allows multiple typecasts wrapped in parens', async () => {
+            program.setFile('source/SomeKlass.bs', `
+                class SomeKlass
+                    function value()
+                        return 0.123
+                    end function
+                end class
+            `);
+            await testTranspile(`
+                sub foo(obj)
+                    print val( sin( (0.707 + (obj as SomeKlass).value()) as float ).toStr() as string)
+                end sub
+            `, `
+                sub foo(obj)
+                    print val(sin((0.707 + obj.value())).toStr())
+                end sub
+            `);
+        });
+
+        it('allows a string of typecasts wrapped in parens', async () => {
+            program.setFile('source/SomeKlass.bs', `
+                class SomeKlass
+                    function data()
+                        return {key: "value"}
+                    end function
+                end class
+
+                interface SomeIFace
+                    key
+                end interface
+            `);
+            await testTranspile(`
+                sub foo(obj)
+                    print (((obj as SomeKlass).data() as SomeIFace).key as string).len() as integer
+                end sub
+            `, `
+                sub foo(obj)
+                    print obj.data().key.len()
+                end sub
+            `);
+        });
+
+        describe('alias', () => {
+            it('comments out the alias statement', async () => {
+                await testTranspile(`
+                    alias l = lcase
+                `, `
+                    'alias l = lcase
+                `);
+            });
+
+            it('replaces aliased consts', async () => {
+                program.setFile('source/types.bs', `
+                    const MyConst = 3.14
+                `);
+                await testTranspile(`
+                    import "pkg:/source/types.bs"
+                    alias myc = MyConst
+
+                    namespace alpha
+                        const MyConst = 100
+                        sub someFunc()
+                            print myc
+                        end sub
+                    end namespace
+                `, `
+                    'import "pkg:/source/types.bs"
+                    'alias myc = MyConst
+
+
+                    sub alpha_someFunc()
+                        print 3.14
+                    end sub
+                `);
+            });
+
+            it('replaces aliased function names', async () => {
+                program.setFile('source/types.bs', `
+                    sub someFunc()
+                    end sub
+                `);
+                await testTranspile(`
+                    import "pkg:/source/types.bs"
+                    alias sf = someFunc
+
+                    namespace alpha
+                        sub someFunc()
+                            sf()
+                        end sub
+                    end namespace
+                `, `
+                    'import "pkg:/source/types.bs"
+                    'alias sf = someFunc
+                    sub alpha_someFunc()
+                        someFunc()
+                    end sub
+                `);
+            });
+
+            it('replaces aliased consts', async () => {
+                program.setFile('source/types.bs', `
+                    const PI = 3.14
+                `);
+                await testTranspile(`
+                    import "pkg:/source/types.bs"
+                    alias p = PI
+
+                    namespace alpha
+                        function pi() as string
+                            return "apple"
+                        end function
+
+                        sub printPi()
+                            print p
+                        end sub
+                    end namespace
+                `, `
+                    'import "pkg:/source/types.bs"
+                    'alias p = PI
+                    function alpha_pi() as string
+                        return "apple"
+                    end function
+
+                    sub alpha_printPi()
+                        print 3.14
+                    end sub
+                `);
+            });
+
+            it('replaces aliased enums', async () => {
+                program.setFile('source/types.bs', `
+                    enum Direction
+                        north = "North"
+                        south = "South"
+                    end enum
+                `);
+                await testTranspile(`
+                    import "pkg:/source/types.bs"
+                    alias dir = Direction
+                    alias dirN = Direction.north
+
+                    namespace alpha
+                        function Direction() as string
+                            return "apple"
+                        end function
+
+                        sub printDir()
+                            print dir.north
+                            print dirN
+                        end sub
+                    end namespace
+                `, `
+                    'import "pkg:/source/types.bs"
+                    'alias dir = Direction
+                    'alias dirN = Direction.north
+                    function alpha_Direction() as string
+                        return "apple"
+                    end function
+
+                    sub alpha_printDir()
+                        print "North"
+                        print "North"
+                    end sub
+                `);
+            });
+
+            it('can deep alias a namespaced thing', async () => {
+                program.setFile('source/types.bs', `
+                    namespace alpha.beta.charlie
+                        sub foo(text as string)
+                            print text
+                        end sub
+
+                        const pi = 3.14
+                    end namespace
+                `);
+                await testTranspile(`
+                    import "pkg:/source/types.bs"
+                    alias abcfoo = alpha.beta.charlie.foo
+                    alias abcpi = alpha.beta.charlie.pi
+
+                    namespace SomeNamespace
+                        sub foo()
+                            abcfoo(abcpi.toStr())
+                        end sub
+                    end namespace
+                `, `
+                    'import "pkg:/source/types.bs"
+                    'alias abcfoo = alpha_beta_charlie_foo
+                    'alias abcpi = alpha_beta_charlie_pi
+                    sub SomeNamespace_foo()
+                        alpha_beta_charlie_foo(3.14.toStr())
+                    end sub
+                `);
+            });
+
+            it('can alias a namespace', async () => {
+                await testTranspile(`
+                    alias get2 = get
+
+                    namespace http
+                        'Do an HTTP request
+                        sub get()
+                            print get2.aa()
+                            print get2.aa().name
+                            print get2.ABC
+                            print get2.beta.DEF
+                            print get2.beta.AnimalSounds.dog
+                            print get2.MY_AA.id
+                        end sub
+                    end namespace
+
+                    namespace get
+                        function aa()
+                            return {name: "John doe"}
+                        end function
+
+                        const ABC = "ABC"
+
+                        const MY_AA = {id: 0}
+
+                        namespace beta
+                            const DEF = "DEF"
+                            enum AnimalSounds
+                                dog = "bark"
+                                cat = "meow"
+                            end enum
+                        end namespace
+                    end namespace
+                `, `
+                    'alias get2 = get
+                    'Do an HTTP request
+                    sub http_get()
+                        print get_aa()
+                        print get_aa().name
+                        print "ABC"
+                        print "DEF"
+                        print "bark"
+                        print ({
+                            id: 0
+                        }).id
+                    end sub
+                    function get_aa()
+                        return {
+                            name: "John doe"
+                        }
+                    end function
+                `);
+            });
+
+            it('can alias a class', async () => {
+                program.setFile('source/types.bs', `
+                    class Person
+                    end class
+                `);
+                await testTranspile(`
+                    import "types.bs"
+                    alias Person2 = Person
+                    sub test()
+                        dude = new Person2()
+                    end sub
+                `, `
+                    'import "types.bs"
+                    'alias Person2 = Person
+
+                    sub test()
+                        dude = Person()
+                    end sub
+                `);
+            });
+
+        });
+
+        it('allows comments after alias/typecast/import statements', async () => {
+            program.setFile('source/types.bs', `
+                class Person
+                end class
+
+                interface MyComponent
+                    name as string
+                end interface
+            `);
+            await testTranspile(`
+                typecast m as MyComponent ' typecast comment
+                import "types.bs" ' import comment
+                alias Person2 = Person ' alias comment
+
+                sub test()
+                    dude = new Person2()
+                    print m.name
+                end sub
+            `, `
+                'typecast m as MyComponent ' typecast comment
+                'import "types.bs" ' import comment
+                'alias Person2 = Person ' alias comment
+
+                sub test()
+                    dude = Person()
+                    print m.name
+                end sub
+            `);
+        });
+
+        it('allows comments on same line as alias before namespace', async () => {
+            program.setFile('source/types.bs', `
+                class Person
+                end class
+            `);
+            await testTranspile(`
+                import "types.bs" ' import comment
+                alias Person2 = Person ' alias comment
+
+                namespace alpha
+                    sub foo()
+                    end sub
+                end namespace
+            `, `
+                'import "types.bs" ' import comment
+                'alias Person2 = Person ' alias comment
+
+                sub alpha_foo()
+                end sub
+            `);
+        });
+
+        it('adds comments before eventually empty nodes', async () => {
+            await testTranspile(`
+                ' comment before enum
+                enum Direction
+                    north
+                    south
+                end enum
+
+                ' comment before const
+                const myconst = 1234
+
+                ' comment before interface
+                interface ABC
+                    id as integer
+                    function func() as string
+                end interface
+
+                ' comment before empty namespace
+                namespace alpha
+                end namespace
+            `, `
+                ' comment before enum
+
+                ' comment before const
+
+                ' comment before interface
+
+                ' comment before empty namespace
+            `);
+        });
+
+        describe('augmented assignments', () => {
+            it('transpiles directly', async () => {
+                await testTranspile(`
+                    sub testAugmentedAssigns()
+                        num = 7
+                        num++
+                        num += 2
+                        num -= 2
+                        num >>= 8
+                    end sub
+                `);
+            });
+
+            it('transpiles directly when LHS is a dotted get or indexed get', async () => {
+                await testTranspile(`
+                    sub testAugmentedAssigns(x)
+                        x[0]++
+                        x[0] += 2
+                        x.prop += "hello"
+                    end sub
+                `);
+            });
+        });
+
+        describe('leading and end trivia', () => {
+            it('transpiles leading/end trivia', async () => {
+                await testTranspile(`
+                    'comment before function
+                    sub test(x) 'comment end of line
+                        'comment at start of function
+                        print x 'comment at end of line
+                        'comment at end of function
+                    end sub
+                    'comment after function
+                `);
+            });
+
+            it('allows editing leading trivia', async () => {
+                const mainFile = program.setFile<BrsFile>('source/amain.bs', `
+                    sub test(x)
+                        print x
+                    end sub
+                `);
+                program.validate();
+                const funcStmt = mainFile.ast.statements[0] as FunctionStatement;
+                funcStmt.leadingTrivia.push(createToken(TokenKind.Comment, `'comment before function`), createToken(TokenKind.Newline));
+                funcStmt.func.body.statements[0].leadingTrivia.unshift(createToken(TokenKind.Comment, `'comment after func declaration`));
+
+                funcStmt.func.body.statements[0].leadingTrivia.push(
+                    createToken(TokenKind.Comment, `'comment at start of function`),
+                    createToken(TokenKind.Newline)
+                );
+
+                funcStmt.func.endTrivia.push(
+                    createToken(TokenKind.Comment, `'comment at end of function`),
+                    createToken(TokenKind.Newline)
+                );
+
+                mainFile.parser.eofToken.leadingTrivia.push(createToken(TokenKind.Comment, `'comment at end of file`));
+
+
+                await testTranspile(mainFile, `
+                    'comment before function
+                    sub test(x)
+                        'comment after func declaration
+                        'comment at start of function
+                        print x
+                        'comment at end of function
+                    end sub
+                    'comment at end of file
+                `);
+            });
+        });
+
+        describe('enums', () => {
+
+            it('handles shadowed enum names', async () => {
+                await testTranspile(`
+                    sub foo()
+                        event = {}
+                        event.event.append({})
+                    end sub
+
+                    enum event
+                    end enum
+                    `, `
+                    sub foo()
+                        event = {}
+                        event.event.append({})
+                    end sub
+                `);
+            });
+
+            it('handles shadowed enum names in namespace', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        sub foo()
+                            event = {}
+                            event.event.append({})
+                        end sub
+
+                        enum event
+                        end enum
+                    end namespace
+                    `, `
+                    sub alpha_foo()
+                        event = {}
+                        event.event.append({})
+                    end sub
+                `);
+            });
+
+            it('handles shadowed enum names in previous namespace', async () => {
+                await testTranspile(`
+                    namespace alpha
+                        namespace beta
+                            sub foo()
+                                event = {}
+                                event.event.append({})
+                                print 1
+                            end sub
+                        end namespace
+
+                        enum event
+                        end enum
+                    end namespace
+                    `, `
+                    sub alpha_beta_foo()
+                        event = {}
+                        event.event.append({})
+                        print 1
+                    end sub
+                `);
+            });
+        });
+
+        describe('inline interfaces', () => {
+            it('transpiles to "dynamic"', async () => {
+                await testTranspile(`
+                    function foo(input as {name as string}) as {id as string}
+                        output as {id as string} = {id: input.name}
+                        return output
+                    end function
+                    `, `
+                    function foo(input as dynamic) as dynamic
+                        output = {
+                            id: input.name
+                        }
+                        return output
+                    end function
+                `);
+            });
+        });
+    });
+
+    describe('union types', () => {
+
+        it('use dynamic for union of unlike primitives', async () => {
+            await testTranspile(`
+                function test1() as string or integer
+                    return "hello"
+                end function
+
+                function test2() as double or float
+                    return 1.23
+                end function
+
+                function test3() as integer or longinteger
+                    return 5
+                end function
+
+                function test4() as integer or integer or integer
+                    return 5
+                end function
+            `, `
+                function test1() as dynamic
+                    return "hello"
+                end function
+
+                function test2() as dynamic
+                    return 1.23
+                end function
+
+                function test3() as dynamic
+                    return 5
+                end function
+
+                function test4() as integer
+                    return 5
+                end function
+            `);
+        });
+
+        it('use object for union of object', async () => {
+            await testTranspile(`
+                function test1() as object
+                    return 1
+                end function
+
+                function test2() as object or object
+                    return 1
+                end function
+
+                function test3() as object or object or object
+                    return 1
+                end function
+                `, `
+                function test1() as object
+                    return 1
+                end function
+
+                function test2() as object
+                    return 1
+                end function
+
+                function test3() as object
+                    return 1
+                end function
+            `);
+        });
+    });
+
+    describe('callfunc operator', () => {
+        describe('transpile', () => {
+            it('does not produce diagnostics on plain roSGNode', () => {
+                program.setFile('source/main.bs', `
+                    sub test()
+                        someNode = createObject("roSGNode", "Node")
+                        someNode@.someFunction({test: "value"})
+                    end sub
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
+            it('sets invalid on empty callfunc with legacyCallfuncHandling=true', async () => {
+                program.options.legacyCallfuncHandling = true;
+                await testTranspile(`
+                    sub main(node)
+                        node@.doSomething()
+                        m.top.node@.doSomething()
+                        m.top.node@.doSomething(1)
+                    end sub
+                `, `
+                    sub main(node)
+                        node.callfunc("doSomething", invalid)
+                        m.top.node.callfunc("doSomething", invalid)
+                        m.top.node.callfunc("doSomething", 1)
+                    end sub
+                `);
+            });
+
+            it('empty callfunc allowed by default', async () => {
+                await testTranspile(`
+                    sub main(node)
+                        node@.doSomething()
+                        m.top.node@.doSomething()
+                        m.top.node@.doSomething(1)
+                    end sub
+                `, `
+                    sub main(node)
+                        node.callfunc("doSomething")
+                        m.top.node.callfunc("doSomething")
+                        m.top.node.callfunc("doSomething", 1)
+                    end sub
+                `);
+            });
+
+            it('includes original arguments', async () => {
+                await testTranspile(`
+                    sub main(node)
+                        node@.doSomething(1, true, m.top.someVal)
+                    end sub
+                `, `
+                    sub main(node)
+                        node.callfunc("doSomething", 1, true, m.top.someVal)
+                    end sub
+                `);
+            });
+        });
+    });
+
+    describe('transform callback', () => {
+        function parseFileWithCallback(ext: string, onParsed: () => void) {
+            const rootDir = process.cwd();
+            const program = new Program({
+                rootDir: rootDir
+            });
+            program.plugins.add({
+                name: 'transform callback',
+                afterProvideFile: onParsed
+            });
+            file = program.setFile(`source/file${ext}`, `
+                sub Sum()
+                    print "hello world"
+                end sub
+            `);
+            expect(file.extension).to.equal(ext);
+            return file;
+        }
+
+        it('called for BRS file', () => {
+            const onParsed = sinon.spy();
+            parseFileWithCallback('.brs', onParsed);
+            expect(onParsed.callCount).to.equal(1);
+        });
+
+        it('called for BR file', () => {
+            const onParsed = sinon.spy();
+            parseFileWithCallback('.bs', onParsed);
+            expect(onParsed.callCount).to.equal(1);
+        });
+    });
+
+    describe('typedefKey', () => {
+        it('works for .brs files', () => {
+            expect(
+                s((program.setFile<BrsFile>('source/main.brs', '')).typedefKey)
+            ).to.equal(
+                s`${rootDir.toLowerCase()}/source/main.d.bs`
+            );
+        });
+        it('returns undefined for files that should not have a typedef', () => {
+            expect((program.setFile<BrsFile>('source/main.bs', '')).typedefKey).to.be.undefined;
+
+            expect((program.setFile<BrsFile>('source/main.d.bs', '')).typedefKey).to.be.undefined;
+
+            const xmlFile = program.setFile<BrsFile>('components/comp.xml', '');
+            expect(xmlFile.typedefKey).to.be.undefined;
+        });
+    });
+
+    describe('type definitions', () => {
+        it('only exposes defined functions even if source has more', () => {
+            //parse the .brs file first so it doesn't know about the typedef
+            program.setFile<BrsFile>('source/main.brs', `
+                sub main()
+                end sub
+                sub speak()
+                end sub
+            `);
+
+            program.setFile('source/main.d.bs', `
+                sub main()
+                end sub
+            `);
+
+            const sourceScope = program.getScopeByName('source');
+            const functionNames = sourceScope.getAllCallables().map(x => x.callable.name);
+            expect(functionNames).to.include('main');
+            expect(functionNames).not.to.include('speak');
+        });
+
+        it('reacts to typedef file changes', () => {
+            let file = program.setFile<BrsFile>('source/main.brs', `
+                sub main()
+                end sub
+                sub speak()
+                end sub
+            `);
+            expect(file.hasTypedef).to.be.false;
+            expect(file.typedefFile).not.to.exist;
+
+            program.setFile('source/main.d.bs', `
+                sub main()
+                end sub
+            `);
+            expect(file.hasTypedef).to.be.true;
+            expect(file.typedefFile).to.exist;
+
+            //add replace file, does it still find the typedef
+            file = program.setFile<BrsFile>('source/main.brs', `
+                sub main()
+                end sub
+                sub speak()
+                end sub
+            `);
+            expect(file.hasTypedef).to.be.true;
+            expect(file.typedefFile).to.exist;
+
+            program.removeFile(s`${rootDir}/source/main.d.bs`);
+
+            expect(file.hasTypedef).to.be.false;
+            expect(file.typedefFile).not.to.exist;
+        });
+    });
+
+    describe('typedef', () => {
+        it('includes enum and interface types', async () => {
+            await testGetTypedef(`
+                interface Foo
+                    field as string
+                end interface
+
+                enum Bar
+                    value
+                end enum
+
+                function baz(parameter as Foo) as Bar
+                    return Bar.value
+                end function
+            `, `
+                interface Foo
+                    field as string
+                end interface
+
+                enum Bar
+                    value
+                end enum
+                function baz(parameter as Foo) as Bar
+                end function
+            `);
+        });
+
+        it('sets typedef path properly', () => {
+            expect((program.setFile<BrsFile>('source/main1.brs', '')).typedefKey).to.equal(s`${rootDir}/source/main1.d.bs`.toLowerCase());
+            expect((program.setFile<BrsFile>('source/main2.d.bs', '')).typedefKey).to.equal(undefined);
+            expect((program.setFile<BrsFile>('source/main3.bs', '')).typedefKey).to.equal(undefined);
+            //works for dest with `.brs` extension
+            expect((program.setFile<BrsFile>({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefKey).to.equal(undefined);
+        });
+
+        it('does not link when missing from program', () => {
+            const file = program.setFile<BrsFile>('source/main.brs', ``);
+            expect(file.typedefFile).not.to.exist;
+        });
+
+        it('links typedef when added BEFORE .brs file', () => {
+            const typedef = program.setFile<BrsFile>('source/main.d.bs', ``);
+            const file = program.setFile<BrsFile>('source/main.brs', ``);
+            expect(file.typedefFile).to.equal(typedef);
+        });
+
+        it('links typedef when added AFTER .brs file', () => {
+            const file = program.setFile<BrsFile>('source/main.brs', ``);
+            const typedef = program.setFile<BrsFile>('source/main.d.bs', ``);
+            expect(file.typedefFile).to.eql(typedef);
+        });
+
+        it('removes typedef link when typedef is removed', () => {
+            const typedef = program.setFile<BrsFile>('source/main.d.bs', ``);
+            const file = program.setFile<BrsFile>('source/main.brs', ``);
+            program.removeFile(typedef.srcPath);
+            expect(file.typedefFile).to.be.undefined;
+        });
+    });
+
+    describe('getTypedef', () => {
+        function testTypedef(original: string, expected: string, mode: ParseMode = ParseMode.BrighterScript) {
+            const ext = mode === ParseMode.BrighterScript ? 'bs' : 'brs';
+            let file = program.setFile<BrsFile>(`source/main.${ext}`, original);
+            program.validate();
+            expectZeroDiagnostics(program);
+            expect(file.getTypedef().trimEnd()).to.eql(expected);
+        }
+
+        it('includes namespace on extend class names', () => {
+            testTypedef(`
+                namespace AnimalKingdom
+                    class Bird
+                    end class
+                    class Duck extends Bird
+                    end class
+                end namespace
+            `, trim`
+                namespace AnimalKingdom
+                    class Bird
+                        sub new()
+                        end sub
+                    end class
+                    class Duck extends AnimalKingdom.Bird
+                        sub new()
+                        end sub
+                    end class
+                end namespace
+            `);
+        });
+
+        it('strips function body', () => {
+            testTypedef(`
+                sub main(param1 as string)
+                    print "main"
+                end sub
+            `, trim`
+                sub main(param1 as string)
+                end sub
+            `);
+        });
+
+        it('includes annotations', () => {
+            testTypedef(`
+                namespace test
+                    @an
+                    @anFunc("value")
+                    function getDuck()
+                    end function
+                    class Duck
+                        @anMember
+                        @anMember("field")
+                        private thing
+
+                        @anMember
+                        @anMember("func")
+                        private function foo()
+                        end function
+                    end class
+                end namespace
+            `, trim`
+                namespace test
+                    @an
+                    @anFunc("value")
                     function getDuck()
                     end function
-                    class Duck
-                        @anMember
-                        @anMember("field")
-                        private thing
+                    class Duck
+                        sub new()
+                        end sub
+                        @anMember
+                        @anMember("field")
+                        private thing as dynamic
+                        @anMember
+                        @anMember("func")
+                        private function foo()
+                        end function
+                    end class
+                end namespace
+            `);
+        });
+
+        it('includes import statements', () => {
+            program.setFile('source/lib.brs', ``);
+            testTypedef(`
+               import "pkg:/source/lib.brs"
+            `, trim`
+                import "pkg:/source/lib.brs"
+            `);
+        });
+
+        it('includes namespace statements', () => {
+            testTypedef(`
+                namespace Name
+                    sub logInfo()
+                    end sub
+                end namespace
+                namespace NameA.NameB
+                    sub logInfo()
+                    end sub
+                end namespace
+            `, trim`
+                namespace Name
+                    sub logInfo()
+                    end sub
+                end namespace
+                namespace NameA.NameB
+                    sub logInfo()
+                    end sub
+                end namespace
+            `);
+        });
+
+        it('includes classes', () => {
+            testTypedef(`
+                class Person
+                    public name as string
+                    public age = 12
+                    public sub getAge() as integer
+                        return m.age
+                    end sub
+                end class
+                namespace NameA.NameB
+                    class Person
+                        public name as string
+                        public age = 12
+                        public sub getAge() as integer
+                            return m.age
+                        end sub
+                    end class
+                end namespace
+            `, trim`
+                class Person
+                    sub new()
+                    end sub
+                    public name as string
+                    public age as integer
+                    public sub getAge() as integer
+                    end sub
+                end class
+                namespace NameA.NameB
+                    class Person
+                        sub new()
+                        end sub
+                        public name as string
+                        public age as integer
+                        public sub getAge() as integer
+                        end sub
+                    end class
+                end namespace
+            `);
+        });
+
+        it('creates constructor properly', () => {
+            testTypedef(`
+                class Parent
+                end class
+            `, trim`
+                class Parent
+                    sub new()
+                    end sub
+                end class
+            `);
+        });
+
+        it('sets properties to dynamic when initialized to invalid', () => {
+            testTypedef(`
+                class Human
+                    public firstName = invalid
+                    public lastName as string = invalid
+                end class
+            `, trim`
+                class Human
+                    sub new()
+                    end sub
+                    public firstName as dynamic
+                    public lastName as string
+                end class
+            `);
+        });
+
+        it('includes class inheritance', () => {
+            testTypedef(`
+                class Human
+                    name
+                    sub new(name as string)
+                        m.name = name
+                    end sub
+                end class
+                class Person extends Human
+                    sub new(name as string)
+                        super(name)
+                    end sub
+                end class
+            `, trim`
+                class Human
+                    public name as dynamic
+                    sub new(name as string)
+                    end sub
+                end class
+                class Person extends Human
+                    sub new(name as string)
+                    end sub
+                end class
+            `);
+        });
+
+        it('includes access modifier keyword', () => {
+            testTypedef(`
+                class Human
+                    public firstName as string
+                    protected middleName as string
+                    private lastName as string
+                    public function getFirstName()
+                        return m.firstName
+                    end function
+                    protected function getMiddleName()
+                        return m.middleName
+                    end function
+                    private function getLastName()
+                        return m.lastName
+                    end function
+                end class
+            `, trim`
+                class Human
+                    sub new()
+                    end sub
+                    public firstName as string
+                    protected middleName as string
+                    private lastName as string
+                    public function getFirstName()
+                    end function
+                    protected function getMiddleName()
+                    end function
+                    private function getLastName()
+                    end function
+                end class
+            `);
+        });
 
-                        @anMember
-                        @anMember("func")
-                        private function foo()
-                        end function
+        it('includes overrides keyword if present in source', () => {
+            testTypedef(`
+                class Animal
+                    public sub speak()
+                        print "Hello Animal"
+                    end sub
+                end class
+                class Dog extends Animal
+                    public override sub speak()
+                        print "Hello Dog"
+                    end sub
+                end class
+            `, trim`
+                class Animal
+                    sub new()
+                    end sub
+                    public sub speak()
+                    end sub
+                end class
+                class Dog extends Animal
+                    sub new()
+                    end sub
+                    public override sub speak()
+                    end sub
+                end class
+            `);
+        });
+
+        it('includes class inheritance cross-namespace', () => {
+            testTypedef(`
+                namespace NameA
+                    class Human
+                        name
+                        sub new(name as string)
+                            m.name = name
+                        end sub
+                    end class
+                end namespace
+                namespace NameB
+                    class Person extends NameA.Human
+                        sub new(name as string)
+                            super(name)
+                        end sub
                     end class
                 end namespace
             `, trim`
-                namespace test
-                    @an
-                    @anFunc("value")
-                    function getDuck()
-                    end function
-                    class Duck
-                        sub new()
+                namespace NameA
+                    class Human
+                        public name as dynamic
+                        sub new(name as string)
+                        end sub
+                    end class
+                end namespace
+                namespace NameB
+                    class Person extends NameA.Human
+                        sub new(name as string)
                         end sub
-                        @anMember
-                        @anMember("field")
-                        private thing as dynamic
-                        @anMember
-                        @anMember("func")
-                        private function foo()
-                        end function
                     end class
                 end namespace
             `);
         });
+    });
+
+    describe('parser getter', () => {
+        it('recreates the parser when missing', () => {
+            const file = program.setFile<BrsFile>('source/main.brs', `
+                sub main()
+                end sub
+            `);
+            const parser = file['_parser'];
+            //clear the private _parser instance
+            file['_parser'] = undefined as any;
+
+            //force the file to get a new instance of parser
+            const newParser = file.parser;
+
+            expect(newParser).to.exist.and.to.not.equal(parser);
+
+            //reference shouldn't change in subsequent accesses
+            expect(file.parser).to.equal(newParser);
+        });
+
+        it('call parse when previously skipped', () => {
+            program.setFile<BrsFile>('source/main.d.bs', `'typedef
+                sub main()
+                end sub
+            `);
+            const file = program.setFile<BrsFile>('source/main.brs', `'source
+                sub main()
+                end sub
+            `);
+            //no functions should be found since the parser was skipped
+            expect(file['_parser']).to.not.exist;
+
+            const stub = sinon.stub(file, 'parse').callThrough();
+
+            //`file.parser` is a getter, so that should force the parse to occur
+            expect(file.parser.ast).to.exist;
+            expect(stub.called).to.be.true;
+            //parse should have been called
+        });
+    });
+
+    describe('Plugins', () => {
+        let pluginFileName: string;
+        let idx = 1;
+        beforeEach(() => {
+            pluginFileName = `plugin-${idx++}.js`;
+            fsExtra.outputFileSync(s`${tempDir}/plugins/${pluginFileName}`, `
+                function plugin() {
+                    return {
+                        name: 'lower-file-name',
+                        afterProvideFile: (evt) => {
+                            evt.files[0]._customProp = true;
+                        }
+                    };
+                }
+                exports.default = plugin;
+            `);
+        });
+
+        it('can load an absolute plugin which receives callbacks', () => {
+            for (const plugin of util.loadPlugins(tempDir, [s`${tempDir}/plugins/${pluginFileName}`])) {
+                program.plugins.add(plugin);
+            }
+            const file = program.setFile<any>('source/MAIN.brs', '');
+            expect(file._customProp).to.exist;
+        });
+
+        it('can load a relative plugin which receives callbacks', () => {
+            for (const plugin of util.loadPlugins(tempDir, [`./plugins/${pluginFileName}`])) {
+                program.plugins.add(plugin);
+            }
+            const file = program.setFile<any>('source/MAIN.brs', '');
+            expect(file._customProp).to.exist;
+        });
+    });
+
+    describe('getDefinition', () => {
+        it('returns const locations', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    print alpha.beta.charlie
+                end sub
+                namespace alpha.beta
+                    const CHARLIE = true
+                end namespace
+            `);
+            program.validate();
+            //print alpha.beta.char|lie
+            expect(program.getDefinition(file.srcPath, Position.create(2, 41))).to.eql([{
+                uri: util.pathToUri(file.srcPath),
+                range: util.createRange(5, 26, 5, 33)
+            }]);
+        });
+
+        it('returns enum locations', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    print alpha.beta.people.charlie
+                end sub
+                namespace alpha.beta
+                    enum people
+                        charlie = "charles"
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //print alpha.beta.char|lie
+            expect(program.getDefinition(file.srcPath, Position.create(2, 40))).to.eql([{
+                uri: util.pathToUri(file.srcPath),
+                range: util.createRange(5, 25, 5, 31)
+            }]);
+        });
 
-        it('includes import statements', () => {
-            testTypedef(`
-               import "pkg:/source/lib.brs"
-            `, trim`
-                import "pkg:/source/lib.brs"
+        it('returns interface location', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub test(selectedMovie as Movie)
+                    print selectedMovie
+                end sub
+                interface Movie
+                    url as string
+                end interface
             `);
+            program.validate();
+            // sub test(selectedMovie as Mo|vie)
+            expect(program.getDefinition(file.srcPath, Position.create(1, 44))).to.eql([{
+                uri: util.pathToUri(file.srcPath),
+                range: util.createRange(4, 26, 4, 31)
+            }]);
         });
 
-        it('includes namespace statements', () => {
-            testTypedef(`
-                namespace Name
-                    sub logInfo()
-                    end sub
-                end namespace
-                namespace NameA.NameB
-                    sub logInfo()
-                    end sub
-                end namespace
-            `, trim`
-                namespace Name
-                    sub logInfo()
-                    end sub
-                end namespace
-                namespace NameA.NameB
-                    sub logInfo()
-                    end sub
+        it('returns namespaced interface location', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub test(selectedMovie as interfaces.Movie)
+                    print selectedMovie
+                end sub
+                namespace interfaces
+                    interface Movie
+                        url as string
+                    end interface
                 end namespace
             `);
+            program.validate();
+            //sub test(selectedMovie as interfaces.Mo|vie)
+            expect(program.getDefinition(file.srcPath, Position.create(1, 55))).to.eql([{
+                uri: util.pathToUri(file.srcPath),
+                range: util.createRange(5, 30, 5, 35)
+            }]);
         });
 
-        it('includes classes', () => {
-            testTypedef(`
-                class Person
-                    public name as string
-                    public age = 12
-                    public sub getAge() as integer
-                        return m.age
-                    end sub
+        it('returns class location', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub test(selectedMovie as Movie)
+                    print selectedMovie
+                end sub
+                class Movie
+                    url as string
                 end class
-                namespace NameA.NameB
-                    class Person
-                        public name as string
-                        public age = 12
-                        public sub getAge() as integer
-                            return m.age
-                        end sub
+            `);
+            program.validate();
+            //sub test(selectedMovie as Mo|vie)
+            expect(program.getDefinition(file.srcPath, Position.create(1, 44))).to.eql([{
+                uri: util.pathToUri(file.srcPath),
+                range: util.createRange(4, 22, 4, 27)
+            }]);
+        });
+
+        it('returns namespaced class location', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub test(selectedMovie as classes.Movie)
+                    print selectedMovie
+                end sub
+                namespace classes
+                    class Movie
+                        url as string
                     end class
                 end namespace
-            `, trim`
-                class Person
-                    sub new()
-                    end sub
-                    public name as string
-                    public age as integer
-                    public sub getAge() as integer
-                    end sub
-                end class
-                namespace NameA.NameB
-                    class Person
-                        sub new()
-                        end sub
-                        public name as string
-                        public age as integer
-                        public sub getAge() as integer
-                        end sub
-                    end class
+            `);
+            program.validate();
+            //sub test(selectedMovie as classes.Mo|vie)
+            expect(program.getDefinition(file.srcPath, Position.create(1, 52))).to.eql([{
+                uri: util.pathToUri(file.srcPath),
+                range: util.createRange(5, 26, 5, 31)
+            }]);
+        });
+
+        it('does not crash on nulls', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    print alpha.beta
+                end sub
+            `);
+            program.validate();
+            sinon.stub(util, 'getAllDottedGetParts').returns(null as any);
+            // print alpha.be|ta
+            expect(program.getDefinition(file.srcPath, Position.create(2, 34))).to.eql([]);
+        });
+
+        it('returns enum member locations', () => {
+            const file = program.setFile<BrsFile>('source/main.bs', `
+                sub main()
+                    print alpha.beta.people.charlie
+                end sub
+                namespace alpha.beta
+                    enum people
+                        charlie = "charles"
+                    end enum
                 end namespace
             `);
+            program.validate();
+            //print alpha.beta.char|lie
+            expect(program.getDefinition(file.srcPath, Position.create(2, 48))).to.eql([{
+                uri: util.pathToUri(file.srcPath),
+                range: util.createRange(6, 24, 6, 31)
+            }]);
         });
+    });
 
-        it('creates constructor properly', () => {
-            testTypedef(`
-                class Parent
-                end class
-            `, trim`
-                class Parent
-                    sub new()
-                    end sub
-                end class
+    it('catches mismatched `end` keywords for functions', () => {
+        const file = program.setFile('source/main.brs', `
+            function speak()
+            end sub
+            sub walk()
+            end function
+        `);
+        program.validate();
+        expectDiagnostics(program, [{
+            ...DiagnosticMessages.closingKeywordMismatch('function', 'sub'),
+            location: util.createLocationFromFileRange(file, util.createRange(2, 12, 2, 19))
+        }, {
+            ...DiagnosticMessages.closingKeywordMismatch('sub', 'function'),
+            location: util.createLocationFromFileRange(file, util.createRange(4, 12, 4, 24))
+        }]);
+    });
+
+    describe('requiredSymbols', () => {
+        it('should be empty for a simple file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function someFunc() as integer
+                    return 1
+                end function
             `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('validateFile', validateFileEvent);
+
+            expect(mainFile.requiredSymbols.length).to.eq(0);
         });
 
-        it('sets properties to dynamic when initialized to invalid', () => {
-            testTypedef(`
-                class Human
-                    public firstName = invalid
-                    public lastName as string = invalid
-                end class
-            `, trim`
-                class Human
-                    sub new()
+        it('should be empty if the file needs no external symbols', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function someFunc() as integer
+                    return 1
+                end function
+
+                sub useKlass()
+                    k = new Klass()
+                    k.addTwo()
+                end sub
+
+                class Klass
+                    sub addTwo()
+                        print someFunc() + someFunc()
                     end sub
-                    public firstName as dynamic
-                    public lastName as string
                 end class
             `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('validateFile', validateFileEvent);
+
+            expect(mainFile.requiredSymbols.length).to.eq(0);
         });
 
-        it('includes class inheritance', () => {
-            testTypedef(`
-                class Human
-                    sub new(name as string)
-                        m.name = name
-                    end sub
-                end class
-                class Person extends Human
-                    sub new(name as string)
-                        super(name)
-                    end sub
-                end class
-            `, trim`
-                class Human
-                    sub new(name as string)
-                    end sub
-                end class
-                class Person extends Human
-                    sub new(name as string)
-                    end sub
-                end class
+        it('should not include global callables or types', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function printLower(s as string) as integer
+                    print lcase(s.trim())
+                end function
+
+                sub setLabelText( label as roSGNodeLabel, text as string)
+                label.text = text
+                end sub
             `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('validateFile', validateFileEvent);
+
+            expect(mainFile.requiredSymbols.length).to.eq(0);
         });
 
-        it('includes access modifier keyword', () => {
-            testTypedef(`
-                class Human
-                    public firstName as string
-                    protected middleName as string
-                    private lastName as string
-                    public function getFirstName()
-                        return m.firstName
-                    end function
-                    protected function getMiddleName()
-                        return m.middleName
-                    end function
-                    private function getLastName()
-                        return m.lastName
-                    end function
-                end class
-            `, trim`
-                class Human
-                    sub new()
-                    end sub
-                    public firstName as string
-                    protected middleName as string
-                    private lastName as string
-                    public function getFirstName()
-                    end function
-                    protected function getMiddleName()
-                    end function
-                    private function getLastName()
-                    end function
-                end class
+        it('transpiles multi-dimension typed arrays to dynamic', async () => {
+            await testTranspile(`
+                sub main(param1 as float[][][])
+                end sub
+            `, `
+                sub main(param1 as dynamic)
+                end sub
+            `);
+        });
+
+        it('removes typecasts in transpiled code', async () => {
+            await testTranspile(`
+                sub main(myNode, myString)
+                    print (myNode as roSGNode).id
+                    print (myNode as roSGNode).getParent().id
+                    myNode2 = myNode as roSgNode
+                    print (myString as string).len()
+                    print (myString as string).right(3)
+                    myString2 = myString as string
+                end sub
+            `, `
+                sub main(myNode, myString)
+                    print myNode.id
+                    print myNode.getParent().id
+                    myNode2 = myNode
+                    print myString.len()
+                    print myString.right(3)
+                    myString2 = myString
+                end sub
+            `);
+        });
+
+        it('allows and removes multiple typecasts in transpiled code', async () => {
+            await testTranspile(`
+                sub main(myNode)
+                    print ((myNode as roSGNode as roSGNodeLabel).text as string as ifStringOps).len()
+                end sub
+            `, `
+                sub main(myNode)
+                    print myNode.text.len()
+                end sub
+            `);
+        });
+
+        it('allows built in objects as type names', async () => {
+            //v1 transpiles unknown / built-in roku types to `dynamic` instead of `object`
+            //so the typed-assignment story stays consistent (see "allows types on lhs of
+            //assignments" earlier in this file). Master used `object` here, but v1's design
+            //is `dynamic`.
+            await testTranspile(`
+                sub main(x as roSGNode, y as roSGNodeEvent, z as ifArray)
+                end sub
+            `, `
+                sub main(x as dynamic, y as dynamic, z as dynamic)
+                end sub
+            `);
+        });
+
+        it('allows component names as types names', async () => {
+            await testTranspile(`
+                sub main(x as roSGNodeGroup, y as roSGNodeRowList, z as roSGNodeCustomComponent)
+                end sub
+            `, `
+                sub main(x as dynamic, y as dynamic, z as dynamic)
+                end sub
+            `);
+        });
+
+        it('allows union types for primitives', async () => {
+            await testTranspile(`
+                sub main(x as string or float, y as object or float or string)
+                end sub
+            `, `
+                sub main(x as dynamic, y as dynamic)
+                end sub
             `);
         });
 
-        it('includes overrides keyword if present in source', () => {
-            testTypedef(`
-                class Animal
-                    public sub speak()
-                        print "Hello Animal"
-                    end sub
-                end class
-                class Dog extends Animal
-                    public override sub speak()
-                        print "Hello Dog"
-                    end sub
-                end class
-            `, trim`
-                class Animal
-                    sub new()
-                    end sub
-                    public sub speak()
-                    end sub
-                end class
-                class Dog extends Animal
-                    sub new()
-                    end sub
-                    public override sub speak()
-                    end sub
-                end class
+        it('allows union types for classes, interfaces', async () => {
+            await testTranspile(`
+                interface IFaceA
+                    name as string
+                    data as integer
+                end interface
+
+                interface IFaceB
+                    name as string
+                    value as float
+                end interface
+
+                sub main(x as IFaceA or IFaceB)
+                end sub
+            `, `
+                sub main(x as dynamic)
+                end sub
             `);
         });
 
-        it('includes class inheritance cross-namespace', () => {
-            testTypedef(`
-                namespace NameA
-                    class Human
-                        sub new(name as string)
-                            m.name = name
-                        end sub
-                    end class
-                end namespace
-                namespace NameB
-                    class Person extends NameA.Human
-                        sub new(name as string)
-                            super(name)
-                        end sub
-                    end class
-                end namespace
-            `, trim`
-                namespace NameA
-                    class Human
-                        sub new(name as string)
-                        end sub
-                    end class
+        it('allows union types for classes, interfaces', async () => {
+            await testTranspile(`
+                namespace alpha.beta
+                    interface IFaceA
+                        name as string
+                        data as integer
+                    end interface
+
+                    interface IFaceB
+                        name as string
+                        value as float
+                    end interface
                 end namespace
-                namespace NameB
-                    class Person extends NameA.Human
-                        sub new(name as string)
-                        end sub
-                    end class
+
+                sub main(x as alpha.beta.IFaceA or alpha.beta.IFaceB)
+                end sub
+            `, `
+                sub main(x as dynamic)
+                end sub
+            `);
+        });
+
+        it('allows union types of arrays', async () => {
+            await testTranspile(`
+                namespace alpha.beta
+                    interface IFaceA
+                        name as string
+                        data as integer
+                    end interface
+
+                    interface IFaceB
+                        name as string
+                        value as float
+                    end interface
                 end namespace
+
+                sub main(x as alpha.beta.IFaceA[][] or alpha.beta.IFaceB[] or ifStringOps)
+                end sub
+            `, `
+                sub main(x as dynamic)
+                end sub
             `);
         });
-    });
 
-    describe('parser getter', () => {
-        it('recreates the parser when missing', () => {
-            const file = program.setFile<BrsFile>('source/main.brs', `
-                sub main()
+
+        it('allows intersection types for primitives', async () => {
+            await testTranspile(`
+                sub main(x as string and float, y as object and float or string)
+                end sub
+            `, `
+                sub main(x as dynamic, y as dynamic)
                 end sub
             `);
-            const parser = file['_parser'];
-            //clear the private _parser instance
-            file['_parser'] = undefined as any;
+        });
 
-            //force the file to get a new instance of parser
-            const newParser = file.parser;
+        it('allows intersection types for classes, interfaces', async () => {
+            await testTranspile(`
+                interface IFaceA
+                    name as string
+                    data as integer
+                end interface
 
-            expect(newParser).to.exist.and.to.not.equal(parser);
+                interface IFaceB
+                    name as string
+                    value as float
+                end interface
 
-            //reference shouldn't change in subsequent accesses
-            expect(file.parser).to.equal(newParser);
+                sub main(x as IFaceA and IFaceB)
+                end sub
+            `, `
+                sub main(x as dynamic)
+                end sub
+            `);
         });
 
-        it('call parse when previously skipped', () => {
-            program.setFile<BrsFile>('source/main.d.bs', `'typedef
-                sub main()
+        it('allows intersection types for classes, interfaces', async () => {
+            await testTranspile(`
+                namespace alpha.beta
+                    interface IFaceA
+                        name as string
+                        data as integer
+                    end interface
+
+                    interface IFaceB
+                        name as string
+                        value as float
+                    end interface
+                end namespace
+
+                sub main(x as alpha.beta.IFaceA and alpha.beta.IFaceB)
+                end sub
+            `, `
+                sub main(x as dynamic)
                 end sub
             `);
-            const file = program.setFile<BrsFile>('source/main.brs', `'source
-                sub main()
+        });
+
+        it('allows intersection types of arrays', async () => {
+            await testTranspile(`
+                namespace alpha.beta
+                    interface IFaceA
+                        name as string
+                        data as integer
+                    end interface
+
+                    interface IFaceB
+                        name as string
+                        value as float
+                    end interface
+                end namespace
+
+                sub main(x as alpha.beta.IFaceA[][] and alpha.beta.IFaceB[] and ifStringOps)
+                end sub
+            `, `
+                sub main(x as dynamic)
                 end sub
             `);
-            //no functions should be found since the parser was skipped
-            expect(file['_parser']).to.not.exist;
+        });
 
-            const stub = sinon.stub(file, 'parse').callThrough();
+        it('allows grouped expression in types types', async () => {
+            await testTranspile(`
+                namespace alpha.beta
+                    interface IFaceA
+                        name as string
+                        data as integer
+                    end interface
 
-            //`file.parser` is a getter, so that should force the parse to occur
-            expect(file.parser.references.functionStatements).to.be.lengthOf(1);
-            expect(stub.called).to.be.true;
-            //parse should have been called
+                    interface IFaceB
+                        name as string
+                        value as float
+                    end interface
+                end namespace
+
+                sub main(x as (alpha.beta.IFaceA and alpha.beta.IFaceB)[] or ifStringOps)
+                end sub
+            `, `
+                sub main(x as dynamic)
+                end sub
+            `);
         });
-    });
 
-    describe('Plugins', () => {
-        let pluginFileName: string;
-        let idx = 1;
-        beforeEach(() => {
-            pluginFileName = `plugin-${idx++}.js`;
-            fsExtra.outputFileSync(s`${tempDir}/plugins/${pluginFileName}`, `
-                function plugin() {
-                    return {
-                        name: 'lower-file-name',
-                        afterFileParse: (evt) => {
-                            evt._customProp = true;
-                        }
-                    };
-                }
-                exports.default = plugin;
+        it('allows built-in types for return values', async () => {
+            //v1 transpiles unknown / built-in roku types to `dynamic` instead of `object`
+            //(see "allows built in objects as type names" earlier in this file)
+            await testTranspile(`
+                function makeLabel(text as string) as roSGNodeLabel
+                   label = createObject("roSGNode", "Label")
+                   label.text = text
+                end function
+            `, `
+                function makeLabel(text as string) as dynamic
+                    label = createObject("roSGNode", "Label")
+                    label.text = text
+                end function
             `);
+            const mainFile = program.getFile<BrsFile>('source/main.bs');
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('validateFile', validateFileEvent);
+
+            expect(mainFile.requiredSymbols.length).to.eq(0);
         });
 
-        it('can load an absolute plugin which receives callbacks', () => {
-            program.plugins = new PluginInterface(
-                util.loadPlugins(tempDir, [
-                    s`${tempDir}/plugins/${pluginFileName}`
-                ]),
-                { logger: createLogger() }
-            );
-            const file = program.setFile<any>('source/MAIN.brs', '');
-            expect(file._customProp).to.exist;
+        it('should include unknown param and return types', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function someFunc(arg as OneType) as TwoType
+                    return arg.getTwo()
+                end function
+            `);
+            validateFile(mainFile);
+
+            expect(mainFile.requiredSymbols.length).to.eq(2);
+            expect(mainFile.requiredSymbols.map(x => x.typeChain[0].name)).to.have.same.members([
+                'TwoType', 'OneType']);
+        });
+
+        it('allows built-in types for interface members', () => {
+            program.setFile<BrsFile>('source/main.bs', `
+                interface MyBase
+                    regex as roRegex
+                    node as roSGNodeLabel
+                    sub outputMatches(textInput as string)
+                    function getLabelParent() as roSGNode
+                end interface
+                `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows extends on interfaces', async () => {
+            await testTranspile(`
+                interface MyBase
+                    url as string
+                end interface
+
+                interface MyExtends extends MyBase
+                    method as string
+                end interface
+            `, `
+            `);
         });
 
-        it('can load a relative plugin which receives callbacks', () => {
-            program.plugins = new PluginInterface(
-                util.loadPlugins(tempDir, [
-                    `./plugins/${pluginFileName}`
-                ]),
-                { logger: createLogger() }
-            );
-            const file = program.setFile<any>('source/MAIN.brs', '');
-            expect(file._customProp).to.exist;
+        it('should include unknown param and return types on class methods', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                class Klass
+                    function someFunc(arg as OneType) as TwoType
+                        return arg.getTwo()
+                    end function
+                end class
+            `);
+            validateFile(mainFile);
+
+            expect(mainFile.requiredSymbols.length).to.eq(2);
+            expect(mainFile.requiredSymbols.map(x => x.typeChain[0].name)).to.have.same.members([
+                'TwoType', 'OneType']);
         });
-    });
 
-    describe('getDefinition', () => {
-        it('returns const locations', () => {
-            const file = program.setFile<BrsFile>('source/main.bs', `
-                sub main()
-                    print alpha.beta.charlie
+        it('should not include assigned symbols', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                sub someFunc(arg as SomeOtherType)
+                    x = arg.member
+                    print x+1
                 end sub
-                namespace alpha.beta
-                    const CHARLIE = true
-                end namespace
             `);
-            program.validate();
-            //print alpha.beta.char|lie
-            expect(program.getDefinition(file.srcPath, Position.create(2, 41))).to.eql([{
-                uri: URI.file(file.srcPath).toString(),
-                range: util.createRange(5, 26, 5, 33)
-            }]);
+            validateFile(mainFile);
+
+            expect(mainFile.requiredSymbols.length).to.eq(1);
+            // x and arg are assigned.. they are not included in the required symbols
+            expect(mainFile.requiredSymbols[0].typeChain[0].name).to.equal('SomeOtherType');
         });
-        it('returns enum locations', () => {
-            const file = program.setFile<BrsFile>('source/main.bs', `
-                sub main()
-                    print alpha.beta.people.charlie
+
+        it('should include functions called that are not in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                sub someFunc()
+                    x = otherFileFunc1()
+                    print x+1
                 end sub
-                namespace alpha.beta
-                    enum people
-                        charlie = "charles"
-                    end enum
-                end namespace
+
+                function deepFunctionCall(i as integer)
+                    x = 2*i and otherFileFunc2()
+                    y = sin(x+fix(78.2)*log(otherFileFunc3()))
+                    ' this is a comment otherFileFunc5()
+                    return y-otherFileFunc4()
+                end function
             `);
-            program.validate();
-            //print alpha.beta.char|lie
-            expect(program.getDefinition(file.srcPath, Position.create(2, 40))).to.eql([{
-                uri: URI.file(file.srcPath).toString(),
-                range: util.createRange(5, 25, 5, 31)
-            }]);
+            validateFile(mainFile);
+
+            expect(mainFile.requiredSymbols.length).to.eq(4);
+            expect(mainFile.requiredSymbols.map(x => x.typeChain[0].name)).to.have.same.members([
+                'otherFileFunc1', 'otherFileFunc2', 'otherFileFunc3', 'otherFileFunc4'
+            ]);
         });
 
-        it('does not crash on nulls', () => {
-            const file = program.setFile<BrsFile>('source/main.bs', `
-                sub main()
-                    print alpha.beta
-                end sub
+        it('should include classes called that are not in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function someFunc(other as OtherKlass) as NS1.Thing
+                    x = new AnotherClass()
+                    return other.getThing(x)
+                end function
             `);
-            program.validate();
-            sinon.stub(util, 'getAllDottedGetParts').returns(null as any);
-            // print alpha.be|ta
-            expect(program.getDefinition(file.srcPath, Position.create(2, 34))).to.eql([]);
+            validateFile(mainFile);
+
+            expect(mainFile.requiredSymbols.length).to.eq(3);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            expect(requiredTypeChains).to.have.same.members([
+                'OtherKlass', 'NS1.Thing', 'AnotherClass'
+            ]);
+            const requiredSymbolsFlags = mainFile.requiredSymbols.map(x => x.flags);
+            expect(requiredSymbolsFlags).to.have.same.members([
+                SymbolTypeFlag.typetime, SymbolTypeFlag.typetime, SymbolTypeFlag.runtime
+            ]);
         });
 
-        it('returns enum member locations', () => {
-            const file = program.setFile<BrsFile>('source/main.bs', `
-                sub main()
-                    print alpha.beta.people.charlie
+        it('should include enums and consts that are not in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                sub someFunc(myEnum as SomeEnum)
+                    if myEnum = SomeEnum.value1
+                        print 1
+                    else if myEnum = SomeEnum.value2
+                        print 2
+                    else if myEnum = SomeConstValue
+                        print 3
+                    end if
                 end sub
-                namespace alpha.beta
-                    enum people
-                        charlie = "charles"
-                    end enum
-                end namespace
             `);
-            program.validate();
-            //print alpha.beta.char|lie
-            expect(program.getDefinition(file.srcPath, Position.create(2, 48))).to.eql([{
-                uri: URI.file(file.srcPath).toString(),
-                range: util.createRange(6, 24, 6, 31)
-            }]);
+            validateFile(mainFile);
+
+            expect(mainFile.requiredSymbols.length).to.eq(4);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            expect(requiredTypeChains).to.have.same.members([
+                'SomeEnum', 'SomeEnum.value1', 'SomeEnum.value2', 'SomeConstValue'
+            ]);
+            const requiredSymbolsFlags = mainFile.requiredSymbols.map(x => x.flags);
+            expect(requiredSymbolsFlags).to.have.same.members([
+                SymbolTypeFlag.typetime, SymbolTypeFlag.runtime, SymbolTypeFlag.runtime, SymbolTypeFlag.runtime
+            ]);
         });
-    });
 
-    it('catches mismatched `end` keywords for functions', () => {
-        program.setFile('source/main.brs', `
-            function speak()
-            end sub
-            sub walk()
-            end function
-        `);
-        program.validate();
-        expectDiagnostics(program, [{
-            ...DiagnosticMessages.mismatchedEndCallableKeyword('function', 'sub'),
-            range: util.createRange(2, 12, 2, 19)
-        }, {
-            ...DiagnosticMessages.mismatchedEndCallableKeyword('sub', 'function'),
-            range: util.createRange(4, 12, 4, 24)
-        }]);
-    });
+        it('should include types not defined in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                interface Data
+                    kind as DataKind
+                    getObj as DataObject
+                    subData as SubData
+                end interface
 
+                class DataObject extends BaseData
+                    kind as DataKind
+                    function process(dataProcess as DataProcessor) as ProcessedData
+                        return dataProcess.work(m)
+                    end function
+                end class
+            `);
+            validateFile(mainFile);
+            // 'DataKind' is there twice:
+            // - when used as a type
+            // - when DataObject.kind is used
+            expect(mainFile.requiredSymbols.length).to.eq(6);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            expect(Array.from(requiredTypeChains)).to.have.same.members([
+                'DataKind', 'DataKind', 'SubData', 'BaseData', 'DataProcessor', 'ProcessedData'
+            ]);
+            const requiredSymbolsFlags = mainFile.requiredSymbols.map(x => x.flags);
+            expect(requiredSymbolsFlags).to.have.same.members([
+                SymbolTypeFlag.typetime, SymbolTypeFlag.typetime, SymbolTypeFlag.typetime, SymbolTypeFlag.typetime, SymbolTypeFlag.typetime, SymbolTypeFlag.typetime
+            ]);
 
-    describe('backporting v1 syntax changes', () => {
+            const requiredSymbolsEndFlags = mainFile.requiredSymbols.map(x => x.endChainFlags);
+            expect(requiredSymbolsEndFlags).to.have.same.members([
+                SymbolTypeFlag.typetime, SymbolTypeFlag.runtime, SymbolTypeFlag.typetime, SymbolTypeFlag.typetime, SymbolTypeFlag.typetime, SymbolTypeFlag.typetime
+            ]);
+        });
 
-        it('transpiles typed arrays to dynamic', () => {
-            testTranspile(`
-                sub main(param1 as string[], param2 as SomeType[])
-                end sub
-            `, `
-                sub main(param1 as dynamic, param2 as dynamic)
-                end sub
+        it('includes namespace details', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                namespace Alpha.Beta
+                    sub printConstVal()
+                        print CONST_VALUE
+                    end sub
+                end namespace
+
+                namespace Delta
+                    namespace Gamma
+                        namespace Eta
+                            sub doStuff(x as OtherType)
+                                x.something()
+                            end sub
+                        end namespace
+                    end namespace
+                end namespace
             `);
+            validateFile(mainFile);
+
+            expect(mainFile.requiredSymbols.length).to.eq(2);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            expect(requiredTypeChains).to.have.same.members([
+                'CONST_VALUE', 'OtherType'
+            ]);
+            expect(mainFile.requiredSymbols[0].containingNamespaces).to.have.same.members(['Alpha', 'Beta']);
+            expect(mainFile.requiredSymbols[1].containingNamespaces).to.have.same.members(['Delta', 'Gamma', 'Eta']);
         });
+        it('does not include namespaces that are defined in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                namespace name1
+                    const PI = 3.14
 
-        it('transpiles typed arrays in return types to dynamic', () => {
-            testTranspile(`
-                function main() as integer[]
-                    return []
-                end function
-            `, `
-                function main() as dynamic
-                    return []
-                end function
+                    namespace name2
+                        function getPi() as float
+                            return name1.PI
+                        end function
+                    end namespace
+                end namespace
             `);
+            validateFile(mainFile);
+            expect(mainFile.requiredSymbols.length).to.eq(0);
         });
 
-        it('transpiles typed arrays in return types to dynamic', () => {
-            testTranspile(`
-                function main() as integer[]
-                    return []
-                end function
-            `, `
-                function main() as dynamic
-                    return []
+
+        it('should put types from typecasts as typetime required', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function takesIface(z) as string
+                    return (z as MyInterface).name
                 end function
             `);
+            validateFile(mainFile);
+            expect(mainFile.requiredSymbols.length).to.eq(1);
+            expect(mainFile.requiredSymbols[0].flags).to.eq(SymbolTypeFlag.typetime);
         });
 
-        it('transpiles multi-dimension typed arrays to dynamic', () => {
-            testTranspile(`
-                sub main(param1 as float[][][])
-                end sub
-            `, `
-                sub main(param1 as dynamic)
-                end sub
+        it('should not include symbols in same namespace', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                namespace alpha
+                    const PI = 3.14
+                    function area(r as float) as float
+                        return alpha.PI * r * r
+                    end function
+                end namespace
             `);
+            validateFile(mainFile);
+            expect(mainFile.requiredSymbols.length).to.eq(0);
         });
 
-        it('removes typecasts in transpiled code', () => {
-            testTranspile(`
-                sub main(myNode, myString)
-                    print (myNode as roSGNode).id
-                    print (myNode as roSGNode).getParent().id
-                    myNode2 = myNode as roSgNode
-                    print (myString as string).len()
-                    print (myString as string).right(3)
-                    myString2 = myString as string
-                end sub
-            `, `
-                sub main(myNode, myString)
-                    print myNode.id
-                    print myNode.getParent().id
-                    myNode2 = myNode
-                    print myString.len()
-                    print myString.right(3)
-                    myString2 = myString
-                end sub
+        it('should not include symbols in same namespace, but different statements', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                namespace alpha
+                    function area(r as float) as float
+                        return alpha.PI * r * r
+                    end function
+                end namespace
+
+                namespace alpha
+                    const PI = 3.14
+                end namespace
             `);
+            validateFile(mainFile);
+            expect(mainFile.requiredSymbols.length).to.eq(0);
         });
 
-        it('allows and removes multiple typecasts in transpiled code', () => {
-            testTranspile(`
-                sub main(myNode)
-                    print ((myNode as roSGNode as roSGNodeLabel).text as string as ifStringOps).len()
-                end sub
-            `, `
-                sub main(myNode)
-                    print myNode.text.len()
-                end sub
+        it('should include symbols in imported file', () => {
+            const otherFile: BrsFile = program.setFile('source/other.bs', `
+                namespace alpha
+                    const PI = 3.14
+                end namespace
+            `);
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                import "pkg:/source/other.bs"
+                namespace alpha
+                    function area(r as float) as float
+                        return alpha.PI * r * r
+                    end function
+                end namespace
             `);
+            validateFile(otherFile, mainFile);
+            expect(mainFile.requiredSymbols.length).to.eq(1);
         });
 
-        it('allows built in objects as type names', () => {
-            testTranspile(`
-                sub main(x as roSGNode, y as roSGNodeEvent, z as ifArray)
-                end sub
-            `, `
-                sub main(x as object, y as object, z as object)
-                end sub
+        it('should  include symbols in imported file of imported file', () => {
+            const deepFile: BrsFile = program.setFile('source/deep.bs', `
+                namespace alpha
+                    const SOME_VALUE = 2
+                end namespace
+            `);
+            const otherFile: BrsFile = program.setFile('source/other.bs', `
+                import "pkg:/source/deep.bs"
+                namespace alpha
+                    const PI = 3.14
+                end namespace
+            `);
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                import "pkg:/source/other.bs"
+                namespace alpha
+                    function area(r as float) as float
+                        return alpha.PI * r * r * alpha.SOME_VALUE
+                    end function
+                end namespace
             `);
+            validateFile(otherFile, mainFile, deepFile);
+            expect(mainFile.requiredSymbols.length).to.eq(2);
         });
 
-        it('allows component names as types names', () => {
-            testTranspile(`
-                sub main(x as roSGNodeGroup, y as roSGNodeRowList, z as roSGNodeCustomComponent)
-                end sub
-            `, `
-                sub main(x as object, y as object, z as object)
-                end sub
+        it('should ignore imports even with circular references', () => {
+            const deepFile: BrsFile = program.setFile('source/deep.bs', `
+                import "pkg:/source/main.bs"
+                namespace alpha
+                    function getMyValue()
+                        return alpha.MY_VALUE
+                    end function
+                end namespace
+            `);
+            const otherFile: BrsFile = program.setFile('source/other.bs', `
+                import "pkg:/source/deep.bs"
+                namespace alpha
+                    const PI = 3.14
+                end namespace
+            `);
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                import "pkg:/source/other.bs"
+                namespace alpha
+                    function area(r as float) as float
+                        return alpha.PI * r * r * alpha.getMyValue()
+                    end function
+                    const MY_VALUE = 2
+                end namespace
             `);
+            validateFile(otherFile, mainFile, deepFile);
+            expect(mainFile.requiredSymbols.length).to.eq(2);
         });
+    });
 
-        it('allows union types for primitives', () => {
-            testTranspile(`
-                sub main(x as string or float, y as object or float or string)
-                end sub
-            `, `
-                sub main(x as dynamic, y as dynamic)
-                end sub
+    describe('providedSymbols', () => {
+
+        it('includes functions defined in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function someFunc() as integer
+                    return 1
+                end function
+
+                function someFunc2() as float
+                    return 2.3
+                end function
             `);
+            validateFile(mainFile);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+            expect(runtimeSymbols.size).to.eq(2);
+            const someFuncType = runtimeSymbols.get('somefunc').symbol.type;
+            expectTypeToBe(someFuncType, TypedFunctionType);
+            const someFunc2Type = runtimeSymbols.get('somefunc2').symbol.type;
+            expectTypeToBe(someFunc2Type, TypedFunctionType);
         });
 
-        it('allows union types for classes, interfaces', () => {
-            testTranspile(`
-                interface IFaceA
+        it('includes functions with unresolved params/return types', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                function someFunc() as OtherFileType
+                    return new OtherFileType()
+                end function
+            `);
+            validateFile(mainFile);
+
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+            expect(runtimeSymbols.size).to.eq(1);
+            const someFuncType = runtimeSymbols.get('somefunc').symbol.type;
+            expectTypeToBe(someFuncType, TypedFunctionType);
+            const requiredSymbols = mainFile.requiredSymbols.map(x => x.typeChain[0].name);
+            expect(requiredSymbols).to.have.same.members(['OtherFileType', 'OtherFileType']);
+            const requiredSymbolTypes = mainFile.requiredSymbols.map(x => x.flags);
+            expect(requiredSymbolTypes).to.have.same.members([SymbolTypeFlag.runtime, SymbolTypeFlag.typetime]);
+        });
+
+        it('includes classes defined in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                class Klass
+                    name as string
+                end class
+
+                class Klass2 extends Klass
+                    age as integer
+
+                    function getId() as string
+                        return m.name + " " + m.age.toStr()
+                    end function
+                end class
+
+                class Klass3
+                    propClass = new Klass2()
+                end class
+            `);
+            validateFile(mainFile);
+
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+            expect(runtimeSymbols.size).to.eq(3);
+            expectTypeToBe(runtimeSymbols.get('klass').symbol.type, ClassType);
+            expectTypeToBe(runtimeSymbols.get('klass2').symbol.type, ClassType);
+            expectTypeToBe(runtimeSymbols.get('klass3').symbol.type, ClassType);
+            const typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime);
+            expect(typetimeSymbols.size).to.eq(3);
+            expectTypeToBe(runtimeSymbols.get('klass').symbol.type, ClassType);
+            expectTypeToBe(runtimeSymbols.get('klass2').symbol.type, ClassType);
+            expectTypeToBe(runtimeSymbols.get('klass3').symbol.type, ClassType);
+        });
+
+        it('includes other types defined in the file', () => {
+            const mainFile: BrsFile = program.setFile('source/main.bs', `
+                interface MyInterface
                     name as string
-                    data as integer
                 end interface
 
-                interface IFaceB
-                    name as string
-                    value as float
-                end interface
+                enum MyEnum
+                    val1
+                    val2
+                end enum
+
+                namespace MyNamespace
+                    const MyConst = 3.14
+                end namespace
+            `);
+            validateFile(mainFile);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+            expect(runtimeSymbols.size).to.eq(2);
+            expectTypeToBe(runtimeSymbols.get('myenum').symbol.type, EnumType);
+            expectTypeToBe(runtimeSymbols.get('mynamespace.myconst').symbol.type, FloatType);
+            const typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime);
+            expect(typetimeSymbols.size).to.eq(2);
+            expectTypeToBe(typetimeSymbols.get('myinterface').symbol.type, InterfaceType);
+            expectTypeToBe(runtimeSymbols.get('myenum').symbol.type, EnumType);
+        });
+
+        describe('changes', () => {
+
+            it('new symbols are added to the changes set', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+
+                mainFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+
+                    sub someFunc2()
+                        print 2
+                    end sub
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(2);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(1);
+                expect(runtimeChanges.has('somefunc2')).to.be.true;
+            });
+
+            it('removed symbols are added to the changes set', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+
+                    sub someFunc2()
+                        print 2
+                    end sub
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(2);
+
+                mainFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(1);
+                expect(runtimeChanges.has('somefunc2')).to.be.true;
+            });
+
+            it('new symbols in a namespace are added to the changes set', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    namespace Alpha
+                    end namespace
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(0);
+
+                mainFile = program.setFile('source/main.bs', `
+                    namespace Alpha
+                        const ABC = "abc"
+                    end namespace
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(1);
+                expect(runtimeChanges.has('alpha.abc')).to.be.true;
+            });
+
+            it('should be empty if no changes in actual provided symbols', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    sub printSomething()
+                        print "Something"
+                    end sub
+
+                    namespace alpha.beta
+                        const PI = 3.14
+                    end namespace
+                `);
+
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(2);
+
+                mainFile = program.setFile('source/main.bs', `
+                    sub printSomething()
+                        print "Something Else"
+                    end sub
 
-                sub main(x as IFaceA or IFaceB)
-                end sub
-            `, `
-                sub main(x as dynamic)
-                end sub
-            `);
-        });
+                    namespace alpha.beta
+                        const PI = 3.14159
+                    end namespace
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(2);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+            });
 
-        it('allows union types for classes, interfaces', () => {
-            testTranspile(`
-                namespace alpha.beta
-                    interface IFaceA
+            it('should include changes in function signatures', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    function someFunc(x)
+                        return x
+                    end function
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+
+                mainFile = program.setFile('source/main.bs', `
+                    function someFunc(x, y)
+                        return x+y
+                    end function
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(1);
+                expect(runtimeChanges.has('somefunc'));
+            });
+
+            it('should include changes in classes', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    class MyKlass
                         name as string
-                        data as integer
-                    end interface
+                        function getValue() as float
+                            return 3.14
+                        end function
+                    end class
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
 
-                    interface IFaceB
+                mainFile = program.setFile('source/main.bs', `
+                    class MyKlass
                         name as string
-                        value as float
-                    end interface
-                end namespace
+                        function getValue() as string
+                            return "hello"
+                        end function
+                    end class
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(1);
+                expect(runtimeChanges.has('myklass'));
+                let typeTimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.typetime);
+                expect(typeTimeChanges.size).to.eq(1);
+                expect(typeTimeChanges.has('myklass'));
+            });
 
-                sub main(x as alpha.beta.IFaceA or alpha.beta.IFaceB)
-                end sub
-            `, `
-                sub main(x as dynamic)
-                end sub
-            `);
-        });
 
-        it('allows union types of arrays', () => {
-            testTranspile(`
-                namespace alpha.beta
-                    interface IFaceA
+            it('should include changes in interfaces', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    interface Iface1
                         name as string
-                        data as integer
+                        function doStuff() as float
                     end interface
-
-                    interface IFaceB
+                `);
+                validateFile(mainFile);
+                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime);
+                expect(typetimeSymbols.size).to.eq(1);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(0);
+
+                mainFile = program.setFile('source/main.bs', `
+                    interface Iface1
                         name as string
-                        value as float
+                        age as integer
+                        function doStuff() as float
                     end interface
-                end namespace
+                `);
+                validateFile(mainFile);
+                typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime);
+                expect(typetimeSymbols.size).to.eq(1);
+                let typeTimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.typetime);
+                expect(typeTimeChanges.size).to.eq(1);
+                expect(typeTimeChanges.has('iface1'));
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+            });
 
-                sub main(x as alpha.beta.IFaceA[][] or alpha.beta.IFaceB[] or ifStringOps)
-                end sub
-            `, `
-                sub main(x as dynamic)
-                end sub
-            `);
-        });
+            it('should not include changes in enum values, if inner type is the same', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    enum MyEnum
+                        north = 4
+                        east = 3
+                        south = 2
+                        west = 1
+                    end enum
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+
+                mainFile = program.setFile('source/main.bs', `
+                    enum MyEnum
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+
+                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.typetime);
+                expect(typetimeSymbols.size).to.eq(1);
+                let typetimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.typetime);
+                expect(typetimeChanges.size).to.eq(0);
+            });
 
+            it('should include changes in enum, if different number of members', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    enum Direction
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
 
-        it('allows intersection types for primitives', () => {
-            testTranspile(`
-                sub main(x as string and float, y as object and float or string)
-                end sub
-            `, `
-                sub main(x as dynamic, y as dynamic)
-                end sub
-            `);
-        });
+                    enum Weather
+                        rainy
+                        sunny
+                    end enum
 
-        it('allows intersection types for classes, interfaces', () => {
-            testTranspile(`
-                interface IFaceA
-                    name as string
-                    data as integer
-                end interface
+                    enum Colors
+                        blue
+                        red
+                        green
+                        purple
+                    end enum
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(3);
+
+                mainFile = program.setFile('source/main.bs', `
+                    enum Direction ' same
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
 
-                interface IFaceB
-                    name as string
-                    value as float
-                end interface
+                    enum Weather 'added member
+                        rainy
+                        sunny
+                        snowy
+                    end enum
 
-                sub main(x as IFaceA and IFaceB)
-                end sub
-            `, `
-                sub main(x as dynamic)
-                end sub
-            `);
-        });
+                    enum Colors 'removed member
+                        blue
+                        red
+                        green
+                    end enum
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(3);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(2);
+                expect(runtimeChanges.has('weather'));
+                expect(runtimeChanges.has('colors'));
 
-        it('allows intersection types for classes, interfaces', () => {
-            testTranspile(`
-                namespace alpha.beta
-                    interface IFaceA
-                        name as string
-                        data as integer
-                    end interface
+            });
 
-                    interface IFaceB
-                        name as string
-                        value as float
-                    end interface
-                end namespace
+            it('should include changes in enum, if different underlying type', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    enum Direction
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+
+                mainFile = program.setFile('source/main.bs', `
+                    enum Direction ' now is a string
+                        north = "N"
+                        east = "E"
+                        south = "S"
+                        west = "W"
+                    end enum
+                `);
+                program.plugins.emit('validateFile', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(1);
+                expect(runtimeChanges.has('direction'));
+            });
 
-                sub main(x as alpha.beta.IFaceA and alpha.beta.IFaceB)
-                end sub
-            `, `
-                sub main(x as dynamic)
-                end sub
-            `);
-        });
+            it('should include changes in const, if different underlying type', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    namespace alpha.beta
+                        const PI = 3.14
+                    end namespace
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
 
-        it('allows intersection types of arrays', () => {
-            testTranspile(`
-                namespace alpha.beta
-                    interface IFaceA
-                        name as string
-                        data as integer
-                    end interface
+                mainFile = program.setFile('source/main.bs', `
+                    namespace alpha.beta
+                        const PI = "lemon chiffon"
+                    end namespace
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(1);
+                expect(runtimeChanges.has('alpha.beta.pi'));
+            });
 
-                    interface IFaceB
-                        name as string
-                        value as float
-                    end interface
-                end namespace
+            it('should not include changes inside a function if the param types are known', () => {
+                let mainFile: BrsFile = program.setFile('source/main.bs', `
+                    function func1(p as string) as integer
+                        return len(p)
+                    end function
 
-                sub main(x as alpha.beta.IFaceA[][] and alpha.beta.IFaceB[] and ifStringOps)
-                end sub
-            `, `
-                sub main(x as dynamic)
-                end sub
-            `);
-        });
+                    sub displayModelTypeInLabel(myLabel as roSgNodeLabel)
+                        print myLabel.text
+                        di = createObject("roDeviceInfo")' as roDeviceInfo
+                        myLabel.text = di.GetFriendlyName()
+                        print myLabel.getChildren(0, -1)
+                    end sub
+                `);
+                validateFile(mainFile);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(2);
 
-        it('allows grouped expression in types types', () => {
-            testTranspile(`
-                namespace alpha.beta
-                    interface IFaceA
-                        name as string
-                        data as integer
-                    end interface
+                mainFile = program.setFile('source/main.bs', `
+                    function func1(p as string) as integer
+                        return len(p) + 1
+                    end function
 
-                    interface IFaceB
-                        name as string
-                        value as float
-                    end interface
-                end namespace
+                    sub displayModelTypeInLabel(myLabel as roSgNodeLabel)
+                        print myLabel.text
+                        di = createObject("roDeviceInfo") as roDeviceInfo
+                        myLabel.text = di.GetFriendlyName()
+                        print myLabel.getChildren(0, -1)
+                    end sub
+                `);
+                validateFile(mainFile);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTypeFlag.runtime);
+                expect(runtimeSymbols.size).to.eq(2);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+            });
 
-                sub main(x as (alpha.beta.IFace and alpha.beta.IFaceB)[] or ifStringOps)
-                end sub
-            `, `
-                sub main(x as dynamic)
-                end sub
-            `);
+            it('classes that override AA built-in methods show change properly', () => {
+                const classFileContent = `
+                    class AAOverRide
+                        sub count(num as integer) as void
+                            print num
+                        end sub
+                    end class
+                `;
+
+                let mainFile: BrsFile = program.setFile<BrsFile>('source/class.bs', classFileContent);
+                validateFile(mainFile);
+                // No changes!
+                mainFile = program.setFile<BrsFile>('source/class.bs', classFileContent);
+                validateFile(mainFile);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+            });
+
+
+            it('functions in a namespace that return classes show change properly', () => {
+                const fileContent = `
+                    namespace Alpha.Beta
+
+                        class SomeKlass
+                            name as string
+                            function combineName(klass as SomeKlass)
+                                m.name = m.name+klass.name
+                            end function
+                        end class
+
+                        function getSomeKlass(name as string) as SomeKlass
+                            k = new SomeKlass()
+                            k.name = name
+                            return k
+                        end function
+                    end namespace
+                `;
+
+                let mainFile: BrsFile = program.setFile<BrsFile>('source/class.bs', fileContent);
+                validateFile(mainFile);
+                // No changes!
+                mainFile = program.setFile<BrsFile>('source/class.bs', fileContent);
+                validateFile(mainFile);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+            });
+
+            it('functions in a namespace that have class params show change properly', () => {
+                const fileContent = `
+                    namespace Alpha.Beta
+                        class SomeKlass
+                            name as string
+                            function combineName(klass as SomeKlass)
+                                m.name = m.name + klass.name
+                            end function
+                        end class
+
+                        function combineKlass(klass1 as SomeKlass, klass2 as SomeKlass) as SomeKlass
+                            klass1.combineName(klass2)
+                            return klass1
+                        end function
+                    end namespace
+                `;
+                let mainFile: BrsFile = program.setFile<BrsFile>('source/class.bs', fileContent);
+                validateFile(mainFile);
+                // No changes!
+                mainFile = program.setFile<BrsFile>('source/class.bs', fileContent);
+                validateFile(mainFile);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+            });
+
+            it('should not include namespaces in changes if no symbols in namespace changed', () => {
+                const fileContent = `
+                    namespace Alpha.Beta
+                        const PI = 3.14
+                    end namespace
+                `;
+                const fileContentWithComment = `
+                    namespace Alpha.Beta
+                        const PI = 3.14 ' comment
+                    end namespace
+                `;
+                let mainFile: BrsFile = program.setFile<BrsFile>('source/namespace.bs', fileContent);
+                validateFile(mainFile);
+                // Just added a comment!
+                mainFile = program.setFile<BrsFile>('source/namespace.bs', fileContentWithComment);
+                validateFile(mainFile);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTypeFlag.runtime);
+                expect(runtimeChanges.size).to.eq(0);
+            });
         });
+    });
 
-        it('allows built-in types for return values', () => {
-            testTranspile(`
-                function makeLabel(text as string) as roSGNodeLabel
-                   label = createObject("roSGNode", "Label")
-                   label.text = text
-                end function
-            `, `
-                function makeLabel(text as string) as object
-                    label = createObject("roSGNode", "Label")
-                    label.text = text
+    describe('propertyHints', () => {
+
+        it('extracts property names for completion', () => {
+            const file = program.setFile<BrsFile>('source/main.brs', `
+                function main(arg as string)
+                    aa1 = {
+                        "sprop1": 0,
+                        prop1: 1
+                                prop2: {
+                            prop3: 2
+                        }
+                    }
+                    aa2 = {
+                        prop4: {
+                            prop5: 5,
+                            "sprop2": 0,
+                            prop6: 6
+                        },
+                        prop7: 7
+                    }
+                    calling({
+                        prop8: 8,
+                        prop9: 9
+                    })
+                    aa1.field1 = 1
+                    aa1.field2.field3 = 2
+                    calling(aa2.field4, 3 + aa2.field5.field6)
                 end function
             `);
-        });
 
-        it('allows built-in types for interface members', () => {
-            program.setFile<BrsFile>('source/main.bs', `
-                interface MyBase
-                    regex as roRegex
-                    node as roSGNodeLabel
-                    sub outputMatches(textInput as string)
-                    function getLabelParent() as roSGNode
-                end interface
-            `);
-            program.validate();
-            expectZeroDiagnostics(program);
-        });
+            const expected = [
+                'field1', 'field2', 'field3', 'field4', 'field5', 'field6',
+                'prop1', 'prop2', 'prop3', 'prop4', 'prop5', 'prop6', 'prop7', 'prop8', 'prop9'
+            ];
 
-        it('allows extends on interfaces', () => {
-            testTranspile(`
-                interface MyBase
-                    url as string
-                end interface
+            const { propertyHints } = file['_cachedLookups'];
+            expect(Object.keys(propertyHints).sort()).to.deep.equal(expected, 'Initial hints');
+        });
 
-                interface MyExtends extends MyBase
-                    method as string
-                end interface
-            `, `
+        it('extracts property names matching JavaScript reserved names', () => {
+            const file = program.setFile<BrsFile>('source/main.brs', `
+                function main(arg as string)
+                    aa1 = {
+                        "constructor": 0,
+                        constructor: 1
+                                valueOf: {
+                            toString: 2
+                        }
+                    }
+                    aa1.constructor = 1
+                    aa1.valueOf.toString = 2
+                end function
             `);
-        });
 
-        it('allows extends on classes', () => {
-            program.setFile<BrsFile>('source/main.bs', `
-                class MyBase
-                    url as string
-                end class
+            const expected = [
+                'constructor', 'tostring', 'valueof'
+            ];
 
-                class MyExtends extends MyBase
-                    method as string
-                end class
-            `);
-            program.validate();
-            expectZeroDiagnostics(program);
+            const { propertyHints } = file['_cachedLookups'];
+            expect(Object.keys(propertyHints).sort()).to.deep.equal(expected, 'Initial hints');
         });
 
         it('allows built-in types for class members', () => {
@@ -4763,15 +6822,15 @@ describe('BrsFile', () => {
             expectZeroDiagnostics(program);
         });
 
-        it('allows types on lhs of assignments', () => {
-            testTranspile(`
+        it('allows types on lhs of assignments', async () => {
+            await testTranspile(`
                 sub foo(node as roSGNode)
                     nodeParent as roSGNode = node.getParent()
                     text as string = nodeParent.id
                     print text
                 end sub
             `, `
-                sub foo(node as object)
+                sub foo(node as dynamic)
                     nodeParent = node.getParent()
                     text = nodeParent.id
                     print text
@@ -4779,14 +6838,35 @@ describe('BrsFile', () => {
             `);
         });
 
-        it('allows typecast statements', () => {
-            testTranspile(`
+        //fails at the specific length of statement including leading tabs and spaces
+        it('allows long statements', () => {
+            program.setFile('source/main.bs', `function request()\r\nhzzzzandleInterceptedScreenDataaaaaaaaaaainterceptedScreenData() 'bs:disable-line \r\nend function`);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            program.setFile('source/main.bs', `function request()\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\thandleInterceptedScreenDataaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(m._aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaainterceptedScreenData) 'bs:disable-line \r\nend function`);
+            program.validate();
+            expectZeroDiagnostics(program);
+
+            program.setFile('source/main.bs', `function request()\r\n\t\t\t\thandleInterceptedScreenData(m._aaaaaaainterceptedScreenData) 'bs:disable-line 1140\r\nend function`);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows typecast statements', async () => {
+            await testTranspile(`
                 typecast m as whatever
 
                 sub foo(node as object)
                     print node[m.keyProp]
                 end sub
+
+                interface whatever
+                    keyProp as string
+                end interface
             `, `
+                'typecast m as whatever
+
                 sub foo(node as object)
                     print node[m.keyProp]
                 end sub
@@ -4794,8 +6874,8 @@ describe('BrsFile', () => {
         });
 
         describe('inline interfaces', () => {
-            it('transpiles to "dynamic"', () => {
-                testTranspile(`
+            it('transpiles to "dynamic"', async () => {
+                await testTranspile(`
                     function foo(input as {name as string}) as {id as string}
                         output as {id as string} = {id: input.name}
                         return output
@@ -4812,8 +6892,8 @@ describe('BrsFile', () => {
         });
 
         describe('type statements interfaces', () => {
-            it('transpiles statement to nothing', () => {
-                testTranspile(`
+            it('transpiles statement to nothing', async () => {
+                await testTranspile(`
                      type number = integer or float
 
                     sub foo()
@@ -4826,15 +6906,17 @@ describe('BrsFile', () => {
                 `);
             });
 
-            it('transpiles type statement to object', () => {
-                testTranspile(`
+            it('transpiles type statement to dynamic', async () => {
+                //v1 transpiles unknown / composite types to `dynamic` (master used `object`)
+                //(see "allows union types for primitives" earlier in this file)
+                await testTranspile(`
                      type number = integer or float
 
                     sub foo(node as number)
                         print node[m.keyProp]
                     end sub
                 `, `
-                    sub foo(node as object)
+                    sub foo(node as dynamic)
                         print node[m.keyProp]
                     end sub
                 `);
@@ -4842,8 +6924,8 @@ describe('BrsFile', () => {
         });
 
         describe('for each loop with types', () => {
-            it('transpiles to untyped for each', () => {
-                testTranspile(`
+            it('transpiles to untyped for each', async () => {
+                await testTranspile(`
                     sub foo(items as string[])
                         for each item as string in items
                             print item
@@ -4860,8 +6942,8 @@ describe('BrsFile', () => {
         });
 
         describe('typed functions in type expressions', () => {
-            it('transpiles to function', () => {
-                testTranspile(`
+            it('transpiles to function', async () => {
+                await testTranspile(`
                     function test(func as function(name as string, num as integer) as integer) as integer
                         return func("hello", 123)
                     end function
@@ -4891,7 +6973,7 @@ describe('BrsFile', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.tooManyCallableParameters(64, 63),
-            range: util.createRange(1, 638, 1, 641)
+            location: { range: util.createRange(1, 638, 1, 641) }
         }]);
     });
 
@@ -4903,13 +6985,30 @@ describe('BrsFile', () => {
         program.validate();
         expectDiagnostics(program, [{
             ...DiagnosticMessages.tooManyCallableParameters(65, 63),
-            range: util.createRange(1, 638, 1, 641)
+            location: { range: util.createRange(1, 638, 1, 641) }
         }, {
             ...DiagnosticMessages.tooManyCallableParameters(65, 63),
-            range: util.createRange(1, 648, 1, 651)
+            location: { range: util.createRange(1, 648, 1, 651) }
         }]);
     });
 
+    it('handles deprecated .setPort() on rourltransfer', () => {
+        program.setFile('source/main.bs', `
+            function main()
+                url = createObject("roUrlTransfer") as roUrlTransfer
+                url.setPort(80)
+            end function
+        `);
+        program.validate();
+        expectDiagnostics(program, [
+            {
+                ...DiagnosticMessages.itemIsDeprecated(),
+                // url.|setPort|(80)
+                location: { range: util.createRange(3, 20, 3, 27) }
+            }
+        ]);
+    });
+
     describe('getClosestExpression', () => {
         it('returns undefined for missing Position', () => {
             const file = program.setFile<BrsFile>('source/main.bs', `
diff --git a/src/files/BrsFile.ts b/src/files/BrsFile.ts
index 87bd75db3..2190a60e7 100644
--- a/src/files/BrsFile.ts
+++ b/src/files/BrsFile.ts
@@ -1,85 +1,128 @@
 import type { CodeWithSourceMap } from 'source-map';
 import { SourceNode } from 'source-map';
-import type { CompletionItem, Position, Location, Diagnostic } from 'vscode-languageserver';
+import type { CompletionItem, Position, Location } from 'vscode-languageserver';
 import { CancellationTokenSource } from 'vscode-languageserver';
-import { CompletionItemKind, TextEdit } from 'vscode-languageserver';
+import { CompletionItemKind } from 'vscode-languageserver';
 import chalk from 'chalk';
 import * as path from 'path';
-import { Scope } from '../Scope';
+import { DiagnosticCodeMap, diagnosticCodes, DiagnosticLegacyCodeMap, DiagnosticMessages } from '../DiagnosticMessages';
 import type { NamespaceFileContribution } from '../Scope';
 import { SymbolTable } from '../SymbolTable';
-import { DiagnosticCodeMap, diagnosticCodes, DiagnosticMessages } from '../DiagnosticMessages';
 import { FunctionScope } from '../FunctionScope';
-import type { Callable, CallableArg, CallableParam, CommentFlag, FunctionCall, BsDiagnostic, FileReference, FileLink, BscFile } from '../interfaces';
+import type { Callable, CallableParam, CommentFlag, BsDiagnostic, FileReference, FileLink, SerializedCodeFile } from '../interfaces';
+import type { NamespaceContainer } from '../Scope';
 import type { Token } from '../lexer/Token';
 import { Lexer } from '../lexer/Lexer';
-import { TokenKind, AllowedLocalIdentifiers, Keywords } from '../lexer/TokenKind';
+import { TokenKind, AllowedLocalIdentifiers } from '../lexer/TokenKind';
 import { Parser, ParseMode } from '../parser/Parser';
-import type { FunctionExpression, VariableExpression } from '../parser/Expression';
-import type { ClassStatement, NamespaceStatement, AssignmentStatement, MethodStatement, FieldStatement } from '../parser/Statement';
+import type { FunctionExpression } from '../parser/Expression';
+import type { ClassStatement, NamespaceStatement, MethodStatement, FieldStatement } from '../parser/Statement';
 import type { Program } from '../Program';
-import { DynamicType } from '../types/DynamicType';
-import { FunctionType } from '../types/FunctionType';
-import { VoidType } from '../types/VoidType';
 import { standardizePath as s, util } from '../util';
 import { BrsTranspileState } from '../parser/BrsTranspileState';
-import { Preprocessor } from '../preprocessor/Preprocessor';
 import { serializeError } from 'serialize-error';
-import { isCallExpression, isMethodStatement, isClassStatement, isDottedGetExpression, isFunctionExpression, isFunctionStatement, isFunctionType, isLiteralExpression, isNamespaceStatement, isStringType, isVariableExpression, isImportStatement, isFieldStatement, isEnumStatement, isConstStatement } from '../astUtils/reflection';
-import type { BscType } from '../types/BscType';
+import { isClassStatement, isDottedGetExpression, isFunctionExpression, isNamespaceStatement, isVariableExpression, isImportStatement, isAnyReferenceType, isNamespaceType, isReferenceType, isCallableType, isFunctionStatement, isEnumStatement, isConstStatement } from '../astUtils/reflection';
 import { createVisitor, WalkMode } from '../astUtils/visitors';
-import type { DependencyGraph } from '../DependencyGraph';
+import type { DependencyChangedEvent, DependencyGraph } from '../DependencyGraph';
 import { CommentFlagProcessor } from '../CommentFlagProcessor';
 import type { AstNode, Expression } from '../parser/AstNode';
-import { DefinitionProvider } from '../bscPlugin/definition/DefinitionProvider';
 import { ReferencesProvider } from '../bscPlugin/references/ReferencesProvider';
 import { DocumentSymbolProcessor } from '../bscPlugin/symbols/DocumentSymbolProcessor';
 import { WorkspaceSymbolProcessor } from '../bscPlugin/symbols/WorkspaceSymbolProcessor';
+import type { UnresolvedSymbol, AssignedSymbol } from '../AstValidationSegmenter';
+import { AstValidationSegmenter } from '../AstValidationSegmenter';
+import { LogLevel } from '../Logger';
+import type { BscSymbol } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import type { BscFileLike } from '../astUtils/CachedLookups';
+import { CachedLookups } from '../astUtils/CachedLookups';
+import { Editor } from '../astUtils/Editor';
+import { getBsConst } from '../preprocessor/Manifest';
+import type { BscType } from '../types';
+import { NamespaceType } from '../types';
+import type { BscFile } from './BscFile';
+import { DefinitionProvider } from '../bscPlugin/definition/DefinitionProvider';
+
+export interface ProvidedSymbol {
+    symbol: BscSymbol;
+    duplicates: BscSymbol[];
+    requiredSymbolNames?: Set<string>;
+}
+export type ProvidedSymbolMap = Map<SymbolTypeFlag, Map<string, ProvidedSymbol>>;
+export type ChangedSymbolMap = Map<SymbolTypeFlag, Set<string>>;
+
+export interface ProvidedSymbolInfo {
+    symbolMap: ProvidedSymbolMap;
+    changes: ChangedSymbolMap;
+}
 
 /**
  * Holds all details about this file within the scope of the whole program
  */
-export class BrsFile {
-    constructor(
-        public srcPath: string,
+export class BrsFile implements BscFile {
+    constructor(options: {
         /**
-         * The full pkg path to this file
+         * The path to the file in its source location (where the source code lives in the file system)
          */
-        public pkgPath: string,
-        public program: Program
-    ) {
-        this.srcPath = s`${this.srcPath}`;
-        this.pkgPath = s`${this.pkgPath}`;
-        this.dependencyGraphKey = this.pkgPath.toLowerCase();
-
-        this.extension = util.getExtension(this.srcPath);
-
-        //all BrighterScript files need to be transpiled
-        if (this.extension?.endsWith('.bs') || program?.options?.allowBrighterScriptInBrightScript) {
-            this.needsTranspiled = true;
-            this.parseMode = ParseMode.BrighterScript;
-        }
-        this.isTypedef = this.extension === '.d.bs';
-        if (!this.isTypedef) {
-            this.typedefKey = util.getTypedefPath(this.srcPath);
-        }
+        srcPath: string;
+        /**
+         * The path to the file where it should exist in the program. This is similar to pkgPath, but retains its original file extensions from srcPath
+         */
+        destPath: string;
+        /**
+         * The final path in the zip. This has the extensions changed. Typically this is the same as destPath, but with file extensions changed for transpiled files.
+         */
+        pkgPath?: string;
+        program: Program;
+    }) {
+        if (options) {
+            this.srcPath = s`${options.srcPath}`;
+            this.destPath = s`${options.destPath}`;
+            this.program = options.program;
+            this._cachedLookups = new CachedLookups(this as unknown as BscFileLike);
+
+            this.extension = util.getExtension(this.srcPath);
+            if (options.pkgPath) {
+                this.pkgPath = options.pkgPath;
+            } else {
+                //don't rename .d.bs files to .d.brs
+                if (this.extension === '.d.bs') {
+                    this.pkgPath = this.destPath;
+                } else {
+                    this.pkgPath = this.destPath.replace(/\.bs$/i, '.brs');
+                }
+            }
 
-        //global file doesn't have a program, so only resolve typedef info if we have a program
-        if (this.program) {
-            this.resolveTypedef();
+            //all BrighterScript files need to be transpiled
+            if (this.extension?.endsWith('.bs') || this.program?.options?.allowBrighterScriptInBrightScript) {
+                this.parseMode = ParseMode.BrighterScript;
+            }
+            this.isTypedef = this.extension === '.d.bs';
+            if (!this.isTypedef) {
+                this.typedefKey = util.getTypedefPath(this.srcPath);
+            }
+
+            //global file doesn't have a program, so only resolve typedef info if we have a program
+            if (this.program) {
+                this.resolveTypedef();
+            }
         }
     }
 
+    public type = 'BrsFile';
+
+    public srcPath: string;
+    public destPath: string;
+    public pkgPath: string;
+
+    public program: Program;
+
+    private _cachedLookups: CachedLookups;
+
     /**
-     * The absolute path to the source location for this file
-     * @deprecated use `srcPath` instead
+     * An editor assigned during the build flow that manages edits that will be undone once the build process is complete.
      */
-    public get pathAbsolute() {
-        return this.srcPath;
-    }
-    public set pathAbsolute(value) {
-        this.srcPath = value;
-    }
+    public editor?: Editor;
 
     /**
      * Will this file result in only comment or whitespace output? If so, it can be excluded from the output if that bsconfig setting is enabled.
@@ -105,7 +148,7 @@ export class BrsFile {
     public parseMode = ParseMode.BrightScript;
 
     /**
-     * The key used to identify this file in the dependency graph
+     * The key used to identify this file in the dependency graph. This is set by the BrighterScript program and should not be set by plugins
      */
     public dependencyGraphKey: string;
 
@@ -120,34 +163,8 @@ export class BrsFile {
      */
     public extension: string;
 
-    /**
-     * A collection of diagnostics related to this file
-     */
-    public diagnostics = [] as BsDiagnostic[];
-
-    public getDiagnostics() {
-        return [...this.diagnostics];
-    }
-
-    public addDiagnostic(diagnostic: Diagnostic & { file?: BscFile }) {
-        this.addDiagnostics([diagnostic as BsDiagnostic]);
-    }
-
-    public addDiagnostics(diagnostics: BsDiagnostic[]) {
-        for (const diagnostic of diagnostics) {
-            if (!diagnostic.file) {
-                diagnostic.file = this;
-            }
-            this.diagnostics.push(diagnostic as any);
-        }
-    }
-
     public commentFlags = [] as CommentFlag[];
 
-    public callables = [] as Callable[];
-
-    public functionCalls = [] as FunctionCall[];
-
     private _functionScopes: FunctionScope[];
 
     public get functionScopes(): FunctionScope[] {
@@ -159,7 +176,7 @@ export class BrsFile {
 
     private get cache() {
         // eslint-disable-next-line @typescript-eslint/dot-notation
-        return this._parser?.references['cache'];
+        return this._cachedLookups['cache'];
     }
 
     /**
@@ -176,70 +193,66 @@ export class BrsFile {
      * @internal
      */
     protected getNamespaceContributions(): Map<string, NamespaceFileContribution> {
-        // eslint-disable-next-line @typescript-eslint/dot-notation
-        let contributions = this.parser.references['namespaceContributions'];
-        if (contributions) {
-            return contributions;
-        }
-
-        contributions = new Map<string, NamespaceFileContribution>();
-        this.ast.walk(createVisitor({
-            NamespaceStatement: namespaceStatement => {
-                const name = namespaceStatement.getName(ParseMode.BrighterScript);
-                const nameParts = name.split('.');
-                let loopName: string | null = null;
-                //ensure each dotted prefix has a contribution entry
-                for (const part of nameParts) {
-                    loopName = loopName === null ? part : `${loopName}.${part}`;
-                    const lowerLoopName = loopName.toLowerCase();
-                    if (!contributions.has(lowerLoopName)) {
-                        //explicitly assign every optional field as undefined so all
-                        //NamespaceFileContribution instances share a single V8 hidden
-                        //class. Subsequent `??=` assignments mutate values without
-                        //changing the object shape, which keeps property access fast.
-                        contributions.set(lowerLoopName, {
-                            file: this,
-                            fullName: loopName,
-                            lastPartName: part,
-                            nameRange: namespaceStatement.nameExpression.range,
-                            statements: undefined,
-                            classStatements: undefined,
-                            functionStatements: undefined,
-                            enumStatements: undefined,
-                            constStatements: undefined,
-                            symbolTable: undefined
-                        });
+        return this.cache.getOrAdd('namespaceContributions', () => {
+            let contributions = new Map<string, NamespaceFileContribution>();
+            this.ast.walk(createVisitor({
+                NamespaceStatement: namespaceStatement => {
+                    const name = namespaceStatement.getName(ParseMode.BrighterScript);
+                    const nameParts = name.split('.');
+                    let loopName: string | null = null;
+                    //ensure each dotted prefix has a contribution entry
+                    for (const part of nameParts) {
+                        loopName = loopName === null ? part : `${loopName}.${part}`;
+                        const lowerLoopName = loopName.toLowerCase();
+                        if (!contributions.has(lowerLoopName)) {
+                            //explicitly assign every optional field as undefined so all
+                            //NamespaceFileContribution instances share a single V8 hidden
+                            //class. Subsequent `??=` assignments mutate values without
+                            //changing the object shape, which keeps property access fast.
+                            contributions.set(lowerLoopName, {
+                                file: this,
+                                fullName: loopName,
+                                lastPartName: part,
+                                nameRange: namespaceStatement.nameExpression.location?.range,
+                                namespaceStatements: undefined,
+                                statements: undefined,
+                                classStatements: undefined,
+                                functionStatements: undefined,
+                                enumStatements: undefined,
+                                constStatements: undefined,
+                                symbolTable: undefined
+                            });
+                        }
                     }
-                }
-                //populate the leaf contribution from this namespaceStatement's body
-                const ns = contributions.get(name.toLowerCase())!;
-                if (namespaceStatement.body.statements.length > 0) {
-                    (ns.statements ??= []).push(...namespaceStatement.body.statements);
-                }
-                for (const statement of namespaceStatement.body.statements) {
-                    if (isClassStatement(statement) && statement.name) {
-                        (ns.classStatements ??= {})[statement.name.text.toLowerCase()] = statement;
-                    } else if (isFunctionStatement(statement) && statement.name) {
-                        (ns.functionStatements ??= {})[statement.name.text.toLowerCase()] = statement;
-                    } else if (isEnumStatement(statement) && statement.fullName) {
-                        (ns.enumStatements ??= new Map()).set(statement.fullName.toLowerCase(), statement);
-                    } else if (isConstStatement(statement) && statement.fullName) {
-                        (ns.constStatements ??= new Map()).set(statement.fullName.toLowerCase(), statement);
+                    //populate the leaf contribution from this namespaceStatement's body
+                    const ns = contributions.get(name.toLowerCase())!;
+                    (ns.namespaceStatements ??= []).push(namespaceStatement);
+                    if (namespaceStatement.body.statements.length > 0) {
+                        (ns.statements ??= []).push(...namespaceStatement.body.statements);
                     }
+                    for (const statement of namespaceStatement.body.statements) {
+                        if (isClassStatement(statement) && statement.tokens.name) {
+                            (ns.classStatements ??= {})[statement.tokens.name.text.toLowerCase()] = statement;
+                        } else if (isFunctionStatement(statement) && statement.tokens.name) {
+                            (ns.functionStatements ??= {})[statement.tokens.name.text.toLowerCase()] = statement;
+                        } else if (isEnumStatement(statement) && statement.fullName) {
+                            (ns.enumStatements ??= new Map()).set(statement.fullName.toLowerCase(), statement);
+                        } else if (isConstStatement(statement) && statement.fullName) {
+                            (ns.constStatements ??= new Map()).set(statement.fullName.toLowerCase(), statement);
+                        }
+                    }
+                    //single-file aggregate; NO parent provider (sibling resolution does not
+                    //walk into a sibling's parent, so the previous scope-coupled provider
+                    //was dead code)
+                    ns.symbolTable ??= new SymbolTable(`Namespace File Contribution: '${ns.fullName}' in ${this.pkgPath}`);
+                    ns.symbolTable.mergeSymbolTable(namespaceStatement.body.getSymbolTable());
                 }
-                //single-file aggregate; NO parent provider (sibling resolution does not
-                //walk into a sibling's parent, so the previous scope-coupled provider
-                //was dead code)
-                ns.symbolTable ??= new SymbolTable(`Namespace File Contribution: '${ns.fullName}' in ${this.pkgPath}`);
-                ns.symbolTable.mergeSymbolTable(namespaceStatement.body.getSymbolTable());
-            }
-        }), {
-            walkMode: WalkMode.visitStatements
-        });
+            }), {
+                walkMode: WalkMode.visitStatements
+            });
 
-        // eslint-disable-next-line @typescript-eslint/dot-notation
-        this.parser.references['namespaceContributions'] = contributions;
-        return contributions;
+            return contributions;
+        });
     }
 
     /**
@@ -248,14 +261,14 @@ export class BrsFile {
     public get ownScriptImports() {
         const result = this.cache?.getOrAdd('ownScriptImports', () => {
             const result = [] as FileReference[];
-            for (const statement of this.parser?.references?.importStatements ?? []) {
+            for (const statement of this._cachedLookups?.importStatements ?? []) {
                 //register import statements
-                if (isImportStatement(statement) && statement.filePathToken) {
+                if (isImportStatement(statement) && statement.tokens.path) {
                     result.push({
-                        filePathRange: statement.filePathToken.range,
-                        pkgPath: util.getPkgPathFromTarget(this.pkgPath, statement.filePath),
+                        filePathRange: statement.tokens.path.location?.range,
+                        destPath: util.getPkgPathFromTarget(this.destPath, statement.filePath),
                         sourceFile: this,
-                        text: statement.filePathToken?.text
+                        text: statement.tokens.path.text
                     });
                 }
             }
@@ -266,14 +279,24 @@ export class BrsFile {
 
     /**
      * Does this file need to be transpiled?
+     * @deprecated use the `.editor` property to push changes to the file, which will force transpilation
      */
-    public needsTranspiled = false;
+    public get needsTranspiled() {
+        if (this._needsTranspiled !== undefined) {
+            return this._needsTranspiled;
+        }
+        return !!(this.extension?.endsWith('.bs') || this.program?.options?.allowBrighterScriptInBrightScript || this.editor?.hasChanges);
+    }
+    public set needsTranspiled(value) {
+        this._needsTranspiled = value;
+    }
+    public _needsTranspiled: boolean;
 
     /**
      * The AST for this file
      */
     public get ast() {
-        return this.parser.ast;
+        return this.parser?.ast;
     }
 
     /**
@@ -281,7 +304,18 @@ export class BrsFile {
      */
     public getTokenAt(position: Position) {
         for (let token of this.parser.tokens) {
-            if (util.rangeContains(token.range, position)) {
+            if (util.rangeContains(token.location?.range, position)) {
+                return token;
+            }
+        }
+    }
+
+    /**
+     * Get the token at the specified position, or the next token
+     */
+    public getCurrentOrNextTokenAt(position: Position) {
+        for (let token of this.parser.tokens) {
+            if (util.comparePositionToRange(position, token.location?.range) < 0) {
                 return token;
             }
         }
@@ -299,7 +333,7 @@ export class BrsFile {
         this.ast.walk((node) => {
             const latestContainer = containingNode;
             //bsc walks depth-first
-            if (util.rangeContains(node.range, position)) {
+            if (node.location?.range && util.rangeContains(node.location?.range, position)) {
                 containingNode = node;
             }
             //we had a match before, and don't now. this means we've finished walking down the whole way, and found our match
@@ -353,11 +387,6 @@ export class BrsFile {
      */
     public typedefFile?: BrsFile;
 
-    /**
-     * An unsubscribe function for the dependencyGraph subscription
-     */
-    private unsubscribeFromDependencyGraph: () => void;
-
     /**
      * Find and set the typedef variables (if a matching typedef file exists)
      */
@@ -366,27 +395,30 @@ export class BrsFile {
         this.hasTypedef = !!this.typedefFile;
     }
 
+    public onDependenciesChanged(event: DependencyChangedEvent) {
+        this.resolveTypedef();
+    }
+
     /**
      * Attach the file to the dependency graph so it can monitor changes.
      * Also notify the dependency graph of our current dependencies so other dependents can be notified.
+     * @deprecated this does nothing. This functionality is now handled by the file api and will be deleted in v1
      */
-    public attachDependencyGraph(dependencyGraph: DependencyGraph) {
-        this.unsubscribeFromDependencyGraph?.();
-
-        //event that fires anytime a dependency changes
-        this.unsubscribeFromDependencyGraph = dependencyGraph.onchange(this.dependencyGraphKey, () => {
-            this.resolveTypedef();
-        });
+    public attachDependencyGraph(dependencyGraph: DependencyGraph) { }
 
-        const dependencies = this.ownScriptImports.filter(x => !!x.pkgPath).map(x => x.pkgPath.toLowerCase());
+    /**
+     * The list of files that this file depends on
+     */
+    public get dependencies() {
+        const result = this.ownScriptImports.filter(x => !!x.destPath).map(x => x.destPath.toLowerCase());
 
         //if this is a .brs file, watch for typedef changes
         if (this.extension === '.brs') {
-            dependencies.push(
-                util.getTypedefPath(this.pkgPath)
+            result.push(
+                util.getTypedefPath(this.destPath)
             );
         }
-        dependencyGraph.addOrReplace(this.dependencyGraphKey, dependencies);
+        return result;
     }
 
     /**
@@ -394,9 +426,10 @@ export class BrsFile {
      * @param fileContents the raw source code to parse
      */
     public parse(fileContents: string) {
+        const diagnostics = [] as Array<BsDiagnostic>;
+
         try {
             this.fileContents = fileContents;
-            this.diagnostics = [];
 
             //if we have a typedef file, skip parsing this file
             if (this.hasTypedef) {
@@ -408,71 +441,38 @@ export class BrsFile {
             //tokenize the input file
             let lexer = this.program.logger.time('debug', ['lexer.lex', chalk.green(this.srcPath)], () => {
                 return Lexer.scan(fileContents, {
-                    includeWhitespace: false
+                    includeWhitespace: false,
+                    srcPath: this.srcPath
                 });
             });
 
             this.getCommentFlags(lexer.tokens);
 
-            let preprocessor = new Preprocessor();
-
-            //remove all code inside false-resolved conditional compilation statements.
-            //TODO preprocessor should go away in favor of the AST handling this internally (because it affects transpile)
-            //currently the preprocessor throws exceptions on syntax errors...so we need to catch it
-            try {
-                this.program.logger.time('debug', ['preprocessor.process', chalk.green(this.srcPath)], () => {
-                    preprocessor.process(lexer.tokens, this.program.getManifest());
-                });
-            } catch (error: any) {
-                //if the thrown error is DIFFERENT than any errors from the preprocessor, add that error to the list as well
-                if (this.diagnostics.find((x) => x === error) === undefined) {
-                    this.diagnostics.push(error);
-                }
-            }
-
-            //if the preprocessor generated tokens, use them.
-            let tokens = preprocessor.processedTokens.length > 0 ? preprocessor.processedTokens : lexer.tokens;
-
-            this.program.logger.time('debug', ['parser.parse', chalk.green(this.srcPath)], () => {
-                this._parser = Parser.parse(tokens, {
+            this.program.logger.time(LogLevel.debug, ['parser.parse', chalk.green(this.srcPath)], () => {
+                this._parser = Parser.parse(lexer.tokens, {
+                    srcPath: this.srcPath,
                     mode: this.parseMode,
                     logger: this.program.logger,
+                    bsConsts: getBsConst(this.program.getManifest()),
                     minFirmwareVersion: this.program.options.minFirmwareVersion
                 });
             });
 
             //absorb all lexing/preprocessing/parsing diagnostics
-            this.diagnostics.push(
+            diagnostics.push(
                 ...lexer.diagnostics as BsDiagnostic[],
-                ...preprocessor.diagnostics as BsDiagnostic[],
                 ...this._parser.diagnostics as BsDiagnostic[]
             );
 
-            //extract all callables from this file
-            this.findCallables();
 
-            //find all places where a sub/function is being called
-            this.findFunctionCalls();
-
-            //attach this file to every diagnostic
-            for (let diagnostic of this.diagnostics) {
-                diagnostic.file = this;
-            }
         } catch (e) {
             this._parser = new Parser();
-            this.diagnostics.push({
-                file: this,
-                range: util.createRange(0, 0, 0, Number.MAX_VALUE),
+            diagnostics.push({
+                location: util.createLocationFromFileRange(this, util.createRange(0, 0, 0, Number.MAX_VALUE)),
                 ...DiagnosticMessages.genericParserMessage('Critical error parsing file: ' + JSON.stringify(serializeError(e)))
             });
         }
-    }
-
-    /**
-     * @deprecated logic has moved into BrsFileValidator, this is now an empty function
-     */
-    public validate() {
-
+        this.program?.diagnostics.register(diagnostics);
     }
 
     /**
@@ -498,7 +498,7 @@ export class BrsFile {
 
     public findPropertyNameCompletions(): CompletionItem[] {
         //Build completion items from all the "properties" found in the file
-        const { propertyHints } = this.parser.references;
+        const { propertyHints } = this._cachedLookups;
         const results = [] as CompletionItem[];
         for (const key of Object.keys(propertyHints)) {
             results.push({
@@ -523,16 +523,18 @@ export class BrsFile {
      * @param tokens - an array of tokens of which to find `TokenKind.Comment` from
      */
     public getCommentFlags(tokens: Token[]) {
-        const processor = new CommentFlagProcessor(this, ['rem', `'`], diagnosticCodes, [DiagnosticCodeMap.unknownDiagnosticCode]);
+        const processor = new CommentFlagProcessor(this, ['rem', `'`], diagnosticCodes, [DiagnosticCodeMap.unknownDiagnosticCode, DiagnosticLegacyCodeMap.unknownDiagnosticCode]);
 
         this.commentFlags = [];
-        for (let token of tokens) {
-            if (token.kind === TokenKind.Comment) {
-                processor.tryAdd(token.text, token.range);
+        for (let lexerToken of tokens) {
+            for (let triviaToken of lexerToken.leadingTrivia ?? []) {
+                if (triviaToken.kind === TokenKind.Comment) {
+                    processor.tryAdd(triviaToken.text, triviaToken.location?.range);
+                }
             }
         }
         this.commentFlags.push(...processor.commentFlags);
-        this.diagnostics.push(...processor.diagnostics);
+        this.program?.diagnostics.register(processor.diagnostics);
     }
 
     public scopesByFunc = new Map<FunctionExpression, FunctionScope>();
@@ -542,7 +544,7 @@ export class BrsFile {
      */
     private createFunctionScopes() {
         //find every function
-        let functions = this.parser.references.functionExpressions;
+        let functions = this._cachedLookups.functionExpressions;
 
         //create a functionScope for every function
         this._functionScopes = [];
@@ -552,7 +554,9 @@ export class BrsFile {
 
             //find parent function, and add this scope to it if found
             {
-                let parentScope = this.scopesByFunc.get(func.parentFunction);
+                let parentScope = this.scopesByFunc.get(
+                    func.findAncestor<FunctionExpression>(isFunctionExpression)
+                );
 
                 //add this child scope to its parent
                 if (parentScope) {
@@ -565,10 +569,12 @@ export class BrsFile {
             //add every parameter
             for (let param of func.parameters) {
                 scope.variableDeclarations.push({
-                    nameRange: param.name.range,
-                    lineIndex: param.name.range?.start.line,
-                    name: param.name.text,
-                    type: param.type
+                    nameRange: param.tokens.name.location?.range,
+                    lineIndex: param.tokens.name.location?.range?.start.line,
+                    name: param.tokens.name.text,
+                    getType: () => {
+                        return param.getType({ flags: SymbolTypeFlag.typetime });
+                    }
                 });
             }
 
@@ -576,17 +582,17 @@ export class BrsFile {
             func.body?.walk(createVisitor({
                 ForEachStatement: (stmt) => {
                     scope.variableDeclarations.push({
-                        nameRange: stmt.item.range,
-                        lineIndex: stmt.item.range?.start.line,
-                        name: stmt.item.text,
-                        type: new DynamicType()
+                        nameRange: stmt.tokens.item.location?.range,
+                        lineIndex: stmt.tokens.item.location?.range?.start.line,
+                        name: stmt.tokens.item.text,
+                        getType: () => stmt.getType({ flags: SymbolTypeFlag.runtime })
                     });
                 },
                 LabelStatement: (stmt) => {
-                    const { identifier } = stmt.tokens;
+                    const { name: identifier } = stmt.tokens;
                     scope.labelStatements.push({
-                        nameRange: identifier.range,
-                        lineIndex: identifier.range?.start.line,
+                        nameRange: identifier.location?.range,
+                        lineIndex: identifier.location?.range?.start.line,
                         name: identifier.text
                     });
                 }
@@ -601,211 +607,76 @@ export class BrsFile {
         }
 
         //find every variable assignment in the whole file
-        let assignmentStatements = this.parser.references.assignmentStatements;
+        let assignmentStatements = this._cachedLookups.assignmentStatements;
 
         for (let statement of assignmentStatements) {
 
             //find this statement's function scope
-            let scope = this.scopesByFunc.get(statement.containingFunction);
+            let scope = this.scopesByFunc.get(
+                statement.findAncestor<FunctionExpression>(isFunctionExpression)
+            );
 
             //skip variable declarations that are outside of any scope
             if (scope) {
+                const variableName = statement.tokens.name;
                 scope.variableDeclarations.push({
-                    nameRange: statement.name.range,
-                    lineIndex: statement.name.range?.start.line,
-                    name: statement.name.text,
-                    type: this.getBscTypeFromAssignment(statement, scope)
+                    nameRange: variableName.location?.range,
+                    lineIndex: variableName.location?.range?.start.line,
+                    name: variableName.text,
+                    getType: () => {
+                        return statement.getType({ flags: SymbolTypeFlag.runtime });
+                    }
                 });
             }
         }
     }
 
-    private getBscTypeFromAssignment(assignment: AssignmentStatement, scope: FunctionScope): BscType {
-        try {
-            //function
-            if (isFunctionExpression(assignment.value)) {
-                let functionType = new FunctionType(assignment.value.returnType);
-                functionType.isSub = assignment.value.functionType.text === 'sub';
-                if (functionType.isSub) {
-                    functionType.returnType = new VoidType();
-                }
+    public staticCallables: Callable[];
 
-                functionType.setName(assignment.name.text);
-                for (let param of assignment.value.parameters) {
-                    let isOptional = !!param.defaultValue;
-                    //TODO compute optional parameters
-                    functionType.addParameter(param.name.text, param.type, isOptional);
-                }
-                return functionType;
-
-                //literal
-            } else if (isLiteralExpression(assignment.value)) {
-                return assignment.value.type;
-
-                //function call
-            } else if (isCallExpression(assignment.value)) {
-                let calleeName = (assignment.value.callee as any)?.name?.text;
-                if (calleeName) {
-                    let func = this.getCallableByName(calleeName);
-                    if (func) {
-                        return func.type.returnType;
-                    }
-                }
-            } else if (isVariableExpression(assignment.value)) {
-                let variableName = assignment.value?.name?.text;
-                let variable = scope.getVariableByName(variableName);
-                return variable.type;
-            }
-        } catch (e) {
-            //do nothing. Just return dynamic
-        }
-        //fallback to dynamic
-        return new DynamicType();
-    }
+    get callables(): Callable[] {
 
-    private getCallableByName(name: string) {
-        name = name ? name.toLowerCase() : undefined;
-        if (!name) {
-            return;
-        }
-        for (let func of this.callables) {
-            if (func.name.toLowerCase() === name) {
-                return func;
-            }
+        if (this.staticCallables) {
+            // globalFile can statically set the callables
+            return this.staticCallables;
         }
-    }
-
-    private findCallables() {
-        for (let statement of this.parser.references.functionStatements ?? []) {
 
-            let functionType = new FunctionType(statement.func.returnType);
-            functionType.setName(statement.name.text);
-            functionType.isSub = statement.func.functionType.text.toLowerCase() === 'sub';
-            if (functionType.isSub) {
-                functionType.returnType = new VoidType();
-            }
+        return this.cache.getOrAdd(`BrsFile_callables`, () => {
+            const callables = [];
 
-            //extract the parameters
-            let params = [] as CallableParam[];
-            for (let param of statement.func.parameters) {
-                let callableParam = {
-                    name: param.name.text,
-                    type: param.type,
-                    isOptional: !!param.defaultValue,
-                    isRestArgument: false
-                };
-                params.push(callableParam);
-                let isOptional = !!param.defaultValue;
-                functionType.addParameter(callableParam.name, callableParam.type, isOptional);
-            }
+            for (let statement of this._cachedLookups.functionStatements ?? []) {
 
-            this.callables.push({
-                isSub: statement.func.functionType.text.toLowerCase() === 'sub',
-                name: statement.name.text,
-                nameRange: statement.name.range,
-                file: this,
-                params: params,
-                range: statement.func.range,
-                type: functionType,
-                getName: statement.getName.bind(statement),
-                hasNamespace: !!statement.findAncestor<NamespaceStatement>(isNamespaceStatement),
-                functionStatement: statement
-            });
-        }
-    }
+                //extract the parameters
+                let params = [] as CallableParam[];
+                for (let param of statement.func.parameters) {
+                    const paramType = param.getType({ flags: SymbolTypeFlag.typetime });
 
-    private findFunctionCalls() {
-        this.functionCalls = [];
-        //for every function in the file
-        for (let func of this._parser.references.functionExpressions) {
-            //for all function calls in this function
-            for (let expression of func.callExpressions) {
-                if (
-                    //filter out dotted function invocations (i.e. object.doSomething()) (not currently supported. TODO support it)
-                    (expression.callee as any).obj ||
-                    //filter out method calls on method calls for now (i.e. getSomething().getSomethingElse())
-                    (expression.callee as any).callee ||
-                    //filter out callees without a name (immediately-invoked function expressions)
-                    !(expression.callee as any).name
-                ) {
-                    continue;
+                    let callableParam = {
+                        name: param.tokens.name?.text,
+                        type: paramType,
+                        isOptional: !!param.defaultValue,
+                        isRestArgument: false
+                    };
+                    params.push(callableParam);
                 }
-                let functionName = (expression.callee as any).name.text;
-
-                //callee is the name of the function being called
-                let callee = expression.callee as VariableExpression;
-
-                let columnIndexBegin = callee.range.start.character;
-                let columnIndexEnd = callee.range.end.character;
-
-                let args = [] as CallableArg[];
-                //TODO convert if stmts to use instanceof instead
-                for (let arg of expression.args as any) {
-
-                    //is a literal parameter value
-                    if (isLiteralExpression(arg)) {
-                        args.push({
-                            range: arg.range,
-                            type: arg.type,
-                            text: arg.token.text,
-                            expression: arg,
-                            typeToken: undefined
-                        });
-
-                        //is variable being passed into argument
-                    } else if (arg.name) {
-                        args.push({
-                            range: arg.range,
-                            //TODO - look up the data type of the actual variable
-                            type: new DynamicType(),
-                            text: arg.name.text,
-                            expression: arg,
-                            typeToken: undefined
-                        });
-
-                    } else if (arg.value) {
-                        let text = '';
-                        /* istanbul ignore next: TODO figure out why value is undefined sometimes */
-                        if (arg.value.value) {
-                            text = arg.value.value.toString();
-                        }
-                        let callableArg = {
-                            range: arg.range,
-                            //TODO not sure what to do here
-                            type: new DynamicType(), // util.valueKindToBrsType(arg.value.kind),
-                            text: text,
-                            expression: arg,
-                            typeToken: undefined
-                        };
-                        //wrap the value in quotes because that's how it appears in the code
-                        if (isStringType(callableArg.type)) {
-                            callableArg.text = '"' + callableArg.text + '"';
-                        }
-                        args.push(callableArg);
-
-                    } else {
-                        args.push({
-                            range: arg.range,
-                            type: new DynamicType(),
-                            //TODO get text from other types of args
-                            text: '',
-                            expression: arg,
-                            typeToken: undefined
-                        });
-                    }
-                }
-                let functionCall: FunctionCall = {
-                    range: expression.range,
-                    functionScope: this.getFunctionScopeAtPosition(callee.range.start),
+                const funcType = statement.getType({ flags: SymbolTypeFlag.typetime });
+                callables.push({
+                    isSub: statement.func.tokens.functionType?.text.toLowerCase() === 'sub',
+                    name: statement.tokens.name?.text,
+                    nameRange: statement.tokens.name?.location?.range,
                     file: this,
-                    name: functionName,
-                    nameRange: util.createRange(callee.range.start.line, columnIndexBegin, callee.range.start.line, columnIndexEnd),
-                    //TODO keep track of parameters
-                    args: args
-                };
-                this.functionCalls.push(functionCall);
+                    params: params,
+                    range: statement.func.location?.range,
+                    type: funcType,
+                    getName: statement.getName.bind(statement),
+                    hasNamespace: !!statement.findAncestor<NamespaceStatement>(isNamespaceStatement),
+                    functionStatement: statement
+                });
             }
-        }
+
+            return callables;
+        });
+
+
     }
 
     /**
@@ -841,376 +712,21 @@ export class BrsFile {
     public getNamespaceStatementForPosition(position: Position): NamespaceStatement {
         if (position) {
             return this.cache.getOrAdd(`namespaceStatementForPosition-${position.line}:${position.character}`, () => {
-                for (const statement of this.parser.references.namespaceStatements) {
-                    if (util.rangeContains(statement.range, position)) {
-                        return statement;
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Get completions available at the given cursor. This aggregates all values from this file and the current scope.
-     */
-    public getCompletions(position: Position, scope?: Scope): CompletionItem[] {
-        let result = [] as CompletionItem[];
-
-        //a map of lower-case names of all added options
-        let names = {} as Record<string, boolean>;
-
-        //handle script import completions
-        let scriptImport = util.getScriptImportAtPosition(this.ownScriptImports, position);
-        if (scriptImport) {
-            return this.program.getScriptImportCompletions(this.pkgPath, scriptImport);
-        }
-
-        //if cursor is within a comment, disable completions
-        let currentToken = this.getTokenAt(position);
-        const tokenKind = currentToken?.kind;
-        if (tokenKind === TokenKind.Comment) {
-            return [];
-        } else if (tokenKind === TokenKind.StringLiteral || tokenKind === TokenKind.TemplateStringQuasi) {
-            const match = /^("?)(pkg|libpkg):/.exec(currentToken.text);
-            if (match) {
-                const [, openingQuote, fileProtocol] = match;
-                //include every absolute file path from this scope
-                for (const file of scope.getAllFiles()) {
-                    const pkgPath = `${fileProtocol}:/${file.pkgPath.replace(/\\/g, '/')}`;
-                    result.push({
-                        label: pkgPath,
-                        textEdit: TextEdit.replace(
-                            util.createRange(
-                                currentToken.range.start.line,
-                                //+1 to step past the opening quote
-                                currentToken.range.start.character + (openingQuote ? 1 : 0),
-                                currentToken.range.end.line,
-                                //-1 to exclude the closing quotemark (or the end character if there is no closing quotemark)
-                                currentToken.range.end.character + (currentToken.text.endsWith('"') ? -1 : 0)
-                            ),
-                            pkgPath
-                        ),
-                        kind: CompletionItemKind.File
-                    });
-                }
-                return result;
-            } else {
-                //do nothing. we don't want to show completions inside of strings...
-                return [];
-            }
-        }
-
-        const namespaceCompletions = this.getNamespaceCompletions(currentToken, this.parseMode, scope);
-        if (namespaceCompletions.length > 0) {
-            return [...namespaceCompletions];
-        }
-
-        const enumMemberCompletions = this.getEnumMemberStatementCompletions(currentToken, this.parseMode, scope);
-        if (enumMemberCompletions.length > 0) {
-            // no other completion is valid in this case
-            return enumMemberCompletions;
-        }
-
-        //determine if cursor is inside a function
-        let functionScope = this.getFunctionScopeAtPosition(position);
-        if (!functionScope) {
-            //we aren't in any function scope, so return the keyword completions and namespaces
-            if (this.getTokenBefore(currentToken, TokenKind.New)) {
-                // there's a new keyword, so only class types are viable here
-                return [...this.getGlobalClassStatementCompletions(currentToken, this.parseMode)];
-            } else {
-                return [
-                    ...KeywordCompletions,
-                    ...this.getGlobalClassStatementCompletions(currentToken, this.parseMode),
-                    ...namespaceCompletions,
-                    ...this.getNonNamespacedEnumStatementCompletions(currentToken, this.parseMode, scope)
-                ];
-            }
-        }
-
-        const classNameCompletions = this.getGlobalClassStatementCompletions(currentToken, this.parseMode);
-        const newToken = this.getTokenBefore(currentToken, TokenKind.New);
-        if (newToken) {
-            //we are after a new keyword; so we can only be top-level namespaces or classes at this point
-            result.push(...classNameCompletions);
-            result.push(...namespaceCompletions);
-            return result;
-        }
-
-        if (this.tokenFollows(currentToken, TokenKind.Goto)) {
-            return this.getLabelCompletion(functionScope);
-        }
-
-        if (this.isPositionNextToTokenKind(position, TokenKind.Dot)) {
-
-            const selfClassMemberCompletions = this.getClassMemberCompletions(position, currentToken, functionScope, scope);
-
-            if (selfClassMemberCompletions.size > 0) {
-                return [...selfClassMemberCompletions.values()].filter((i) => i.label !== 'new');
-            }
-
-            if (!this.getClassFromMReference(position, currentToken, functionScope)) {
-                //and anything from any class in scope to a non m class
-                let classMemberCompletions = scope.getAllClassMemberCompletions();
-                result.push(...classMemberCompletions.values());
-                result.push(...scope.getPropertyNameCompletions().filter((i) => !classMemberCompletions.has(i.label)));
-            } else {
-                result.push(...scope.getPropertyNameCompletions());
-            }
-        } else {
-            result.push(
-                //include namespaces
-                ...namespaceCompletions,
-                //include class names
-                ...classNameCompletions,
-                //include enums
-                ...this.getNonNamespacedEnumStatementCompletions(currentToken, this.parseMode, scope),
-                //include constants
-                ...this.getNonNamespacedConstStatementCompletions(currentToken, this.parseMode, scope),
-                //include the global callables
-                ...scope.getCallablesAsCompletions(this.parseMode)
-            );
-
-            //add `m` because that's always valid within a function
-            result.push({
-                label: 'm',
-                kind: CompletionItemKind.Variable
-            });
-            names.m = true;
-
-            result.push(...KeywordCompletions);
-
-            //include local variables
-            let variables = functionScope.variableDeclarations;
-            for (let variable of variables) {
-                //skip duplicate variable names
-                if (names[variable.name.toLowerCase()]) {
-                    continue;
-                }
-                names[variable.name.toLowerCase()] = true;
-                result.push({
-                    label: variable.name,
-                    kind: isFunctionType(variable.type) ? CompletionItemKind.Function : CompletionItemKind.Variable
-                });
-            }
-
-            if (this.parseMode === ParseMode.BrighterScript) {
-                //include the first part of namespaces
-                let namespaces = scope.getAllNamespaceStatements();
-                for (let stmt of namespaces) {
-                    let firstPart = stmt.nameExpression.getNameParts().shift();
-                    //skip duplicate namespace names
-                    if (names[firstPart.toLowerCase()]) {
-                        continue;
-                    }
-                    names[firstPart.toLowerCase()] = true;
-                    result.push({
-                        label: firstPart,
-                        kind: CompletionItemKind.Module
-                    });
-                }
-            }
-        }
-        return result;
-    }
-
-    private getLabelCompletion(functionScope: FunctionScope) {
-        return functionScope.labelStatements.map(label => ({
-            label: label.name,
-            kind: CompletionItemKind.Reference
-        }));
-    }
-
-    private getClassMemberCompletions(position: Position, currentToken: Token, functionScope: FunctionScope, scope: Scope) {
-
-        let classStatement = this.getClassFromMReference(position, currentToken, functionScope);
-        let results = new Map<string, CompletionItem>();
-        if (classStatement) {
-            let classes = scope.getClassHierarchy(classStatement.item.getName(ParseMode.BrighterScript).toLowerCase());
-            for (let cs of classes) {
-                for (let member of [...cs?.item?.fields ?? [], ...cs?.item?.methods ?? []]) {
-                    if (!results.has(member.name.text.toLowerCase())) {
-                        results.set(member.name.text.toLowerCase(), {
-                            label: member.name.text,
-                            kind: isFieldStatement(member) ? CompletionItemKind.Field : CompletionItemKind.Function
-                        });
-                    }
-                }
-            }
-        }
-        return results;
-    }
-
-    public getClassFromMReference(position: Position, currentToken: Token, functionScope: FunctionScope): FileLink<ClassStatement> | undefined {
-        let previousToken = this.getPreviousToken(currentToken);
-        if (previousToken?.kind === TokenKind.Dot) {
-            previousToken = this.getPreviousToken(previousToken);
-        }
-        if (previousToken?.kind === TokenKind.Identifier && previousToken?.text.toLowerCase() === 'm' && isMethodStatement(functionScope.func.functionStatement)) {
-            return { item: this.parser.references.classStatements.find((cs) => util.rangeContains(cs.range, position)), file: this };
-        }
-        return undefined;
-    }
-
-    private getGlobalClassStatementCompletions(currentToken: Token, parseMode: ParseMode): CompletionItem[] {
-        if (parseMode === ParseMode.BrightScript) {
-            return [];
-        }
-        let results = new Map<string, CompletionItem>();
-        let completionName = this.getPartialVariableName(currentToken, [TokenKind.New])?.toLowerCase();
-        if (completionName?.includes('.')) {
-            return [];
-        }
-        let scopes = this.program.getScopesForFile(this);
-        for (let scope of scopes) {
-            let classMap = scope.getClassMap();
-            for (const key of [...classMap.keys()]) {
-                let cs = classMap.get(key).item;
-                if (!results.has(cs.name.text)) {
-                    results.set(cs.name.text, {
-                        label: cs.name.text,
-                        kind: CompletionItemKind.Class
-                    });
-                }
-            }
-        }
-        return [...results.values()];
-    }
-
-    private getNonNamespacedEnumStatementCompletions(currentToken: Token, parseMode: ParseMode, scope: Scope): CompletionItem[] {
-        if (parseMode !== ParseMode.BrighterScript) {
-            return [];
-        }
-        const containingNamespaceName = this.getNamespaceStatementForPosition(currentToken?.range?.start)?.name + '.';
-        const results = new Map<string, CompletionItem>();
-        const enumMap = scope.getEnumMap();
-        for (const key of [...enumMap.keys()]) {
-            const enumStatement = enumMap.get(key).item;
-            const fullName = enumStatement.fullName;
-            //if the enum is contained within our own namespace, or if it's a non-namespaced enum
-            if (fullName.startsWith(containingNamespaceName) || !fullName.includes('.')) {
-                results.set(fullName, {
-                    label: enumStatement.name,
-                    kind: CompletionItemKind.Enum
-                });
-            }
-        }
-        return [...results.values()];
-    }
-
-    private getNonNamespacedConstStatementCompletions(currentToken: Token, parseMode: ParseMode, scope: Scope): CompletionItem[] {
-        if (parseMode !== ParseMode.BrighterScript) {
-            return [];
-        }
-        const containingNamespaceName = this.getNamespaceStatementForPosition(currentToken?.range?.start)?.name + '.';
-        const results = new Map<string, CompletionItem>();
-        const map = scope.getConstMap();
-        for (const key of [...map.keys()]) {
-            const statement = map.get(key).item;
-            const fullName = statement.fullName;
-            //if the item is contained within our own namespace, or if it's non-namespaced
-            if (fullName.startsWith(containingNamespaceName) || !fullName.includes('.')) {
-                results.set(fullName, {
-                    label: statement.name,
-                    kind: CompletionItemKind.Constant
-                });
-            }
-        }
-        return [...results.values()];
-    }
-
-    private getEnumMemberStatementCompletions(currentToken: Token, parseMode: ParseMode, scope: Scope): CompletionItem[] {
-        if (parseMode === ParseMode.BrightScript || !currentToken) {
-            return [];
-        }
-        const results = new Map<string, CompletionItem>();
-        const completionName = this.getPartialVariableName(currentToken)?.toLowerCase();
-        //if we don't have a completion name, or if there's no period in the name, then this is not to the right of an enum name
-        if (!completionName || !completionName.includes('.')) {
-            return [];
-        }
-        const enumNameLower = completionName?.split(/\.(\w+)?$/)[0]?.toLowerCase();
-        const namespaceNameLower = this.getNamespaceStatementForPosition(currentToken.range.end)?.name.toLowerCase();
-        const enumMap = scope.getEnumMap();
-        //get the enum statement with this name (check without namespace prefix first, then with inferred namespace prefix next)
-        const enumStatement = (enumMap.get(enumNameLower) ?? enumMap.get(namespaceNameLower + '.' + enumNameLower))?.item;
-        //if we found an enum with this name
-        if (enumStatement) {
-            for (const member of enumStatement.getMembers()) {
-                const name = enumStatement.fullName + '.' + member.name;
-                const nameLower = name.toLowerCase();
-                results.set(nameLower, {
-                    label: member.name,
-                    kind: CompletionItemKind.EnumMember
-                });
-            }
-        }
-        return [...results.values()];
-    }
-
-    private getNamespaceCompletions(currentToken: Token, parseMode: ParseMode, scope: Scope): CompletionItem[] {
-        //BrightScript does not support namespaces, so return an empty list in that case
-        if (parseMode === ParseMode.BrightScript) {
-            return [];
-        }
-
-        const completionName = this.getPartialVariableName(currentToken, [TokenKind.New]);
-        //if we don't have a completion name, or if there's no period in the name, then this is not a namespaced variable
-        if (!completionName || !completionName.includes('.')) {
-            return [];
-        }
-        //remove any trailing identifer and then any trailing dot, to give us the
-        //name of its immediate parent namespace
-        let closestParentNamespaceName = completionName.replace(/\.([a-z0-9_]*)?$/gi, '').toLowerCase();
-        let newToken = this.getTokenBefore(currentToken, TokenKind.New);
-
-        let result = new Map<string, CompletionItem>();
-        for (let [, namespace] of scope.namespaceLookup) {
-            //completionName = "NameA."
-            //completionName = "NameA.Na
-            //NameA
-            //NameA.NameB
-            //NameA.NameB.NameC
-            if (namespace.fullName.toLowerCase() === closestParentNamespaceName) {
-                //add all of this namespace's immediate child namespaces, bearing in mind if we are after a new keyword
-                for (let [, ns] of namespace.namespaces) {
-                    if (!newToken || ns.statements?.find((s) => isClassStatement(s))) {
-                        if (!result.has(ns.lastPartName)) {
-                            result.set(ns.lastPartName, {
-                                label: ns.lastPartName,
-                                kind: CompletionItemKind.Module
-                            });
+                let mostSpecificNamespace: NamespaceStatement;
+                for (const statement of this._cachedLookups.namespaceStatements) {
+                    if (util.rangeContains(statement.location?.range, position)) {
+                        if (mostSpecificNamespace) {
+                            if (util.isRangeInRange(statement.location?.range, mostSpecificNamespace.location?.range)) {
+                                mostSpecificNamespace = statement;
+                            }
+                        } else {
+                            mostSpecificNamespace = statement;
                         }
                     }
                 }
-
-                //add function and class statement completions
-                for (let stmt of namespace.statements ?? []) {
-                    if (isClassStatement(stmt)) {
-                        result.set(stmt.name.text, {
-                            label: stmt.name.text,
-                            kind: CompletionItemKind.Class
-                        });
-                    } else if (isFunctionStatement(stmt) && !newToken) {
-                        result.set(stmt.name.text, {
-                            label: stmt.name.text,
-                            kind: CompletionItemKind.Function
-                        });
-                    } else if (isEnumStatement(stmt) && !newToken) {
-                        result.set(stmt.name, {
-                            label: stmt.name,
-                            kind: CompletionItemKind.Enum
-                        });
-                    } else if (isConstStatement(stmt) && !newToken) {
-                        result.set(stmt.name, {
-                            label: stmt.name,
-                            kind: CompletionItemKind.Constant
-                        });
-                    }
-                }
-            }
+                return mostSpecificNamespace;
+            });
         }
-        return [...result.values()];
     }
 
     /**
@@ -1241,6 +757,10 @@ export class BrsFile {
 
     public isPositionNextToTokenKind(position: Position, tokenKind: TokenKind) {
         const closestToken = this.getClosestToken(position);
+        return this.isTokenNextToTokenKind(closestToken, tokenKind);
+    }
+
+    public isTokenNextToTokenKind(closestToken: Token, tokenKind: TokenKind) {
         const previousToken = this.getPreviousToken(closestToken);
         const previousTokenKind = previousToken?.kind;
         //next to matched token
@@ -1258,8 +778,11 @@ export class BrsFile {
         }
     }
 
-    private getTokenBefore(currentToken: Token, tokenKind: TokenKind): Token {
+    public getTokenBefore(currentToken: Token, tokenKind?: TokenKind): Token {
         const index = this.parser.tokens.indexOf(currentToken);
+        if (!tokenKind) {
+            return this.parser.tokens[index - 1];
+        }
         for (let i = index - 1; i >= 0; i--) {
             currentToken = this.parser.tokens[i];
             if (currentToken.kind === TokenKind.Newline) {
@@ -1271,7 +794,7 @@ export class BrsFile {
         return undefined;
     }
 
-    private tokenFollows(currentToken: Token, tokenKind: TokenKind): boolean {
+    public tokenFollows(currentToken: Token, tokenKind: TokenKind): boolean {
         const index = this.parser.tokens.indexOf(currentToken);
         if (index > 0) {
             return this.parser.tokens[index - 1].kind === tokenKind;
@@ -1279,9 +802,9 @@ export class BrsFile {
         return false;
     }
 
-    public getTokensUntil(currentToken: Token, tokenKind: TokenKind, direction: -1 | 1 = -1) {
+    public getTokensUntil(currentToken: Token, tokenKind: TokenKind, direction: -1 | 1 = 1) {
         let tokens = [];
-        for (let i = this.parser.tokens.indexOf(currentToken); direction === -1 ? i >= 0 : i === this.parser.tokens.length; i += direction) {
+        for (let i = this.parser.tokens.indexOf(currentToken); direction === -1 ? i >= 0 : i < this.parser.tokens.length; i += direction) {
             currentToken = this.parser.tokens[i];
             if (currentToken.kind === TokenKind.Newline || currentToken.kind === tokenKind) {
                 break;
@@ -1291,6 +814,16 @@ export class BrsFile {
         return tokens;
     }
 
+    public getNextTokenByPredicate(currentToken: Token, test: (Token) => boolean, direction: -1 | 1 = 1) {
+        for (let i = this.parser.tokens.indexOf(currentToken); direction === -1 ? i >= 0 : i < this.parser.tokens.length; i += direction) {
+            currentToken = this.parser.tokens[i];
+            if (test(currentToken)) {
+                return currentToken;
+            }
+        }
+        return undefined;
+    }
+
     public getPreviousToken(token: Token) {
         const parser = this.parser;
         let idx = parser.tokens.indexOf(token);
@@ -1302,41 +835,16 @@ export class BrsFile {
      * Returns false if no namespace was found with that name
      */
     public calleeStartsWithNamespace(callee: Expression) {
-        let left = callee as any;
+        let left = callee as AstNode;
         while (isDottedGetExpression(left)) {
             left = left.obj;
         }
 
         if (isVariableExpression(left)) {
-            let lowerName = left.name.text.toLowerCase();
-            //find the first scope that contains this namespace
-            let scope = this.program.getFirstScopeForFile(this);
-            if (scope?.namespaceLookup.has(lowerName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Determine if the callee (i.e. function name) is a known function declared on the given namespace.
-     */
-    public calleeIsKnownNamespaceFunction(callee: Expression, namespaceName: string | undefined) {
-        //if we have a variable and a namespace
-        if (isVariableExpression(callee) && namespaceName) {
-            let lowerCalleeName = callee?.name?.text?.toLowerCase();
-            if (lowerCalleeName) {
-                let scope = this.program.getFirstScopeForFile(this);
-
-                //if this file does not belong to any scopes, make a temporary one to answer the question
-                if (!scope) {
-                    scope = new Scope(`temporary-for-${this.pkgPath}`, this.program);
-                    scope.getAllFiles = () => [this];
-                    scope.getOwnFiles = scope.getAllFiles;
-                }
-
-                let namespace = scope.namespaceLookup.get(namespaceName.toLowerCase());
-                if (namespace?.functionStatements?.[lowerCalleeName]) {
+            const leftType = left.getType({ flags: SymbolTypeFlag.runtime });
+            if (isNamespaceType(leftType)) {
+                // this is a namespace, but it might be aliased. Look it up and see if it has the same name
+                if (leftType.name.toLowerCase() === left.tokens?.name?.text?.toLowerCase()) {
                     return true;
                 }
             }
@@ -1351,11 +859,11 @@ export class BrsFile {
         let tokens = this.parser.tokens;
         for (let i = 0; i < tokens.length; i++) {
             let token = tokens[i];
-            if (util.rangeContains(token.range, position)) {
+            if (util.rangeContains(token.location?.range, position)) {
                 return token;
             }
             //if the position less than this token range, then this position touches no token,
-            if (util.positionIsGreaterThanRange(position, token.range) === false) {
+            if (util.positionIsGreaterThanRange(position, token.location?.range) === false) {
                 let t = tokens[i - 1];
                 //return the token or the first token
                 return t ? t : tokens[0];
@@ -1406,17 +914,17 @@ export class BrsFile {
         //get class fields and members
         const statementHandler = (statement: MethodStatement) => {
             if (statement.getName(file.parseMode).toLowerCase() === textToSearchFor) {
-                results.push(util.createLocation(util.pathToUri(file.srcPath), statement.range));
+                results.push(util.createLocationFromRange(util.pathToUri(file.srcPath), statement.location?.range));
             }
         };
         const fieldStatementHandler = (statement: FieldStatement) => {
-            if (statement.name.text.toLowerCase() === textToSearchFor) {
-                results.push(util.createLocation(util.pathToUri(file.srcPath), statement.range));
+            if (statement.tokens.name.text.toLowerCase() === textToSearchFor) {
+                results.push(util.createLocationFromRange(util.pathToUri(file.srcPath), statement.location?.range));
             }
         };
         file.parser.ast.walk(createVisitor({
-            ClassMethodStatement: statementHandler,
-            ClassFieldStatement: fieldStatementHandler
+            MethodStatement: statementHandler,
+            FieldStatement: fieldStatementHandler
         }), {
             walkMode: WalkMode.visitStatements
         });
@@ -1427,8 +935,8 @@ export class BrsFile {
     public getClassMethod(classStatement: ClassStatement, name: string, walkParents = true): MethodStatement | undefined {
         //TODO - would like to write this with getClassHieararchy; but got stuck on working out the scopes to use... :(
         let statement;
-        const statementHandler = (e) => {
-            if (!statement && e.name.text.toLowerCase() === name.toLowerCase()) {
+        const statementHandler = (e: MethodStatement) => {
+            if (!statement && e.tokens.name.text.toLowerCase() === name.toLowerCase()) {
                 statement = e;
             }
         };
@@ -1466,15 +974,47 @@ export class BrsFile {
         }).process();
     }
 
+    /**
+     * Generate the code, map, and typedef for this file
+     */
+    public serialize(): SerializedCodeFile {
+        const result: SerializedCodeFile = {};
+
+        const transpiled = this.transpile();
+        if (typeof transpiled.code === 'string') {
+            result.code = transpiled.code;
+        }
+        if (transpiled.map) {
+            result.map = transpiled.map.toString();
+        }
+        //generate the typedef (if this is not a typedef itself, and if enabled)
+        if (!this.isTypedef && this.program.options.emitDefinitions) {
+            result.typedef = this.getTypedef();
+        }
+        return result;
+    }
+
     /**
      * Convert the brightscript/brighterscript source code into valid brightscript
      */
     public transpile(): CodeWithSourceMap {
         const state = new BrsTranspileState(this);
+        state.editor = this.editor ?? new Editor();
         let transpileResult: SourceNode | undefined;
 
         if (this.needsTranspiled) {
-            transpileResult = util.sourceNodeFromTranspileResult(null, null, state.srcPath, this.ast.transpile(state));
+            const astTranspile = this.ast.transpile(state);
+            const trailingComments = [];
+            if (util.hasLeadingComments(this.parser.eofToken)) {
+                if (util.isLeadingCommentOnSameLine(this.ast.statements[this.ast.statements.length - 1]?.location, this.parser.eofToken)) {
+                    trailingComments.push(' ');
+                } else {
+                    trailingComments.push('\n');
+                }
+                trailingComments.push(...state.transpileLeadingComments(this.parser.eofToken));
+            }
+
+            transpileResult = util.sourceNodeFromTranspileResult(null, null, state.srcPath, [...astTranspile, ...trailingComments]);
         } else if (this.program.options.sourceMap) {
             //emit code as-is with a simple map to the original file location
             transpileResult = util.simpleMap(state.srcPath, this.fileContents);
@@ -1482,8 +1022,12 @@ export class BrsFile {
             //simple SourceNode wrapping the entire file to simplify the logic below
             transpileResult = new SourceNode(null, null, state.srcPath, this.fileContents);
         }
-        //undo any AST edits that the transpile cycle has made
-        state.editor.undoAll();
+
+        //if we created an editor for this flow, undo the edits now
+        if (!this.editor) {
+            //undo any AST edits that the transpile cycle has made
+            state.editor.undoAll();
+        }
 
         if (this.program.options.sourceMap) {
             const stagingFileName = path.basename(state.srcPath).replace(/\.bs$/, '.brs');
@@ -1500,6 +1044,340 @@ export class BrsFile {
         }
     }
 
+    public validationSegmenter = new AstValidationSegmenter(this);
+
+    public getNamespaceSymbolTable(allowCache = true) {
+        if (!allowCache) {
+            return this.constructNamespaceSymbolTable();
+        }
+        return this.cache?.getOrAdd(`namespaceSymbolTable`, () => this.constructNamespaceSymbolTable());
+    }
+
+    private constructNamespaceSymbolTable() {
+        const nsTable = new SymbolTable(`File NamespaceTypes ${this.destPath}`, () => this.program?.globalScope.symbolTable);
+        this.populateNameSpaceSymbolTable(nsTable);
+        return nsTable;
+    }
+
+    public processSymbolInformation() {
+        // Get namespaces across imported files
+        this.program.logger.debug('Processing symbol information', this.srcPath);
+
+        const nsTable = this.getNamespaceSymbolTable(false);
+        this.linkSymbolTableDisposables.push(this.ast.symbolTable.addSibling(nsTable));
+        this.validationSegmenter.processTree(this.ast);
+        this.program.addFileSymbolInfo(this);
+        this.unlinkNamespaceSymbolTables();
+    }
+
+    public unlinkNamespaceSymbolTables() {
+        for (let disposable of this.linkSymbolTableDisposables) {
+            disposable();
+        }
+        this.linkSymbolTableDisposables = [];
+    }
+
+    private linkSymbolTableDisposables = [];
+
+
+    public populateNameSpaceSymbolTable(namespaceSymbolTable: SymbolTable) {
+        //Add namespace aggregates to namespace member tables
+        const namespaceTypesKnown = new Map<string, BscType>();
+        // eslint-disable-next-line no-bitwise
+        let getTypeOptions = { flags: SymbolTypeFlag.runtime | SymbolTypeFlag.typetime };
+        for (const [nsName, nsContainer] of this.getNamespaceLookupObject()) {
+            let currentNSType: BscType = null;
+            let parentNSType: BscType = null;
+            const existingNsStmt = nsContainer.namespaceStatements?.[0];
+
+            if (!nsContainer.isTopLevel) {
+                parentNSType = namespaceTypesKnown.get(nsContainer.parentNameLower);
+                if (!parentNSType) {
+                    // we don't know about the parent namespace... uh, oh!
+                    this.program.logger.error(`Unable to find parent namespace type for namespace ${nsName}`);
+                    break;
+                }
+                currentNSType = parentNSType.getMemberType(nsContainer.fullNameLower, getTypeOptions);
+            } else {
+                currentNSType = namespaceSymbolTable.getSymbolType(nsContainer.fullNameLower, getTypeOptions);
+            }
+            if (!isNamespaceType(currentNSType)) {
+                if (!currentNSType || isReferenceType(currentNSType) || isCallableType(currentNSType)) {
+                    currentNSType = existingNsStmt
+                        ? existingNsStmt.getType(getTypeOptions)
+                        : new NamespaceType(nsName);
+                    if (parentNSType) {
+                        // adding as a member of existing NS
+                        parentNSType.addMember(nsContainer.lastPartName, { definingNode: existingNsStmt }, currentNSType, getTypeOptions.flags);
+                    } else {
+                        namespaceSymbolTable.addSymbol(nsContainer.lastPartName, { definingNode: existingNsStmt }, currentNSType, getTypeOptions.flags);
+                    }
+                } else {
+                    // Something else already used the name this namespace is using.
+                    continue;
+                }
+            } else {
+                // Existing known namespace
+            }
+            if (!namespaceTypesKnown.has(nsName)) {
+                namespaceTypesKnown.set(nsName, currentNSType);
+            }
+            currentNSType.memberTable.addSibling(nsContainer.symbolTable);
+        }
+    }
+
+    public get requiredSymbols() {
+        return this.cache.getOrAdd(`requiredSymbols`, () => {
+            this.program.logger.debug('Getting required symbols', this.srcPath);
+
+            const allNeededSymbolSets = this.validationSegmenter.unresolvedSegmentsSymbols.values();
+
+            const requiredSymbols: UnresolvedSymbol[] = [];
+            const addedSymbols = new Map<SymbolTypeFlag, Set<string>>();
+            addedSymbols.set(SymbolTypeFlag.runtime, new Set());
+            addedSymbols.set(SymbolTypeFlag.typetime, new Set());
+            for (const setOfSymbols of allNeededSymbolSets) {
+                for (const symbol of setOfSymbols) {
+                    const fullSymbolKey = symbol.typeChain.map(tce => tce.name).join('.').toLowerCase();
+                    const flag = symbol.endChainFlags;
+                    if (this.providedSymbols.symbolMap.get(flag)?.has(fullSymbolKey)) {
+                        // this catches namespaced things
+                        continue;
+                    }
+                    const existingSymbol = this.ast.getSymbolTable().getSymbol(fullSymbolKey, flag);
+                    if (existingSymbol?.length > 0) {
+                        if (symbol[0]?.data?.isAlias) {
+                            //catches aliases
+                            continue;
+                        }
+                    }
+                    if (!addedSymbols.get(flag)?.has(fullSymbolKey)) {
+                        requiredSymbols.push(symbol);
+                        addedSymbols.get(flag)?.add(fullSymbolKey);
+                    }
+                }
+            }
+            return requiredSymbols;
+        });
+    }
+
+    public get providedSymbols() {
+        return this.cache?.getOrAdd(`providedSymbols`, () => {
+            return this.getProvidedSymbols();
+        });
+    }
+
+    public get assignedSymbols() {
+        return this.cache.getOrAdd(`assignedSymbols`, () => {
+            const allAssignedSymbolsEntries = this.validationSegmenter.assignedTokensInSegment.entries() ?? [];
+
+            let allAssignedSymbolsSet: AssignedSymbol[] = [];
+
+            for (const [_segment, assignedSymbolSet] of allAssignedSymbolsEntries) {
+                allAssignedSymbolsSet.push(...assignedSymbolSet.values());
+            }
+            return allAssignedSymbolsSet;
+        });
+    }
+
+    private getProvidedSymbols() {
+        this.program.logger.debug('Getting provided symbols', this.srcPath);
+
+        const symbolMap = new Map<SymbolTypeFlag, Map<string, ProvidedSymbol>>();
+        const runTimeSymbolMap = new Map<string, ProvidedSymbol>();
+        const typeTimeSymbolMap = new Map<string, ProvidedSymbol>();
+        const referenceSymbolMap = new Map<SymbolTypeFlag, Map<string, ProvidedSymbol>>();
+        const referenceRunTimeSymbolMap = new Map<string, ProvidedSymbol>();
+        const referenceTypeTimeSymbolMap = new Map<string, ProvidedSymbol>();
+
+        const tablesToGetSymbolsFrom: Array<{ table: SymbolTable; namePrefixLower?: string }> = [
+            { table: this.parser.symbolTable },
+            ...this.parser.symbolTable.pocketTables
+        ];
+
+        for (const namespaceStatement of this._cachedLookups.namespaceStatements) {
+            tablesToGetSymbolsFrom.push({
+                table: namespaceStatement.body.getSymbolTable(),
+                namePrefixLower: namespaceStatement.getName(ParseMode.BrighterScript).toLowerCase()
+            });
+        }
+
+        function getAnyDuplicates(symbolNameLower: string, providedSymbolMap: Map<string, ProvidedSymbol>, referenceProvidedSymbolMap: Map<string, ProvidedSymbol>) {
+            if (symbolNameLower === 'm') {
+                return [];
+            }
+            let duplicates = [] as Array<BscSymbol>;
+            let existingSymbol = providedSymbolMap.get(symbolNameLower);
+            if (existingSymbol) {
+                duplicates.push(existingSymbol.symbol, ...existingSymbol.duplicates);
+            }
+            existingSymbol = referenceProvidedSymbolMap.get(symbolNameLower);
+            if (existingSymbol) {
+                duplicates.push(existingSymbol.symbol, ...existingSymbol.duplicates);
+            }
+
+            return duplicates;
+        }
+
+        for (const symbolTable of tablesToGetSymbolsFrom) {
+            const runTimeSymbols = symbolTable.table.getOwnSymbols(SymbolTypeFlag.runtime);
+            const typeTimeSymbols = symbolTable.table.getOwnSymbols(SymbolTypeFlag.typetime);
+
+            for (const symbol of runTimeSymbols) {
+                const symbolNameLower = symbolTable.namePrefixLower
+                    ? `${symbolTable.namePrefixLower}.${symbol.name.toLowerCase()}`
+                    : symbol.name.toLowerCase();
+                if (symbolNameLower === 'm') {
+                    continue;
+                }
+                const duplicates = getAnyDuplicates(symbolNameLower, runTimeSymbolMap, referenceRunTimeSymbolMap);
+
+                if (!isAnyReferenceType(symbol.type)) {
+                    runTimeSymbolMap.set(symbolNameLower, { symbol: symbol, duplicates: duplicates });
+                } else {
+                    referenceRunTimeSymbolMap.set(symbolNameLower, { symbol: symbol, duplicates: duplicates });
+                }
+            }
+
+            for (const symbol of typeTimeSymbols) {
+                const symbolNameLower = symbolTable.namePrefixLower
+                    ? `${symbolTable.namePrefixLower}.${symbol.name.toLowerCase()}`
+                    : symbol.name.toLowerCase();
+                if (symbolNameLower === 'm') {
+                    continue;
+                }
+
+                const duplicates = getAnyDuplicates(symbolNameLower, typeTimeSymbolMap, referenceTypeTimeSymbolMap);
+                if (!isAnyReferenceType(symbol.type)) {
+                    const requiredSymbolTypes = new Set<BscType>();
+                    util.getCustomTypesInSymbolTree(requiredSymbolTypes, symbol.type);
+                    const requiredSymbolNames = new Set<string>();
+                    for (const requiredType of requiredSymbolTypes.values()) {
+                        requiredSymbolNames.add(requiredType.toString());
+                    }
+                    typeTimeSymbolMap.set(symbolNameLower, { symbol: symbol, duplicates: duplicates, requiredSymbolNames: requiredSymbolNames });
+                } else {
+                    referenceTypeTimeSymbolMap.set(symbolNameLower, { symbol: symbol, duplicates: duplicates });
+                }
+            }
+        }
+
+        symbolMap.set(SymbolTypeFlag.runtime, runTimeSymbolMap);
+        symbolMap.set(SymbolTypeFlag.typetime, typeTimeSymbolMap);
+
+        referenceSymbolMap.set(SymbolTypeFlag.runtime, referenceRunTimeSymbolMap);
+        referenceSymbolMap.set(SymbolTypeFlag.typetime, referenceTypeTimeSymbolMap);
+
+        const changes = new Map<SymbolTypeFlag, Set<string>>();
+        changes.set(SymbolTypeFlag.runtime, new Set<string>());
+        changes.set(SymbolTypeFlag.typetime, new Set<string>());
+        const previouslyProvidedSymbols = this.program.getFileSymbolInfo(this)?.provides.symbolMap;
+        const previousSymbolsChecked = new Map<SymbolTypeFlag, Set<string>>();
+        previousSymbolsChecked.set(SymbolTypeFlag.runtime, new Set<string>());
+        previousSymbolsChecked.set(SymbolTypeFlag.typetime, new Set<string>());
+
+        for (const flag of [SymbolTypeFlag.runtime, SymbolTypeFlag.typetime]) {
+            const newSymbolMapForFlag = symbolMap.get(flag);
+            const oldSymbolMapForFlag = previouslyProvidedSymbols?.get(flag);
+            const previousSymbolsCheckedForFlag = previousSymbolsChecked.get(flag);
+            const changesForFlag = changes.get(flag);
+            if (!oldSymbolMapForFlag) {
+                for (const key of newSymbolMapForFlag.keys()) {
+                    changesForFlag.add(key);
+                }
+                continue;
+
+            }
+            for (const [symbolKey, symbolObj] of newSymbolMapForFlag) {
+                const symbolType = symbolObj.symbol.type;
+                const previousType = oldSymbolMapForFlag?.get(symbolKey)?.symbol?.type;
+                previousSymbolsCheckedForFlag.add(symbolKey);
+                if (!previousType) {
+                    changesForFlag.add(symbolKey);
+                    continue;
+                }
+                const data = {};
+                if (!symbolType.isEqual(previousType, data)) {
+                    changesForFlag.add(symbolKey);
+                }
+            }
+            for (const [symbolKey] of previouslyProvidedSymbols.get(flag)) {
+                if (!previousSymbolsCheckedForFlag.has(symbolKey)) {
+                    changesForFlag.add(symbolKey);
+                }
+            }
+        }
+        return {
+            symbolMap: symbolMap,
+            changes: changes,
+            referenceSymbolMap: referenceSymbolMap
+        };
+    }
+
+    public markSegmentAsValidated(node: AstNode) {
+        this.validationSegmenter.markSegmentAsValidated(node);
+    }
+
+    public getNamespaceLookupObject() {
+        if (!this.isValidated) {
+            return this.buildNamespaceLookup();
+        }
+        return this.cache.getOrAdd(`namespaceLookup`, () => {
+            const nsLookup = this.buildNamespaceLookup();
+            return nsLookup;
+        });
+    }
+
+    private buildNamespaceLookup() {
+        const namespaceLookup = new Map<string, NamespaceContainer>();
+        for (let namespaceStatement of this._cachedLookups.namespaceStatements) {
+            let nameParts = namespaceStatement.getNameParts();
+
+            let loopName: string = null;
+            let lowerLoopName: string = null;
+            let parentNameLower: string = null;
+
+            //ensure each namespace section is represented in the results
+            //(so if the namespace name is A.B.C, this will make an entry for "A", an entry for "A.B", and an entry for "A.B.C"
+            for (let i = 0; i < nameParts.length; i++) {
+
+                let part = nameParts[i];
+                let lowerPartName = part.text.toLowerCase();
+
+                if (i === 0) {
+                    loopName = part.text;
+                    lowerLoopName = lowerPartName;
+                } else {
+                    parentNameLower = lowerLoopName;
+                    loopName += '.' + part.text;
+                    lowerLoopName += '.' + lowerPartName;
+                }
+                if (!namespaceLookup.has(lowerLoopName)) {
+                    namespaceLookup.set(lowerLoopName, {
+                        isTopLevel: i === 0,
+                        file: this,
+                        fullName: loopName,
+                        fullNameLower: lowerLoopName,
+                        parentNameLower: parentNameLower,
+                        nameParts: nameParts.slice(0, i),
+                        nameRange: namespaceStatement.nameExpression.location?.range,
+                        lastPartName: part.text,
+                        lastPartNameLower: lowerPartName,
+                        namespaceStatements: [],
+                        // the aggregate symbol table should have no parent. It should include just the symbols of the namespace.
+                        symbolTable: new SymbolTable(`Namespace File Aggregate: '${loopName}'`)
+                    });
+                }
+            }
+            let ns = namespaceLookup.get(lowerLoopName);
+            ns.namespaceStatements.push(namespaceStatement);
+            // Merges all the symbol tables of the namespace statements into the new symbol table created above.
+            // Set those symbol tables to have this new merged table as a parent
+            ns.symbolTable.mergeSymbolTable(namespaceStatement.body.getSymbolTable());
+        }
+        return namespaceLookup;
+    }
+
     public getTypedef() {
         const state = new BrsTranspileState(this);
         const typedef = this.ast.getTypedef(state);
@@ -1509,30 +1387,11 @@ export class BrsFile {
 
     public dispose() {
         this._parser?.dispose();
-        //unsubscribe from any DependencyGraph subscriptions
-        this.unsubscribeFromDependencyGraph?.();
 
         //deleting these properties result in lower memory usage (garbage collection is magic!)
         delete this.fileContents;
         delete this._parser;
-        delete this.callables;
-        delete this.functionCalls;
         delete this._functionScopes;
         delete this.scopesByFunc;
     }
 }
-
-/**
- * List of completions for all valid keywords/reserved words.
- * Build this list once because it won't change for the lifetime of this process
- */
-export const KeywordCompletions = Object.keys(Keywords)
-    //remove any keywords with whitespace
-    .filter(x => !x.includes(' '))
-    //create completions
-    .map(x => {
-        return {
-            label: x,
-            kind: CompletionItemKind.Keyword
-        } as CompletionItem;
-    });
diff --git a/src/files/BscFile.ts b/src/files/BscFile.ts
new file mode 100644
index 000000000..dc9a4394e
--- /dev/null
+++ b/src/files/BscFile.ts
@@ -0,0 +1,110 @@
+import type { SourceMapGenerator } from 'source-map';
+import type { Editor } from '../astUtils/Editor';
+import type { CommentFlag } from '../interfaces';
+import type { DependencyChangedEvent } from '../DependencyGraph';
+
+export interface BscFile {
+    /**
+     * A string name representing the file type. This is generally the class name (i.e. 'BrsFile', 'XmlFile')
+     */
+    type: string;
+    /**
+     * The absolute path to the source file.
+     * @example "C:\projects\YourRokuApp\source\main.bs" or "/mnt/projects/YourRokuApp/source/main.bs"
+     */
+    srcPath: string;
+    /**
+     * The path where the file exists within the context of a brightscript program, relative to the root of the package/zip.
+     * This is the path that you will reference within your code.
+     * Generally this is the same as `pkgPath`, but can be different (as shown in the example below):
+     *
+     * **NOTE:** This should _not_ containing a leading slash or `pkg:/` scheme
+     * @example
+     * {
+     *    //given this srcPath:
+     *    srcPath: "C:/projects/YourRokuApp/source/main.bs",
+     *    //destPath should be:
+     *    destPath: "source/main.bs"
+     * }
+     */
+    destPath?: string; // "images\\profile.png"
+    /**
+     * The path to the file within the package, relative to the root of the package/zip.
+     * This is different than `destPath` in that it's the final file name that is used when creating the zip.
+     *
+     * **NOTE:** This should _not_ containing a leading slash or `pkg:/` scheme
+     * @example
+     * {
+     *    //given this srcPath:
+     *    srcPath: "C:/projects/YourRokuApp/source/main.bs",
+     *    //pkgPath should be:
+     *    pkgPath: "source/main.brs" //(note the `.brs` file extension)
+     * }
+     */
+    pkgPath?: string; // "images\\profile.jpg"   file.bs   file.brs
+    /**
+     * The key used to identify this file in the dependency graph.
+     * If omitted, the pkgPath is used.
+     */
+    dependencyGraphKey?: string;
+    /**
+     * An array of dependencyGraphKeys of items this file depends on.
+     */
+    dependencies?: string[];
+    /**
+     * Called when any of this file's dependencies change (i.e. file depends on `a.brs`, and `a.brs` changes)
+     */
+    onDependenciesChanged?: (event: DependencyChangedEvent) => void;
+
+    /**
+     * Indicates whether the file has been validated. This flag is auto-set by the program during the validation cycle.
+     * You can set this to `true` to skip validation for this file or if you've validated the file yourself already
+     */
+    isValidated?: boolean;
+    /**
+     * Called when the file needs to be validated
+     */
+    validate?: () => void;
+    /**
+     * An array of comment-based flags that can be used to suppress diagnostics
+     */
+    commentFlags?: CommentFlag[];
+    /**
+     * An array of functions that will be called when this file gets destroyed (i.e. event handler disconnection functions)
+     */
+    disposables?: Array<() => void>;
+    /**
+     * Dispose of any resources the file may have created.
+     */
+    dispose?(): void;
+    /**
+     * Should this file be excluded when generating the project output (i.e. transpiling the project).
+     * This affects whether the file is transpiled, copied, or completely excluded.
+     * `true` means exclude, all other values mean include.
+     */
+    excludeFromOutput?: boolean;
+    /**
+     * An editor that plugins can use to modify attributes about this file during the build process.
+     */
+    editor?: Editor;
+    /**
+     * Can this file be pruned from the output? This typically is true when the files not referenced anywhere, or will result in only whitespace/comment output.
+     */
+    canBePruned?: boolean;
+}
+
+export interface SerializeFileResult {
+    content: Buffer;
+    map?: SourceMapGenerator;
+}
+
+
+/**
+ * Create a basic `File` object.
+ */
+export function createFile(props: Partial<BscFile>) {
+    props.dependencies ??= [];
+    props.dependencyGraphKey ??= props.destPath;
+    props.disposables ??= [];
+    return props as BscFile;
+}
diff --git a/src/files/Factory.ts b/src/files/Factory.ts
new file mode 100644
index 000000000..5869bd761
--- /dev/null
+++ b/src/files/Factory.ts
@@ -0,0 +1,25 @@
+import { BrsFile } from './BrsFile';
+import { XmlFile } from './XmlFile';
+import { AssetFile } from './AssetFile';
+import type { Program } from '../Program';
+import type { FileData } from './LazyFileData';
+
+export class FileFactory {
+
+    public constructor(
+        public program: Program
+    ) {
+    }
+
+    BrsFile(options: { srcPath: string; destPath: string; pkgPath?: string }) {
+        return new BrsFile({ ...options, program: this.program });
+    }
+
+    XmlFile(options: { srcPath: string; destPath: string; pkgPath?: string }) {
+        return new XmlFile({ ...options, program: this.program });
+    }
+
+    AssetFile(options: { srcPath: string; destPath: string; pkgPath?: string; data?: FileData }) {
+        return new AssetFile(options);
+    }
+}
diff --git a/src/files/LazyFileData.spec.ts b/src/files/LazyFileData.spec.ts
new file mode 100644
index 000000000..adf2bb9ec
--- /dev/null
+++ b/src/files/LazyFileData.spec.ts
@@ -0,0 +1,30 @@
+import { expect } from 'chai';
+import { LazyFileData } from './LazyFileData';
+
+describe('LazyFileData', () => {
+    it('lazy loads string data', () => {
+        const data = new LazyFileData('cat');
+        expect(data['initialData']).to.eql('cat');
+        expect(data['resolvedData']).to.be.undefined;
+        expect(data.isValueLoaded).to.be.false;
+
+        //now lazy-load the data
+        expect(Buffer.isBuffer(data.value)).to.be.true;
+        expect(data['initialData']).to.be.undefined;
+        expect(data['resolvedData']?.toString()).to.eql('cat');
+        expect(data.isValueLoaded).to.be.true;
+    });
+
+    it('supports LazyFileData as initialData', () => {
+        const data = new LazyFileData(
+            new LazyFileData('cat')
+        );
+        expect(data.value?.toString()).to.eql('cat');
+    });
+
+    it('supports Buffer', () => {
+        expect(
+            new LazyFileData(Buffer.from('cat')).value.toString()
+        ).to.eql('cat');
+    });
+});
diff --git a/src/files/LazyFileData.ts b/src/files/LazyFileData.ts
new file mode 100644
index 000000000..f3e68b2b1
--- /dev/null
+++ b/src/files/LazyFileData.ts
@@ -0,0 +1,57 @@
+export class LazyFileData {
+    constructor(
+        private initialData: FileData
+    ) { }
+
+    /**
+     * Has the data been loaded
+     */
+    public isValueLoaded = false;
+
+    /**
+     * Once the data has been loaded, this is where it's stored
+     */
+    private resolvedData: Buffer;
+
+    public get value(): Buffer {
+        if (!this.isValueLoaded) {
+            this.isValueLoaded = true;
+            this.resolve();
+        }
+        return this.resolvedData;
+    }
+
+    public set value(value: FileData) {
+        this.isValueLoaded = true;
+        this.initialData = value;
+        this.resolve();
+    }
+
+    /**
+     * Resolve the initialData into the actual data
+     */
+    private resolve() {
+        let result: any;
+        if (Buffer.isBuffer(this.initialData)) {
+            result = this.initialData;
+        } else if (typeof this.initialData === 'string') {
+            result = Buffer.from(this.initialData);
+        } else if (typeof this.initialData === 'function') {
+            result = this.initialData();
+            //convert result to buffer
+            if (!Buffer.isBuffer(result)) {
+                result = Buffer.from(result);
+            }
+        } else if (isLazyFileData(this.initialData)) {
+            result = this.initialData.value;
+        }
+        this.resolvedData = result;
+        delete this.initialData;
+    }
+}
+
+export type FileData = string | Buffer | (() => Buffer | string) | LazyFileData;
+
+function isLazyFileData(item: any): item is LazyFileData {
+    return item?.constructor?.name === 'LazyFileData';
+}
diff --git a/src/files/XmlFile.spec.ts b/src/files/XmlFile.spec.ts
index e8726a7e8..df633cca9 100644
--- a/src/files/XmlFile.spec.ts
+++ b/src/files/XmlFile.spec.ts
@@ -1,20 +1,19 @@
 import { assert, expect } from '../chai-config.spec';
 import * as path from 'path';
 import * as sinonImport from 'sinon';
-import type { CompletionItem } from 'vscode-languageserver';
-import { CompletionItemKind, Position, Range } from 'vscode-languageserver';
+import { Range } from 'vscode-languageserver';
 import * as fsExtra from 'fs-extra';
 import { DiagnosticMessages } from '../DiagnosticMessages';
 import type { BsDiagnostic, FileReference } from '../interfaces';
 import { Program } from '../Program';
-import { BrsFile } from './BrsFile';
 import { XmlFile } from './XmlFile';
-import { standardizePath as s } from '../util';
-import { expectDiagnostics, expectZeroDiagnostics, getTestTranspile, trim, trimMap } from '../testHelpers.spec';
+import util, { standardizePath as s } from '../util';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectZeroDiagnostics, getTestTranspile, trim, trimMap } from '../testHelpers.spec';
 import { ProgramBuilder } from '../ProgramBuilder';
 import { LogLevel } from '../logging';
 import { isXmlFile } from '../astUtils/reflection';
-import { tempDir, rootDir, stagingDir } from '../testHelpers.spec';
+import { tempDir, rootDir, outDir } from '../testHelpers.spec';
+import type { BrsFile } from './BrsFile';
 
 describe('XmlFile', () => {
 
@@ -26,9 +25,13 @@ describe('XmlFile', () => {
     beforeEach(() => {
         fsExtra.emptyDirSync(tempDir);
         fsExtra.ensureDirSync(rootDir);
-        fsExtra.ensureDirSync(stagingDir);
-        program = new Program({ rootDir: rootDir });
-        file = new XmlFile(`${rootDir}/components/MainComponent.xml`, 'components/MainComponent.xml', program);
+        fsExtra.ensureDirSync(outDir);
+        program = new Program({ rootDir: rootDir, outDir: outDir });
+        file = new XmlFile({
+            srcPath: `${rootDir}/components/MainComponent.xml`,
+            destPath: 'components/MainComponent.xml',
+            program: program
+        });
     });
     afterEach(() => {
         sinon.restore();
@@ -40,9 +43,10 @@ describe('XmlFile', () => {
             const expected = 'OtherName';
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
-                afterFileParse: (file) => {
-                    if (isXmlFile(file) && file.parser.ast.root?.attributes?.[0]?.value) {
-                        file.parser.ast.root.attributes[0].value.text = expected;
+                afterProvideFile: (event) => {
+                    const file = event.files[0] as XmlFile;
+                    if (isXmlFile(file) && file.parser.ast.rootElement?.attributes?.[0]?.value) {
+                        file.parser.ast.rootElement.attributes[0].value = expected;
                     }
                 }
             });
@@ -55,17 +59,17 @@ describe('XmlFile', () => {
         });
 
         it('only removes specified attribute when calling setAttribute', () => {
-            file = new XmlFile('abs', 'rel', program);
+            const file = new XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
             program.plugins.add({
                 name: 'allows modifying the parsed XML model',
-                afterFileParse: () => {
-                    let child = file.parser.ast.component!.children.children[0];
+                afterProvideFile: () => {
+                    let child = file.parser.ast.componentElement!.childrenElement.elements[0];
                     expect(child.attributes).to.have.lengthOf(4);
-                    child.setAttribute('text', undefined as any);
-                    expect(child.getAttribute('id')!.value.text).to.equal('one');
+                    child.setAttributeValue('text', undefined as any);
+                    expect(child.getAttribute('id')!.value).to.equal('one');
                     expect(child.attributes).to.have.lengthOf(3);
-                    child.setAttribute('text3', undefined as any);
-                    expect(child.getAttribute('id')!.value.text).to.equal('one');
+                    child.setAttributeValue('text3', undefined as any);
+                    expect(child.getAttribute('id')!.value).to.equal('one');
                     expect(child.attributes).to.have.lengthOf(2);
                 }
             });
@@ -91,7 +95,7 @@ describe('XmlFile', () => {
                     <script type="text/brightscript" uri="ChildScene.bs" />
                 </component>
             `);
-            expect(file.scriptTagImports.map(x => x.pkgPath)[0]).to.equal(
+            expect(file.scriptTagImports.map(x => x.destPath)[0]).to.equal(
                 s`components/ChildScene.bs`
             );
         });
@@ -106,14 +110,14 @@ describe('XmlFile', () => {
                 </component>
             `);
             expect(
-                file.scriptTagImports?.[0]?.pkgPath
+                file.scriptTagImports?.[0]?.destPath
             ).to.eql(
                 s`components/ChildScene.brs`
             );
         });
 
         it('finds scripts when more than one per line', () => {
-            file = new XmlFile('abs', 'rel', program);
+            file = new XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
             file.parse(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="Scene">
@@ -136,7 +140,7 @@ describe('XmlFile', () => {
         });
 
         it('finds component names', () => {
-            file = new XmlFile('abs', 'rel', program);
+            file = new XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
             file.parse(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
@@ -148,26 +152,24 @@ describe('XmlFile', () => {
         });
 
         it('Adds error when whitespace appears before the prolog', () => {
-            file = new XmlFile('abs', 'rel', program);
+            file = new XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
             file.parse(/* not trimmed */`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
                     <script type="text/brightscript" uri="ChildScene.brs" />
                 </component>`
             );
-            expect(file.diagnostics).to.be.lengthOf(2);
-            expect(file.diagnostics[0]).to.deep.include({ // expecting opening tag but got prolog
-                code: DiagnosticMessages.xmlGenericParseError('').code,
-                range: Range.create(1, 16, 1, 22)
-            });
-            expect(file.diagnostics[1]).to.deep.include({
-                ...DiagnosticMessages.xmlGenericParseError('Syntax error: whitespace found before the XML prolog'),
-                range: Range.create(0, 0, 1, 16)
-            });
+            expectDiagnostics(program, [{ // expecting opening tag but got prolog
+                code: DiagnosticMessages.syntaxError('').code,
+                location: { range: Range.create(1, 16, 1, 22) }
+            }, {
+                ...DiagnosticMessages.syntaxError('Syntax error: whitespace found before the XML prolog'),
+                location: { range: Range.create(0, 0, 1, 16) }
+            }]);
         });
 
         it('Adds error when an unknown tag is found in xml', () => {
-            file = new XmlFile('abs', 'rel', program);
+            file = new XmlFile({ srcPath: 'abs', destPath: 'rel', program: program });
             file.parse(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="ChildScene" extends="ParentScene">
@@ -177,15 +179,13 @@ describe('XmlFile', () => {
                     <unexpectedToo />
                 </component>
             `);
-            expect(file.diagnostics).to.be.lengthOf(2);
-            expect(file.diagnostics[0]).to.deep.include({
+            expectDiagnostics(program, [{
                 ...DiagnosticMessages.xmlUnexpectedTag('unexpected'),
-                range: Range.create(3, 9, 3, 19)
-            });
-            expect(file.diagnostics[1]).to.deep.include({
+                location: { range: Range.create(3, 9, 3, 19) }
+            }, {
                 ...DiagnosticMessages.xmlUnexpectedTag('unexpectedToo'),
-                range: Range.create(5, 5, 5, 18)
-            });
+                location: { range: Range.create(5, 5, 5, 18) }
+            }]);
         });
 
         it('Adds error when no component is declared in xml', () => {
@@ -194,7 +194,7 @@ describe('XmlFile', () => {
             expectDiagnostics(program, [
                 {
                     ...DiagnosticMessages.xmlUnexpectedTag('script'),
-                    range: Range.create(0, 1, 0, 7)
+                    location: { range: Range.create(0, 1, 0, 7) }
                 },
                 DiagnosticMessages.xmlComponentMissingComponentDeclaration()
             ]);
@@ -208,11 +208,10 @@ describe('XmlFile', () => {
                 </component>
             `);
             program.validate();
-            expect(file.diagnostics).to.be.lengthOf(1);
-            expect(file.diagnostics[0]).to.deep.include(<BsDiagnostic>{
+            expectDiagnosticsIncludes(program, [{
                 message: DiagnosticMessages.xmlComponentMissingNameAttribute().message,
-                range: Range.create(1, 1, 1, 10)
-            });
+                location: { range: Range.create(1, 1, 1, 10) }
+            }]);
         });
 
         it('catches xml parse errors', () => {
@@ -222,16 +221,17 @@ describe('XmlFile', () => {
                 </component>
             `);
             program.validate();
-            expect(file.diagnostics).to.be.lengthOf(2);
-            expect(file.diagnostics[0].code).to.equal(DiagnosticMessages.xmlGenericParseError('').code); //unexpected character '1'
-            expect(file.diagnostics[1]).to.deep.include(<BsDiagnostic>{
+            const diagnostics = program.getDiagnostics();
+            expect(diagnostics).to.be.lengthOf(2);
+            expect(diagnostics[0].code).to.equal(DiagnosticMessages.syntaxError('').code); //unexpected character '1'
+            expect(diagnostics[1]).to.deep.include(<BsDiagnostic>{
                 code: DiagnosticMessages.xmlComponentMissingNameAttribute().code,
-                range: Range.create(1, 1, 1, 10)
+                location: util.createLocationFromFileRange(file, Range.create(1, 1, 1, 10))
             });
         });
 
         it('finds script imports', () => {
-            file = new XmlFile('abspath/components/cmp1.xml', 'components/cmp1.xml', program);
+            file = new XmlFile({ srcPath: 'abspath/components/cmp1.xml', destPath: 'components/cmp1.xml', program: program });
             file.parse(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Cmp1" extends="Scene">
@@ -242,13 +242,13 @@ describe('XmlFile', () => {
             expect(file.scriptTagImports[0]).to.deep.include(<FileReference>{
                 sourceFile: file,
                 text: 'pkg:/components/cmp1.brs',
-                pkgPath: `components${path.sep}cmp1.brs`,
+                destPath: `components${path.sep}cmp1.brs`,
                 filePathRange: Range.create(2, 42, 2, 66)
             });
         });
 
         it('throws an error if the file has already been parsed', () => {
-            file = new XmlFile('abspath', 'relpath', program);
+            file = new XmlFile({ srcPath: 'abspath', destPath: 'relpath', program: program });
             file.parse('a comment');
             try {
                 file.parse(`'a new comment`);
@@ -268,7 +268,7 @@ describe('XmlFile', () => {
             expect(file.scriptTagImports.length).to.equal(1);
             expect(file.scriptTagImports[0]).to.deep.include(<FileReference>{
                 text: 'cmp1.brs',
-                pkgPath: `components${path.sep}cmp1.brs`
+                destPath: `components${path.sep}cmp1.brs`
             });
         });
 
@@ -355,49 +355,6 @@ describe('XmlFile', () => {
         });
     });
 
-    describe('getCompletions', () => {
-        it('formats completion paths with proper slashes', () => {
-            let scriptPath = s`C:/app/components/component1/component1.brs`;
-            program.files[scriptPath] = new BrsFile(scriptPath, s`components/component1/component1.brs`, program);
-
-            let xmlFile = new XmlFile(s`${rootDir}/components/component1/component1.xml`, s`components/component1/component1.xml`, <any>program);
-            xmlFile.parser.references.scriptTagImports.push({
-                pkgPath: s`components/component1/component1.brs`,
-                text: 'component1.brs',
-                filePathRange: Range.create(1, 1, 1, 1)
-            });
-
-            expect(xmlFile.getCompletions(Position.create(1, 1))[0]).to.include({
-                label: 'component1.brs',
-                kind: CompletionItemKind.File
-            });
-
-            expect(xmlFile.getCompletions(Position.create(1, 1))[1]).to.include(<CompletionItem>{
-                label: 'pkg:/components/component1/component1.brs',
-                kind: CompletionItemKind.File
-            });
-        });
-
-        it('returns empty set when out of range', () => {
-            program.setFile('components/component1.brs', ``);
-            expect(file.getCompletions(Position.create(99, 99))).to.be.empty;
-        });
-
-        //TODO - refine this test once cdata scripts are supported
-        it('prevents scope completions entirely', () => {
-            program.setFile('components/component1.brs', ``);
-
-            let xmlFile = program.setFile('components/component1.xml', trim`
-                <?xml version="1.0" encoding="utf-8" ?>
-                <component name="ParentScene" extends="GrandparentScene">
-                    <script type="text/brightscript" uri="./Component1.brs" />
-                </component>
-            `);
-
-            expect(program.getCompletions(xmlFile.srcPath, Position.create(1, 1))).to.be.empty;
-        });
-    });
-
     describe('getAllDependencies', () => {
         it('returns own imports', () => {
             file = program.setFile('components/comp1.xml', trim`
@@ -488,16 +445,6 @@ describe('XmlFile', () => {
         expect(program.getScopesForFile(xmlFile2)[0].isValidated).to.be.true;
     });
 
-    it('allows adding diagnostics', () => {
-        const expected: BsDiagnostic[] = [{
-            message: 'message',
-            file: undefined as any,
-            range: undefined as any
-        }];
-        file.addDiagnostics(expected);
-        expectDiagnostics(file, expected);
-    });
-
     describe('component extends', () => {
         it('works for single-line', () => {
             file = program.setFile(
@@ -511,7 +458,7 @@ describe('XmlFile', () => {
                     </component>
                 `
             );
-            expect(file.parentComponentName.range).to.eql(Range.create(1, 38, 1, 47));
+            expect(file.parentComponentName.location?.range).to.eql(Range.create(1, 38, 1, 47));
         });
 
         it('works for multi-line', () => {
@@ -527,7 +474,7 @@ describe('XmlFile', () => {
                     </component>
                 `
             );
-            expect(file.parentComponentName.range).to.eql(Range.create(2, 13, 2, 22));
+            expect(file.parentComponentName.location?.range).to.eql(Range.create(2, 13, 2, 22));
         });
 
         it('does not throw when unable to find extends', () => {
@@ -564,28 +511,9 @@ describe('XmlFile', () => {
         });
     });
 
-    it('detects when importing the codebehind file unnecessarily', () => {
-        program = new Program({
-            autoImportComponentScript: true,
-            rootDir: rootDir
-        });
-        program.setFile(`components/SimpleScene.bs`, '');
-        program.setFile(`components/SimpleScene.xml`, trim`
-            <?xml version="1.0" encoding="utf-8" ?>
-            <component name="SimpleScene" extends="Scene">
-                <script type="text/brighterscript" uri="SimpleScene.bs" />
-            </component>
-        `);
-
-        program.validate();
-        expectDiagnostics(program, [
-            DiagnosticMessages.unnecessaryCodebehindScriptImport()
-        ]);
-    });
-
     describe('transpile', () => {
-        it('handles single quotes properly', () => {
-            testTranspile(trim`
+        it('handles single quotes properly', async () => {
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="AnimationExample" extends="Scene">
                     <children>
@@ -619,33 +547,32 @@ describe('XmlFile', () => {
             const builder = new ProgramBuilder();
             await builder.run({
                 cwd: rootDir,
-                retainStagingDir: true,
-                stagingDir: stagingDir,
+                outDir: outDir,
                 logLevel: LogLevel.off
             });
             expect(
                 trim(
-                    fsExtra.readFileSync(`${stagingDir}/components/MainScene.xml`).toString()
+                    fsExtra.readFileSync(`${outDir}/components/MainScene.xml`).toString()
                 )
             ).to.eql(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="MainScene" extends="Scene">
                     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                    <customization resumehandler="customResume" />
+                    <customization suspendhandler="customSuspend" />
                     <children>
                         <Rectangle width="1920" height="1080" />
                     </children>
-                    <customization resumehandler="customResume" />
-                    <customization suspendhandler="customSuspend" />
                 </component>
             `);
         });
 
-        it(`honors the 'needsTranspiled' flag when set in 'afterFileParse'`, () => {
+        it(`honors the 'needsTranspiled' flag when set in 'afterProvideFile'`, () => {
             program.plugins.add({
                 name: 'test',
-                afterFileParse: (file) => {
+                afterProvideFile: (event) => {
                     //enable transpile for every file
-                    file.needsTranspiled = true;
+                    (event.files[0] as BrsFile).needsTranspiled = true;
                 }
             });
             const file = program.setFile('components/file.xml', trim`
@@ -653,11 +580,11 @@ describe('XmlFile', () => {
                 <component name="Comp" extends="Group">
                 </component>
             `);
-            expect(file.needsTranspiled).to.be.true;
+            expect(file['needsTranspiled']).to.be.true;
         });
 
-        it('includes bslib script', () => {
-            testTranspile(trim`
+        it('includes bslib script', async () => {
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                 </component>
@@ -669,8 +596,8 @@ describe('XmlFile', () => {
             `, 'none', 'components/Comp.xml');
         });
 
-        it('does not include additional bslib script if already there ', () => {
-            testTranspile(trim`
+        it('does not include additional bslib script if already there ', async () => {
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                     <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
@@ -683,11 +610,11 @@ describe('XmlFile', () => {
             `, 'none', 'components/child.xml');
         });
 
-        it('does not include bslib script if already there from ropm', () => {
+        it('does not include bslib script if already there from ropm', async () => {
             program.setFile('source/roku_modules/bslib/bslib.brs', ``);
             program.setFile('source/lib.bs', ``);
             //include a bs file to force transpile for the xml file
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Comp" extends="Group">
                     <script type="text/brightscript" uri="pkg:/source/lib.bs" />
@@ -711,7 +638,7 @@ describe('XmlFile', () => {
             `);
             program.validate();
             expectZeroDiagnostics(program);
-            expect(file.needsTranspiled).to.be.false;
+            expect(file['needsTranspiled']).to.be.false;
         });
 
 
@@ -736,30 +663,86 @@ describe('XmlFile', () => {
                 </component>
             `;
 
-            await program.transpile([], stagingDir);
+            await program.build();
             expect(
                 trim(
-                    fsExtra.readFileSync(`${stagingDir}/components/SimpleScene.xml`).toString()
+                    fsExtra.readFileSync(`${outDir}/components/SimpleScene.xml`).toString()
                 )
             ).to.eql(expected);
 
             //clear the output folder
-            fsExtra.emptyDirSync(stagingDir);
-            await program.transpile([], stagingDir);
+            fsExtra.emptyDirSync(outDir);
+            await program.build();
             expect(
                 trim(
-                    fsExtra.readFileSync(`${stagingDir}/components/SimpleScene.xml`).toString()
+                    fsExtra.readFileSync(`${outDir}/components/SimpleScene.xml`).toString()
                 )
             ).to.eql(expected);
         });
 
-        it('keeps all content of the XML', () => {
+        it('injects new scripts near existing scripts', async () => {
+            program.setFile(`components/SimpleScene.bs`, `
+                sub b()
+                end sub
+            `);
+
+            await testTranspile(trim`
+                <component name="SimpleScene" extends="group">
+                    <script type="text/brightscript" uri="SimpleScene.bs"/>
+                    <children>
+                        <aa id="aa">
+                            <bb id="bb" />
+                        </aa>
+                    </children>
+                </component>
+            `, trim`
+                <component name="SimpleScene" extends="group">
+                    <script type="text/brightscript" uri="SimpleScene.brs" />
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                    <children>
+                        <aa id="aa">
+                            <bb id="bb" />
+                        </aa>
+                    </children>
+                </component>
+            `, 'none', 'components/SimpleScene.xml');
+        });
+
+        it('injects new scripts at top of component when no scripts were present', async () => {
+            program.setFile(`components/SimpleScene.bs`, `
+                sub b()
+                end sub
+            `);
+            program.options.autoImportComponentScript = true;
+
+            await testTranspile(trim`
+                <component name="SimpleScene" extends="group">
+                    <children>
+                        <aa id="aa">
+                            <bb id="bb" />
+                        </aa>
+                    </children>
+                </component>
+            `, trim`
+                <component name="SimpleScene" extends="group">
+                    <script type="text/brightscript" uri="pkg:/components/SimpleScene.brs" />
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                    <children>
+                        <aa id="aa">
+                            <bb id="bb" />
+                        </aa>
+                    </children>
+                </component>
+            `, 'none', 'components/SimpleScene.xml');
+        });
+
+        it('keeps all content of the XML', async () => {
             program.setFile(`components/SimpleScene.bs`, `
                 sub b()
                 end sub
             `);
 
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component
                     name="SimpleScene" extends="Scene"
@@ -795,13 +778,13 @@ describe('XmlFile', () => {
             `, 'none', 'components/SimpleScene.xml');
         });
 
-        it('changes file extensions from bs to brs', () => {
+        it('changes file extensions from bs to brs', async () => {
             program.setFile(`components/SimpleScene.bs`, `
                 import "pkg:/source/lib.bs"
             `);
             program.setFile('source/lib.bs', ``);
 
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script type="text/brighterscript" uri="SimpleScene.bs"/>
@@ -816,9 +799,9 @@ describe('XmlFile', () => {
             `, 'none', 'components/SimpleScene.xml');
         });
 
-        it('does not fail on missing script type', () => {
+        it('does not fail on missing script type', async () => {
             program.setFile('components/SimpleScene.brs', '');
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                     <script uri="SimpleScene.brs"/>
@@ -833,7 +816,7 @@ describe('XmlFile', () => {
         });
 
         it('returns the XML unmodified if needsTranspiled is false', () => {
-            let file = program.setFile('components/SimpleScene.xml',
+            let file = program.setFile<XmlFile>('components/SimpleScene.xml',
                 trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <!-- should stay as-is -->
@@ -859,7 +842,7 @@ describe('XmlFile', () => {
                 <component name="SimpleScene" extends="Scene" >
                 </component>
             `);
-            expect(file.needsTranspiled).to.be.false;
+            expect(file['needsTranspiled']).to.be.false;
         });
 
         it('needsTranspiled is true if an import is brighterscript', () => {
@@ -870,12 +853,12 @@ describe('XmlFile', () => {
                     <script type="text/brightscript" uri="SimpleScene.bs"/>
                 </component>
             `);
-            expect(file.needsTranspiled).to.be.true;
+            expect(file['needsTranspiled']).to.be.true;
         });
 
         it('simple source mapping includes sourcemap reference', () => {
             program.options.sourceMap = true;
-            let file = program.setFile('components/SimpleScene.xml',
+            let file = program.setFile<XmlFile>('components/SimpleScene.xml',
                 trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
@@ -889,18 +872,18 @@ describe('XmlFile', () => {
 
         it('AST-based source mapping includes sourcemap reference', () => {
             program.options.sourceMap = true;
-            let file = program.setFile('components/SimpleScene.xml',
+            let file = program.setFile<XmlFile>('components/SimpleScene.xml',
                 trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="SimpleScene" extends="Scene">
                 </component>
             `);
-            file.needsTranspiled = true;
+            file['needsTranspiled'] = true;
             const code = file.transpile().code;
             expect(code.endsWith(`<!--//# sourceMappingURL=./SimpleScene.xml.map -->`)).to.be.true;
         });
 
-        it('removes script imports if given file is not publishable', () => {
+        it('removes script imports if given file is not publishable', async () => {
             program.options.pruneEmptyCodeFiles = true;
             program.setFile(`components/SimpleScene.bs`, `
                 enum simplescenetypes
@@ -909,7 +892,7 @@ describe('XmlFile', () => {
                 end enum
             `);
 
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component
                     name="SimpleScene" extends="Scene"
@@ -926,7 +909,7 @@ describe('XmlFile', () => {
             `, 'none', 'components/SimpleScene.xml');
         });
 
-        it('removes extra imports found via dependencies if given file is not publishable', () => {
+        it('removes extra imports found via dependencies if given file is not publishable', async () => {
             program.options.pruneEmptyCodeFiles = true;
             program.setFile(`source/simplescenetypes.bs`, `
                 enum SimpleSceneTypes
@@ -941,7 +924,7 @@ describe('XmlFile', () => {
                 end sub
             `);
 
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component
                     name="SimpleScene" extends="Scene"
@@ -959,7 +942,7 @@ describe('XmlFile', () => {
             `, 'none', 'components/SimpleScene.xml');
         });
 
-        it('removes imports of empty brightscript files', () => {
+        it('removes imports of empty brightscript files', async () => {
             program.options.pruneEmptyCodeFiles = true;
             program.setFile(`components/EmptyFile.brs`, '');
             program.setFile(`components/SimpleScene.brs`, `
@@ -967,7 +950,7 @@ describe('XmlFile', () => {
                     ? "Hello World"
                 end sub
             `);
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component
                     name="SimpleScene" extends="Scene"
@@ -985,6 +968,18 @@ describe('XmlFile', () => {
                 </component>
             `, 'none', 'components/SimpleScene.xml');
         });
+
+        it('includes script tags in self closing component', async () => {
+            await testTranspile(trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Comp" extends="Group" />
+            `, trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Comp" extends="Group">
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                </component>
+            `, 'none', 'components/Comp.xml');
+        });
     });
 
     describe('Transform plugins', () => {
@@ -995,7 +990,7 @@ describe('XmlFile', () => {
             });
             program.plugins.add({
                 name: 'Transform plugins',
-                afterFileParse: file => validateXml(file as XmlFile)
+                validateFile: event => validateXml(event.file as XmlFile)
             });
             file = program.setFile<XmlFile>('components/component.xml', trim`
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -1019,14 +1014,15 @@ describe('XmlFile', () => {
     it('plugin diagnostics work for xml files', () => {
         program.plugins.add({
             name: 'Xml diagnostic test',
-            afterFileParse: (file) => {
-                if (file.srcPath.endsWith('.xml')) {
-                    file.addDiagnostics([{
-                        file: file,
-                        message: 'Test diagnostic',
-                        range: Range.create(0, 0, 0, 0),
-                        code: 9999
-                    }]);
+            afterProvideFile: (event) => {
+                for (const file of event.files) {
+                    if (isXmlFile(file)) {
+                        program.diagnostics.register({
+                            message: 'Test diagnostic',
+                            location: util.createLocationFromFileRange(file, Range.create(0, 0, 0, 0)),
+                            code: 9999
+                        });
+                    }
                 }
             }
         });
@@ -1090,7 +1086,7 @@ describe('XmlFile', () => {
             program.validate();
             expectZeroDiagnostics(program);
             const scope = program.getComponentScope('ChildComponent')!;
-            expect([...scope.namespaceLookup.keys()].sort()).to.eql([
+            expect([...scope.namespaceNameSet.keys()].sort()).to.eql([
                 'lib',
                 'parent'
             ]);
@@ -1111,7 +1107,7 @@ describe('XmlFile', () => {
             expect(program.getScopesForFile(xmlFile)[0].getAllCallables().map(x => x.callable.name)).to.include('logInfo');
         });
 
-        it('does not include `d.bs` script during transpile', () => {
+        it('does not include `d.bs` script during transpile', async () => {
             program.setFile('source/logger.d.bs', `
                 sub logInfo()
                 end sub
@@ -1125,7 +1121,7 @@ describe('XmlFile', () => {
                 sub init()
                 end sub
             `);
-            testTranspile(trim`
+            await testTranspile(trim`
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Scene">
                     <script type="text/brighterscript" uri="Component1.bs" />
@@ -1230,7 +1226,7 @@ describe('XmlFile', () => {
             expectZeroDiagnostics(program);
         });
 
-        it('ignores warning from previous line just for the specified code', () => {
+        it('ignores a specific diagnostic on next line', () => {
             //component without a name attribute
             program.setFile<XmlFile>('components/file.xml', trim`
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -1244,7 +1240,7 @@ describe('XmlFile', () => {
             ]);
         });
 
-        it('ignores warning from previous line comment', () => {
+        it('ignores all warnings from previous line comment', () => {
             //component without a name attribute
             program.setFile<XmlFile>('components/file.xml', trim`
                 <?xml version="1.0" encoding="utf-8" ?>
@@ -1259,7 +1255,7 @@ describe('XmlFile', () => {
             //component without a name attribute
             program.setFile<XmlFile>('components/file.xml', trim`
                 <?xml version="1.0" encoding="utf-8" ?>
-                <component> <!--bs:disable-line 1006-->
+                <component name="ButtonCustom"> <!--bs:disable-line 1006-->
                 </component>
             `);
             program.validate();
@@ -1300,7 +1296,7 @@ describe('XmlFile', () => {
                 <component name="comp1">
                 </component>
             `);
-            expect(program.getComponent('comp1')!.file.pkgPath).to.equal(comp2.pkgPath);
+            expect(program.getComponent('comp1')!.file.destPath).to.equal(comp2.destPath);
 
             //add comp1. it should become the main component with this name
             const comp1 = program.setFile('components/comp1.xml', trim`
@@ -1308,11 +1304,11 @@ describe('XmlFile', () => {
                 <component name="comp1" extends="Group">
                 </component>
             `);
-            expect(program.getComponent('comp1')!.file.pkgPath).to.equal(comp1.pkgPath);
+            expect(program.getComponent('comp1')!.file.destPath).to.equal(comp1.destPath);
 
             //remove comp1, comp2 should be the primary again
             program.removeFile(s`${rootDir}/components/comp1.xml`);
-            expect(program.getComponent('comp1')!.file.pkgPath).to.equal(comp2.pkgPath);
+            expect(program.getComponent('comp1').file.destPath).to.equal(comp2.destPath);
 
             //add comp3
             program.setFile('components/comp3.xml', trim`
@@ -1321,7 +1317,7 @@ describe('XmlFile', () => {
                 </component>
             `);
             //...the 2nd file should still be main
-            expect(program.getComponent('comp1')!.file.pkgPath).to.equal(comp2.pkgPath);
+            expect(program.getComponent('comp1')!.file.destPath).to.equal(comp2.destPath);
         });
     });
 });
diff --git a/src/files/XmlFile.ts b/src/files/XmlFile.ts
index e3172998a..bc38ed954 100644
--- a/src/files/XmlFile.ts
+++ b/src/files/XmlFile.ts
@@ -1,39 +1,83 @@
 import * as path from 'path';
 import type { CodeWithSourceMap } from 'source-map';
 import { SourceNode } from 'source-map';
-import type { CompletionItem, Location, Position, Range } from 'vscode-languageserver';
-import { DiagnosticCodeMap, diagnosticCodes } from '../DiagnosticMessages';
-import type { FunctionScope } from '../FunctionScope';
-import type { Callable, BsDiagnostic, File, FileReference, FunctionCall, CommentFlag } from '../interfaces';
+import type { Location, Position, Range } from 'vscode-languageserver';
+import { DiagnosticCodeMap, DiagnosticLegacyCodeMap, diagnosticCodes } from '../DiagnosticMessages';
+import type { Callable, FileReference, CommentFlag, SerializedCodeFile } from '../interfaces';
 import type { Program } from '../Program';
 import util from '../util';
-import SGParser, { rangeFromTokenValue } from '../parser/SGParser';
+import { standardizePath as s } from '../util';
+import SGParser from '../parser/SGParser';
 import chalk from 'chalk';
 import { Cache } from '../Cache';
-import type { DependencyGraph } from '../DependencyGraph';
-import type { SGToken } from '../parser/SGTypes';
-import { SGScript } from '../parser/SGTypes';
+import type { DependencyChangedEvent, DependencyGraph } from '../DependencyGraph';
+import type { SGInterfaceField, SGInterfaceFunction, SGToken } from '../parser/SGTypes';
 import { CommentFlagProcessor } from '../CommentFlagProcessor';
 import type { IToken, TokenType } from 'chevrotain';
 import { TranspileState } from '../parser/TranspileState';
+import type { BscFile } from './BscFile';
+import type { Editor } from '../astUtils/Editor';
+import type { FunctionScope } from '../FunctionScope';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+
+
+export interface UnresolvedXMLSymbol {
+    flags: SymbolTypeFlag;
+    name: string;
+    file: XmlFile;
+}
+
 
-export class XmlFile {
-    constructor(
-        public srcPath: string,
+export class XmlFile implements BscFile {
+    /**
+     * Create a new instance of BrsFile
+     */
+    constructor(options: {
         /**
-         * The absolute path to the file, relative to the pkg
+         * The absolute path to the source file on disk (e.g. '/usr/you/projects/RokuApp/source/main.brs' or 'c:/projects/RokuApp/source/main.brs').
          */
-        public pkgPath: string,
-        public program: Program
-    ) {
-        this.extension = path.extname(this.srcPath).toLowerCase();
-
-        this.possibleCodebehindPkgPaths = [
-            this.pkgPath.replace('.xml', '.bs'),
-            this.pkgPath.replace('.xml', '.brs')
-        ];
+        srcPath: string;
+        /**
+         * The absolute path to the file on-device (i.e. 'source/main.brs') without the leading `pkg:/`
+         */
+        destPath: string;
+        pkgPath?: string;
+        program: Program;
+    }) {
+        if (options) {
+            this.srcPath = s`${options.srcPath}`;
+            this.destPath = s`${options.destPath}`;
+            this.pkgPath = s`${options.pkgPath ?? options.destPath}`;
+            this.program = options.program;
+
+            this.extension = path.extname(this.srcPath).toLowerCase();
+
+            this.possibleCodebehindDestPaths = [
+                this.pkgPath.replace(/\.xml$/, '.bs'),
+                this.pkgPath.replace(/\.xml$/, '.brs')
+            ];
+        }
     }
 
+    public type = 'XmlFile';
+
+    /**
+     * The absolute path to the source file on disk (e.g. '/usr/you/projects/RokuApp/source/main.brs' or 'c:/projects/RokuApp/source/main.brs').
+     */
+    public srcPath: string;
+    /**
+     * The absolute path to the file on-device (i.e. 'source/main.brs') without the leading `pkg:/`
+     */
+    public destPath: string;
+    public pkgPath: string;
+
+    public program: Program;
+
+    /**
+     * An editor assigned during the build flow that manages edits that will be undone once the build process is complete.
+     */
+    public editor?: Editor;
+
     /**
      * The absolute path to the source location for this file
      * @deprecated use `srcPath` instead
@@ -49,8 +93,19 @@ export class XmlFile {
 
     /**
      * The list of possible autoImport codebehind pkg paths.
+     * @deprecated use `possibleCodebehindDestPaths` instead.
+     */
+    public get possibleCodebehindPkgPaths() {
+        return this.possibleCodebehindDestPaths;
+    }
+    public set possibleCodebehindPkgPaths(value) {
+        this.possibleCodebehindDestPaths = value;
+    }
+
+    /**
+     * The list of possible autoImport codebehind destPath values
      */
-    public possibleCodebehindPkgPaths: string[];
+    public possibleCodebehindDestPaths: string[];
 
     /**
      * An unsubscribe function for the dependencyGraph subscription
@@ -88,7 +143,7 @@ export class XmlFile {
     }
 
     /**
-     * List of all pkgPaths to scripts that this XmlFile depends, regardless of whether they are loaded in the program or not.
+     * List of all `destPath` values pointing to scripts that this XmlFile depends on, regardless of whether they are loaded in the program or not.
      * This includes own dependencies and all parent compoent dependencies
      * coming from:
      *  - script tags
@@ -103,7 +158,7 @@ export class XmlFile {
     }
 
     /**
-     * List of all pkgPaths to scripts that this XmlFile depends on directly, regardless of whether they are loaded in the program or not.
+     * List of all destPaths to scripts that this XmlFile depends on directly, regardless of whether they are loaded in the program or not.
      * This does not account for parent component scripts
      * coming from:
      *  - script tags
@@ -118,7 +173,7 @@ export class XmlFile {
     }
 
     /**
-     * List of all pkgPaths to scripts that this XmlFile depends on that are actually loaded into the program.
+     * List of all destPaths to scripts that this XmlFile depends on that are actually loaded into the program.
      * This does not account for parent component scripts.
      * coming from:
      *  - script tags
@@ -135,39 +190,66 @@ export class XmlFile {
             let result = [] as string[];
             let filesInProgram = this.program.getFiles(allDependencies);
             for (let file of filesInProgram) {
-                result.push(file.pkgPath);
+                result.push(file.destPath);
             }
             this.logDebug('computed allAvailableScriptImports', () => result);
             return result;
         });
     }
 
-    public getDiagnostics() {
-        return [...this.diagnostics];
-    }
+    public get requiredSymbols() {
+        return this.cache.getOrAdd(`requiredSymbols`, () => {
+            this.program.logger.debug('Getting required symbols', this.srcPath);
+
+
+            const requiredSymbols: UnresolvedXMLSymbol[] = [];
+
+            const allInterfaceFunctions = this.parser.ast.componentElement?.interfaceElement?.getElementsByTagName<SGInterfaceFunction>('function') ?? [];
 
-    public addDiagnostics(diagnostics: BsDiagnostic[]) {
-        this.diagnostics.push(...diagnostics);
+            for (const node of allInterfaceFunctions) {
+                if (node.name) {
+                    requiredSymbols.push({
+                        flags: SymbolTypeFlag.runtime,
+                        file: this,
+                        name: node.name.toLowerCase()
+                    });
+                }
+            }
+
+            const allInterfaceFields = this.parser.ast.componentElement?.interfaceElement?.getElementsByTagName<SGInterfaceField>('field') ?? [];
+
+            for (const node of allInterfaceFields) {
+                if (node.onChange) {
+                    requiredSymbols.push({
+                        flags: SymbolTypeFlag.runtime,
+                        file: this,
+                        name: node.onChange.toLowerCase()
+                    });
+                }
+                // TODO: when we can specify proper types in fields, add those types too:
+                //if (node.type && isCustomXmlType(node.type)) {
+                //    requiredSymbols.push({
+                //        flags: SymbolTypeFlag.typetime,
+                //        file: this,
+                //        name: node.type.toLowerCase()
+                //    });
+                //}
+            }
+            return requiredSymbols;
+        });
     }
 
+
     /**
      * The range of the entire file
      */
     public fileRange: Range;
 
-    /**
-     * A collection of diagnostics related to this file
-     */
-    public diagnostics = [] as BsDiagnostic[];
-
     public parser = new SGParser();
 
     //TODO implement the xml CDATA parsing, which would populate this list
     public callables = [] as Callable[];
 
-    //TODO implement the xml CDATA parsing, which would populate this list
-    public functionCalls = [] as FunctionCall[];
-
     public functionScopes = [] as FunctionScope[];
 
     /**
@@ -188,8 +270,22 @@ export class XmlFile {
 
     /**
      * Does this file need to be transpiled?
+     * @deprecated use the `.editor` property to push changes to the file, which will force transpilation
      */
-    public needsTranspiled = false;
+    public get needsTranspiled() {
+        if (this._needsTranspiled !== undefined) {
+            return this._needsTranspiled;
+        }
+        return !!(
+            this.editor?.hasChanges || this.ast.componentElement?.scriptElements?.some(
+                script => script.type?.indexOf('brighterscript') > 0 || script.uri?.endsWith('.bs')
+            )
+        );
+    }
+    public set needsTranspiled(value) {
+        this._needsTranspiled = value;
+    }
+    public _needsTranspiled: boolean;
 
     /**
      * The AST for this file
@@ -210,32 +306,31 @@ export class XmlFile {
     public parse(fileContents: string) {
         this.fileContents = fileContents;
 
-        this.parser.parse(this.pkgPath, fileContents);
-        this.diagnostics = this.parser.diagnostics.map(diagnostic => ({
-            ...diagnostic,
-            file: this
-        }));
+        this.parser.parse(fileContents, {
+            srcPath: this.srcPath,
+            destPath: this.destPath
+        });
 
+        this.program?.diagnostics.register(this.parser.diagnostics);
         this.getCommentFlags(this.parser.tokens as any[]);
-
-        //needsTranspiled should be true if an import is brighterscript
-        this.needsTranspiled = this.needsTranspiled || this.ast.component?.scripts?.some(
-            script => script.type?.indexOf('brighterscript') > 0 || script.uri?.endsWith('.bs')
-        );
     }
 
     /**
-     * @deprecated logic has moved into XmlFileValidator, this is now an empty function
+     * Generate the code, map, and typedef for this file
      */
-    public validate() {
-
+    public serialize(): SerializedCodeFile {
+        const result = this.transpile();
+        return {
+            code: result?.code,
+            map: result?.map?.toString()
+        };
     }
 
     /**
      * Collect all bs: comment flags
      */
     public getCommentFlags(tokens: Array<IToken & { tokenType: TokenType }>) {
-        const processor = new CommentFlagProcessor(this, ['<!--'], diagnosticCodes, [DiagnosticCodeMap.unknownDiagnosticCode]);
+        const processor = new CommentFlagProcessor(this, ['<!--'], diagnosticCodes, [DiagnosticCodeMap.unknownDiagnosticCode, DiagnosticLegacyCodeMap.unknownDiagnosticCode]);
 
         this.commentFlags = [];
         for (let token of tokens) {
@@ -243,42 +338,45 @@ export class XmlFile {
                 processor.tryAdd(
                     //remove the close comment symbol
                     token.image.replace(/\-\-\>$/, ''),
-                    rangeFromTokenValue(token)
+                    //technically this range is 3 characters longer due to the removed `-->`, but that probably doesn't matter
+                    this.parser.rangeFromToken(token)
                 );
             }
         }
         this.commentFlags.push(...processor.commentFlags);
-        this.diagnostics.push(...processor.diagnostics);
+        this.program?.diagnostics.register(processor.diagnostics);
     }
 
     private dependencyGraph: DependencyGraph;
 
+    public onDependenciesChanged(event: DependencyChangedEvent) {
+        this.logDebug('clear cache because dependency graph changed', event?.sourceKey);
+        this.cache.clear();
+    }
+
     /**
      * Attach the file to the dependency graph so it can monitor changes.
      * Also notify the dependency graph of our current dependencies so other dependents can be notified.
+     * @deprecated this does nothing. This functionality is now handled by the file api and will be deleted in v1
      */
     public attachDependencyGraph(dependencyGraph: DependencyGraph) {
         this.dependencyGraph = dependencyGraph;
-        if (this.unsubscribeFromDependencyGraph) {
-            this.unsubscribeFromDependencyGraph();
-        }
-
-        //anytime a dependency changes, clean up some cached values
-        this.unsubscribeFromDependencyGraph = dependencyGraph.onchange(this.dependencyGraphKey, () => {
-            this.logDebug('clear cache because dependency graph changed');
-            this.cache.clear();
-        });
+    }
 
-        let dependencies = [
-            ...this.scriptTagImports.map(x => x.pkgPath.toLowerCase())
+    /**
+     * The list of files that this file depends on
+     */
+    public get dependencies() {
+        const dependencies = [
+            ...this.scriptTagImports.map(x => x.destPath.toLowerCase())
         ];
         //if autoImportComponentScript is enabled, add the .bs and .brs files with the same name
-        if (this.program.options.autoImportComponentScript) {
+        if (this.program?.options?.autoImportComponentScript) {
             dependencies.push(
                 //add the codebehind file dependencies.
                 //These are kind of optional, so it doesn't hurt to just add both extension versions
-                this.pkgPath.replace(/\.xml$/i, '.bs').toLowerCase(),
-                this.pkgPath.replace(/\.xml$/i, '.brs').toLowerCase()
+                this.destPath.replace(/\.xml$/i, '.bs').toLowerCase(),
+                this.destPath.replace(/\.xml$/i, '.brs').toLowerCase()
             );
         }
         const len = dependencies.length;
@@ -294,7 +392,7 @@ export class XmlFile {
         if (this.parentComponentName) {
             dependencies.push(this.parentComponentDependencyGraphKey);
         }
-        this.dependencyGraph.addOrReplace(this.dependencyGraphKey, dependencies);
+        return dependencies;
     }
 
     /**
@@ -309,14 +407,14 @@ export class XmlFile {
     /**
      * The key used in the dependency graph for this file.
      * If we have a component name, we will use that so we can be discoverable by child components.
-     * If we don't have a component name, use the pkgPath so at least we can self-validate
+     * If we don't have a component name, use the destPath so at least we can self-validate
      */
     public get dependencyGraphKey() {
         let key: string;
         if (this.componentName) {
             key = `component:${this.componentName.text}`.toLowerCase();
         } else {
-            key = this.pkgPath.toLowerCase();
+            key = this.destPath.toLowerCase();
         }
         //if our index is not zero, then we are not the primary component with that name, and need to
         //append our index to the dependency graph key as to prevent collisions in the program.
@@ -326,6 +424,10 @@ export class XmlFile {
         return key;
     }
 
+    public set dependencyGraphKey(value) {
+        //do nothing, we override this value in the getter
+    }
+
     /**
      * The key used in the dependency graph for this component's parent.
      * If we have aparent, we will use that. If we don't, this will return undefined
@@ -341,20 +443,20 @@ export class XmlFile {
     /**
      * Determines if this xml file has a reference to the specified file (or if it's itself)
      */
-    public doesReferenceFile(file: File) {
-        return this.cache.getOrAdd(`doesReferenceFile: ${file.pkgPath}`, () => {
+    public doesReferenceFile(file: BscFile) {
+        return this.cache.getOrAdd(`doesReferenceFile: ${file.destPath}`, () => {
             if (file === this) {
                 return true;
             }
             let allDependencies = this.getOwnDependencies();
-            for (let importPkgPath of allDependencies) {
-                if (importPkgPath.toLowerCase() === file.pkgPath.toLowerCase()) {
+            for (let destPath of allDependencies) {
+                if (destPath.toLowerCase() === file.destPath.toLowerCase()) {
                     return true;
                 }
             }
 
             //if this is an xml file...do we extend the component it defines?
-            if (path.extname(file.pkgPath).toLowerCase() === '.xml') {
+            if (path.extname(file.destPath).toLowerCase() === '.xml') {
 
                 //didn't find any script imports for this file
                 return false;
@@ -363,18 +465,6 @@ export class XmlFile {
         });
     }
 
-    /**
-     * Get all available completions for the specified position
-     */
-    public getCompletions(position: Position): CompletionItem[] {
-        let scriptImport = util.getScriptImportAtPosition(this.scriptTagImports, position);
-        if (scriptImport) {
-            return this.program.getScriptImportCompletions(this.pkgPath, scriptImport);
-        } else {
-            return [];
-        }
-    }
-
     /**
      * Get the parent component (the component this component extends)
      */
@@ -422,21 +512,21 @@ export class XmlFile {
      * and only includes the ones that are not found on the parent.
      * If no parent is found, all imports are returned
      */
-    private getMissingImportsForTranspile() {
+    public getMissingImportsForTranspile() {
         let ownImports = this.getAvailableScriptImports();
         //add the bslib path to ownImports, it'll get filtered down below
         ownImports.push(this.program.bslibPkgPath);
 
         let parentImports = this.parentComponent?.getAvailableScriptImports() ?? [];
 
-        let parentMap = parentImports.reduce((map, pkgPath) => {
-            map[pkgPath.toLowerCase()] = true;
+        let parentMap = parentImports.reduce((map, destPath) => {
+            map[destPath.toLowerCase()] = true;
             return map;
         }, {});
 
         //if the XML already has this import, skip this one
         let alreadyThereScriptImportMap = this.scriptTagImports.reduce((map, fileReference) => {
-            map[fileReference.pkgPath.toLowerCase()] = true;
+            map[fileReference.destPath.toLowerCase()] = true;
             return map;
         }, {});
 
@@ -460,26 +550,7 @@ export class XmlFile {
     }
 
     private logDebug(...args) {
-        this.program.logger.debug('XmlFile', chalk.green(this.pkgPath), ...args);
-    }
-
-    private checkScriptsForPublishableImports(scripts: SGScript[]): [boolean, SGScript[]] {
-        if (!this.program.options.pruneEmptyCodeFiles) {
-            return [false, scripts];
-        }
-        const publishableScripts = scripts.filter(script => {
-            const uriAttributeValue = script.attributes.find((v) => v.key.text === 'uri')?.value.text || '';
-            const pkgMapPath = util.getPkgPathFromTarget(this.pkgPath, uriAttributeValue);
-            let file = this.program.getFile(pkgMapPath);
-            if (!file && pkgMapPath.endsWith(this.program.bslibPkgPath)) {
-                return true;
-            }
-            if (!file && pkgMapPath.endsWith('.brs')) {
-                file = this.program.getFile(pkgMapPath.replace(/\.brs$/, '.bs'));
-            }
-            return !(file?.canBePruned);
-        });
-        return [publishableScripts.length !== scripts.length, publishableScripts];
+        this.program?.logger?.debug('XmlFile', chalk.green(this.destPath), ...args);
     }
 
     /**
@@ -488,29 +559,10 @@ export class XmlFile {
     public transpile(): CodeWithSourceMap {
         const state = new TranspileState(this.srcPath, this.program.options);
 
-        const originalScripts = this.ast.component?.scripts ?? [];
-        const extraImportScripts = this.getMissingImportsForTranspile().map(uri => {
-            const script = new SGScript();
-            script.uri = util.getRokuPkgPath(uri.replace(/\.bs$/, '.brs'));
-            return script;
-        });
-
-        const [scriptsHaveChanged, publishableScripts] = this.checkScriptsForPublishableImports([
-            ...originalScripts,
-            ...extraImportScripts
-        ]);
-
         let transpileResult: SourceNode | undefined;
-        if (this.needsTranspiled || extraImportScripts.length > 0 || scriptsHaveChanged) {
-            //temporarily add the missing imports as script tags
-            this.ast.component.scripts = publishableScripts;
-
 
+        if (this.needsTranspiled) {
             transpileResult = util.sourceNodeFromTranspileResult(null, null, state.srcPath, this.parser.ast.transpile(state));
-
-            //restore the original scripts array
-            this.ast.component.scripts = originalScripts;
-
         } else if (this.program.options.sourceMap) {
             //emit code as-is with a simple map to the original file location
             transpileResult = util.simpleMap(state.srcPath, this.fileContents);
diff --git a/src/files/tests/imports.spec.ts b/src/files/tests/imports.spec.ts
index 07240ada3..aae0d391f 100644
--- a/src/files/tests/imports.spec.ts
+++ b/src/files/tests/imports.spec.ts
@@ -7,7 +7,7 @@ import { standardizePath as s } from '../../util';
 import type { XmlFile } from '../XmlFile';
 import type { BrsFile } from '../BrsFile';
 import { expectDiagnostics, expectZeroDiagnostics, getTestTranspile, trim, trimMap } from '../../testHelpers.spec';
-import { tempDir, rootDir, stagingDir } from '../../testHelpers.spec';
+import { tempDir, rootDir, outDir } from '../../testHelpers.spec';
 
 let sinon = sinonImport.createSandbox();
 
@@ -20,7 +20,7 @@ describe('import statements', () => {
         fsExtra.emptyDirSync(tempDir);
         program = new Program({
             rootDir: rootDir,
-            stagingDir: stagingDir
+            outDir: outDir
         });
     });
     afterEach(() => {
@@ -51,15 +51,15 @@ describe('import statements', () => {
                 return true
             end function
         `);
-        let files = Object.keys(program.files).map(x => program.getFile(x)).filter(x => !!x).map(x => {
+        Object.keys(program.files).map(x => program.getFile(x)).filter(x => !!x).map(x => {
             return {
                 src: x!.srcPath,
-                dest: x!.pkgPath
+                dest: x!.destPath
             };
         });
-        await program.transpile(files, stagingDir);
+        await program.build({ outDir: outDir });
         expect(
-            trimMap(fsExtra.readFileSync(`${stagingDir}/components/ChildScene.xml`).toString())
+            trimMap(fsExtra.readFileSync(`${outDir}/components/ChildScene.xml`).toString())
         ).to.equal(trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="Scene">
@@ -173,14 +173,7 @@ describe('import statements', () => {
         expectZeroDiagnostics(program);
     });
 
-    it('adds brs imports to xml file during transpile', () => {
-        //create child component
-        let component = program.setFile('components/ChildScene.xml', trim`
-            <?xml version="1.0" encoding="utf-8" ?>
-            <component name="ChildScene" extends="ParentScene">
-                <script type="text/brightscript" uri="pkg:/source/lib.bs" />
-            </component>
-        `);
+    it('adds brs imports to xml file during transpile', async () => {
         program.setFile('source/lib.bs', `
             import "stringOps.brs"
             function toLower(strVal as string)
@@ -189,18 +182,22 @@ describe('import statements', () => {
         `);
         program.setFile('source/stringOps.brs', `
             function StringToLower(strVal as string)
-                return isInt(strVal)
+                return LCase(strVal)
             end function
         `);
-        program.validate();
-        expect(trimMap(component.transpile().code)).to.equal(trim`
+        await testTranspile(trim`
+            <?xml version="1.0" encoding="utf-8" ?>
+            <component name="ChildScene" extends="ParentScene">
+                <script type="text/brightscript" uri="pkg:/source/lib.bs" />
+            </component>
+        `, trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="ParentScene">
                 <script type="text/brightscript" uri="pkg:/source/lib.brs" />
                 <script type="text/brightscript" uri="pkg:/source/stringOps.brs" />
                 <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
             </component>
-        `);
+        `, null, 'components/ChildScene.xml');
     });
 
     it('shows diagnostic for missing file in import', () => {
@@ -222,7 +219,7 @@ describe('import statements', () => {
         ]);
     });
 
-    it('complicated import graph adds correct script tags', () => {
+    it('complicated import graph adds correct script tags', async () => {
         program.setFile('source/maestro/ioc/IOCMixin.bs', `
             sub DoIocThings()
             end sub
@@ -234,7 +231,7 @@ describe('import statements', () => {
         program.setFile('components/AuthManager.bs', `
             import "pkg:/source/BaseClass.bs"
         `);
-        testTranspile(trim`
+        await testTranspile(trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="ParentScene">
                 <script type="text/brighterscript" uri="AuthManager.bs" />
@@ -260,6 +257,20 @@ describe('import statements', () => {
             import "pkg:/"
         `);
         expect(brsFile.ownScriptImports.length).to.equal(5);
-        expect(brsFile.ownScriptImports.filter(p => !!p.pkgPath).length).to.equal(3);
+        expect(brsFile.ownScriptImports.filter(p => !!p.destPath).length).to.equal(3);
+    });
+
+    it('keeps the original import path when transpiled', async () => {
+        program.setFile('components/MainScene.xml', `
+            <component name="MainScene" extends="Scene">
+                <script uri="MainScene.bs" />
+            </component>
+        `);
+        program.setFile('components/Lib.bs', '');
+        await testTranspile(`
+            import "Lib.bs"
+        `, `
+            'import "Lib.bs"
+        `, undefined, 'components/MainScene.bs');
     });
 });
diff --git a/src/files/tests/optionalChaning.spec.ts b/src/files/tests/optionalChaning.spec.ts
index 3ed3d9f49..a047364cd 100644
--- a/src/files/tests/optionalChaning.spec.ts
+++ b/src/files/tests/optionalChaning.spec.ts
@@ -2,7 +2,7 @@ import * as sinonImport from 'sinon';
 import * as fsExtra from 'fs-extra';
 import { Program } from '../../Program';
 import { expectDiagnostics, getTestTranspile } from '../../testHelpers.spec';
-import { tempDir, rootDir, stagingDir } from '../../testHelpers.spec';
+import { tempDir, rootDir, outDir } from '../../testHelpers.spec';
 import { DiagnosticMessages } from '../../DiagnosticMessages';
 import util from '../../util';
 
@@ -17,7 +17,7 @@ describe('optional chaining', () => {
         fsExtra.emptyDirSync(tempDir);
         program = new Program({
             rootDir: rootDir,
-            stagingDir: stagingDir
+            outDir: outDir
         });
     });
     afterEach(() => {
@@ -27,32 +27,32 @@ describe('optional chaining', () => {
         program.dispose();
     });
 
-    it('transpiles ?. properly', () => {
-        testTranspile(`
+    it('transpiles ?. properly', async () => {
+        await testTranspile(`
             sub main()
                 print m?.value
             end sub
         `);
     });
 
-    it('transpiles ?[ properly', () => {
-        testTranspile(`
+    it('transpiles ?[ properly', async () => {
+        await testTranspile(`
             sub main()
                 print m?["value"]
             end sub
         `);
     });
 
-    it(`transpiles '?.[`, () => {
-        testTranspile(`
+    it(`transpiles '?.[`, async () => {
+        await testTranspile(`
             sub main()
                 print m?["value"]
             end sub
         `);
     });
 
-    it(`transpiles '?@`, () => {
-        testTranspile(`
+    it(`transpiles '?@`, async () => {
+        await testTranspile(`
             sub main()
                 someXml = invalid
                 print someXml?@someAttr
@@ -60,8 +60,8 @@ describe('optional chaining', () => {
         `);
     });
 
-    it(`transpiles '?(`, () => {
-        testTranspile(`
+    it(`transpiles '?(`, async () => {
+        await testTranspile(`
             sub main()
                 localFunc = sub()
                 end sub
@@ -71,8 +71,8 @@ describe('optional chaining', () => {
         `);
     });
 
-    it('transpiles various use cases', () => {
-        testTranspile(`
+    it('transpiles various use cases', async () => {
+        await testTranspile(`
             sub main()
                 obj = {}
                 arr = []
@@ -80,12 +80,12 @@ describe('optional chaining', () => {
                 print arr?.value
                 print obj?.[0]
                 print obj?.getName()?.first?.second
-                print createObject("roByteArray")?.value
+                print createObject("roByteArray")?.Count
                 print createObject("roByteArray")?["0"]
-                print createObject("roList")?.value
+                print createObject("roList")?.Count
                 print createObject("roList")?["0"]
                 print createObject("roXmlList")?["0"]
-                print createObject("roDateTime")?.value
+                print createObject("roDateTime")?.GetYear
                 print createObject("roDateTime")?.GetTimeZoneOffset
                 print createObject("roSGNode", "Node")?[0]
                 print obj?.first?.second
@@ -96,8 +96,8 @@ describe('optional chaining', () => {
         `);
     });
 
-    it('includes final operator in chain', () => {
-        testTranspile(`
+    it('includes final operator in chain', async () => {
+        await testTranspile(`
             sub main()
                 if m.cardFolderStack <> invalid then
                     m?.cardFolderStack?.visible?.ither = false
@@ -116,7 +116,7 @@ describe('optional chaining', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.noOptionalChainingInLeftHandSideOfAssignment(),
-                range: util.createRange(2, 20, 2, 24)
+                location: { range: util.createRange(2, 20, 2, 24) }
             }]);
         });
 
@@ -129,7 +129,7 @@ describe('optional chaining', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.noOptionalChainingInLeftHandSideOfAssignment(),
-                range: util.createRange(2, 20, 2, 29)
+                location: { range: util.createRange(2, 20, 2, 29) }
             }]);
         });
 
@@ -143,7 +143,7 @@ describe('optional chaining', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.noOptionalChainingInLeftHandSideOfAssignment(),
-                range: util.createRange(3, 20, 3, 27)
+                location: { range: util.createRange(3, 20, 3, 27) }
             }]);
         });
 
@@ -157,7 +157,7 @@ describe('optional chaining', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.noOptionalChainingInLeftHandSideOfAssignment(),
-                range: util.createRange(3, 20, 3, 30)
+                location: { range: util.createRange(3, 20, 3, 30) }
             }]);
         });
 
@@ -172,10 +172,10 @@ describe('optional chaining', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.noOptionalChainingInLeftHandSideOfAssignment(),
-                range: util.createRange(3, 20, 3, 39)
+                location: { range: util.createRange(3, 20, 3, 39) }
             }, {
                 ...DiagnosticMessages.noOptionalChainingInLeftHandSideOfAssignment(),
-                range: util.createRange(4, 20, 4, 33)
+                location: { range: util.createRange(4, 20, 4, 33) }
             }]);
         });
     });
diff --git a/src/globalCallables.spec.ts b/src/globalCallables.spec.ts
index aae6160dc..edf5ea0ff 100644
--- a/src/globalCallables.spec.ts
+++ b/src/globalCallables.spec.ts
@@ -1,6 +1,6 @@
 import { util } from './util';
 import { Program } from './Program';
-import { expectDiagnostics, expectZeroDiagnostics, rootDir, stagingDir } from './testHelpers.spec';
+import { expectDiagnostics, expectZeroDiagnostics, rootDir, outDir } from './testHelpers.spec';
 import { DiagnosticMessages } from './DiagnosticMessages';
 import { expect } from './chai-config.spec';
 
@@ -9,7 +9,7 @@ describe('globalCallables', () => {
     beforeEach(() => {
         program = new Program({
             rootDir: rootDir,
-            stagingDir: stagingDir
+            outDir: outDir
         });
     });
     afterEach(() => {
@@ -21,6 +21,20 @@ describe('globalCallables', () => {
             program.setFile('source/main.brs', `
                 sub main()
                     adIface = Roku_Ads()
+                    print adIface
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
+    describe('Roku_Event_Dispatcher', () => {
+        it('exists', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    red = Roku_Event_Dispatcher()
+                    print red
                 end sub
             `);
             program.validate();
@@ -57,14 +71,11 @@ describe('globalCallables', () => {
             end sub
         `);
         program.validate();
-        const hover = program.getHover(file.srcPath, util.createPosition(2, 25));
+        //print Mi|d("value1", 1)
+        const hover = program.getHover(file.srcPath, util.createPosition(2, 24));
         expect(
-            hover[0].contents.toString().replace('\r\n', '\n')
-        ).to.eql([
-            '```brightscript',
-            'function Mid(s as string, p as integer, n? as integer) as string',
-            '```'
-        ].join('\n'));
+            hover[0].contents.toString()
+        ).to.include('function Mid(s as string, p as integer, n? as integer) as string');
     });
 
     describe('bslCore', () => {
@@ -105,6 +116,28 @@ describe('globalCallables', () => {
         });
     });
 
+    describe('Type', () => {
+        it('allows single parameter', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    print Type(2)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows both parameters', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    print Type(2, 3)
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+    });
+
     describe('StrI', () => {
         it('allows single parameter', () => {
             program.setFile('source/main.brs', `
diff --git a/src/globalCallables.ts b/src/globalCallables.ts
index f73e83e64..e00c3c940 100644
--- a/src/globalCallables.ts
+++ b/src/globalCallables.ts
@@ -4,14 +4,15 @@ import { ArrayType } from './types/ArrayType';
 import { BooleanType } from './types/BooleanType';
 import { DynamicType } from './types/DynamicType';
 import { FloatType } from './types/FloatType';
-import { FunctionType } from './types/FunctionType';
+import { TypedFunctionType } from './types/TypedFunctionType';
 import { IntegerType } from './types/IntegerType';
 import { ObjectType } from './types/ObjectType';
 import { StringType } from './types/StringType';
 import { VoidType } from './types/VoidType';
-import util from './util';
+import { util } from './util';
+import { UnionType, unionTypeFactory } from './types/UnionType';
 
-export let globalFile = new BrsFile('global', 'global', null);
+export let globalFile = new BrsFile({ srcPath: 'global', destPath: 'global', program: null });
 globalFile.parse('');
 
 type GlobalCallable = Pick<Callable, 'name' | 'shortDescription' | 'type' | 'file' | 'params' | 'documentation' | 'isDeprecated' | 'nameRange'>;
@@ -19,172 +20,172 @@ type GlobalCallable = Pick<Callable, 'name' | 'shortDescription' | 'type' | 'fil
 let mathFunctions: GlobalCallable[] = [{
     name: 'Abs',
     shortDescription: 'Returns the absolute value of the argument.',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Atn',
     shortDescription: 'Returns the arctangent (in radians) of the argument.',
     documentation: '`ATN(X)` returns "the angle whose tangent is X". To get arctangent in degrees, multiply `ATN(X)` by `57.29578`.',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Cdbl',
     shortDescription: 'Returns a single precision float representation of the argument. Someday may return double.',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new IntegerType(),
+        type: IntegerType.instance,
         isOptional: false
     }]
 }, {
     name: 'Cint',
     shortDescription: 'Returns an integer representation of the argument, rounding up from midpoints. CINT(2.1) returns 2; CINT(2.5) returns 3; CINT(-2.2) returns -2; CINT(-2.5) returns -2; CINT(-2.6) returns -3.',
-    type: new FunctionType(new IntegerType()),
+    type: new TypedFunctionType(IntegerType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Cos',
     shortDescription: 'Returns the cosine of the argument (argument must be in radians). To obtain the cosine of X when X is in degrees, use CGS(X*.01745329).',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Csng',
     shortDescription: 'Returns a single-precision float representation of the argument.',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new IntegerType(),
+        type: IntegerType.instance,
         isOptional: false
     }]
 }, {
     name: 'Exp',
     shortDescription: 'Returns the "natural exponential" of X, that is, ex. This is the inverse of the LOG function, so X=EXP(LOG(X)).',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Fix',
     shortDescription: 'Returns a truncated representation of the argument. All digits to the right of the decimal point are simply chopped off, so the resultant value is an integer. For non-negative X, FIX(X)=lNT(X). For negative values of X, FIX(X)=INT(X)+1. For example, FIX(2.2) returns 2, and FIX(-2.2) returns -2.',
-    type: new FunctionType(new IntegerType()),
+    type: new TypedFunctionType(IntegerType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Int',
     shortDescription: 'Returns an integer representation of the argument, using the largest whole number that is not greater than the argument.. INT(2.5) returns 2; INT(-2.5) returns -3; and INT(1000101.23) returns 10000101.',
-    type: new FunctionType(new IntegerType()),
+    type: new TypedFunctionType(IntegerType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Log',
     shortDescription: 'Returns the natural logarithm of the argument, that is, loge(x) or ln(x). This is the inverse of the EXP function, so LOG(EXP(X)) = X. To find the logarithm of a number to another base b, use the formula logb(X) = loge(X) / loge(b). For example, LOG(32767) / LOG(2) returns the logarithm to base 2 of 32767.',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Rnd',
     shortDescription: 'Generates a pseudo-random number using the current pseudo-random "seed number" (generated internally and not accessible to user).returns an integer between 1 and integer inclusive . For example, RND(55) returns a pseudo-random integer greater than zero and less than 56.',
-    type: new FunctionType(new IntegerType()),
+    type: new TypedFunctionType(IntegerType.instance),
     file: globalFile,
     params: [{
         name: 'range',
-        type: new IntegerType(),
+        type: IntegerType.instance,
         isOptional: false
     }]
 }, {
     name: 'Rnd',
     shortDescription: 'Generates a pseudo-random number using the current pseudo-random "seed number" (generated internally and not accessible to user). Returns a float value between 0 and 1.',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: '0',
-        type: new IntegerType(),
+        type: IntegerType.instance,
         isOptional: false
     }]
 }, {
     name: 'Sgn',
     shortDescription: 'The "sign" function: returns -1 for X negative, 0 for X zero, and +1 for X positive.',
-    type: new FunctionType(new IntegerType()),
+    type: new TypedFunctionType(IntegerType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Sgn',
     shortDescription: 'The "sign" function: returns -1 for X negative, 0 for X zero, and +1 for X positive.',
-    type: new FunctionType(new IntegerType()),
+    type: new TypedFunctionType(IntegerType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new IntegerType(),
+        type: IntegerType.instance,
         isOptional: false
     }]
 }, {
     name: 'Sin',
     shortDescription: 'Returns the sine of the argument (argument must be in radians). To obtain the sine of X when X is in degrees, use SIN(X*.01745329).',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Sqr',
     shortDescription: 'Returns the square root of the argument. SQR(X) is the same as X ^ (1/2), only faster.',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }, {
     name: 'Tan',
     shortDescription: 'Returns the tangent of the argument (argument must be in radians). To obtain the tangent of X when X is in degrees, use TAN(X*.01745329).',
-    type: new FunctionType(new FloatType()),
+    type: new TypedFunctionType(FloatType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new FloatType(),
+        type: FloatType.instance,
         isOptional: false
     }]
 }];
@@ -192,114 +193,100 @@ let mathFunctions: GlobalCallable[] = [{
 let runtimeFunctions: GlobalCallable[] = [{
     name: 'CreateObject',
     shortDescription: 'Creates a BrightScript Component of class classname specified. Return invalid if the object creation fails. Some Objects have optional parameters in their constructor that are passed after name.',
-    type: new FunctionType(new ObjectType()),
+    type: new TypedFunctionType(ObjectType.instance),
     file: globalFile,
     params: [{
         name: 'name',
-        type: new StringType(),
+        type: StringType.instance,
         isOptional: false
     }, {
         name: 'param2',
-        type: new DynamicType(),
+        type: DynamicType.instance,
         isOptional: true
     }, {
         name: 'param3',
-        type: new DynamicType(),
+        type: DynamicType.instance,
         isOptional: true
     }, {
         name: 'param4',
-        type: new DynamicType(),
+        type: DynamicType.instance,
         isOptional: true
     }, {
         name: 'param5',
-        type: new DynamicType(),
+        type: DynamicType.instance,
         isOptional: true
     }, {
         name: 'param6',
-        type: new DynamicType(),
+        type: DynamicType.instance,
         isOptional: true
     }]
 }, {
     name: 'Type',
     shortDescription: 'Returns the type of a variable and/or object. See the BrightScript Component specification for a list of types.',
-    type: new FunctionType(new ObjectType()),
+    type: new TypedFunctionType(StringType.instance),
     file: globalFile,
     params: [{
         name: 'variable',
-        type: new ObjectType(),
+        type: ObjectType.instance,
         isOptional: false
     }, {
         name: 'version',
-        type: new StringType(),
+        type: IntegerType.instance,
         isOptional: true
     }]
 }, {
     name: 'GetGlobalAA',
     shortDescription: 'Each script has a global Associative Array. It can be fetched with this function. ',
-    type: new FunctionType(new ObjectType()),
+    type: new TypedFunctionType(ObjectType.instance),
     file: globalFile,
     params: []
 }, {
     name: 'Box',
     shortDescription: 'Box() will return an object version of an intrinsic type, or pass through an object if given one.',
-    type: new FunctionType(new ObjectType()),
+    type: new TypedFunctionType(ObjectType.instance),
     file: globalFile,
     params: [{
         name: 'x',
-        type: new DynamicType(),
-        isOptional: false
-    }]
-}, {
-    name: 'Run',
-    shortDescription: `The Run function can be used to compile and run a script dynamically.\nThe file specified by that path is compiled and run.\nArguments may be passed to the script's Main function, and that script may return a result value.'`,
-    type: new FunctionType(new DynamicType()),
-    file: globalFile,
-    params: [{
-        name: 'filename',
-        type: new StringType(),
-        isOptional: false
-    }, {
-        name: 'arg',
-        type: new DynamicType(),
-        isRestArgument: true,
+        type: DynamicType.instance,
         isOptional: false
     }]
 }, {
     name: 'Run',
     shortDescription: `The Run function can be used to compile and run a script dynamically.\nAll files specified are compiled together, then run.\nArguments may be passed to the script's Main function, and that script may return a result value.'`,
-    type: new FunctionType(new DynamicType()),
+    type: new TypedFunctionType(DynamicType.instance),
     file: globalFile,
+    isDeprecated: true,
     params: [{
         name: 'filename',
-        type: new ArrayType(new StringType()),
+        type: new UnionType([new ArrayType(StringType.instance), StringType.instance]),
         isOptional: false
     }, {
         name: 'arg',
-        type: new DynamicType(),
+        type: DynamicType.instance,
         isRestArgument: true,
         isOptional: true
     }]
 }, {
     name: 'Eval',
     shortDescription: `Eval can be used to run a code snippet in the context of the current function. It performs a compile, and then the bytecode execution.\nIf a compilation error occurs, no bytecode execution is performed, and Eval returns an roList with one or more compile errors. Each list entry is an roAssociativeArray with ERRNO and ERRSTR keys describing the error.\nIf compilation succeeds, bytecode execution is performed and the integer runtime error code is returned. These are the same error codes as returned by GetLastRunRuntimeError().\nEval() can be usefully in two cases. The first is when you need to dynamically generate code at runtime.\nThe other is if you need to execute a statement that could result in a runtime error, but you don't want code execution to stop. '`,
-    type: new FunctionType(new DynamicType()),
+    type: new TypedFunctionType(DynamicType.instance),
     file: globalFile,
     isDeprecated: true,
     params: [{
         name: 'code',
-        type: new StringType(),
+        type: StringType.instance,
         isOptional: false
     }]
 }, {
     name: 'GetLastRunCompileError',
     shortDescription: 'Returns an roList of compile errors, or invalid if no errors. Each list entry is an roAssociativeArray with the keys: ERRNO, ERRSTR, FILESPEC, and LINENO.',
-    type: new FunctionType(new ObjectType()),
+    type: new TypedFunctionType(ObjectType.instance),
     file: globalFile,
     params: []
 }, {
     name: 'GetLastRunRuntimeError',
     shortDescription: 'Returns an error code result after the last script Run().These are normal:\\,&hFF==ERR_OKAY\\n&hFC==ERR_NORMAL_END\\n&hE2==ERR_VALUE_RETURN',
-    type: new FunctionType(new IntegerType()),
+    type: new TypedFunctionType(IntegerType.instance),
     file: globalFile,
     params: []
 }];
@@ -308,131 +295,131 @@ let globalUtilityFunctions: GlobalCallable[] = [
     {
         name: 'Sleep',
         shortDescription: 'This function causes the script to pause for the specified time, without wasting CPU cycles. There are 1000 milliseconds in one second.',
-        type: new FunctionType(new VoidType()),
+        type: new TypedFunctionType(VoidType.instance),
         file: globalFile,
         params: [{
             name: 'milliseconds',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
         name: 'Wait',
         shortDescription: 'This function waits on objects that are "waitable" (those that have a MessagePort interface). Wait() returns the event object that was posted to the message port. If timeout is zero, "wait" will wait for ever. Otherwise, Wait will return after timeout milliseconds if no messages are received. In this case, Wait returns a type "invalid".',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'timeout',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'port',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }]
     }, {
         name: 'GetInterface',
         shortDescription: 'Each BrightScript Component has one or more interfaces. This function returns a value of type "Interface". \nNote that generally BrightScript Components allow you to skip the interface specification. In which case, the appropriate interface within the object is used. This works as long as the function names within the interfaces are unique.',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'object',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }, {
             name: 'ifname',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'FindMemberFunction',
         shortDescription: 'Returns the interface from the object that provides the specified function, or invalid if not found.',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'object',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }, {
             name: 'functionName',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'UpTime',
         shortDescription: 'Returns the uptime of the system since the last reboot in seconds.',
-        type: new FunctionType(new FloatType()),
+        type: new TypedFunctionType(FloatType.instance),
         file: globalFile,
         params: [{
             name: 'dummy',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
         name: 'RebootSystem',
         shortDescription: 'Requests the system to perform a soft reboot. The Roku platform has disabled this feature.',
-        type: new FunctionType(new VoidType()),
+        type: new TypedFunctionType(VoidType.instance),
         file: globalFile,
         params: []
     }, {
         name: 'ListDir',
         shortDescription: 'Returns a List object containing the contents of the directory path specified.',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'path',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'ReadAsciiFile',
         shortDescription: 'This function reads the specified file and returns the data as a string.\nThe file can be encoded as either UTF-8 (which includes the 7-bit ASCII subset) or UTF-16.\nAn empty string is returned if the file can not be read.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'filePath',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'WriteAsciiFile',
         shortDescription: 'This function writes the specified string data to a file at the specified location.\nThe string data is written as UTF-8 encoded (which includes the 7-bit ASCII subset).\nThe function returns true if the file was successfully written.',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'filePath',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'text',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'CopyFile',
         shortDescription: 'Make a copy of a file.',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'source',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'destination',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'MoveFile',
         shortDescription: 'Rename a file.',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'source',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'destination',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
@@ -449,75 +436,75 @@ A '*' matches zero or more arbitrary characters.
 The character class '[...]' matches any single character specified within the brackets. The closing bracket is treated as a member of the character class if it immediately follows the opening bracket. i.e. '[]]' matches a single close bracket. Within the class '-' can be used to specify a range unless it is the first or last character. e.g. '[A-Cf-h]' is equivalent to '[ABCfgh]'.
 A character class can be negated by specifying '^' as the first character. To match a literal '^' place it elsewhere within the class.
 The characters '?', '*' and '[' lose their special meaning if preceded by a single '\\'. A single '\\' can be matched as '\\\\'.`,
-        type: new FunctionType(new ArrayType(new StringType())),
+        type: new TypedFunctionType(new ArrayType(StringType.instance)),
         file: globalFile,
         params: [{
             name: 'path',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'pattern_in',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'DeleteFile',
         shortDescription: 'Delete the specified file.',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'file',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'DeleteDirectory',
         shortDescription: 'Deletes the specified directory.  It is only possible to delete an empty directory.',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'dir',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'CreateDirectory',
         shortDescription: 'Creates the specified Directory. Only one directory can be created at a time',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'dir',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'FormatDrive',
         shortDescription: 'Formats a specified drive using the specified filesystem.',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'drive',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'fs_type',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'StrToI',
         shortDescription: 'Return the integer value of the string, or 0 if nothing is parsed.',
-        type: new FunctionType(new IntegerType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 'str',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'RunGarbageCollector',
         shortDescription: `This function runs the garbage collector. It returns and Associative Array with some statistics regarding the garbage collection. \nSee the Garbage Collection section of the manual for more detail. You don't normally need to call this function.`,
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: []
     }, {
@@ -528,16 +515,16 @@ The characters '?', '*' and '[' lose their special meaning if preceded by a sing
 Any roAssociativeArray objects in the returned objects will be case sensitive. As of Roku OS 9.4, to return a case-insensitive structure, set the flags parameter to "i".
 If the "i" option is used, and the jsonString includes multiple keys that match case-insensitively, duplicates are overwritten and only the last matching values are preserved.
 An error will be returned if arrays/associative arrays are nested more than 256 levels deep.`,
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'jsonString',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         },
         {
             name: 'flags',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: true
         }]
     }, {
@@ -552,15 +539,15 @@ An error will be returned if arrays/associative arrays are nested more than 256
 If an error occurs an empty string will be returned.
 
 Normally non-ASCII characters are escaped in the output string as "\\uXXXX" where XXXX is the hexadecimal representation of the Unicode character value.  If flags=1, non-ASCII characters are not escaped.`,
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'object',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }, {
             name: 'flags',
-            type: new StringType(),
+            type: new UnionType([IntegerType.instance, StringType.instance]),
             isOptional: true
         }]
     }, {
@@ -570,11 +557,11 @@ Normally non-ASCII characters are escaped in the output string as "\\uXXXX" wher
 
 In some cases you may want to include a placeholder marker in a localizable string that gets dynamically substituted with a value at runtime.
 One way to accomplish that is to use the Replace method on the string value returned from the Tr() lookup.`,
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'source',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }
@@ -584,31 +571,31 @@ let globalStringFunctions: GlobalCallable[] = [
     {
         name: 'UCase',
         shortDescription: 'Converts the string to all upper case.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 's',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'LCase',
         shortDescription: 'Converts the string to all lower case.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 's',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'Asc',
         shortDescription: 'Returns the Unicode ("ASCII") value for the first character of the specified string\n An empty string argument will return 0.',
-        type: new FunctionType(new IntegerType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 'letter',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
@@ -621,178 +608,178 @@ let globalStringFunctions: GlobalCallable[] = [
 By using Chr, you can create strings containing characters which cannot be contained in quotes, such as newline or the quote character itself.
 
  print (Chr(34) + "hello" + Chr(34))  ' prints: "hello"`,
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'ch',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
         name: 'Instr',
         shortDescription: 'Returns the position of the first instances of substring within text, starting at the specified start position.\nReturns 0 if the substring is not found. Unlike the ifString.Instr() method, the first position is 1.',
-        type: new FunctionType(new IntegerType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 'startOrText',
-            type: new DynamicType(),
+            type: unionTypeFactory([IntegerType.instance, StringType.instance]),
             isOptional: false
         }, {
             name: 'textOrSubstring',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'substring',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: true
         }]
     }, {
         name: 'Left',
         shortDescription: 'Returns the first n characters of s. ',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 's',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'n',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
         name: 'Len',
         shortDescription: 'Returns the number of characters in the specified string.',
-        type: new FunctionType(new IntegerType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 's',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'Mid',
         shortDescription: 'Returns a substring of s with length n and starting at position p.\nn may be omitted, in which case the string starting at p and ending at the end of the string is returned.\nUnlike the ifString.Mid() method, the first character in the string is position 1.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 's',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'p',
             //description: '1-based position',
             isOptional: false,
-            type: new IntegerType()
+            type: IntegerType.instance
         }, {
             name: 'n',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: true
         }]
     }, {
         name: 'Right',
         shortDescription: 'Returns the last n characters of s.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 's',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'n',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
         name: 'Str',
         shortDescription: 'Converts a value to a string. Str(A), for example, returns a string equal to the decimal representation of the numeric value of A.\nNote: for non-negative numbers, a leading blank is inserted before the value string as a sign placeholder.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'value',
-            type: new FloatType(),
+            type: FloatType.instance,
             isOptional: false
         }]
     }, {
         name: 'StrI',
         shortDescription: 'Converts a value to a string. Str(A), for example, returns a string equal to the decimal representation of the numeric value of A.\nNote: for non-negative numbers, a leading blank is inserted before the value string as a sign placeholder.. If the radix parameter is provided, then converts the integer value into a string representation using the given radix.\nIf radix is not 2 .. 36 then an empty string is returned.\nNote that the returned string does not include a base prefix and uses lowercase letters to represent those digits in bases greater than 10.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'value',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'radix',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: true
         }]
     }, {
         name: 'string',
         shortDescription: 'Returns a string composed of n copies of the second argument concatenated together.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'n',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'str',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'StringI',
         shortDescription: 'Returns a string composed of n copies of the character whose Unicode value is the second argument.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'n',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'ch',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
         name: 'Val',
         shortDescription: 'Performs the inverse of the STR function: returns the number represented by the characters in a string argument.\nFor example, if A$="12" and B$="34" then VAL(A$+ "."+B$) returns the number 12.34. If radix is provided as the second parameter, it returns the integer value from parsing the string with the specified radix.\nRadix should be 2 .. 36 or the special value 0 (which automatically identified hexadecimal or octal numbers based on 0x or 0 prefixes respectively).\nLeading whitespace is ignored then as much of the rest of the string will be parsed as valid.',
-        type: new FunctionType(new IntegerType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 'str',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'radix',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: true
         }]
     }, {
         name: 'Substitute',
         shortDescription: 'Replaces all instances of {0} or ^0 in str with arg0.  Similarly, replaces all instances of {1} or ^1 with arg1, {2} or ^2 with arg2, and {3} or ^3 with arg3.',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'str',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'arg0',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'arg1',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: true
         }, {
             name: 'arg2',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: true
         }, {
             name: 'arg3',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: true
         }]
     }
@@ -803,88 +790,95 @@ let programStatementFunctions = [
     {
         name: 'Tab',
         shortDescription: 'Moves the cursor to the specified position on the current line (modulo the width of your console if you specify TAB positions greater than the console width). TAB may be used several times in a PRINT list. No punctuation is required after a TAB modifier. Numerical expressions may be used to specify a TAB position. TAB cannot be used to move the cursor to the left. If the cursor is beyond the specified position, the TAB is ignored.',
-        type: new FunctionType(new VoidType()),
+        type: new TypedFunctionType(VoidType.instance),
         file: globalFile,
         params: [{
             name: 'expression',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
         name: 'Pos',
         shortDescription: 'Returns a number from 0 to window width, indicating the current cursor position on the cursor. Requires a "dummy argument" (any numeric expression).',
-        type: new FunctionType(new VoidType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 'x',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
         //TODO this is a temporary fix for library imported files. Eventually this should be moved into `Roku_Ads.brs` and handled by the `Library` statement
     }, {
         name: 'Roku_Ads',
         shortDescription: 'The main entry point for instantiating the ad interface. This object manages ad server requests, parses ad structure, schedules and renders ads, and triggers tracking beacons.\n\nThe Roku ad parser/renderer object returned has global scope because it is meant to represent interaction with external resources (the ad server and any tracking services) that have persistence and state independent of the ad rendering within a client application.',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
+        file: globalFile,
+        params: []
+        //TODO this is a temporary fix for library imported files. Eventually this should be moved into `Roku_Event_Dispatcher.brs` and handled by the `Library` statement
+    }, {
+        name: 'Roku_Event_Dispatcher',
+        shortDescription: 'Use the Roku Event Dispatcher in your channel\'s authentication workflow to send authentication events. See: https://developer.roku.com/docs/developer-program/discovery/search/prioritizing-authenticated-channels-in-roku-search.md',
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: []
     }, { //TODO Same as the Roku_Ads.brs (RAF) library above, the following functions are from the 'v30/bslCore.brs' library
         name: 'bslBrightScriptErrorCodes',
         shortDescription: 'Returns an roAssociativeArray with name value pairs of the error name and corresponding integer value, for example ERR_OKAY = &hFF.',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: []
     }, {
         name: 'bslGeneralConstants',
         shortDescription: 'Returns an roAssociativeArray with name value pairs of system constants, for example MAX_INT = 2147483647.',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: []
     }, {
         name: 'bslUniversalControlEventCodes',
         shortDescription: 'Returns an roAssociativeArray with name value pairs of the remote key code (buttons) constants, for example BUTTON_SELECT_PRESSED = 6.',
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: []
     },
     {
         name: 'AsciiToHex',
         shortDescription: 'Returns the hex encoded string, for example AsciiToHex("Hi!") = "486921".',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'ascii',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'HexToAscii',
         shortDescription: 'Returns a string that is the hex decoded string, for example HexToAscii("486921") = "Hi!".',
-        type: new FunctionType(new StringType()),
+        type: new TypedFunctionType(StringType.instance),
         file: globalFile,
         params: [{
             name: 'hex',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     },
     {
         name: 'HexToInteger',
         shortDescription: 'Returns the integer value of the passed in hex string.',
-        type: new FunctionType(new IntegerType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 'hex',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'HexToInteger',
         shortDescription: 'Returns a string that is the hex decoded string, for example HexToAscii("486921") = "Hi!".',
-        type: new FunctionType(new IntegerType()),
+        type: new TypedFunctionType(IntegerType.instance),
         file: globalFile,
         params: [{
             name: 'hex',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
@@ -896,47 +890,47 @@ ExtraInfo: roAssociativeArray
 Regions: roAssociativeArray of name, roRegions pairs
 Animations: roAssociativeArray of name, roArray of roRegion pairs.
 Backgrounds: roAssociativeArray of name, path pairs.`,
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'filename',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }]
     }, {
         name: 'dfDrawMessage',
         shortDescription: 'dest is an roScreen/roBitmap/roRegion and region is an roRegion.\nGreys the entire dest region and draws it the region centered on the drawable dest.',
-        type: new FunctionType(new VoidType()),
+        type: new TypedFunctionType(VoidType.instance),
         file: globalFile,
         params: [{
             name: 'dest',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }, {
             name: 'region',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }]
     }, {
         name: 'dfDrawImage',
         shortDescription: 'Returns True if successful.\nCreates a bitmap out of the image stored in the filename "path" and draws it at position (x,y) of the drawable dest.',
-        type: new FunctionType(new BooleanType()),
+        type: new TypedFunctionType(BooleanType.instance),
         file: globalFile,
         params: [{
             name: 'dest',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }, {
             name: 'path',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'x',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'y',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
@@ -953,27 +947,27 @@ Right: right region if there is a pillar box area on the right
 Upper: upper region if there is a letterbox area at thetop
 Lower: lower region if there is a letterbox area at the bottom
 When using these regions as drawables, your graphics will be translated and clipped to these regions.`,
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'screen',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }, {
             name: 'topx',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'topy',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'width',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }, {
             name: 'height',
-            type: new IntegerType(),
+            type: IntegerType.instance,
             isOptional: false
         }]
     }, {
@@ -982,19 +976,19 @@ When using these regions as drawables, your graphics will be translated and clip
 backgroundName is a key for the Backgrounds roAssociative array of backgrounds.
 Backgrounds is an roAssociative array of background name keys and file path string values
 This function creates an roBitmap out of the background image file and returns a region the size of the entire roBitmap.`,
-        type: new FunctionType(new ObjectType()),
+        type: new TypedFunctionType(ObjectType.instance),
         file: globalFile,
         params: [{
             name: 'backgroundName',
-            type: new StringType(),
+            type: StringType.instance,
             isOptional: false
         }, {
             name: 'backgrounds',
-            type: new ObjectType(),
+            type: ObjectType.instance,
             isOptional: false
         }]
     }
-] as Callable[];
+] as unknown[] as Callable[];
 
 export let globalCallables = [...mathFunctions, ...runtimeFunctions, ...globalUtilityFunctions, ...globalStringFunctions, ...programStatementFunctions];
 for (let callable of globalCallables) {
@@ -1014,10 +1008,8 @@ for (let callable of globalCallables) {
     };
 
 }
-globalFile.callables = globalCallables as Callable[];
-for (const callable of globalCallables) {
-    globalFile.parser.symbolTable.addSymbol(callable.name, undefined, callable.type);
-}
+globalFile.staticCallables = globalCallables as Callable[];
+
 
 /**
  * A map of all built-in function names. We use this extensively in scope validation
diff --git a/src/index.ts b/src/index.ts
index 52cdac3e2..c7e0b4add 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -15,6 +15,7 @@ export * from './parser/Parser';
 export * from './parser/AstNode';
 export * from './parser/Expression';
 export * from './parser/Statement';
+export * from './parser/BrightScriptDocParser';
 export * from './BsConfig';
 export * from './deferred';
 export * from './astUtils/visitors';
@@ -22,11 +23,18 @@ export * from './astUtils/stackedVisitor';
 export * from './astUtils/reflection';
 export * from './astUtils/creators';
 export * from './astUtils/xml';
-export * from './astUtils/AstEditor';
+export * from './astUtils/Editor';
+export * from './files/BscFile';
+export * from './parser/BrsTranspileState';
+export * from './astUtils/Editor';
+export * from './SymbolTable';
+export * from './types';
+export * from './Cache';
 export * from './BusyStatusTracker';
 export * from './Logger';
 export * from './parser/SGTypes';
 export * from './parser/SGParser';
+export * from './SymbolTypeFlag';
 export * from './CodeActionUtil';
 export * from './DependencyGraph';
 export * from './PluginInterface';
diff --git a/src/interfaces.ts b/src/interfaces.ts
index 86794978f..be32573f9 100644
--- a/src/interfaces.ts
+++ b/src/interfaces.ts
@@ -1,31 +1,95 @@
-import type { Range, Diagnostic, CodeAction, Position, CompletionItem, Location, DocumentSymbol, WorkspaceSymbol, Disposable, FileChangeType, SelectionRange } from 'vscode-languageserver-protocol';
+import type { Range, CodeAction, Position, CompletionItem, Location, DocumentSymbol, WorkspaceSymbol, Disposable, FileChangeType, CodeDescription, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, SelectionRange } from 'vscode-languageserver-protocol';
 import type { Scope } from './Scope';
 import type { BrsFile } from './files/BrsFile';
 import type { XmlFile } from './files/XmlFile';
-import type { FunctionScope } from './FunctionScope';
-import type { FunctionType } from './types/FunctionType';
+import type { TypedFunctionType } from './types/TypedFunctionType';
 import type { ParseMode } from './parser/Parser';
-import type { Program, SourceObj, TranspileObj } from './Program';
+import type { Program } from './Program';
 import type { ProgramBuilder } from './ProgramBuilder';
 import type { FunctionStatement } from './parser/Statement';
-import type { Expression } from './parser/AstNode';
+import type { AstNode, Expression } from './parser/AstNode';
 import type { TranspileState } from './parser/TranspileState';
-import type { SourceMapGenerator, SourceNode } from 'source-map';
+import type { SourceNode } from 'source-map';
 import type { BscType } from './types/BscType';
-import type { AstEditor } from './astUtils/AstEditor';
 import type { Token } from './lexer/Token';
 import type { SemanticTokenModifiers, SemanticTokenTypes } from 'vscode-languageserver';
+import type { SymbolTypeFlag } from './SymbolTypeFlag';
+import type { Editor } from './astUtils/Editor';
+import type { BscFile } from './files/BscFile';
+import type { FileFactory } from './files/Factory';
+import type { LazyFileData } from './files/LazyFileData';
+import { TokenKind } from './lexer/TokenKind';
+import type { BscTypeKind } from './types/BscTypeKind';
+import { createToken } from './astUtils/creators';
 import type { SourceFixAllCodeAction } from './CodeActionUtil';
 
-export interface BsDiagnostic extends Diagnostic {
-    file: BscFile;
+export interface BsDiagnostic {
+    /**
+     * The location at which the message applies
+     */
+    location: Location;
+    /**
+     * The diagnostic's severity. Can be omitted. If omitted it is up to the
+     * client to interpret diagnostics as error, warning, info or hint.
+     */
+    severity?: DiagnosticSeverity;
+    /**
+     * The diagnostic's code, which usually appear in the user interface.
+     */
+    code?: number | string;
+    /**
+     * An optional property to describe the error code.
+     * Requires the code field (above) to be present/not null.
+     *
+     * @since 3.16.0
+     */
+    codeDescription?: CodeDescription;
+    /**
+     * A human-readable string describing the source of this
+     * diagnostic, e.g. 'typescript' or 'super lint'. It usually
+     * appears in the user interface.
+     */
+    source?: string;
+    /**
+     * The diagnostic's message. It usually appears in the user interface
+     */
+    message: string;
+    /**
+     * Additional metadata about the diagnostic.
+     *
+     * @since 3.15.0
+     */
+    tags?: DiagnosticTag[];
+    /**
+     * An array of related diagnostic information, e.g. when symbol-names within
+     * a scope collide all definitions can be marked via this property.
+     */
+    relatedInformation?: DiagnosticRelatedInformation[];
     /**
-     * A generic data container where additional details of the diagnostic can be stored. These are stripped out before being sent to a languageclient, and not printed to the console.
+     * A data entry field that is preserved between a `textDocument/publishDiagnostics`
+     * notification and `textDocument/codeAction` request.
+     *
+     * @since 3.16.0
      */
     data?: any;
+
+    /**
+     * The code used for this diagnostic in v0
+     */
+    legacyCode?: number | string;
+}
+
+export interface DiagnosticContext {
+    scopeSpecific?: boolean;
+    scope?: Scope;
+    tags?: string[];
+    segment?: AstNode;
 }
 
-export type BscFile = BrsFile | XmlFile;
+export interface DiagnosticContextPair {
+    diagnostic: BsDiagnostic;
+    context?: DiagnosticContext;
+}
 
 export interface Callable {
     file: BscFile;
@@ -34,7 +98,7 @@ export interface Callable {
      * Is the callable declared as "sub". If falsey, assumed declared as "function"
      */
     isSub: boolean;
-    type: FunctionType;
+    type: TypedFunctionType;
     /**
      * A short description of the callable. Should be a short sentence.
      */
@@ -64,29 +128,6 @@ export interface Callable {
     functionStatement: FunctionStatement;
 }
 
-export interface FunctionCall {
-    /**
-     * The full range of this function call (from the start of the function name to its closing paren)
-     */
-    range: Range;
-    functionScope: FunctionScope;
-    file: File;
-    name: string;
-    args: CallableArg[];
-    nameRange: Range;
-}
-
-/**
- * An argument for an expression call.
- */
-export interface CallableArg {
-    text: string;
-    type: BscType;
-    typeToken: Token;
-    range: Range;
-    expression: Expression;
-}
-
 export interface CallableParam {
     name: string;
     type: BscType;
@@ -110,12 +151,12 @@ export interface FileObj {
  */
 export interface FileReference {
     /**
-     * The pkgPath to the referenced file.
+     * The destPath for the referenced file.
      */
-    pkgPath: string;
+    destPath: string;
     text: string;
     /**
-     * The file that is doing the import. Note this is NOT the file the pkgPath points to.
+     * The file that is doing the import. Note this is NOT the file the destPath points to.
      */
     sourceFile: XmlFile | BrsFile;
     /**
@@ -127,18 +168,9 @@ export interface FileReference {
     filePathRange?: Range;
 }
 
-export interface File {
-    /**
-     * The absolute path to the file, relative to the pkg
-     */
-    pkgPath: string;
-    srcPath: string;
-    getDiagnostics(): BsDiagnostic[];
-}
-
 export interface VariableDeclaration {
     name: string;
-    type: BscType;
+    getType: () => BscType;
     /**
      * The range for the variable name
      */
@@ -185,8 +217,6 @@ export interface CommentFlag {
     codes: DiagnosticCode[] | null;
 }
 
-type ValidateHandler = (scope: Scope, files: BscFile[], callables: CallableContainerMap) => void;
-
 export interface PluginFactoryOptions {
     /**
      * What version of brighterscript is activating this plugin? (Useful for picking different plugins or behavior based on the version of brighterscript)
@@ -206,53 +236,96 @@ export type CompilerPlugin = Plugin;
 
 export interface Plugin {
     name: string;
-    //program events
-    beforeProgramCreate?: (builder: ProgramBuilder) => void;
-    beforePrepublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    afterPrepublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    beforePublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    afterPublish?: (builder: ProgramBuilder, files: FileObj[]) => void;
-    afterProgramCreate?: (program: Program) => void;
-    beforeProgramValidate?: (program: Program) => void;
-    afterProgramValidate?: (program: Program, wasCancelled: boolean) => void;
-    beforeProgramTranspile?: (program: Program, entries: TranspileObj[], editor: AstEditor) => void;
-    afterProgramTranspile?: (program: Program, entries: TranspileObj[], editor: AstEditor) => void;
-    beforeProgramDispose?: PluginHandler<BeforeProgramDisposeEvent>;
-    onGetCodeActions?: PluginHandler<OnGetCodeActionsEvent>;
+    /**
+     * Called before a new program is created
+     */
+    beforeProvideProgram?(event: BeforeProvideProgramEvent): any;
+    provideProgram?(event: ProvideProgramEvent): any;
+    /**
+     * Called after a new program is created
+     */
+    afterProvideProgram?(event: AfterProvideProgramEvent): any;
+
+
+    /**
+     * Called before the program gets prepared for building
+     */
+    beforePrepareProgram?(event: BeforePrepareProgramEvent): any;
+    /**
+     * Called when the program gets prepared for building
+     */
+    prepareProgram?(event: PrepareProgramEvent): any;
+    /**
+     * Called after the program gets prepared for building
+     */
+    afterPrepareProgram?(event: AfterPrepareProgramEvent): any;
+
+
+    /**
+     * Called before the entire program is validated
+     */
+    beforeValidateProgram?(event: BeforeValidateProgramEvent): any;
+    /**
+     * Called before the entire program is validated
+     */
+    validateProgram?(event: ValidateProgramEvent): any;
+    /**
+     * Called after the program has been validated
+     */
+    afterValidateProgram?(event: AfterValidateProgramEvent): any;
+
+    /**
+     * Called right before the program is disposed/destroyed
+     */
+    beforeRemoveProgram?(event: BeforeRemoveProgramEvent): any;
+    removeProgram?(event: RemoveProgramEvent): any;
+    afterRemoveProgram?(event: AfterRemoveProgramEvent): any;
+
     /**
      * Emitted when VS Code requests "source fix all" source actions for a file.
      * Plugins push one or more `SourceFixAllCodeAction` objects onto `event.actions`,
      * each representing a distinct named group that will appear in the Source Actions menu.
      * Plugins are responsible for assembling and merging all changes within each action.
      */
-    // For possible future use, but not currently implemented:
-    onGetSourceFixAllCodeActions?: PluginHandler<OnGetSourceFixAllCodeActionsEvent>;
+    onGetSourceFixAllCodeActions?(event: OnGetSourceFixAllCodeActionsEvent): any;
 
     /**
      * Emitted before the program starts collecting completions
      */
-    beforeProvideCompletions?: PluginHandler<BeforeProvideCompletionsEvent>;
+    beforeProvideCompletions?(event: BeforeProvideCompletionsEvent): any;
     /**
      * Use this event to contribute completions
      */
-    provideCompletions?: PluginHandler<ProvideCompletionsEvent>;
+    provideCompletions?(event: ProvideCompletionsEvent): any;
     /**
      * Emitted after the program has finished collecting completions, but before they are sent to the client
      */
-    afterProvideCompletions?: PluginHandler<AfterProvideCompletionsEvent>;
+    afterProvideCompletions?(event: AfterProvideCompletionsEvent): any;
+
 
     /**
      * Called before the `provideHover` hook. Use this if you need to prepare any of the in-memory objects before the `provideHover` gets called
      */
-    beforeProvideHover?: PluginHandler<BeforeProvideHoverEvent>;
+    beforeProvideHover?(event: BeforeProvideHoverEvent): any;
     /**
      * Called when bsc looks for hover information. Use this if your plugin wants to contribute hover information.
      */
-    provideHover?: PluginHandler<ProvideHoverEvent>;
+    provideHover?(event: ProvideHoverEvent): any;
     /**
      * Called after the `provideHover` hook. Use this if you want to intercept or sanitize the hover data (even from other plugins) before it gets sent to the client.
      */
-    afterProvideHover?: PluginHandler<AfterProvideHoverEvent>;
+    afterProvideHover?(event: AfterProvideHoverEvent): any;
+
+    /**
+     * Called after a scope was created
+     */
+    beforeProvideScope?(event: BeforeProvideScopeEvent): any;
+    provideScope?(event: ProvideScopeEvent): any;
+    afterProvideScope?(event: AfterProvideScopeEvent): any;
+
+    beforeRemoveScope?(event: BeforeRemoveProgramEvent): any;
+    removeScope?(event: RemoveScopeEvent): any;
+    afterRemoveScope?(event: AfterRemoveScopeEvent): any;
 
     /**
      * Called before the `provideDefinition` hook
@@ -269,7 +342,6 @@ export interface Plugin {
      */
     afterProvideDefinition?(event: AfterProvideDefinitionEvent): any;
 
-
     /**
      * Called before the `provideReferences` hook
      */
@@ -331,46 +403,195 @@ export interface Plugin {
      */
     afterProvideSelectionRanges?(event: AfterProvideSelectionRangesEvent): any;
 
-
-    onGetSemanticTokens?: PluginHandler<OnGetSemanticTokensEvent>;
     //scope events
-    afterScopeCreate?: (scope: Scope) => void;
-    beforeScopeDispose?: (scope: Scope) => void;
-    afterScopeDispose?: (scope: Scope) => void;
-    beforeScopeValidate?: ValidateHandler;
-    onScopeValidate?: PluginHandler<OnScopeValidateEvent>;
-    afterScopeValidate?: ValidateHandler;
-    //file events
-    beforeFileParse?: (source: SourceObj) => void;
-    afterFileParse?: (file: BscFile) => void;
+    beforeValidateScope?(event: BeforeValidateScopeEvent): any;
+    validateScope?(event: ValidateScopeEvent): any;
+    afterValidateScope?(event: AfterValidateScopeEvent): any;
+
+    beforeProvideCodeActions?(event: BeforeProvideCodeActionsEvent): any;
+    provideCodeActions?(event: ProvideCodeActionsEvent): any;
+    afterProvideCodeActions?(event: AfterProvideCodeActionsEvent): any;
+
+    beforeProvideSemanticTokens?(event: BeforeProvideSemanticTokensEvent): any;
+    provideSemanticTokens?(event: ProvideSemanticTokensEvent): any;
+    afterProvideSemanticTokens?(event: AfterProvideSemanticTokensEvent): any;
+
+
+    /**
+     * Called before plugins are asked to provide files to the program. (excludes virtual files produced by `provideFile` events).
+     * Call the `setFileData()` method to override the file contents.
+     */
+    beforeProvideFile?(event: BeforeProvideFileEvent): any;
+    /**
+     * Give plugins the opportunity to handle processing a file. (excludes virtual files produced by `provideFile` events)
+     */
+    provideFile?(event: ProvideFileEvent): any;
+    /**
+     * Called after a file was added to the program. (excludes virtual files produced by `provideFile` events)
+     */
+    afterProvideFile?(event: AfterProvideFileEvent): any;
+
+
+    /**
+     * Called before a file is added to the program.
+     * Includes physical files as well as any virtual files produced by `provideFile` events
+     */
+    beforeAddFile?(event: BeforeAddFileEvent): any;
+    /**
+     * Called after a file has been added to the program.
+     * Includes physical files as well as any virtual files produced by `provideFile` events
+     */
+    afterAddFile?(event: AfterAddFileEvent): any;
+
+    /**
+     * Called before a file is removed from the program. This includes physical and virtual files
+     */
+    beforeRemoveFile?(event: BeforeRemoveFileEvent): any;
+    /**
+     * Called after a file has been removed from the program. This includes physical and virtual files
+     */
+    afterRemoveFile?(event: AfterRemoveFileEvent): any;
+
+
     /**
      * Called before each file is validated
      */
-    beforeFileValidate?: PluginHandler<BeforeFileValidateEvent>;
+    beforeValidateFile?(event: BeforeValidateFileEvent): any;
     /**
      * Called during the file validation process. If your plugin contributes file validations, this is a good place to contribute them.
      */
-    onFileValidate?: PluginHandler<OnFileValidateEvent>;
+    validateFile?(event: ValidateFileEvent): any;
     /**
      * Called after each file is validated
      */
-    afterFileValidate?: (file: BscFile) => void;
-    beforeFileTranspile?: PluginHandler<BeforeFileTranspileEvent>;
-    afterFileTranspile?: PluginHandler<AfterFileTranspileEvent>;
-    beforeFileDispose?: (file: BscFile) => void;
-    afterFileDispose?: (file: BscFile) => void;
-}
-export type PluginHandler<T, R = void> = (event: T) => R;
+    afterValidateFile?(event: AfterValidateFileEvent): any;
 
-export interface OnGetCodeActionsEvent {
+
+    /**
+     * Called right before the program builds (i.e. generates the code and puts it in the outDir
+     */
+    beforeBuildProgram?(event: BeforeBuildProgramEvent): any;
+    /**
+     * Called right after the program builds (i.e. generates the code and puts it in the outDir
+     */
+    afterBuildProgram?(event: AfterBuildProgramEvent): any;
+
+
+    /**
+     * Before preparing the file for building
+     */
+    beforePrepareFile?(event: BeforePrepareFileEvent): any;
+    /**
+     * Prepare the file for building
+     */
+    prepareFile?(event: PrepareFileEvent): any;
+    /**
+     * After preparing the file for building
+     */
+    afterPrepareFile?(event: AfterPrepareFileEvent): any;
+
+
+    /**
+     * Before the program turns all file objects into their final buffers
+     */
+    beforeSerializeProgram?(event: BeforeSerializeProgramEvent): any;
+    /**
+     * Emitted right at the start of the program turning all file objects into their final buffers
+     */
+    serializeProgram?(event: SerializeProgramEvent): any;
+    /**
+     * After the program turns all file objects into their final buffers
+     */
+    afterSerializeProgram?(event: AfterSerializeProgramEvent): any;
+
+
+    /**
+     * Before turning the file into its final contents
+     */
+    beforeSerializeFile?(event: BeforeSerializeFileEvent): any;
+    /**
+     * Turn the file into its final contents (i.e. transpile a bs file, compress a jpeg, etc)
+     */
+    serializeFile?(event: SerializeFileEvent): any;
+    /**
+     * After turning the file into its final contents
+     */
+    afterSerializeFile?(event: AfterSerializeFileEvent): any;
+
+
+    /**
+     * Called before any files are written
+     */
+    beforeWriteProgram?(event: BeforeWriteProgramEvent): any;
+    /**
+     * Called after all files are written
+     */
+    afterWriteProgram?(event: AfterWriteProgramEvent): any;
+
+
+    /**
+     * Before a file is written to disk. These are raw files that contain the final output. One `File` may produce several of these
+     */
+    beforeWriteFile?(event: BeforeWriteFileEvent): any;
+    /**
+     * Called when a file should be persisted (usually writing to storage). These are raw files that contain the final output. One `File` may produce several of these.
+     * When a plugin has handled a file, it should be pushed to the `handledFiles` set so future plugins don't write the file multiple times
+     */
+    writeFile?(event: WriteFileEvent): any;
+    /**
+     * Before a file is written to disk. These are raw files that contain the final output. One `File` may produce several of these
+     */
+    afterWriteFile?(event: AfterWriteFileEvent): any;
+}
+export interface BeforeProvideCodeActionsEvent<TFile extends BscFile = BscFile> {
     program: Program;
-    file: BscFile;
+    file: TFile;
+    range: Range;
+    scopes: Scope[];
+    diagnostics: BsDiagnostic[];
+    codeActions: CodeAction[];
+}
+export interface ProvideCodeActionsEvent<TFile extends BscFile = BscFile> {
+    program: Program;
+    file: TFile;
+    range: Range;
+    scopes: Scope[];
+    diagnostics: BsDiagnostic[];
+    codeActions: CodeAction[];
+}
+export interface AfterProvideCodeActionsEvent<TFile extends BscFile = BscFile> {
+    program: Program;
+    file: TFile;
     range: Range;
     scopes: Scope[];
     diagnostics: BsDiagnostic[];
     codeActions: CodeAction[];
 }
 
+export interface BeforeProvideProgramEvent {
+    builder: ProgramBuilder;
+    program?: Program;
+}
+export interface ProvideProgramEvent {
+    builder: ProgramBuilder;
+    program?: Program;
+}
+export interface AfterProvideProgramEvent {
+    builder: ProgramBuilder;
+    program: Program;
+}
+
+export interface BeforeValidateProgramEvent {
+    program: Program;
+}
+export type ValidateProgramEvent = BeforeValidateProgramEvent;
+export interface AfterValidateProgramEvent extends BeforeValidateProgramEvent {
+    /**
+     * Was the validation cancelled? Will be false if the validation was completed
+     */
+    wasCancelled: boolean;
+}
+
 export interface OnGetSourceFixAllCodeActionsEvent {
     program: Program;
     file: BscFile;
@@ -384,9 +605,14 @@ export interface OnGetSourceFixAllCodeActionsEvent {
     actions: SourceFixAllCodeAction[];
 }
 
+
 export interface ProvideCompletionsEvent<TFile extends BscFile = BscFile> {
     program: Program;
     file: TFile;
+    /**
+     * The scopes this file is a member of. If the file is a member of no scopes, this will be an empty array.
+     * Plugins can use `event.program.globalScope` if the file is not a member of any scopes
+     */
     scopes: Scope[];
     position: Position;
     completions: CompletionItem[];
@@ -394,6 +620,13 @@ export interface ProvideCompletionsEvent<TFile extends BscFile = BscFile> {
 export type BeforeProvideCompletionsEvent<TFile extends BscFile = BscFile> = ProvideCompletionsEvent<TFile>;
 export type AfterProvideCompletionsEvent<TFile extends BscFile = BscFile> = ProvideCompletionsEvent<TFile>;
 
+export interface BeforeBuildProgramEvent {
+    program: Program;
+    files: BscFile[];
+    editor: Editor;
+}
+export type AfterBuildProgramEvent = BeforeBuildProgramEvent;
+
 export interface ProvideHoverEvent {
     program: Program;
     file: BscFile;
@@ -419,6 +652,49 @@ export interface Hover {
 export type BeforeProvideHoverEvent = ProvideHoverEvent;
 export type AfterProvideHoverEvent = ProvideHoverEvent;
 
+export interface BeforeProvideScopeEvent {
+    program: Program;
+    scope: Scope;
+}
+export interface ProvideScopeEvent {
+    program: Program;
+    scope: Scope;
+}
+export interface AfterProvideScopeEvent {
+    program: Program;
+    scope: Scope;
+}
+export interface BeforeRemoveProgramEvent {
+    program: Program;
+}
+export interface RemoveScopeEvent {
+    program: Program;
+    scope: Scope;
+}
+export interface AfterRemoveScopeEvent {
+    program: Program;
+    scope: Scope;
+}
+export interface BeforeValidateScopeEvent {
+    program: Program;
+    scope: Scope;
+}
+export type AfterValidateScopeEvent = BeforeValidateScopeEvent;
+
+export interface BeforeFileParseEvent {
+    program: Program;
+    srcPath: string;
+    source: string;
+}
+export interface OnFileParseEvent {
+    program: Program;
+    srcPath: string;
+    source: string;
+}
+export interface AfterFileParseEvent {
+    program: Program;
+    file: BscFile;
+}
 export interface ProvideDefinitionEvent<TFile = BscFile> {
     program: Program;
     /**
@@ -482,27 +758,25 @@ export type BeforeProvideWorkspaceSymbolsEvent = ProvideWorkspaceSymbolsEvent;
 export type AfterProvideWorkspaceSymbolsEvent = ProvideWorkspaceSymbolsEvent;
 
 
-export interface ProvideSelectionRangesEvent<TFile = BscFile> {
+export interface BeforeProvideSemanticTokensEvent<T extends BscFile = BscFile> {
+    /**
+     * The program this file is from
+     */
     program: Program;
     /**
-     * The file that the `selectionRange` request was invoked in
+     * The file to get semantic tokens for
      */
-    file: TFile;
+    file: T;
     /**
-     * The list of positions for which selection ranges are requested
+     * The list of scopes that this file is a member of
      */
-    positions: Position[];
+    scopes: Scope[];
     /**
-     * The result list of selection ranges. One entry per position in `positions`.
-     * Each SelectionRange is a linked list from innermost to outermost via the `.parent` property.
+     * The list of semantic tokens being produced during this event.
      */
-    selectionRanges: SelectionRange[];
+    semanticTokens: SemanticToken[];
 }
-export type BeforeProvideSelectionRangesEvent<TFile = BscFile> = ProvideSelectionRangesEvent<TFile>;
-export type AfterProvideSelectionRangesEvent<TFile = BscFile> = ProvideSelectionRangesEvent<TFile>;
-
-
-export interface OnGetSemanticTokensEvent<T extends BscFile = BscFile> {
+export interface ProvideSemanticTokensEvent<T extends BscFile = BscFile> {
     /**
      * The program this file is from
      */
@@ -520,34 +794,74 @@ export interface OnGetSemanticTokensEvent<T extends BscFile = BscFile> {
      */
     semanticTokens: SemanticToken[];
 }
-
-export interface BeforeFileValidateEvent<T extends BscFile = BscFile> {
+export interface AfterProvideSemanticTokensEvent<T extends BscFile = BscFile> {
+    /**
+     * The program this file is from
+     */
     program: Program;
+    /**
+     * The file to get semantic tokens for
+     */
     file: T;
+    /**
+     * The list of scopes that this file is a member of
+     */
+    scopes: Scope[];
+    /**
+     * The list of semantic tokens being produced during this event.
+     */
+    semanticTokens: SemanticToken[];
 }
 
-export interface OnFileValidateEvent<T extends BscFile = BscFile> {
+export interface ProvideSelectionRangesEvent<TFile = BscFile> {
+    program: Program;
+    /**
+     * The file that the `selectionRange` request was invoked in
+     */
+    file: TFile;
+    /**
+     * The list of positions for which selection ranges are requested
+     */
+    positions: Position[];
+    /**
+     * The result list of selection ranges. One entry per position in `positions`.
+     * Each SelectionRange is a linked list from innermost to outermost via the `.parent` property.
+     */
+    selectionRanges: SelectionRange[];
+}
+export type BeforeProvideSelectionRangesEvent<TFile = BscFile> = ProvideSelectionRangesEvent<TFile>;
+export type AfterProvideSelectionRangesEvent<TFile = BscFile> = ProvideSelectionRangesEvent<TFile>;
+
+export type BeforeValidateFileEvent = ValidateFileEvent;
+export interface ValidateFileEvent<T extends BscFile = BscFile> {
     program: Program;
     file: T;
 }
+export type AfterValidateFileEvent<T extends BscFile = BscFile> = ValidateFileEvent;
 
-export interface OnScopeValidateEvent {
+export interface ValidateFileEvent<T extends BscFile = BscFile> {
     program: Program;
-    scope: Scope;
+    file: T;
 }
+export interface TranspileEntry {
+    file: BscFile;
+    outputPath: string;
+}
+
 
-export type Editor = Pick<AstEditor, 'addToArray' | 'hasChanges' | 'removeFromArray' | 'setArrayValue' | 'setProperty' | 'overrideTranspileResult' | 'arrayPop' | 'arrayPush' | 'arrayShift' | 'arraySplice' | 'arrayUnshift' | 'removeProperty' | 'edit'>;
+export interface ScopeValidationOptions {
+    filesToBeValidatedInScopeContext?: Set<BscFile>;
+    changedSymbols?: Map<SymbolTypeFlag, Set<string>>;
+    changedFiles?: BscFile[];
+    force?: boolean;
+    initialValidation?: boolean;
+}
 
-export interface BeforeFileTranspileEvent<TFile extends BscFile = BscFile> {
+export interface ValidateScopeEvent {
     program: Program;
-    file: TFile;
-    outputPath: string;
-    /**
-     * An editor that can be used to transform properties or arrays. Once the `afterFileTranspile` event has fired, these changes will be reverted,
-     * restoring the objects to their prior state. This is useful for changing code right before a file gets transpiled, but when you don't want
-     * the changes to persist in the in-memory file.
-     */
-    editor: Editor;
+    scope: Scope;
+    changedFiles?: BscFile[];
+    changedSymbols?: Map<SymbolTypeFlag, Set<string>>;
 }
 
 export interface AfterFileTranspileEvent<TFile extends BscFile = BscFile> {
@@ -564,23 +878,188 @@ export interface AfterFileTranspileEvent<TFile extends BscFile = BscFile> {
     /**
      * The sourceMaps for the generated code (if emitting source maps is enabled)
      */
-    map?: SourceMapGenerator;
+    map?: string;
     /**
      * The generated type definition file contents (if emitting type definitions are enabled)
      */
     typedef?: string;
+}
+
+export type BeforeProvideFileEvent<TFile extends BscFile = BscFile> = ProvideFileEvent<TFile>;
+export interface ProvideFileEvent<TFile extends BscFile = BscFile> {
+    /**
+     * The lower-case file extension for the srcPath. (i.e. ".brs", ".xml")
+     */
+    srcExtension: string;
     /**
-     * An editor that can be used to transform properties or arrays. Once the `afterFileTranspile` event has fired, these changes will be reverted,
-     * restoring the objects to their prior state. This is useful for changing code right before a file gets transpiled, but when you don't want
-     * the changes to persist in the in-memory file.
+     * The srcPath for the file. (i.e. `/user/bob/projects/VideoApp/source/main.bs`)
      */
+    srcPath: string;
+    /**
+     * The destPath for the file. (i.e. for `/user/bob/projects/VideoApp/source/main.bs`, destPath would be `source/main.bs`)
+     */
+    destPath: string;
+
+    /**
+     * A lazy-loading container for this file's data. Call `.get()` to lazy load the data, and `.set()` to override file contents
+     */
+    data: LazyFileData;
+
+    /**
+     * An array of files that should be added to the program as a result of this event
+     */
+    files: TFile[];
+    /**
+     * The program for this event
+     */
+    program: Program;
+    /**
+     * A factory used to create new instances of the BrighterScript built-in file types. This mitigates the issue
+     * of a plugin's version of a File not being the same as the LanguageServer or CLI version of BrighterScript
+     * (due to npm installing multiple versions of brighterscript)
+     */
+    fileFactory: FileFactory;
+}
+export type AfterProvideFileEvent<TFile extends BscFile = BscFile> = ProvideFileEvent<TFile>;
+
+export interface BeforeAddFileEvent<TFile extends BscFile = BscFile> {
+    file: TFile;
+    program: Program;
+}
+export type AfterAddFileEvent<TFile extends BscFile = BscFile> = BeforeAddFileEvent<TFile>;
+
+export interface BeforeRemoveFileEvent<TFile extends BscFile = BscFile> {
+    file: TFile;
+    program: Program;
+}
+export type AfterRemoveFileEvent<TFile extends BscFile = BscFile> = BeforeRemoveFileEvent<TFile>;
+
+export type BeforePrepareProgramEvent = PrepareProgramEvent;
+/**
+ * Event for when the program prepares itself for building
+ */
+export interface PrepareProgramEvent {
+    program: Program;
     editor: Editor;
+    files: BscFile[];
+}
+export type AfterPrepareProgramEvent = PrepareProgramEvent;
+
+
+export type BeforePrepareFileEvent<TFile extends BscFile = BscFile> = PrepareFileEvent<TFile>;
+/**
+ * Prepare the file for building
+ */
+export interface PrepareFileEvent<TFile extends BscFile = BscFile> {
+    program: Program;
+    file: TFile;
+    editor: Editor;
+    /**
+     * The scope that was linked for this event. A file may be included in multiple scopes, but we choose the most relevant scope.
+     * Plugins may unlink this scope and link another one, but must then reassign this property to that new scope so that other
+     * plugins can reference it.
+     */
+    scope: Scope;
+}
+export type OnPrepareFileEvent<TFile extends BscFile = BscFile> = PrepareFileEvent<TFile>;
+export type AfterPrepareFileEvent<TFile extends BscFile = BscFile> = PrepareFileEvent<TFile>;
+
+
+/**
+ * A container that holds the code, map, and typedef for serialized code files.
+ */
+export interface SerializedCodeFile {
+    code?: string;
+    map?: string;
+    typedef?: string;
+}
+
+export interface BeforeSerializeProgramEvent {
+    program: Program;
+    files: BscFile[];
+    result: Map<BscFile, SerializedFile[]>;
 }
+export type SerializeProgramEvent = BeforeSerializeProgramEvent;
+export type AfterSerializeProgramEvent = BeforeSerializeProgramEvent;
 
-export interface BeforeProgramDisposeEvent {
+/**
+ * During the `SerializeFile` events, this is how plugins will contribute file data for a specific file
+ */
+export interface SerializedFile {
+    /**
+     * The raw data for this file (i.e. a binary buffer for a .jpeg file, or the transpiled code for a .bs file)
+     */
+    data: Buffer;
+    /**
+     * The pkgPath for this chunk of data.
+     */
+    pkgPath: string;
+}
+
+export type BeforeSerializeFileEvent<TFile extends BscFile = BscFile> = SerializeFileEvent<TFile>;
+export interface SerializeFileEvent<TFile extends BscFile = BscFile> {
+    program: Program;
+    file: TFile;
+    /**
+     * The scope that was linked for this event. A file may be included in multiple scopes, but we choose the most relevant scope.
+     * Plugins may unlink this scope and link another one, but must then reassign this property to that new scope so that other
+     * plugins can reference it.
+     */
+    scope: Scope;
+    /**
+     * The list of all files created across all the `SerializeFile` events.
+     * The key is the pkgPath of the file, and the
+     */
+    result: Map<TFile, SerializedFile[]>;
+}
+export type AfterSerializeFileEvent<TFile extends BscFile = BscFile> = SerializeFileEvent<TFile>;
+
+
+export interface BeforeWriteProgramEvent {
+    program: Program;
+    outDir: string;
+    files: Map<BscFile, SerializedFile[]>;
+}
+export type AfterWriteProgramEvent = BeforeWriteProgramEvent;
+
+
+export type BeforeWriteFileEvent = WriteFileEvent;
+export interface WriteFileEvent {
     program: Program;
+    file: SerializedFile;
+    /**
+     * The full path to where the file was (or will be) written to.
+     */
+    outputPath: string;
+    /**
+     * A set of all files that have been properly written. Plugins should add any handled files to this list so future plugins don't write then again
+     */
+    processedFiles: Set<SerializedFile>;
 }
+export type AfterWriteFileEvent = BeforeWriteFileEvent;
 
+export interface TranspileObj {
+    file: BscFile;
+    /**
+     * The absolute path to where the file should be written during build. (i.e. somewhere inside the outDir)
+     */
+    outputPath: string;
+}
+
+export interface BeforeFileDisposeEvent {
+    program: Program;
+    file: BscFile;
+}
+export type AfterFileDisposeEvent = BeforeFileDisposeEvent;
+export interface BeforeRemoveProgramEvent {
+    program: Program;
+}
+export interface RemoveProgramEvent {
+    program: Program;
+}
+export interface AfterRemoveProgramEvent {
+    program: Program;
+}
 export interface SemanticToken {
     range: Range;
     tokenType: SemanticTokenTypes;
@@ -603,7 +1082,7 @@ export type TranspileResult = Array<(string | SourceNode | TranspileResult)>;
  */
 export type FlattenedTranspileResult = Array<string | SourceNode>;
 
-export type FileResolver = (srcPath: string) => string | undefined | Thenable<string | undefined> | void;
+export type FileResolver = (srcPath: string) => string | Buffer | undefined | Thenable<string | Buffer | undefined> | void;
 
 export interface ExpressionInfo {
     expressions: Expression[];
@@ -618,6 +1097,187 @@ export interface FileLink<T> {
     file: BrsFile;
 }
 
+export interface ExtraSymbolData {
+    /**
+     * What AST node defined this symbol?
+     */
+    definingNode?: AstNode;
+    /**
+     * Description of this symbol
+     */
+    description?: string;
+    /**
+     * the higher the number, the lower the priority
+     */
+    completionPriority?: number;
+    /**
+     * Flags for this symbol
+     */
+    flags?: SymbolTypeFlag;
+    /**
+     * this symbol comes from an ancestor symbol table
+     */
+    memberOfAncestor?: boolean;
+    /**
+     * Do not merge this symbol when merging symbol tables
+     */
+    doNotMerge?: boolean;
+    /**
+     * is this symbol an alias?
+     */
+    isAlias?: boolean;
+    /**
+     * Is this symbol an instance of the type.
+     *
+     * `true` means `true`, and `false` or `undefined` means `false`,
+     *
+     * so check for `=== true` or `!== true`
+     */
+    isInstance?: boolean;
+    /**
+     * Is this type as defined in a doc comment?
+     */
+    isFromDocComment?: boolean;
+    /**
+     * Is this symbol built in to Brightscript?
+     */
+    isBuiltIn?: boolean;
+    /**
+     * Was this a result of a callfunc?
+     */
+    isFromCallFunc?: boolean;
+    /**
+     * Is this type created from a type statement - eg. is it a nickname for another type?
+     */
+    isFromTypeStatement?: boolean;
+}
+
+export interface GetTypeOptions {
+    flags: SymbolTypeFlag;
+    typeChain?: TypeChainEntry[];
+    data?: ExtraSymbolData;
+    /**
+     * get the type of this expression, NOT its return type
+     */
+    ignoreCall?: boolean;
+    onlyCacheResolvedTypes?: boolean;
+    ignoreCacheForRetrieval?: boolean;
+    isExistenceTest?: boolean;
+    preferDocType?: boolean;
+    /**
+     * For narrowing the type, which statement are we concerned with in the current block?
+     */
+    statementIndex?: number | 'end';
+    ignoreParentTables?: boolean;
+    /**
+     * If this is true, AA's, objects, nodes, etc, do not return dynamic if no member is found
+     */
+    ignoreDefaultDynamicMembers?: boolean;
+}
+
+export class TypeChainEntry {
+    constructor(options: {
+        name: string;
+        type: BscType;
+        data: ExtraSymbolData;
+        location?: Location;
+        separatorToken?: Token;
+        astNode: AstNode;
+    }) {
+        this.name = options.name;
+        // make a copy of this data
+        this.data = { ...options.data };
+        this.type = options.type;
+        this._location = options.location;
+        this.separatorToken = options.separatorToken ?? createToken(TokenKind.Dot);
+        this.astNode = options.astNode;
+        this.isResolved = this.type?.isResolvable();
+    }
+
+    get location(): Location {
+        return this._location ?? this.astNode?.location;
+    }
+
+    public readonly name: string;
+    public readonly type: BscType;
+    public readonly data: ExtraSymbolData;
+    private readonly _location: Location;
+    public readonly separatorToken: Token;
+    public isResolved: boolean;
+    public astNode: AstNode;
+}
+
+export interface TypeChainProcessResult {
+    /**
+     * The name of the last item in the chain, OR the first unresolved item in the chain
+     */
+    itemName: string;
+    /**
+     * The TypeKind of the item of `itemName`
+     */
+    itemTypeKind: BscTypeKind | string;
+    /**
+     * The name of the parent of the item of `itemName`
+     */
+    itemParentTypeName: string;
+    /**
+     * The TypeKind of the parent of the item of `itemName`
+     */
+    itemParentTypeKind: BscTypeKind | string;
+    /**
+     * The complete chain leading up to the item of `itemName`
+     */
+    fullNameOfItem: string;
+    /**
+     * The complete chain (even including unresolved items)
+     */
+    fullChainName: string;
+    /**
+     * the range of the first unresolved item
+     */
+    location: Location;
+    /**
+     * Does the chain contain a dynamic type?
+     */
+    containsDynamic: boolean;
+    /**
+     * The AstNode of the item
+     */
+    astNode: AstNode;
+    /**
+     * Does the chain contain a type that crossed a callFunc boundary?
+     */
+    crossedCallFunc: boolean;
+}
+
+export interface TypeCircularReferenceInfo {
+    isCircularReference: boolean;
+    referenceChainNames?: string[];
+}
+
+export interface TypeCompatibilityData {
+    missingFields?: { name: string; expectedType: BscType }[];
+    fieldMismatches?: { name: string; expectedType: BscType; actualType: BscType }[];
+    parameterMismatches?: { index: number; expectedOptional?: boolean; actualOptional?: boolean; data: TypeCompatibilityData }[];
+    returnTypeMismatch?: TypeCompatibilityData;
+    expectedParamCount?: number;
+    actualParamCount?: number;
+    expectedVariadic?: boolean;
+    actualVariadic?: boolean;
+    depth?: number;
+    // override for diagnostic message - useful for Arrays with different default types
+    actualType?: BscType;
+    expectedType?: BscType;
+    allowNameEquality?: boolean;
+    unresolveableTarget?: string;
+}
+
+/**
+ * Use Writable<T> to remove readonly flag from properties in T
+ * Be careful!
+ */
+export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
+export type DeepWriteable<T> = { -readonly [P in keyof T]: DeepWriteable<T[P]> };
 export type DisposableLike = Disposable | (() => any);
 
 export type MaybePromise<T> = T | Promise<T>;
diff --git a/src/lexer/Lexer.spec.ts b/src/lexer/Lexer.spec.ts
index 6dfaf2c3f..f84cb1e7c 100644
--- a/src/lexer/Lexer.spec.ts
+++ b/src/lexer/Lexer.spec.ts
@@ -1,12 +1,13 @@
 /* eslint no-template-curly-in-string: 0 */
 import { expect } from '../chai-config.spec';
 
-import { TokenKind } from './TokenKind';
+import { AllowedTriviaTokens, TokenKind } from './TokenKind';
 import { Lexer } from './Lexer';
+import type { Token } from './Token';
 import { isToken } from './Token';
 import { rangeToArray } from '../parser/Parser.spec';
 import { Range } from 'vscode-languageserver';
-import util from '../util';
+import { DiagnosticMessages } from '../DiagnosticMessages';
 
 describe('lexer', () => {
     it('recognizes the `const` keyword', () => {
@@ -133,7 +134,6 @@ describe('lexer', () => {
         expect(tokens.map(t => t.kind)).to.deep.equal([
             TokenKind.Newline,
             TokenKind.Newline,
-            TokenKind.Comment,
             TokenKind.Newline,
             TokenKind.Newline,
             TokenKind.Newline,
@@ -169,12 +169,12 @@ describe('lexer', () => {
 
     it('computes range properly both with and without whitespace', () => {
         let withoutWhitespace = Lexer.scan(`sub Main()\n    bob = true\nend sub`).tokens
-            .map(x => rangeToArray(x.range));
+            .map(x => rangeToArray(x.location?.range));
 
         let withWhitespace = Lexer.scan(`sub Main()\n    bob = true\nend sub`).tokens
             //filter out the whitespace...we only care that it was computed during the scan
             .filter(x => x.kind !== TokenKind.Whitespace)
-            .map(x => rangeToArray(x.range));
+            .map(x => rangeToArray(x.location?.range));
 
         /*eslint-disable */
         let expectedLocations = [
@@ -234,12 +234,32 @@ describe('lexer', () => {
     });
 
     describe('comments', () => {
-        it('does not include carriage return character', () => {
+        it('are not included in output', () => {
+            let kinds = Lexer.scan(`
+                'comment
+                REM some comment
+                print 1 ' comment after
+            `).tokens
+                .map(x => x.kind);
+
+            expect(kinds.length).to.eq(7);
+            expect(kinds).to.eql([
+                TokenKind.Newline,
+                TokenKind.Newline,
+                TokenKind.Newline,
+                TokenKind.Print,
+                TokenKind.IntegerLiteral,
+                TokenKind.Newline,
+                TokenKind.Eof
+            ]);
+        });
+
+        it('do not remove Newline token from output', () => {
             let tokens = Lexer.scan(`'someComment\r\nprint "hello"`).tokens;
-            expect(tokens[0].text).to.equal(`'someComment`);
+            expect(tokens[0].kind).to.equal(TokenKind.Newline);
         });
 
-        it('includes the comment characters in the text', () => {
+        it('includes no comment characters in the text', () => {
             let text = Lexer.scan(`
                 'comment
                 REM some comment
@@ -247,10 +267,7 @@ describe('lexer', () => {
                 .filter(x => ![TokenKind.Newline, TokenKind.Eof].includes(x.kind))
                 .map(x => x.text);
 
-            expect(text).to.eql([
-                `'comment`,
-                'REM some comment'
-            ]);
+            expect(text).to.eql([]);
         });
 
         it('tracks the correct location', () => {
@@ -261,7 +278,7 @@ describe('lexer', () => {
                 end sub
             `, {
                 includeWhitespace: true
-            }).tokens.map(x => [...rangeToArray(x.range), x.text]);
+            }).tokens.map(x => [...rangeToArray(x.location?.range), x.text]);
 
             expect(tokens).to.eql([
                 [0, 0, 0, 1, '\n'],
@@ -272,7 +289,7 @@ describe('lexer', () => {
                 [1, 24, 1, 25, '('],
                 [1, 25, 1, 26, ')'],
                 [1, 26, 1, 27, ' '],
-                [1, 27, 1, 41, `'first comment`],
+                //  skip `'first comment`
                 [1, 41, 1, 42, '\n'],
                 [2, 0, 2, 20, '                    '],
                 [2, 20, 2, 21, 'k'],
@@ -281,10 +298,10 @@ describe('lexer', () => {
                 [2, 23, 2, 24, ' '],
                 [2, 24, 2, 25, '2'],
                 [2, 25, 2, 26, ' '],
-                [2, 26, 2, 42, `' second comment`],
+                //  skip `' second comment`
                 [2, 42, 2, 43, '\n'],
                 [3, 0, 3, 20, '                    '],
-                [3, 20, 3, 37, 'REM third comment'],
+                //  skip `REM third comment`
                 [3, 37, 3, 38, '\n'],
                 [4, 0, 4, 16, '                '],
                 [4, 16, 4, 23, 'end sub'],
@@ -294,27 +311,12 @@ describe('lexer', () => {
             ]);
         });
 
-        it('tracks the correct location for comments', () => {
-            let tokens = Lexer.scan(`
-                'comment
-                REM some comment
-            `).tokens.filter(x => ![TokenKind.Newline, TokenKind.Eof].includes(x.kind));
-
-            expect(tokens[0].range).to.eql(
-                Range.create(1, 16, 1, 24)
-            );
-
-            expect(tokens[1].range).to.eql(
-                Range.create(2, 16, 2, 32)
-            );
-        });
-
         it('finds correct location for newlines', () => {
             let tokens = Lexer.scan('sub\nsub\r\nsub\n\n').tokens
                 //ignore the Eof token
                 .filter(x => x.kind !== TokenKind.Eof);
 
-            expect(tokens.map(x => x.range)).to.eql([
+            expect(tokens.map(x => x.location?.range)).to.eql([
                 Range.create(0, 0, 0, 3), // sub
                 Range.create(0, 3, 0, 4), // \n
                 Range.create(1, 0, 1, 3), // sub
@@ -324,37 +326,20 @@ describe('lexer', () => {
                 Range.create(3, 0, 3, 1) //  /n
             ]);
         });
-        it('finds correct location for comment after if statement', () => {
-            let { tokens } = Lexer.scan(`
-                sub a()
-                    if true then
-                        print false
-                    else if true then
-                        print "true"
-                    else
-                        print "else"
-                    end if 'comment
-                end sub
-            `);
-            let comments = tokens.filter(x => x.kind === TokenKind.Comment);
-            expect(comments).to.be.lengthOf(1);
-            expect(comments[0].range).to.eql(
-                Range.create(8, 27, 8, 35)
-            );
-        });
+
         it('ignores everything after `\'`', () => {
             let { tokens } = Lexer.scan('= \' (');
-            expect(tokens.map(t => t.kind)).to.deep.equal([TokenKind.Equal, TokenKind.Comment, TokenKind.Eof]);
+            expect(tokens.map(t => t.kind)).to.deep.equal([TokenKind.Equal, TokenKind.Eof]);
         });
 
         it('ignores everything after `REM`', () => {
             let { tokens } = Lexer.scan('= REM (');
-            expect(tokens.map(t => t.kind)).to.deep.equal([TokenKind.Equal, TokenKind.Comment, TokenKind.Eof]);
+            expect(tokens.map(t => t.kind)).to.deep.equal([TokenKind.Equal, TokenKind.Eof]);
         });
 
         it('ignores everything after `rem`', () => {
             let { tokens } = Lexer.scan('= rem (');
-            expect(tokens.map(t => t.kind)).to.deep.equal([TokenKind.Equal, TokenKind.Comment, TokenKind.Eof]);
+            expect(tokens.map(t => t.kind)).to.deep.equal([TokenKind.Equal, TokenKind.Eof]);
         });
     }); // comments
 
@@ -444,7 +429,7 @@ describe('lexer', () => {
         it('disallows multiline strings', () => {
             let { diagnostics } = Lexer.scan(`"multi-line\n\n`);
             expect(diagnostics.map(err => err.message)).to.deep.equal([
-                'Unterminated string at end of line'
+                DiagnosticMessages.unterminatedString().message
             ]);
         });
     });
@@ -737,7 +722,7 @@ describe('lexer', () => {
             );
             expect(tokens.map(x => {
                 return {
-                    range: x.range,
+                    range: x.location?.range,
                     kind: x.kind
                 };
             })).to.eql([
@@ -963,7 +948,7 @@ describe('lexer', () => {
         it('matches single-word keywords', () => {
             // test just a sample of single-word reserved words for now.
             // if we find any that we've missed
-            let { tokens } = Lexer.scan('and then or if else endif return true false line_num');
+            let { tokens } = Lexer.scan('and then or if else endif return true false line_num exitwhile');
             expect(tokens.map(w => w.kind)).to.deep.equal([
                 TokenKind.And,
                 TokenKind.Then,
@@ -975,6 +960,7 @@ describe('lexer', () => {
                 TokenKind.True,
                 TokenKind.False,
                 TokenKind.LineNumLiteral,
+                TokenKind.ExitWhile,
                 TokenKind.Eof
             ]);
         });
@@ -986,7 +972,8 @@ describe('lexer', () => {
                 TokenKind.EndWhile,
                 TokenKind.EndSub,
                 TokenKind.EndFunction,
-                TokenKind.ExitWhile,
+                TokenKind.Exit,
+                TokenKind.While,
                 TokenKind.Eof
             ]);
         });
@@ -994,7 +981,8 @@ describe('lexer', () => {
         it('accepts \'exit for\' but not \'exitfor\'', () => {
             let { tokens } = Lexer.scan('exit for exitfor');
             expect(tokens.map(w => w.kind)).to.deep.equal([
-                TokenKind.ExitFor,
+                TokenKind.Exit,
+                TokenKind.For,
                 TokenKind.Identifier,
                 TokenKind.Eof
             ]);
@@ -1193,7 +1181,7 @@ describe('lexer', () => {
     describe('location tracking', () => {
         it('tracks starting and ending locations including whitespace', () => {
             let { tokens } = Lexer.scan(`sub foo()\n    print "bar"\r\nend sub`, { includeWhitespace: true });
-            expect(tokens.map(t => t.range)).to.eql([
+            expect(tokens.map(t => t.location?.range)).to.eql([
                 Range.create(0, 0, 0, 3), // sub
                 Range.create(0, 3, 0, 4), // <space>
                 Range.create(0, 4, 0, 7), // foo
@@ -1212,7 +1200,7 @@ describe('lexer', () => {
 
         it('tracks starting and ending locations excluding whitespace', () => {
             let { tokens } = Lexer.scan(`sub foo()\n    print "bar"\r\nend sub`, { includeWhitespace: false });
-            expect(tokens.map(t => t.range)).to.eql([
+            expect(tokens.map(t => t.location?.range)).to.eql([
                 Range.create(0, 0, 0, 3), // sub
                 Range.create(0, 4, 0, 7), // foo
                 Range.create(0, 7, 0, 8), // (
@@ -1257,7 +1245,7 @@ describe('lexer', () => {
         ]);
 
         //verify the location of `rem`
-        expect(tokens.map(t => [t.range.start.character, t.range.end.character])).to.eql([
+        expect(tokens.map(t => [t.location?.range.start.character, t.location?.range.end.character])).to.eql([
             [0, 6], // person
             [6, 7], // .
             [7, 10], // rem
@@ -1349,6 +1337,17 @@ describe('lexer', () => {
     });
 
     it('properly tracks leadingWhitespace', () => {
+        /**
+         * Convert a list of tokens into a string, including their leading whitespace
+         */
+        function tokensToString(tokens: Token[]) {
+            let result = '';
+            //skip iterating the final token
+            for (let token of tokens) {
+                result += token.leadingWhitespace + token.text;
+            }
+            return result;
+        }
         const text = `
             sub main()
 
@@ -1357,7 +1356,7 @@ describe('lexer', () => {
             end sub
         `;
         const { tokens } = Lexer.scan(text, { includeWhitespace: false });
-        expect(util.tokensToString(tokens)).to.equal(text);
+        expect(tokensToString(tokens)).to.equal(text);
     });
 
     it('properly detects try/catch tokens', () => {
@@ -1388,7 +1387,6 @@ describe('lexer', () => {
                 /simple/,
                 /SimpleWithValidFlags/g,
                 /UnknownFlags/gi,
-                /with spaces/s,
                 /with(parens)and[squarebraces]/,
                 //lots of special characters
                 /.*()^$@/,
@@ -1452,6 +1450,63 @@ describe('lexer', () => {
             TokenKind.Eof
         ]);
     });
+
+    describe('trivia', () => {
+        function stringify(tokens: Token[]) {
+            return tokens
+                //exclude the explicit triva tokens since they'll be included in the leading/trailing arrays
+                .filter(x => !AllowedTriviaTokens.includes(x.kind))
+                .flatMap(x => [...x.leadingTrivia, x])
+                .map(x => x.text)
+                .join('');
+        }
+
+        it('combining token text and trivia can reproduce full input', () => {
+            const input = `
+                function   test(  )
+                    'comment
+                    print   alpha   '  blabla
+                end function 'trailing
+                'trailing2
+            `;
+            expect(
+                stringify(
+                    Lexer.scan(input).tokens
+                )
+            ).to.eql(input);
+        });
+
+        function expectTrivia(text: string, expected: Array<{ text: string; leadingTrivia?: string[]; trailingTrivia?: string[] }>) {
+            const tokens = Lexer.scan(text).tokens.filter(x => !AllowedTriviaTokens.includes(x.kind));
+            expect(
+                tokens.map(x => {
+                    return {
+                        text: x.text,
+                        leadingTrivia: x.leadingTrivia.map(x => x.text)
+                    };
+                })
+            ).to.eql(
+                expected.map(x => ({
+                    leadingTrivia: [],
+                    ...x
+                }))
+            );
+        }
+
+        it('associates trailing items on same line with the preceeding token', () => {
+            expectTrivia(
+                `'leading\n` +
+                `alpha = true 'trueComment\n` +
+                `'eof`
+                , [
+                    { leadingTrivia: [`'leading`, `\n`], text: `alpha` },
+                    { leadingTrivia: [` `], text: `=` },
+                    { leadingTrivia: [` `], text: `true` },
+                    //EOF
+                    { leadingTrivia: [` `, `'trueComment`, `\n`, `'eof`], text: `` }
+                ]);
+        });
+    });
 });
 
 function expectKinds(text: string, tokenKinds: TokenKind[]) {
diff --git a/src/lexer/Lexer.ts b/src/lexer/Lexer.ts
index 6f45df185..a0ac4b573 100644
--- a/src/lexer/Lexer.ts
+++ b/src/lexer/Lexer.ts
@@ -1,10 +1,11 @@
 /* eslint-disable func-names */
-import { TokenKind, ReservedWords, Keywords, PreceedingRegexTypes } from './TokenKind';
+import { TokenKind, ReservedWords, Keywords, PreceedingRegexTypes, AllowedTriviaTokens } from './TokenKind';
 import type { Token } from './Token';
 import { isAlpha, isDecimalDigit, isAlphaNumeric, isHexDigit } from './Characters';
-import type { Range, Diagnostic } from 'vscode-languageserver';
+import type { Location } from 'vscode-languageserver';
 import { DiagnosticMessages } from '../DiagnosticMessages';
 import util from '../util';
+import type { BsDiagnostic } from '../interfaces';
 
 /**
  * Numeric type designators can only be one of these characters
@@ -55,7 +56,7 @@ export class Lexer {
     /**
      * The errors produced from `source.`
      */
-    public diagnostics: Diagnostic[];
+    public diagnostics: BsDiagnostic[];
 
     /**
      * The options used to scan this file
@@ -67,6 +68,16 @@ export class Lexer {
      */
     private leadingWhitespace = '';
 
+    /**
+     * Contains trivia/comments, etc. before this line
+     */
+    private leadingTrivia: Token[] = [];
+
+    /**
+     * URI of the file being scanned (if available)
+     */
+    private uri?: string;
+
     /**
      * A convenience function, equivalent to `new Lexer().scan(toScan)`, that converts a string
      * containing BrightScript code to an array of `Token` objects that will later be used to build
@@ -99,6 +110,7 @@ export class Lexer {
         this.columnEnd = 0;
         this.tokens = [];
         this.diagnostics = [];
+        this.uri = util.pathToUri(options?.srcPath);
         while (!this.isAtEnd()) {
             this.scanToken();
         }
@@ -107,15 +119,23 @@ export class Lexer {
             kind: TokenKind.Eof,
             isReserved: false,
             text: '',
-            range: this.options.trackLocations
-                ? util.createRange(this.lineBegin, this.columnBegin, this.lineEnd, this.columnEnd + 1)
+            location: this.options.trackLocations
+                ? util.createLocation(this.lineBegin, this.columnBegin, this.lineEnd, this.columnEnd + 1, this.uri)
                 : undefined,
-            leadingWhitespace: this.leadingWhitespace
+            leadingWhitespace: this.leadingWhitespace,
+            leadingTrivia: this.leadingTrivia ?? []
         });
         this.leadingWhitespace = '';
         return this;
     }
 
+    /**
+     * Pushes a token into the leadingTrivia list
+     */
+    private pushTrivia(token: Token) {
+        this.leadingTrivia.push(token);
+    }
+
     /**
      * Fill in missing/invalid options with defaults
      */
@@ -375,7 +395,7 @@ export class Lexer {
         } else {
             this.diagnostics.push({
                 ...DiagnosticMessages.unexpectedCharacter(c),
-                range: this.rangeOf()
+                location: this.locationOf()
             });
         }
     }
@@ -488,8 +508,8 @@ export class Lexer {
             if (this.peekNext() === '\n' || this.peekNext() === '\r') {
                 // BrightScript doesn't support multi-line strings
                 this.diagnostics.push({
-                    ...DiagnosticMessages.unterminatedStringAtEndOfLine(),
-                    range: this.rangeOf()
+                    ...DiagnosticMessages.unterminatedString(),
+                    location: this.locationOf()
                 });
                 isUnterminated = true;
                 break;
@@ -501,8 +521,8 @@ export class Lexer {
         if (this.isAtEnd()) {
             // terminating a string with EOF is also not allowed
             this.diagnostics.push({
-                ...DiagnosticMessages.unterminatedStringAtEndOfFile(),
-                range: this.rangeOf()
+                ...DiagnosticMessages.unterminatedString(),
+                location: this.locationOf()
             });
             isUnterminated = true;
         }
@@ -623,7 +643,7 @@ export class Lexer {
 
                     this.diagnostics.push({
                         ...DiagnosticMessages.unexpectedConditionalCompilationString(),
-                        range: this.rangeOf()
+                        location: this.locationOf()
                     });
                 }
 
@@ -766,16 +786,6 @@ export class Lexer {
             this.advance();
         }
 
-        // fractional hex literals aren't valid
-        if (this.peek() === '.' && isHexDigit(this.peekNext())) {
-            this.advance(); // consume the "."
-            this.diagnostics.push({
-                ...DiagnosticMessages.fractionalHexLiteralsAreNotSupported(),
-                range: this.rangeOf()
-            });
-            return;
-        }
-
         if (this.peek() === '&') {
             // literals ending with "&" are forced to LongIntegers
             this.advance();
@@ -987,7 +997,7 @@ export class Lexer {
             default:
                 this.diagnostics.push({
                     ...DiagnosticMessages.unexpectedConditionalCompilationString(),
-                    range: this.rangeOf()
+                    location: this.locationOf()
                 });
         }
     }
@@ -1050,6 +1060,13 @@ export class Lexer {
         return false;
     }
 
+    /**
+     * Determine if this token is a trivia token
+     */
+    private isTrivia(token: Token) {
+        return AllowedTriviaTokens.includes(token.kind);
+    }
+
     /**
      * Creates a `Token` and adds it to the `tokens` array.
      * @param kind the type of token to produce.
@@ -1060,11 +1077,21 @@ export class Lexer {
             kind: kind,
             text: text,
             isReserved: ReservedWords.has(text.toLowerCase()),
-            range: this.rangeOf(),
-            leadingWhitespace: this.leadingWhitespace
+            location: this.locationOf(),
+            leadingWhitespace: this.leadingWhitespace,
+            leadingTrivia: []
         };
+
+        if (this.isTrivia(token)) {
+            this.pushTrivia(token);
+        } else {
+            token.leadingTrivia.push(...this.leadingTrivia);
+            this.leadingTrivia = [];
+        }
         this.leadingWhitespace = '';
-        this.tokens.push(token);
+        if (kind !== TokenKind.Comment) {
+            this.tokens.push(token);
+        }
         this.sync();
         return token;
     }
@@ -1079,12 +1106,12 @@ export class Lexer {
     }
 
     /**
-     * Creates a `Range` at the lexer's current position
-     * @returns the range of `text`
+     * Creates a `Location` at the lexer's current position
+     * @returns the location of `text`
      */
-    private rangeOf(): Range {
+    private locationOf(): Location {
         if (this.options.trackLocations) {
-            return util.createRange(this.lineBegin, this.columnBegin, this.lineEnd, this.columnEnd);
+            return util.createLocation(this.lineBegin, this.columnBegin, this.lineEnd, this.columnEnd, this.uri);
         } else {
             return undefined;
         }
@@ -1102,4 +1129,8 @@ export interface ScanOptions {
      * @default true
      */
     trackLocations?: boolean;
+    /**
+     * Path to the file where this source code originated
+     */
+    srcPath?: string;
 }
diff --git a/src/lexer/Token.ts b/src/lexer/Token.ts
index 94647d1e0..e940cc4b2 100644
--- a/src/lexer/Token.ts
+++ b/src/lexer/Token.ts
@@ -1,30 +1,43 @@
 import { TokenKind } from './TokenKind';
-import type { Range } from 'vscode-languageserver';
+import type { Location } from 'vscode-languageserver';
 
 /**
  * Represents a chunk of BrightScript scanned by the lexer.
  */
 export interface Token {
-    /** The type of token this represents. */
+    /**
+     * The type of token this represents.
+     */
     kind: TokenKind;
-    /** The text found in the original BrightScript source, if any. */
+    /**
+     * The text found in the original BrightScript source, if any.
+     */
     text: string;
-    /** True if this token's `text` is a reserved word, otherwise `false`. */
+    /**
+     * True if this token's `text` is a reserved word, otherwise `false`.
+     *
+     */
     isReserved?: boolean;
-    /** Where the token was found. */
-    range: Range;
+    /**
+     * Where the token was found.
+     */
+    location: Location;
     /**
      * Any leading whitespace found prior to this token. Excludes newline characters.
      */
     leadingWhitespace?: string;
+
+    /**
+     * Any tokens starting on the next line of the previous token, up to the start of this token
+     */
+    leadingTrivia: Token[];
 }
 
 /**
  * Any object that has a range
  */
 export interface Locatable {
-    range: Range;
-    [key: string]: any;
+    location: Location;
 }
 
 /**
@@ -39,8 +52,8 @@ export interface Identifier extends Token {
  * @param obj the object to check for `Token`-ness
  * @returns `true` is `obj` is a `Token`, otherwise `false`
  */
-export function isToken(obj: any): obj is Token {
-    return !!(obj.kind && obj.text);
+export function isToken(obj: Record<string, any>): obj is Token {
+    return !!(obj?.kind && (obj.text || obj.kind === TokenKind.Eof));
 }
 
 /**
diff --git a/src/lexer/TokenKind.ts b/src/lexer/TokenKind.ts
index 21b40a481..9603afc61 100644
--- a/src/lexer/TokenKind.ts
+++ b/src/lexer/TokenKind.ts
@@ -1,3 +1,5 @@
+import type { Token } from './Token';
+
 export enum TokenKind {
     // parens (and friends)
     LeftParen = 'LeftParen', // (
@@ -108,7 +110,6 @@ export enum TokenKind {
     EndWhile = 'EndWhile',
     Eval = 'Eval',
     Exit = 'Exit',
-    ExitFor = 'ExitFor', // not technically a reserved word, but definitely a tokenKind
     ExitWhile = 'ExitWhile',
     False = 'False',
     For = 'For',
@@ -119,6 +120,7 @@ export enum TokenKind {
     GetLastRunRunTimeError = 'GetLastRunRunTimeError',
     Goto = 'Goto',
     If = 'If',
+    In = 'In',
     Let = 'Let',
     Next = 'Next',
     Not = 'Not',
@@ -270,9 +272,7 @@ export const Keywords: Record<string, TokenKind> = {
     endwhile: TokenKind.EndWhile,
     'end while': TokenKind.EndWhile,
     exit: TokenKind.Exit,
-    'exit for': TokenKind.ExitFor, // note: 'exitfor' (no space) is *not* a keyword
     exitwhile: TokenKind.ExitWhile,
-    'exit while': TokenKind.ExitWhile,
     false: TokenKind.False,
     for: TokenKind.For,
     'for each': TokenKind.ForEach, // note: 'foreach' (no space) is *not* a keyword
@@ -350,6 +350,21 @@ export type BlockTerminator =
     | TokenKind.Catch
     | TokenKind.EndTry;
 
+/** Set of keywords that end non-conditional compilation blocks. */
+export const BlockTerminators = [
+    TokenKind.Else,
+    TokenKind.EndFor,
+    TokenKind.Next,
+    TokenKind.EndIf,
+    TokenKind.EndWhile,
+    TokenKind.EndSub,
+    TokenKind.EndFunction,
+    TokenKind.EndNamespace,
+    TokenKind.EndInterface,
+    TokenKind.Catch,
+    TokenKind.EndTry
+];
+
 /** The set of operators valid for use in assignment statements. */
 export const AssignmentOperators = [
     TokenKind.Equal,
@@ -389,7 +404,6 @@ export const AllowedProperties = [
     TokenKind.EndWhile,
     TokenKind.Eval,
     TokenKind.Exit,
-    TokenKind.ExitFor,
     TokenKind.ExitWhile,
     TokenKind.False,
     TokenKind.For,
@@ -400,6 +414,7 @@ export const AllowedProperties = [
     TokenKind.GetLastRunRunTimeError,
     TokenKind.Goto,
     TokenKind.If,
+    TokenKind.In,
     TokenKind.Invalid,
     TokenKind.Let,
     TokenKind.Mod,
@@ -460,13 +475,13 @@ export const AllowedProperties = [
     TokenKind.Const,
     TokenKind.Continue,
     TokenKind.Typecast,
-    TokenKind.Alias
+    TokenKind.Alias,
+    TokenKind.Type
 ];
 
 /** List of TokenKind that are allowed as local var identifiers. */
 export const AllowedLocalIdentifiers = [
     TokenKind.EndFor,
-    TokenKind.ExitFor,
     TokenKind.ForEach,
     TokenKind.Void,
     TokenKind.Boolean,
@@ -496,6 +511,7 @@ export const AllowedLocalIdentifiers = [
     TokenKind.EndTry,
     TokenKind.Const,
     TokenKind.Continue,
+    TokenKind.In,
     TokenKind.Typecast,
     TokenKind.Alias,
     TokenKind.Type
@@ -634,12 +650,17 @@ export const DeclarableTypes = [
     TokenKind.Double,
     TokenKind.String,
     TokenKind.Object,
-    TokenKind.Interface,
     TokenKind.Dynamic,
     TokenKind.Void,
     TokenKind.Function
 ];
 
+/** List of TokenKind that will not break parsing a TypeExpression in Brighterscript*/
+export const AllowedTypeIdentifiers = [
+    ...(AllowedProperties.filter(tokenKind => tokenKind !== TokenKind.Invalid))
+];
+
+
 /**
  * The tokens that might preceed a regex literal
  */
@@ -683,3 +704,44 @@ export const PreceedingRegexTypes = new Set([
     TokenKind.Colon,
     TokenKind.Semicolon
 ]);
+
+/**
+ * The tokens that may be in leading trivia
+ */
+export const AllowedTriviaTokens: ReadonlyArray<TokenKind> = [
+    TokenKind.Newline,
+    TokenKind.Whitespace,
+    TokenKind.Comment,
+    TokenKind.Colon
+];
+
+
+/**
+ * Tokens that can be used between expressions in a print statement
+ */
+export type PrintSeparatorToken = Token & {
+    kind: TokenKind.Comma | TokenKind.Semicolon;
+};
+
+/**
+ * The tokens that may be in a binary expression
+ */
+export const BinaryExpressionOperatorTokens: ReadonlyArray<TokenKind> = [
+    TokenKind.Equal,
+    TokenKind.LessGreater,
+    TokenKind.Greater,
+    TokenKind.GreaterEqual,
+    TokenKind.Less,
+    TokenKind.LessEqual,
+    TokenKind.And,
+    TokenKind.Or,
+    TokenKind.Plus,
+    TokenKind.Minus,
+    TokenKind.Star,
+    TokenKind.RightShift,
+    TokenKind.LeftShift,
+    TokenKind.Forwardslash,
+    TokenKind.Mod,
+    TokenKind.Backslash,
+    TokenKind.Caret
+];
diff --git a/src/lsp/Project.spec.ts b/src/lsp/Project.spec.ts
index d008dc866..4df48f0e7 100644
--- a/src/lsp/Project.spec.ts
+++ b/src/lsp/Project.spec.ts
@@ -65,11 +65,11 @@ describe('Project', () => {
 
             project['builder'].program.plugins.add({
                 name: 'Test',
-                beforeProgramValidate: () => {
+                beforeValidateProgram: () => {
                     validationCount++;
                     maxValidationCount = Math.max(maxValidationCount, validationCount);
                 },
-                afterProgramValidate: () => {
+                afterValidateProgram: () => {
                     validationCount--;
                 }
             });
@@ -80,6 +80,7 @@ describe('Project', () => {
                 //each of these needs to take about 1ms to complete
                 const startTime = Date.now();
                 while (Date.now() - startTime < 2) { }
+                return true;
             });
 
             //validate 3 times in quick succession
@@ -153,7 +154,7 @@ describe('Project', () => {
                 workspaceFolder: undefined,
                 bsconfigPath: undefined
             });
-            expect(project['builder'].program.options.copyToStaging).to.be.false;
+            expect(project['builder'].program.options.noEmit).to.be.true;
         });
     });
 
@@ -430,19 +431,6 @@ describe('Project', () => {
             });
             expect(project.projectNumber).to.eql(123);
         });
-
-        it('warns about deprecated brsconfig.json', async () => {
-            fsExtra.outputFileSync(`${rootDir}/subdir1/brsconfig.json`, '');
-            await project.activate({
-                bsconfigPath: 'subdir1/brsconfig.json',
-                projectDir: rootDir,
-                workspaceFolder: rootDir,
-                projectKey: undefined
-            });
-            await expectDiagnosticsAsync(project, [
-                DiagnosticMessages.brsConfigJsonIsDeprecated()
-            ]);
-        });
     });
 
     describe('getConfigPath', () => {
@@ -474,4 +462,22 @@ describe('Project', () => {
             await project['getConfigFilePath'](undefined);
         });
     });
+
+    describe('getDiagnostics', () => {
+        it('does not crash when diagnostic is missing location', async () => {
+            await project.activate({
+                projectPath: rootDir
+            } as any);
+            await project.validate();
+
+            //register a diagnostic with no location
+            project['builder'].diagnostics.register({
+                message: 'test diagnostic',
+                location: undefined
+            });
+
+            //this should not throw
+            project.getDiagnostics();
+        });
+    });
 });
diff --git a/src/lsp/Project.ts b/src/lsp/Project.ts
index 7376d2eb1..794dc0809 100644
--- a/src/lsp/Project.ts
+++ b/src/lsp/Project.ts
@@ -5,8 +5,6 @@ import * as path from 'path';
 import type { ProjectConfig, ActivateResponse, LspDiagnostic, LspProject, FileRenameTextEdit } from './LspProject';
 import { isBrsFile, isXmlFile } from '../astUtils/reflection';
 import type { Plugin, Hover, MaybePromise } from '../interfaces';
-import { DiagnosticMessages } from '../DiagnosticMessages';
-import { URI } from 'vscode-uri';
 import { Deferred } from '../deferred';
 import type { StandardizedFileEntry } from 'roku-deploy';
 import { rokuDeploy } from 'roku-deploy';
@@ -19,6 +17,8 @@ import type { BsConfig } from '../BsConfig';
 import type { Logger, LogLevel } from '../logging';
 import { createLogger } from '../logging';
 import * as fsExtra from 'fs-extra';
+import type { XmlFile } from '../files/XmlFile';
+import type { BrsFile } from '../files/BrsFile';
 
 export class Project implements LspProject {
     public constructor(
@@ -72,9 +72,7 @@ export class Project implements LspProject {
             cwd: cwd,
             project: this.bsconfigPath,
             watch: false,
-            createPackage: false,
-            deploy: false,
-            copyToStaging: false,
+            noEmit: true,
             showDiagnosticsInConsole: false,
             validate: false
         } as BsConfig;
@@ -92,11 +90,18 @@ export class Project implements LspProject {
             showDiagnosticsInConsole: false
         });
 
-        //flush diagnostics every time the program finishes validating
-        //this plugin must be added LAST to the program to ensure we can see all diagnostics
+        //flush diagnostics every time the program FINISHES validating.
+        //this plugin must be added LAST to the program to ensure we can see all diagnostics.
+        //skip cancelled validations: those fire afterValidateProgram with whatever partial
+        //state was reached, and downstream consumers (e.g. test specs awaiting
+        //onNextDiagnostics) end up reading the partial emit instead of the completed one
+        //that follows.
         this.builder.plugins.add({
             name: 'bsc-language-server',
-            afterProgramValidate: () => {
+            afterValidateProgram: (event) => {
+                if (event?.wasCancelled) {
+                    return;
+                }
                 const diagnostics = this.getDiagnostics();
                 this.emit('diagnostics', {
                     diagnostics: diagnostics
@@ -104,20 +109,17 @@ export class Project implements LspProject {
             }
         } as Plugin);
 
-        //if we found a deprecated brsconfig.json, add a diagnostic warning the user
-        if (this.bsconfigPath && path.basename(this.bsconfigPath) === 'brsconfig.json') {
-            this.builder.addDiagnostic(this.bsconfigPath, {
-                ...DiagnosticMessages.brsConfigJsonIsDeprecated(),
-                range: util.createRange(0, 0, 0, 0)
-            });
+        this.manifestSrcPath = this.builder.program.manifestPath;
+
+        //load the manifest file contents (used for change detection to trigger project reloads)
+        if (this.manifestSrcPath) {
+            try {
+                this.manifestFileContents = (await fsExtra.readFile(this.manifestSrcPath)).toString();
+            } catch { }
         }
 
-        //load the manifest file contents (used for change detection to trigger project reloads).
-        //use builder.program.manifestPath which reflects the actual src path (respects {src;dest} mappings)
-        this.manifestSrcPath = this.builder.program.manifestPath;
-        try {
-            this.manifestFileContents = (await fsExtra.readFile(this.manifestSrcPath)).toString();
-        } catch { }
+        //trigger a validation (but don't wait for it. That way we can cancel it sooner if we get new incoming data or requests)
+        void this.validate();
 
         this.activationDeferred.resolve();
 
@@ -179,6 +181,12 @@ export class Project implements LspProject {
     public async validate() {
         this.logger.debug('Project.validate');
 
+        //a sync that started during a previous Phase 2 may have disposed this project before
+        //runWithConcurrencyLimit reached our slot. Skip validate() if the builder is gone.
+        if (!this.builder?.program) {
+            return;
+        }
+
         this.cancelValidate();
         //store
         this.validationCancelToken = new CancellationTokenSource();
@@ -202,15 +210,22 @@ export class Project implements LspProject {
         delete this.validationCancelToken;
     }
 
-    public getDiagnostics() {
-        const diagnostics = this.builder.getDiagnostics();
-        return diagnostics.map(x => {
-            const uri = URI.file(x.file.srcPath).toString();
-            return {
-                ...util.toDiagnostic(x, uri),
-                uri: uri
-            };
-        });
+    public getDiagnostics(): LspDiagnostic[] {
+        const result: LspDiagnostic[] = [];
+        for (const diagnostic of this.builder.getDiagnostics()) {
+            //skip diagnostics that have no location
+            if (!diagnostic?.location?.uri) {
+                this.logger.debug('Skipping diagnostic that has no location', diagnostic);
+                continue;
+            }
+
+            const srcPath = util.uriToPath(diagnostic.location.uri);
+            result.push({
+                ...util.toDiagnostic(diagnostic, srcPath),
+                uri: diagnostic.location.uri
+            });
+        }
+        return result;
     }
 
     /**
@@ -313,7 +328,7 @@ export class Project implements LspProject {
         let destPath = rokuDeploy.getDestPath(srcPath, files, rootDir);
 
         //if we have a file and the contents haven't changed
-        let file = this.builder.program.getFile(destPath);
+        let file = this.builder.program.getFile<XmlFile | BrsFile>(destPath);
         if (file && file.fileContents === fileContents) {
             return false;
         }
@@ -432,36 +447,41 @@ export class Project implements LspProject {
         }
 
         const programOptions = this.builder.program.options;
-        const newPkgPath = this.computePkgPathForNewSrcPath(options.newSrcPath, programOptions);
-        if (!newPkgPath) {
+        const newDestPath = this.computeDestPathForNewSrcPath(options.newSrcPath, programOptions);
+        if (!newDestPath) {
             return [];
         }
 
-        const oldPkgPath = util.standardizePath(oldFile.pkgPath).toLowerCase();
+        //rename comparisons happen at the source-extension level (destPath), since import
+        //statements reference source paths (e.g. "pkg:/source/lib.bs"), not the transpiled
+        //pkgPath (e.g. "source/lib.brs"). A new file at "source/lib2.bs" needs to be
+        //identified by its destPath, not its pkgPath.
+        const oldDestPath = util.standardizePath(oldFile.destPath).toLowerCase();
 
-        //if the rename doesn't change the pkg path, nothing to do
-        if (oldPkgPath === newPkgPath.toLowerCase()) {
+        //if the rename doesn't change the dest path, nothing to do
+        if (oldDestPath === newDestPath.toLowerCase()) {
             return [];
         }
 
         const result: FileRenameTextEdit[] = [];
         for (const file of Object.values(this.builder.program.files)) {
             if (isBrsFile(file)) {
-                for (const importStatement of file.parser?.references?.importStatements ?? []) {
-                    if (!importStatement.filePathToken || !importStatement.filePath) {
+                // eslint-disable-next-line @typescript-eslint/dot-notation
+                for (const importStatement of file['_cachedLookups']?.importStatements ?? []) {
+                    if (!importStatement.tokens.path || !importStatement.filePath) {
                         continue;
                     }
-                    const resolvedPkgPath = util.getPkgPathFromTarget(file.pkgPath, importStatement.filePath);
-                    if (!resolvedPkgPath || util.standardizePath(resolvedPkgPath).toLowerCase() !== oldPkgPath) {
+                    const resolvedPkgPath = util.getPkgPathFromTarget(file.destPath, importStatement.filePath);
+                    if (!resolvedPkgPath || util.standardizePath(resolvedPkgPath).toLowerCase() !== oldDestPath) {
                         continue;
                     }
-                    const newText = util.computeRenamedReferencePath(importStatement.filePath, file.pkgPath, newPkgPath);
+                    const newText = util.computeRenamedReferencePath(importStatement.filePath, file.destPath, newDestPath);
                     if (newText === null) {
                         continue;
                     }
                     result.push({
                         uri: util.pathToUri(file.srcPath),
-                        range: importStatement.filePathToken.range,
+                        range: importStatement.tokens.path.location.range,
                         newText: newText
                     });
                 }
@@ -470,11 +490,11 @@ export class Project implements LspProject {
                     if (!scriptTag.filePathRange || !scriptTag.text) {
                         continue;
                     }
-                    const resolvedPkgPath = util.getPkgPathFromTarget(file.pkgPath, scriptTag.text);
-                    if (!resolvedPkgPath || util.standardizePath(resolvedPkgPath).toLowerCase() !== oldPkgPath) {
+                    const resolvedPkgPath = util.getPkgPathFromTarget(file.destPath, scriptTag.text);
+                    if (!resolvedPkgPath || util.standardizePath(resolvedPkgPath).toLowerCase() !== oldDestPath) {
                         continue;
                     }
-                    const newText = util.computeRenamedReferencePath(scriptTag.text, file.pkgPath, newPkgPath);
+                    const newText = util.computeRenamedReferencePath(scriptTag.text, file.destPath, newDestPath);
                     if (newText === null) {
                         continue;
                     }
@@ -495,7 +515,7 @@ export class Project implements LspProject {
      * folders that aren't yet in the glob still get their imports rewritten.
      * Returns undefined if the new path is outside this project's rootDir.
      */
-    private computePkgPathForNewSrcPath(newSrcPath: string, programOptions: { files?: BsConfig['files']; rootDir?: string }): string | undefined {
+    private computeDestPathForNewSrcPath(newSrcPath: string, programOptions: { files?: BsConfig['files']; rootDir?: string }): string | undefined {
         if (!programOptions.rootDir) {
             return undefined;
         }
diff --git a/src/lsp/ProjectManager.spec.ts b/src/lsp/ProjectManager.spec.ts
index b9823497b..7ad663155 100644
--- a/src/lsp/ProjectManager.spec.ts
+++ b/src/lsp/ProjectManager.spec.ts
@@ -118,6 +118,37 @@ describe('ProjectManager', () => {
         });
     });
 
+    describe('getHover', () => {
+        it('dedupes identical hover contents', async () => {
+            fsExtra.outputFileSync(`${rootDir}/source/main.brs`, `
+                sub main()
+                end sub
+            `);
+            await manager.syncProjects([{
+                languageServer: {
+                    enableProjectDiscovery: false,
+                    enableThreading: false
+                },
+                workspaceFolder: rootDir
+            }]);
+            sinon.stub(manager.projects[0], 'getHover').returns(Promise.resolve([{
+                contents: ['one', 'two', 'three'],
+                range: util.createRange(1, 1, 1, 1)
+            }, {
+                contents: ['two', 'three', 'four'],
+                range: util.createRange(2, 2, 2, 2)
+            }]));
+            const hover = await manager.getHover({
+                srcPath: s`${rootDir}/source/main.brs`,
+                position: util.createPosition(1, 23)
+            });
+            expect(hover).to.eql({
+                contents: ['one', 'two', 'three', 'four'],
+                range: util.createRange(1, 1, 2, 2)
+            });
+        });
+    });
+
     describe('syncProjects', () => {
         it('does not crash on zero projects', async () => {
             await manager.syncProjects([]);
@@ -186,16 +217,17 @@ describe('ProjectManager', () => {
             ]);
         });
 
-        it('gets diagnostics from plugins added in afterProgramValidate', async () => {
+        it('gets diagnostics from plugins added in afterValidateProgram', async () => {
             fsExtra.outputFileSync(`${rootDir}/plugin.js`, `
                 module.exports = function () {
                     return {
-                        afterProgramValidate: function(program) {
-                            var file = program.getFile('source/main.brs');
+                        afterValidateProgram: function(event) {
+                            var file = event.program.getFile('source/main.brs');
                             //add a diagnostic from a plugin
-                            file.addDiagnostic({
+                            event.program.diagnostics.register({
                                 message: 'Test diagnostic',
                                 code: 'test-123',
+                                location: {},
                                 severity: 1
                             });
                         }
@@ -217,7 +249,7 @@ describe('ProjectManager', () => {
             await manager.syncProjects([workspaceSettings]);
             expectDiagnostics(await onNextDiagnostics(), [
                 DiagnosticMessages.cannotFindName('nameNotDefined').message,
-                'Test diagnostic'
+                'Test diagnostic (location unknown, added here for visibility)'
             ]);
         });
 
@@ -735,6 +767,195 @@ describe('ProjectManager', () => {
         });
     });
 
+    describe('maxDepth configuration', () => {
+        function writeTestFiles(files: Record<string, string>) {
+            for (const [filePath, content] of Object.entries(files)) {
+                fsExtra.outputFileSync(`${rootDir}/${filePath}`, content);
+            }
+        }
+
+        it('respects maxDepth of 1 when discovering projects', async () => {
+            // Create bsconfig.json files at different depths
+            writeTestFiles({
+                'bsconfig.json': '',
+                'level1/bsconfig.json': '',
+                'level1/level2/bsconfig.json': '',
+                'level1/level2/level3/bsconfig.json': ''
+            });
+
+            await manager.syncProjects([{
+                ...workspaceSettings,
+                languageServer: {
+                    ...workspaceSettings.languageServer,
+                    projectDiscoveryMaxDepth: 1
+                }
+            }]);
+
+            // maxDepth: 1 should find files at depth 0 only
+            expect(
+                manager.projects.map(x => x.projectKey).sort()
+            ).to.eql([
+                s`${rootDir}/bsconfig.json`
+            ]);
+        });
+
+        it('respects maxDepth of 5 when discovering projects', async () => {
+            // Create bsconfig.json files at different depths
+            writeTestFiles({
+                'bsconfig.json': '',
+                'level1/bsconfig.json': '',
+                'level1/level2/bsconfig.json': '',
+                'level1/level2/level3/bsconfig.json': '',
+                'level1/level2/level3/level4/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/level6/bsconfig.json': ''
+            });
+
+            await manager.syncProjects([{
+                ...workspaceSettings,
+                languageServer: {
+                    ...workspaceSettings.languageServer,
+                    projectDiscoveryMaxDepth: 5
+                }
+            }]);
+
+            // maxDepth: 5 should find files at depths 0, 1, 2, 3, 4
+            expect(
+                manager.projects.map(x => x.projectKey).sort()
+            ).to.eql([
+                s`${rootDir}/bsconfig.json`,
+                s`${rootDir}/level1/bsconfig.json`,
+                s`${rootDir}/level1/level2/bsconfig.json`,
+                s`${rootDir}/level1/level2/level3/bsconfig.json`,
+                s`${rootDir}/level1/level2/level3/level4/bsconfig.json`
+            ]);
+        });
+
+        it('respects maxDepth of 20 when discovering projects', async () => {
+            // Create bsconfig.json files at different depths, skipping some levels in between
+            // and proving it stops at level 20 by creating files at level 20 and 21
+            // Note: depth 20 means the file is in the 20th directory level from root
+            writeTestFiles({
+                'bsconfig.json': '',
+                'level1/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/level6/level7/level8/level9/level10/level11/level12/level13/level14/level15/level16/level17/level18/level19/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/level6/level7/level8/level9/level10/level11/level12/level13/level14/level15/level16/level17/level18/level19/level20/bsconfig.json': ''
+            });
+
+            await manager.syncProjects([{
+                ...workspaceSettings,
+                languageServer: {
+                    ...workspaceSettings.languageServer,
+                    projectDiscoveryMaxDepth: 20
+                }
+            }]);
+
+            // maxDepth: 20 should find file at level 19 (depth 20) but not at level 20 (depth 21)
+            expect(
+                manager.projects.map(x => x.projectKey).sort()
+            ).to.eql([
+                s`${rootDir}/bsconfig.json`,
+                s`${rootDir}/level1/bsconfig.json`,
+                s`${rootDir}/level1/level2/level3/level4/level5/bsconfig.json`,
+                s`${rootDir}/level1/level2/level3/level4/level5/level6/level7/level8/level9/level10/level11/level12/level13/level14/level15/level16/level17/level18/level19/bsconfig.json`
+            ]);
+        });
+
+        it('uses default maxDepth of 15 when no maxDepth is specified', async () => {
+            // Create bsconfig.json files at different depths, skipping some levels in between
+            // and proving it stops at level 15 by creating files at level 15 and 16
+            // Note: depth 15 means the file is in the 15th directory level from root
+            writeTestFiles({
+                'bsconfig.json': '',
+                'level1/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/level6/level7/level8/level9/level10/level11/level12/level13/level14/bsconfig.json': '',
+                'level1/level2/level3/level4/level5/level6/level7/level8/level9/level10/level11/level12/level13/level14/level15/bsconfig.json': ''
+            });
+
+            await manager.syncProjects([workspaceSettings]);
+
+            // Default maxDepth: 15 should find file at level 14 (depth 15) but not at level 15 (depth 16)
+            expect(
+                manager.projects.map(x => x.projectKey).sort()
+            ).to.eql([
+                s`${rootDir}/bsconfig.json`,
+                s`${rootDir}/level1/bsconfig.json`,
+                s`${rootDir}/level1/level2/level3/level4/level5/bsconfig.json`,
+                s`${rootDir}/level1/level2/level3/level4/level5/level6/level7/level8/level9/level10/level11/level12/level13/level14/bsconfig.json`
+            ]);
+        });
+
+        it('respects maxDepth of 1 when discovering roku projects with manifest files', async () => {
+            // Create manifest files at different depths
+            writeTestFiles({
+                'manifest': '',
+                'source/main.brs': '',
+                'level1/manifest': '',
+                'level1/source/main.brs': '',
+                'level1/level2/manifest': '',
+                'level1/level2/source/main.brs': '',
+                'level1/level2/level3/manifest': '',
+                'level1/level2/level3/source/main.brs': ''
+            });
+
+            await manager.syncProjects([{
+                ...workspaceSettings,
+                languageServer: {
+                    ...workspaceSettings.languageServer,
+                    projectDiscoveryMaxDepth: 1
+                }
+            }]);
+
+            // maxDepth: 1 should find projects at depth 0 only
+            expect(
+                manager.projects.map(x => x.projectKey).sort()
+            ).to.eql([
+                s`${rootDir}`
+            ]);
+        });
+
+        it('respects maxDepth of 5 when discovering roku projects with manifest files', async () => {
+            // Create manifest files at different depths
+            writeTestFiles({
+                'manifest': '',
+                'source/main.brs': '',
+                'level1/manifest': '',
+                'level1/source/main.brs': '',
+                'level1/level2/manifest': '',
+                'level1/level2/source/main.brs': '',
+                'level1/level2/level3/manifest': '',
+                'level1/level2/level3/source/main.brs': '',
+                'level1/level2/level3/level4/manifest': '',
+                'level1/level2/level3/level4/source/main.brs': '',
+                'level1/level2/level3/level4/level5/manifest': '',
+                'level1/level2/level3/level4/level5/source/main.brs': '',
+                'level1/level2/level3/level4/level5/level6/manifest': '',
+                'level1/level2/level3/level4/level5/level6/source/main.brs': ''
+            });
+
+            await manager.syncProjects([{
+                ...workspaceSettings,
+                languageServer: {
+                    ...workspaceSettings.languageServer,
+                    projectDiscoveryMaxDepth: 5
+                }
+            }]);
+
+            // maxDepth: 5 should find projects at depths 0, 1, 2, 3, 4
+            expect(
+                manager.projects.map(x => x.projectKey).sort()
+            ).to.eql([
+                s`${rootDir}`,
+                s`${rootDir}/level1`,
+                s`${rootDir}/level1/level2`,
+                s`${rootDir}/level1/level2/level3`,
+                s`${rootDir}/level1/level2/level3/level4`
+            ]);
+        });
+    });
+
     describe('getCompletions', () => {
         it('works for quick file changes', async () => {
             //set up the project
@@ -969,8 +1190,8 @@ describe('ProjectManager', () => {
 
             let deferred1 = new Deferred();
             let deferred2 = new Deferred();
-            const project1 = manager.projects.find(x => x.bsconfigPath.includes('project1')) as Project;
-            const project2 = manager.projects.find(x => x.bsconfigPath.includes('project2')) as Project;
+            const project1 = manager.projects.find(x => x.bsconfigPath.includes('project1')) as unknown as Project;
+            const project2 = manager.projects.find(x => x.bsconfigPath.includes('project2')) as unknown as Project;
 
             const project1Stub: SinonStub = sinon.stub(project1, 'applyFileChanges').callsFake(async (...args) => {
                 const result = await project1Stub.wrappedMethod.apply(project1, args);
@@ -1108,7 +1329,7 @@ describe('ProjectManager', () => {
             await onNextDiagnostics();
 
             let applyFileChangesDeferred = new Deferred<DocumentActionWithStatus[]>();
-            const project1 = manager.projects[0] as Project;
+            const project1 = manager.projects[0] as unknown as Project;
 
             const project1Stub = sinon.stub(project1, 'applyFileChanges').callsFake(async (...args) => {
                 const result = await project1Stub.wrappedMethod.apply(project1, args);
@@ -1223,6 +1444,11 @@ describe('ProjectManager', () => {
         });
 
         it('spawns a worker thread when threading is enabled', async () => {
+            //the afterEach `manager.dispose()` for this test will log a
+            //'Validation phase error: ... MessageHandler is now disposed' error to the console.
+            //This is expected — Phase 2 validation runs in the worker thread asynchronously
+            //(NOT awaited) and the dispose tears the worker down before that validation finishes,
+            //which rejects the in-flight worker request. Nothing to fix here.
             await manager.syncProjects([{
                 ...workspaceSettings,
                 languageServer: {
@@ -1363,7 +1589,7 @@ describe('ProjectManager', () => {
                 this.server.listen(port, host);
             }
 
-            afterProgramCreate(program: Program) {
+            afterProvideProgram(program: Program) {
                 // hijack the function to get workspace symbols, return a promise that resolves in the future
                 program.getWorkspaceSymbols = () => {
                     return this.deferred.promise as any;
diff --git a/src/lsp/ProjectManager.ts b/src/lsp/ProjectManager.ts
index d1e90b362..5abf5acf5 100644
--- a/src/lsp/ProjectManager.ts
+++ b/src/lsp/ProjectManager.ts
@@ -605,12 +605,34 @@ export class ProjectManager {
         await this.onIdle();
 
         //Ask every project for hover info, keep whichever one responds first that has a valid response
-        let hover = await util.promiseRaceMatch(
+        let hovers = await util.promiseRaceMatch(
             this.projects.map(x => x.getHover(options)),
             //keep the first set of non-empty results
             (result) => result?.length > 0
         );
-        return hover?.[0];
+
+        let result = {
+            contents: [],
+            range: undefined as Range | undefined
+        };
+
+        //consolidate all hover results into a single hover
+        for (const hover of hovers ?? []) {
+            if (typeof hover?.contents === 'string') {
+                result.contents.push(hover.contents);
+            } else if (Array.isArray(hover?.contents)) {
+                result.contents.push(...hover.contents);
+            }
+
+            if (!result.range && hover.range) {
+                result.range = hover.range;
+            }
+            result.range = util.createBoundingRange(result.range, hover.range);
+        }
+
+        //now only keep unique hovers
+        result.contents = [...new Set(result.contents)];
+        return result;
     }
 
     /**
diff --git a/src/parser/AstNode.spec.ts b/src/parser/AstNode.spec.ts
index 68a9eea69..abb1fa225 100644
--- a/src/parser/AstNode.spec.ts
+++ b/src/parser/AstNode.spec.ts
@@ -3,11 +3,11 @@ import * as fsExtra from 'fs-extra';
 import { Program } from '../Program';
 import type { BrsFile } from '../files/BrsFile';
 import { expect } from '../chai-config.spec';
-import type { AAIndexedMemberExpression, AALiteralExpression, AAMemberExpression, ArrayLiteralExpression, BinaryExpression, CallExpression, CallfuncExpression, DottedGetExpression, FunctionExpression, GroupingExpression, IndexedGetExpression, NewExpression, NullCoalescingExpression, TaggedTemplateStringExpression, TemplateStringExpression, TemplateStringQuasiExpression, TernaryExpression, TypeCastExpression, UnaryExpression, XmlAttributeGetExpression } from './Expression';
+import type { AAIndexedMemberExpression, AALiteralExpression, AAMemberExpression, ArrayLiteralExpression, BinaryExpression, CallExpression, CallfuncExpression, DottedGetExpression, FunctionExpression, GroupingExpression, IndexedGetExpression, NewExpression, NullCoalescingExpression, TaggedTemplateStringExpression, TemplateStringExpression, TemplateStringQuasiExpression, TernaryExpression, TypecastExpression, UnaryExpression, XmlAttributeGetExpression } from './Expression';
 import { expectZeroDiagnostics } from '../testHelpers.spec';
-import { tempDir, rootDir, stagingDir } from '../testHelpers.spec';
-import { isAAIndexedMemberExpression, isAALiteralExpression, isAAMemberExpression, isAnnotationExpression, isArrayLiteralExpression, isAssignmentStatement, isBinaryExpression, isBlock, isCallExpression, isCallfuncExpression, isCatchStatement, isClassStatement, isCommentStatement, isConstStatement, isDimStatement, isDottedGetExpression, isDottedSetStatement, isEnumMemberStatement, isEnumStatement, isExpressionStatement, isForEachStatement, isForStatement, isFunctionExpression, isFunctionStatement, isGroupingExpression, isIfStatement, isIncrementStatement, isIndexedGetExpression, isIndexedSetStatement, isInterfaceFieldStatement, isInterfaceMethodStatement, isInterfaceStatement, isLibraryStatement, isMethodStatement, isNamespaceStatement, isNewExpression, isNullCoalescingExpression, isPrintStatement, isReturnStatement, isTaggedTemplateStringExpression, isTemplateStringExpression, isTemplateStringQuasiExpression, isTernaryExpression, isThrowStatement, isTryCatchStatement, isTypeCastExpression, isUnaryExpression, isWhileStatement, isXmlAttributeGetExpression } from '../astUtils/reflection';
-import type { ClassStatement, FunctionStatement, InterfaceFieldStatement, InterfaceMethodStatement, MethodStatement, InterfaceStatement, CatchStatement, ThrowStatement, EnumStatement, EnumMemberStatement, ConstStatement, Block, CommentStatement, PrintStatement, DimStatement, ForStatement, WhileStatement, IndexedSetStatement, LibraryStatement, NamespaceStatement, TryCatchStatement, DottedSetStatement } from './Statement';
+import { tempDir, rootDir, outDir } from '../testHelpers.spec';
+import { isAAIndexedMemberExpression, isAALiteralExpression, isAAMemberExpression, isAnnotationExpression, isArrayLiteralExpression, isAssignmentStatement, isBinaryExpression, isBlock, isCallExpression, isCallfuncExpression, isCatchStatement, isClassStatement, isConstStatement, isDimStatement, isDottedGetExpression, isDottedSetStatement, isEnumMemberStatement, isEnumStatement, isExpressionStatement, isForEachStatement, isForStatement, isFunctionExpression, isFunctionStatement, isGroupingExpression, isIfStatement, isIncrementStatement, isIndexedGetExpression, isIndexedSetStatement, isInterfaceFieldStatement, isInterfaceMethodStatement, isInterfaceStatement, isMethodStatement, isNamespaceStatement, isNewExpression, isNullCoalescingExpression, isPrintStatement, isReturnStatement, isTaggedTemplateStringExpression, isTemplateStringExpression, isTemplateStringQuasiExpression, isTernaryExpression, isThrowStatement, isTryCatchStatement, isTypecastExpression, isUnaryExpression, isWhileStatement, isXmlAttributeGetExpression } from '../astUtils/reflection';
+import type { ClassStatement, FunctionStatement, InterfaceFieldStatement, InterfaceMethodStatement, MethodStatement, InterfaceStatement, CatchStatement, ThrowStatement, EnumStatement, EnumMemberStatement, ConstStatement, Block, PrintStatement, DimStatement, ForStatement, WhileStatement, IndexedSetStatement, NamespaceStatement, TryCatchStatement, DottedSetStatement, ExpressionStatement } from './Statement';
 import { AssignmentStatement, EmptyStatement } from './Statement';
 import { ParseMode, Parser } from './Parser';
 import type { AstNode } from './AstNode';
@@ -21,7 +21,7 @@ describe('AstNode', () => {
         fsExtra.emptyDirSync(tempDir);
         program = new Program({
             rootDir: rootDir,
-            stagingDir: stagingDir
+            outDir: outDir
         });
         program.createSourceScope(); //ensure source scope is created
     });
@@ -41,10 +41,10 @@ describe('AstNode', () => {
             program.validate();
             expectZeroDiagnostics(program);
             const delta = file.ast.findChildAtPosition<DottedGetExpression>(util.createPosition(3, 52))!;
-            expect(delta.name.text).to.eql('delta');
+            expect(delta.tokens.name.text).to.eql('delta');
 
             const foxtrot = file.ast.findChildAtPosition<DottedGetExpression>(util.createPosition(3, 71))!;
-            expect(foxtrot.name.text).to.eql('foxtrot');
+            expect(foxtrot.tokens.name.text).to.eql('foxtrot');
         });
     });
 
@@ -58,7 +58,7 @@ describe('AstNode', () => {
             `);
             expect(
                 file.ast.findChild((node) => {
-                    return isAssignmentStatement(node) && node.name.text === 'alpha';
+                    return isAssignmentStatement(node) && node.tokens.name.text === 'alpha';
                 })
             ).instanceof(AssignmentStatement);
         });
@@ -134,7 +134,7 @@ describe('AstNode', () => {
             `);
             const secondStatement = (file.ast.statements[0] as FunctionStatement).func.body.statements[1];
             const foxtrot = file.ast.findChild((node) => {
-                return isDottedGetExpression(node) && node.name?.text === 'foxtrot';
+                return isDottedGetExpression(node) && node.tokens.name?.text === 'foxtrot';
             })!;
             expect(
                 foxtrot.findAncestor(isPrintStatement)
@@ -149,7 +149,7 @@ describe('AstNode', () => {
                 end sub
             `);
             const foxtrot = file.ast.findChild((node) => {
-                return isDottedGetExpression(node) && node.name?.text === 'foxtrot';
+                return isDottedGetExpression(node) && node.tokens.name?.text === 'foxtrot';
             })!;
             expect(
                 foxtrot.findAncestor(isClassStatement)
@@ -165,7 +165,7 @@ describe('AstNode', () => {
             `);
             const firstStatement = (file.ast.statements[0] as FunctionStatement).func.body.statements[0];
             const foxtrot = file.ast.findChild((node) => {
-                return isDottedGetExpression(node) && node.name?.text === 'foxtrot';
+                return isDottedGetExpression(node) && node.tokens.name?.text === 'foxtrot';
             })!;
             expect(
                 foxtrot.findAncestor(node => firstStatement)
@@ -268,9 +268,9 @@ describe('AstNode', () => {
         }
 
         it('clones EmptyStatement', () => {
-            testClone(new EmptyStatement(
-                util.createRange(1, 2, 3, 4)
-            ));
+            testClone(new EmptyStatement({
+                range: util.createLocation(1, 2, 3, 4)
+            }));
         });
 
         it('clones body with undefined statements array', () => {
@@ -278,7 +278,7 @@ describe('AstNode', () => {
                 sub main()
                 end sub
             `).ast;
-            original.statements = undefined;
+            (original.statements as any) = undefined;
             testClone(original);
         });
 
@@ -312,7 +312,7 @@ describe('AstNode', () => {
                 interface Empty
                 end interface
             `).ast;
-            original.findChild<InterfaceStatement>(isInterfaceStatement).body = undefined;
+            original.findChild<DeepWriteable<InterfaceStatement>>(isInterfaceStatement).body = undefined;
             testClone(original);
         });
 
@@ -331,7 +331,7 @@ describe('AstNode', () => {
                     name as string
                 end interface
             `).ast;
-            original.findChild<InterfaceFieldStatement>(isInterfaceFieldStatement).type = undefined;
+            original.findChild<DeepWriteable<InterfaceFieldStatement>>(isInterfaceFieldStatement).typeExpression = undefined;
             testClone(original);
         });
 
@@ -341,8 +341,8 @@ describe('AstNode', () => {
                     function test() as dynamic
                 end interface
             `).ast;
-            original.findChild<InterfaceMethodStatement>(isInterfaceMethodStatement).params.push(undefined);
-            original.findChild<InterfaceMethodStatement>(isInterfaceMethodStatement).returnType = undefined;
+            original.findChild<DeepWriteable<InterfaceMethodStatement>>(isInterfaceMethodStatement).params.push(undefined);
+            original.findChild<DeepWriteable<InterfaceMethodStatement>>(isInterfaceMethodStatement).returnTypeExpression = undefined;
             testClone(original);
         });
 
@@ -352,7 +352,7 @@ describe('AstNode', () => {
                     function test(a) as dynamic
                 end interface
             `).ast;
-            original.findChild<InterfaceMethodStatement>(isInterfaceMethodStatement).params = undefined;
+            original.findChild<DeepWriteable<InterfaceMethodStatement>>(isInterfaceMethodStatement).params = undefined;
             testClone(original);
         });
 
@@ -368,7 +368,7 @@ describe('AstNode', () => {
                 class Movie
                 end class
             `).ast;
-            original.findChild<ClassStatement>(isClassStatement).body = undefined;
+            original.findChild<DeepWriteable<ClassStatement>>(isClassStatement).body = undefined;
             testClone(original);
         });
 
@@ -452,14 +452,6 @@ describe('AstNode', () => {
             testClone(original);
         });
 
-        it('clones comment statement with undefined comments array', () => {
-            const original = Parser.parse(`
-                'hello world
-            `).ast;
-            original.findChild<CommentStatement>(isCommentStatement).comments = undefined;
-            testClone(original);
-        });
-
         it('clones class with undefined method modifiers array', () => {
             const original = Parser.parse(`
                 class Movie
@@ -467,7 +459,7 @@ describe('AstNode', () => {
                     end sub
                 end class
             `).ast;
-            original.findChild<MethodStatement>(isMethodStatement).modifiers = undefined;
+            original.findChild<DeepWriteable<MethodStatement>>(isMethodStatement).modifiers = undefined;
             testClone(original);
         });
 
@@ -478,7 +470,7 @@ describe('AstNode', () => {
                     end sub
                 end class
             `).ast;
-            original.findChild<MethodStatement>(isMethodStatement).func = undefined;
+            original.findChild<DeepWriteable<MethodStatement>>(isMethodStatement).func = undefined;
             testClone(original);
         });
 
@@ -496,8 +488,7 @@ describe('AstNode', () => {
                     test()
                 end sub
             `).ast;
-            original.findChild<any>(isExpressionStatement).expression = undefined;
-            original.findChild<FunctionExpression>(isFunctionExpression).callExpressions = [];
+            original.findChild<DeepWriteable<ExpressionStatement>>(isExpressionStatement).expression = undefined;
             testClone(original);
         });
 
@@ -586,7 +577,7 @@ describe('AstNode', () => {
                     dim alpha[1,2]
                 end sub
             `).ast;
-            original.findChild<DimStatement>(isDimStatement).dimensions = undefined;
+            original.findChild<DeepWriteable<DimStatement>>(isDimStatement).dimensions = undefined;
             testClone(original);
         });
 
@@ -661,10 +652,10 @@ describe('AstNode', () => {
                     end for
                 end function
             `).ast;
-            original.findChild<ForStatement>(isForStatement).counterDeclaration = undefined;
-            original.findChild<ForStatement>(isForStatement).finalValue = undefined;
-            original.findChild<ForStatement>(isForStatement).body = undefined;
-            original.findChild<ForStatement>(isForStatement).increment = undefined;
+            original.findChild<DeepWriteable<ForStatement>>(isForStatement).counterDeclaration = undefined;
+            original.findChild<DeepWriteable<ForStatement>>(isForStatement).finalValue = undefined;
+            original.findChild<DeepWriteable<ForStatement>>(isForStatement).body = undefined;
+            original.findChild<DeepWriteable<ForStatement>>(isForStatement).increment = undefined;
             testClone(original);
         });
 
@@ -755,8 +746,8 @@ describe('AstNode', () => {
                     end try
                 end sub
             `).ast;
-            original.findChild<TryCatchStatement>(isTryCatchStatement).tryBranch = undefined;
-            original.findChild<TryCatchStatement>(isTryCatchStatement).catchStatement = undefined;
+            original.findChild<DeepWriteable<TryCatchStatement>>(isTryCatchStatement).tryBranch = undefined;
+            original.findChild<DeepWriteable<TryCatchStatement>>(isTryCatchStatement).catchStatement = undefined;
             testClone(original);
         });
 
@@ -770,7 +761,7 @@ describe('AstNode', () => {
                     end try
                 end sub
             `).ast;
-            original.findChild<CatchStatement>(isCatchStatement).catchBranch = undefined;
+            original.findChild<DeepWriteable<CatchStatement>>(isCatchStatement).catchBranch = undefined;
             testClone(original);
         });
 
@@ -788,7 +779,7 @@ describe('AstNode', () => {
                     throw "Crash"
                 end sub
             `).ast;
-            original.findChild<ThrowStatement>(isThrowStatement).expression = undefined;
+            original.findChild<DeepWriteable<ThrowStatement>>(isThrowStatement).expression = undefined;
             testClone(original);
         });
 
@@ -797,7 +788,7 @@ describe('AstNode', () => {
                sub main()
                 end sub
             `).ast;
-            original.findChild<FunctionStatement>(isFunctionStatement).func = undefined;
+            original.findChild<DeepWriteable<FunctionStatement>>(isFunctionStatement).func = undefined;
             testClone(original);
         });
 
@@ -824,7 +815,7 @@ describe('AstNode', () => {
                     up = "up"
                 end enum
             `).ast;
-            original.findChild<EnumStatement>(isEnumStatement).body = undefined;
+            original.findChild<DeepWriteable<EnumStatement>>(isEnumStatement).body = undefined;
             testClone(original);
         });
 
@@ -845,7 +836,7 @@ describe('AstNode', () => {
                     up = "up"
                 end enum
             `).ast;
-            original.findChild<EnumMemberStatement>(isEnumMemberStatement).value = undefined;
+            original.findChild<DeepWriteable<EnumMemberStatement>>(isEnumMemberStatement).value = undefined;
             testClone(original);
         });
 
@@ -861,7 +852,7 @@ describe('AstNode', () => {
             const original = Parser.parse(`
                 const key = "KEY"
             `).ast;
-            original.findChild<ConstStatement>(isConstStatement).value = undefined;
+            original.findChild<DeepWriteable<ConstStatement>>(isConstStatement).value = undefined;
 
             testClone(original);
         });
@@ -945,13 +936,13 @@ describe('AstNode', () => {
             testClone(original);
         });
 
-        it('clones IndexedSetStatement with undefined additional index', () => {
+        it('clones IndexedSetStatement with undefined index entry', () => {
             const original = Parser.parse(`
                 sub main()
                     m["value", 2] = true
                 end sub
             `).ast;
-            original.findChild<DeepWriteable<IndexedSetStatement>>(isIndexedSetStatement).additionalIndexes[0] = undefined;
+            original.findChild<DeepWriteable<IndexedSetStatement>>(isIndexedSetStatement).indexes[0] = undefined;
 
             testClone(original);
         });
@@ -962,8 +953,7 @@ describe('AstNode', () => {
                     m["value"] = true
                 end sub
             `).ast;
-            original.findChild<DeepWriteable<IndexedSetStatement>>(isIndexedSetStatement).index = undefined;
-            original.findChild<DeepWriteable<IndexedSetStatement>>(isIndexedSetStatement).additionalIndexes = undefined;
+            original.findChild<DeepWriteable<IndexedSetStatement>>(isIndexedSetStatement).indexes = undefined;
 
             testClone(original);
         });
@@ -976,15 +966,6 @@ describe('AstNode', () => {
             testClone(original);
         });
 
-        it('clones LibraryStatement with missing tokens', () => {
-            const original = Parser.parse(`
-                Library "v30/bslCore.brs"
-            `).ast;
-            original.findChild<DeepWriteable<LibraryStatement>>(isLibraryStatement).tokens = undefined;
-
-            testClone(original);
-        });
-
         it('clones NamespaceStatement', () => {
             const original = Parser.parse(`
                 namespace Alpha
@@ -1151,7 +1132,7 @@ describe('AstNode', () => {
                 class Person extends Alpha.Humanoid
                 end class
             `).ast;
-            original.findChild<DeepWriteable<ClassStatement>>(isClassStatement).parentClassName.expression = undefined;
+            original.findChild<DeepWriteable<ClassStatement>>(isClassStatement).parentClassName = undefined;
 
             testClone(original);
         });
@@ -1215,13 +1196,12 @@ describe('AstNode', () => {
                 end sub
             `).ast;
             original.findChild<DeepWriteable<IndexedGetExpression>>(isIndexedGetExpression).obj = undefined;
-            original.findChild<DeepWriteable<IndexedGetExpression>>(isIndexedGetExpression).index = undefined;
-            original.findChild<DeepWriteable<IndexedGetExpression>>(isIndexedGetExpression).additionalIndexes = undefined;
+            original.findChild<DeepWriteable<IndexedGetExpression>>(isIndexedGetExpression).indexes = undefined;
 
             testClone(original);
         });
 
-        it('clones IndexedGetExpression with additionalIndexes', () => {
+        it('clones IndexedGetExpression', () => {
             const original = Parser.parse(`
                 sub test()
                     print m.stuff[0, 1]
@@ -1231,13 +1211,13 @@ describe('AstNode', () => {
             testClone(original);
         });
 
-        it('clones IndexedGetExpression with additionalIndexes having undefined', () => {
+        it('clones IndexedGetExpression with indexes having undefined props', () => {
             const original = Parser.parse(`
                 sub test()
                     print m.stuff[0, 1]
                 end sub
             `).ast;
-            original.findChild<DeepWriteable<IndexedGetExpression>>(isIndexedGetExpression).additionalIndexes[0] = undefined;
+            original.findChild<DeepWriteable<IndexedGetExpression>>(isIndexedGetExpression).indexes[0] = undefined;
 
             testClone(original);
         });
@@ -1659,7 +1639,54 @@ describe('AstNode', () => {
                     print name as string
                 end sub
             `).ast;
-            original.findChild<DeepWriteable<TypeCastExpression>>(isTypeCastExpression).obj = undefined;
+            original.findChild<DeepWriteable<TypecastExpression>>(isTypecastExpression).obj = undefined;
+
+            testClone(original);
+        });
+
+        it('clones AugmentedAssignmentStatement', () => {
+            const original = Parser.parse(`
+                sub test()
+                    a += 1
+                end sub
+            `).ast;
+
+            testClone(original);
+        });
+
+        it('clones TypecastStatement', () => {
+            const original = Parser.parse(`
+                sub test()
+                    typecast m as dynamic
+                    a += 1
+                end sub
+            `).ast;
+
+            testClone(original);
+        });
+
+        it('clones ConditionalCompile statements', () => {
+            const original = Parser.parse(`
+                sub test()
+                    #const one = true
+                    #if true
+                        print "true"
+                    #else
+                        print "false
+                        #error "Custom error"
+                    #endif
+                end sub
+            `).ast;
+
+            testClone(original);
+        });
+
+        it('clones AliasStatement', () => {
+            const original = Parser.parse(`
+                alias test2 = test
+                sub test()
+                end sub
+            `).ast;
 
             testClone(original);
         });
diff --git a/src/parser/AstNode.ts b/src/parser/AstNode.ts
index 17c63731e..511e75c3f 100644
--- a/src/parser/AstNode.ts
+++ b/src/parser/AstNode.ts
@@ -1,25 +1,35 @@
 import type { WalkVisitor, WalkOptions } from '../astUtils/visitors';
 import { WalkMode } from '../astUtils/visitors';
-import type { Position, Range } from 'vscode-languageserver';
+import type { Location, Position } from 'vscode-languageserver';
 import { CancellationTokenSource } from 'vscode-languageserver';
 import { InternalWalkMode } from '../astUtils/visitors';
 import type { SymbolTable } from '../SymbolTable';
 import type { BrsTranspileState } from './BrsTranspileState';
-import type { TranspileResult } from '../interfaces';
+import type { GetTypeOptions, TranspileResult } from '../interfaces';
 import type { AnnotationExpression } from './Expression';
 import util from '../util';
+import { DynamicType } from '../types/DynamicType';
+import type { BscType } from '../types/BscType';
+import type { Token } from '../lexer/Token';
+import { isBlock, isBody, isFunctionParameterExpression } from '../astUtils/reflection';
 
 /**
  * A BrightScript AST node
  */
 export abstract class AstNode {
+    public abstract kind: AstNodeKind;
     /**
      *  The starting and ending location of the node.
      */
-    public abstract range: Range | undefined;
+    public abstract location?: Location | undefined;
 
     public abstract transpile(state: BrsTranspileState): TranspileResult;
 
+    /**
+     * Optional property, set at the top level with a map of conditional compile consts and their values
+     */
+    public bsConsts?: Map<string, boolean>;
+
     /**
      * Get the typedef for this node. (defaults to transpiling the node, should be overridden by subclasses if there's a more specific typedef requirement)
      */
@@ -35,7 +45,7 @@ export abstract class AstNode {
     public abstract walk(visitor: WalkVisitor, options: WalkOptions);
 
     /**
-     * The parent node for this statement. This is set dynamically during `onFileValidate`, and should not be set directly.
+     * The parent node for this statement. This is set dynamically during `validateFile`, and should not be set directly.
      */
     public parent?: AstNode;
 
@@ -107,28 +117,92 @@ export abstract class AstNode {
         return result as unknown as TNode;
     }
 
+    /**
+     * Find a list of all children first child where the matcher evaluates to true.
+     * @param matcher a function called for each node. If you return true, the specified node is included in the results. If you return a node,
+     * that node is returned. all other return values exclude that value and continue the loop
+     */
+    public findChildren<TNode extends AstNode = AstNode>(matcher: (node: AstNode, cancellationSource: CancellationTokenSource) => boolean | AstNode | undefined | void, options?: WalkOptions): Array<TNode> {
+        const cancel = new CancellationTokenSource();
+        let result: Array<AstNode> = [];
+        this.walk((node) => {
+            const matcherValue = matcher(node, cancel);
+            if (matcherValue) {
+                result.push(matcherValue === true ? node : matcherValue);
+            }
+        }, {
+            walkMode: WalkMode.visitAllRecursive,
+            ...options ?? {},
+            cancel: cancel.token
+        });
+        return result as TNode[];
+    }
+
     /**
      * FInd the deepest child that includes the given position
      */
     public findChildAtPosition<TNodeType extends AstNode = AstNode>(position: Position, options?: WalkOptions): TNodeType | undefined {
         return this.findChild<TNodeType>((node) => {
             //if the current node includes this range, keep that node
-            if (util.rangeContains(node.range, position)) {
+            if (util.rangeContains(node?.location.range, position)) {
                 return node.findChildAtPosition(position, options) ?? node;
             }
         }, options);
     }
 
+    /**
+     * Get the BscType of this node.
+     */
+    public getType(options: GetTypeOptions): BscType {
+        return DynamicType.instance;
+    }
+
     /**
      * Links all child nodes to their parent AstNode, and the same with symbol tables. This performs a full AST walk, so you should use this sparingly
      */
     public link() {
         //the act of walking causes the nodes to be linked
         this.walk(() => { }, {
-            walkMode: WalkMode.visitAllRecursive
+            // eslint-disable-next-line no-bitwise
+            walkMode: WalkMode.visitAllRecursive | InternalWalkMode.visitFalseConditionalCompilationBlocks
         });
     }
 
+    /**
+     * Walk upward and return the root node
+     */
+    public getRoot() {
+        let node = this as AstNode;
+
+        while (node) {
+            if (!node.parent) {
+                return node;
+            }
+            node = node.parent;
+        }
+    }
+
+
+    /**
+     * Gets all the trivia (comments, whitespace) that is directly before the start of this node
+     * Note: this includes all trivia that might start on the line of the previous node
+     */
+    public get leadingTrivia(): Token[] {
+        return [];
+    }
+
+    /**
+     * Gets any trivia that is directly before the end of the node
+     * For example, this would return all trivia before a `end function` token of a FunctionExpression
+     */
+    public get endTrivia(): Token[] {
+        return [];
+    }
+
+    public getBsConsts() {
+        return this.bsConsts ?? this.parent?.getBsConsts?.();
+    }
+
     /**
      * Clone this node and all of its children. This creates a completely detached and identical copy of the AST.
      * All tokens, statements, expressions, range, and location are cloned.
@@ -155,9 +229,38 @@ export abstract class AstNode {
                 }
             }
         }
+
+        //reapply the location if we have one but the clone doesn't
+        if (!clone.location && this.location) {
+            clone.location = util.cloneLocation(this.location);
+        }
         return clone;
     }
 
+    /**
+     * The index of the statement containing this node (or in the case of a statement, itself) within the containing block.
+     */
+    public get statementIndex(): number {
+        if (isBody(this)) {
+            return 0;
+        }
+        if (!this.parent) {
+            return -1;
+        }
+        let currentNode: AstNode = this;
+        if (isFunctionParameterExpression(currentNode)) {
+            // function parameters are not part of statement lists
+            return -1;
+        }
+        while (currentNode && !(isBlock(currentNode?.parent) || isBody(currentNode?.parent))) {
+            currentNode = currentNode.parent;
+
+        }
+        if (isBlock(currentNode?.parent) || isBody(currentNode?.parent)) {
+            return currentNode.parent.statements.indexOf(currentNode);
+        }
+        return -1;
+    }
 }
 
 export abstract class Statement extends AstNode {
@@ -168,7 +271,7 @@ export abstract class Statement extends AstNode {
     /**
      * Annotations for this statement
      */
-    public annotations: AnnotationExpression[] | undefined;
+    public annotations?: AnnotationExpression[] | undefined;
 }
 
 
@@ -179,3 +282,86 @@ export abstract class Expression extends AstNode {
      */
     public visitMode = InternalWalkMode.visitExpressions;
 }
+
+export enum AstNodeKind {
+    Body = 'Body',
+    BinaryExpression = 'BinaryExpression',
+    CallExpression = 'CallExpression',
+    FunctionExpression = 'FunctionExpression',
+    FunctionParameterExpression = 'FunctionParameterExpression',
+    NamespacedVariableNameExpression = 'NamespacedVariableNameExpression',
+    DottedGetExpression = 'DottedGetExpression',
+    XmlAttributeGetExpression = 'XmlAttributeGetExpression',
+    IndexedGetExpression = 'IndexedGetExpression',
+    GroupingExpression = 'GroupingExpression',
+    LiteralExpression = 'LiteralExpression',
+    EscapedCharCodeLiteralExpression = 'EscapedCharCodeLiteralExpression',
+    ArrayLiteralExpression = 'ArrayLiteralExpression',
+    AAMemberExpression = 'AAMemberExpression',
+    AALiteralExpression = 'AALiteralExpression',
+    AAIndexedMemberExpression = 'AAIndexedMemberExpression',
+    UnaryExpression = 'UnaryExpression',
+    VariableExpression = 'VariableExpression',
+    SourceLiteralExpression = 'SourceLiteralExpression',
+    NewExpression = 'NewExpression',
+    CallfuncExpression = 'CallfuncExpression',
+    TemplateStringQuasiExpression = 'TemplateStringQuasiExpression',
+    TemplateStringExpression = 'TemplateStringExpression',
+    TaggedTemplateStringExpression = 'TaggedTemplateStringExpression',
+    AnnotationExpression = 'AnnotationExpression',
+    TernaryExpression = 'TernaryExpression',
+    NullCoalescingExpression = 'NullCoalescingExpression',
+    RegexLiteralExpression = 'RegexLiteralExpression',
+    EmptyStatement = 'EmptyStatement',
+    AssignmentStatement = 'AssignmentStatement',
+    ExpressionStatement = 'ExpressionStatement',
+    ExitStatement = 'ExitStatement',
+    FunctionStatement = 'FunctionStatement',
+    IfStatement = 'IfStatement',
+    IncrementStatement = 'IncrementStatement',
+    PrintStatement = 'PrintStatement',
+    DimStatement = 'DimStatement',
+    GotoStatement = 'GotoStatement',
+    LabelStatement = 'LabelStatement',
+    ReturnStatement = 'ReturnStatement',
+    EndStatement = 'EndStatement',
+    StopStatement = 'StopStatement',
+    ForStatement = 'ForStatement',
+    ForEachStatement = 'ForEachStatement',
+    WhileStatement = 'WhileStatement',
+    DottedSetStatement = 'DottedSetStatement',
+    IndexedSetStatement = 'IndexedSetStatement',
+    LibraryStatement = 'LibraryStatement',
+    NamespaceStatement = 'NamespaceStatement',
+    ImportStatement = 'ImportStatement',
+    InterfaceStatement = 'InterfaceStatement',
+    InterfaceFieldStatement = 'InterfaceFieldStatement',
+    InterfaceMethodStatement = 'InterfaceMethodStatement',
+    ClassStatement = 'ClassStatement',
+    MethodStatement = 'MethodStatement',
+    ClassMethodStatement = 'ClassMethodStatement',
+    FieldStatement = 'FieldStatement',
+    ClassFieldStatement = 'ClassFieldStatement',
+    TryCatchStatement = 'TryCatchStatement',
+    CatchStatement = 'CatchStatement',
+    ThrowStatement = 'ThrowStatement',
+    EnumStatement = 'EnumStatement',
+    EnumMemberStatement = 'EnumMemberStatement',
+    ConstStatement = 'ConstStatement',
+    ContinueStatement = 'ContinueStatement',
+    Block = 'Block',
+    TypeExpression = 'TypeExpression',
+    TypecastExpression = 'TypecastExpression',
+    TypedArrayExpression = 'TypedArrayExpression',
+    TypecastStatement = 'TypecastStatement',
+    AliasStatement = 'AliasStatement',
+    ConditionalCompileStatement = 'ConditionalCompileStatement',
+    ConditionalCompileConstStatement = 'ConditionalCompileConstStatement',
+    ConditionalCompileErrorStatement = 'ConditionalCompileErrorStatement',
+    AugmentedAssignmentStatement = 'AugmentedAssignmentStatement',
+    PrintSeparatorExpression = 'PrintSeparatorExpression',
+    InlineInterfaceExpression = 'InlineInterfaceExpression',
+    InlineInterfaceMemberExpression = 'InlineInterfaceMemberExpression',
+    TypeStatement = 'TypeStatement',
+    TypedFunctionTypeExpression = 'TypedFunctionTypeExpression'
+}
diff --git a/src/parser/BrightScriptDocParser.spec.ts b/src/parser/BrightScriptDocParser.spec.ts
new file mode 100644
index 000000000..a34167673
--- /dev/null
+++ b/src/parser/BrightScriptDocParser.spec.ts
@@ -0,0 +1,358 @@
+import { expect } from 'chai';
+import { brsDocParser } from './BrightScriptDocParser';
+import { Parser } from './Parser';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { IntegerType } from '../types/IntegerType';
+import { UnionType } from '../types/UnionType';
+import { isReferenceType } from '../astUtils/reflection';
+import { createToken } from '../astUtils/creators';
+import { TokenKind } from '../lexer/TokenKind';
+import util from '../util';
+
+describe('BrightScriptDocParser', () => {
+
+
+    it('should get a comment', () => {
+        const doc = brsDocParser.parse('this is a comment');
+        expect(doc.description).to.equal('this is a comment');
+    });
+
+    it('should get a tag', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+            @sometag here is the rest
+        `);
+        expect(doc.description).to.equal('this is a comment');
+        expect(doc.tags.length).to.equal(1);
+        expect(doc.tags[0].tagName).to.equal('sometag');
+        expect(doc.tags[0].detail).to.equal('here is the rest');
+        expect(doc.getTag('sometag').detail).to.equal('here is the rest');
+    });
+
+    it('ignores leading apostrophes ', () => {
+        const doc = brsDocParser.parse(`
+            ' this is a comment
+            ' @sometag here is the rest
+        `);
+        expect(doc.description).to.equal('this is a comment');
+        expect(doc.tags.length).to.equal(1);
+        expect(doc.tags[0].tagName).to.equal('sometag');
+        expect(doc.tags[0].detail).to.equal('here is the rest');
+        expect(doc.getTag('sometag').detail).to.equal('here is the rest');
+    });
+
+    it('should get a multiline comment', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+            this is some more of a comment
+        `);
+        expect(doc.description).to.equal('this is a comment\nthis is some more of a comment');
+    });
+
+    describe('parseParam', () => {
+
+        it('should find @param tags of various types', () => {
+            const doc = brsDocParser.parse(`
+                this is a comment
+                @param p1
+                @param p2 description of p2
+                @param {some.type} p3
+                @param {some.type} p4 description of p4
+                @param [p5] optional p5
+                @param {some.type} [p6] optional with type p6
+                @param p7 multi line description
+                       of p7
+                @param p8
+                        description of p8
+            `);
+
+            expect(doc.getAllTags('param').length).to.equal(8);
+
+            expect(doc.getParam('p1').description).to.equal('');
+            expect(doc.getParam('p1').typeString).to.equal('');
+
+            expect(doc.getParam('p2').description).to.equal('description of p2');
+            expect(doc.getParam('p2').typeString).to.equal('');
+
+            expect(doc.getParam('p3').description).to.equal('');
+            expect(doc.getParam('p3').typeString).to.equal('some.type');
+
+            expect(doc.getParam('p4').description).to.equal('description of p4');
+            expect(doc.getParam('p4').typeString).to.equal('some.type');
+
+            expect(doc.getParam('p5').description).to.equal('optional p5');
+            expect(doc.getParam('p5').typeString).to.be.equal('');
+            expect(doc.getParam('p5').optional).to.be.true;
+
+            expect(doc.getParam('p6').description).to.equal('optional with type p6');
+            expect(doc.getParam('p6').typeString).to.be.equal('some.type');
+            expect(doc.getParam('p6').optional).to.be.true;
+
+            expect(doc.getParam('p7').description).to.equal('multi line description\nof p7');
+            expect(doc.getParam('p7').typeString).to.be.equal('');
+            expect(doc.getParam('p7').optional).to.be.false;
+
+            expect(doc.getParam('p8').description).to.equal('description of p8');
+            expect(doc.getParam('p8').typeString).to.equal('');
+        });
+    });
+
+    it('includes the @description tag in the description', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+            @description this is a description
+        `);
+        expect(doc.description).to.equal('this is a comment\nthis is a description');
+    });
+
+    it('includes the @description tag in the description when multiline', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+
+            above space intentionally blank
+            @description this is a description
+
+             above space intentionally blank again
+            @param whatever
+             this will be the description of whatever
+
+        `);
+        expect(doc.description).to.equal('this is a comment\n\nabove space intentionally blank\nthis is a description\n\nabove space intentionally blank again');
+    });
+
+    it('includes the @return tag', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+            @return this is a return
+        `);
+        expect(doc.getReturn().description).to.equal('this is a return');
+    });
+
+    it('includes the @return tag when it has a type', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+            @return {some.thing.here} this is a return
+        `);
+        expect(doc.getReturn().description).to.equal('this is a return');
+        expect(doc.getReturn().typeString).to.equal('some.thing.here');
+    });
+
+    it('includes the @return tag when it only has a type', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+            @return {some.thing.here}
+        `);
+        expect(doc.getReturn().description).to.equal('');
+        expect(doc.getReturn().typeString).to.equal('some.thing.here');
+    });
+
+    it('allows the @returns (with an s)', () => {
+        const doc = brsDocParser.parse(`
+            this is a comment
+            @returns {some.thing.here} this is a returns
+        `);
+        expect(doc.getReturn().description).to.equal('this is a returns');
+        expect(doc.getReturn().typeString).to.equal('some.thing.here');
+    });
+
+
+    it('finds the type tag', () => {
+        const doc = brsDocParser.parse(`
+            @type {integer}
+        `);
+        expect(doc.getTypeTag().typeString).to.equal('integer');
+    });
+
+    it('is case INSENSITIVE for param names', () => {
+        const doc = brsDocParser.parse(`
+            @param {integer} ALLCAPS
+        `);
+        expect(doc.getParam('allcaps').typeString).to.equal('integer');
+    });
+
+    it('is case SENSITIVE for tag names', () => {
+        const doc = brsDocParser.parse(`
+            @ALLCAPS
+        `);
+        expect(doc.getTag('allcaps')).to.be.undefined;
+    });
+
+    describe('nodes', () => {
+        const parser = new Parser();
+
+        it('should get documentation from an ast node', () => {
+            let { ast } = parser.parse(`
+                ' this is a comment
+                sub foo()
+                end sub
+            `);
+
+            const doc = brsDocParser.parseNode(ast.statements[0]);
+            expect(doc.description).to.equal('this is a comment');
+        });
+
+        it('should get documentation from a function', () => {
+            let { ast } = parser.parse(`
+                ' My description
+                ' of this function
+                ' @param p1 this is p1
+                ' @param p2 this is p2
+                ' @return {integer} sum of p1 and p2
+                function foo(p1, p2)
+                    return p1 + p2
+                end function
+            `);
+
+            const doc = brsDocParser.parseNode(ast.statements[0]);
+            expect(doc.description).to.equal('My description\nof this function');
+            expect(doc.getAllTags('param').length).to.equal(2);
+            expect(doc.getParam('p1').description).to.equal('this is p1');
+            expect(doc.getParam('p2').description).to.equal('this is p2');
+            expect(doc.getReturn().description).to.equal('sum of p1 and p2');
+            expect(doc.getReturn().typeString).to.equal('integer');
+        });
+
+        it('should get documentation when it is wrapped in jsdoc /** */', () => {
+            let { ast } = parser.parse(`
+                ' /**
+                '  * My description
+                '  * of this function
+                '  * @param p1 this is p1
+                '  * @param p2 this is p2
+                '  * @return {integer} sum of p1 and p2
+                '  */
+                function foo(p1, p2)
+                    return p1 + p2
+                end function
+            `);
+
+            const doc = brsDocParser.parseNode(ast.statements[0]);
+            expect(doc.description).to.equal('My description\nof this function');
+            expect(doc.getAllTags('param').length).to.equal(2);
+            expect(doc.getParam('p1').description).to.equal('this is p1');
+            expect(doc.getParam('p2').description).to.equal('this is p2');
+            expect(doc.getReturn().description).to.equal('sum of p1 and p2');
+            expect(doc.getReturn().typeString).to.equal('integer');
+        });
+
+        it('should get types from the context of the node with teh documentation', () => {
+            let { ast } = parser.parse(`
+                '  @param {List} p1 this is p1
+                '  @param {integer} p2 this is p2
+                '  @return {integer} sum of p1 and p2
+                function foo(p1, p2)
+                    return p1.next.value + p2
+                end function
+
+                class List
+                    next as Bar
+                    value as integer
+                end class
+            `);
+
+            const doc = brsDocParser.parseNode(ast.statements[0]);
+            expect(doc.getAllTags('param').length).to.equal(2);
+            expect(isReferenceType(doc.getParamBscType('p1', { flags: SymbolTypeFlag.typetime }))).to.be.true;
+        });
+
+    });
+
+    describe('Types', () => {
+        const parser = new Parser();
+
+        it('should get a type expression from a tag with a type', () => {
+            const doc = brsDocParser.parse(`
+                @type {integer}
+            `);
+            expect(doc.getTypeTag().typeExpression).to.be.ok;
+        });
+
+        it('should get a BscType from a tag with a type', () => {
+            const doc = brsDocParser.parse(`
+                @param {integer} test
+            `);
+            expectTypeToBe(doc.getParamBscType('test', { flags: SymbolTypeFlag.typetime }), IntegerType);
+        });
+
+        it('should get a union type from a tag with a types with "or"', () => {
+            const doc = brsDocParser.parse(`
+                @param {integer or String} test
+            `);
+            expectTypeToBe(doc.getParamBscType('test', { flags: SymbolTypeFlag.typetime }), UnionType);
+        });
+
+
+        it('should get documentation from a function', () => {
+            let { ast } = parser.parse(`
+                ' My description
+                ' of this function
+                ' @param p1 this is p1
+                ' @param p2 this is p2
+                ' @return {integer} sum of p1 and p2
+                function foo(p1, p2)
+                    return p1 + p2
+                end function
+            `);
+
+            const doc = brsDocParser.parseNode(ast.statements[0]);
+            expect(doc.description).to.equal('My description\nof this function');
+            expect(doc.getAllTags('param').length).to.equal(2);
+            expect(doc.getParam('p1').description).to.equal('this is p1');
+            expect(doc.getParam('p2').description).to.equal('this is p2');
+            expect(doc.getReturn().description).to.equal('sum of p1 and p2');
+            expect(doc.getReturn().typeString).to.equal('integer');
+        });
+
+        it('should get documentation when it is wrapped in jsdoc /** */', () => {
+            let { ast } = parser.parse(`
+                ' /**
+                '  * My description
+                '  * of this function
+                '  * @param p1 this is p1
+                '  * @param p2 this is p2
+                '  * @return {integer} sum of p1 and p2
+                '  */
+                function foo(p1, p2)
+                    return p1 + p2
+                end function
+            `);
+
+            const doc = brsDocParser.parseNode(ast.statements[0]);
+            expect(doc.description).to.equal('My description\nof this function');
+            expect(doc.getAllTags('param').length).to.equal(2);
+            expect(doc.getParam('p1').description).to.equal('this is p1');
+            expect(doc.getParam('p2').description).to.equal('this is p2');
+            expect(doc.getReturn().description).to.equal('sum of p1 and p2');
+            expect(doc.getReturn().typeString).to.equal('integer');
+        });
+
+    });
+
+    describe('getTypeExpressionFromTypeString', () => {
+        it('should get the location of the type', () => {
+            const text = '\' @param {integer} test';
+            const commentToken = createToken(TokenKind.Comment, text, util.createLocation(1, 0, 1, text.length));
+            const typeLoc = brsDocParser.getTypeLocationFromToken(commentToken);
+            expect(typeLoc.range.start.character).to.equal(10);
+            expect(typeLoc.range.end.character).to.equal(17);
+        });
+
+        it('should return undefined if no type found', () => {
+            const texts = [
+                '\' @param test',
+                '\' @type oijp oisjoisj oi',
+                '\' @param {start curly brace',
+                '\' @param integer}',
+                '\' @param }integer{',
+                '\' @param }integer{ }}'
+            ];
+            for (const text of texts) {
+                const commentToken = createToken(TokenKind.Comment, text, util.createLocation(1, 0, 1, text.length));
+                const typeLoc = brsDocParser.getTypeLocationFromToken(commentToken);
+                expect(typeLoc).to.be.undefined;
+            }
+
+        });
+    });
+});
diff --git a/src/parser/BrightScriptDocParser.ts b/src/parser/BrightScriptDocParser.ts
new file mode 100644
index 000000000..cde2e4843
--- /dev/null
+++ b/src/parser/BrightScriptDocParser.ts
@@ -0,0 +1,339 @@
+import type { GetSymbolTypeOptions } from '../SymbolTable';
+import util from '../util';
+import type { AstNode, Expression } from './AstNode';
+import type { Location } from 'vscode-languageserver';
+import { Parser } from './Parser';
+import type { ExpressionStatement } from './Statement';
+import { isExpressionStatement } from '../astUtils/reflection';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import type { Token } from '../lexer/Token';
+
+const tagRegex = /@(\w+)(?:\s+(.*))?/;
+const paramRegex = /(?:{([^}]*)}\s+)?(?:(\[?\w+\]?))\s*(.*)/;
+const returnRegex = /(?:{([^}]*)})?\s*(.*)/;
+const typeTagRegex = /(?:{([^}]*)})?/;
+
+export enum BrsDocTagKind {
+    Description = 'description',
+    Param = 'param',
+    Return = 'return',
+    Type = 'type'
+}
+
+export class BrightScriptDocParser {
+
+    public parseNode(node: AstNode) {
+        const commentTokens: Token[] = [];
+        const result = this.parse(
+            util.getNodeDocumentation(node, {
+                prettyPrint: false,
+                commentTokens: commentTokens
+            }),
+            commentTokens);
+        for (const tag of result.tags) {
+            if ((tag as BrsDocWithType).typeExpression) {
+                (tag as BrsDocWithType).typeExpression.symbolTable = node.getSymbolTable();
+            }
+        }
+        return result;
+    }
+
+    public parse(documentation: string, matchingTokens: Token[] = []) {
+        const brsDoc = new BrightScriptDoc(documentation);
+        if (!documentation) {
+            return brsDoc;
+        }
+        const lines = documentation.split('\n');
+        const blockLines = [] as { line: string; token?: Token }[];
+        const descriptionLines = [] as { line: string; token?: Token }[];
+        let lastTag: BrsDocTag;
+        let haveMatchingTokens = false;
+        if (lines.length === matchingTokens.length) {
+            // We locations for each line, so we can add Locations
+            haveMatchingTokens = true;
+        }
+        function augmentLastTagWithBlockLines() {
+            if (blockLines.length > 0 && lastTag) {
+                // add to the description or details to previous tag
+                if (typeof (lastTag as BrsDocWithDescription).description !== 'undefined') {
+                    (lastTag as BrsDocWithDescription).description += '\n' + blockLines.map(obj => obj.line).join('\n');
+                    (lastTag as BrsDocWithDescription).description = (lastTag as BrsDocWithDescription).description.trim();
+                }
+                if (typeof lastTag.detail !== 'undefined') {
+                    lastTag.detail += '\n' + blockLines.map(obj => obj.line).join('\n');
+                    lastTag.detail = lastTag.detail.trim();
+                }
+                if (haveMatchingTokens) {
+                    lastTag.location = util.createBoundingLocation(lastTag.location, blockLines[blockLines.length - 1].token.location);
+                }
+            }
+            blockLines.length = 0;
+        }
+        for (let line of lines) {
+            let token = haveMatchingTokens ? matchingTokens.shift() : undefined;
+            line = line.trim();
+            while (line.startsWith('\'')) {
+                // remove leading apostrophes
+                line = line.substring(1).trim();
+            }
+            if (!line.startsWith('@')) {
+                if (lastTag) {
+
+                    blockLines.push({ line: line, token: token });
+                } else if (descriptionLines.length > 0 || line) {
+                    // add a line to the list if it's not empty
+                    descriptionLines.push({ line: line, token: token });
+                }
+            } else {
+                augmentLastTagWithBlockLines();
+                const newTag = this.parseLine(line, token);
+                lastTag = newTag;
+                if (newTag) {
+                    brsDoc.tags.push(newTag);
+                }
+            }
+        }
+        augmentLastTagWithBlockLines();
+        brsDoc.description = descriptionLines.map(obj => obj.line).join('\n').trim();
+        return brsDoc;
+    }
+
+    public getTypeLocationFromToken(token: Token): Location {
+        if (!token?.location) {
+            return undefined;
+        }
+        const startCurly = token.text.indexOf('{');
+        const endCurly = token.text.indexOf('}');
+        if (startCurly === -1 || endCurly === -1 || endCurly <= startCurly) {
+            return undefined;
+        }
+        return {
+            uri: token.location.uri,
+            range: {
+                start: {
+                    line: token.location.range.start.line,
+                    character: token.location.range.start.character + startCurly + 1
+                },
+                end: {
+                    line: token.location.range.start.line,
+                    character: token.location.range.start.character + endCurly
+                }
+            }
+        };
+    }
+
+    private parseLine(line: string, token?: Token) {
+        line = line.trim();
+        const match = tagRegex.exec(line);
+        if (!match) {
+            return;
+        }
+        const tagName = match[1];
+        const detail = match[2] ?? '';
+
+        let result: BrsDocTag = {
+            tagName: tagName,
+            detail: detail
+        };
+
+        switch (tagName) {
+            case BrsDocTagKind.Param:
+                result = this.parseParam(detail);
+                break;
+            case BrsDocTagKind.Return:
+            case 'returns':
+                result = this.parseReturn(detail);
+                break;
+            case BrsDocTagKind.Type:
+                result = this.parseType(detail);
+                break;
+        }
+        return {
+            ...result,
+            token: token,
+            location: token?.location
+        };
+    }
+
+    private parseParam(detail: string): BrsDocParamTag {
+        let type = '';
+        let description = '';
+        let optional = false;
+        let paramName = '';
+        let match = paramRegex.exec(detail);
+        if (match) {
+            type = match[1] ?? '';
+            paramName = match[2] ?? '';
+            description = match[3] ?? '';
+        } else {
+            paramName = detail.trim();
+        }
+        if (paramName) {
+            optional = paramName.startsWith('[') && paramName.endsWith(']');
+            paramName = paramName.replace(/\[|\]/g, '').trim();
+        }
+        return {
+            tagName: BrsDocTagKind.Param,
+            name: paramName,
+            typeString: type,
+            typeExpression: this.getTypeExpressionFromTypeString(type),
+            description: description,
+            optional: optional,
+            detail: detail
+        };
+    }
+
+    private parseReturn(detail: string): BrsDocWithDescription {
+        let match = returnRegex.exec(detail);
+        let type = '';
+        let description = '';
+        if (match) {
+            type = match[1] ?? '';
+            description = match[2] ?? '';
+        }
+        return {
+            tagName: BrsDocTagKind.Return,
+            typeString: type,
+            typeExpression: this.getTypeExpressionFromTypeString(type),
+            description: description,
+            detail: detail
+        };
+    }
+
+    private parseType(detail: string): BrsDocWithType {
+        let match = typeTagRegex.exec(detail);
+        let type = '';
+        if (match) {
+            if (match[1]) {
+                type = match[1] ?? '';
+            }
+        }
+        return {
+            tagName: BrsDocTagKind.Type,
+            typeString: type,
+            typeExpression: this.getTypeExpressionFromTypeString(type),
+            detail: detail
+        };
+    }
+
+    private getTypeExpressionFromTypeString(typeString: string) {
+        if (!typeString) {
+            return undefined;
+        }
+        let result: Expression;
+        try {
+            let { ast } = Parser.parse(typeString);
+            if (isExpressionStatement(ast?.statements?.[0])) {
+                result = (ast.statements[0] as ExpressionStatement).expression;
+            }
+        } catch (e) {
+            //ignore
+        }
+        return result;
+    }
+}
+
+export class BrightScriptDoc {
+
+    protected _description: string;
+
+    public tags = [] as BrsDocTag[];
+
+    constructor(
+        public readonly documentation: string
+    ) {
+    }
+
+    set description(value: string) {
+        this._description = value;
+    }
+
+    get description() {
+        const descTag = this.tags.find((tag) => {
+            return tag.tagName === BrsDocTagKind.Description;
+        });
+
+        let result = this._description ?? '';
+        if (descTag) {
+            const descTagDetail = descTag.detail;
+            result = result ? result + '\n' + descTagDetail : descTagDetail;
+        }
+        return result.trim();
+    }
+
+    getParam(name: string) {
+        const lowerName = name.toLowerCase();
+        return this.tags.find((tag) => {
+            return tag.tagName === BrsDocTagKind.Param && (tag as BrsDocParamTag).name.toLowerCase() === lowerName;
+        }) as BrsDocParamTag;
+    }
+
+    getReturn() {
+        return this.tags.find((tag) => {
+            return tag.tagName === BrsDocTagKind.Return || tag.tagName === 'returns';
+        }) as BrsDocWithDescription;
+    }
+
+    getTypeTag() {
+        return this.tags.find((tag) => {
+            return tag.tagName === BrsDocTagKind.Type;
+        }) as BrsDocWithType;
+    }
+
+    getTypeTagByName(name: string) {
+        const lowerName = name.toLowerCase();
+        return this.tags.find((tag) => {
+            return tag.tagName === BrsDocTagKind.Type && (tag as BrsDocParamTag).name.toLowerCase() === lowerName;
+        }) as BrsDocWithType;
+    }
+
+    getTag(tagName: string) {
+        return this.tags.find((tag) => {
+            return tag.tagName === tagName;
+        });
+    }
+
+    getAllTags(tagName: string) {
+        return this.tags.filter((tag) => {
+            return tag.tagName === tagName;
+        });
+    }
+
+    getParamBscType(name: string, options: GetSymbolTypeOptions = { flags: SymbolTypeFlag.typetime }) {
+        const param = this.getParam(name);
+        return param?.typeExpression?.getType({ ...options, flags: SymbolTypeFlag.typetime });
+    }
+
+    getReturnBscType(options: GetSymbolTypeOptions = { flags: SymbolTypeFlag.typetime }) {
+        const retTag = this.getReturn();
+        return retTag?.typeExpression?.getType({ ...options, flags: SymbolTypeFlag.typetime });
+    }
+
+    getTypeTagBscType(options: GetSymbolTypeOptions = { flags: SymbolTypeFlag.typetime }) {
+        const typeTag = this.getTypeTag();
+        return typeTag?.typeExpression?.getType({ ...options, flags: SymbolTypeFlag.typetime });
+    }
+}
+
+export interface BrsDocTag {
+    tagName: string;
+    detail?: string;
+    location?: Location;
+    token?: Token;
+}
+export interface BrsDocWithType extends BrsDocTag {
+    typeString?: string;
+    typeExpression?: Expression;
+}
+
+export interface BrsDocWithDescription extends BrsDocWithType {
+    description?: string;
+}
+
+export interface BrsDocParamTag extends BrsDocWithDescription {
+    name: string;
+    optional?: boolean;
+}
+
+export let brsDocParser = new BrightScriptDocParser();
+export default brsDocParser;
diff --git a/src/parser/BrsTranspileState.ts b/src/parser/BrsTranspileState.ts
index 28ae56c23..294238cda 100644
--- a/src/parser/BrsTranspileState.ts
+++ b/src/parser/BrsTranspileState.ts
@@ -1,8 +1,9 @@
-import type { Range } from 'vscode-languageserver';
-import { AstEditor } from '../astUtils/AstEditor';
+import type { Location } from 'vscode-languageserver';
+import { Editor } from '../astUtils/Editor';
 import type { BrsFile } from '../files/BrsFile';
-import type { ClassStatement } from './Statement';
+import type { ClassStatement, ConditionalCompileStatement } from './Statement';
 import { TranspileState } from './TranspileState';
+import type { Statement } from './AstNode';
 
 export class BrsTranspileState extends TranspileState {
     public constructor(
@@ -22,7 +23,7 @@ export class BrsTranspileState extends TranspileState {
      * Used to assist blocks in knowing when to add a comment statement to the same line as the first line of the parent
      */
     lineage = [] as Array<{
-        range?: Range;
+        location?: Location;
     }>;
 
     /**
@@ -32,6 +33,26 @@ export class BrsTranspileState extends TranspileState {
 
     /**
      * An AST editor that can be used by the AST nodes to do various transformations to the AST which will be reverted at the end of the transpile cycle
+     * TODO remove this before file_api is merged
      */
-    public editor = new AstEditor();
+    public editor = new Editor();
+
+    /**
+     * Used by ConditionalCompileStatement to determine if there's already an conditional compile going on
+     */
+    public conditionalCompileStatement?: ConditionalCompileStatement;
+
+    /**
+     * Do not transpile leading comments
+     */
+    public skipLeadingComments = false;
+
+    /**
+     * Transpile all leading trivia for a given statement, including comments mixed between annotations
+     */
+    public transpileAnnotations(node: Statement) {
+        return (node?.annotations ?? []).map(x => {
+            return x.transpile(this);
+        });
+    }
 }
diff --git a/src/parser/Expression.ts b/src/parser/Expression.ts
index 344836697..41f1f5d8c 100644
--- a/src/parser/Expression.ts
+++ b/src/parser/Expression.ts
@@ -1,45 +1,74 @@
 /* eslint-disable no-bitwise */
 import type { Token, Identifier } from '../lexer/Token';
+import type { PrintSeparatorToken } from '../lexer/TokenKind';
 import { TokenKind } from '../lexer/TokenKind';
-import type { Block, CommentStatement, FunctionStatement, NamespaceStatement } from './Statement';
-import type { Range } from 'vscode-languageserver';
+import type { Block, NamespaceStatement } from './Statement';
+import type { Location } from 'vscode-languageserver';
 import util from '../util';
 import type { BrsTranspileState } from './BrsTranspileState';
 import { ParseMode } from './Parser';
 import * as fileUrl from 'file-url';
 import type { WalkOptions, WalkVisitor } from '../astUtils/visitors';
-import { createVisitor, WalkMode } from '../astUtils/visitors';
+import { WalkMode } from '../astUtils/visitors';
 import { walk, InternalWalkMode, walkArray } from '../astUtils/visitors';
-import { isAAIndexedMemberExpression, isAALiteralExpression, isArrayLiteralExpression, isCallExpression, isCallfuncExpression, isCommentStatement, isDottedGetExpression, isEscapedCharCodeLiteralExpression, isFunctionExpression, isFunctionStatement, isIntegerType, isLiteralBoolean, isLiteralExpression, isLiteralNumber, isLiteralString, isLongIntegerType, isMethodStatement, isNamespaceStatement, isNewExpression, isStringType, isTemplateStringExpression, isTypeCastExpression, isUnaryExpression, isVariableExpression, isVoidType } from '../astUtils/reflection';
-import type { TranspileResult, TypedefProvider } from '../interfaces';
+import { isAAIndexedMemberExpression, isAALiteralExpression, isAAMemberExpression, isArrayLiteralExpression, isArrayType, isCallableType, isCallExpression, isCallfuncExpression, isDottedGetExpression, isEscapedCharCodeLiteralExpression, isFunctionExpression, isFunctionStatement, isIntegerType, isInterfaceMethodStatement, isInvalidType, isLiteralBoolean, isLiteralExpression, isLiteralNumber, isLiteralString, isLongIntegerType, isMethodStatement, isNamespaceStatement, isNativeType, isNewExpression, isPrimitiveType, isReferenceType, isStringType, isTemplateStringExpression, isTypecastExpression, isTypeStatementType, isUnaryExpression, isVariableExpression, isVoidType } from '../astUtils/reflection';
+import type { GetTypeOptions, TranspileResult, TypedefProvider } from '../interfaces';
+import { TypeChainEntry } from '../interfaces';
 import { VoidType } from '../types/VoidType';
 import { DynamicType } from '../types/DynamicType';
 import type { BscType } from '../types/BscType';
-import { FunctionType } from '../types/FunctionType';
 import type { AstNode } from './AstNode';
-import { Expression } from './AstNode';
+import { AstNodeKind, Expression } from './AstNode';
 import { SymbolTable } from '../SymbolTable';
 import { SourceNode } from 'source-map';
+import type { TranspileState } from './TranspileState';
+import { StringType } from '../types/StringType';
+import { TypePropertyReferenceType } from '../types/ReferenceType';
+import { UnionType } from '../types/UnionType';
+import { ArrayType } from '../types/ArrayType';
+import { AssociativeArrayType } from '../types/AssociativeArrayType';
+import { TypedFunctionType } from '../types/TypedFunctionType';
+import { InvalidType } from '../types/InvalidType';
+import { UninitializedType } from '../types/UninitializedType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { FunctionType } from '../types/FunctionType';
+import type { BaseFunctionType } from '../types/BaseFunctionType';
+import { brsDocParser } from './BrightScriptDocParser';
+import { InlineInterfaceType } from '../types/InlineInterfaceType';
+import { IntersectionType } from '../types/IntersectionType';
 
 export type ExpressionVisitor = (expression: Expression, parent: Expression) => void;
 
 export class BinaryExpression extends Expression {
-    constructor(
-        public left: Expression,
-        public operator: Token,
-        public right: Expression
-    ) {
+    constructor(options: {
+        left: Expression;
+        operator: Token;
+        right: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.left, this.operator, this.right);
+        this.tokens = {
+            operator: options.operator
+        };
+        this.left = options.left;
+        this.right = options.right;
+        this.location = util.createBoundingLocation(this.left, this.tokens.operator, this.right);
     }
+    readonly tokens: {
+        readonly operator: Token;
+    };
 
-    public readonly range: Range | undefined;
+    public readonly left: Expression;
+    public readonly right: Expression;
 
-    transpile(state: BrsTranspileState) {
+    public readonly kind = AstNodeKind.BinaryExpression;
+
+    public readonly location: Location | undefined;
+
+    transpile(state: BrsTranspileState): TranspileResult {
         return [
             state.sourceNode(this.left, this.left.transpile(state)),
             ' ',
-            state.transpileToken(this.operator),
+            state.transpileToken(this.tokens.operator),
             ' ',
             state.sourceNode(this.right, this.right.transpile(state))
         ];
@@ -52,18 +81,44 @@ export class BinaryExpression extends Expression {
         }
     }
 
+
+    public getType(options: GetTypeOptions): BscType {
+        const operatorKind = this.tokens.operator.kind;
+        if (options.flags & SymbolTypeFlag.typetime) {
+            // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+            switch (operatorKind) {
+                case TokenKind.Or:
+                    return new UnionType([this.left.getType(options), this.right.getType(options)]);
+                case TokenKind.And:
+                    return new IntersectionType([this.left.getType(options), this.right.getType(options)]);
+                //TODO: Intersection Types?, eg. case TokenKind.And:
+            }
+        } else if (options.flags & SymbolTypeFlag.runtime) {
+            return util.binaryOperatorResultType(
+                this.left.getType(options),
+                this.tokens.operator,
+                this.right.getType(options)) ?? DynamicType.instance;
+        }
+        return DynamicType.instance;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.left.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new BinaryExpression(
-                this.left?.clone(),
-                util.cloneToken(this.operator),
-                this.right?.clone()
-            ),
+            new BinaryExpression({
+                left: this.left?.clone(),
+                operator: util.cloneToken(this.tokens.operator),
+                right: this.right?.clone()
+            }),
             ['left', 'right']
         );
     }
 }
 
+
 export class CallExpression extends Expression {
     /**
      * Number of parameters that can be defined on a function
@@ -73,42 +128,52 @@ export class CallExpression extends Expression {
      */
     static MaximumArguments = 63;
 
-    constructor(
-        readonly callee: Expression,
-        /**
-         * Can either be `(`, or `?(` for optional chaining
-         */
-        readonly openingParen: Token,
-        readonly closingParen: Token,
-        readonly args: Expression[],
-        unused?: any
-    ) {
+    constructor(options: {
+        callee: Expression;
+        openingParen?: Token;
+        args?: Expression[];
+        closingParen?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.callee, this.openingParen, ...args ?? [], this.closingParen);
+        this.tokens = {
+            openingParen: options.openingParen,
+            closingParen: options.closingParen
+        };
+        this.callee = options.callee;
+        this.args = options.args ?? [];
+        this.location = util.createBoundingLocation(this.callee, this.tokens.openingParen, ...this.args ?? [], this.tokens.closingParen);
     }
 
-    public readonly range: Range | undefined;
+    readonly callee: Expression;
+    readonly args: Expression[];
+    readonly tokens: {
+        /**
+         * Can either be `(`, or `?(` for optional chaining - defaults to '('
+         */
+        readonly openingParen?: Token;
+        readonly closingParen?: Token;
+    };
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    public get namespaceName() {
-        return this.findAncestor<NamespaceStatement>(isNamespaceStatement)?.nameExpression;
-    }
+    public readonly kind = AstNodeKind.CallExpression;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState, nameOverride?: string) {
         let result: TranspileResult = [];
 
         //transpile the name
         if (nameOverride) {
-            result.push(state.sourceNode(this.callee, nameOverride));
+            result.push(
+                //transpile leading comments since we're bypassing callee.transpile (which would normally do this)
+                ...state.transpileLeadingCommentsForAstNode(this),
+                state.sourceNode(this.callee, nameOverride)
+            );
         } else {
             result.push(...this.callee.transpile(state));
         }
 
         result.push(
-            state.transpileToken(this.openingParen)
+            state.transpileToken(this.tokens.openingParen, '(')
         );
         for (let i = 0; i < this.args.length; i++) {
             //add comma between args
@@ -118,11 +183,9 @@ export class CallExpression extends Expression {
             let arg = this.args[i];
             result.push(...arg.transpile(state));
         }
-        if (this.closingParen) {
-            result.push(
-                state.transpileToken(this.closingParen)
-            );
-        }
+        result.push(
+            state.transpileToken(this.tokens.closingParen, ')')
+        );
         return result;
     }
 
@@ -133,105 +196,123 @@ export class CallExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        let calleeType = this.callee.getType(options);
+        while (isTypeStatementType(calleeType)) {
+            calleeType = calleeType.wrappedType;
+        }
+        if (options.ignoreCall) {
+            return calleeType;
+        }
+        if (isNewExpression(this.parent)) {
+            return calleeType;
+        }
+
+        const specialCaseReturnType = util.getSpecialCaseCallExpressionReturnType(this, options);
+        if (specialCaseReturnType) {
+            return specialCaseReturnType;
+        }
+        if (isCallableType(calleeType) && (!isReferenceType(calleeType.returnType) || calleeType.returnType?.isResolvable())) {
+            if (isVoidType(calleeType.returnType)) {
+                if (options.data?.isBuiltIn) {
+                    // built in functions that return `as void` will not initialize the result
+                    return UninitializedType.instance;
+                }
+                // non-built in functions with return type`as void` actually return `invalid`
+                return InvalidType.instance;
+            }
+            return calleeType.returnType;
+        }
+        if (util.isUnionOfFunctions(calleeType, true)) {
+            return util.getReturnTypeOfUnionOfFunctions(calleeType);
+        }
+        if (!isReferenceType(calleeType) && (calleeType as BaseFunctionType)?.returnType?.isResolvable()) {
+            return (calleeType as BaseFunctionType).returnType;
+        }
+        return new TypePropertyReferenceType(calleeType, 'returnType');
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.callee.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new CallExpression(
-                this.callee?.clone(),
-                util.cloneToken(this.openingParen),
-                util.cloneToken(this.closingParen),
-                this.args?.map(e => e?.clone())
-            ),
+            new CallExpression({
+                callee: this.callee?.clone(),
+                openingParen: util.cloneToken(this.tokens.openingParen),
+                closingParen: util.cloneToken(this.tokens.closingParen),
+                args: this.args?.map(e => e?.clone())
+            }),
             ['callee', 'args']
         );
     }
 }
 
 export class FunctionExpression extends Expression implements TypedefProvider {
-    constructor(
-        readonly parameters: FunctionParameterExpression[],
-        public body: Block,
-        readonly functionType: Token | null,
-        public end: Token,
-        readonly leftParen: Token,
-        readonly rightParen: Token,
-        readonly asToken?: Token,
-        readonly returnTypeToken?: Token
-    ) {
+    constructor(options: {
+        functionType?: Token;
+        leftParen?: Token;
+        parameters?: FunctionParameterExpression[];
+        rightParen?: Token;
+        as?: Token;
+        returnTypeExpression?: TypeExpression;
+        body: Block;
+        endFunctionType?: Token;
+    }) {
         super();
-        this.setReturnType(); // set the initial return type that we parse
+        this.tokens = {
+            functionType: options.functionType,
+            leftParen: options.leftParen,
+            rightParen: options.rightParen,
+            as: options.as,
+            endFunctionType: options.endFunctionType
+        };
+        this.parameters = options.parameters ?? [];
+        this.body = options.body;
+        this.returnTypeExpression = options.returnTypeExpression;
 
-        //if there's a body, and it doesn't have a SymbolTable, assign one
-        if (this.body && !this.body.symbolTable) {
-            this.body.symbolTable = new SymbolTable(`Function Body`);
+        if (this.body) {
+            this.body.parent = this;
         }
         this.symbolTable = new SymbolTable('FunctionExpression', () => this.parent?.getSymbolTable());
     }
 
-    /**
-     * The type this function returns
-     */
-    public returnType: BscType;
+    public readonly kind = AstNodeKind.FunctionExpression;
 
-    /**
-     * Does this method require the return type to be present after transpile (useful for `as void` or the `as boolean` in `onKeyEvent`)
-     */
-    private requiresReturnType: boolean;
+    readonly parameters: FunctionParameterExpression[];
+    public readonly body: Block;
+    public readonly returnTypeExpression?: TypeExpression;
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    public get namespaceName() {
-        return this.findAncestor<NamespaceStatement>(isNamespaceStatement)?.nameExpression;
-    }
+    readonly tokens: {
+        readonly functionType?: Token;
+        readonly endFunctionType?: Token;
+        readonly leftParen?: Token;
+        readonly rightParen?: Token;
+        readonly as?: Token;
+    };
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isFunctionExpression)` instead.
-     */
-    public get parentFunction() {
-        return this.findAncestor<FunctionExpression>(isFunctionExpression);
+    public get leadingTrivia(): Token[] {
+        return this.tokens.functionType?.leadingTrivia;
     }
 
-    /**
-     * The list of function calls that are declared within this function scope. This excludes CallExpressions
-     * declared in child functions
-     */
-    public callExpressions = [] as CallExpression[];
-
-    /**
-     * If this function is part of a FunctionStatement, this will be set. Otherwise this will be undefined
-     */
-    public functionStatement?: FunctionStatement;
-
-    /**
-     * A list of all child functions declared directly within this function
-     * @deprecated use `.walk(createVisitor({ FunctionExpression: ()=>{}), { walkMode: WalkMode.visitAllRecursive })` instead
-     */
-    public get childFunctionExpressions() {
-        const expressions = [] as FunctionExpression[];
-        this.walk(createVisitor({
-            FunctionExpression: (expression) => {
-                expressions.push(expression);
-            }
-        }), {
-            walkMode: WalkMode.visitAllRecursive
-        });
-        return expressions;
+    public get endTrivia(): Token[] {
+        return this.tokens.endFunctionType?.leadingTrivia;
     }
 
     /**
      * The range of the function, starting at the 'f' in function or 's' in sub (or the open paren if the keyword is missing),
      * and ending with the last n' in 'end function' or 'b' in 'end sub'
      */
-    public get range() {
-        return util.createBoundingRange(
-            this.functionType, this.leftParen,
+    public get location(): Location {
+        return util.createBoundingLocation(
+            this.tokens.functionType,
+            this.tokens.leftParen,
             ...this.parameters ?? [],
-            this.rightParen,
-            this.asToken,
-            this.returnTypeToken,
-            this.end
+            this.tokens.rightParen,
+            this.tokens.as,
+            this.returnTypeExpression,
+            this.tokens.endFunctionType
         );
     }
 
@@ -239,7 +320,7 @@ export class FunctionExpression extends Expression implements TypedefProvider {
         let results = [] as TranspileResult;
         //'function'|'sub'
         results.push(
-            state.transpileToken(this.functionType!)
+            state.transpileToken(this.tokens.functionType, 'function', false, state.skipLeadingComments)
         );
         //functionName?
         if (name) {
@@ -250,7 +331,7 @@ export class FunctionExpression extends Expression implements TypedefProvider {
         }
         //leftParen
         results.push(
-            state.transpileToken(this.leftParen)
+            state.transpileToken(this.tokens.leftParen, '(')
         );
         //parameters
         for (let i = 0; i < this.parameters.length; i++) {
@@ -264,31 +345,32 @@ export class FunctionExpression extends Expression implements TypedefProvider {
         }
         //right paren
         results.push(
-            state.transpileToken(this.rightParen)
+            state.transpileToken(this.tokens.rightParen, ')')
         );
         //as [Type]
-        this.setReturnType(); // check one more time before transpile
-        if (this.asToken && !(state.options.removeParameterTypes && !this.requiresReturnType)) {
+
+        if (this.tokens.as && this.returnTypeExpression && (this.requiresReturnType || !state.options.removeParameterTypes)) {
             results.push(
                 ' ',
                 //as
-                state.transpileToken(this.asToken),
+                state.transpileToken(this.tokens.as, 'as'),
                 ' ',
                 //return type
-                state.sourceNode(this.returnTypeToken!, this.returnType.toTypeString())
+                ...this.returnTypeExpression.transpile(state)
             );
         }
+        let hasBody = false;
         if (includeBody) {
             state.lineage.unshift(this);
             let body = this.body.transpile(state);
+            hasBody = body.length > 0;
             state.lineage.shift();
             results.push(...body);
         }
-        results.push('\n');
-        //'end sub'|'end function'
+
+        const lastLocatable = hasBody ? this.body : this.returnTypeExpression ?? this.tokens.leftParen ?? this.tokens.functionType;
         results.push(
-            state.indent(),
-            state.transpileToken(this.end)
+            ...state.transpileEndBlockToken(lastLocatable, this.tokens.endFunctionType, `end ${this.tokens.functionType ?? 'function'}`)
         );
         return results;
     }
@@ -297,9 +379,9 @@ export class FunctionExpression extends Expression implements TypedefProvider {
         let results = [
             new SourceNode(1, 0, null, [
                 //'function'|'sub'
-                this.functionType?.text,
+                this.tokens.functionType?.text ?? 'function',
                 //functionName?
-                ...(isFunctionStatement(this.parent) || isMethodStatement(this.parent) ? [' ', this.parent.name?.text ?? ''] : []),
+                ...(isFunctionStatement(this.parent) || isMethodStatement(this.parent) ? [' ', this.parent.tokens.name?.text ?? ''] : []),
                 //leftParen
                 '(',
                 //parameters
@@ -313,14 +395,16 @@ export class FunctionExpression extends Expression implements TypedefProvider {
                 //right paren
                 ')',
                 //as <ReturnType>
-                ...(this.asToken ? [
-                    ' as ',
-                    this.returnTypeToken?.text
+                ...(this.returnTypeExpression ? [
+                    ' ',
+                    this.tokens.as?.text ?? 'as',
+                    ' ',
+                    ...this.returnTypeExpression.getTypedef(state)
                 ] : []),
                 '\n',
                 state.indent(),
                 //'end sub'|'end function'
-                this.end.text
+                this.tokens.endFunctionType?.text ?? `end ${this.tokens.functionType ?? 'function'}`
             ])
         ];
         return results;
@@ -329,7 +413,7 @@ export class FunctionExpression extends Expression implements TypedefProvider {
     walk(visitor: WalkVisitor, options: WalkOptions) {
         if (options.walkMode & InternalWalkMode.walkExpressions) {
             walkArray(this.parameters, visitor, options, this);
-
+            walk(this, 'returnTypeExpression', visitor, options);
             //This is the core of full-program walking...it allows us to step into sub functions
             if (options.walkMode & InternalWalkMode.recurseChildFunctions) {
                 walk(this, 'body', visitor, options);
@@ -337,17 +421,48 @@ export class FunctionExpression extends Expression implements TypedefProvider {
         }
     }
 
-    getFunctionType(): FunctionType {
-        let functionType = new FunctionType(this.returnType);
-        functionType.isSub = this.functionType?.text === 'sub';
+    public getType(options: GetTypeOptions): TypedFunctionType {
+        //if there's a defined return type, use that
+        let returnType: BscType;
+
+        const docs = brsDocParser.parseNode(this.findAncestor(isFunctionStatement));
+
+        returnType = util.chooseTypeFromCodeOrDocComment(
+            this.returnTypeExpression?.getType({ ...options, typeChain: undefined }),
+            docs.getReturnBscType({ ...options, tableProvider: () => this.getSymbolTable() }),
+            options
+        );
+
+        const isSub = this.tokens.functionType?.kind === TokenKind.Sub;
+        //if we don't have a return type and this is a sub, set the return type to `void`. else use `dynamic`
+        if (!returnType) {
+            returnType = isSub ? VoidType.instance : DynamicType.instance;
+        }
+
+        const resultType = new TypedFunctionType(returnType);
+        resultType.isSub = isSub;
         for (let param of this.parameters) {
-            functionType.addParameter(param.name.text, param.type, !!param.typeToken);
+            resultType.addParameter(param.tokens.name.text, param.getType({ ...options, typeChain: undefined }), !!param.defaultValue);
+        }
+        // Figure out this function's name if we can
+        let funcName = '';
+        if (isMethodStatement(this.parent) || isInterfaceMethodStatement(this.parent)) {
+            funcName = this.parent.getName(ParseMode.BrighterScript);
+            if (options.typeChain) {
+                // Get the typechain info from the parent class
+                this.parent.parent?.getType(options);
+            }
+        } else if (isFunctionStatement(this.parent)) {
+            funcName = this.parent.getName(ParseMode.BrighterScript);
         }
-        return functionType;
+        if (funcName) {
+            resultType.setName(funcName);
+        }
+        options.typeChain?.push(new TypeChainEntry({ name: funcName, type: resultType, data: options.data, astNode: this }));
+        return resultType;
     }
 
-    private setReturnType() {
-
+    private get requiresReturnType() {
         /**
          * RokuOS methods can be written several different ways:
          * 1. Function() : return withValue
@@ -364,110 +479,139 @@ export class FunctionExpression extends Expression implements TypedefProvider {
          * 7. Additionally, as a special case, the OS requires that `onKeyEvent()` be defined with `as boolean`
          */
 
-        const isSub = this.functionType?.text.toLowerCase() === 'sub';
 
-        if (this.returnTypeToken) {
-            this.returnType = util.tokenToBscType(this.returnTypeToken);
-        } else if (isSub) {
-            this.returnType = new VoidType();
-        } else {
-            this.returnType = DynamicType.instance;
+        if ((isFunctionStatement(this.parent) || isMethodStatement(this.parent)) && this.parent?.tokens?.name?.text.toLowerCase() === 'onkeyevent') {
+            // onKeyEvent() requires 'as Boolean' otherwise RokuOS throws errors
+            return true;
         }
+        const isSub = this.tokens.functionType?.text.toLowerCase() === 'sub';
+        const returnType = this.returnTypeExpression?.getType({ flags: SymbolTypeFlag.typetime });
+        const isVoidReturnType = isVoidType(returnType);
 
-        if ((isFunctionStatement(this.parent) || isMethodStatement(this.parent)) && this.parent?.name?.text.toLowerCase() === 'onkeyevent') {
-            // onKeyEvent() requires 'as Boolean' otherwise RokuOS throws errors
-            this.requiresReturnType = true;
-        } else if (isSub && !isVoidType(this.returnType)) { // format (6)
-            this.requiresReturnType = true;
-        } else if (this.returnTypeToken && isVoidType(this.returnType)) { // format (3)
-            this.requiresReturnType = true;
+
+        if (isSub && !isVoidReturnType) { // format (6)
+            return true;
+        } else if (isVoidReturnType) { // format (3)
+            return true;
         }
+
+        return false;
     }
 
     public clone() {
-        const clone = this.finalizeClone(
-            new FunctionExpression(
-                this.parameters?.map(e => e?.clone()),
-                this.body?.clone(),
-                util.cloneToken(this.functionType),
-                util.cloneToken(this.end),
-                util.cloneToken(this.leftParen),
-                util.cloneToken(this.rightParen),
-                util.cloneToken(this.asToken),
-                util.cloneToken(this.returnTypeToken)
-            ),
-            ['body']
+        return this.finalizeClone(
+            new FunctionExpression({
+                parameters: this.parameters?.map(e => e?.clone()),
+                body: this.body?.clone(),
+                functionType: util.cloneToken(this.tokens.functionType),
+                endFunctionType: util.cloneToken(this.tokens.endFunctionType),
+                leftParen: util.cloneToken(this.tokens.leftParen),
+                rightParen: util.cloneToken(this.tokens.rightParen),
+                as: util.cloneToken(this.tokens.as),
+                returnTypeExpression: this.returnTypeExpression?.clone()
+            }),
+            ['body', 'returnTypeExpression']
         );
-
-        //rebuild the .callExpressions list in the clone
-        clone.body?.walk?.((node) => {
-            if (isCallExpression(node) && !isNewExpression(node.parent)) {
-                clone.callExpressions.push(node);
-            }
-        }, { walkMode: WalkMode.visitExpressions });
-        return clone;
     }
 }
 
 export class FunctionParameterExpression extends Expression {
-    constructor(
-        public name: Identifier,
-        public typeToken?: Token,
-        public defaultValue?: Expression,
-        public asToken?: Token
-    ) {
+    constructor(options: {
+        name: Identifier;
+        equals?: Token;
+        defaultValue?: Expression;
+        as?: Token;
+        typeExpression?: TypeExpression;
+    }) {
         super();
-        if (typeToken) {
-            this.type = util.tokenToBscType(typeToken);
-        } else {
-            this.type = new DynamicType();
-        }
+        this.tokens = {
+            name: options.name,
+            equals: options.equals,
+            as: options.as
+        };
+        this.defaultValue = options.defaultValue;
+        this.typeExpression = options.typeExpression;
     }
 
-    public type: BscType;
+    public readonly kind = AstNodeKind.FunctionParameterExpression;
 
-    public get range(): Range | undefined {
-        return util.createBoundingRange(
-            this.name,
-            this.asToken,
-            this.typeToken,
+    readonly tokens: {
+        readonly name: Identifier;
+        readonly equals?: Token;
+        readonly as?: Token;
+    };
+
+    public readonly defaultValue?: Expression;
+    public readonly typeExpression?: TypeExpression;
+
+    public getType(options: GetTypeOptions) {
+        const docs = brsDocParser.parseNode(this.findAncestor(isFunctionStatement));
+        const paramName = this.tokens.name.text;
+
+        let paramTypeFromCode = this.typeExpression?.getType({ ...options, flags: SymbolTypeFlag.typetime, typeChain: undefined }) ??
+            util.getDefaultTypeFromValueType(this.defaultValue?.getType({ ...options, flags: SymbolTypeFlag.runtime, typeChain: undefined }));
+        if (isInvalidType(paramTypeFromCode) || isVoidType(paramTypeFromCode)) {
+            paramTypeFromCode = undefined;
+        }
+        const paramTypeFromDoc = docs.getParamBscType(paramName, { ...options, fullName: paramName, typeChain: undefined, tableProvider: () => this.getSymbolTable() });
+        const paramType = util.chooseTypeFromCodeOrDocComment(paramTypeFromCode, paramTypeFromDoc, options) ?? DynamicType.instance;
+
+        const docDescription = docs.getParam(paramName)?.description;
+        if (docDescription) {
+            options.data = options.data ?? {};
+            options.data.description = docDescription;
+        }
+        options.typeChain?.push(new TypeChainEntry({ name: paramName, type: paramType, data: options.data, astNode: this }));
+        return paramType;
+    }
+
+    public get location(): Location | undefined {
+        return util.createBoundingLocation(
+            this.tokens.name,
+            this.tokens.as,
+            this.typeExpression,
+            this.tokens.equals,
             this.defaultValue
         );
     }
 
     public transpile(state: BrsTranspileState) {
-        let result = [
+        let result: TranspileResult = [
             //name
-            state.transpileToken(this.name)
-        ] as any[];
+            state.transpileToken(this.tokens.name)
+        ];
         //default value
         if (this.defaultValue) {
             result.push(' = ');
             result.push(this.defaultValue.transpile(state));
         }
         //type declaration
-        if (this.asToken && !state.options.removeParameterTypes) {
+        if (this.typeExpression && !state.options.removeParameterTypes) {
             result.push(' ');
-            result.push(state.transpileToken(this.asToken));
+            result.push(state.transpileToken(this.tokens.as, 'as'));
             result.push(' ');
-            result.push(state.sourceNode(this.typeToken!, this.type.toTypeString()));
+            result.push(
+                ...(this.typeExpression?.transpile(state) ?? [])
+            );
         }
 
         return result;
     }
 
     public getTypedef(state: BrsTranspileState): TranspileResult {
-        const results = [this.name.text] as TranspileResult;
+        const results = [this.tokens.name.text] as TranspileResult;
 
         if (this.defaultValue) {
             results.push(' = ', ...(this.defaultValue.getTypedef(state) ?? this.defaultValue.transpile(state)));
         }
 
-        if (this.asToken) {
+        if (this.tokens.as) {
             results.push(' as ');
 
-            if (this.typeToken) {
-                results.push(this.typeToken.text);
+            // TODO: Is this conditional needed? Will typeToken always exist
+            // so long as `asToken` exists?
+            if (this.typeExpression) {
+                results.push(...(this.typeExpression?.getTypedef(state) ?? ['']));
             }
         }
 
@@ -476,111 +620,71 @@ export class FunctionParameterExpression extends Expression {
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
         // eslint-disable-next-line no-bitwise
-        if (this.defaultValue && options.walkMode & InternalWalkMode.walkExpressions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
             walk(this, 'defaultValue', visitor, options);
+            walk(this, 'typeExpression', visitor, options);
         }
     }
 
-    public clone() {
-        return this.finalizeClone(
-            new FunctionParameterExpression(
-                util.cloneToken(this.name),
-                util.cloneToken(this.typeToken),
-                this.defaultValue?.clone(),
-                util.cloneToken(this.asToken)
-            ),
-            ['defaultValue']
-        );
-    }
-}
-
-export class NamespacedVariableNameExpression extends Expression {
-    constructor(
-        //if this is a `DottedGetExpression`, it must be comprised only of `VariableExpression`s
-        readonly expression: DottedGetExpression | VariableExpression
-    ) {
-        super();
-        this.range = expression?.range;
-    }
-    range: Range | undefined;
-
-    transpile(state: BrsTranspileState) {
-        return [
-            state.sourceNode(this, this.getName(ParseMode.BrightScript))
-        ];
-    }
-
-    getTypedef(state) {
-        return [
-            state.sourceNode(this, this.getName(ParseMode.BrighterScript))
-        ];
-    }
-
-    public getNameParts() {
-        let parts = [] as string[];
-        if (isVariableExpression(this.expression)) {
-            parts.push(this.expression.name.text);
-        } else {
-            let expr = this.expression;
-
-            parts.push(expr.name.text);
-
-            while (isVariableExpression(expr) === false) {
-                expr = expr.obj as DottedGetExpression;
-                parts.unshift(expr.name.text);
-            }
-        }
-        return parts;
-    }
-
-    getName(parseMode: ParseMode) {
-        if (parseMode === ParseMode.BrighterScript) {
-            return this.getNameParts().join('.');
-        } else {
-            return this.getNameParts().join('_');
-        }
-    }
-
-    walk(visitor: WalkVisitor, options: WalkOptions) {
-        this.expression?.link();
-        if (options.walkMode & InternalWalkMode.walkExpressions) {
-            walk(this, 'expression', visitor, options);
-        }
+    get leadingTrivia(): Token[] {
+        return this.tokens.name.leadingTrivia;
     }
 
     public clone() {
         return this.finalizeClone(
-            new NamespacedVariableNameExpression(
-                this.expression?.clone()
-            )
+            new FunctionParameterExpression({
+                name: util.cloneToken(this.tokens.name),
+                as: util.cloneToken(this.tokens.as),
+                typeExpression: this.typeExpression?.clone(),
+                equals: util.cloneToken(this.tokens.equals),
+                defaultValue: this.defaultValue?.clone()
+            }),
+            ['typeExpression', 'defaultValue']
         );
     }
 }
 
 export class DottedGetExpression extends Expression {
-    constructor(
-        readonly obj: Expression,
-        readonly name: Identifier,
+    constructor(options: {
+        obj: Expression;
+        name: Identifier;
         /**
-         * Can either be `.`, or `?.` for optional chaining
+         * Can either be `.`, or `?.` for optional chaining - defaults in transpile to '.'
          */
-        readonly dot: Token
-    ) {
+        dot?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.obj, this.dot, this.name);
+        this.tokens = {
+            name: options.name,
+            dot: options.dot
+        };
+        this.obj = options.obj;
+
+        this.location = util.createBoundingLocation(this.obj, this.tokens.dot, this.tokens.name);
     }
 
-    public readonly range: Range | undefined;
+    readonly tokens: {
+        readonly name: Identifier;
+        readonly dot?: Token;
+    };
+    readonly obj: Expression;
+
+    public readonly kind = AstNodeKind.DottedGetExpression;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         //if the callee starts with a namespace name, transpile the name
         if (state.file.calleeStartsWithNamespace(this)) {
-            return new NamespacedVariableNameExpression(this as DottedGetExpression | VariableExpression).transpile(state);
+            return [
+                ...state.transpileLeadingCommentsForAstNode(this),
+                state.sourceNode(this, this.getName(ParseMode.BrightScript))
+            ];
         } else {
             return [
                 ...this.obj.transpile(state),
-                state.transpileToken(this.dot),
-                state.transpileToken(this.name)
+                state.transpileToken(this.tokens.dot, '.'),
+                state.transpileToken(this.tokens.name)
             ];
         }
     }
@@ -589,8 +693,8 @@ export class DottedGetExpression extends Expression {
         //always transpile the dots for typedefs
         return [
             ...(this.obj.getTypedef ? this.obj.getTypedef(state) : this.obj.transpile(state)),
-            state.transpileToken(this.dot),
-            state.transpileToken(this.name)
+            state.transpileToken(this.tokens.dot),
+            state.transpileToken(this.tokens.name)
         ];
     }
 
@@ -600,38 +704,83 @@ export class DottedGetExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const objType = this.obj?.getType(options);
+        let result = objType?.getMemberType(this.tokens.name?.text, options);
+
+        if (util.isClassUsedAsFunction(result, this, options)) {
+            // treat this class constructor as a function
+            result = FunctionType.instance;
+        }
+        options.typeChain?.push(new TypeChainEntry({
+            name: this.tokens.name?.text,
+            type: result,
+            data: options.data,
+            location: this.tokens.name?.location ?? this.location,
+            astNode: this
+        }));
+        if (result ||
+            options.flags & SymbolTypeFlag.typetime ||
+            (isPrimitiveType(objType) || isCallableType(objType))) {
+            // All types should be known at typeTime, or the obj is well known
+            return result;
+        }
+        // It is possible at runtime that a value has been added dynamically to an object, or something
+        // TODO: maybe have a strict flag on this?
+        return DynamicType.instance;
+    }
+
+    getName(parseMode: ParseMode) {
+        return util.getAllDottedGetPartsAsString(this, parseMode);
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.obj.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new DottedGetExpression(
-                this.obj?.clone(),
-                util.cloneToken(this.name),
-                util.cloneToken(this.dot)
-            ),
+            new DottedGetExpression({
+                obj: this.obj?.clone(),
+                dot: util.cloneToken(this.tokens.dot),
+                name: util.cloneToken(this.tokens.name)
+            }),
             ['obj']
         );
     }
 }
 
 export class XmlAttributeGetExpression extends Expression {
-    constructor(
-        readonly obj: Expression,
-        readonly name: Identifier,
+    constructor(options: {
+        obj: Expression;
         /**
-         * Can either be `@`, or `?@` for optional chaining
+         * Can either be `@`, or `?@` for optional chaining - defaults to '@'
          */
-        readonly at: Token
-    ) {
+        at?: Token;
+        name: Identifier;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.obj, this.at, this.name);
+        this.obj = options.obj;
+        this.tokens = { at: options.at, name: options.name };
+        this.location = util.createBoundingLocation(this.obj, this.tokens.at, this.tokens.name);
     }
 
-    public readonly range: Range | undefined;
+    public readonly kind = AstNodeKind.XmlAttributeGetExpression;
+
+    public readonly tokens: {
+        name: Identifier;
+        at?: Token;
+    };
+
+    public readonly obj: Expression;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         return [
             ...this.obj.transpile(state),
-            state.transpileToken(this.at),
-            state.transpileToken(this.name)
+            state.transpileToken(this.tokens.at, '@'),
+            state.transpileToken(this.tokens.name)
         ];
     }
 
@@ -641,60 +790,86 @@ export class XmlAttributeGetExpression extends Expression {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.obj.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new XmlAttributeGetExpression(
-                this.obj?.clone(),
-                util.cloneToken(this.name),
-                util.cloneToken(this.at)
-            ),
+            new XmlAttributeGetExpression({
+                obj: this.obj?.clone(),
+                at: util.cloneToken(this.tokens.at),
+                name: util.cloneToken(this.tokens.name)
+            }),
             ['obj']
         );
     }
 }
 
 export class IndexedGetExpression extends Expression {
-    constructor(
-        public obj: Expression,
-        public index: Expression,
-        /**
-         * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.`
-         */
-        public openingSquare: Token,
-        public closingSquare: Token,
-        public questionDotToken?: Token, //  ? or ?.
+    constructor(options: {
+        obj: Expression;
+        indexes: Expression[];
         /**
-         * More indexes, separated by commas
+         * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.` - defaults to '[' in transpile
          */
-        public additionalIndexes?: Expression[]
-    ) {
+        openingSquare?: Token;
+        closingSquare?: Token;
+        questionDot?: Token;//  ? or ?.
+    }) {
         super();
-        this.range = util.createBoundingRange(this.obj, this.openingSquare, this.questionDotToken, this.openingSquare, this.index, this.closingSquare);
-        this.additionalIndexes ??= [];
+        this.tokens = {
+            openingSquare: options.openingSquare,
+            closingSquare: options.closingSquare,
+            questionDot: options.questionDot
+        };
+        this.obj = options.obj;
+        this.indexes = options.indexes;
+        this.location = util.createBoundingLocation(
+            this.obj,
+            this.tokens.openingSquare,
+            this.tokens.questionDot,
+            this.tokens.openingSquare,
+            ...this.indexes ?? [],
+            this.tokens.closingSquare
+        );
     }
 
-    public readonly range: Range | undefined;
+    public readonly kind = AstNodeKind.IndexedGetExpression;
+
+    public readonly obj: Expression;
+    public readonly indexes: Expression[];
+
+    readonly tokens: {
+        /**
+         * Can either be `[` or `?[`. If `?.[` is used, this will be `[` and `optionalChainingToken` will be `?.` - defaults to '[' in transpile
+         */
+        readonly openingSquare?: Token;
+        readonly closingSquare?: Token;
+        readonly questionDot?: Token; //  ? or ?.
+    };
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         const result = [];
         result.push(
             ...this.obj.transpile(state),
-            this.questionDotToken ? state.transpileToken(this.questionDotToken) : '',
-            state.transpileToken(this.openingSquare)
+            this.tokens.questionDot ? state.transpileToken(this.tokens.questionDot) : '',
+            state.transpileToken(this.tokens.openingSquare, '[')
         );
-        const indexes = [this.index, ...this.additionalIndexes ?? []];
-        for (let i = 0; i < indexes.length; i++) {
+        for (let i = 0; i < this.indexes.length; i++) {
             //add comma between indexes
             if (i > 0) {
                 result.push(', ');
             }
-            let index = indexes[i];
+            let index = this.indexes[i];
             result.push(
                 ...(index?.transpile(state) ?? [])
             );
         }
         result.push(
-            this.closingSquare ? state.transpileToken(this.closingSquare) : ''
+            state.transpileToken(this.tokens.closingSquare, ']')
         );
         return result;
     }
@@ -702,48 +877,70 @@ export class IndexedGetExpression extends Expression {
     walk(visitor: WalkVisitor, options: WalkOptions) {
         if (options.walkMode & InternalWalkMode.walkExpressions) {
             walk(this, 'obj', visitor, options);
-            walk(this, 'index', visitor, options);
-            walkArray(this.additionalIndexes, visitor, options, this);
+            walkArray(this.indexes, visitor, options, this);
+        }
+    }
+
+    getType(options: GetTypeOptions): BscType {
+        const objType = this.obj.getType(options);
+        if (isArrayType(objType)) {
+            // This is used on an array. What is the default type of that array?
+            return objType.defaultType;
         }
+        return super.getType(options);
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.obj.leadingTrivia;
     }
 
     public clone() {
         return this.finalizeClone(
-            new IndexedGetExpression(
-                this.obj?.clone(),
-                this.index?.clone(),
-                util.cloneToken(this.openingSquare),
-                util.cloneToken(this.closingSquare),
-                util.cloneToken(this.questionDotToken),
-                this.additionalIndexes?.map(e => e?.clone())
-            ),
-            ['obj', 'index', 'additionalIndexes']
+            new IndexedGetExpression({
+                obj: this.obj?.clone(),
+                questionDot: util.cloneToken(this.tokens.questionDot),
+                openingSquare: util.cloneToken(this.tokens.openingSquare),
+                indexes: this.indexes?.map(x => x?.clone()),
+                closingSquare: util.cloneToken(this.tokens.closingSquare)
+            }),
+            ['obj', 'indexes']
         );
     }
 }
 
 export class GroupingExpression extends Expression {
-    constructor(
-        readonly tokens: {
-            left: Token;
-            right: Token;
-        },
-        public expression: Expression
-    ) {
+    constructor(options: {
+        leftParen?: Token;
+        rightParen?: Token;
+        expression: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.tokens.left, this.expression, this.tokens.right);
+        this.tokens = {
+            rightParen: options.rightParen,
+            leftParen: options.leftParen
+        };
+        this.expression = options.expression;
+        this.location = util.createBoundingLocation(this.tokens.leftParen, this.expression, this.tokens.rightParen);
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly leftParen?: Token;
+        readonly rightParen?: Token;
+    };
+    public readonly expression: Expression;
+
+    public readonly kind = AstNodeKind.GroupingExpression;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
-        if (isTypeCastExpression(this.expression)) {
+        if (isTypecastExpression(this.expression)) {
             return this.expression.transpile(state);
         }
         return [
-            state.transpileToken(this.tokens.left),
+            state.transpileToken(this.tokens.leftParen, '('),
             ...this.expression.transpile(state),
-            state.transpileToken(this.tokens.right)
+            state.transpileToken(this.tokens.rightParen, ')')
         ];
     }
 
@@ -753,55 +950,68 @@ export class GroupingExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        return this.expression.getType(options);
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.leftParen?.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new GroupingExpression(
-                {
-                    left: util.cloneToken(this.tokens.left),
-                    right: util.cloneToken(this.tokens.right)
-                },
-                this.expression?.clone()
-            ),
+            new GroupingExpression({
+                leftParen: util.cloneToken(this.tokens.leftParen),
+                expression: this.expression?.clone(),
+                rightParen: util.cloneToken(this.tokens.rightParen)
+            }),
             ['expression']
         );
     }
 }
 
 export class LiteralExpression extends Expression {
-    constructor(
-        public token: Token
-    ) {
+    constructor(options: {
+        value: Token;
+    }) {
         super();
-        this.type = util.tokenToBscType(token);
+        this.tokens = {
+            value: options.value
+        };
     }
 
-    public get range() {
-        return this.token.range;
+    public readonly tokens: {
+        readonly value: Token;
+    };
+
+    public readonly kind = AstNodeKind.LiteralExpression;
+
+    public get location() {
+        return this.tokens.value.location;
     }
 
-    /**
-     * The (data) type of this expression
-     */
-    public type: BscType;
+    public getType(options?: GetTypeOptions) {
+        return util.tokenToBscType(this.tokens.value);
+    }
 
     transpile(state: BrsTranspileState) {
         let text: string;
-        if (this.token.kind === TokenKind.TemplateStringQuasi) {
+        if (this.tokens.value.kind === TokenKind.TemplateStringQuasi) {
             //wrap quasis with quotes (and escape inner quotemarks)
-            text = `"${this.token.text.replace(/"/g, '""')}"`;
+            text = `"${this.tokens.value.text.replace(/"/g, '""')}"`;
 
-        } else if (isStringType(this.type)) {
-            text = this.token.text;
+        } else if (this.tokens.value.kind === TokenKind.StringLiteral) {
+            text = this.tokens.value.text;
             //add trailing quotemark if it's missing. We will have already generated a diagnostic for this.
             if (text.endsWith('"') === false) {
                 text += '"';
             }
         } else {
-            text = this.token.text;
+            text = this.tokens.value.text;
         }
 
         return [
-            state.sourceNode(this, text)
+            state.transpileToken({ ...this.tokens.value, text: text })
         ];
     }
 
@@ -809,31 +1019,89 @@ export class LiteralExpression extends Expression {
         //nothing to walk
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.value.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new LiteralExpression(
-                util.cloneToken(this.token)
-            )
+            new LiteralExpression({
+                value: util.cloneToken(this.tokens.value)
+            })
         );
     }
 }
 
 /**
- * This is a special expression only used within template strings. It exists so we can prevent producing lots of empty strings
- * during template string transpile by identifying these expressions explicitly and skipping the bslib_toString around them
+ * The print statement can have a mix of expressions and separators. These separators represent actual output to the screen,
+ * so this AstNode represents those separators (comma, semicolon, and whitespace)
  */
-export class EscapedCharCodeLiteralExpression extends Expression {
-    constructor(
-        readonly token: Token & { charCode: number }
-    ) {
+export class PrintSeparatorExpression extends Expression {
+    constructor(options: {
+        separator: PrintSeparatorToken;
+    }) {
         super();
-        this.range = token.range;
+        this.tokens = {
+            separator: options.separator
+        };
+        this.location = this.tokens.separator.location;
     }
-    readonly range: Range;
 
-    transpile(state: BrsTranspileState) {
+    public readonly tokens: {
+        readonly separator: PrintSeparatorToken;
+    };
+
+    public readonly kind = AstNodeKind.PrintSeparatorExpression;
+
+    public location: Location;
+
+    transpile(state: BrsTranspileState) {
+        return [
+            ...this.tokens.separator.leadingWhitespace ?? [],
+            ...state.transpileToken(this.tokens.separator)
+        ];
+    }
+
+    walk(visitor: WalkVisitor, options: WalkOptions) {
+        //nothing to walk
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.separator.leadingTrivia;
+    }
+
+    public clone() {
+        return new PrintSeparatorExpression({
+            separator: util.cloneToken(this.tokens?.separator)
+        });
+    }
+}
+
+
+/**
+ * This is a special expression only used within template strings. It exists so we can prevent producing lots of empty strings
+ * during template string transpile by identifying these expressions explicitly and skipping the bslib_toString around them
+ */
+export class EscapedCharCodeLiteralExpression extends Expression {
+    constructor(options: {
+        value: Token & { charCode: number };
+    }) {
+        super();
+        this.tokens = { value: options.value };
+        this.location = util.cloneLocation(this.tokens.value.location);
+    }
+
+    public readonly kind = AstNodeKind.EscapedCharCodeLiteralExpression;
+
+    public readonly tokens: {
+        readonly value: Token & { charCode: number };
+    };
+
+    public readonly location: Location;
+
+    transpile(state: BrsTranspileState) {
         return [
-            state.sourceNode(this, `chr(${this.token.charCode})`)
+            state.sourceNode(this, `chr(${this.tokens.value.charCode})`)
         ];
     }
 
@@ -843,30 +1111,43 @@ export class EscapedCharCodeLiteralExpression extends Expression {
 
     public clone() {
         return this.finalizeClone(
-            new EscapedCharCodeLiteralExpression(
-                util.cloneToken(this.token)
-            )
+            new EscapedCharCodeLiteralExpression({
+                value: util.cloneToken(this.tokens.value)
+            })
         );
     }
 }
 
 export class ArrayLiteralExpression extends Expression {
-    constructor(
-        readonly elements: Array<Expression | CommentStatement>,
-        readonly open: Token,
-        readonly close: Token,
-        readonly hasSpread = false
-    ) {
+    constructor(options: {
+        elements: Array<Expression>;
+        open?: Token;
+        close?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.open, ...this.elements ?? [], this.close);
+        this.tokens = {
+            open: options.open,
+            close: options.close
+        };
+        this.elements = options.elements;
+        this.location = util.createBoundingLocation(this.tokens.open, ...this.elements ?? [], this.tokens.close);
     }
 
-    public readonly range: Range | undefined;
+    public readonly elements: Array<Expression>;
+
+    public readonly tokens: {
+        readonly open?: Token;
+        readonly close?: Token;
+    };
+
+    public readonly kind = AstNodeKind.ArrayLiteralExpression;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
-        let result = [] as TranspileResult;
+        let result: TranspileResult = [];
         result.push(
-            state.transpileToken(this.open)
+            state.transpileToken(this.tokens.open, '[')
         );
         let hasChildren = this.elements.length > 0;
         state.blockDepth++;
@@ -875,39 +1156,23 @@ export class ArrayLiteralExpression extends Expression {
             let previousElement = this.elements[i - 1];
             let element = this.elements[i];
 
-            if (isCommentStatement(element)) {
-                //if the comment is on the same line as opening square or previous statement, don't add newline
-                if (util.linesTouch(this.open, element) || util.linesTouch(previousElement, element)) {
-                    result.push(' ');
-                } else {
-                    result.push(
-                        '\n',
-                        state.indent()
-                    );
-                }
-                state.lineage.unshift(this);
-                result.push(element.transpile(state));
-                state.lineage.shift();
+            if (util.isLeadingCommentOnSameLine(previousElement ?? this.tokens.open, element)) {
+                result.push(' ');
             } else {
-                result.push('\n');
-
                 result.push(
-                    state.indent(),
-                    ...element.transpile(state)
+                    '\n',
+                    state.indent()
                 );
             }
-        }
-        state.blockDepth--;
-        //add a newline between open and close if there are elements
-        if (hasChildren) {
-            result.push('\n');
-            result.push(state.indent());
-        }
-        if (this.close) {
             result.push(
-                state.transpileToken(this.close)
+                ...element.transpile(state)
             );
         }
+        state.blockDepth--;
+        //add a newline between open and close if there are elements
+        const lastLocatable = this.elements[this.elements.length - 1] ?? this.tokens.open;
+        result.push(...state.transpileEndBlockToken(lastLocatable, this.tokens.close, ']', hasChildren));
+
         return result;
     }
 
@@ -917,32 +1182,60 @@ export class ArrayLiteralExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions): BscType {
+        const innerTypes = this.elements.map(expr => expr.getType(options));
+        return new ArrayType(...innerTypes);
+    }
+    get leadingTrivia(): Token[] {
+        return this.tokens.open?.leadingTrivia;
+    }
+
+    get endTrivia(): Token[] {
+        return this.tokens.close?.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ArrayLiteralExpression(
-                this.elements?.map(e => e?.clone()),
-                util.cloneToken(this.open),
-                util.cloneToken(this.close),
-                this.hasSpread
-            ),
+            new ArrayLiteralExpression({
+                elements: this.elements?.map(e => e?.clone()),
+                open: util.cloneToken(this.tokens.open),
+                close: util.cloneToken(this.tokens.close)
+            }),
             ['elements']
         );
     }
 }
 
 export class AAMemberExpression extends Expression {
-    constructor(
-        public keyToken: Token,
-        public colonToken: Token,
+    constructor(options: {
+        key: Token;
+        colon?: Token;
         /** The expression evaluated to determine the member's initial value. */
-        public value: Expression
-    ) {
+        value: Expression;
+        comma?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.keyToken, this.colonToken, this.value);
+        this.tokens = {
+            key: options.key,
+            colon: options.colon,
+            comma: options.comma
+        };
+        this.value = options.value;
+        this.location = util.createBoundingLocation(this.tokens.key, this.tokens.colon, this.value);
     }
 
-    public range: Range | undefined;
-    public commaToken?: Token;
+    public readonly kind = AstNodeKind.AAMemberExpression;
+
+    public readonly location: Location | undefined;
+
+    public readonly tokens: {
+        readonly key: Token;
+        readonly colon?: Token;
+        readonly comma?: Token;
+    };
+
+    /** The expression evaluated to determine the member's initial value. */
+    public readonly value: Expression;
 
     transpile(state: BrsTranspileState) {
         return [];
@@ -952,13 +1245,21 @@ export class AAMemberExpression extends Expression {
         walk(this, 'value', visitor, options);
     }
 
+    getType(options: GetTypeOptions): BscType {
+        return this.value.getType(options);
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.key.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new AAMemberExpression(
-                util.cloneToken(this.keyToken),
-                util.cloneToken(this.colonToken),
-                this.value?.clone()
-            ),
+            new AAMemberExpression({
+                key: util.cloneToken(this.tokens.key),
+                colon: util.cloneToken(this.tokens.colon),
+                value: this.value?.clone()
+            }),
             ['value']
         );
     }
@@ -966,36 +1267,41 @@ export class AAMemberExpression extends Expression {
 
 export class AAIndexedMemberExpression extends Expression {
     constructor(options: {
-        leftBracket: Token;
+        leftBracket?: Token;
         key: Expression;
-        rightBracket: Token;
-        colon: Token;
+        rightBracket?: Token;
+        colon?: Token;
         /** The expression evaluated to determine the member's initial value. */
         value: Expression;
+        comma?: Token;
     }) {
         super();
         this.key = options.key;
         this.tokens = {
             leftBracket: options.leftBracket,
             rightBracket: options.rightBracket,
-            colon: options.colon
+            colon: options.colon,
+            comma: options.comma
         };
         this.value = options.value;
-        this.range = util.createBoundingRange(this.tokens.leftBracket, this.key, this.tokens.rightBracket, this.tokens.colon, this.value);
+        this.location = util.createBoundingLocation(this.tokens.leftBracket, this.key, this.tokens.rightBracket, this.tokens.colon, this.value, this.tokens.comma);
     }
 
     public readonly tokens: {
-        readonly leftBracket: Token;
-        readonly rightBracket: Token;
-        readonly colon: Token;
+        readonly leftBracket?: Token;
+        readonly rightBracket?: Token;
+        readonly colon?: Token;
+        readonly comma?: Token;
     };
 
     public key: Expression;
     /** The expression evaluated to determine the member's initial value. */
     public value: Expression;
 
-    public range: Range | undefined;
-    public commaToken?: Token;
+
+    public readonly kind = AstNodeKind.AAIndexedMemberExpression;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         return [];
@@ -1013,7 +1319,8 @@ export class AAIndexedMemberExpression extends Expression {
                 key: this.key?.clone(),
                 rightBracket: util.cloneToken(this.tokens.rightBracket),
                 colon: util.cloneToken(this.tokens.colon),
-                value: this.value?.clone()
+                value: this.value?.clone(),
+                comma: util.cloneToken(this.tokens.comma)
             }),
             ['key', 'value']
         );
@@ -1021,26 +1328,40 @@ export class AAIndexedMemberExpression extends Expression {
 }
 
 export class AALiteralExpression extends Expression {
-    constructor(
-        readonly elements: Array<AAMemberExpression | AAIndexedMemberExpression | CommentStatement>,
-        readonly open: Token,
-        readonly close: Token
+    constructor(options: {
+        readonly elements: Array<AAMemberExpression | AAIndexedMemberExpression>;
+        readonly open?: Token;
+        readonly close?: Token;
+    }
     ) {
         super();
-        this.range = util.createBoundingRange(this.open, ...this.elements ?? [], this.close);
+        this.tokens = {
+            open: options.open,
+            close: options.close
+        };
+        this.elements = options.elements;
+        this.location = util.createBoundingLocation(this.tokens.open, ...this.elements ?? [], this.tokens.close);
     }
 
-    public readonly range: Range | undefined;
+    public readonly elements: Array<AAMemberExpression | AAIndexedMemberExpression>;
+    public readonly tokens: {
+        readonly open?: Token;
+        readonly close?: Token;
+    };
+
+    public readonly kind = AstNodeKind.AALiteralExpression;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
-        let result = [] as TranspileResult;
+        let result: TranspileResult = [];
         //open curly
         result.push(
-            state.transpileToken(this.open)
+            state.transpileToken(this.tokens.open, '{')
         );
         let hasChildren = this.elements.length > 0;
         //add newline if the object has children and the first child isn't a comment starting on the same line as opening curly
-        if (hasChildren && (isCommentStatement(this.elements[0]) === false || !util.linesTouch(this.elements[0], this.open))) {
+        if (hasChildren && !util.isLeadingCommentOnSameLine(this.tokens.open, this.elements[0])) {
             result.push('\n');
         }
         state.blockDepth++;
@@ -1050,60 +1371,42 @@ export class AALiteralExpression extends Expression {
             let nextElement = this.elements[i + 1];
 
             //don't indent if comment is same-line
-            if (isCommentStatement(element as any) &&
-                (util.linesTouch(this.open, element) || util.linesTouch(previousElement, element))
-            ) {
+            if (util.isLeadingCommentOnSameLine(this.tokens.open, element) ||
+                util.isLeadingCommentOnSameLine(previousElement, element)) {
                 result.push(' ');
-
-                //indent line
             } else {
+                //indent line
                 result.push(state.indent());
             }
 
-            //render comments
-            if (isCommentStatement(element)) {
-                result.push(...element.transpile(state));
+            //key
+            if (isAAIndexedMemberExpression(element)) {
+                //computed key: transpile the resolved expression (pre-transpile overrides it to a literal)
+                result.push(...element.key.transpile(state));
             } else {
-                //key
-                if ('tokens' in element) {
-                    //computed key: transpile the resolved expression (pre-transpile overrides it to a literal)
-                    result.push(...element.key.transpile(state));
-                } else {
-                    result.push(
-                        state.transpileToken(element.keyToken)
-                    );
-                }
-                //colon
                 result.push(
-                    state.transpileToken('tokens' in element ? element.tokens.colon : element.colonToken),
-                    ' '
+                    state.transpileToken(element.tokens.key)
                 );
-
-                //value
-                result.push(...element.value.transpile(state));
             }
-
+            //colon
+            result.push(
+                state.transpileToken(element.tokens.colon, ':'),
+                ' '
+            );
+            //value
+            result.push(...element.value.transpile(state));
 
             //if next element is a same-line comment, skip the newline
-            if (nextElement && isCommentStatement(nextElement) && nextElement.range?.start.line === element.range?.start.line) {
-
+            if (nextElement && !util.isLeadingCommentOnSameLine(element, nextElement)) {
                 //add a newline between statements
-            } else {
                 result.push('\n');
             }
         }
         state.blockDepth--;
 
-        //only indent the closing curly if we have children
-        if (hasChildren) {
-            result.push(state.indent());
-        }
-        //close curly
-        if (this.close) {
-            result.push(
-                state.transpileToken(this.close)
-            );
-        }
+        const lastElement = this.elements[this.elements.length - 1] ?? this.tokens.open;
+        result.push(...state.transpileEndBlockToken(lastElement, this.tokens.close, '}', hasChildren));
+
         return result;
     }
 
@@ -1113,40 +1416,78 @@ export class AALiteralExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions): BscType {
+        const resultType = new AssociativeArrayType();
+        resultType.addBuiltInInterfaces();
+        for (const element of this.elements) {
+            if (isAAMemberExpression(element)) {
+                let memberName = element.tokens?.key?.text ?? '';
+                if (element.tokens.key.kind === TokenKind.StringLiteral) {
+                    memberName = memberName.replace(/"/g, ''); // remove quotes if it was a stringLiteral
+                }
+                if (memberName) {
+                    resultType.addMember(memberName, { definingNode: element }, element.getType(options), SymbolTypeFlag.runtime);
+                }
+            }
+        }
+        return resultType;
+    }
+
+    public get leadingTrivia(): Token[] {
+        return this.tokens.open?.leadingTrivia;
+    }
+
+    public get endTrivia(): Token[] {
+        return this.tokens.close?.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new AALiteralExpression(
-                this.elements?.map(e => e?.clone()),
-                util.cloneToken(this.open),
-                util.cloneToken(this.close)
-            ),
+            new AALiteralExpression({
+                elements: this.elements?.map(e => e?.clone()),
+                open: util.cloneToken(this.tokens.open),
+                close: util.cloneToken(this.tokens.close)
+            }),
             ['elements']
         );
     }
 }
 
 export class UnaryExpression extends Expression {
-    constructor(
-        public operator: Token,
-        public right: Expression
-    ) {
+    constructor(options: {
+        operator: Token;
+        right: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.operator, this.right);
+        this.tokens = {
+            operator: options.operator
+        };
+        this.right = options.right;
+        this.location = util.createBoundingLocation(this.tokens.operator, this.right);
     }
 
-    public readonly range: Range | undefined;
+    public readonly kind = AstNodeKind.UnaryExpression;
+
+    public readonly location: Location | undefined;
+
+    public readonly tokens: {
+        readonly operator: Token;
+    };
+    public readonly right: Expression;
 
     transpile(state: BrsTranspileState) {
         let separatingWhitespace: string | undefined;
         if (isVariableExpression(this.right)) {
-            separatingWhitespace = this.right.name.leadingWhitespace;
+            separatingWhitespace = this.right.tokens.name.leadingWhitespace;
         } else if (isLiteralExpression(this.right)) {
-            separatingWhitespace = this.right.token.leadingWhitespace;
+            separatingWhitespace = this.right.tokens.value.leadingWhitespace;
+        } else {
+            separatingWhitespace = ' ';
         }
 
         return [
-            state.transpileToken(this.operator),
-            separatingWhitespace ?? ' ',
+            state.transpileToken(this.tokens.operator),
+            separatingWhitespace,
             ...this.right.transpile(state)
         ];
     }
@@ -1157,48 +1498,66 @@ export class UnaryExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions): BscType {
+        return util.unaryOperatorResultType(this.tokens.operator, this.right.getType(options));
+    }
+
+    public get leadingTrivia(): Token[] {
+        return this.tokens.operator.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new UnaryExpression(
-                util.cloneToken(this.operator),
-                this.right?.clone()
-            ),
+            new UnaryExpression({
+                operator: util.cloneToken(this.tokens.operator),
+                right: this.right?.clone()
+            }),
             ['right']
         );
     }
 }
 
 export class VariableExpression extends Expression {
-    constructor(
-        readonly name: Identifier
-    ) {
+    constructor(options: {
+        name: Identifier;
+    }) {
         super();
-        this.range = this.name?.range;
+        this.tokens = {
+            name: options.name
+        };
+        this.location = util.cloneLocation(this.tokens.name?.location);
     }
 
-    public readonly range: Range;
+    public readonly tokens: {
+        readonly name: Identifier;
+    };
+
+    public readonly kind = AstNodeKind.VariableExpression;
 
-    public getName(parseMode: ParseMode) {
-        return this.name.text;
+    public readonly location: Location;
+
+    public getName(parseMode?: ParseMode) {
+        return this.tokens.name.text;
     }
 
     transpile(state: BrsTranspileState) {
-        let result = [] as TranspileResult;
+        let result: TranspileResult = [];
         const namespace = this.findAncestor<NamespaceStatement>(isNamespaceStatement);
         //if the callee is the name of a known namespace function
-        if (namespace && state.file.calleeIsKnownNamespaceFunction(this, namespace.getName(ParseMode.BrighterScript))) {
+        if (namespace && util.isCalleeMemberOfNamespace(this.tokens.name.text, this, namespace)) {
             result.push(
+                //transpile leading comments since the token isn't being transpiled directly
+                ...state.transpileLeadingCommentsForAstNode(this),
                 state.sourceNode(this, [
                     namespace.getName(ParseMode.BrightScript),
                     '_',
                     this.getName(ParseMode.BrightScript)
                 ])
             );
-
             //transpile  normally
         } else {
             result.push(
-                state.transpileToken(this.name)
+                state.transpileToken(this.tokens.name)
             );
         }
         return result;
@@ -1206,7 +1565,7 @@ export class VariableExpression extends Expression {
 
     getTypedef(state: BrsTranspileState) {
         return [
-            state.transpileToken(this.name)
+            state.transpileToken(this.tokens.name)
         ];
     }
 
@@ -1214,37 +1573,93 @@ export class VariableExpression extends Expression {
         //nothing to walk
     }
 
+
+    getType(options: GetTypeOptions) {
+        let resultType: BscType = util.tokenToBscType(this.tokens.name);
+        const nameKey = this.getName();
+        if (!resultType) {
+            const symbolTable = this.getSymbolTable();
+            resultType = symbolTable?.getSymbolType(nameKey, {
+                ...options,
+                statementIndex: this.statementIndex,
+                fullName: nameKey,
+                tableProvider: () => this.getSymbolTable()
+            });
+
+            if (util.isClassUsedAsFunction(resultType, this, options)) {
+                resultType = FunctionType.instance;
+            }
+
+        }
+        options?.typeChain?.push(new TypeChainEntry({ name: nameKey, type: resultType, data: options.data, astNode: this }));
+        return resultType;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.name.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new VariableExpression(
-                util.cloneToken(this.name)
-            )
+            new VariableExpression({
+                name: util.cloneToken(this.tokens.name)
+            })
         );
     }
 }
 
 export class SourceLiteralExpression extends Expression {
-    constructor(
-        readonly token: Token
-    ) {
+    constructor(options: {
+        value: Token;
+    }) {
         super();
-        this.range = token?.range;
+        this.tokens = {
+            value: options.value
+        };
+        this.location = util.cloneLocation(this.tokens.value?.location);
     }
 
-    public readonly range: Range;
+    public readonly location: Location;
+
+    public readonly kind = AstNodeKind.SourceLiteralExpression;
+
+    public readonly tokens: {
+        readonly value: Token;
+    };
+
+    /**
+     * Find the index of the function in its parent
+     */
+    private findFunctionIndex(parentFunction: FunctionExpression, func: FunctionExpression) {
+        let index = -1;
+        parentFunction.findChild((node) => {
+            if (isFunctionExpression(node)) {
+                index++;
+                if (node === func) {
+                    return true;
+                }
+            }
+        }, {
+            walkMode: WalkMode.visitAllRecursive
+        });
+        return index;
+    }
 
     private getFunctionName(state: BrsTranspileState, parseMode: ParseMode) {
         let func = this.findAncestor<FunctionExpression>(isFunctionExpression);
         let nameParts = [] as TranspileResult;
-        while (func.parentFunction) {
-            let index = func.parentFunction.childFunctionExpressions.indexOf(func);
+        let parentFunction: FunctionExpression;
+        while ((parentFunction = func.findAncestor<FunctionExpression>(isFunctionExpression))) {
+            let index = this.findFunctionIndex(parentFunction, func);
             nameParts.unshift(`anon${index}`);
-            func = func.parentFunction;
+            func = parentFunction;
         }
         //get the index of this function in its parent
-        nameParts.unshift(
-            func.functionStatement!.getName(parseMode)
-        );
+        if (isFunctionStatement(func.parent)) {
+            nameParts.unshift(
+                func.parent.getName(parseMode)
+            );
+        }
         return nameParts.join('$');
     }
 
@@ -1254,8 +1669,8 @@ export class SourceLiteralExpression extends Expression {
     private getClosestLineNumber() {
         let node: AstNode = this;
         while (node) {
-            if (node.range) {
-                return node.range.start.line + 1;
+            if (node.location?.range) {
+                return node.location.range.start.line + 1;
             }
             node = node.parent;
         }
@@ -1264,7 +1679,7 @@ export class SourceLiteralExpression extends Expression {
 
     transpile(state: BrsTranspileState) {
         let text: string;
-        switch (this.token.kind) {
+        switch (this.tokens.value.kind) {
             case TokenKind.SourceFilePathLiteral:
                 const pathUrl = fileUrl(state.srcPath);
                 text = `"${pathUrl.substring(0, 4)}" + "${pathUrl.substring(4)}"`;
@@ -1298,23 +1713,15 @@ export class SourceLiteralExpression extends Expression {
                 text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.getClosestLineNumber()}"`;
                 break;
             case TokenKind.PkgPathLiteral:
-                let pkgPath1 = `pkg:/${state.file.pkgPath}`
-                    .replace(/\\/g, '/')
-                    .replace(/\.bs$/i, '.brs');
-
-                text = `"${pkgPath1}"`;
+                text = `"${util.sanitizePkgPath(state.file.pkgPath)}"`;
                 break;
             case TokenKind.PkgLocationLiteral:
-                let pkgPath2 = `pkg:/${state.file.pkgPath}`
-                    .replace(/\\/g, '/')
-                    .replace(/\.bs$/i, '.brs');
-
-                text = `"${pkgPath2}:" + str(LINE_NUM)`;
+                text = `"${util.sanitizePkgPath(state.file.pkgPath)}:" + str(LINE_NUM)`;
                 break;
             case TokenKind.LineNumLiteral:
             default:
                 //use the original text (because it looks like a variable)
-                text = this.token.text;
+                text = this.tokens.value.text;
                 break;
 
         }
@@ -1327,11 +1734,15 @@ export class SourceLiteralExpression extends Expression {
         //nothing to walk
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.value.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new SourceLiteralExpression(
-                util.cloneToken(this.token)
-            )
+            new SourceLiteralExpression({
+                value: util.cloneToken(this.tokens.value)
+            })
         );
     }
 }
@@ -1342,25 +1753,36 @@ export class SourceLiteralExpression extends Expression {
  * do more type checking.
  */
 export class NewExpression extends Expression {
-    constructor(
-        readonly newKeyword: Token,
-        readonly call: CallExpression
-    ) {
+    constructor(options: {
+        new?: Token;
+        call: CallExpression;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.newKeyword, this.call);
+        this.tokens = {
+            new: options.new
+        };
+        this.call = options.call;
+        this.location = util.createBoundingLocation(this.tokens.new, this.call);
     }
 
+    public readonly kind = AstNodeKind.NewExpression;
+
+    public readonly location: Location | undefined;
+
+    public readonly tokens: {
+        readonly new?: Token;
+    };
+    public readonly call: CallExpression;
+
     /**
      * The name of the class to initialize (with optional namespace prefixed)
      */
     public get className() {
         //the parser guarantees the callee of a new statement's call object will be
-        //a NamespacedVariableNameExpression
-        return this.call.callee as NamespacedVariableNameExpression;
+        //either a VariableExpression or a DottedGet
+        return this.call.callee as (VariableExpression | DottedGetExpression);
     }
 
-    public readonly range: Range | undefined;
-
     public transpile(state: BrsTranspileState) {
         const namespace = this.findAncestor<NamespaceStatement>(isNamespaceStatement);
         const cls = state.file.getClassFileLink(
@@ -1378,62 +1800,88 @@ export class NewExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const result = this.call.getType(options);
+        if (options.typeChain) {
+            // modify last typechain entry to show it is a new ...()
+            const lastEntry = options.typeChain[options.typeChain.length - 1];
+            if (lastEntry) {
+                lastEntry.astNode = this;
+            }
+        }
+        return result;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.new.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new NewExpression(
-                util.cloneToken(this.newKeyword),
-                this.call?.clone()
-            ),
+            new NewExpression({
+                new: util.cloneToken(this.tokens.new),
+                call: this.call?.clone()
+            }),
             ['call']
         );
     }
 }
 
 export class CallfuncExpression extends Expression {
-    constructor(
-        readonly callee: Expression,
-        readonly operator: Token,
-        readonly methodName: Identifier,
-        readonly openingParen: Token,
-        readonly args: Expression[],
-        readonly closingParen: Token
-    ) {
+    constructor(options: {
+        callee: Expression;
+        operator?: Token;
+        methodName: Identifier;
+        openingParen?: Token;
+        args?: Expression[];
+        closingParen?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            callee,
-            operator,
-            methodName,
-            openingParen,
-            ...args ?? [],
-            closingParen
+        this.tokens = {
+            operator: options.operator,
+            methodName: options.methodName,
+            openingParen: options.openingParen,
+            closingParen: options.closingParen
+        };
+        this.callee = options.callee;
+        this.args = options.args ?? [];
+
+        this.location = util.createBoundingLocation(
+            this.callee,
+            this.tokens.operator,
+            this.tokens.methodName,
+            this.tokens.openingParen,
+            ...this.args ?? [],
+            this.tokens.closingParen
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly callee: Expression;
+    public readonly args: Expression[];
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    public get namespaceName() {
-        return this.findAncestor<NamespaceStatement>(isNamespaceStatement)?.nameExpression;
-    }
+    public readonly tokens: {
+        readonly operator: Token;
+        readonly methodName: Identifier;
+        readonly openingParen?: Token;
+        readonly closingParen?: Token;
+    };
+
+    public readonly kind = AstNodeKind.CallfuncExpression;
+
+    public readonly location: Location | undefined;
 
     public transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
         result.push(
             ...this.callee.transpile(state),
-            state.sourceNode(this.operator, '.callfunc'),
-            state.transpileToken(this.openingParen),
+            state.sourceNode(this.tokens.operator, '.callfunc'),
+            state.transpileToken(this.tokens.openingParen, '('),
             //the name of the function
-            state.sourceNode(this.methodName, ['"', this.methodName.text, '"']),
-            ', '
+            state.sourceNode(this.tokens.methodName, ['"', this.tokens.methodName.text, '"'])
         );
-        //transpile args
-        //callfunc with zero args never gets called, so pass invalid as the first parameter if there are no args
-        if (this.args.length === 0) {
-            result.push('invalid');
-        } else {
+        if (this.args?.length > 0) {
+            result.push(', ');
+            //transpile args
             for (let i = 0; i < this.args.length; i++) {
                 //add comma between args
                 if (i > 0) {
@@ -1442,9 +1890,12 @@ export class CallfuncExpression extends Expression {
                 let arg = this.args[i];
                 result.push(...arg.transpile(state));
             }
+        } else if (state.options.legacyCallfuncHandling) {
+            result.push(', ', 'invalid');
         }
+
         result.push(
-            state.transpileToken(this.closingParen)
+            state.transpileToken(this.tokens.closingParen, ')')
         );
         return result;
     }
@@ -1456,16 +1907,25 @@ export class CallfuncExpression extends Expression {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const result = util.getCallFuncType(this, this.tokens.methodName, options) ?? DynamicType.instance;
+        return result;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.callee.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new CallfuncExpression(
-                this.callee?.clone(),
-                util.cloneToken(this.operator),
-                util.cloneToken(this.methodName),
-                util.cloneToken(this.openingParen),
-                this.args?.map(e => e?.clone()),
-                util.cloneToken(this.closingParen)
-            ),
+            new CallfuncExpression({
+                callee: this.callee?.clone(),
+                operator: util.cloneToken(this.tokens.operator),
+                methodName: util.cloneToken(this.tokens.methodName),
+                openingParen: util.cloneToken(this.tokens.openingParen),
+                args: this.args?.map(e => e?.clone()),
+                closingParen: util.cloneToken(this.tokens.closingParen)
+            }),
             ['callee', 'args']
         );
     }
@@ -1476,15 +1936,20 @@ export class CallfuncExpression extends Expression {
  * This is a single expression that represents the string contatenation of all parts of a single quasi.
  */
 export class TemplateStringQuasiExpression extends Expression {
-    constructor(
-        readonly expressions: Array<LiteralExpression | EscapedCharCodeLiteralExpression>
-    ) {
+    constructor(options: {
+        expressions: Array<LiteralExpression | EscapedCharCodeLiteralExpression>;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            ...expressions ?? []
+        this.expressions = options.expressions;
+        this.location = util.createBoundingLocation(
+            ...this.expressions ?? []
         );
     }
-    readonly range: Range | undefined;
+
+    public readonly expressions: Array<LiteralExpression | EscapedCharCodeLiteralExpression>;
+    public readonly kind = AstNodeKind.TemplateStringQuasiExpression;
+
+    readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState, skipEmptyStrings = true) {
         let result = [] as TranspileResult;
@@ -1492,7 +1957,7 @@ export class TemplateStringQuasiExpression extends Expression {
         for (let expression of this.expressions) {
             //skip empty strings
             //TODO what does an empty string literal expression look like?
-            if (expression.token.text === '' && skipEmptyStrings === true) {
+            if (expression.tokens.value.text === '' && skipEmptyStrings === true) {
                 continue;
             }
             result.push(
@@ -1512,31 +1977,50 @@ export class TemplateStringQuasiExpression extends Expression {
 
     public clone() {
         return this.finalizeClone(
-            new TemplateStringQuasiExpression(
-                this.expressions?.map(e => e?.clone())
-            ),
+            new TemplateStringQuasiExpression({
+                expressions: this.expressions?.map(e => e?.clone())
+            }),
             ['expressions']
         );
     }
 }
 
 export class TemplateStringExpression extends Expression {
-    constructor(
-        readonly openingBacktick: Token,
-        readonly quasis: TemplateStringQuasiExpression[],
-        readonly expressions: Expression[],
-        readonly closingBacktick: Token
-    ) {
+    constructor(options: {
+        openingBacktick?: Token;
+        quasis: TemplateStringQuasiExpression[];
+        expressions: Expression[];
+        closingBacktick?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            openingBacktick,
-            quasis?.[0],
-            quasis?.[quasis?.length - 1],
-            closingBacktick
+        this.tokens = {
+            openingBacktick: options.openingBacktick,
+            closingBacktick: options.closingBacktick
+        };
+        this.quasis = options.quasis;
+        this.expressions = options.expressions;
+        this.location = util.createBoundingLocation(
+            this.tokens.openingBacktick,
+            this.quasis?.[0],
+            this.quasis?.[this.quasis?.length - 1],
+            this.tokens.closingBacktick
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly kind = AstNodeKind.TemplateStringExpression;
+
+    public readonly tokens: {
+        readonly openingBacktick?: Token;
+        readonly closingBacktick?: Token;
+    };
+    public readonly quasis: TemplateStringQuasiExpression[];
+    public readonly expressions: Expression[];
+
+    public readonly location: Location | undefined;
+
+    public getType(options: GetTypeOptions) {
+        return StringType.instance;
+    }
 
     transpile(state: BrsTranspileState) {
         //if this is essentially just a normal brightscript string but with backticks, transpile it as a normal string without parens
@@ -1570,7 +2054,7 @@ export class TemplateStringExpression extends Expression {
                 //skip the toString wrapper around certain expressions
                 if (
                     isEscapedCharCodeLiteralExpression(expression) ||
-                    (isLiteralExpression(expression) && isStringType(expression.type))
+                    (isLiteralExpression(expression) && isStringType(expression.getType()))
                 ) {
                     add(
                         ...expression.transpile(state)
@@ -1608,41 +2092,60 @@ export class TemplateStringExpression extends Expression {
 
     public clone() {
         return this.finalizeClone(
-            new TemplateStringExpression(
-                util.cloneToken(this.openingBacktick),
-                this.quasis?.map(e => e?.clone()),
-                this.expressions?.map(e => e?.clone()),
-                util.cloneToken(this.closingBacktick)
-            ),
+            new TemplateStringExpression({
+                openingBacktick: util.cloneToken(this.tokens.openingBacktick),
+                quasis: this.quasis?.map(e => e?.clone()),
+                expressions: this.expressions?.map(e => e?.clone()),
+                closingBacktick: util.cloneToken(this.tokens.closingBacktick)
+            }),
             ['quasis', 'expressions']
         );
     }
 }
 
 export class TaggedTemplateStringExpression extends Expression {
-    constructor(
-        readonly tagName: Identifier,
-        readonly openingBacktick: Token,
-        readonly quasis: TemplateStringQuasiExpression[],
-        readonly expressions: Expression[],
-        readonly closingBacktick: Token
-    ) {
+    constructor(options: {
+        tagName: Identifier;
+        openingBacktick?: Token;
+        quasis: TemplateStringQuasiExpression[];
+        expressions: Expression[];
+        closingBacktick?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tagName,
-            openingBacktick,
-            quasis?.[0],
-            quasis?.[quasis?.length - 1],
-            closingBacktick
-        );
+        this.tokens = {
+            tagName: options.tagName,
+            openingBacktick: options.openingBacktick,
+            closingBacktick: options.closingBacktick
+        };
+        this.quasis = options.quasis;
+        this.expressions = options.expressions;
+
+        this.location = util.createBoundingLocation(
+            this.tokens.tagName,
+            this.tokens.openingBacktick,
+            this.quasis?.[0],
+            this.quasis?.[this.quasis?.length - 1],
+            this.tokens.closingBacktick
+        );
     }
 
-    public readonly range: Range | undefined;
+    public readonly kind = AstNodeKind.TaggedTemplateStringExpression;
+
+    public readonly tokens: {
+        readonly tagName: Identifier;
+        readonly openingBacktick?: Token;
+        readonly closingBacktick?: Token;
+    };
+
+    public readonly quasis: TemplateStringQuasiExpression[];
+    public readonly expressions: Expression[];
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
         result.push(
-            state.transpileToken(this.tagName),
+            state.transpileToken(this.tokens.tagName),
             '(['
         );
 
@@ -1676,7 +2179,7 @@ export class TaggedTemplateStringExpression extends Expression {
             );
         }
         result.push(
-            state.sourceNode(this.closingBacktick, '])')
+            state.sourceNode(this.tokens.closingBacktick, '])')
         );
         return result;
     }
@@ -1697,37 +2200,51 @@ export class TaggedTemplateStringExpression extends Expression {
 
     public clone() {
         return this.finalizeClone(
-            new TaggedTemplateStringExpression(
-                util.cloneToken(this.tagName),
-                util.cloneToken(this.openingBacktick),
-                this.quasis?.map(e => e?.clone()),
-                this.expressions?.map(e => e?.clone()),
-                util.cloneToken(this.closingBacktick)
-            ),
+            new TaggedTemplateStringExpression({
+                tagName: util.cloneToken(this.tokens.tagName),
+                openingBacktick: util.cloneToken(this.tokens.openingBacktick),
+                quasis: this.quasis?.map(e => e?.clone()),
+                expressions: this.expressions?.map(e => e?.clone()),
+                closingBacktick: util.cloneToken(this.tokens.closingBacktick)
+            }),
             ['quasis', 'expressions']
         );
     }
 }
 
 export class AnnotationExpression extends Expression {
-    constructor(
-        readonly atToken: Token,
-        readonly nameToken: Token
-    ) {
+    constructor(options: {
+        at?: Token;
+        name: Token;
+        call?: CallExpression;
+    }) {
         super();
-        this.name = nameToken.text;
+        this.tokens = {
+            at: options.at,
+            name: options.name
+        };
+        this.call = options.call;
+        this.name = this.tokens.name.text;
     }
 
-    public get range() {
-        return util.createBoundingRange(
-            this.atToken,
-            this.nameToken,
+    public readonly kind = AstNodeKind.AnnotationExpression;
+
+    public readonly tokens: {
+        readonly at: Token;
+        readonly name: Token;
+    };
+
+    public get location(): Location | undefined {
+        return util.createBoundingLocation(
+            this.tokens.at,
+            this.tokens.name,
             this.call
         );
     }
 
-    public name: string;
-    public call: CallExpression | undefined;
+    public readonly name: string;
+
+    public call: CallExpression;
 
     /**
      * Convert annotation arguments to JavaScript types
@@ -1740,8 +2257,13 @@ export class AnnotationExpression extends Expression {
         return this.call.args.map(e => expressionToValue(e, strict));
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.at?.leadingTrivia;
+    }
+
     transpile(state: BrsTranspileState) {
-        return [];
+        //transpile only our leading comments
+        return state.transpileComments(this.leadingTrivia);
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
@@ -1757,34 +2279,52 @@ export class AnnotationExpression extends Expression {
 
     public clone() {
         const clone = this.finalizeClone(
-            new AnnotationExpression(
-                util.cloneToken(this.atToken),
-                util.cloneToken(this.nameToken)
-            )
+            new AnnotationExpression({
+                at: util.cloneToken(this.tokens.at),
+                name: util.cloneToken(this.tokens.name)
+            })
         );
         return clone;
     }
 }
 
 export class TernaryExpression extends Expression {
-    constructor(
-        readonly test: Expression,
-        readonly questionMarkToken: Token,
-        readonly consequent?: Expression,
-        readonly colonToken?: Token,
-        readonly alternate?: Expression
-    ) {
+    constructor(options: {
+        test: Expression;
+        questionMark?: Token;
+        consequent?: Expression;
+        colon?: Token;
+        alternate?: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            test,
-            questionMarkToken,
-            consequent,
-            colonToken,
-            alternate
+        this.tokens = {
+            questionMark: options.questionMark,
+            colon: options.colon
+        };
+        this.test = options.test;
+        this.consequent = options.consequent;
+        this.alternate = options.alternate;
+        this.location = util.createBoundingLocation(
+            this.test,
+            this.tokens.questionMark,
+            this.consequent,
+            this.tokens.colon,
+            this.alternate
         );
     }
 
-    public range: Range | undefined;
+    public readonly kind = AstNodeKind.TernaryExpression;
+
+    public readonly location: Location | undefined;
+
+    public readonly tokens: {
+        readonly questionMark?: Token;
+        readonly colon?: Token;
+    };
+
+    public readonly test: Expression;
+    public readonly consequent?: Expression;
+    public readonly alternate?: Expression;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
@@ -1807,7 +2347,7 @@ export class TernaryExpression extends Expression {
         if (mutatingExpressions.length > 0) {
             result.push(
                 state.sourceNode(
-                    this.questionMarkToken,
+                    this.tokens.questionMark,
                     //write all the scope variables as parameters.
                     //TODO handle when there are more than 31 parameters
                     `(function(${['__bsCondition', ...allUniqueVarNames].join(', ')})`
@@ -1818,23 +2358,23 @@ export class TernaryExpression extends Expression {
                 state.sourceNode(this.test, `if __bsCondition then`),
                 state.newline,
                 state.indent(1),
-                state.sourceNode(this.consequent ?? this.questionMarkToken, 'return '),
-                ...this.consequent?.transpile(state) ?? [state.sourceNode(this.questionMarkToken, 'invalid')],
+                state.sourceNode(this.consequent ?? this.tokens.questionMark, 'return '),
+                ...this.consequent?.transpile(state) ?? [state.sourceNode(this.tokens.questionMark, 'invalid')],
                 state.newline,
                 state.indent(-1),
-                state.sourceNode(this.consequent ?? this.questionMarkToken, 'else'),
+                state.sourceNode(this.consequent ?? this.tokens.questionMark, 'else'),
                 state.newline,
                 state.indent(1),
-                state.sourceNode(this.consequent ?? this.questionMarkToken, 'return '),
-                ...this.alternate?.transpile(state) ?? [state.sourceNode(this.consequent ?? this.questionMarkToken, 'invalid')],
+                state.sourceNode(this.consequent ?? this.tokens.questionMark, 'return '),
+                ...this.alternate?.transpile(state) ?? [state.sourceNode(this.consequent ?? this.tokens.questionMark, 'invalid')],
                 state.newline,
                 state.indent(-1),
-                state.sourceNode(this.questionMarkToken, 'end if'),
+                state.sourceNode(this.tokens.questionMark, 'end if'),
                 state.newline,
                 state.indent(-1),
-                state.sourceNode(this.questionMarkToken, 'end function)('),
+                state.sourceNode(this.tokens.questionMark, 'end function)('),
                 ...this.test.transpile(state),
-                state.sourceNode(this.questionMarkToken, `${['', ...allUniqueVarNames].join(', ')})`)
+                state.sourceNode(this.tokens.questionMark, `${['', ...allUniqueVarNames].join(', ')})`)
             );
             state.blockDepth--;
         } else {
@@ -1859,34 +2399,53 @@ export class TernaryExpression extends Expression {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.test.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new TernaryExpression(
-                this.test?.clone(),
-                util.cloneToken(this.questionMarkToken),
-                this.consequent?.clone(),
-                util.cloneToken(this.colonToken),
-                this.alternate?.clone()
-            ),
+            new TernaryExpression({
+                test: this.test?.clone(),
+                questionMark: util.cloneToken(this.tokens.questionMark),
+                consequent: this.consequent?.clone(),
+                colon: util.cloneToken(this.tokens.colon),
+                alternate: this.alternate?.clone()
+            }),
             ['test', 'consequent', 'alternate']
         );
     }
 }
 
 export class NullCoalescingExpression extends Expression {
-    constructor(
-        public consequent: Expression,
-        public questionQuestionToken: Token,
-        public alternate: Expression
-    ) {
+    constructor(options: {
+        consequent: Expression;
+        questionQuestion?: Token;
+        alternate: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            consequent,
-            questionQuestionToken,
-            alternate
+        this.tokens = {
+            questionQuestion: options.questionQuestion
+        };
+        this.consequent = options.consequent;
+        this.alternate = options.alternate;
+        this.location = util.createBoundingLocation(
+            this.consequent,
+            this.tokens.questionQuestion,
+            this.alternate
         );
     }
-    public readonly range: Range | undefined;
+
+    public readonly kind = AstNodeKind.NullCoalescingExpression;
+
+    public readonly location: Location | undefined;
+
+    public readonly tokens: {
+        readonly questionQuestion?: Token;
+    };
+
+    public readonly consequent: Expression;
+    public readonly alternate: Expression;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
@@ -1960,29 +2519,39 @@ export class NullCoalescingExpression extends Expression {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.consequent.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new NullCoalescingExpression(
-                this.consequent?.clone(),
-                util.cloneToken(this.questionQuestionToken),
-                this.alternate?.clone()
-            ),
+            new NullCoalescingExpression({
+                consequent: this.consequent?.clone(),
+                questionQuestion: util.cloneToken(this.tokens.questionQuestion),
+                alternate: this.alternate?.clone()
+            }),
             ['consequent', 'alternate']
         );
     }
 }
 
 export class RegexLiteralExpression extends Expression {
-    public constructor(
-        public tokens: {
-            regexLiteral: Token;
-        }
-    ) {
+    constructor(options: {
+        regexLiteral: Token;
+    }) {
         super();
+        this.tokens = {
+            regexLiteral: options.regexLiteral
+        };
     }
 
-    public get range() {
-        return this.tokens?.regexLiteral?.range;
+    public readonly kind = AstNodeKind.RegexLiteralExpression;
+    public readonly tokens: {
+        readonly regexLiteral: Token;
+    };
+
+    public get location(): Location {
+        return this.tokens?.regexLiteral?.location;
     }
 
     public transpile(state: BrsTranspileState): TranspileResult {
@@ -2021,43 +2590,9 @@ export class RegexLiteralExpression extends Expression {
             })
         );
     }
-}
-
-
-export class TypeCastExpression extends Expression {
-    constructor(
-        public obj: Expression,
-        public asToken: Token,
-        public typeToken: Token
-    ) {
-        super();
-        this.range = util.createBoundingRange(
-            this.obj,
-            this.asToken,
-            this.typeToken
-        );
-    }
-
-    public range: Range;
-
-    public transpile(state: BrsTranspileState): TranspileResult {
-        return this.obj.transpile(state);
-    }
-    public walk(visitor: WalkVisitor, options: WalkOptions) {
-        if (options.walkMode & InternalWalkMode.walkExpressions) {
-            walk(this, 'obj', visitor, options);
-        }
-    }
 
-    public clone() {
-        return this.finalizeClone(
-            new TypeCastExpression(
-                this.obj?.clone(),
-                util.cloneToken(this.asToken),
-                util.cloneToken(this.typeToken)
-            ),
-            ['obj']
-        );
+    get leadingTrivia(): Token[] {
+        return this.tokens.regexLiteral?.leadingTrivia;
     }
 }
 
@@ -2069,28 +2604,27 @@ function expressionToValue(expr: Expression, strict: boolean): ExpressionValue {
         return null;
     }
     if (isUnaryExpression(expr) && isLiteralNumber(expr.right)) {
-        return numberExpressionToValue(expr.right, expr.operator.text);
+        return numberExpressionToValue(expr.right, expr.tokens.operator.text);
     }
     if (isLiteralString(expr)) {
         //remove leading and trailing quotes
-        return expr.token.text.replace(/^"/, '').replace(/"$/, '');
+        return expr.tokens.value.text.replace(/^"/, '').replace(/"$/, '');
     }
     if (isLiteralNumber(expr)) {
         return numberExpressionToValue(expr);
     }
 
     if (isLiteralBoolean(expr)) {
-        return expr.token.text.toLowerCase() === 'true';
+        return expr.tokens.value.text.toLowerCase() === 'true';
     }
     if (isArrayLiteralExpression(expr)) {
         return expr.elements
-            .filter(e => !isCommentStatement(e))
             .map(e => expressionToValue(e, strict));
     }
     if (isAALiteralExpression(expr)) {
         return expr.elements.reduce((acc, e) => {
-            if (!isCommentStatement(e) && !(isAAIndexedMemberExpression(e))) {
-                acc[e.keyToken.text] = expressionToValue(e.value, strict);
+            if (!(isAAIndexedMemberExpression(e))) {
+                acc[e.tokens.key.text] = expressionToValue(e.value, strict);
             }
             return acc;
         }, {});
@@ -2098,20 +2632,445 @@ function expressionToValue(expr: Expression, strict: boolean): ExpressionValue {
     //for annotations, we only support serializing pure string values
     if (isTemplateStringExpression(expr)) {
         if (expr.quasis?.length === 1 && expr.expressions.length === 0) {
-            return expr.quasis[0].expressions.map(x => x.token.text).join('');
+            return expr.quasis[0].expressions.map(x => x.tokens.value.text).join('');
         }
     }
     return strict ? null : expr;
 }
 
 function numberExpressionToValue(expr: LiteralExpression, operator = '') {
-    if (isIntegerType(expr.type) || isLongIntegerType(expr.type)) {
-        return parseInt(operator + expr.token.text);
+    if (isIntegerType(expr.getType()) || isLongIntegerType(expr.getType())) {
+        return parseInt(operator + expr.tokens.value.text);
     } else {
-        return parseFloat(operator + expr.token.text);
+        return parseFloat(operator + expr.tokens.value.text);
     }
 }
 
+export class TypeExpression extends Expression implements TypedefProvider {
+    constructor(options: {
+        /**
+         * The standard AST expression that represents the type for this TypeExpression.
+         */
+        expression: Expression;
+    }) {
+        super();
+        this.expression = options.expression;
+        this.location = util.cloneLocation(this.expression?.location);
+    }
+
+    public readonly kind = AstNodeKind.TypeExpression;
+
+    /**
+     * The standard AST expression that represents the type for this TypeExpression.
+     */
+    public readonly expression: Expression;
+
+    public readonly location: Location;
+
+    public transpile(state: BrsTranspileState): TranspileResult {
+        //roku built-in names (rosgnode*, etc.) collapse to `dynamic` at transpile.
+        //Check before isNativeType, since unresolved built-ins resolve to DynamicType
+        //(a native type) which would otherwise pass-through their original text.
+        const name = this.getName(ParseMode.BrighterScript);
+        if (name && util.isBuiltInType(name)) {
+            return ['dynamic'];
+        }
+        const exprType = this.getType({ flags: SymbolTypeFlag.typetime });
+        if (isNativeType(exprType)) {
+            return this.expression.transpile(state);
+        }
+        return [exprType.toTypeString()];
+    }
+    public walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'expression', visitor, options);
+        }
+    }
+
+    public getType(options: GetTypeOptions): BscType {
+        return this.expression.getType({ ...options, flags: SymbolTypeFlag.typetime });
+    }
+
+    getTypedef(state: TranspileState): TranspileResult {
+        // TypeDefs should pass through any valid type names
+        return this.expression.transpile(state as BrsTranspileState);
+    }
+
+    getName(parseMode = ParseMode.BrighterScript): string {
+        //TODO: this may not support Complex Types, eg. generics or Unions
+        return util.getAllDottedGetPartsAsString(this.expression, parseMode);
+    }
+
+    getNameParts(): string[] {
+        //TODO: really, this code is only used to get Namespaces. It could be more clear.
+        return util.getAllDottedGetParts(this.expression).map(x => x.text);
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new TypeExpression({
+                expression: this.expression?.clone()
+            }),
+            ['expression']
+        );
+    }
+}
+
+export class TypecastExpression extends Expression {
+    constructor(options: {
+        obj: Expression;
+        as?: Token;
+        typeExpression?: TypeExpression;
+    }) {
+        super();
+        this.tokens = {
+            as: options.as
+        };
+        this.obj = options.obj;
+        this.typeExpression = options.typeExpression;
+        this.location = util.createBoundingLocation(
+            this.obj,
+            this.tokens.as,
+            this.typeExpression
+        );
+    }
+
+    public readonly kind = AstNodeKind.TypecastExpression;
+
+    public readonly obj: Expression;
+
+    public readonly tokens: {
+        readonly as?: Token;
+    };
+
+    public typeExpression?: TypeExpression;
+
+    public readonly location: Location;
+
+    public transpile(state: BrsTranspileState): TranspileResult {
+        return this.obj.transpile(state);
+    }
+    public walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'obj', visitor, options);
+            walk(this, 'typeExpression', visitor, options);
+        }
+    }
+
+    public getType(options: GetTypeOptions): BscType {
+        const result = this.typeExpression.getType(options);
+        if (options.typeChain) {
+            // modify last typechain entry to show it is a typecast
+            const lastEntry = options.typeChain[options.typeChain.length - 1];
+            if (lastEntry) {
+                lastEntry.astNode = this;
+            }
+        }
+        return result;
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new TypecastExpression({
+                obj: this.obj?.clone(),
+                as: util.cloneToken(this.tokens.as),
+                typeExpression: this.typeExpression?.clone()
+            }),
+            ['obj', 'typeExpression']
+        );
+    }
+}
+
+export class TypedArrayExpression extends Expression {
+    constructor(options: {
+        innerType: Expression;
+        leftBracket?: Token;
+        rightBracket?: Token;
+    }) {
+        super();
+        this.tokens = {
+            leftBracket: options.leftBracket,
+            rightBracket: options.rightBracket
+        };
+        this.innerType = options.innerType;
+        this.location = util.createBoundingLocation(
+            this.innerType,
+            this.tokens.leftBracket,
+            this.tokens.rightBracket
+        );
+    }
+
+    public readonly tokens: {
+        readonly leftBracket?: Token;
+        readonly rightBracket?: Token;
+    };
+
+    public readonly innerType: Expression;
+
+    public readonly kind = AstNodeKind.TypedArrayExpression;
+
+    public readonly location: Location;
+
+    public transpile(state: BrsTranspileState): TranspileResult {
+        //typed arrays (e.g. `float[]`, `float[][][]`) collapse to `dynamic` since
+        //BrightScript has no array-of-T type at the language level.
+        return ['dynamic'];
+    }
+
+    public walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'innerType', visitor, options);
+        }
+    }
+
+    public getType(options: GetTypeOptions): BscType {
+        return new ArrayType(this.innerType.getType(options));
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new TypedArrayExpression({
+                innerType: this.innerType?.clone(),
+                leftBracket: util.cloneToken(this.tokens.leftBracket),
+                rightBracket: util.cloneToken(this.tokens.rightBracket)
+            }),
+            ['innerType']
+        );
+    }
+}
+
+export class InlineInterfaceExpression extends Expression {
+    constructor(options: {
+        open?: Token;
+        members: InlineInterfaceMemberExpression[];
+        close?: Token;
+    }) {
+        super();
+        this.tokens = {
+            open: options.open,
+            close: options.close
+        };
+        this.members = options.members;
+        this.location = util.createBoundingLocation(
+            this.tokens.open,
+            ...this.members,
+            this.tokens.close
+        );
+    }
+
+    public readonly tokens: {
+        readonly open?: Token;
+        readonly close?: Token;
+    };
+
+    public readonly members: InlineInterfaceMemberExpression[];
+
+    public readonly kind = AstNodeKind.InlineInterfaceExpression;
+
+    public readonly location: Location;
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.open?.leadingTrivia;
+    }
+
+    public transpile(state: BrsTranspileState): TranspileResult {
+        return [this.getType({ flags: SymbolTypeFlag.typetime }).toTypeString()];
+    }
+
+    public walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walkArray(this.members, visitor, options, this);
+        }
+    }
+
+    public getType(options: GetTypeOptions): BscType {
+        const resultType = new InlineInterfaceType();
+        for (const member of this.members) {
+            let memberName = member.tokens?.name?.text ?? '';
+            if (member.tokens.name.kind === TokenKind.StringLiteral) {
+                memberName = memberName.replace(/"/g, ''); // remove quotes if it was a stringLiteral
+            }
+            if (memberName) {
+                const memberType = member?.getType({ ...options, typeChain: undefined }); // no typechain info needed
+                let flag = SymbolTypeFlag.runtime;
+                if (member.isOptional) {
+                    flag |= SymbolTypeFlag.optional;
+                }
+                resultType.addMember(memberName, { definingNode: member }, memberType, flag);
+            }
+        }
+        return resultType;
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new InlineInterfaceExpression({
+                open: util.cloneToken(this.tokens.open),
+                members: this.members?.map(x => x?.clone()),
+                close: util.cloneToken(this.tokens.close)
+            }),
+            ['members']
+        );
+    }
+}
+
+export class InlineInterfaceMemberExpression extends Expression {
+    constructor(options: {
+        optional?: Token;
+        name: Token;
+        as?: Token;
+        typeExpression?: TypeExpression;
+    }) {
+        super();
+        this.tokens = {
+            name: options.name,
+            as: options.as,
+            optional: options.optional
+        };
+        this.typeExpression = options.typeExpression;
+        this.location = util.createBoundingLocation(
+            this.tokens.optional,
+            this.tokens.name,
+            this.tokens.as,
+            this.typeExpression
+        );
+    }
+
+    public readonly kind = AstNodeKind.InlineInterfaceMemberExpression;
+
+    readonly tokens: {
+        readonly optional?: Token;
+        readonly name: Token;
+        readonly as?: Token;
+    };
+
+    public readonly typeExpression?: TypeExpression;
+
+    public readonly location: Location;
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.optional?.leadingTrivia ?? this.tokens.name.leadingTrivia;
+    }
+
+    public transpile(state: BrsTranspileState): TranspileResult {
+        throw new Error('Method not implemented.');
+    }
+
+    public walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'typeExpression', visitor, options);
+        }
+    }
+
+    public getType(options: GetTypeOptions): BscType {
+        return this.typeExpression?.getType(options) ?? DynamicType.instance;
+    }
+
+    public get isOptional() {
+        return !!this.tokens.optional;
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new InlineInterfaceMemberExpression({
+                typeExpression: this.typeExpression?.clone(),
+                as: util.cloneToken(this.tokens.as),
+                name: util.cloneToken(this.tokens.name),
+                optional: util.cloneToken(this.tokens.optional)
+            }),
+            ['typeExpression']
+        );
+    }
+}
+
+export class TypedFunctionTypeExpression extends Expression {
+    constructor(options: {
+        functionType?: Token;
+        leftParen?: Token;
+        params?: FunctionParameterExpression[];
+        rightParen?: Token;
+        as?: Token;
+        returnType?: TypeExpression;
+
+    }) {
+        super();
+        this.tokens = {
+            functionType: options.functionType,
+            leftParen: options.leftParen,
+            rightParen: options.rightParen,
+            as: options.as
+        };
+        this.params = options.params;
+        this.returnType = options.returnType;
+        this.location = util.createBoundingLocation(
+            this.tokens.functionType,
+            this.tokens.leftParen,
+            ...this.params,
+            this.tokens.rightParen,
+            this.tokens.as,
+            this.returnType
+        );
+    }
+
+    public readonly kind = AstNodeKind.TypedFunctionTypeExpression;
+
+    public readonly tokens: {
+        readonly functionType?: Token;
+        readonly leftParen?: Token;
+        readonly rightParen?: Token;
+        readonly as?: Token;
+    };
+
+    public readonly params: FunctionParameterExpression[];
+    public readonly returnType?: TypeExpression;
+
+    public readonly location: Location;
+
+    public transpile(state: BrsTranspileState): TranspileResult {
+        return [this.getType({ flags: SymbolTypeFlag.typetime }).toTypeString()];
+    }
+
+    public walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walkArray(this.params, visitor, options, this);
+            walk(this, 'returnType', visitor, options);
+        }
+    }
+
+    public getType(options: GetTypeOptions): BscType {
+        const returnType = this.returnType?.getType({ ...options, typeChain: undefined }) ?? DynamicType.instance;
+        const functionType = new TypedFunctionType(returnType);
+        for (const param of this.params) {
+            functionType.addParameter(param.tokens.name.text, param.getType({ ...options, typeChain: undefined }), !!param.defaultValue);
+        }
+        functionType.setSub(this.tokens.functionType?.kind === TokenKind.Sub);
+
+        options.typeChain?.push(new TypeChainEntry({
+            name: '',
+            type: functionType,
+            astNode: this,
+            data: options.data
+        }));
+
+        return functionType;
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new TypedFunctionTypeExpression({
+                functionType: util.cloneToken(this.tokens.functionType),
+                leftParen: util.cloneToken(this.tokens.leftParen),
+                params: this.params?.map(x => x?.clone()),
+                rightParen: util.cloneToken(this.tokens.rightParen),
+                as: util.cloneToken(this.tokens.as),
+                returnType: this.returnType?.clone()
+            }),
+            ['params', 'returnType']
+        );
+    }
+}
+
+
 /**
  * A list of names of functions that are restricted from being stored to a
  * variable, property, or passed as an argument. (i.e. `type` or `createobject`).
diff --git a/src/parser/Parser.Class.spec.ts b/src/parser/Parser.Class.spec.ts
index 98739d2cc..1b3eab8b8 100644
--- a/src/parser/Parser.Class.spec.ts
+++ b/src/parser/Parser.Class.spec.ts
@@ -8,6 +8,8 @@ import { ClassStatement } from './Statement';
 import { NewExpression } from './Expression';
 import { expectDiagnostics, expectDiagnosticsIncludes, expectZeroDiagnostics } from '../testHelpers.spec';
 import { isClassStatement } from '../astUtils/reflection';
+import { StringType } from '../types/StringType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
 import util from '../util';
 
 describe('parser class', () => {
@@ -42,9 +44,9 @@ describe('parser class', () => {
                     ${keyword} as string
                 end class
             `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements[0]).instanceof(ClassStatement);
+            expect(ast.statements[0]).instanceof(ClassStatement);
         });
 
         it(`supports ${keyword} as method name`, () => {
@@ -55,9 +57,9 @@ describe('parser class', () => {
                    end sub
                 end class
             `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics[0]?.message).not.to.exist;
-            expect(statements[0]).instanceof(ClassStatement);
+            expect(ast.statements[0]).instanceof(ClassStatement);
         });
     }
 
@@ -68,9 +70,9 @@ describe('parser class', () => {
                 class ${keyword}
                 end class
             `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements[0]).instanceof(ClassStatement);
+            expect(ast.statements[0]).instanceof(ClassStatement);
         });
     }
 
@@ -103,7 +105,7 @@ describe('parser class', () => {
 
         expectDiagnostics(parser, [{
             ...DiagnosticMessages.cannotUseReservedWordAsIdentifier('type'),
-            range: util.createRange(1, 21, 1, 25)
+            location: util.createLocation(1, 21, 1, 25)
         }]);
     });
 
@@ -117,7 +119,7 @@ describe('parser class', () => {
 
         expectDiagnostics(parser, [{
             ...DiagnosticMessages.cannotUseReservedWordAsIdentifier('type'),
-            range: util.createRange(2, 25, 2, 29)
+            location: util.createLocation(2, 25, 2, 29)
         }]);
     });
 
@@ -130,7 +132,7 @@ describe('parser class', () => {
 
         expectDiagnostics(parser, [{
             ...DiagnosticMessages.cannotUseReservedWordAsIdentifier('type'),
-            range: util.createRange(2, 25, 2, 29)
+            location: util.createLocation(2, 25, 2, 29)
         }]);
     });
 
@@ -186,9 +188,9 @@ describe('parser class', () => {
                 class Person
                 end class
             `);
-        let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+        let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements[0]).instanceof(ClassStatement);
+        expect(ast.statements[0]).instanceof(ClassStatement);
     });
 
     it('bad property does not invalidate next sibling method', () => {
@@ -199,10 +201,10 @@ describe('parser class', () => {
                     end sub
                 end class
             `);
-        let { statements } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
-        let classStatement = statements[0] as ClassStatement;
+        let { ast } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+        let classStatement = ast.statements[0] as ClassStatement;
         expect(classStatement.methods[0]).to.exist;
-        expect(classStatement.methods[0].name.text).to.equal('new');
+        expect(classStatement.methods[0].tokens.name.text).to.equal('new');
     });
 
     it('catches class without name', () => {
@@ -210,19 +212,19 @@ describe('parser class', () => {
                 class
                 end class
             `);
-        let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+        let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
         expect(diagnostics).length.to.be.greaterThan(0);
-        expect(diagnostics[0].code).to.equal(DiagnosticMessages.expectedIdentifierAfterKeyword('class').code);
-        expect(statements[0]).instanceof(ClassStatement);
+        expect(diagnostics[0].code).to.equal(DiagnosticMessages.expectedIdentifier('class').code);
+        expect(ast.statements[0]).instanceof(ClassStatement);
     });
 
     it('catches malformed class', () => {
         let { tokens } = Lexer.scan(`
                 class Person
             `);
-        let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+        let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
         expect(diagnostics).length.to.be.greaterThan(0);
-        expect(statements[0]).instanceof(ClassStatement);
+        expect(ast.statements[0]).instanceof(ClassStatement);
     });
 
     describe('fields', () => {
@@ -232,14 +234,14 @@ describe('parser class', () => {
                         public firstName as string
                     end class
                 `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.empty;
-            expect(statements[0]).instanceof(ClassStatement);
-            let field = (statements[0] as ClassStatement).body[0] as FieldStatement;
-            expect(field.accessModifier!.kind).to.equal(TokenKind.Public);
-            expect(field.name!.text).to.equal('firstName');
-            expect(field.as!.text).to.equal('as');
-            expect(field.type!.text).to.equal('string');
+            expect(ast.statements[0]).instanceof(ClassStatement);
+            let field = (ast.statements[0] as ClassStatement).body[0] as FieldStatement;
+            expect(field.tokens.accessModifier!.kind).to.equal(TokenKind.Public);
+            expect(field.tokens.name!.text).to.equal('firstName');
+            expect(field.tokens.as!.text).to.equal('as');
+            expect(field.getType({ flags: SymbolTypeFlag.typetime }))!.to.be.instanceOf(StringType);
         });
 
         it('can be solely an identifier', () => {
@@ -248,10 +250,10 @@ describe('parser class', () => {
                         firstName
                     end class
                 `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.lengthOf(0);
-            let cls = statements[0] as ClassStatement;
-            expect(cls.fields[0].name!.text).to.equal('firstName');
+            let cls = ast.statements[0] as ClassStatement;
+            expect(cls.fields[0].tokens.name!.text).to.equal('firstName');
         });
 
         it('malformed field does not impact leading and trailing fields', () => {
@@ -262,23 +264,23 @@ describe('parser class', () => {
                         lastName as string
                     end class
                 `);
-            let { statements } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
-            let cls = statements[0] as ClassStatement;
-            expect(cls.fields[0].name!.text).to.equal('firstName');
-            expect(cls.fields[cls.fields.length - 1].name!.text).to.equal('lastName');
+            let { ast } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let cls = ast.statements[0] as ClassStatement;
+            expect(cls.fields[0].tokens.name!.text).to.equal('firstName');
+            expect(cls.fields[cls.fields.length - 1].tokens.name!.text).to.equal('lastName');
         });
 
         it(`detects missing type after 'as' keyword`, () => {
             let { tokens } = Lexer.scan(`
-                    class Person
-                        middleName as
-                    end class
-                `);
-            let { diagnostics, statements } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                class Person
+                    middleName as
+                end class
+            `);
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics.length).to.be.greaterThan(0);
-            let cls = statements[0] as ClassStatement;
-            expect(cls.fields[0].name!.text).to.equal('middleName');
-            expect(diagnostics[0].code).to.equal(DiagnosticMessages.expectedIdentifierAfterKeyword('as').code);
+            let cls = ast.statements[0] as ClassStatement;
+            expect(cls.fields[0].tokens.name!.text).to.equal('middleName');
+            expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.expectedIdentifier('as'));
         });
 
         it('field access modifier defaults to undefined when omitted', () => {
@@ -287,10 +289,10 @@ describe('parser class', () => {
                         firstName as string
                     end class
                 `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.lengthOf(0);
-            let cls = statements[0] as ClassStatement;
-            expect(cls.fields[0].accessModifier).to.be.undefined;
+            let cls = ast.statements[0] as ClassStatement;
+            expect(cls.fields[0].tokens.accessModifier).to.be.undefined;
         });
     });
 
@@ -303,12 +305,12 @@ describe('parser class', () => {
                         end function
                     end class
                 `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.lengthOf(0);
-            let theClass = statements[0] as ClassStatement;
+            let theClass = ast.statements[0] as ClassStatement;
             expect(theClass).to.be.instanceof(ClassStatement);
             let method = theClass.methods[0];
-            expect(method.name.text).to.equal('getName');
+            expect(method.tokens.name.text).to.equal('getName');
             expect(method.accessModifier!.text).to.equal('public');
             expect(method.func).to.exist;
         });
@@ -321,9 +323,9 @@ describe('parser class', () => {
                         end function
                     end class
                 `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.lengthOf(0);
-            let theClass = statements[0] as ClassStatement;
+            let theClass = ast.statements[0] as ClassStatement;
             let method = theClass.methods[0];
             expect(method.accessModifier!.text).to.equal('public');
             expect(method.func).to.exist;
@@ -337,9 +339,9 @@ describe('parser class', () => {
                         end function
                     end class
                     `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics).to.be.lengthOf(0);
-            let cls = statements[0] as ClassStatement;
+            let cls = ast.statements[0] as ClassStatement;
             expect(cls.methods[0].accessModifier).to.be.undefined;
         });
 
@@ -354,9 +356,9 @@ describe('parser class', () => {
                     end sub
                 end class
             `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expect(diagnostics[0]?.message).not.to.exist;
-            let cls = statements[0] as ClassStatement;
+            let cls = ast.statements[0] as ClassStatement;
             expect((cls.memberMap['name'] as FieldStatement).initialValue).to.exist;
             expect((cls.memberMap['age'] as FieldStatement).initialValue).to.exist;
             expect((cls.memberMap['isalive'] as FieldStatement).initialValue).to.exist;
@@ -403,11 +405,11 @@ describe('parser class', () => {
             class Toddler extends Person
             end class
         `);
-        let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+        let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
         expect(diagnostics[0]?.message).to.not.exist;
-        let stmt = (statements[1] as ClassStatement);
-        expect(stmt.extendsKeyword!.text).to.equal('extends');
-        expect(stmt.parentClassName!.getName(ParseMode.BrighterScript)).to.equal('Person');
+        let stmt = (ast.statements[1] as ClassStatement);
+        expect(stmt.tokens.extends!.text).to.equal('extends');
+        expect(stmt.parentClassName.getName()).to.equal('Person');
     });
 
     it('catches missing identifier after "extends" keyword', () => {
@@ -422,12 +424,12 @@ describe('parser class', () => {
             end class
         `);
         let { diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
-        expect(diagnostics[0].code).to.equal(DiagnosticMessages.expectedIdentifierAfterKeyword('extends').code);
+        expect(diagnostics[0].code).to.equal(DiagnosticMessages.expectedIdentifier('extends').code);
     });
 
     describe('new keyword', () => {
         it('parses properly', () => {
-            let { statements, diagnostics } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 sub main()
                     a = new Animal()
                 end sub
@@ -436,7 +438,7 @@ describe('parser class', () => {
             `, { mode: ParseMode.BrighterScript });
 
             expect(diagnostics[0]?.message).to.not.exist;
-            let body = (statements[0] as FunctionStatement).func.body;
+            let body = (ast.statements[0] as FunctionStatement).func.body;
             let stmt = (body.statements[0] as AssignmentStatement);
             expect(stmt.value).to.be.instanceof(NewExpression);
         });
@@ -455,85 +457,108 @@ describe('parser class', () => {
 
     describe('optional members', () => {
         it('allows optional fields', () => {
-            let { statements, diagnostics } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 class HasOptional
                     optional name as string
                     optional height
                 end class
             `, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements.length).to.eq(1);
-            expect(isClassStatement(statements[0])).to.be.true;
-            const klass = statements[0] as ClassStatement;
+            expect(ast.statements.length).to.eq(1);
+            expect(isClassStatement(ast.statements[0])).to.be.true;
+            const klass = ast.statements[0] as ClassStatement;
             klass.fields.forEach(f => expect(f.isOptional).to.be.true);
+            const klassType = klass.getType({ flags: SymbolTypeFlag.typetime });
+            // eslint-disable-next-line no-bitwise
+            klassType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime).forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
         });
 
         it('allows fields named optional', () => {
-            let { statements, diagnostics } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 class IsJustOptional
                     optional
                     someThingElse
                 end class
             `, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements.length).to.eq(1);
-            expect(isClassStatement(statements[0])).to.be.true;
-            const klass = statements[0] as ClassStatement;
+            expect(ast.statements.length).to.eq(1);
+            expect(isClassStatement(ast.statements[0])).to.be.true;
+            const klass = ast.statements[0] as ClassStatement;
             klass.fields.forEach(f => expect(f.isOptional).to.be.false);
+            const klassType = klass.getType({ flags: SymbolTypeFlag.typetime });
+            const klassMembers = klassType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(klassMembers.length).to.eq(2);
+            // eslint-disable-next-line no-bitwise
+            klassMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(0));
         });
 
         it('allows typed fields named optional', () => {
-            let { statements, diagnostics } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 class IsJustOptional
                     optional as string
                 end class
             `, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements.length).to.eq(1);
-            expect(isClassStatement(statements[0])).to.be.true;
-            const klass = statements[0] as ClassStatement;
+            expect(ast.statements.length).to.eq(1);
+            expect(isClassStatement(ast.statements[0])).to.be.true;
+            const klass = ast.statements[0] as ClassStatement;
             klass.fields.forEach(f => expect(f.isOptional).to.be.false);
+            const klassType = klass.getType({ flags: SymbolTypeFlag.typetime });
+            const klassMembers = klassType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(klassMembers.length).to.eq(1);
+            // eslint-disable-next-line no-bitwise
+            klassMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(0));
         });
 
         it('allows fields named optional that are also optional', () => {
-            let { statements, diagnostics } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 class IsJustOptional
                     optional optional
                 end class
             `, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements.length).to.eq(1);
-            expect(isClassStatement(statements[0])).to.be.true;
-            const klass = statements[0] as ClassStatement;
+            expect(ast.statements.length).to.eq(1);
+            expect(isClassStatement(ast.statements[0])).to.be.true;
+            const klass = ast.statements[0] as ClassStatement;
             klass.fields.forEach(f => expect(f.isOptional).to.be.true);
+            const klassType = klass.getType({ flags: SymbolTypeFlag.typetime });
+            const klassMembers = klassType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(klassMembers.length).to.eq(1);
+            // eslint-disable-next-line no-bitwise
+            klassMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
         });
 
         it('disallows optional methods', () => {
-            let { statements, diagnostics } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 class HasOptional
+
                     optional function getValue() as boolean
                         return false
                     end function
                 end class
             `, { mode: ParseMode.BrighterScript });
-
             expectDiagnosticsIncludes(diagnostics, [
                 DiagnosticMessages.expectedNewlineOrColon().message
             ]);
-            expect(statements.length).to.eq(1);
+            expect(ast.statements.length).to.eq(1);
         });
 
         it('allows fields named `as` that are also optional', () => {
-            let { statements, diagnostics } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 class IsJustOptional
                     optional as
                 end class
             `, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements.length).to.eq(1);
-            expect(isClassStatement(statements[0])).to.be.true;
-            const klass = statements[0] as ClassStatement;
+            expect(ast.statements.length).to.eq(1);
+            expect(isClassStatement(ast.statements[0])).to.be.true;
+            const klass = ast.statements[0] as ClassStatement;
             klass.fields.forEach(f => expect(f.isOptional).to.be.true);
+            const klassType = klass.getType({ flags: SymbolTypeFlag.typetime });
+            const klassMembers = klassType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(klassMembers.length).to.eq(1);
+            // eslint-disable-next-line no-bitwise
+            klassMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
         });
     });
 });
diff --git a/src/parser/Parser.spec.ts b/src/parser/Parser.spec.ts
index 52e6b40cb..5d315ce68 100644
--- a/src/parser/Parser.spec.ts
+++ b/src/parser/Parser.spec.ts
@@ -1,183 +1,31 @@
 import { expect, assert } from '../chai-config.spec';
 import { Lexer } from '../lexer/Lexer';
 import { ReservedWords, TokenKind } from '../lexer/TokenKind';
-import type { AAMemberExpression } from './Expression';
-import { TernaryExpression, NewExpression, IndexedGetExpression, DottedGetExpression, XmlAttributeGetExpression, CallfuncExpression, AnnotationExpression, CallExpression, FunctionExpression } from './Expression';
+import type { AAMemberExpression, BinaryExpression, GroupingExpression, InlineInterfaceExpression, LiteralExpression, TypecastExpression, TypeExpression, UnaryExpression } from './Expression';
+import { TernaryExpression, NewExpression, IndexedGetExpression, DottedGetExpression, XmlAttributeGetExpression, CallfuncExpression, AnnotationExpression, CallExpression, FunctionExpression, VariableExpression } from './Expression';
 import { Parser, ParseMode } from './Parser';
-import type { AliasStatement, AssignmentStatement, ClassStatement, TypecastStatement, TypeStatement } from './Statement';
+import type { AliasStatement, AssignmentStatement, Block, ClassStatement, ConditionalCompileConstStatement, ConditionalCompileErrorStatement, ConditionalCompileStatement, ExitStatement, ForStatement, IfStatement, InterfaceStatement, ReturnStatement, TypecastStatement, TypeStatement } from './Statement';
 import { PrintStatement, FunctionStatement, NamespaceStatement, ImportStatement } from './Statement';
 import { Range } from 'vscode-languageserver';
 import { DiagnosticMessages } from '../DiagnosticMessages';
-import { isAliasStatement, isBlock, isCommentStatement, isFunctionStatement, isIfStatement, isIndexedGetExpression, isTypecastStatement, isTypeStatement } from '../astUtils/reflection';
-import { expectDiagnostics, expectDiagnosticsIncludes, expectZeroDiagnostics } from '../testHelpers.spec';
-import { BrsTranspileState } from './BrsTranspileState';
-import { SourceNode } from 'source-map';
-import { BrsFile } from '../files/BrsFile';
-import { Program } from '../Program';
+import { isAliasStatement, isAssignmentStatement, isBinaryExpression, isBlock, isBody, isCallExpression, isCallfuncExpression, isClassStatement, isConditionalCompileConstStatement, isConditionalCompileErrorStatement, isConditionalCompileStatement, isDottedGetExpression, isExitStatement, isExpression, isExpressionStatement, isFunctionStatement, isGroupingExpression, isIfStatement, isIndexedGetExpression, isInlineInterfaceExpression, isInterfaceStatement, isLiteralExpression, isNamespaceStatement, isPrintStatement, isTypecastExpression, isTypecastStatement, isTypeExpression, isTypeStatement, isUnaryExpression, isVariableExpression } from '../astUtils/reflection';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectTypeToBe, expectZeroDiagnostics, rootDir } from '../testHelpers.spec';
 import { createVisitor, WalkMode } from '../astUtils/visitors';
 import type { Expression, Statement } from './AstNode';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { IntegerType } from '../types/IntegerType';
+import { FloatType } from '../types/FloatType';
+import { StringType } from '../types/StringType';
+import { ArrayType, DynamicType, UnionType } from '../types';
+import { standardizePath as s } from '../util';
+import { InlineInterfaceType } from '../types/InlineInterfaceType';
 
 describe('parser', () => {
     it('emits empty object when empty token list is provided', () => {
-        expect(Parser.parse([])).to.deep.include({
-            statements: [],
-            diagnostics: []
-        });
-    });
-
-    describe('findReferences', () => {
-        it('gets called if references are missing', () => {
-            const parser = Parser.parse(`
-                sub main()
-                end sub
-
-                sub UnusedFunction()
-                end sub
-            `);
-            expect(parser.references.functionStatements.map(x => x.name.text)).to.eql([
-                'main',
-                'UnusedFunction'
-            ]);
-            //simulate a tree-shaking plugin by removing the `UnusedFunction`
-            parser.ast.statements.splice(1);
-            //tell the parser we modified the AST and need to regenerate references
-            parser.invalidateReferences();
-            expect(parser['_references']).not.to.exist;
-            //calling `references` automatically regenerates the references
-            expect(parser.references.functionStatements.map(x => x.name.text)).to.eql([
-                'main'
-            ]);
-        });
-
-        function expressionsToStrings(expressions: Set<Expression>) {
-            return [...expressions.values()].map(x => {
-                const file = new BrsFile('', '', new Program({} as any));
-                const state = new BrsTranspileState(file);
-                return new SourceNode(null, null, null, x.transpile(state) as any).toString();
-            });
-        }
-
-        it('works for references.expressions', () => {
-            const parser = Parser.parse(`
-                b += "plus-equal"
-                a += 1 + 2
-                b += getValue1() + getValue2()
-                increment++
-                decrement--
-                some.node@.doCallfunc()
-                bravo(3 + 4).jump(callMe())
-                obj = {
-                    val1: someValue
-                }
-                arr = [
-                    one
-                ]
-                thing = alpha.bravo
-                alpha.charlie()
-                delta(alpha.delta)
-                call1().a.b.call2()
-                class Person
-                    name as string = "bob"
-                end class
-                function thing(p1 = name.space.getSomething())
-
-                end function
-            `);
-            const expected = [
-                '"plus-equal"',
-                'b',
-                'b += "plus-equal"',
-                '1',
-                '2',
-                'a',
-                'a += 1 + 2',
-                'getValue1()',
-                'getValue2()',
-                'b',
-                'b += getValue1() + getValue2()',
-                'increment++',
-                'decrement--',
-                //currently the "toString" does a transpile, so that's why this is different.
-                'some.node.callfunc("doCallfunc", invalid)',
-                '3',
-                '4',
-                '3 + 4',
-                'callMe()',
-                'bravo(3 + 4).jump(callMe())',
-                'someValue',
-                '{\n    val1: someValue\n}',
-                'one',
-                '[\n    one\n]',
-                'alpha.bravo',
-                'alpha.charlie()',
-                'alpha.delta',
-                'delta(alpha.delta)',
-                'call1().a.b.call2()',
-                '"bob"',
-                'name.space.getSomething()'
-            ];
-
-            expect(
-                expressionsToStrings(parser.references.expressions)
-            ).to.eql(expected);
-
-            //tell the parser we modified the AST and need to regenerate references
-            parser.invalidateReferences();
-
-            expect(
-                expressionsToStrings(parser.references.expressions).sort()
-            ).to.eql(expected.sort());
-        });
-
-        it('works for references.expressions', () => {
-            const parser = Parser.parse(`
-                value = true or type(true) = "something" or Enums.A.Value = "value" and Enum1.Value = Name.Space.Enum2.Value
-            `);
-            const expected = [
-                'true',
-                'type(true)',
-                '"something"',
-                'true',
-                'Enums.A.Value',
-                '"value"',
-                'Enum1.Value',
-                'Name.Space.Enum2.Value',
-                'true or type(true) = "something" or Enums.A.Value = "value" and Enum1.Value = Name.Space.Enum2.Value'
-            ];
-
-            expect(
-                expressionsToStrings(parser.references.expressions)
-            ).to.eql(expected);
-
-            //tell the parser we modified the AST and need to regenerate references
-            parser.invalidateReferences();
-
-            expect(
-                expressionsToStrings(parser.references.expressions).sort()
-            ).to.eql(expected.sort());
-        });
-
-        it('works for logical expression', () => {
-            const parser = Parser.parse(`
-                value = Enums.A.Value = "value"
-            `);
-            const expected = [
-                'Enums.A.Value',
-                '"value"',
-                'Enums.A.Value = "value"'
-            ];
-
-            expect(
-                expressionsToStrings(parser.references.expressions)
-            ).to.eql(expected);
-
-            //tell the parser we modified the AST and need to regenerate references
-            parser.invalidateReferences();
-
-            expect(
-                expressionsToStrings(parser.references.expressions).sort()
-            ).to.eql(expected.sort());
-        });
+        let { ast, diagnostics } = Parser.parse([]);
+        expect(isBody(ast)).to.be.true;
+        expect(ast.statements).to.be.empty;
+        expect(diagnostics).to.be.empty;
     });
 
     describe('callfunc operator', () => {
@@ -201,15 +49,32 @@ describe('parser', () => {
                 end sub
             `, ParseMode.BrighterScript);
             expect(parser.diagnostics[0]?.message).not.to.exist;
-            expect((parser as any).statements[0]?.func?.body?.statements[0]?.expression).to.be.instanceof(CallfuncExpression);
+            expect((parser as any).ast.statements[0]?.func?.body?.statements[0]?.expression).to.be.instanceof(CallfuncExpression);
         });
     });
 
+    it('flags function names with invalid characters', () => {
+        const { diagnostics } = Parser.parse(`
+            function alpha$() : end function
+            function beta%() : end function
+            function charlie!() : end function
+            function delta#() : end function
+            function echo&() : end function
+        `);
+        expectDiagnostics(diagnostics, [
+            DiagnosticMessages.invalidIdentifier('alpha$', '$'),
+            DiagnosticMessages.invalidIdentifier('beta%', '%'),
+            DiagnosticMessages.invalidIdentifier('charlie!', '!'),
+            DiagnosticMessages.invalidIdentifier('delta#', '#'),
+            DiagnosticMessages.invalidIdentifier('echo&', '&')
+        ]);
+    });
+
     describe('optional chaining operator', () => {
         function getExpression<T>(text: string, options?: { matcher?: any; parseMode?: ParseMode }) {
             const parser = parse(text, options?.parseMode);
             expectZeroDiagnostics(parser);
-            const expressions = [...parser.references.expressions];
+            const expressions = parser.ast.findChildren<Expression>(isExpression);
             if (options?.matcher) {
                 return expressions.find(options.matcher) as unknown as T;
             } else {
@@ -219,55 +84,55 @@ describe('parser', () => {
         it('works for ?.', () => {
             const expression = getExpression<DottedGetExpression>(`value = person?.name`);
             expect(expression).to.be.instanceOf(DottedGetExpression);
-            expect(expression.dot.kind).to.eql(TokenKind.QuestionDot);
+            expect(expression.tokens.dot.kind).to.eql(TokenKind.QuestionDot);
         });
 
         it('works for ?[', () => {
             const expression = getExpression<IndexedGetExpression>(`value = person?["name"]`, { matcher: isIndexedGetExpression });
             expect(expression).to.be.instanceOf(IndexedGetExpression);
-            expect(expression.openingSquare.kind).to.eql(TokenKind.QuestionLeftSquare);
-            expect(expression.questionDotToken).not.to.exist;
+            expect(expression.tokens.openingSquare.kind).to.eql(TokenKind.QuestionLeftSquare);
+            expect(expression.tokens.questionDot).not.to.exist;
         });
 
         it('works for ?.[', () => {
             const expression = getExpression<IndexedGetExpression>(`value = person?.["name"]`, { matcher: isIndexedGetExpression });
             expect(expression).to.be.instanceOf(IndexedGetExpression);
-            expect(expression.openingSquare.kind).to.eql(TokenKind.LeftSquareBracket);
-            expect(expression.questionDotToken?.kind).to.eql(TokenKind.QuestionDot);
+            expect(expression.tokens.openingSquare.kind).to.eql(TokenKind.LeftSquareBracket);
+            expect(expression.tokens.questionDot?.kind).to.eql(TokenKind.QuestionDot);
         });
 
         it('works for ?@', () => {
             const expression = getExpression<XmlAttributeGetExpression>(`value = someXml?@someAttr`);
             expect(expression).to.be.instanceOf(XmlAttributeGetExpression);
-            expect(expression.at.kind).to.eql(TokenKind.QuestionAt);
+            expect(expression.tokens.at.kind).to.eql(TokenKind.QuestionAt);
         });
 
         it('works for ?(', () => {
             const expression = getExpression<CallExpression>(`value = person.getName?()`);
             expect(expression).to.be.instanceOf(CallExpression);
-            expect(expression.openingParen.kind).to.eql(TokenKind.QuestionLeftParen);
+            expect(expression.tokens.openingParen.kind).to.eql(TokenKind.QuestionLeftParen);
         });
 
         it('works for print statements using question mark', () => {
-            const { statements } = parse(`
+            const { ast } = parse(`
                 ?[1]
                 ?(1+1)
             `);
-            expect(statements[0]).to.be.instanceOf(PrintStatement);
-            expect(statements[1]).to.be.instanceOf(PrintStatement);
+            expect(ast.statements[0]).to.be.instanceOf(PrintStatement);
+            expect(ast.statements[1]).to.be.instanceOf(PrintStatement);
         });
 
         //TODO enable this once we properly parse IIFEs
         it.skip('works for ?( in anonymous function', () => {
             const expression = getExpression<CallExpression>(`thing = (function() : end function)?()`);
             expect(expression).to.be.instanceOf(CallExpression);
-            expect(expression.openingParen.kind).to.eql(TokenKind.QuestionLeftParen);
+            expect(expression.tokens.openingParen.kind).to.eql(TokenKind.QuestionLeftParen);
         });
 
         it('works for ?( in new call', () => {
             const expression = getExpression<NewExpression>(`thing = new Person?()`, { parseMode: ParseMode.BrighterScript });
             expect(expression).to.be.instanceOf(NewExpression);
-            expect(expression.call.openingParen.kind).to.eql(TokenKind.QuestionLeftParen);
+            expect(expression.call.tokens.openingParen.kind).to.eql(TokenKind.QuestionLeftParen);
         });
 
         it('distinguishes between optional chaining and ternary expression', () => {
@@ -278,8 +143,9 @@ describe('parser', () => {
                     key = isTrue ? ["name"] : ["age"]
                 end sub
             `, ParseMode.BrighterScript);
-            expect(parser.references.assignmentStatements[0].value).is.instanceof(IndexedGetExpression);
-            expect(parser.references.assignmentStatements[2].value).is.instanceof(TernaryExpression);
+            const assignmentStatements = parser.ast.findChildren<AssignmentStatement>(isAssignmentStatement);
+            expect(assignmentStatements[0].value).is.instanceof(IndexedGetExpression);
+            expect(assignmentStatements[2].value).is.instanceof(TernaryExpression);
         });
 
         it('distinguishes between optional chaining and ternary expression', () => {
@@ -291,8 +157,9 @@ describe('parser', () => {
                     key = isTrue ? ["name"] : getDefault()
                 end sub
             `, ParseMode.BrighterScript);
-            expect(parser.references.assignmentStatements[0].value).is.instanceof(IndexedGetExpression);
-            expect(parser.references.assignmentStatements[1].value).is.instanceof(TernaryExpression);
+            const assignmentStatements = parser.ast.findChildren<AssignmentStatement>(isAssignmentStatement);
+            expect(assignmentStatements[0].value).is.instanceof(IndexedGetExpression);
+            expect(assignmentStatements[1].value).is.instanceof(TernaryExpression);
         });
     });
 
@@ -302,7 +169,7 @@ describe('parser', () => {
                 sub main()
                     call()a
                 end sub
-            `).diagnostics.map(x => rangeToArray(x.range))).to.eql([
+            `).diagnostics.map(x => rangeToArray(x.location.range))).to.eql([
                 [2, 26, 2, 27],
                 [2, 27, 2, 28]
             ]);
@@ -315,10 +182,10 @@ describe('parser', () => {
                 end functionasdf
             `).diagnostics;
             expect(diagnostics[0]?.message).to.exist.and.to.eql(
-                DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression().message
+                DiagnosticMessages.expectedStatement().message
             );
 
-            expect(diagnostics[0]?.range).to.eql(
+            expect(diagnostics[0]?.location.range).to.eql(
                 Range.create(3, 20, 3, 32)
             );
         });
@@ -370,15 +237,107 @@ describe('parser', () => {
             const parser = parse(`
                 sub test(param1 as unknownType)
                 end sub
-            `);
-            expectDiagnostics(parser, [{
-                ...DiagnosticMessages.functionParameterTypeIsInvalid('param1', 'unknownType')
-            }]);
+            `, ParseMode.BrighterScript);
+            // type validation happens at scope validation, not at the parser
+            expectZeroDiagnostics(parser);
             expect(
                 isFunctionStatement(parser.ast.statements[0])
             ).to.be.true;
         });
 
+        it('does not scrap the entire function when encountering unknown parameter type in brightscript mode', () => {
+            const parser = parse(`
+                sub test(param1 as unknownType)
+                end sub
+            `, ParseMode.BrightScript);
+            // type validation happens at scope validation, not at the parser
+            expectDiagnosticsIncludes(parser, DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types'));
+            expect(
+                isFunctionStatement(parser.ast.statements[0])
+            ).to.be.true;
+        });
+
+        it('adds diagnostics when missing end for statements', () => {
+            let parser = parse(`
+                sub test1(x)
+                    for each item in x
+                        print item
+                 end sub
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(parser, [
+                DiagnosticMessages.expectedEndForOrNextToTerminateForLoop('for each')
+            ]);
+
+            parser = parse(`
+                sub test2()
+                    for i = 0 to 10
+                        print i
+                 end sub
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(parser, [
+                DiagnosticMessages.expectedEndForOrNextToTerminateForLoop('for')
+            ]);
+
+            parser = parse(`
+                sub test3(x )
+                    for each item in x
+                        print item
+                    next
+
+                    for i = 0 to 10
+                        print i
+                    next ' next works the same as "end for"
+                 end sub
+            `, ParseMode.BrightScript);
+            expectZeroDiagnostics(parser);
+        });
+
+        it('does not allow return type as invalid', () => {
+            let parser = parse(`
+                function test(x) as invalid
+                    return invalid
+                 end function
+            `, ParseMode.BrighterScript);
+            expectDiagnosticsIncludes(parser, [
+                DiagnosticMessages.expectedIdentifier('as').message
+            ]);
+        });
+
+        it('does not allow param type as invalid', () => {
+            let parser = parse(`
+                function test(x as invalid)
+                    return invalid
+                 end function
+            `, ParseMode.BrighterScript);
+            expectDiagnosticsIncludes(parser, [
+                DiagnosticMessages.expectedIdentifier('as').message
+            ]);
+        });
+
+        it('validates when theres a fraction hex', () => {
+            let parser = parse(`
+                function test()
+                    x = &HFF.01234
+                    return x
+                end function
+            `);
+
+            expectDiagnostics(parser, [
+                DiagnosticMessages.expectedStatement(),
+                DiagnosticMessages.expectedNewlineOrColon()
+            ]);
+        });
+
+        it('allows print statement with hex followed by dot <number>', () => {
+            let parser = parse(`
+                function test()
+                    print  &HFF.01234
+                end function
+            `);
+
+            expectZeroDiagnostics(parser);
+        });
+
         describe('namespace', () => {
             it('allows namespaces declared inside other namespaces', () => {
                 const parser = parse(`
@@ -391,22 +350,23 @@ describe('parser', () => {
                 `, ParseMode.BrighterScript);
                 expectZeroDiagnostics(parser);
                 // We expect these names to be "as given" in this context, because we aren't evaluating a full program.
-                expect(parser.references.namespaceStatements.map(statement => statement.getName(ParseMode.BrighterScript))).to.deep.equal([
+                const namespaceStatements = parser.ast.findChildren<NamespaceStatement>(isNamespaceStatement);
+                expect(namespaceStatements.map(statement => statement.getName(ParseMode.BrighterScript))).to.have.deep.members([
                     'Level1.Level2.Level3',
                     'Level1'
                 ]);
             });
             it('parses empty namespace', () => {
-                let { statements, diagnostics } =
+                let { ast, diagnostics } =
                     parse(`
                         namespace Name.Space
                         end namespace
                     `, ParseMode.BrighterScript);
                 expect(diagnostics[0]?.message).not.to.exist;
-                expect(statements[0]).to.be.instanceof(NamespaceStatement);
+                expect(ast.statements[0]).to.be.instanceof(NamespaceStatement);
             });
             it('includes body', () => {
-                let { statements, diagnostics } =
+                let { ast, diagnostics } =
                     parse(`
                         namespace Name.Space
                             sub main()
@@ -414,8 +374,8 @@ describe('parser', () => {
                         end namespace
                     `, ParseMode.BrighterScript);
                 expect(diagnostics[0]?.message).not.to.exist;
-                expect(statements[0]).to.be.instanceof(NamespaceStatement);
-                expect((statements[0] as NamespaceStatement).body.statements[0]).to.be.instanceof(FunctionStatement);
+                expect(ast.statements[0]).to.be.instanceof(NamespaceStatement);
+                expect((ast.statements[0] as NamespaceStatement).body.statements[0]).to.be.instanceof(FunctionStatement);
             });
             it('supports comments and newlines', () => {
                 let { diagnostics } =
@@ -441,7 +401,7 @@ describe('parser', () => {
                         end namespace
                     `, ParseMode.BrighterScript);
                 expect(diagnostics[0]?.message).to.equal(
-                    DiagnosticMessages.expectedIdentifierAfterKeyword('namespace').message
+                    DiagnosticMessages.expectedIdentifier('namespace').message
                 );
             });
 
@@ -504,18 +464,18 @@ describe('parser', () => {
             `);
             expect(parser.diagnostics[0]?.message).to.not.exist;
 
-            let statements = (parser.statements[0] as FunctionStatement).func.body.statements as AssignmentStatement[];
-            let first = statements[0].value as XmlAttributeGetExpression;
+            let assignments = (parser.ast.statements[0] as FunctionStatement).func.body.statements as AssignmentStatement[];
+            let first = assignments[0].value as XmlAttributeGetExpression;
             expect(first).to.be.instanceof(XmlAttributeGetExpression);
-            expect(first.name.text).to.equal('firstName');
-            expect(first.at.text).to.equal('@');
-            expect((first.obj as any).name.text).to.equal('personXml');
+            expect(first.tokens.name.text).to.equal('firstName');
+            expect(first.tokens.at.text).to.equal('@');
+            expect((first.obj as any).tokens.name.text).to.equal('personXml');
 
-            let second = statements[1].value as XmlAttributeGetExpression;
+            let second = assignments[1].value as XmlAttributeGetExpression;
             expect(second).to.be.instanceof(XmlAttributeGetExpression);
-            expect(second.name.text).to.equal('age');
-            expect(second.at.text).to.equal('@');
-            expect((second.obj as any).name.text).to.equal('firstChild');
+            expect(second.tokens.name.text).to.equal('age');
+            expect(second.tokens.at.text).to.equal('@');
+            expect((second.obj as any).tokens.name.text).to.equal('firstChild');
         });
 
         it('does not allow chaining of @ symbols', () => {
@@ -528,51 +488,51 @@ describe('parser', () => {
             expect(parser.diagnostics).not.to.be.empty;
         });
         it('unknown function type does not invalidate rest of function', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 function log() as UNKNOWN_TYPE
                 end function
             `, ParseMode.BrightScript);
-            expect(diagnostics.length).to.be.greaterThan(0);
-            expect(statements[0]).to.exist;
+            expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types').message); // type validation happens at scope validation step
+            expect(ast.statements[0]).to.exist;
         });
         it('unknown function type is not a problem in Brighterscript mode', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 function log() as UNKNOWN_TYPE
                 end function
             `, ParseMode.BrighterScript);
-            expect(diagnostics.length).to.equal(0);
-            expect(statements[0]).to.exist;
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements[0]).to.exist;
         });
         it('allows namespaced function type in Brighterscript mode', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 function log() as SOME_NAMESPACE.UNKNOWN_TYPE
                 end function
             `, ParseMode.BrighterScript);
             expect(diagnostics.length).to.equal(0);
-            expect(statements[0]).to.exist;
+            expect(ast.statements[0]).to.exist;
         });
         it('allows custom parameter types in BrighterscriptMode', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 sub foo(value as UNKNOWN_TYPE)
                 end sub
             `, ParseMode.BrighterScript);
             expect(diagnostics.length).to.equal(0);
-            expect(statements[0]).to.exist;
+            expect(ast.statements[0]).to.exist;
         });
-        it('does not allow custom parameter types in Brightscript Mode', () => {
+        it('does cause diagnostics when custom parameter types are used in Brightscript Mode', () => {
             let { diagnostics } = parse(`
                 sub foo(value as UNKNOWN_TYPE)
                 end sub
             `, ParseMode.BrightScript);
-            expect(diagnostics.length).not.to.equal(0);
+            expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types').message);
         });
         it('allows custom namespaced parameter types in BrighterscriptMode', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 sub foo(value as SOME_NAMESPACE.UNKNOWN_TYPE)
                 end sub
             `, ParseMode.BrighterScript);
             expect(diagnostics.length).to.equal(0);
-            expect(statements[0]).to.exist;
+            expect(ast.statements[0]).to.exist;
         });
 
         it('works with conditionals', () => {
@@ -616,29 +576,167 @@ describe('parser', () => {
             expect(diagnostics).to.be.lengthOf(1, 'Error count should be 0');
         });
 
-        it.skip('allows printing object with trailing period', () => {
+        it('allows printing object with trailing period', () => {
             let { tokens } = Lexer.scan(`print a.`);
-            let { statements, diagnostics } = Parser.parse(tokens);
-            let printStatement = statements[0] as PrintStatement;
-            expect(diagnostics).to.be.empty;
+            let { ast, diagnostics } = Parser.parse(tokens);
+            let printStatement = ast.statements[0] as PrintStatement;
+            expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.expectedIdentifier());
+            expect(printStatement).to.be.instanceof(PrintStatement);
+            expect(printStatement.expressions[0]).to.be.instanceof(VariableExpression);
+        });
+
+        it('allows printing object with trailing period with multiple dotted gets', () => {
+            let { tokens } = Lexer.scan(`print a.b.`);
+            let { ast, diagnostics } = Parser.parse(tokens);
+            let printStatement = ast.statements[0] as PrintStatement;
+            expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.expectedIdentifier());
             expect(printStatement).to.be.instanceof(PrintStatement);
             expect(printStatement.expressions[0]).to.be.instanceof(DottedGetExpression);
         });
 
+        describe('incomplete statements in the ast', () => {
+            it('adds variable expressions to the ast', () => {
+                let { tokens } = Lexer.scan(`
+                    function a()
+                        NameA.
+                    end function
+
+                    namespace NameA
+                        sub noop()
+                        end sub
+                    end namespace
+                `);
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
+                expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.expectedStatement());
+                let stmt = ast.statements[0].func.body.statements[0];
+
+                expect(isExpressionStatement(stmt)).to.be.true;
+                expect(isVariableExpression((stmt).expression)).to.be.true;
+                expect(stmt.expression.tokens.name.text).to.equal('NameA');
+            });
+
+            it('adds unended call statements', () => {
+                let { tokens } = Lexer.scan(`
+                    function a()
+                        lcase(
+                    end function
+                `);
+                let { ast } = Parser.parse(tokens) as any;
+                let stmt = ast.statements[0].func.body.statements[0];
+
+                expect(isExpressionStatement(stmt)).to.be.true;
+                expect(isCallExpression((stmt).expression)).to.be.true;
+                expect(stmt.expression.callee.tokens.name.text).to.equal('lcase');
+            });
+
+            it('adds unended indexed get statements', () => {
+                let { tokens } = Lexer.scan(`
+                    function a()
+                        nums[
+                    end function
+
+                    const nums = [1, 2, 3]
+                `);
+                let { ast } = Parser.parse(tokens) as any;
+                let stmt = ast.statements[0].func.body.statements[0];
+
+                expect(isExpressionStatement(stmt)).to.be.true;
+                expect(isIndexedGetExpression((stmt).expression)).to.be.true;
+                expect(stmt.expression.obj.tokens.name.text).to.equal('nums');
+            });
+
+            it('adds dotted gets', () => {
+                let { tokens } = Lexer.scan(`
+                    function foo(a as KlassA)
+                        a.b.
+                    end function
+
+                    class KlassA
+                        b as KlassB
+                    end class
+
+                    class KlassB
+                        sub noop()
+                        end sub
+                    end class
+                `);
+                let { ast } = Parser.parse(tokens) as any;
+                let stmt = ast.statements[0].func.body.statements[0];
+
+                expect(isExpressionStatement(stmt)).to.be.true;
+                expect(isDottedGetExpression((stmt).expression)).to.be.true;
+                expect(stmt.expression.obj.tokens.name.text).to.equal('a');
+                expect(stmt.expression.tokens.name.text).to.equal('b');
+            });
+
+            it('adds function statement with missing type after as', () => {
+                let parser = parse(`
+                    sub foo(thing as  )
+                        print thing
+                    end sub
+                `, ParseMode.BrighterScript);
+                expect(parser.diagnostics[0]?.message).to.exist;
+                expect(parser.ast.statements[0]).to.be.instanceof(FunctionStatement);
+            });
+
+            it('adds binary expressions to the ast', () => {
+                let { tokens } = Lexer.scan(`
+                    function a(x, y)
+                        1 or 2
+                        x * y
+                        x + y
+                        x - y
+                    end function
+                `);
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
+                expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.expectedStatement());
+                for (const stmt of ast.statements[0].func.body.statements) {
+                    expect(isExpressionStatement(stmt)).to.be.true;
+                    expect(isBinaryExpression((stmt).expression)).to.be.true;
+                }
+            });
+
+            it('adds callfunc expressions', () => {
+                let parser = parse(`
+                    sub foo(thing)
+                        thing@.
+                    end sub
+                `, ParseMode.BrighterScript);
+                expect(parser.diagnostics[0]?.message).to.exist;
+                let body = (parser.ast.statements[0] as FunctionStatement).func.body;
+
+                let callFunc = body.findChild<CallExpression>(isCallfuncExpression);
+                expect(callFunc).to.exist;
+            });
+
+            it('adds if statements', () => {
+                let parser = parse(`
+                    sub foo(thing)
+                        if thing.
+                    end sub
+                `, ParseMode.BrighterScript);
+                expect(parser.diagnostics[0]?.message).to.exist;
+                let body = (parser.ast.statements[0] as FunctionStatement).func.body;
+
+                let ifStmt = body.findChild<IfStatement>(isIfStatement);
+                expect(ifStmt).to.exist;
+            });
+        });
+
         describe('comments', () => {
-            it('combines multi-line comments', () => {
+            it('does not include comments', () => {
                 let { tokens } = Lexer.scan(`
                     'line 1
                     'line 2
                     'line 3
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens) as any;
-                expect(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
+                expectZeroDiagnostics(diagnostics);
 
-                expect(statements[0].text).to.equal(`'line 1\n'line 2\n'line 3`);
+                expect(ast.statements.length).to.equal(0);
             });
 
-            it('does not combile comments separated by newlines', () => {
+            it('does matter if comments separated by newlines', () => {
                 let { tokens } = Lexer.scan(`
                     'line 1
 
@@ -646,14 +744,9 @@ describe('parser', () => {
 
                     'line 3
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens) as any;
-                expect(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
-
-                expect(statements).to.be.lengthOf(3);
-
-                expect(statements[0].text).to.equal(`'line 1`);
-                expect(statements[1].text).to.equal(`'line 2`);
-                expect(statements[2].text).to.equal(`'line 3`);
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
+                expectZeroDiagnostics(diagnostics);
+                expect(ast.statements).to.be.lengthOf(0);
             });
 
             it('works after print statement', () => {
@@ -662,23 +755,22 @@ describe('parser', () => {
                         print "hi" 'comment 1
                     end sub
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens);
-                expect(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
+                let { ast, diagnostics } = Parser.parse(tokens);
+                expectZeroDiagnostics(diagnostics);
 
-                expect((statements as any)[0].func.body.statements[1].text).to.equal(`'comment 1`);
+                expect((ast.statements[0] as FunctionStatement).func.body.statements.length).to.equal(1);
             });
 
-            it('declaration-level', () => {
+            it('declaration-level should be set as leading trivia', () => {
                 let { tokens } = Lexer.scan(`
                     'comment 1
                     function a()
                     end function
                     'comment 2
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens);
+                let { ast, diagnostics } = Parser.parse(tokens);
                 expect(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
-                expect((statements as any)[0].text).to.equal(`'comment 1`);
-                expect((statements as any)[2].text).to.equal(`'comment 2`);
+                expect(ast.statements[0].leadingTrivia[2].text).to.equal(`'comment 1`);
             });
 
             it('works in aa literal as its own statement', () => {
@@ -699,10 +791,9 @@ describe('parser', () => {
                         DoSomething(name) 'comment 1
                     end sub
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens) as any;
+                let { diagnostics } = Parser.parse(tokens) as any;
                 expect(diagnostics).to.be.lengthOf(0, 'Should have zero diagnostics');
 
-                expect(statements[0].func.body.statements[2].text).to.equal(`'comment 1`);
             });
 
             it('function', () => {
@@ -713,13 +804,10 @@ describe('parser', () => {
                         'comment 3
                     end function 'comment 4
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens) as any;
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
                 expect(diagnostics).to.be.lengthOf(0, 'Should have zero diagnostics');
 
-                expect(statements[0].func.body.statements[0].text).to.equal(`'comment 1`);
-                expect(statements[0].func.body.statements[1].text).to.equal(`'comment 2`);
-                expect(statements[0].func.body.statements[3].text).to.equal(`'comment 3`);
-                expect(statements[1].text).to.equal(`'comment 4`);
+                expect(ast.statements[0].func.body.statements[0].leadingTrivia.filter(x => x.kind === TokenKind.Comment).map(x => x.text)).members([`'comment 1`, `'comment 2`]);
             });
 
             it('if statement`', () => {
@@ -740,27 +828,21 @@ describe('parser', () => {
                         end if 'comment 10
                     end function
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens);
+                let { ast, diagnostics } = Parser.parse(tokens);
                 expect(diagnostics).to.be.lengthOf(0, 'Should have zero diagnostics');
-                let fnSmt = statements[0];
+                let fnSmt = ast.statements[0];
                 if (isFunctionStatement(fnSmt)) {
                     let ifStmt = fnSmt.func.body.statements[0];
                     if (isIfStatement(ifStmt)) {
-                        expectCommentWithText(ifStmt.thenBranch.statements[0], `'comment 1`);
-                        expectCommentWithText(ifStmt.thenBranch.statements[1], `'comment 2`);
-                        expectCommentWithText(ifStmt.thenBranch.statements[3], `'comment 3`);
+                        expectCommentWithText(ifStmt.thenBranch.statements[0], `'comment 1\n'comment 2`);
 
                         let elseIfBranch = ifStmt.elseBranch!;
                         if (isIfStatement(elseIfBranch)) {
-                            expectCommentWithText(elseIfBranch.thenBranch.statements[0], `'comment 4`);
-                            expectCommentWithText(elseIfBranch.thenBranch.statements[1], `'comment 5`);
-                            expectCommentWithText(elseIfBranch.thenBranch.statements[3], `'comment 6`);
+                            expectCommentWithText(elseIfBranch.thenBranch.statements[0], `'comment 4\n'comment 5`);
 
                             let elseBranch = elseIfBranch.elseBranch!;
                             if (isBlock(elseBranch)) {
-                                expectCommentWithText(elseBranch.statements[0], `'comment 7`);
-                                expectCommentWithText(elseBranch.statements[1], `'comment 8`);
-                                expectCommentWithText(elseBranch.statements[3], `'comment 9`);
+                                expectCommentWithText(elseBranch.statements[0], `'comment 7\n'comment 8`);
                             } else {
                                 failStatementType(elseBranch, 'Block');
                             }
@@ -768,7 +850,6 @@ describe('parser', () => {
                         } else {
                             failStatementType(elseIfBranch, 'If');
                         }
-                        expectCommentWithText(fnSmt.func.body.statements[1], `'comment 10`);
                     } else {
                         failStatementType(ifStmt, 'If');
                     }
@@ -787,15 +868,11 @@ describe('parser', () => {
                         end while 'comment 4
                     end function
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens) as any;
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
                 expect(diagnostics).to.be.lengthOf(0, 'Error count should be zero');
-                let stmt = statements[0].func.body.statements[0];
+                let stmt = ast.statements[0].func.body.statements[0];
 
-                expect(stmt.body.statements[0].text).to.equal(`'comment 1`);
-                expect(stmt.body.statements[1].text).to.equal(`'comment 2`);
-                expect(stmt.body.statements[3].text).to.equal(`'comment 3`);
-
-                expect(statements[0].func.body.statements[1].text).to.equal(`'comment 4`);
+                expectCommentWithText(stmt.body.statements[0], `'comment 1\n'comment 2`);
             });
 
             it('for', () => {
@@ -808,15 +885,11 @@ describe('parser', () => {
                         end for 'comment 4
                     end function
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens) as any;
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
                 expect(diagnostics).to.be.lengthOf(0, 'Error count should be zero');
-                let stmt = statements[0].func.body.statements[0];
-
-                expect(stmt.body.statements[0].text).to.equal(`'comment 1`);
-                expect(stmt.body.statements[1].text).to.equal(`'comment 2`);
-                expect(stmt.body.statements[3].text).to.equal(`'comment 3`);
+                let stmt = ast.statements[0].func.body.statements[0];
 
-                expect(statements[0].func.body.statements[1].text).to.equal(`'comment 4`);
+                expectCommentWithText(stmt.body.statements[0], `'comment 1\n'comment 2`);
             });
 
             it('for each', () => {
@@ -829,15 +902,11 @@ describe('parser', () => {
                         end for 'comment 4
                     end function
                 `);
-                let { diagnostics, statements } = Parser.parse(tokens) as any;
+                let { ast, diagnostics } = Parser.parse(tokens) as any;
                 expect(diagnostics).to.be.lengthOf(0, 'Error count should be zero');
-                let stmt = statements[0].func.body.statements[0];
+                let stmt = ast.statements[0].func.body.statements[0];
 
-                expect(stmt.body.statements[0].text).to.equal(`'comment 1`);
-                expect(stmt.body.statements[1].text).to.equal(`'comment 2`);
-                expect(stmt.body.statements[3].text).to.equal(`'comment 3`);
-
-                expect(statements[0].func.body.statements[1].text).to.equal(`'comment 4`);
+                expectCommentWithText(stmt.body.statements[0], `'comment 1\n'comment 2`);
             });
 
         });
@@ -899,7 +968,7 @@ describe('parser', () => {
                 });
 
                 expect(
-                    elements.map(x => x.keyToken.kind)
+                    elements.map(x => x.tokens.key.kind)
                 ).to.eql(
                     [TokenKind.Identifier, TokenKind.Identifier]
                 );
@@ -933,31 +1002,31 @@ describe('parser', () => {
     describe('import keyword', () => {
 
         it('parses without errors', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 import "somePath"
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            expect(statements[0]).to.be.instanceof(ImportStatement);
+            expect(ast.statements[0]).to.be.instanceof(ImportStatement);
         });
 
         it('catches import statements used in brightscript files', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 import "somePath"
             `, ParseMode.BrightScript);
             expect(diagnostics[0]?.message).to.eql(
                 DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('import statements').message
             );
-            expect(statements[0]).to.be.instanceof(ImportStatement);
+            expect(ast.statements[0]).to.be.instanceof(ImportStatement);
         });
 
         it('catchs missing file path', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 import
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).to.equal(
                 DiagnosticMessages.expectedStringLiteralAfterKeyword('import').message
             );
-            expect(statements[0]).to.be.instanceof(ImportStatement);
+            expect(ast.statements[0]).to.be.instanceof(ImportStatement);
         });
     });
 
@@ -1010,7 +1079,7 @@ describe('parser', () => {
         });
 
         it('attaches an annotation to next statement', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta1
                 function main()
                 end function
@@ -1019,29 +1088,29 @@ describe('parser', () => {
                 end sub
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            expect(statements[0]).to.be.instanceof(FunctionStatement);
-            let fn = statements[0] as FunctionStatement;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
             expect(fn.annotations).to.exist;
             expect(fn.annotations![0]).to.be.instanceof(AnnotationExpression);
-            expect(fn.annotations![0].nameToken.text).to.equal('meta1');
+            expect(fn.annotations![0].tokens.name.text).to.equal('meta1');
             expect(fn.annotations![0].name).to.equal('meta1');
 
-            expect(statements[1]).to.be.instanceof(FunctionStatement);
-            fn = statements[1] as FunctionStatement;
+            expect(ast.statements[1]).to.be.instanceof(FunctionStatement);
+            fn = ast.statements[1] as FunctionStatement;
             expect(fn.annotations).to.exist;
             expect(fn.annotations![0]).to.be.instanceof(AnnotationExpression);
-            expect(fn.annotations![0].nameToken.text).to.equal('meta2');
+            expect(fn.annotations![0].tokens.name.text).to.equal('meta2');
         });
 
         it('attaches annotations inside a function body', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 function main()
                     @meta1
                     print "hello"
                 end function
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let fn = statements[0] as FunctionStatement;
+            let fn = ast.statements[0] as FunctionStatement;
             let fnStatements = fn.func.body.statements;
             let stat = fnStatements[0];
             expect(stat).to.exist;
@@ -1050,15 +1119,15 @@ describe('parser', () => {
         });
 
         it('attaches multiple annotations to next statement', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta1
                 @meta2 @meta3
                 function main()
                 end function
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            expect(statements[0]).to.be.instanceof(FunctionStatement);
-            let fn = statements[0] as FunctionStatement;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
             expect(fn.annotations).to.exist;
             expect(fn.annotations!.length).to.equal(3);
             expect(fn.annotations![0]).to.be.instanceof(AnnotationExpression);
@@ -1067,21 +1136,21 @@ describe('parser', () => {
         });
 
         it('allows annotations with parameters', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta1("arg", 2, true, { prop: "value" })
                 function main()
                 end function
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let fn = statements[0] as FunctionStatement;
+            let fn = ast.statements[0] as FunctionStatement;
             expect(fn.annotations).to.exist;
             expect(fn.annotations![0]).to.be.instanceof(AnnotationExpression);
-            expect(fn.annotations![0].nameToken.text).to.equal('meta1');
+            expect(fn.annotations![0].tokens.name.text).to.equal('meta1');
             expect(fn.annotations![0].call).to.be.instanceof(CallExpression);
         });
 
         it('attaches annotations to a class', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta1
                 class MyClass
                     function main()
@@ -1090,13 +1159,13 @@ describe('parser', () => {
                 end class
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let cs = statements[0] as ClassStatement;
+            let cs = ast.statements[0] as ClassStatement;
             expect(cs.annotations?.length).to.equal(1);
             expect(cs.annotations![0]).to.be.instanceof(AnnotationExpression);
         });
 
         it('attaches annotations to multiple clases', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta1
                 class MyClass
                     function main()
@@ -1111,18 +1180,18 @@ describe('parser', () => {
                 end class
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let cs = statements[0] as ClassStatement;
+            let cs = ast.statements[0] as ClassStatement;
             expect(cs.annotations?.length).to.equal(1);
             expect(cs.annotations![0]).to.be.instanceof(AnnotationExpression);
             expect(cs.annotations![0].name).to.equal('meta1');
-            let cs2 = statements[1] as ClassStatement;
+            let cs2 = ast.statements[1] as ClassStatement;
             expect(cs2.annotations?.length).to.equal(1);
             expect(cs2.annotations![0]).to.be.instanceof(AnnotationExpression);
             expect(cs2.annotations![0].name).to.equal('meta2');
         });
 
         it('attaches annotations to a namespaced class', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 namespace ns
                     @meta1
                     class MyClass
@@ -1133,14 +1202,14 @@ describe('parser', () => {
                 end namespace
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let ns = statements[0] as NamespaceStatement;
+            let ns = ast.statements[0] as NamespaceStatement;
             let cs = ns.body.statements[0] as ClassStatement;
             expect(cs.annotations?.length).to.equal(1);
             expect(cs.annotations![0]).to.be.instanceof(AnnotationExpression);
         });
 
         it('attaches annotations to a namespaced class - multiple', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 namespace ns
                     @meta1
                     class MyClass
@@ -1157,7 +1226,7 @@ describe('parser', () => {
                 end namespace
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let ns = statements[0] as NamespaceStatement;
+            let ns = ast.statements[0] as NamespaceStatement;
             let cs = ns.body.statements[0] as ClassStatement;
             expect(cs.annotations?.length).to.equal(1);
             expect(cs.annotations![0]).to.be.instanceof(AnnotationExpression);
@@ -1170,7 +1239,7 @@ describe('parser', () => {
         });
 
         it('attaches annotations to a class constructor', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 class MyClass
                     @meta1
                     function new()
@@ -1182,14 +1251,14 @@ describe('parser', () => {
                 end class
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let cs = statements[0] as ClassStatement;
+            let cs = ast.statements[0] as ClassStatement;
             let stat = cs.body[0];
             expect(stat.annotations?.length).to.equal(1);
             expect(stat.annotations![0]).to.be.instanceof(AnnotationExpression);
         });
 
         it('attaches annotations to a class methods', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 class MyClass
                     function new()
                         print "hello"
@@ -1201,13 +1270,13 @@ describe('parser', () => {
                 end class
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let cs = statements[0] as ClassStatement;
+            let cs = ast.statements[0] as ClassStatement;
             let stat = cs.body[1];
             expect(stat.annotations?.length).to.equal(1);
             expect(stat.annotations![0]).to.be.instanceof(AnnotationExpression);
         });
         it('attaches annotations to a class methods, fields and constructor', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta2
                 @meta1
                 class MyClass
@@ -1228,7 +1297,7 @@ describe('parser', () => {
                 end class
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let cs = statements[0] as ClassStatement;
+            let cs = ast.statements[0] as ClassStatement;
             expect(cs.annotations?.length).to.equal(2);
             expect(cs.annotations![0]).to.be.instanceof(AnnotationExpression);
             let stat1 = cs.body[0];
@@ -1243,7 +1312,7 @@ describe('parser', () => {
         });
 
         it('ignores annotations on commented out lines', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 '@meta1
                 '   @meta1
                 function new()
@@ -1251,12 +1320,12 @@ describe('parser', () => {
                 end function
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            let cs = statements[0] as ClassStatement;
+            let cs = ast.statements[0] as ClassStatement;
             expect(cs.annotations).to.be.undefined;
         });
 
         it('can convert argument of an annotation to JS types', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta1
                 function main()
                 end function
@@ -1271,13 +1340,13 @@ describe('parser', () => {
                 end sub
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            expect(statements[0]).to.be.instanceof(FunctionStatement);
-            let fn = statements[0] as FunctionStatement;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
             expect(fn.annotations).to.exist;
             expect(fn.annotations![0].getArguments()).to.deep.equal([]);
 
-            expect(statements[1]).to.be.instanceof(FunctionStatement);
-            fn = statements[1] as FunctionStatement;
+            expect(ast.statements[1]).to.be.instanceof(FunctionStatement);
+            fn = ast.statements[1] as FunctionStatement;
             expect(fn.annotations).to.exist;
             expect(fn.annotations![0]).to.be.instanceof(AnnotationExpression);
             expect(fn.annotations![0].getArguments()).to.deep.equal([
@@ -1290,7 +1359,7 @@ describe('parser', () => {
         });
 
         it('can handle negative numbers', () => {
-            let { statements, diagnostics } = parse(`
+            let { ast, diagnostics } = parse(`
                 @meta(-100)
                 function main()
                 end function
@@ -1299,74 +1368,213 @@ describe('parser', () => {
                 end sub
             `, ParseMode.BrighterScript);
             expect(diagnostics[0]?.message).not.to.exist;
-            expect(statements[0]).to.be.instanceof(FunctionStatement);
-            let fn = statements[0] as FunctionStatement;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
             expect(fn.annotations).to.exist;
             expect(fn.annotations![0].getArguments()).to.deep.equal([-100]);
         });
     });
 
-    describe('grouped type expressions', () => {
+    describe('type casts', () => {
+
         it('is not allowed in brightscript mode', () => {
             let parser = parse(`
-                sub main(param as (string or integer))
-                    print param
+                sub main(node as dynamic)
+                    print lcase((node as string))
                 end sub
             `, ParseMode.BrightScript);
-            expectDiagnosticsIncludes(parser.diagnostics, [DiagnosticMessages.functionParameterTypeIsInvalid('param', '(')]);
+            expect(
+                parser.diagnostics[0]?.message
+            ).to.equal(
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('type cast').message
+            );
         });
 
-        it('allows group type expressions in parameters', () => {
-            let { diagnostics } = parse(`
-                sub main(param as (string or integer))
-                    print param
+        it('allows type casts after function calls', () => {
+            let { ast, diagnostics } = parse(`
+                sub main()
+                    value = getValue() as integer
                 end sub
+
+                function getValue()
+                    return 123
+                end function
             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
+            expect(diagnostics[0]?.message).not.to.exist;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
+            expect(fn.func.body.statements).to.exist;
+            let assignment = fn.func.body.statements[0] as AssignmentStatement;
+            expect(isAssignmentStatement(assignment)).to.be.true;
+            expect(isTypecastExpression(assignment.value)).to.be.true;
+            expect(isCallExpression((assignment.value as TypecastExpression).obj)).to.be.true;
+            expectTypeToBe(assignment.getType({ flags: SymbolTypeFlag.typetime }), IntegerType);
         });
 
-        it('allows group type expressions in type casts', () => {
-            let { diagnostics } = parse(`
-                sub main(val)
-                    printThing(val as (string or integer))
+        it('allows type casts in the middle of expressions', () => {
+            let { ast, diagnostics } = parse(`
+                sub main()
+                    value = (getValue() as integer).toStr()
                 end sub
-                sub printThing(thing as (string or integer))
-                    print thing
+
+                function getValue()
+                    return 123
+                end function
+            `, ParseMode.BrighterScript);
+            expect(diagnostics[0]?.message).not.to.exist;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
+            expect(fn.func.body.statements).to.exist;
+            let assignment = fn.func.body.statements[0] as any;
+            expect(isAssignmentStatement(assignment)).to.be.true;
+            expect(isCallExpression(assignment.value)).to.be.true;
+            expect(isDottedGetExpression(assignment.value.callee)).to.be.true;
+            expect(isGroupingExpression(assignment.value.callee.obj)).to.be.true;
+            expect(isTypecastExpression(assignment.value.callee.obj.expression)).to.be.true;
+            //grouping expression is an integer
+            expectTypeToBe(assignment.value.callee.obj.getType({ flags: SymbolTypeFlag.typetime }), IntegerType);
+        });
+
+        it('allows type casts in a function call', () => {
+            let { ast, diagnostics } = parse(`
+                sub main()
+                    print cos(getAngle() as float)
                 end sub
+
+                function getAngle()
+                    return 123
+                end function
             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
+            expect(diagnostics[0]?.message).not.to.exist;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
+            expect(fn.func.body.statements).to.exist;
+            let print = fn.func.body.statements[0] as any;
+            expect(isPrintStatement(print)).to.be.true;
+            expect(isCallExpression(print.expressions[0])).to.be.true;
+            let fnCall = print.expressions[0] as CallExpression;
+            expect(isTypecastExpression(fnCall.args[0])).to.be.true;
+            let arg = fnCall.args[0] as TypecastExpression;
+            //argument type is float
+            expectTypeToBe(arg.getType({ flags: SymbolTypeFlag.typetime }), FloatType);
+        });
+
+        it('allows multiple type casts', () => {
+            let { ast, diagnostics } = parse(`
+                sub main()
+                    print getData() as dynamic as float as string
+                end sub
+            `, ParseMode.BrighterScript);
+            expect(diagnostics[0]?.message).not.to.exist;
+            expect(ast.statements[0]).to.be.instanceof(FunctionStatement);
+            let fn = ast.statements[0] as FunctionStatement;
+            expect(fn.func.body.statements).to.exist;
+            let print = fn.func.body.statements[0] as any;
+            expect(isPrintStatement(print)).to.be.true;
+            expect(isTypecastExpression(print.expressions[0])).to.be.true;
+            //argument type is float
+            expectTypeToBe(print.expressions[0].getType({ flags: SymbolTypeFlag.typetime }), StringType);
         });
 
-        it('allows union of grouped type expressions', () => {
+        it('flags invalid type cast syntax - multiple as', () => {
             let { diagnostics } = parse(`
-                sub main(param as (string or integer) or (float or dynamic))
-                    print param
+                sub foo(key)
+                    getData(key as as string)
                 end sub
             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
+            expect(diagnostics[0]?.message).to.exist;
         });
 
-        it('allows nested grouped type expressions', () => {
+        it('flags invalid type cast syntax - no type after as', () => {
             let { diagnostics } = parse(`
-                sub main(param as ((string or integer) or (float or dynamic)))
-                    print param
+                sub foo(key)
+                    getData(key as)
                 end sub
             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
+            expect(diagnostics[0]?.message).to.exist;
         });
 
-
-        it('allows complicated grouped type expression', () => {
+        it('allows declaring types on assignment in Brighterscript mode', () => {
             let { diagnostics } = parse(`
-                sub main(param as (({name as string} and {age as integer}) or (string and SomeInterface) or Klass and roAssociativeArray) )
-                    print param
+                sub foo()
+                    x as string = formatJson("some string")
                 end sub
             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
         });
+
+        it('does not allow declaring types on assignment in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                sub foo()
+                    x as string = formatJson("some string")
+                end sub
+            `, ParseMode.BrightScript);
+            expect(diagnostics[0]?.message).to.exist;
+            expect(diagnostics[0]?.message).to.include('typed assignment');
+        });
     });
 
-    describe('union types', () => {
+    describe('grouped type expressions', () => {
+        it('is not allowed in brightscript mode', () => {
+            let parser = parse(`
+                sub main(param as (string or integer))
+                    print param
+                end sub
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(parser.diagnostics, [DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')]);
+        });
+
+        it('allows group type expressions in parameters', () => {
+            let { diagnostics } = parse(`
+                sub main(param as (string or integer))
+                    print param
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('allows group type expressions in type casts', () => {
+            let { diagnostics } = parse(`
+                sub main(val)
+                    printThing(val as (string or integer))
+                end sub
+                sub printThing(thing as (string or integer))
+                    print thing
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('allows union of grouped type expressions', () => {
+            let { diagnostics } = parse(`
+                sub main(param as (string or integer) or (float or dynamic))
+                    print param
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('allows nested grouped type expressions', () => {
+            let { diagnostics } = parse(`
+                sub main(param as ((string or integer) or (float or dynamic)))
+                    print param
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+
+        it('allows complicated grouped type expression', () => {
+            let { diagnostics } = parse(`
+                sub main(param as (({name as string} and {age as integer}) or (string and SomeInterface) or Klass and roAssociativeArray) )
+                    print param
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+    });
+
+    describe('union types', () => {
 
         it('is not allowed in brightscript mode', () => {
             let parser = parse(`
@@ -1374,7 +1582,7 @@ describe('parser', () => {
                     print param
                 end sub
             `, ParseMode.BrightScript);
-            expectDiagnosticsIncludes(parser.diagnostics, [DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()]);
+            expectDiagnosticsIncludes(parser.diagnostics, [DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')]);
         });
 
         it('allows union types in parameters', () => {
@@ -1408,7 +1616,7 @@ describe('parser', () => {
                     print param
                 end sub
             `, ParseMode.BrightScript);
-            expectDiagnosticsIncludes(parser.diagnostics, [DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()]);
+            expectDiagnosticsIncludes(parser.diagnostics, [DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')]);
         });
 
         it('allows intersection types in parameters', () => {
@@ -1432,6 +1640,64 @@ describe('parser', () => {
             expectZeroDiagnostics(diagnostics);
         });
 
+        it('follows order of operations with "or" first lexically', () => {
+            let { ast, diagnostics } = parse(`
+                sub main(param as string or integer and float)
+                    print param
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const paramExpr = func.parameters[0];
+            let binExpr = paramExpr.typeExpression.expression as BinaryExpression;
+            //first level should be 'or'
+            expect(binExpr.tokens.operator.kind).to.equal(TokenKind.Or);
+            //right side should be 'and'
+            expect(isBinaryExpression(binExpr.right)).to.be.true;
+            const rightAndExpr = binExpr.right as BinaryExpression;
+            expect(rightAndExpr.tokens.operator.kind).to.equal(TokenKind.And);
+        });
+
+
+        it('follows order of operations with "and" first lexically', () => {
+            let { ast, diagnostics } = parse(`
+                sub main(param as string and integer or float)
+                    print param
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const paramExpr = func.parameters[0];
+            let binExpr = paramExpr.typeExpression.expression as BinaryExpression;
+            //first level should be 'or'
+            expect(binExpr.tokens.operator.kind).to.equal(TokenKind.Or);
+            //left side should be 'and'
+            expect(isBinaryExpression(binExpr.left)).to.be.true;
+            const leftAndExpr = binExpr.left as BinaryExpression;
+            expect(leftAndExpr.tokens.operator.kind).to.equal(TokenKind.And);
+        });
+
+        it('allows grouped expression to override order of operations', () => {
+            let { ast, diagnostics } = parse(`
+                sub main(param as string and (integer or float))
+                    print param
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const paramExpr = func.parameters[0];
+            let binExpr = paramExpr.typeExpression.expression as BinaryExpression;
+            //first level should be 'and'
+            expect(binExpr.tokens.operator.kind).to.equal(TokenKind.And);
+            //right side should be 'or'
+            expect(isGroupingExpression(binExpr.right)).to.be.true;
+            const groupedExpr = binExpr.right as GroupingExpression;
+            expect(isGroupingExpression(groupedExpr)).to.be.true;
+            expect(isTypeExpression(groupedExpr.expression)).to.be.true;
+            const rightOrExpr = (groupedExpr.expression as TypeExpression).expression as BinaryExpression;
+            expect(rightOrExpr.tokens.operator.kind).to.equal(TokenKind.Or);
+        });
+
         describe('invalid syntax', () => {
 
             it('flags union type with missing sides', () => {
@@ -1440,7 +1706,7 @@ describe('parser', () => {
                         print param
                     end sub
                 `, ParseMode.BrighterScript);
-                expectDiagnostics(diagnostics, [DiagnosticMessages.expectedIdentifierAfterKeyword('or').message]);
+                expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.expectedIdentifier('or').message);
             });
 
             it('flags missing type inside binary type', () => {
@@ -1451,123 +1717,1425 @@ describe('parser', () => {
                 `, ParseMode.BrighterScript);
                 expect(diagnostics[0]?.message).to.exist;
             });
+
+            it('flags missing group paren', () => {
+                let { diagnostics } = parse(`
+                    sub main(param as (string or float)
+                        print param
+                    end sub
+                `, ParseMode.BrighterScript);
+                expect(diagnostics[0]?.message).to.exist;
+            });
         });
     });
 
-    describe('typecast statement', () => {
-        it('allows typecast statement ', () => {
+
+    describe('typed arrays', () => {
+
+        it('is not allowed in brightscript mode', () => {
+            let parser = parse(`
+                sub main(things as string[])
+                    print things
+                end sub
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(parser.diagnostics,
+                [DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('typed arrays')]
+            );
+        });
+
+
+        it('is allowed in brighterscript mode', () => {
             let { ast, diagnostics } = parse(`
-                typeCAST m AS roAssociativeArray
+                sub main(things as string[])
+                    print things
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const paramType = (ast.statements[0] as FunctionStatement).func.parameters[0].getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(paramType, ArrayType);
+            expectTypeToBe((paramType as ArrayType).defaultType, StringType);
+        });
+
+        it('allows multi dimensional arrays', () => {
+            let { ast, diagnostics } = parse(`
+                sub main(things as string[][])
+                    print things
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const paramType = (ast.statements[0] as FunctionStatement).func.parameters[0].getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(paramType, ArrayType);
+            expectTypeToBe((paramType as ArrayType).defaultType, ArrayType);
+            expectTypeToBe(((paramType as ArrayType).defaultType as ArrayType).defaultType, StringType);
+        });
+
+        it('allows arrays as return types', () => {
+            let { ast, diagnostics } = parse(`
+                function getFourPrimes() as integer[]
+                    return [2, 3, 5, 7]
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const paramType = (ast.statements[0] as FunctionStatement).func.returnTypeExpression.getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(paramType, ArrayType);
+            expectTypeToBe((paramType as ArrayType).defaultType, IntegerType);
+        });
+
+        it('allows arrays in union types', () => {
+            let { ast, diagnostics } = parse(`
+                sub foo(x as integer or integer[] or string or string[])
+                  print x
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const paramType = (ast.statements[0] as FunctionStatement).func.parameters[0].getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(paramType, UnionType);
+            expect(paramType.toString().includes('Array<string>')).to.be.true;
+            expect(paramType.toString().includes('Array<integer>')).to.be.true;
+        });
+
+    });
+
+    describe('interfaces', () => {
+
+        it('allows fields and methods', () => {
+            let { ast, diagnostics } = parse(`
+                interface SomeIFace
+                    name as string
+                    height as integer
+                    function getValue(thing as float) as object
+                    function getMe() as SomeIFace
+                    sub noop()
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+        });
+
+        it('allows untyped fields', () => {
+            let { ast, diagnostics } = parse(`
+                interface HasUntyped
+                    name
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+        });
+
+        it('allows optional fields', () => {
+            let { ast, diagnostics } = parse(`
+                interface HasOptional
+                    optional name as string
+                    optional height
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+            const iface = ast.statements[0] as InterfaceStatement;
+            iface.fields.forEach(f => expect(f.isOptional).to.be.true);
+            const ifaceType = iface.getType({ flags: SymbolTypeFlag.typetime });
+            // eslint-disable-next-line no-bitwise
+            ifaceType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime).forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
+        });
+
+        it('allows fields named optional', () => {
+            let { ast, diagnostics } = parse(`
+                interface IsJustOptional
+                    optional
+                    someThingElse
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+            const iface = ast.statements[0] as InterfaceStatement;
+            iface.fields.forEach(f => expect(f.isOptional).to.be.false);
+            const ifaceType = iface.getType({ flags: SymbolTypeFlag.typetime });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(iFaceMembers.length).to.eq(2);
+            // eslint-disable-next-line no-bitwise
+            iFaceMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(0));
+        });
+
+        it('allows fields named optional that are also optional', () => {
+            let { ast, diagnostics } = parse(`
+                interface IsJustOptional
+                    optional optional
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+            const iface = ast.statements[0] as InterfaceStatement;
+            iface.fields.forEach(f => expect(f.isOptional).to.be.true);
+            const ifaceType = iface.getType({ flags: SymbolTypeFlag.typetime });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(iFaceMembers.length).to.eq(1);
+            // eslint-disable-next-line no-bitwise
+            iFaceMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
+        });
+
+        it('allows optional methods', () => {
+            let { ast, diagnostics } = parse(`
+                interface HasOptional
+                    optional function getValue() as boolean
+                    optional sub noop()
+                    optional function process()
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+            const iface = ast.statements[0] as InterfaceStatement;
+            iface.methods.forEach(m => expect(m.isOptional).to.equal(true));
+            const ifaceType = iface.getType({ flags: SymbolTypeFlag.typetime });
+            // eslint-disable-next-line no-bitwise
+            ifaceType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime).forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
+        });
+
+        it('allows fields named `as` that are also optional', () => {
+            let { ast, diagnostics } = parse(`
+                interface IsJustOptional
+                    optional as
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+            const iface = ast.statements[0] as InterfaceStatement;
+            iface.fields.forEach(f => expect(f.isOptional).to.be.true);
+            const ifaceType = iface.getType({ flags: SymbolTypeFlag.typetime });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(iFaceMembers.length).to.eq(1);
+            // eslint-disable-next-line no-bitwise
+            iFaceMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
+        });
+
+        it('allows fields named `as` that are also typed', () => {
+            let { ast, diagnostics } = parse(`
+                interface IsJustOptional
+                    optional as as string
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+            const iface = ast.statements[0] as InterfaceStatement;
+            iface.fields.forEach(f => expect(f.isOptional).to.be.true);
+            const ifaceType = iface.getType({ flags: SymbolTypeFlag.typetime });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(iFaceMembers.length).to.eq(1);
+            // eslint-disable-next-line no-bitwise
+            iFaceMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(SymbolTypeFlag.optional));
+        });
+
+        it('allows fields named `optional` that are also typed', () => {
+            let { ast, diagnostics } = parse(`
+                interface IsJustOptional
+                    optional as string
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            expect(isInterfaceStatement(ast.statements[0])).to.be.true;
+            const iface = ast.statements[0] as InterfaceStatement;
+            iface.fields.forEach(f => expect(f.isOptional).to.be.false);
+            const ifaceType = iface.getType({ flags: SymbolTypeFlag.typetime });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+            expect(iFaceMembers.length).to.eq(1);
+            // eslint-disable-next-line no-bitwise
+            iFaceMembers.forEach(sym => expect(sym.flags & SymbolTypeFlag.optional).to.eq(0));
+        });
+    });
+
+    describe('leadingTrivia', () => {
+        it('gets leading trivia from functions', () => {
+            let { ast } = parse(`
+                ' Nice function, bro
+                function foo()
+                    return 1
+                end function
+            `);
+            const funcStatements = ast.statements.filter(isFunctionStatement);
+            const fooTrivia = funcStatements[0].leadingTrivia;
+            expect(fooTrivia.length).to.be.greaterThan(0);
+            expect(fooTrivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+        });
+
+        it('gets multiple lines of leading trivia', () => {
+            let { ast, diagnostics } = parse(`
+                ' Say hello to someone
+                '
+                ' @param {string} name the person you want to say hello to.
+                sub sayHello(name = "world" as string)
+                end sub
+            `);
+            expectZeroDiagnostics(diagnostics);
+            const funcStatements = ast.statements.filter(isFunctionStatement);
+            const helloTrivia = funcStatements[0].leadingTrivia;
+            expect(helloTrivia.length).to.be.greaterThan(0);
+            expect(helloTrivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(3);
+        });
+
+        it('gets leading trivia from classes', () => {
+            let { ast } = parse(`
+                ' hello
+                ' classes
+                class Hello
+                end class
+            `, ParseMode.BrighterScript);
+            const classStatements = ast.statements.filter(isClassStatement);
+            const trivia = classStatements[0].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(2);
+        });
+
+        it('gets leading trivia from functions with annotations', () => {
+            let { ast } = parse(`
+                ' hello comment 1
+                ' hello comment 2
+                @annotation
+                ' hello comment 3
+                @otherAnnotation
+                sub sayHello(name  = "world" as string)
+                end sub
+            `, ParseMode.BrighterScript);
+            const funcStatements = ast.statements.filter(isFunctionStatement);
+            const helloTrivia = funcStatements[0].leadingTrivia;
+            expect(helloTrivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(0);
+            const helloAnnotationTrivia = funcStatements[0].annotations[0].leadingTrivia;
+            expect(helloAnnotationTrivia.length).to.be.greaterThan(0);
+            expect(helloAnnotationTrivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(2);
+            const otherAnnotationTrivia = funcStatements[0].annotations[1].leadingTrivia;
+            expect(otherAnnotationTrivia.length).to.be.greaterThan(0);
+            expect(otherAnnotationTrivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+        });
+
+
+        it('gets leading trivia from class methods', () => {
+            let { ast } = parse(`
+                ' hello
+                ' classes
+                class Hello
+
+                    ' Gets the value of PI
+                    ' Not a dessert
+                    function getPi() as float
+                        return 3.14
+                    end function
+
+                    ' Gets a dessert
+                    function getPie() as string
+                        return "Apple Pie"
+                    end function
+                end class
+            `, ParseMode.BrighterScript);
+            const classStatement = ast.statements.filter(isClassStatement)[0];
+            const methodStatements = classStatement.methods;
+
+            // function getPi()
+            let trivia = methodStatements[0].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(2);
+
+            // function getPie()
+            trivia = methodStatements[1].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+        });
+
+        it('gets leading trivia from class fields', () => {
+            let { ast } = parse(`
+                ' hello
+                ' classes
+                class Thing
+                    ' like the sky
+                    ' or a blueberry, evn though that's purple
+                    color = "blue"
+
+                    ' My name
+                    public name as string
+
+                    ' Only I know how old I am
+                    private age = 42
+                end class
+            `, ParseMode.BrighterScript);
+            const classStatement = ast.statements.filter(isClassStatement)[0];
+            const fieldStatements = classStatement.fields;
+
+            // color = "blue"
+            let trivia = fieldStatements[0].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(2);
+
+            // public name as string
+            trivia = fieldStatements[1].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+
+            // private age = 42
+            trivia = fieldStatements[2].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+        });
+
+        it('gets leading trivia from interfaces', () => {
+            let { ast } = parse(`
+                ' Description of interface
+                interface myIface
+                    ' comment
+                    someField as integer
+
+                    'comment
+                    function someFunc() as string
+                end interface
+            `, ParseMode.BrighterScript);
+            const ifaceStatement = ast.statements.filter(isInterfaceStatement)[0];
+            const fieldStatements = ifaceStatement.fields;
+            const methodStatements = ifaceStatement.methods;
+
+            // interface myIface
+            let trivia = ifaceStatement.leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+
+            // someField as integer
+            trivia = fieldStatements[0].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+
+            // function someFunc() as string
+            trivia = methodStatements[0].leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+        });
+
+
+        it('gets leading trivia from namespaces', () => {
+            let { ast } = parse(`
+                ' Description of interface
+                namespace Nested.Name.Space
+
+                end  namespace
             `, ParseMode.BrighterScript);
+            const nameSpaceStatement = ast.statements.filter(isNamespaceStatement)[0];
+
+            // namespace Nested.Name.Space
+            let trivia = nameSpaceStatement.leadingTrivia;
+            expect(trivia.length).to.be.greaterThan(0);
+            expect(trivia.filter(t => t.kind === TokenKind.Comment).length).to.eq(1);
+        });
+    });
+
+    describe('unary/binary ordering', () => {
+        it('creates the correct operator order for `not x = x` code', () => {
+            let { ast, diagnostics } = parse(`
+                function isStrNotEmpty(myStr as string) as boolean
+                    return not myStr = ""
+                end function
+            `);
+            expectZeroDiagnostics(diagnostics);
+            expect(isFunctionStatement(ast.statements[0])).to.be.true;
+            const insideReturn = ((ast.statements[0] as FunctionStatement).func.body.statements[0] as ReturnStatement).value;
+            expect(isUnaryExpression(insideReturn)).to.be.true;
+            expect(isBinaryExpression((insideReturn as UnaryExpression).right)).to.be.true;
+        });
+
+        it('creates the correct operator order for `not x + x` code', () => {
+            let { ast, diagnostics } = parse(`
+                function tryStuff() as integer
+                    return not 1 + 3 ' same as "not (3)" ... eg. the "flipped bits" of 3 (0000 0011) -> 1111 1100, or -4
+                end function
+            `);
+            expectZeroDiagnostics(diagnostics);
+            expect(isFunctionStatement(ast.statements[0])).to.be.true;
+            const insideReturn = ((ast.statements[0] as FunctionStatement).func.body.statements[0] as ReturnStatement).value;
+            expect(isUnaryExpression(insideReturn)).to.be.true;
+            expect(isBinaryExpression((insideReturn as UnaryExpression).right)).to.be.true;
+        });
+
+        it('creates the correct operator order for `x = not x` code', () => {
+            let { ast, diagnostics } = parse(`
+                function tryStuff() as boolean
+                    return 4 = not -5 ' same as "4 = 4"
+                end function
+            `);
+            expectZeroDiagnostics(diagnostics);
+            expect(isFunctionStatement(ast.statements[0])).to.be.true;
+            const insideReturn = ((ast.statements[0] as FunctionStatement).func.body.statements[0] as ReturnStatement).value;
+            expect(isBinaryExpression(insideReturn)).to.be.true;
+            expect(isLiteralExpression((insideReturn as BinaryExpression).left)).to.be.true;
+
+            const right = (insideReturn as BinaryExpression).right as UnaryExpression;
+            expect(isUnaryExpression(right)).to.be.true;
+            expect(isUnaryExpression(right.right)).to.be.true; // not ( - ( 5))
+        });
+
+        it('allows multiple nots', () => {
+            let { ast, diagnostics } = parse(`
+                function tryStuff() as integer
+                    return not not not 4
+                end function
+            `);
+            expectZeroDiagnostics(diagnostics);
+            expect(isFunctionStatement(ast.statements[0])).to.be.true;
+            const insideReturn = ((ast.statements[0] as FunctionStatement).func.body.statements[0] as ReturnStatement).value;
+            expect(isUnaryExpression(insideReturn)).to.be.true;
+            expect(isUnaryExpression((insideReturn as UnaryExpression).right)).to.be.true;
+            expect(isUnaryExpression(((insideReturn as UnaryExpression).right as UnaryExpression).right)).to.be.true;
+        });
+
+        it('allows multiple -', () => {
+            let { ast, diagnostics } = parse(`
+                function tryStuff() as integer
+                    return - - - 4
+                end function
+            `);
+            expectZeroDiagnostics(diagnostics);
+            expect(isFunctionStatement(ast.statements[0])).to.be.true;
+            const insideReturn = ((ast.statements[0] as FunctionStatement).func.body.statements[0] as ReturnStatement).value;
+            expect(isUnaryExpression(insideReturn)).to.be.true;
+            expect(isUnaryExpression((insideReturn as UnaryExpression).right)).to.be.true;
+            expect(isUnaryExpression(((insideReturn as UnaryExpression).right as UnaryExpression).right)).to.be.true;
+        });
+    });
+
+    describe('typecast statement', () => {
+        it('allows typecast statement ', () => {
+            let { ast, diagnostics } = parse(`
+                typeCAST m AS roAssociativeArray
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(isTypecastStatement(ast.statements[0])).to.be.true;
+            const stmt = ast.statements[0] as TypecastStatement;
+            expect(stmt.tokens.typecast.text).to.eq('typeCAST');
+            expect(stmt.typecastExpression).to.exist;
+        });
+
+        it('is disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                typecast m AS roAssociativeArray
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('typecast statements')
+            ]);
+        });
+
+        it('allows `typecast` for function name', () => {
+            let { ast, diagnostics } = parse(`
+                function typecast() as integer
+                    return 1
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect((ast.statements[0] as FunctionStatement).tokens.name.text).to.eq('typecast');
+        });
+
+        it('allows `typecast` for variable name', () => {
+            let { ast, diagnostics } = parse(`
+                function foo() as integer
+                    typecast = 1
+                    return typecast
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(((ast.statements[0] as FunctionStatement).func.body.statements[0] as AssignmentStatement).tokens.name.text).to.eq('typecast');
+        });
+
+        it('is allowed in function', () => {
+            let { diagnostics } = parse(`
+                function foo() as integer
+                    typecast m as MyObject
+                    return m.getNum()
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('is allowed in function literal', () => {
+            let { diagnostics } = parse(`
+                interface PiGetter
+                    pi as float
+                    function getPi() as float
+                end interface
+
+                function makePiGetter() as object
+                    x = {
+                        pi: 3.14,
+                        getPi: function() as float
+                            typecast m as PiGetter
+                            return m.pi
+                        end function
+                    }
+                    return x
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+    });
+
+    describe('conditional compilation', () => {
+
+        it('contains code from conditional compile blocks', () => {
+            let { ast, diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    print "hello"
+                #end if
+                end sub
+            `, ParseMode.BrighterScript, { debug: true });
+            expectZeroDiagnostics(diagnostics);
+            const funcBlock = (ast.statements[0] as FunctionStatement).func.body;
+            expect(funcBlock.statements.length).to.eq(1);
+            const ccStmt = funcBlock.statements[0] as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(ccStmt)).to.true;
+            const printStmt = ccStmt.thenBranch.statements[0];
+            expect(isPrintStatement(printStmt)).to.true;
+        });
+
+        it('contains code from conditional compile else blocks', () => {
+            let { ast, diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    m.pi = 3.14
+                #else
+                    print "hello"
+                #end if
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const funcBlock = (ast.statements[0] as FunctionStatement).func.body;
+            const ccStmt = funcBlock.statements[0] as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(ccStmt)).to.true;
+            expect(ccStmt.elseBranch).to.exist;
+            expect(isBlock(ccStmt.elseBranch)).to.true;
+            const printStmt = (ccStmt.elseBranch as Block).statements[0];
+            expect(isPrintStatement(printStmt)).to.true;
+        });
+
+        it('contains code from conditional compile else if blocks', () => {
+            let { ast, diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    m.pi = 3.14
+                #else if PROD
+                    print "hello"
+                #end if
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const funcBlock = (ast.statements[0] as FunctionStatement).func.body;
+            const ccStmt = funcBlock.statements[0] as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(ccStmt)).to.true;
+            expect(ccStmt.elseBranch).to.exist;
+            const elseBranch = ccStmt.elseBranch as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(elseBranch)).to.true;
+            expect(elseBranch.tokens.condition.text).to.eq('PROD');
+            const printStmt = elseBranch.thenBranch.statements[0];
+            expect(isPrintStatement(printStmt)).to.true;
+        });
+
+        it('contains code from multiple conditional compile else if blocks', () => {
+            let { ast, diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    m.pi = 3.14
+                #else if PROD
+                    print "hello"
+                #else if ABC
+                    print "hello"
+                #else if DEF
+                    print "hello"
+                #else if HIJ
+                    print "hello"
+                #else
+                    x = 78
+                #end if
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const funcBlock = (ast.statements[0] as FunctionStatement).func.body;
+            const ccStmt = funcBlock.statements[0] as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(ccStmt)).to.true;
+            expect(ccStmt.elseBranch).to.exist;
+            let elseBranch = ccStmt.elseBranch as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(elseBranch)).to.true;
+            expect(elseBranch.tokens.condition.text).to.eq('PROD');
+            elseBranch = elseBranch.elseBranch as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(elseBranch)).to.true;
+            expect(elseBranch.tokens.condition.text).to.eq('ABC');
+            elseBranch = elseBranch.elseBranch as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(elseBranch)).to.true;
+            expect(elseBranch.tokens.condition.text).to.eq('DEF');
+            elseBranch = elseBranch.elseBranch as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(elseBranch)).to.true;
+            expect(elseBranch.tokens.condition.text).to.eq('HIJ');
+            let lastElse = elseBranch.elseBranch as Block;
+            expect(isBlock(lastElse)).to.true;
+            expect(isAssignmentStatement(lastElse.statements[0])).to.true;
+        });
+
+        it('allows empty conditional compilation blocks', () => {
+            let { ast, diagnostics } = parse(`
+                #if DEBUG
+                #else if PROD
+                #else
+                #end if
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const ccStmt = ast.statements[0] as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(ccStmt)).to.true;
+            expect(ccStmt.thenBranch.statements.length).to.eq(0);
+            expect((ccStmt.elseBranch as ConditionalCompileStatement).thenBranch.statements.length).to.eq(0);
+            expect(((ccStmt.elseBranch as ConditionalCompileStatement).elseBranch as Block).statements.length).to.eq(0);
+        });
+
+        it('allows only comments in compilation blocks', () => {
+            let { ast, diagnostics } = parse(`
+                ' before if
+                #if DEBUG
+                    ' this is debug
+                #else if PROD
+                    ' this is prod
+                #else
+                    ' this is neither
+                #end if
+                ' after if
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            const ccStmt = ast.statements[0] as ConditionalCompileStatement;
+            expect(isConditionalCompileStatement(ccStmt)).to.true;
+            expect(ccStmt.thenBranch.statements.length).to.eq(0);
+            expect((ccStmt.elseBranch as ConditionalCompileStatement).thenBranch.statements.length).to.eq(0);
+            expect(((ccStmt.elseBranch as ConditionalCompileStatement).elseBranch as Block).statements.length).to.eq(0);
+        });
+
+        it('has no error when safely closing block', () => {
+            let { diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    if m.enabled
+                        print "hello"
+                    end if
+                #end if
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('has error when unsafely closing block', () => {
+            let { diagnostics } = parse(`
+                sub foo()
+                    if m.enabled
+                #if DEBUG
+                        print "hello"
+                    end if
+                #end if
+                end sub
+            `, ParseMode.BrighterScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.unsafeUnmatchedTerminatorInConditionalCompileBlock('end if').message
+            ]);
+        });
+
+
+        it('has error when unsafely opening block', () => {
+            let { diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    if m.enabled
+                        print "hello"
+                #end if
+                    end if
+                end sub
+            `, ParseMode.BrighterScript, { debug: true });
+            expectDiagnostics(diagnostics, [
+                DiagnosticMessages.expectedTerminator('end if', 'if').message,
+                DiagnosticMessages.unexpectedToken('end if').message
+            ]);
+        });
+
+        it('has no diagnostics from false blocks', () => {
+            let { diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    blah blah blah
+                #end if
+
+                #if false
+                    there are no diagnostics here
+                #end if
+                end sub
+            `, ParseMode.BrighterScript, { debug: false });
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('allows #if not bs_const', () => {
+            let { diagnostics } = parse(`
+                sub foo()
+                #if not DEBUG
+                    print "not debug"
+                #end if
+                end sub
+            `, ParseMode.BrighterScript, { debug: false });
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('allows #elseif not bs_const', () => {
+            let { diagnostics } = parse(`
+                sub foo()
+                #if DEBUG
+                    print "debug"
+                #else if not STAGING
+                    print "not debug and not staging"
+                #end if
+                end sub
+            `, ParseMode.BrighterScript, { debug: false, staging: false });
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        describe('#const', () => {
+            it('parses #const', () => {
+                let { ast, diagnostics } = parse(`
+                    #const test = true
+                    sub foo()
+                        #const debug = test
+                    end sub
+                    #    const spaces = false
+                `, ParseMode.BrighterScript);
+                expectZeroDiagnostics(diagnostics);
+                //#const test = true
+                let ccc = ast.statements[0] as ConditionalCompileConstStatement;
+                expect(isConditionalCompileConstStatement(ccc)).to.be.true;
+                expect(ccc.assignment.tokens.name.text).to.eq('test');
+                expect(isLiteralExpression(ccc.assignment.value)).to.be.true;
+                expect((ccc.assignment.value as LiteralExpression).tokens.value.text).to.eq('true');
+                //#const debug = test
+                ccc = (ast.statements[1] as FunctionStatement).func.body.statements[0] as ConditionalCompileConstStatement;
+                expect(isConditionalCompileConstStatement(ccc)).to.be.true;
+                expect(ccc.assignment.tokens.name.text).to.eq('debug');
+                expect(isVariableExpression(ccc.assignment.value)).to.be.true;
+                expect((ccc.assignment.value as VariableExpression).tokens.name.text).to.eq('test');
+                //#    const spaces = false
+                ccc = ast.statements[2] as ConditionalCompileConstStatement;
+                expect(isConditionalCompileConstStatement(ccc)).to.be.true;
+                expect(ccc.assignment.tokens.name.text).to.eq('spaces');
+                expect(isLiteralExpression(ccc.assignment.value)).to.be.true;
+                expect((ccc.assignment.value as LiteralExpression).tokens.value.text).to.eq('false');
+            });
+
+            it('has diagnostic if no lhs', () => {
+                let { diagnostics } = parse(`
+                    #const test
+                `, ParseMode.BrighterScript);
+                expectDiagnostics(diagnostics, [
+                    DiagnosticMessages.expectedOperator([TokenKind.Equal], 'test').message
+                ]);
+            });
+
+            it('has diagnostic if invalid operator', () => {
+                let { diagnostics } = parse(`
+                    #const test += other
+                `, ParseMode.BrighterScript);
+                expectDiagnostics(diagnostics, [
+                    DiagnosticMessages.expectedOperator([TokenKind.Equal], 'test').message
+                ]);
+            });
+
+            it('has diagnostic if invalid lhs', () => {
+                let { diagnostics } = parse(`
+                    #const test = 4
+                `, ParseMode.BrighterScript);
+                expectDiagnostics(diagnostics, [
+                    DiagnosticMessages.invalidHashConstValue().message
+                ]);
+            });
+        });
+
+        describe('#error', () => {
+            it('parses #error', () => {
+                let { ast, diagnostics } = parse(`
+                    #error
+                    sub foo()
+                        #error this is a LONG "message" :: with colons, etc.
+                    end sub
+                    #    error this one has spaces
+                `, ParseMode.BrighterScript);
+                expectZeroDiagnostics(diagnostics);
+
+                //#error
+                let cce = ast.statements[0] as ConditionalCompileErrorStatement;
+                expect(isConditionalCompileErrorStatement(cce)).to.be.true;
+                expect(cce.tokens.message.kind).to.eq(TokenKind.HashErrorMessage);
+                expect(cce.tokens.message.text).to.eq('');
+
+                //#error this is a long "message" :: with colons, etc.
+                cce = (ast.statements[1] as FunctionStatement).func.body.statements[0] as ConditionalCompileErrorStatement;
+                expect(isConditionalCompileErrorStatement(cce)).to.be.true;
+                expect(cce.tokens.message.kind).to.eq(TokenKind.HashErrorMessage);
+                expect(cce.tokens.message.text).to.eq('this is a LONG "message" :: with colons, etc.');
+
+                //#    error this one has spaces
+                cce = ast.statements[2] as ConditionalCompileErrorStatement;
+                expect(isConditionalCompileErrorStatement(cce)).to.be.true;
+                expect(cce.tokens.message.kind).to.eq(TokenKind.HashErrorMessage);
+                expect(cce.tokens.message.text).to.eq('this one has spaces');
+            });
+        });
+    });
+
+    describe('alias statement', () => {
+        it('allows alias statement ', () => {
+            let { ast, diagnostics } = parse(`
+                ALIAS x = lcase
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(isAliasStatement(ast.statements[0])).to.be.true;
+            const stmt = ast.statements[0] as AliasStatement;
+            expect(stmt.tokens.alias.text).to.eq('ALIAS');
+            expect(stmt.value).to.exist;
+        });
+
+        it('is disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                alias x = lcase
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('alias statements')
+            ]);
+        });
+
+        it('allows `alias` for function name', () => {
+            let { ast, diagnostics } = parse(`
+                function alias() as integer
+                    return 1
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect((ast.statements[0] as FunctionStatement).tokens.name.text).to.eq('alias');
+        });
+
+        it('allows `alias` for variable name', () => {
+            let { ast, diagnostics } = parse(`
+                function foo() as integer
+                    alias = 1
+                    return alias
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(((ast.statements[0] as FunctionStatement).func.body.statements[0] as AssignmentStatement).tokens.name.text).to.eq('alias');
+        });
+    });
+
+    describe('type statement', () => {
+        it('allows type statement ', () => {
+            let { ast, diagnostics } = parse(`
+                TYPE x = string
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(isTypeStatement(ast.statements[0])).to.be.true;
+            const stmt = ast.statements[0] as TypeStatement;
+            expect(stmt.tokens.type.text).to.eq('TYPE');
+            expect(stmt.value).to.exist;
+        });
+
+        it('is disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                type x = string
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('type statements')
+            ]);
+        });
+
+        it('disallows `type` for function name', () => {
+            let { diagnostics } = parse(`
+                function type() as integer
+                    return 1
+                end function
+            `, ParseMode.BrighterScript);
+            expectDiagnostics(diagnostics, [
+                DiagnosticMessages.cannotUseReservedWordAsIdentifier('type').message
+            ]);
+        });
+
+        it('disallows `type` for variable name', () => {
+            let { diagnostics } = parse(`
+                function foo() as integer
+                    type = 1
+                    return type
+                end function
+            `, ParseMode.BrighterScript);
+            expectDiagnostics(diagnostics, [
+                DiagnosticMessages.cannotUseReservedWordAsIdentifier('type').message
+            ]);
+        });
+
+        it('has error when rhs is not a type', () => {
+            let { diagnostics } = parse(`
+                type x = 123
+            `, ParseMode.BrighterScript);
+            expectDiagnostics(diagnostics, [
+                DiagnosticMessages.expectedIdentifier('=').message
+            ]);
+        });
+
+        it('allows type statement with complicated type', () => {
+            let { ast, diagnostics } = parse(`
+                type x = string or CustomKlass or roAssociativeArray
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(isTypeStatement(ast.statements[0])).to.be.true;
+            const stmt = ast.statements[0] as TypeStatement;
+            expect(stmt.tokens.type.text).to.eq('type');
+            expect(stmt.value).to.exist;
+        });
+
+        it('allows grouped expressions in type statement', () => {
+            let { ast, diagnostics } = parse(`
+                type guy = ({name as string} or {age as integer}) and {foo as boolean, age as integer}
+
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(isTypeStatement(ast.statements[0])).to.be.true;
+            const stmt = ast.statements[0] as TypeStatement;
+            expect(stmt.tokens.type.text).to.eq('type');
+            expect(stmt.value).to.exist;
+        });
+    });
+
+    describe('jump statements', () => {
+        it('should recognize `exit for`', () => {
+            let { ast, diagnostics } = parse(`
+                sub main()
+                    for i = 1 to 10
+                        exit for
+                    end for
+                end sub
+            `);
+            expectZeroDiagnostics(diagnostics);
+            let loop = (ast.statements[0] as FunctionStatement).func.body.statements[0] as ForStatement;
+            let exitStmt = loop.body.statements[0] as ExitStatement;
+            expect(isExitStatement(exitStmt)).to.be.true;
+            expect(exitStmt.tokens.loopType.text).to.eq('for');
+        });
+
+        it('should recognize `exit while`', () => {
+            let { ast, diagnostics } = parse(`
+                sub main(i)
+                    while i < 10
+                        exit while
+                        i++
+                    end while
+                end sub
+            `);
+            expectZeroDiagnostics(diagnostics);
+            let loop = (ast.statements[0] as FunctionStatement).func.body.statements[0] as ForStatement;
+            let exitStmt = loop.body.statements[0] as ExitStatement;
+            expect(isExitStatement(exitStmt)).to.be.true;
+            expect(exitStmt.tokens.loopType.text).to.eq('while');
+        });
+
+        it('should recognize `exitwhile` (one word)', () => {
+            let { ast, diagnostics } = parse(`
+                sub main(i)
+                    while i < 10
+                        exitwhile
+                        i++
+                    end while
+                end sub
+            `);
+            expectZeroDiagnostics(diagnostics);
+            let loop = (ast.statements[0] as FunctionStatement).func.body.statements[0] as ForStatement;
+            let exitStmt = loop.body.statements[0] as ExitStatement;
+            expect(isExitStatement(exitStmt)).to.be.true;
+            expect(exitStmt.tokens.loopType.text).to.eq('while');
+        });
+
+        it('should allow identifiers named `exitfor` (one word)', () => {
+            let { ast, diagnostics } = parse(`
+                sub main()
+                    for i = 1 to 10
+                        exitfor = 1
+                        exit for
+                    end for
+                end sub
+            `);
+            expectZeroDiagnostics(diagnostics);
+            let loop = (ast.statements[0] as FunctionStatement).func.body.statements[0] as ForStatement;
+            let assignment = loop.body.statements[0] as AssignmentStatement;
+            expect(assignment.tokens.name.text).to.eq('exitfor');
+            let exitStmt = loop.body.statements[1] as ExitStatement;
+            expect(isExitStatement(exitStmt)).to.be.true;
+            expect(exitStmt.tokens.loopType.text).to.eq('for');
+        });
+    });
+
+    describe('custom types', () => {
+        it('built-in interface param types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as roAssociativeArray)
+                    print foo.x
+                end sub
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+
+        it('built-in interface types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as roAssociativeArray
+                    return foo.x
+                end function
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+
+        it('custom param types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as Whatever)
+                    print foo.x
+                end sub
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+
+        it('custom return types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as Whatever
+                    return foo.x
+                end function
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+
+        it('built-in interface param types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as roAssociativeArray)
+                    print foo.x
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('built-in interface types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as roAssociativeArray
+                    return foo.x
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('custom param types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as Whatever)
+                    print foo.x
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('custom return types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as Whatever
+                    return foo.x
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+    });
+
+    describe('inline interfaces', () => {
+        it('inline interface param types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as {x as string})
+                    print foo.x
+                end sub
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('inline interface')
+            ]);
+        });
+
+        it('inline interface return types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                function test() as {x as string}
+                    print {x: "hello"}
+                end function
+            `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('inline interface')
+            ]);
+        });
+
+        it('inline interface as param type', () => {
+            let { ast, diagnostics } = parse(`
+                sub test(foo as {x as string})
+                    print foo.x
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            expect(isInlineInterfaceExpression(func.parameters[0].typeExpression?.expression)).to.be.true;
+        });
+
+        it('inline interface as return type', () => {
+            let { ast, diagnostics } = parse(`
+               function test() as {x as string}
+                    print {x: "hello"}
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            expect(isInlineInterfaceExpression(func.returnTypeExpression.expression)).to.be.true;
+        });
+
+        it('parses a big inline interface as param type', () => {
+            let { ast, diagnostics } = parse(`
+                sub test(foo as {
+                    x as string,
+                    y as {a as integer}
+                    z})
+                    print foo.x + y.a.toStr()
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const inlineIface = func.parameters[0].typeExpression?.expression as InlineInterfaceExpression;
+            expect(isInlineInterfaceExpression(inlineIface)).to.be.true;
+
+            expect(inlineIface.tokens.open).not.to.be.undefined;
+            expect(inlineIface.tokens.close).not.to.be.undefined;
+            expect(inlineIface.members).to.have.length(3);
+            const iFaceType = inlineIface.getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(iFaceType, InlineInterfaceType);
+
+            expectTypeToBe(iFaceType.getMemberType('x', { flags: SymbolTypeFlag.runtime }), StringType);
+            expectTypeToBe(iFaceType.getMemberType('y', { flags: SymbolTypeFlag.runtime }), InlineInterfaceType);
+            expectTypeToBe(iFaceType.getMemberType('z', { flags: SymbolTypeFlag.runtime }), DynamicType);
+        });
+
+        it('allows optional members', () => {
+            let { ast, diagnostics } = parse(`
+                sub test(p as {x as string, optional y})
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements.length).to.eq(1);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const inlineIface = func.parameters[0].typeExpression?.expression as InlineInterfaceExpression;
+            expect(isInlineInterfaceExpression(inlineIface)).to.be.true;
+            expect(inlineIface.members).to.have.length(2);
+            expect(inlineIface.members[1].isOptional).to.be.true;
+        });
+
+        it('is allowed as typecast', () => {
+            let { diagnostics } = parse(`
+                sub test(p)
+                    print (p as {name as string}).name
+                end sub
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('is allowed as class and interface field', () => {
+            let { diagnostics } = parse(`
+                class Klass
+                    x as {name as string}
+                end class
+
+                interface Iface
+                    y as {age as integer}
+                end interface
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('can have custom type as member type', () => {
+            let { diagnostics } = parse(`
+                interface IFace
+                   name as string
+                end interface
+
+                function test(z as {foo as IFace})
+                    return z.foo.name
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('can have per-member doc comment', () => {
+            let { diagnostics } = parse(`
+                interface IFace
+                    inline as {
+                        ' comment 1
+                        name as string
+                        ' comment 2
+                        age as integer
+                    }
+                end interface
+
+                function test(z as {foo as IFace})
+                    return z.foo.inline.name
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('can have string literals as members', () => {
+            let { diagnostics } = parse(`
+                function test(z as {"this is a stringliteral" as string})
+                    return z["this is a stringliteral"]
+                end function
+            `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+    });
+
+    describe('typed functions as types', () => {
+        it('disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(func as function())
+                    return func()
+                end function
+             `, ParseMode.BrightScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('typed function types')
+            ]);
+        });
+
+        it('can be passed as param types', () => {
+            let { diagnostics } = parse(`
+                function test(func as function())
+                    return func()
+                end function
+             `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
+        });
+
+        it('can have a return type', () => {
+            let { diagnostics } = parse(`
+                function test(func as sub() as integer) as integer
+                    return func()
+                end function
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
-            expect(isTypecastStatement(ast.statements[0])).to.be.true;
-            const stmt = ast.statements[0] as TypecastStatement;
-            expect(stmt.tokens.typecast.text).to.eq('typeCAST');
-            expect(stmt.tokens.typecast).to.exist;
         });
 
-        it('is disallowed in brightscript mode', () => {
+        it('can use sub or function', () => {
             let { diagnostics } = parse(`
-                typecast m AS roAssociativeArray
-            `, ParseMode.BrightScript);
-            expectDiagnostics(diagnostics, [
-                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('typecast statements')
-            ]);
-        });
-
-        it('allows `typecast` for function name', () => {
-            let { ast, diagnostics } = parse(`
-                function typecast() as integer
-                    return 1
+                function test(func as sub() as integer) as integer
+                    return func()
                 end function
-            `, ParseMode.BrighterScript);
+
+                function test2(func as function() as integer) as integer
+                    return func()
+                 end function
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
-            expect((ast.statements[0] as FunctionStatement).name.text).to.eq('typecast');
         });
 
-        it('allows `typecast` for variable name', () => {
-            let { ast, diagnostics } = parse(`
-                function foo() as integer
-                    typecast = 1
-                    return typecast
+        it('can have primitive parameters', () => {
+            let { diagnostics } = parse(`
+                function test(func as function(name as string, num as integer) as integer) as integer
+                    return func("hello", 123)
                 end function
-            `, ParseMode.BrighterScript);
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
-            expect(((ast.statements[0] as FunctionStatement).func.body.statements[0] as AssignmentStatement).name.text).to.eq('typecast');
         });
 
-        it('is allowed in function', () => {
+        it('can have complex parameters', () => {
             let { diagnostics } = parse(`
-                function foo() as integer
-                    typecast m as MyObject
-                    return m.getNum()
+                interface IFace
+                    name as string
+                end interface
+
+                function test(func as function(thing as IFace) as integer) as integer
+                    return func({name: "hello"})
                 end function
-            `, ParseMode.BrighterScript);
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
         });
 
-        it('is allowed in function literal', () => {
+        it('can have compound parameters', () => {
             let { diagnostics } = parse(`
-                interface PiGetter
-                    pi as float
-                    function getPi() as float
+                interface IFace
+                    name as string
                 end interface
 
-                function makePiGetter() as object
-                    x = {
-                        pi: 3.14,
-                        getPi: function() as float
-                            typecast m as PiGetter
-                            return m.pi
-                        end function
-                    }
-                    return x
+                function test(func as function(arg1 as string or integer, arg2 as IFace) as integer) as integer
+                    return func("hello", {name: "hello"})
                 end function
-            `, ParseMode.BrighterScript);
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
         });
-    });
 
-    describe('alias statement', () => {
-        it('allows alias statement ', () => {
-            let { ast, diagnostics } = parse(`
-                ALIAS x = lcase
-            `, ParseMode.BrighterScript);
+        it('invalid syntax inside the function type causes errors', () => {
+            let { diagnostics } = parse(`
+                function test(func as function(arg2 noAsBeforeType) as integer) as integer
+                    return func({name: "hello"})
+                end function
+             `, ParseMode.BrighterScript);
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.unmatchedLeftToken('(', 'function type expression').message
+            ]);
+        });
+
+        it('can be used as return types', () => {
+            let { diagnostics } = parse(`
+                function test() as function() as integer
+                    return function() as integer
+                        return 123
+                    end function
+                end function
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
-            expect(isAliasStatement(ast.statements[0])).to.be.true;
-            const stmt = ast.statements[0] as AliasStatement;
-            expect(stmt.tokens.alias.text).to.eq('ALIAS');
-            expect(stmt.tokens.value).to.exist;
         });
 
-        it('is disallowed in brightscript mode', () => {
+        it('can have a union as return type', () => {
             let { diagnostics } = parse(`
-                alias x = lcase
-            `, ParseMode.BrightScript);
-            expectDiagnostics(diagnostics, [
-                DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('alias statements')
-            ]);
+                type foo = function() as integer or string
+                function test() as foo
+                    return function() as integer
+                        return 123
+                    end function
+                end function
+             `, ParseMode.BrighterScript);
+            expectZeroDiagnostics(diagnostics);
         });
 
-        it('allows `alias` for function name', () => {
-            let { ast, diagnostics } = parse(`
-                function alias() as integer
-                    return 1
+        it('can have optional parameters', () => {
+            let { diagnostics } = parse(`
+                function test(func as function(arg1 as string,  arg2 = 0 as integer) as integer) as integer
+                    return func("hello")
                 end function
-            `, ParseMode.BrighterScript);
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
-            expect((ast.statements[0] as FunctionStatement).name.text).to.eq('alias');
         });
 
-        it('allows `alias` for variable name', () => {
-            let { ast, diagnostics } = parse(`
-                function foo() as integer
-                    alias = 1
-                    return alias
+        it('can have a function type as a parameter to a function type', () => {
+            let { diagnostics } = parse(`
+                function test(func as function(arg1 as function() as integer) as integer) as integer
+                    return func(function() as integer
+                        return 123
+                    end function)
                 end function
-            `, ParseMode.BrighterScript);
+             `, ParseMode.BrighterScript);
             expectZeroDiagnostics(diagnostics);
-            expect(((ast.statements[0] as FunctionStatement).func.body.statements[0] as AssignmentStatement).name.text).to.eq('alias');
         });
     });
 
@@ -1580,7 +3148,7 @@ describe('parser', () => {
             expect(isTypeStatement(ast.statements[0])).to.be.true;
             const stmt = ast.statements[0] as TypeStatement;
             expect(stmt.tokens.type.text).to.eq('TYPE');
-            expect(stmt.tokens.value).to.exist;
+            expect(stmt.value).to.exist;
         });
 
         it('is disallowed in brightscript mode', () => {
@@ -1620,7 +3188,7 @@ describe('parser', () => {
                 type x = 123
             `, ParseMode.BrighterScript);
             expectDiagnostics(diagnostics, [
-                DiagnosticMessages.expectedIdentifierAfterKeyword('=').message
+                DiagnosticMessages.expectedIdentifier('=').message
             ]);
         });
 
@@ -1632,44 +3200,12 @@ describe('parser', () => {
             expect(isTypeStatement(ast.statements[0])).to.be.true;
             const stmt = ast.statements[0] as TypeStatement;
             expect(stmt.tokens.type.text).to.eq('type');
-            expect(stmt.tokens.value).to.exist;
+            expect(stmt.value).to.exist;
         });
     });
 
 
-    describe('inline interfaces', () => {
-        it('inline interface param types disallowed in brightscript mode', () => {
-            let { diagnostics } = parse(`
-                sub test(foo as {x as string})
-                    print foo.x
-                end sub
-            `, ParseMode.BrightScript);
-            expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.functionParameterTypeIsInvalid('foo', '{').message
-            ]);
-        });
-
-        it('inline interface return types disallowed in brightscript mode', () => {
-            let { diagnostics } = parse(`
-                function test() as {x as string}
-                    print {x: "hello"}
-                end function
-            `, ParseMode.BrightScript);
-            expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.invalidFunctionReturnType('{').message
-            ]);
-        });
-
-        it('inline interface as param type', () => {
-            let { ast, diagnostics } = parse(`
-                sub test(foo as {x as string})
-                    print foo.x
-                end sub
-            `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-            expect(ast.statements.length).to.eq(1);
-        });
-
+    describe('inline interfaces (more)', () => {
         it('inline interface as return type', () => {
             let { ast, diagnostics } = parse(`
                function test() as {x as string}
@@ -1851,7 +3387,7 @@ describe('parser', () => {
                 `, ParseMode.BrightScript);
                 expectDiagnosticsIncludes(diagnostics, [
                     DiagnosticMessages.unexpectedToken('\n'),
-                    DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                    DiagnosticMessages.expectedStatement()
                 ]);
             });
         });
@@ -1870,8 +3406,8 @@ describe('parser', () => {
                 `, ParseMode.BrightScript);
                 expectDiagnosticsIncludes(diagnostics, [
                     DiagnosticMessages.unexpectedToken('\n'),
-                    DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
-                    DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                    DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments'),
+                    DiagnosticMessages.expectedStatement()
                 ]);
             });
 
@@ -1945,7 +3481,7 @@ describe('parser', () => {
                 });
                 expectDiagnosticsIncludes(diagnostics, [
                     DiagnosticMessages.unexpectedToken('\n'),
-                    DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                    DiagnosticMessages.expectedStatement()
                 ]);
             });
 
@@ -1984,120 +3520,25 @@ describe('parser', () => {
                 });
                 expectDiagnosticsIncludes(diagnostics, [
                     DiagnosticMessages.unexpectedToken('\n'),
-                    DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
-                    DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()
+                    DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments'),
+                    DiagnosticMessages.expectedStatement()
                 ]);
             });
         });
     });
 
-    describe('typed functions as types', () => {
-        it('disallowed in brightscript mode', () => {
-            let { diagnostics } = parse(`
-                function test(func as function())
-                    return func()
-                end function
-             `, ParseMode.BrightScript);
-            expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.unexpectedToken(')')
-            ]);
-        });
-
-        it('can be passed as param types', () => {
-            let { diagnostics } = parse(`
-                function test(func as function())
-                    return func()
-                end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-
-        it('can have a return type', () => {
-            let { diagnostics } = parse(`
-                function test(func as sub() as integer) as integer
-                    return func()
-                end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-
-        it('can use sub or function', () => {
-            let { diagnostics } = parse(`
-                function test(func as sub() as integer) as integer
-                    return func()
-                end function
-
-                function test2(func as function() as integer) as integer
-                    return func()
-                 end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-
-        it('can have primitive parameters', () => {
-            let { diagnostics } = parse(`
-                function test(func as function(name as string, num as integer) as integer) as integer
-                    return func("hello", 123)
-                end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-
-        it('can have complex parameters', () => {
-            let { diagnostics } = parse(`
-                interface IFace
-                    name as string
-                end interface
-
-                function test(func as function(thing as IFace) as integer) as integer
-                    return func({name: "hello"})
-                end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-
-        it('can have compound parameters', () => {
-            let { diagnostics } = parse(`
-                interface IFace
-                    name as string
-                end interface
-
-                function test(func as function(arg1 as string or integer, arg2 as IFace) as integer) as integer
-                    return func("hello", {name: "hello"})
-                end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-
-        it('can be used as return types', () => {
-            let { diagnostics } = parse(`
-                function test() as function() as integer
-                    return function() as integer
-                        return 123
-                    end function
-                end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-
-        it('can have a union as return type', () => {
-            let { diagnostics } = parse(`
-                type foo = function() as integer or string
-                function test() as foo
-                    return function() as integer
-                        return 123
-                    end function
-                end function
-             `, ParseMode.BrighterScript);
-            expectZeroDiagnostics(diagnostics);
-        });
-    });
 });
 
-function parse(text: string, mode?: ParseMode) {
+export function parse(text: string, mode?: ParseMode, bsConsts: Record<string, boolean> = {}) {
     let { tokens } = Lexer.scan(text);
+    const bsConstMap = new Map<string, boolean>();
+    for (const constName in bsConsts) {
+        bsConstMap.set(constName.toLowerCase(), bsConsts[constName]);
+    }
     return Parser.parse(tokens, {
-        mode: mode!
+        srcPath: s`${rootDir}/source/main.brs`,
+        mode: mode!,
+        bsConsts: bsConstMap
     });
 }
 
@@ -2111,13 +3552,14 @@ export function rangeToArray(range: Range) {
 }
 
 function expectCommentWithText(stat: Statement, text: string) {
-    if (isCommentStatement(stat)) {
-        expect(stat.text).to.equal(text);
+    const trivia = stat.leadingTrivia;
+    if (trivia) {
+        expect(trivia.filter(tok => tok.kind === TokenKind.Comment).map(t => t.text).join('\n')).to.equal(text);
     } else {
         failStatementType(stat, 'Comment');
     }
 }
 
 export function failStatementType(stat: Statement, type: string) {
-    assert.fail(`Statement ${stat.constructor.name} line ${stat.range.start.line} is not a ${type}`);
+    assert.fail(`Statement ${stat.constructor.name} line ${stat.location?.range.start.line} is not a ${type}`);
 }
diff --git a/src/parser/Parser.ts b/src/parser/Parser.ts
index 368c33668..4138a8918 100644
--- a/src/parser/Parser.ts
+++ b/src/parser/Parser.ts
@@ -1,22 +1,24 @@
 import type { Token, Identifier } from '../lexer/Token';
 import { isToken } from '../lexer/Token';
-import type { BlockTerminator } from '../lexer/TokenKind';
+import type { BlockTerminator, PrintSeparatorToken } from '../lexer/TokenKind';
 import { Lexer } from '../lexer/Lexer';
 import {
     AllowedLocalIdentifiers,
+    AllowedTypeIdentifiers,
+    DeclarableTypes,
     AllowedProperties,
     AssignmentOperators,
     BrighterScriptSourceLiterals,
-    DeclarableTypes,
     DisallowedFunctionIdentifiersText,
     DisallowedLocalIdentifiersText,
-    TokenKind
+    TokenKind,
+    BlockTerminators,
+    ReservedWords,
+    CompoundAssignmentOperators,
+    BinaryExpressionOperatorTokens
 } from '../lexer/TokenKind';
-import type {
-    PrintSeparatorSpace,
-    PrintSeparatorTab
-} from './Statement';
 import {
+    AliasStatement,
     AssignmentStatement,
     Block,
     Body,
@@ -24,17 +26,16 @@ import {
     ContinueStatement,
     ClassStatement,
     ConstStatement,
-    CommentStatement,
+    ConditionalCompileStatement,
     DimStatement,
     DottedSetStatement,
     EndStatement,
     EnumMemberStatement,
     EnumStatement,
-    ExitForStatement,
-    ExitWhileStatement,
+    ExitStatement,
     ExpressionStatement,
-    FieldStatement,
     ForEachStatement,
+    FieldStatement,
     ForStatement,
     FunctionStatement,
     GotoStatement,
@@ -56,7 +57,9 @@ import {
     TryCatchStatement,
     WhileStatement,
     TypecastStatement,
-    AliasStatement,
+    ConditionalCompileConstStatement,
+    ConditionalCompileErrorStatement,
+    AugmentedAssignmentStatement,
     TypeStatement
 } from './Statement';
 import type { DiagnosticInfo } from '../DiagnosticMessages';
@@ -78,7 +81,6 @@ import {
     GroupingExpression,
     IndexedGetExpression,
     LiteralExpression,
-    NamespacedVariableNameExpression,
     NewExpression,
     NullCoalescingExpression,
     RegexLiteralExpression,
@@ -87,23 +89,28 @@ import {
     TemplateStringExpression,
     TemplateStringQuasiExpression,
     TernaryExpression,
-    TypeCastExpression,
+    TypecastExpression,
+    TypeExpression,
+    TypedArrayExpression,
     UnaryExpression,
     VariableExpression,
-    XmlAttributeGetExpression
+    XmlAttributeGetExpression,
+    PrintSeparatorExpression,
+    InlineInterfaceExpression,
+    InlineInterfaceMemberExpression,
+    TypedFunctionTypeExpression
 } from './Expression';
-import type { Diagnostic, Range } from 'vscode-languageserver';
+import type { Range } from 'vscode-languageserver';
 import type { Logger } from '../logging';
 import { createLogger } from '../logging';
-import { isAAIndexedMemberExpression, isAAMemberExpression, isAnnotationExpression, isBinaryExpression, isCallExpression, isCallfuncExpression, isMethodStatement, isCommentStatement, isDottedGetExpression, isIfStatement, isIndexedGetExpression, isVariableExpression, isXmlAttributeGetExpression } from '../astUtils/reflection';
-import { createVisitor, WalkMode } from '../astUtils/visitors';
+import { isAnnotationExpression, isCallExpression, isCallfuncExpression, isDottedGetExpression, isIfStatement, isIndexedGetExpression, isVariableExpression, isConditionalCompileStatement, isLiteralBoolean, isTypecastExpression, isXmlAttributeGetExpression } from '../astUtils/reflection';
 import { createStringLiteral, createToken } from '../astUtils/creators';
-import { Cache } from '../Cache';
 import type { Expression, Statement } from './AstNode';
-import { SymbolTable } from '../SymbolTable';
-import type { BscType } from '../types/BscType';
+import type { BsDiagnostic, DeepWriteable } from '../interfaces';
 import * as semver from 'semver';
 
+const declarableTypesLower = DeclarableTypes.map(tokenKind => tokenKind.toLowerCase());
+
 export class Parser {
     /**
      * The minimum Roku firmware version that added native support for multi-line expressions
@@ -124,10 +131,13 @@ export class Parser {
     /**
      * The list of statements for the parsed file
      */
-    public ast = new Body([]);
+    public ast = new Body({ statements: [] });
 
-    public get statements() {
-        return this.ast.statements;
+    public get eofToken(): Token {
+        const lastToken = this.tokens?.[this.tokens.length - 1];
+        if (lastToken?.kind === TokenKind.Eof) {
+            return lastToken;
+        }
     }
 
     /**
@@ -137,49 +147,10 @@ export class Parser {
         return this.ast.symbolTable;
     }
 
-    /**
-     * References for significant statements/expressions in the parser.
-     * These are initially extracted during parse-time to improve performance, but will also be dynamically regenerated if need be.
-     *
-     * If a plugin modifies the AST, then the plugin should call Parser#invalidateReferences() to force this object to refresh
-     */
-    public get references() {
-        //build the references object if it's missing.
-        if (!this._references) {
-            this.findReferences();
-        }
-        return this._references;
-    }
-
-    private _references = new References();
-
-    /**
-     * Invalidates (clears) the references collection. This should be called anytime the AST has been manipulated.
-     */
-    invalidateReferences() {
-        this._references = undefined;
-    }
-
-    private addPropertyHints(item: Token | AALiteralExpression) {
-        if (isToken(item)) {
-            const name = item.text;
-            this._references.propertyHints[name.toLowerCase()] = name;
-        } else {
-            for (const member of item.elements) {
-                if (!isCommentStatement(member) && isAAMemberExpression(member) && member.keyToken) {
-                    const name = member.keyToken.text;
-                    if (!name.startsWith('"')) {
-                        this._references.propertyHints[name.toLowerCase()] = name;
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * The list of diagnostics found during the parse process
      */
-    public diagnostics: Diagnostic[];
+    public diagnostics: BsDiagnostic[];
 
     /**
      * The depth of the calls to function declarations. Helps some checks know if they are at the root or not.
@@ -248,7 +219,10 @@ export class Parser {
 
         let tokens: Token[];
         if (typeof toParse === 'string') {
-            tokens = Lexer.scan(toParse, { trackLocations: options.trackLocations }).tokens;
+            tokens = Lexer.scan(toParse, {
+                trackLocations: options.trackLocations,
+                srcPath: options?.srcPath
+            }).tokens;
         } else {
             tokens = toParse;
         }
@@ -264,7 +238,7 @@ export class Parser {
         this.pendingAnnotations = [];
 
         this.ast = this.body();
-
+        this.ast.bsConsts = options.bsConsts;
         //now that we've built the AST, link every node to its parent
         this.ast.link();
         return this;
@@ -275,7 +249,7 @@ export class Parser {
     private body() {
         const parentAnnotations = this.enterAnnotationBlock();
 
-        let body = new Body([]);
+        let body = new Body({ statements: [] });
         if (this.tokens.length > 0) {
             this.consumeStatementSeparators(true);
 
@@ -309,7 +283,9 @@ export class Parser {
     }
 
     private sanitizeParseOptions(options: ParseOptions) {
-        options ??= {};
+        options ??= {
+            srcPath: undefined
+        };
         options.mode ??= ParseMode.BrightScript;
         options.trackLocations ??= true;
         return options;
@@ -329,8 +305,8 @@ export class Parser {
         if (this.options.mode !== ParseMode.BrighterScript) {
             let diagnostic = {
                 ...DiagnosticMessages.bsFeatureNotSupportedInBrsFiles(featureName),
-                range: this.peek().range
-            } as Diagnostic;
+                location: this.peek().location
+            };
             this.diagnostics.push(diagnostic);
         }
     }
@@ -346,6 +322,16 @@ export class Parser {
 
     private declaration(): Statement | AnnotationExpression | undefined {
         try {
+            if (this.checkAny(TokenKind.HashConst)) {
+                return this.conditionalCompileConstStatement();
+            }
+            if (this.checkAny(TokenKind.HashIf)) {
+                return this.conditionalCompileStatement();
+            }
+            if (this.checkAny(TokenKind.HashError)) {
+                return this.conditionalCompileErrorStatement();
+            }
+
             if (this.checkAny(TokenKind.Sub, TokenKind.Function)) {
                 return this.functionDeclaration(false);
             }
@@ -354,6 +340,13 @@ export class Parser {
                 return this.libraryStatement();
             }
 
+            if (this.checkAlias()) {
+                return this.aliasStatement();
+            }
+            if (this.checkTypeStatement()) {
+                return this.typeStatement();
+            }
+
             if (this.check(TokenKind.Const) && this.checkAnyNext(TokenKind.Identifier, ...this.allowedLocalIdentifiers)) {
                 return this.constDeclaration();
             }
@@ -362,10 +355,6 @@ export class Parser {
                 return this.annotationExpression();
             }
 
-            if (this.check(TokenKind.Comment)) {
-                return this.commentStatement();
-            }
-
             //catch certain global terminators to prevent unnecessary lookahead (i.e. like `end namespace`, no need to continue)
             if (this.checkAny(...this.peekGlobalTerminators())) {
                 return;
@@ -409,17 +398,19 @@ export class Parser {
     }
 
     private enumMemberStatement() {
-        const statement = new EnumMemberStatement({} as any);
-        statement.tokens.name = this.consume(
-            DiagnosticMessages.expectedClassFieldIdentifier(),
+        const name = this.consume(
+            DiagnosticMessages.expectedIdentifier(),
             TokenKind.Identifier,
             ...AllowedProperties
         ) as Identifier;
+        let equalsToken: Token;
+        let value: Expression;
         //look for `= SOME_EXPRESSION`
         if (this.check(TokenKind.Equal)) {
-            statement.tokens.equal = this.advance();
-            statement.value = this.expression();
+            equalsToken = this.advance();
+            value = this.expression();
         }
+        const statement = new EnumMemberStatement({ name: name, equals: equalsToken, value: value });
         return statement;
     }
 
@@ -428,24 +419,43 @@ export class Parser {
      */
     private interfaceFieldStatement(optionalKeyword?: Token) {
         const name = this.identifier(...AllowedProperties);
-        let asToken: Token;
-        let typeToken: Token;
-        let type: BscType;
+        let asToken;
+        let typeExpression;
         if (this.check(TokenKind.As)) {
-            asToken = this.consumeToken(TokenKind.As);
-            typeToken = this.typeToken();
-            type = util.tokenToBscType(typeToken);
+            [asToken, typeExpression] = this.consumeAsTokenAndTypeExpression();
         }
+        return new InterfaceFieldStatement({ name: name, as: asToken, typeExpression: typeExpression, optional: optionalKeyword });
+    }
 
-        if (!type) {
-            this.diagnostics.push({
-                ...DiagnosticMessages.functionParameterTypeIsInvalid(name.text, typeToken.text),
-                range: typeToken.range
-            });
-            throw this.lastDiagnosticAsError();
+    private consumeAsTokenAndTypeExpression(ignoreDiagnostics = false): [Token, TypeExpression] {
+        let asToken = this.consumeToken(TokenKind.As);
+        let typeExpression: TypeExpression;
+        if (asToken) {
+            //if there's nothing after the `as`, add a diagnostic and continue
+            if (this.checkEndOfStatement()) {
+                if (!ignoreDiagnostics) {
+                    this.diagnostics.push({
+                        ...DiagnosticMessages.expectedIdentifier(asToken.text),
+                        location: asToken.location
+                    });
+                }
+                //consume the statement separator
+                this.consumeStatementSeparators();
+            } else if (!this.checkAny(TokenKind.Identifier, TokenKind.LeftCurlyBrace, TokenKind.LeftParen, ...DeclarableTypes, ...AllowedTypeIdentifiers)) {
+                if (!ignoreDiagnostics) {
+                    this.diagnostics.push({
+                        ...DiagnosticMessages.expectedIdentifier(asToken.text),
+                        location: asToken.location
+                    });
+                }
+            } else {
+                typeExpression = this.typeExpression();
+            }
         }
-
-        return new InterfaceFieldStatement(name, asToken, typeToken, type, optionalKeyword);
+        if (this.checkAny(TokenKind.And, TokenKind.Or)) {
+            this.warnIfNotBrighterScriptMode('custom types');
+        }
+        return [asToken, typeExpression];
     }
 
     /**
@@ -462,7 +472,7 @@ export class Parser {
                 if (params.length >= CallExpression.MaximumArguments) {
                     this.diagnostics.push({
                         ...DiagnosticMessages.tooManyCallableParameters(params.length, CallExpression.MaximumArguments),
-                        range: this.peek().range
+                        location: this.peek().location
                     });
                 }
 
@@ -470,32 +480,24 @@ export class Parser {
             } while (this.match(TokenKind.Comma));
         }
         const rightParen = this.consumeToken(TokenKind.RightParen);
-        let asToken = null as Token;
-        let returnTypeToken = null as Token;
+        // let asToken = null as Token;
+        // let returnTypeExpression: TypeExpression;
+        let asToken: Token;
+        let returnTypeExpression: TypeExpression;
         if (this.check(TokenKind.As)) {
-            asToken = this.advance();
-            returnTypeToken = this.typeToken();
-            const returnType = util.tokenToBscType(returnTypeToken);
-            if (!returnType) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.functionParameterTypeIsInvalid(name.text, returnTypeToken.text),
-                    range: returnTypeToken.range
-                });
-                throw this.lastDiagnosticAsError();
-            }
+            [asToken, returnTypeExpression] = this.consumeAsTokenAndTypeExpression();
         }
 
-        return new InterfaceMethodStatement(
-            functionType,
-            name,
-            leftParen,
-            params,
-            rightParen,
-            asToken,
-            returnTypeToken,
-            util.tokenToBscType(returnTypeToken),
-            optionalKeyword
-        );
+        return new InterfaceMethodStatement({
+            functionType: functionType,
+            name: name,
+            leftParen: leftParen,
+            params: params,
+            rightParen: rightParen,
+            as: asToken,
+            returnTypeExpression: returnTypeExpression,
+            optional: optionalKeyword
+        });
     }
 
     private interfaceDeclaration(): InterfaceStatement {
@@ -510,11 +512,18 @@ export class Parser {
         const nameToken = this.identifier(...this.allowedLocalIdentifiers);
 
         let extendsToken: Token;
-        let parentInterfaceName: NamespacedVariableNameExpression;
+        let parentInterfaceName: TypeExpression;
 
         if (this.peek().text.toLowerCase() === 'extends') {
             extendsToken = this.advance();
-            parentInterfaceName = this.getNamespacedVariableNameExpression();
+            if (this.checkEndOfStatement()) {
+                this.diagnostics.push({
+                    ...DiagnosticMessages.expectedIdentifier(extendsToken.text),
+                    location: extendsToken.location
+                });
+            } else {
+                parentInterfaceName = this.typeExpression();
+            }
         }
         this.consumeStatementSeparators();
         //gather up all interface members (Fields, Methods)
@@ -532,7 +541,6 @@ export class Parser {
                 if (this.check(TokenKind.At)) {
                     this.annotationExpression();
                 }
-
                 const optionalKeyword = this.consumeTokenIf(TokenKind.Optional);
                 //fields
                 if (this.checkAny(TokenKind.Identifier, ...AllowedProperties) && this.checkAnyNext(TokenKind.As, TokenKind.Newline, TokenKind.Comment)) {
@@ -547,9 +555,6 @@ export class Parser {
                 } else if (this.checkAny(TokenKind.Function, TokenKind.Sub) && this.checkAnyNext(TokenKind.Identifier, ...AllowedProperties)) {
                     decl = this.interfaceMethodStatement(optionalKeyword);
 
-                    //comments
-                } else if (this.check(TokenKind.Comment)) {
-                    decl = this.commentStatement();
                 }
                 if (decl) {
                     this.consumePendingAnnotations(decl);
@@ -570,37 +575,36 @@ export class Parser {
         //consume the final `end interface` token
         const endInterfaceToken = this.consumeToken(TokenKind.EndInterface);
 
-        const statement = new InterfaceStatement(
-            interfaceToken,
-            nameToken,
-            extendsToken,
-            parentInterfaceName,
-            body,
-            endInterfaceToken
-        );
-        this._references.interfaceStatements.push(statement);
+        const statement = new InterfaceStatement({
+            interface: interfaceToken,
+            name: nameToken,
+            extends: extendsToken,
+            parentInterfaceName: parentInterfaceName,
+            body: body,
+            endInterface: endInterfaceToken
+        });
         this.exitAnnotationBlock(parentAnnotations);
         return statement;
     }
 
     private enumDeclaration(): EnumStatement {
-        const result = new EnumStatement({} as any, []);
-        this.warnIfNotBrighterScriptMode('enum declarations');
-
-        const parentAnnotations = this.enterAnnotationBlock();
-
-        result.tokens.enum = this.consume(
+        const enumToken = this.consume(
             DiagnosticMessages.expectedKeyword(TokenKind.Enum),
             TokenKind.Enum
         );
+        const nameToken = this.tryIdentifier(...this.allowedLocalIdentifiers);
+
+        this.warnIfNotBrighterScriptMode('enum declarations');
 
-        result.tokens.name = this.tryIdentifier(...this.allowedLocalIdentifiers);
+        const parentAnnotations = this.enterAnnotationBlock();
 
         this.consumeStatementSeparators();
+
+        const body: Array<EnumMemberStatement> = [];
         //gather up all members
         while (this.checkAny(TokenKind.Comment, TokenKind.Identifier, TokenKind.At, ...AllowedProperties)) {
             try {
-                let decl: EnumMemberStatement | CommentStatement;
+                let decl: EnumMemberStatement;
 
                 //collect leading annotations
                 if (this.check(TokenKind.At)) {
@@ -610,15 +614,11 @@ export class Parser {
                 //members
                 if (this.checkAny(TokenKind.Identifier, ...AllowedProperties)) {
                     decl = this.enumMemberStatement();
-
-                    //comments
-                } else if (this.check(TokenKind.Comment)) {
-                    decl = this.commentStatement();
                 }
 
                 if (decl) {
                     this.consumePendingAnnotations(decl);
-                    result.body.push(decl);
+                    body.push(decl);
                 } else {
                     //we didn't find a declaration...flag tokens until next line
                     this.flagUntil(TokenKind.Newline, TokenKind.Colon, TokenKind.Eof);
@@ -637,9 +637,15 @@ export class Parser {
         }
 
         //consume the final `end interface` token
-        result.tokens.endEnum = this.consumeToken(TokenKind.EndEnum);
+        const endEnumToken = this.consumeToken(TokenKind.EndEnum);
+
+        const result = new EnumStatement({
+            enum: enumToken,
+            name: nameToken,
+            body: body,
+            endEnum: endEnumToken
+        });
 
-        this._references.enumStatements.push(result);
         this.exitAnnotationBlock(parentAnnotations);
         return result;
     }
@@ -657,15 +663,22 @@ export class Parser {
             TokenKind.Class
         );
         let extendsKeyword: Token;
-        let parentClassName: NamespacedVariableNameExpression;
+        let parentClassName: TypeExpression;
 
         //get the class name
-        let className = this.tryConsume(DiagnosticMessages.expectedIdentifierAfterKeyword('class'), TokenKind.Identifier, ...this.allowedLocalIdentifiers) as Identifier;
+        let className = this.tryConsume(DiagnosticMessages.expectedIdentifier('class'), TokenKind.Identifier, ...this.allowedLocalIdentifiers) as Identifier;
 
         //see if the class inherits from parent
         if (this.peek().text.toLowerCase() === 'extends') {
             extendsKeyword = this.advance();
-            parentClassName = this.getNamespacedVariableNameExpression();
+            if (this.checkEndOfStatement()) {
+                this.diagnostics.push({
+                    ...DiagnosticMessages.expectedIdentifier(extendsKeyword.text),
+                    location: extendsKeyword.location
+                });
+            } else {
+                parentClassName = this.typeExpression();
+            }
         }
 
         //ensure statement separator
@@ -691,31 +704,24 @@ export class Parser {
                 if (this.peek().text.toLowerCase() === 'override') {
                     overrideKeyword = this.advance();
                 }
-
                 //methods (function/sub keyword OR identifier followed by opening paren)
                 if (this.checkAny(TokenKind.Function, TokenKind.Sub) || (this.checkAny(TokenKind.Identifier, ...AllowedProperties) && this.checkNext(TokenKind.LeftParen))) {
                     const funcDeclaration = this.functionDeclaration(false, false);
 
-                    //remove this function from the lists because it's not a callable
-                    const functionStatement = this._references.functionStatements.pop();
-
                     //if we have an overrides keyword AND this method is called 'new', that's not allowed
-                    if (overrideKeyword && funcDeclaration.name.text.toLowerCase() === 'new') {
+                    if (overrideKeyword && funcDeclaration.tokens.name.text.toLowerCase() === 'new') {
                         this.diagnostics.push({
                             ...DiagnosticMessages.cannotUseOverrideKeywordOnConstructorFunction(),
-                            range: overrideKeyword.range
+                            location: overrideKeyword.location
                         });
                     }
 
-                    decl = new MethodStatement(
-                        accessModifier,
-                        funcDeclaration.name,
-                        funcDeclaration.func,
-                        overrideKeyword
-                    );
-
-                    //refer to this statement as parent of the expression
-                    functionStatement.func.functionStatement = decl as MethodStatement;
+                    decl = new MethodStatement({
+                        modifiers: accessModifier,
+                        name: funcDeclaration.tokens.name,
+                        func: funcDeclaration.func,
+                        override: overrideKeyword
+                    });
 
                     //fields
                 } else if (this.checkAny(TokenKind.Identifier, ...AllowedProperties)) {
@@ -726,13 +732,10 @@ export class Parser {
                     if (overrideKeyword) {
                         this.diagnostics.push({
                             ...DiagnosticMessages.classFieldCannotBeOverridden(),
-                            range: overrideKeyword.range
+                            location: overrideKeyword.location
                         });
                     }
 
-                    //comments
-                } else if (this.check(TokenKind.Comment)) {
-                    decl = this.commentStatement();
                 }
 
                 if (decl) {
@@ -752,20 +755,19 @@ export class Parser {
         if (endingKeyword.kind !== TokenKind.EndClass) {
             this.diagnostics.push({
                 ...DiagnosticMessages.couldNotFindMatchingEndKeyword('class'),
-                range: endingKeyword.range
+                location: endingKeyword.location
             });
         }
 
-        const result = new ClassStatement(
-            classKeyword,
-            className,
-            body,
-            endingKeyword,
-            extendsKeyword,
-            parentClassName
-        );
+        const result = new ClassStatement({
+            class: classKeyword,
+            name: className,
+            body: body,
+            endClass: endingKeyword,
+            extends: extendsKeyword,
+            parentClassName: parentClassName
+        });
 
-        this._references.classStatements.push(result);
         this.exitAnnotationBlock(parentAnnotations);
         return result;
     }
@@ -798,24 +800,16 @@ export class Parser {
         }
 
         let name = this.consume(
-            DiagnosticMessages.expectedClassFieldIdentifier(),
+            DiagnosticMessages.expectedIdentifier(),
             TokenKind.Identifier,
             ...AllowedProperties
         ) as Identifier;
+
         let asToken: Token;
-        let fieldType: Token;
+        let fieldTypeExpression: TypeExpression;
         //look for `as SOME_TYPE`
         if (this.check(TokenKind.As)) {
-            asToken = this.advance();
-            fieldType = this.typeToken();
-
-            //no field type specified
-            if (!util.tokenToBscType(fieldType)) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.expectedValidTypeToFollowAsKeyword(),
-                    range: this.peek().range
-                });
-            }
+            [asToken, fieldTypeExpression] = this.consumeAsTokenAndTypeExpression();
         }
 
         let initialValue: Expression;
@@ -826,15 +820,15 @@ export class Parser {
             initialValue = this.expression();
         }
 
-        return new FieldStatement(
-            accessModifier,
-            name,
-            asToken,
-            fieldType,
-            equal,
-            initialValue,
-            optionalKeyword
-        );
+        return new FieldStatement({
+            accessModifier: accessModifier,
+            name: name,
+            as: asToken,
+            typeExpression: fieldTypeExpression,
+            equals: equal,
+            initialValue: initialValue,
+            optional: optionalKeyword
+        });
     }
 
     /**
@@ -856,18 +850,17 @@ export class Parser {
             } else {
                 this.diagnostics.push({
                     ...DiagnosticMessages.missingCallableKeyword(),
-                    range: this.peek().range
+                    location: this.peek().location
                 });
+                //TODO we should probably eliminate this entirely, since it's not present in the source code
                 functionType = {
                     isReserved: true,
                     kind: TokenKind.Function,
                     text: 'function',
                     //zero-length location means derived
-                    range: {
-                        start: this.peek().range.start,
-                        end: this.peek().range.start
-                    },
-                    leadingWhitespace: ''
+                    location: this.peek().location,
+                    leadingWhitespace: '',
+                    leadingTrivia: []
                 };
             }
             let isSub = functionType?.kind === TokenKind.Sub;
@@ -877,17 +870,17 @@ export class Parser {
 
             if (isAnonymous) {
                 leftParen = this.consume(
-                    DiagnosticMessages.expectedLeftParenAfterCallable(functionTypeText),
+                    DiagnosticMessages.expectedToken('('),
                     TokenKind.LeftParen
                 );
             } else {
                 name = this.consume(
-                    DiagnosticMessages.expectedNameAfterCallableKeyword(functionTypeText),
+                    DiagnosticMessages.expectedIdentifier(functionTypeText),
                     TokenKind.Identifier,
                     ...AllowedProperties
                 ) as Identifier;
                 leftParen = this.consume(
-                    DiagnosticMessages.expectedLeftParenAfterCallableName(functionTypeText),
+                    DiagnosticMessages.expectedToken('('),
                     TokenKind.LeftParen
                 );
 
@@ -896,8 +889,8 @@ export class Parser {
                 if (['$', '%', '!', '#', '&'].includes(lastChar)) {
                     //don't throw this error; let the parser continue
                     this.diagnostics.push({
-                        ...DiagnosticMessages.functionNameCannotEndWithTypeDesignator(functionTypeText, name.text, lastChar),
-                        range: name.range
+                        ...DiagnosticMessages.invalidIdentifier(name.text, lastChar),
+                        location: name.location
                     });
                 }
 
@@ -905,39 +898,32 @@ export class Parser {
                 if (checkIdentifier && DisallowedFunctionIdentifiersText.has(name.text.toLowerCase())) {
                     this.diagnostics.push({
                         ...DiagnosticMessages.cannotUseReservedWordAsIdentifier(name.text),
-                        range: name.range
+                        location: name.location
                     });
                 }
             }
 
             let params = [] as FunctionParameterExpression[];
             let asToken: Token;
-            let typeToken: Token;
+            let typeExpression: TypeExpression;
             if (!this.check(TokenKind.RightParen)) {
                 do {
                     params.push(this.functionParameter());
                 } while (this.match(TokenKind.Comma));
             }
-            let rightParen = this.advance();
-
+            let rightParen = this.consume(
+                DiagnosticMessages.unmatchedLeftToken(leftParen.text, 'function parameter list'),
+                TokenKind.RightParen
+            );
             if (this.check(TokenKind.As)) {
-                asToken = this.advance();
-
-                typeToken = this.typeToken();
-
-                if (!util.tokenToBscType(typeToken, this.options.mode === ParseMode.BrighterScript)) {
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.invalidFunctionReturnType(typeToken.text ?? ''),
-                        range: typeToken.range
-                    });
-                }
+                [asToken, typeExpression] = this.consumeAsTokenAndTypeExpression();
             }
 
             params.reduce((haveFoundOptional: boolean, param: FunctionParameterExpression) => {
                 if (haveFoundOptional && !param.defaultValue) {
                     this.diagnostics.push({
-                        ...DiagnosticMessages.requiredParameterMayNotFollowOptionalParameter(param.name.text),
-                        range: param.range
+                        ...DiagnosticMessages.requiredParameterMayNotFollowOptionalParameter(param.tokens.name.text),
+                        location: param.location
                     });
                 }
 
@@ -946,63 +932,43 @@ export class Parser {
 
             this.consumeStatementSeparators(true);
 
-            let func = new FunctionExpression(
-                params,
-                undefined, //body
-                functionType,
-                undefined, //ending keyword
-                leftParen,
-                rightParen,
-                asToken,
-                typeToken
-            );
-
-            // add the function to the relevant symbol tables
-            if (!onlyCallableAsMember && name) {
-                const funcType = func.getFunctionType();
-                funcType.setName(name.text);
-            }
-
-            this._references.functionExpressions.push(func);
 
             //support ending the function with `end sub` OR `end function`
-            func.body = this.block();
+            let body = this.block();
             //if the parser was unable to produce a block, make an empty one so the AST makes some sense...
-            if (!func.body) {
-                func.body = new Block([], util.createRangeFromPositions(func.range.start, func.range.start));
-            }
-            func.body.symbolTable = new SymbolTable(`Block: Function '${name?.text ?? ''}'`, () => func.getSymbolTable());
-
-            if (!func.body) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.callableBlockMissingEndKeyword(functionTypeText),
-                    range: this.peek().range
-                });
-                throw this.lastDiagnosticAsError();
-            }
 
             // consume 'end sub' or 'end function'
-            func.end = this.advance();
+            const endFunctionType = this.advance();
             let expectedEndKind = isSub ? TokenKind.EndSub : TokenKind.EndFunction;
 
             //if `function` is ended with `end sub`, or `sub` is ended with `end function`, then
             //add an error but don't hard-fail so the AST can continue more gracefully
-            if (func.end.kind !== expectedEndKind) {
+            if (endFunctionType.kind !== expectedEndKind) {
                 this.diagnostics.push({
-                    ...DiagnosticMessages.mismatchedEndCallableKeyword(functionTypeText, func.end.text),
-                    range: func.end.range
+                    ...DiagnosticMessages.closingKeywordMismatch(functionTypeText, endFunctionType.text),
+                    location: endFunctionType.location
                 });
             }
-            func.callExpressions = this.callExpressions;
+
+            if (!body) {
+                body = new Block({ statements: [] });
+            }
+
+            let func = new FunctionExpression({
+                parameters: params,
+                body: body,
+                functionType: functionType,
+                endFunctionType: endFunctionType,
+                leftParen: leftParen,
+                rightParen: rightParen,
+                as: asToken,
+                returnTypeExpression: typeExpression
+            });
 
             if (isAnonymous) {
                 return func;
             } else {
-                let result = new FunctionStatement(name, func);
-                func.symbolTable.name += `: '${name?.text}'`;
-                func.functionStatement = result;
-                this._references.functionStatements.push(result);
-
+                let result = new FunctionStatement({ name: name, func: func });
                 return result;
             }
         } finally {
@@ -1016,7 +982,7 @@ export class Parser {
         if (!this.checkAny(TokenKind.Identifier, ...this.allowedLocalIdentifiers)) {
             this.diagnostics.push({
                 ...DiagnosticMessages.expectedParameterNameButFound(this.peek().text),
-                range: this.peek().range
+                location: this.peek().location
             });
             throw this.lastDiagnosticAsError();
         }
@@ -1029,82 +995,80 @@ export class Parser {
         if (DisallowedLocalIdentifiersText.has(name.text.toLowerCase())) {
             this.diagnostics.push({
                 ...DiagnosticMessages.cannotUseReservedWordAsIdentifier(name.text),
-                range: name.range
+                location: name.location
             });
         }
 
-        let typeToken: Token | undefined;
+        let typeExpression: TypeExpression;
         let defaultValue;
-
+        let equalToken: Token;
         // parse argument default value
-        if (this.match(TokenKind.Equal)) {
+        if ((equalToken = this.consumeTokenIf(TokenKind.Equal))) {
             // it seems any expression is allowed here -- including ones that operate on other arguments!
             defaultValue = this.expression(false);
         }
 
-        let asToken = null;
+        let asToken: Token = null;
         if (this.check(TokenKind.As)) {
-            asToken = this.advance();
-
-            typeToken = this.typeToken();
+            [asToken, typeExpression] = this.consumeAsTokenAndTypeExpression();
 
-            if (!util.tokenToBscType(typeToken, this.options.mode === ParseMode.BrighterScript)) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.functionParameterTypeIsInvalid(name.text, typeToken.text),
-                    range: typeToken.range
-                });
-            }
         }
-        return new FunctionParameterExpression(
-            name,
-            typeToken,
-            defaultValue,
-            asToken
-        );
+        return new FunctionParameterExpression({
+            name: name,
+            equals: equalToken,
+            defaultValue: defaultValue,
+            as: asToken,
+            typeExpression: typeExpression
+        });
     }
 
-    private assignment(): AssignmentStatement {
+    private assignment(allowTypedAssignment = false): AssignmentStatement {
         let name = this.advance() as Identifier;
         //add diagnostic if name is a reserved word that cannot be used as an identifier
         if (DisallowedLocalIdentifiersText.has(name.text.toLowerCase())) {
             this.diagnostics.push({
                 ...DiagnosticMessages.cannotUseReservedWordAsIdentifier(name.text),
-                range: name.range
+                location: name.location
             });
         }
-        if (this.check(TokenKind.As)) {
-            // v1 syntax allows type declaration on lhs of assignment
-            this.warnIfNotBrighterScriptMode('typed assignment');
+        let asToken: Token;
+        let typeExpression: TypeExpression;
+
+        if (allowTypedAssignment) {
+            //look for `as SOME_TYPE`
+            if (this.check(TokenKind.As)) {
+                this.warnIfNotBrighterScriptMode('typed assignment');
 
-            this.advance(); // skip 'as'
-            this.typeToken(); // skip typeToken;
+                [asToken, typeExpression] = this.consumeAsTokenAndTypeExpression();
+            }
         }
 
         let operator = this.consume(
-            DiagnosticMessages.expectedOperatorAfterIdentifier(AssignmentOperators, name.text),
-            ...AssignmentOperators
+            DiagnosticMessages.expectedOperator([TokenKind.Equal], name.text),
+            ...[TokenKind.Equal]
         );
         let value = this.expression();
 
-        let result: AssignmentStatement;
-        if (operator.kind === TokenKind.Equal) {
-            result = new AssignmentStatement(operator, name, value);
-        } else {
-            const nameExpression = new VariableExpression(name);
-            result = new AssignmentStatement(
-                { kind: TokenKind.Equal, text: '=', range: operator.range },
-                name,
-                new BinaryExpression(nameExpression, operator, value)
-            );
-            this.addExpressionsToReferences(nameExpression);
-            if (isBinaryExpression(value)) {
-                //remove the right-hand-side expression from this assignment operator, and replace with the full assignment expression
-                this._references.expressions.delete(value);
-            }
-            this._references.expressions.add(result);
-        }
+        let result = new AssignmentStatement({ equals: operator, name: name, value: value, as: asToken, typeExpression: typeExpression });
+
+        return result;
+    }
+
+    private augmentedAssignment(): AugmentedAssignmentStatement {
+        let item = this.expression();
+
+        let operator = this.consume(
+            DiagnosticMessages.expectedToken(...CompoundAssignmentOperators),
+            ...CompoundAssignmentOperators
+        );
+        let value = this.expression();
+
+        let result = new AugmentedAssignmentStatement({
+            item: item,
+            operator: operator,
+            value: value
+        });
 
-        this._references.assignmentStatements.push(result);
         return result;
     }
 
@@ -1211,8 +1175,8 @@ export class Parser {
             return this.whileStatement();
         }
 
-        if (this.check(TokenKind.ExitWhile)) {
-            return this.exitWhile();
+        if (this.checkAny(TokenKind.Exit, TokenKind.ExitWhile)) {
+            return this.exitStatement();
         }
 
         if (this.check(TokenKind.For)) {
@@ -1223,10 +1187,6 @@ export class Parser {
             return this.forEachStatement();
         }
 
-        if (this.check(TokenKind.ExitFor)) {
-            return this.exitFor();
-        }
-
         if (this.check(TokenKind.End)) {
             return this.endStatement();
         }
@@ -1263,20 +1223,20 @@ export class Parser {
             this.checkAny(TokenKind.Identifier, ...this.allowedLocalIdentifiers)
         ) {
             if (this.checkAnyNext(...AssignmentOperators)) {
+                if (this.checkAnyNext(...CompoundAssignmentOperators)) {
+                    return this.augmentedAssignment();
+                }
                 return this.assignment();
             } else if (this.checkNext(TokenKind.As)) {
-                // may be a typed assignment - this is v1 syntax
+                // may be a typed assignment
                 const backtrack = this.current;
                 let validTypeExpression = false;
+
                 try {
                     // skip the identifier, and check for valid type expression
                     this.advance();
-                    // skip the 'as'
-                    this.advance();
-                    // check if there is a valid type
-                    const typeToken = this.typeToken(true);
-                    const allowedNameKinds = [TokenKind.Identifier, ...DeclarableTypes, ...this.allowedLocalIdentifiers];
-                    validTypeExpression = allowedNameKinds.includes(typeToken.kind);
+                    const parts = this.consumeAsTokenAndTypeExpression(true);
+                    validTypeExpression = !!(parts?.[0] && parts?.[1]);
                 } catch (e) {
                     // ignore any errors
                 } finally {
@@ -1284,7 +1244,7 @@ export class Parser {
                 }
                 if (validTypeExpression) {
                     // there is a valid 'as' and type expression
-                    return this.assignment();
+                    return this.assignment(true);
                 }
             }
         }
@@ -1321,7 +1281,7 @@ export class Parser {
         if (!whileBlock || this.peek().kind !== TokenKind.EndWhile) {
             this.diagnostics.push({
                 ...DiagnosticMessages.couldNotFindMatchingEndKeyword('while'),
-                range: this.peek().range
+                location: this.peek().location
             });
             if (!whileBlock) {
                 throw this.lastDiagnosticAsError();
@@ -1330,17 +1290,51 @@ export class Parser {
             endWhile = this.advance();
         }
 
-        return new WhileStatement(
-            { while: whileKeyword, endWhile: endWhile },
-            condition,
-            whileBlock
-        );
+        return new WhileStatement({
+            while: whileKeyword,
+            endWhile: endWhile,
+            condition: condition,
+            body: whileBlock
+        });
     }
 
-    private exitWhile(): ExitWhileStatement {
-        let keyword = this.advance();
+    private exitStatement(): ExitStatement {
+        let exitToken = this.advance();
+        if (exitToken.kind === TokenKind.ExitWhile) {
+            // `exitwhile` is allowed in code, and means `exit while`
+            // use an ExitStatement that is nicer to work with by breaking the `exit` and `while` tokens apart
+
+            const exitText = exitToken.text.substring(0, 4);
+            const whileText = exitToken.text.substring(4);
+            const originalRange = exitToken.location?.range;
+            const originalStart = originalRange?.start;
+
+            const exitRange = util.createRange(
+                originalStart.line,
+                originalStart.character,
+                originalStart.line,
+                originalStart.character + 4);
+            const whileRange = util.createRange(
+                originalStart.line,
+                originalStart.character + 4,
+                originalStart.line,
+                originalStart.character + exitToken.text.length);
+
+            exitToken = createToken(TokenKind.Exit, exitText, util.createLocationFromRange(exitToken.location.uri, exitRange));
+            this.tokens[this.current - 1] = exitToken;
+            const newLoopToken = createToken(TokenKind.While, whileText, util.createLocationFromRange(exitToken.location.uri, whileRange));
+            this.tokens.splice(this.current, 0, newLoopToken);
+        }
+
+        const loopTypeToken = this.tryConsume(
+            DiagnosticMessages.expectedToken(TokenKind.While, TokenKind.For),
+            TokenKind.While, TokenKind.For
+        );
 
-        return new ExitWhileStatement({ exitWhile: keyword });
+        return new ExitStatement({
+            exit: exitToken,
+            loopType: loopTypeToken
+        });
     }
 
     private forStatement(): ForStatement {
@@ -1367,8 +1361,8 @@ export class Parser {
         let endForToken: Token;
         if (!body || !this.checkAny(TokenKind.EndFor, TokenKind.Next)) {
             this.diagnostics.push({
-                ...DiagnosticMessages.expectedEndForOrNextToTerminateForLoop(),
-                range: this.peek().range
+                ...DiagnosticMessages.expectedEndForOrNextToTerminateForLoop(forToken.text),
+                location: this.peek().location
             });
             if (!body) {
                 throw this.lastDiagnosticAsError();
@@ -1379,27 +1373,28 @@ export class Parser {
 
         // WARNING: BrightScript doesn't delete the loop initial value after a for/to loop! It just
         // stays around in scope with whatever value it was when the loop exited.
-        return new ForStatement(
-            forToken,
-            initializer,
-            toToken,
-            finalValue,
-            body,
-            endForToken,
-            stepToken,
-            incrementExpression
-        );
+        return new ForStatement({
+            for: forToken,
+            counterDeclaration: initializer,
+            to: toToken,
+            finalValue: finalValue,
+            body: body,
+            endFor: endForToken,
+            step: stepToken,
+            increment: incrementExpression
+        });
     }
 
     private forEachStatement(): ForEachStatement {
         let forEach = this.advance();
         let name = this.advance();
 
-        if (this.check(TokenKind.As)) {
-            this.warnIfNotBrighterScriptMode('typed for each item');
+        let asToken: Token;
+        let typeExpression: TypeExpression;
 
-            this.advance(); // get 'as'
-            this.typeToken(); // get type
+        if (this.check(TokenKind.As)) {
+            this.warnIfNotBrighterScriptMode('typed for each loop variable');
+            [asToken, typeExpression] = this.consumeAsTokenAndTypeExpression();
         }
 
         let maybeIn = this.peek();
@@ -1407,17 +1402,18 @@ export class Parser {
             this.advance();
         } else {
             this.diagnostics.push({
-                ...DiagnosticMessages.expectedInAfterForEach(name.text),
-                range: this.peek().range
+                ...DiagnosticMessages.expectedToken(TokenKind.In),
+                location: this.peek().location
             });
             throw this.lastDiagnosticAsError();
         }
+        maybeIn.kind = TokenKind.In;
 
         let target = this.expression();
         if (!target) {
             this.diagnostics.push({
                 ...DiagnosticMessages.expectedExpressionAfterForEachIn(),
-                range: this.peek().range
+                location: this.peek().location
             });
             throw this.lastDiagnosticAsError();
         }
@@ -1425,48 +1421,27 @@ export class Parser {
         this.consumeStatementSeparators();
 
         let body = this.block(TokenKind.EndFor, TokenKind.Next);
-        if (!body) {
+        let endForToken: Token;
+        if (!body || !this.checkAny(TokenKind.EndFor, TokenKind.Next)) {
+
             this.diagnostics.push({
-                ...DiagnosticMessages.expectedEndForOrNextToTerminateForLoop(),
-                range: this.peek().range
+                ...DiagnosticMessages.expectedEndForOrNextToTerminateForLoop(forEach.text),
+                location: this.peek().location
             });
             throw this.lastDiagnosticAsError();
         }
+        endForToken = this.advance();
 
-        let endFor = this.advance();
-
-        return new ForEachStatement(
-            {
-                forEach: forEach,
-                in: maybeIn,
-                endFor: endFor
-            },
-            name,
-            target,
-            body
-        );
-    }
-
-    private exitFor(): ExitForStatement {
-        let keyword = this.advance();
-
-        return new ExitForStatement({ exitFor: keyword });
-    }
-
-    private commentStatement() {
-        //if this comment is on the same line as the previous statement,
-        //then this comment should be treated as a single-line comment
-        let prev = this.previous();
-        if (prev?.range?.end.line === this.peek().range?.start.line) {
-            return new CommentStatement([this.advance()]);
-        } else {
-            let comments = [this.advance()];
-            while (this.check(TokenKind.Newline) && this.checkNext(TokenKind.Comment)) {
-                this.advance();
-                comments.push(this.advance());
-            }
-            return new CommentStatement(comments);
-        }
+        return new ForEachStatement({
+            forEach: forEach,
+            as: asToken,
+            typeExpression: typeExpression,
+            in: maybeIn,
+            endFor: endForToken,
+            item: name,
+            target: target,
+            body: body
+        });
     }
 
     private namespaceStatement(): NamespaceStatement | undefined {
@@ -1475,9 +1450,8 @@ export class Parser {
 
         this.namespaceAndFunctionDepth++;
 
-        let name = this.getNamespacedVariableNameExpression();
+        let name = this.identifyingExpression();
         //set the current namespace name
-        let result = new NamespaceStatement(keyword, name, null, null);
 
         this.globalTerminators.push([TokenKind.EndNamespace]);
         let body = this.body();
@@ -1490,17 +1464,21 @@ export class Parser {
             //the `end namespace` keyword is missing. add a diagnostic, but keep parsing
             this.diagnostics.push({
                 ...DiagnosticMessages.couldNotFindMatchingEndKeyword('namespace'),
-                range: keyword.range
+                location: keyword.location
             });
         }
 
         this.namespaceAndFunctionDepth--;
 
-        result.body = body;
-        result.endKeyword = endKeyword;
-        this._references.namespaceStatements.push(result);
+        let result = new NamespaceStatement({
+            namespace: keyword,
+            nameExpression: name,
+            body: body,
+            endNamespace: endKeyword
+        });
+
         //cache the range property so that plugins can't affect it
-        result.cacheRange();
+        result.cacheLocation();
         result.body.symbolTable.name += `: namespace '${result.name}'`;
         return result;
     }
@@ -1508,27 +1486,20 @@ export class Parser {
     /**
      * Get an expression with identifiers separated by periods. Useful for namespaces and class extends
      */
-    private getNamespacedVariableNameExpression(ignoreDiagnostics = false) {
-        let firstIdentifier: Identifier;
-        if (ignoreDiagnostics) {
-            if (this.checkAny(...this.allowedLocalIdentifiers)) {
-                firstIdentifier = this.advance() as Identifier;
-            } else {
-                throw new Error();
-            }
-        } else {
-            firstIdentifier = this.consume(
-                DiagnosticMessages.expectedIdentifierAfterKeyword(this.previous().text),
-                TokenKind.Identifier,
-                ...this.allowedLocalIdentifiers
-            ) as Identifier;
-        }
+    private identifyingExpression(allowedTokenKinds?: TokenKind[]): DottedGetExpression | VariableExpression {
+        allowedTokenKinds = allowedTokenKinds ?? this.allowedLocalIdentifiers;
+        let firstIdentifier = this.consume(
+            DiagnosticMessages.expectedIdentifier(this.previous().text),
+            TokenKind.Identifier,
+            ...allowedTokenKinds
+        ) as Identifier;
+
         let expr: DottedGetExpression | VariableExpression;
 
         if (firstIdentifier) {
             // force it into an identifier so the AST makes some sense
             firstIdentifier.kind = TokenKind.Identifier;
-            const varExpr = new VariableExpression(firstIdentifier);
+            const varExpr = new VariableExpression({ name: firstIdentifier });
             expr = varExpr;
 
             //consume multiple dot identifiers (i.e. `Name.Space.Can.Have.Many.Parts`)
@@ -1543,7 +1514,7 @@ export class Parser {
                 let identifier = this.tryConsume(
                     DiagnosticMessages.expectedIdentifier(),
                     TokenKind.Identifier,
-                    ...this.allowedLocalIdentifiers,
+                    ...allowedTokenKinds,
                     ...AllowedProperties
                 ) as Identifier;
 
@@ -1552,12 +1523,11 @@ export class Parser {
                 }
                 // force it into an identifier so the AST makes some sense
                 identifier.kind = TokenKind.Identifier;
-                expr = new DottedGetExpression(expr, identifier, dot);
+                expr = new DottedGetExpression({ obj: expr, name: identifier, dot: dot });
             }
         }
-        return new NamespacedVariableNameExpression(expr);
+        return expr;
     }
-
     /**
      * Add an 'unexpected token' diagnostic for any token found between current and the first stopToken found.
      */
@@ -1566,7 +1536,7 @@ export class Parser {
             let token = this.advance();
             this.diagnostics.push({
                 ...DiagnosticMessages.unexpectedToken(token.text),
-                range: token.range
+                location: token.location
             });
         }
     }
@@ -1594,9 +1564,9 @@ export class Parser {
         const statement = new ConstStatement({
             const: constToken,
             name: nameToken,
-            equals: equalToken
-        }, expression);
-        this._references.constStatements.push(statement);
+            equals: equalToken,
+            value: expression
+        });
         return statement;
     }
 
@@ -1610,79 +1580,79 @@ export class Parser {
             )
         });
 
-        this._references.libraryStatements.push(libStatement);
         return libStatement;
     }
 
     private importStatement() {
         this.warnIfNotBrighterScriptMode('import statements');
-        let importStatement = new ImportStatement(
-            this.advance(),
+        let importStatement = new ImportStatement({
+            import: this.advance(),
             //grab the next token only if it's a string
-            this.tryConsume(
+            path: this.tryConsume(
                 DiagnosticMessages.expectedStringLiteralAfterKeyword('import'),
                 TokenKind.StringLiteral
             )
-        );
+        });
 
-        this._references.importStatements.push(importStatement);
         return importStatement;
     }
 
     private typecastStatement() {
         this.warnIfNotBrighterScriptMode('typecast statements');
         const typecastToken = this.advance();
-        const obj = this.identifier(...this.allowedLocalIdentifiers);
-        const asToken = this.advance();
-        const typeToken = this.typeToken();
-        return new TypecastStatement({
-            typecast: typecastToken,
-            obj: obj,
-            as: asToken,
-            type: typeToken
+        const typecastExpr = this.expression();
+        if (isTypecastExpression(typecastExpr)) {
+            return new TypecastStatement({
+                typecast: typecastToken,
+                typecastExpression: typecastExpr
+            });
+        }
+        this.diagnostics.push({
+            ...DiagnosticMessages.expectedIdentifier('typecast'),
+            location: {
+                uri: typecastToken.location.uri,
+                range: util.createBoundingRange(typecastToken, this.peek())
+            }
         });
+        throw this.lastDiagnosticAsError();
     }
 
-    private aliasStatement() {
+    private aliasStatement(): AliasStatement | undefined {
         this.warnIfNotBrighterScriptMode('alias statements');
         const aliasToken = this.advance();
-        const name = this.identifier(...this.allowedLocalIdentifiers);
-        const equals = this.consumeToken(TokenKind.Equal);
-        const value = this.identifier(...this.allowedLocalIdentifiers);
-        return new AliasStatement({
+        const name = this.tryConsume(
+            DiagnosticMessages.expectedIdentifier('alias'),
+            TokenKind.Identifier
+        );
+        const equals = this.tryConsume(
+            DiagnosticMessages.expectedToken(TokenKind.Equal),
+            TokenKind.Equal
+        );
+        let value = this.identifyingExpression();
+
+        let aliasStmt = new AliasStatement({
             alias: aliasToken,
             name: name,
             equals: equals,
             value: value
-        });
-    }
 
-    private annotationExpression() {
-        const atToken = this.advance();
-        const identifier = this.tryConsume(DiagnosticMessages.expectedIdentifier(), TokenKind.Identifier, ...AllowedProperties);
-        if (identifier) {
-            identifier.kind = TokenKind.Identifier;
-        }
-        let annotation = new AnnotationExpression(atToken, identifier);
-        this.pendingAnnotations.push(annotation);
+        });
 
-        //optional arguments
-        if (this.check(TokenKind.LeftParen)) {
-            let leftParen = this.advance();
-            annotation.call = this.finishCall(leftParen, annotation, false);
-        }
-        return annotation;
+        return aliasStmt;
     }
 
     private typeStatement(): TypeStatement | undefined {
         this.warnIfNotBrighterScriptMode('type statements');
         const typeToken = this.advance();
-        const name = this.identifier(...this.allowedLocalIdentifiers);
+        const name = this.tryConsume(
+            DiagnosticMessages.expectedIdentifier('type'),
+            TokenKind.Identifier
+        );
         const equals = this.tryConsume(
             DiagnosticMessages.expectedToken(TokenKind.Equal),
             TokenKind.Equal
         );
-        let value = this.typeToken();
+        let value = this.typeExpression();
 
         let typeStmt = new TypeStatement({
             type: typeToken,
@@ -1691,10 +1661,27 @@ export class Parser {
             value: value
 
         });
-        this._references.typeStatements.push(typeStmt);
+
         return typeStmt;
     }
 
+    private annotationExpression() {
+        const atToken = this.advance();
+        const identifier = this.tryConsume(DiagnosticMessages.expectedIdentifier(), TokenKind.Identifier, ...AllowedProperties);
+        if (identifier) {
+            identifier.kind = TokenKind.Identifier;
+        }
+        let annotation = new AnnotationExpression({ at: atToken, name: identifier });
+        this.pendingAnnotations.push(annotation);
+
+        //optional arguments
+        if (this.check(TokenKind.LeftParen)) {
+            let leftParen = this.advance();
+            annotation.call = this.finishCall(leftParen, annotation, false);
+        }
+        return annotation;
+    }
+
     private ternaryExpression(test?: Expression): TernaryExpression {
         this.warnIfNotBrighterScriptMode('ternary operator');
         if (!test) {
@@ -1728,14 +1715,24 @@ export class Parser {
             alternate = this.expression();
         } catch { }
 
-        return new TernaryExpression(test, questionMarkToken, consequent, colonToken, alternate);
+        return new TernaryExpression({
+            test: test,
+            questionMark: questionMarkToken,
+            consequent: consequent,
+            colon: colonToken,
+            alternate: alternate
+        });
     }
 
     private nullCoalescingExpression(test: Expression): NullCoalescingExpression {
         this.warnIfNotBrighterScriptMode('null coalescing operator');
         const questionQuestionToken = this.advance();
         const alternate = this.expression();
-        return new NullCoalescingExpression(test, questionQuestionToken, alternate);
+        return new NullCoalescingExpression({
+            consequent: test,
+            questionQuestion: questionQuestionToken,
+            alternate: alternate
+        });
     }
 
     private regexLiteralExpression() {
@@ -1766,18 +1763,18 @@ export class Parser {
             if (next.kind === TokenKind.TemplateStringQuasi) {
                 //a quasi can actually be made up of multiple quasis when it includes char literals
                 currentQuasiExpressionParts.push(
-                    new LiteralExpression(next)
+                    new LiteralExpression({ value: next })
                 );
                 this.advance();
             } else if (next.kind === TokenKind.EscapedCharCodeLiteral) {
                 currentQuasiExpressionParts.push(
-                    new EscapedCharCodeLiteralExpression(<any>next)
+                    new EscapedCharCodeLiteralExpression({ value: next as Token & { charCode: number } })
                 );
                 this.advance();
             } else {
                 //finish up the current quasi
                 quasis.push(
-                    new TemplateStringQuasiExpression(currentQuasiExpressionParts)
+                    new TemplateStringQuasiExpression({ expressions: currentQuasiExpressionParts })
                 );
                 currentQuasiExpressionParts = [];
 
@@ -1792,7 +1789,10 @@ export class Parser {
                 } else {
                     this.diagnostics.push({
                         ...DiagnosticMessages.unterminatedTemplateExpression(),
-                        range: util.getRange(openingBacktick, this.peek())
+                        location: {
+                            uri: openingBacktick.location.uri,
+                            range: util.createBoundingRange(openingBacktick, this.peek())
+                        }
                     });
                     throw this.lastDiagnosticAsError();
                 }
@@ -1801,73 +1801,92 @@ export class Parser {
 
         //store the final set of quasis
         quasis.push(
-            new TemplateStringQuasiExpression(currentQuasiExpressionParts)
+            new TemplateStringQuasiExpression({ expressions: currentQuasiExpressionParts })
         );
 
         if (this.isAtEnd()) {
             //error - missing backtick
             this.diagnostics.push({
-                ...DiagnosticMessages.unterminatedTemplateStringAtEndOfFile(),
-                range: util.getRange(openingBacktick, this.peek())
+                ...DiagnosticMessages.unterminatedTemplateString(),
+                location: {
+                    uri: openingBacktick.location.uri,
+                    range: util.createBoundingRange(openingBacktick, this.peek())
+                }
             });
             throw this.lastDiagnosticAsError();
 
         } else {
             let closingBacktick = this.advance();
             if (isTagged) {
-                return new TaggedTemplateStringExpression(tagName, openingBacktick, quasis, expressions, closingBacktick);
+                return new TaggedTemplateStringExpression({
+                    tagName: tagName,
+                    openingBacktick: openingBacktick,
+                    quasis: quasis,
+                    expressions: expressions,
+                    closingBacktick: closingBacktick
+                });
             } else {
-                return new TemplateStringExpression(openingBacktick, quasis, expressions, closingBacktick);
+                return new TemplateStringExpression({
+                    openingBacktick: openingBacktick,
+                    quasis: quasis,
+                    expressions: expressions,
+                    closingBacktick: closingBacktick
+                });
             }
         }
     }
 
     private tryCatchStatement(): TryCatchStatement {
         const tryToken = this.advance();
-        const statement = new TryCatchStatement(
-            { try: tryToken }
-        );
-
+        let endTryToken: Token;
+        let catchStmt: CatchStatement;
         //ensure statement separator
         this.consumeStatementSeparators();
 
-        statement.tryBranch = this.block(TokenKind.Catch, TokenKind.EndTry);
+        let tryBranch = this.block(TokenKind.Catch, TokenKind.EndTry);
 
         const peek = this.peek();
         if (peek.kind !== TokenKind.Catch) {
             this.diagnostics.push({
                 ...DiagnosticMessages.expectedCatchBlockInTryCatch(),
-                range: this.peek().range
+                location: this.peek()?.location
             });
-            //gracefully handle end-try
-            if (peek.kind === TokenKind.EndTry) {
-                statement.tokens.endTry = this.advance();
+        } else {
+            const catchToken = this.advance();
+
+            //get the exception variable as an expression
+            let exceptionVariableExpression: Expression;
+            //if we consumed any statement separators, that means we don't have an exception variable
+            if (this.consumeStatementSeparators(true)) {
+                //no exception variable. That's fine in BrighterScript but not in brightscript. But that'll get caught by the validator later...
+            } else {
+                exceptionVariableExpression = this.expression(true);
+                this.consumeStatementSeparators();
             }
-            return statement;
-        }
-        const catchStmt = new CatchStatement({ catch: this.advance() });
-        statement.catchStatement = catchStmt;
 
-        const exceptionVarToken = this.tryConsume(DiagnosticMessages.missingExceptionVarToFollowCatch(), TokenKind.Identifier, ...this.allowedLocalIdentifiers);
-        if (exceptionVarToken) {
-            // force it into an identifier so the AST makes some sense
-            exceptionVarToken.kind = TokenKind.Identifier;
-            catchStmt.exceptionVariable = exceptionVarToken as Identifier;
+            const catchBranch = this.block(TokenKind.EndTry);
+            catchStmt = new CatchStatement({
+                catch: catchToken,
+                exceptionVariableExpression: exceptionVariableExpression,
+                catchBranch: catchBranch
+            });
         }
-
-        //ensure statement sepatator
-        this.consumeStatementSeparators();
-
-        catchStmt.catchBranch = this.block(TokenKind.EndTry);
-
         if (this.peek().kind !== TokenKind.EndTry) {
             this.diagnostics.push({
-                ...DiagnosticMessages.expectedEndTryToTerminateTryCatch(),
-                range: this.peek().range
+                ...DiagnosticMessages.expectedTerminator('end try', 'try-catch'),
+                location: this.peek().location
             });
         } else {
-            statement.tokens.endTry = this.advance();
+            endTryToken = this.advance();
+        }
+
+        const statement = new TryCatchStatement({
+            try: tryToken,
+            tryBranch: tryBranch,
+            catchStatement: catchStmt,
+            endTry: endTryToken
         }
+        );
         return statement;
     }
 
@@ -1877,24 +1896,24 @@ export class Parser {
         if (this.checkAny(TokenKind.Newline, TokenKind.Colon)) {
             this.diagnostics.push({
                 ...DiagnosticMessages.missingExceptionExpressionAfterThrowKeyword(),
-                range: throwToken.range
+                location: throwToken.location
             });
         } else {
             expression = this.expression();
         }
-        return new ThrowStatement(throwToken, expression);
+        return new ThrowStatement({ throw: throwToken, expression: expression });
     }
 
     private dimStatement() {
         const dim = this.advance();
 
-        let identifier = this.tryConsume(DiagnosticMessages.expectedIdentifierAfterKeyword('dim'), TokenKind.Identifier, ...this.allowedLocalIdentifiers) as Identifier;
+        let identifier = this.tryConsume(DiagnosticMessages.expectedIdentifier('dim'), TokenKind.Identifier, ...this.allowedLocalIdentifiers) as Identifier;
         // force to an identifier so the AST makes some sense
         if (identifier) {
             identifier.kind = TokenKind.Identifier;
         }
 
-        let leftSquareBracket = this.tryConsume(DiagnosticMessages.missingLeftSquareBracketAfterDimIdentifier(), TokenKind.LeftSquareBracket);
+        let leftSquareBracket = this.tryConsume(DiagnosticMessages.expectedToken('['), TokenKind.LeftSquareBracket);
 
         let expressions: Expression[] = [];
         let expression: Expression;
@@ -1915,29 +1934,36 @@ export class Parser {
         if (expressions.length === 0) {
             this.diagnostics.push({
                 ...DiagnosticMessages.missingExpressionsInDimStatement(),
-                range: this.peek().range
+                location: this.peek().location
             });
         }
-        let rightSquareBracket = this.tryConsume(DiagnosticMessages.missingRightSquareBracketAfterDimIdentifier(), TokenKind.RightSquareBracket);
-        return new DimStatement(dim, identifier, leftSquareBracket, expressions, rightSquareBracket);
+        let rightSquareBracket = this.tryConsume(DiagnosticMessages.unmatchedLeftToken('[', 'dim identifier'), TokenKind.RightSquareBracket);
+        return new DimStatement({
+            dim: dim,
+            name: identifier,
+            openingSquare: leftSquareBracket,
+            dimensions: expressions,
+            closingSquare: rightSquareBracket
+        });
     }
 
-    private ifStatement(): IfStatement {
+    private nestedInlineConditionalCount = 0;
+
+    private ifStatement(incrementNestedCount = true): IfStatement {
         // colon before `if` is usually not allowed, unless it's after `then`
         if (this.current > 0) {
             const prev = this.previous();
             if (prev.kind === TokenKind.Colon) {
-                if (this.current > 1 && this.tokens[this.current - 2].kind !== TokenKind.Then) {
+                if (this.current > 1 && this.tokens[this.current - 2].kind !== TokenKind.Then && this.nestedInlineConditionalCount === 0) {
                     this.diagnostics.push({
                         ...DiagnosticMessages.unexpectedColonBeforeIfStatement(),
-                        range: prev.range
+                        location: prev.location
                     });
                 }
             }
         }
 
         const ifToken = this.advance();
-        const startingRange = ifToken.range;
 
         const condition = this.expression();
         let thenBranch: Block;
@@ -1957,13 +1983,16 @@ export class Parser {
 
         if (isInlineIfThen) {
             /*** PARSE INLINE IF STATEMENT ***/
+            if (!incrementNestedCount) {
+                this.nestedInlineConditionalCount++;
+            }
 
             thenBranch = this.inlineConditionalBranch(TokenKind.Else, TokenKind.EndIf);
 
             if (!thenBranch) {
                 this.diagnostics.push({
-                    ...DiagnosticMessages.expectedStatementToFollowConditionalCondition(ifToken.text),
-                    range: this.peek().range
+                    ...DiagnosticMessages.expectedStatement(ifToken.text, 'statement'),
+                    location: this.peek().location
                 });
                 throw this.lastDiagnosticAsError();
             } else {
@@ -1976,13 +2005,13 @@ export class Parser {
 
                 if (this.check(TokenKind.If)) {
                     // recurse-read `else if`
-                    elseBranch = this.ifStatement();
+                    elseBranch = this.ifStatement(false);
 
                     //no multi-line if chained with an inline if
                     if (!elseBranch.isInline) {
                         this.diagnostics.push({
                             ...DiagnosticMessages.expectedInlineIfStatement(),
-                            range: elseBranch.range
+                            location: elseBranch.location
                         });
                     }
 
@@ -1990,7 +2019,7 @@ export class Parser {
                     //expecting inline else branch
                     this.diagnostics.push({
                         ...DiagnosticMessages.expectedInlineIfStatement(),
-                        range: this.peek().range
+                        location: this.peek().location
                     });
                     throw this.lastDiagnosticAsError();
                 } else {
@@ -2004,8 +2033,8 @@ export class Parser {
                 if (!elseBranch) {
                     //missing `else` branch
                     this.diagnostics.push({
-                        ...DiagnosticMessages.expectedStatementToFollowElse(),
-                        range: this.peek().range
+                        ...DiagnosticMessages.expectedStatement('else', 'statement'),
+                        location: this.peek().location
                     });
                     throw this.lastDiagnosticAsError();
                 }
@@ -2014,7 +2043,7 @@ export class Parser {
             if (!elseBranch || !isIfStatement(elseBranch)) {
                 //enforce newline at the end of the inline if statement
                 const peek = this.peek();
-                if (peek.kind !== TokenKind.Newline && peek.kind !== TokenKind.Comment && !this.isAtEnd()) {
+                if (peek.kind !== TokenKind.Newline && peek.kind !== TokenKind.Comment && peek.kind !== TokenKind.Else && !this.isAtEnd()) {
                     //ignore last error if it was about a colon
                     if (this.previous().kind === TokenKind.Colon) {
                         this.diagnostics.pop();
@@ -2023,11 +2052,11 @@ export class Parser {
                     //newline is required
                     this.diagnostics.push({
                         ...DiagnosticMessages.expectedFinalNewline(),
-                        range: this.peek().range
+                        location: this.peek().location
                     });
                 }
             }
-
+            this.nestedInlineConditionalCount--;
         } else {
             /*** PARSE MULTI-LINE IF STATEMENT ***/
 
@@ -2059,25 +2088,22 @@ export class Parser {
                 } else {
                     //missing endif
                     this.diagnostics.push({
-                        ...DiagnosticMessages.expectedEndIfToCloseIfStatement(startingRange.start),
-                        range: ifToken.range
+                        ...DiagnosticMessages.expectedTerminator('end if', 'if'),
+                        location: ifToken.location
                     });
                 }
             }
         }
 
-        return new IfStatement(
-            {
-                if: ifToken,
-                then: thenToken,
-                endIf: endIfToken,
-                else: elseToken
-            },
-            condition,
-            thenBranch,
-            elseBranch,
-            isInlineIfThen
-        );
+        return new IfStatement({
+            if: ifToken,
+            then: thenToken,
+            endIf: endIfToken,
+            else: elseToken,
+            condition: condition,
+            thenBranch: thenBranch,
+            elseBranch: elseBranch
+        });
     }
 
     //consume a `then` or `else` branch block of an `if` statement
@@ -2098,21 +2124,276 @@ export class Parser {
 
             //this whole if statement is bogus...add error to the if token and hard-fail
             this.diagnostics.push({
-                ...DiagnosticMessages.expectedEndIfElseIfOrElseToTerminateThenBlock(),
-                range: ifToken.range
+                ...DiagnosticMessages.expectedTerminator(['end if', 'else if', 'else'], 'then', 'block'),
+                location: ifToken.location
             });
             throw this.lastDiagnosticAsError();
         }
         return branch;
     }
 
+    private conditionalCompileStatement(): ConditionalCompileStatement {
+        const hashIfToken = this.advance();
+        let notToken: Token | undefined;
+
+        if (this.check(TokenKind.Not)) {
+            notToken = this.advance();
+        }
+
+        if (!this.checkAny(TokenKind.True, TokenKind.False, TokenKind.Identifier)) {
+            this.diagnostics.push({
+                ...DiagnosticMessages.invalidHashIfValue(),
+                location: this.peek()?.location
+            });
+        }
+
+
+        const condition = this.advance();
+
+        let thenBranch: Block;
+        let elseBranch: ConditionalCompileStatement | Block | undefined;
+
+        let hashEndIfToken: Token | undefined;
+        let hashElseToken: Token | undefined;
+
+        //keep track of the current error count
+        //if this is `#if false` remove all diagnostics.
+        let diagnosticsLengthBeforeBlock = this.diagnostics.length;
+
+        thenBranch = this.blockConditionalCompileBranch(hashIfToken);
+        const conditionTextLower = condition.text.toLowerCase();
+        if (!this.options.bsConsts?.get(conditionTextLower) || conditionTextLower === 'false') {
+            //throw out any new diagnostics created as a result of a false block
+            this.diagnostics.splice(diagnosticsLengthBeforeBlock, this.diagnostics.length - diagnosticsLengthBeforeBlock);
+        }
+
+        this.ensureNewLine();
+        this.advance();
+
+        //else branch
+        if (this.check(TokenKind.HashElseIf)) {
+            // recurse-read `#else if`
+            elseBranch = this.conditionalCompileStatement();
+            this.ensureNewLine();
+
+        } else if (this.check(TokenKind.HashElse)) {
+            hashElseToken = this.advance();
+            let diagnosticsLengthBeforeBlock = this.diagnostics.length;
+            elseBranch = this.blockConditionalCompileBranch(hashIfToken);
+
+            if (condition.text.toLowerCase() === 'true') {
+                //throw out any new diagnostics created as a result of a false block
+                this.diagnostics.splice(diagnosticsLengthBeforeBlock, this.diagnostics.length - diagnosticsLengthBeforeBlock);
+            }
+            this.ensureNewLine();
+            this.advance();
+        }
+
+        if (!isConditionalCompileStatement(elseBranch)) {
+
+            if (this.check(TokenKind.HashEndIf)) {
+                hashEndIfToken = this.advance();
+
+            } else {
+                //missing #endif
+                this.diagnostics.push({
+                    ...DiagnosticMessages.expectedTerminator('#end if', '#if'),
+                    location: hashIfToken.location
+                });
+            }
+        }
+
+        return new ConditionalCompileStatement({
+            hashIf: hashIfToken,
+            hashElse: hashElseToken,
+            hashEndIf: hashEndIfToken,
+            not: notToken,
+            condition: condition,
+            thenBranch: thenBranch,
+            elseBranch: elseBranch
+        });
+    }
+
+    //consume a conditional compile branch block of an `#if` statement
+    private blockConditionalCompileBranch(hashIfToken: Token) {
+        //keep track of the current error count, because if the then branch fails,
+        //we will trash them in favor of a single error on if
+        let diagnosticsLengthBeforeBlock = this.diagnostics.length;
+
+        //parsing until trailing "#end if", "#else", "#else if"
+        let branch = this.conditionalCompileBlock();
+
+        if (!branch) {
+            //throw out any new diagnostics created as a result of a `then` block parse failure.
+            //the block() function will discard the current line, so any discarded diagnostics will
+            //resurface if they are legitimate, and not a result of a malformed if statement
+            this.diagnostics.splice(diagnosticsLengthBeforeBlock, this.diagnostics.length - diagnosticsLengthBeforeBlock);
+
+            //this whole if statement is bogus...add error to the if token and hard-fail
+            this.diagnostics.push({
+                ...DiagnosticMessages.expectedTerminator(['#end if', '#else if', '#else'], 'conditional compilation', 'block'),
+                location: hashIfToken.location
+            });
+            throw this.lastDiagnosticAsError();
+        }
+        return branch;
+    }
+
+    /**
+     * Parses a block, looking for a specific terminating TokenKind to denote completion.
+     * Always looks for `#end if` or `#else`
+     */
+    private conditionalCompileBlock(): Block | undefined {
+        const parentAnnotations = this.enterAnnotationBlock();
+
+        this.consumeStatementSeparators(true);
+        const unsafeTerminators = BlockTerminators;
+        const conditionalEndTokens = [TokenKind.HashElse, TokenKind.HashElseIf, TokenKind.HashEndIf];
+        const terminators = [...conditionalEndTokens, ...unsafeTerminators];
+        this.globalTerminators.push(conditionalEndTokens);
+        const statements: Statement[] = [];
+        while (!this.isAtEnd() && !this.checkAny(...terminators)) {
+            //grab the location of the current token
+            let loopCurrent = this.current;
+            let dec = this.declaration();
+            if (dec) {
+                if (!isAnnotationExpression(dec)) {
+                    this.consumePendingAnnotations(dec);
+                    statements.push(dec);
+                }
+
+                const peekKind = this.peek().kind;
+                if (conditionalEndTokens.includes(peekKind)) {
+                    // current conditional compile branch was closed by other statement, rewind to preceding newline
+                    this.current--;
+                }
+                //ensure statement separator
+                this.consumeStatementSeparators();
+
+            } else {
+                //something went wrong. reset to the top of the loop
+                this.current = loopCurrent;
+
+                //scrap the entire line (hopefully whatever failed has added a diagnostic)
+                this.consumeUntil(TokenKind.Newline, TokenKind.Colon, TokenKind.Eof);
+
+                //trash the next token. this prevents an infinite loop. not exactly sure why we need this,
+                //but there's already an error in the file being parsed, so just leave this line here
+                this.advance();
+
+                //consume potential separators
+                this.consumeStatementSeparators(true);
+            }
+        }
+        this.globalTerminators.pop();
+
+
+        if (this.isAtEnd()) {
+            return undefined;
+            // TODO: Figure out how to handle unterminated blocks well
+        } else {
+            //did we  hit an unsafe terminator?
+            //if so, we need to restore the statement separator
+            let prev = this.previous();
+            let prevKind = prev.kind;
+            let peek = this.peek();
+            let peekKind = this.peek().kind;
+            if (
+                (peekKind === TokenKind.HashEndIf || peekKind === TokenKind.HashElse || peekKind === TokenKind.HashElseIf) &&
+                (prevKind === TokenKind.Newline)
+            ) {
+                this.current--;
+            } else if (unsafeTerminators.includes(peekKind) &&
+                (prevKind === TokenKind.Newline || prevKind === TokenKind.Colon)
+            ) {
+                this.diagnostics.push({
+                    ...DiagnosticMessages.unsafeUnmatchedTerminatorInConditionalCompileBlock(peek.text),
+                    location: peek.location
+                });
+                throw this.lastDiagnosticAsError();
+            } else {
+                return undefined;
+            }
+        }
+        this.exitAnnotationBlock(parentAnnotations);
+        return new Block({ statements: statements });
+    }
+
+    private conditionalCompileConstStatement() {
+        const hashConstToken = this.advance();
+
+        const constName = this.peek();
+        //disallow using keywords for const names
+        if (ReservedWords.has(constName?.text.toLowerCase())) {
+            this.diagnostics.push({
+                ...DiagnosticMessages.cannotUseReservedWordAsIdentifier(constName?.text),
+                location: constName?.location
+            });
+
+            this.lastDiagnosticAsError();
+            return;
+        }
+        const assignment = this.assignment();
+        if (assignment) {
+            // check for something other than #const <name> = <otherName|true|false>
+            if (assignment.tokens.as || assignment.typeExpression) {
+                this.diagnostics.push({
+                    ...DiagnosticMessages.unexpectedToken(assignment.tokens.as?.text || assignment.typeExpression?.getName(ParseMode.BrighterScript)),
+                    location: assignment.tokens.as?.location ?? assignment.typeExpression?.location
+                });
+                this.lastDiagnosticAsError();
+            }
+
+            if (isVariableExpression(assignment.value) || isLiteralBoolean(assignment.value)) {
+                //value is an identifier or a boolean
+                //check for valid identifiers will happen in program validation
+            } else {
+                this.diagnostics.push({
+                    ...DiagnosticMessages.invalidHashConstValue(),
+                    location: assignment.value.location
+                });
+                this.lastDiagnosticAsError();
+            }
+        } else {
+            return undefined;
+        }
+
+        if (!this.check(TokenKind.Newline)) {
+            this.diagnostics.push({
+                ...DiagnosticMessages.unexpectedToken(this.peek().text),
+                location: this.peek().location
+            });
+            throw this.lastDiagnosticAsError();
+        }
+
+        return new ConditionalCompileConstStatement({ hashConst: hashConstToken, assignment: assignment });
+    }
+
+    private conditionalCompileErrorStatement() {
+        const hashErrorToken = this.advance();
+        const tokensUntilEndOfLine = this.consumeUntil(TokenKind.Newline);
+        const message = createToken(TokenKind.HashErrorMessage, tokensUntilEndOfLine.map(t => t.text).join(' '));
+        return new ConditionalCompileErrorStatement({ hashError: hashErrorToken, message: message });
+    }
+
+    private ensureNewLine() {
+        //ensure newline before next keyword
+        if (!this.check(TokenKind.Newline)) {
+            this.diagnostics.push({
+                ...DiagnosticMessages.unexpectedToken(this.peek().text),
+                location: this.peek().location
+            });
+            throw this.lastDiagnosticAsError();
+        }
+    }
+
     private ensureNewLineOrColon(silent = false) {
         const prev = this.previous().kind;
         if (prev !== TokenKind.Newline && prev !== TokenKind.Colon) {
             if (!silent) {
                 this.diagnostics.push({
                     ...DiagnosticMessages.expectedNewlineOrColon(),
-                    range: this.peek().range
+                    location: this.peek().location
                 });
             }
             return false;
@@ -2126,7 +2407,7 @@ export class Parser {
             if (isIfStatement(stat) && !stat.isInline) {
                 this.diagnostics.push({
                     ...DiagnosticMessages.expectedInlineIfStatement(),
-                    range: stat.range
+                    location: stat.location
                 });
             }
         }
@@ -2142,7 +2423,6 @@ export class Parser {
             return undefined;
         }
         statements.push(statement);
-        const startingRange = statement.range;
 
         //look for colon statement separator
         let foundColon = false;
@@ -2164,11 +2444,11 @@ export class Parser {
                 const colon = this.previous();
                 this.diagnostics.push({
                     ...DiagnosticMessages.unexpectedToken(colon.text),
-                    range: colon.range
+                    location: colon.location
                 });
             }
         }
-        return new Block(statements, startingRange);
+        return new Block({ statements: statements });
     }
 
     private expressionStatement(expr: Expression): ExpressionStatement | IncrementStatement {
@@ -2179,25 +2459,28 @@ export class Parser {
 
             if (this.checkAny(TokenKind.PlusPlus, TokenKind.MinusMinus)) {
                 this.diagnostics.push({
-                    ...DiagnosticMessages.consecutiveIncrementDecrementOperatorsAreNotAllowed(),
-                    range: this.peek().range
+                    ...DiagnosticMessages.unexpectedOperator(),
+                    location: this.peek().location
                 });
                 throw this.lastDiagnosticAsError();
             } else if (isCallExpression(expr)) {
                 this.diagnostics.push({
-                    ...DiagnosticMessages.incrementDecrementOperatorsAreNotAllowedAsResultOfFunctionCall(),
-                    range: expressionStart.range
+                    ...DiagnosticMessages.unexpectedOperator(),
+                    location: expressionStart.location
                 });
                 throw this.lastDiagnosticAsError();
             }
 
-            const result = new IncrementStatement(expr, operator);
-            this._references.expressions.add(result);
+            const result = new IncrementStatement({ value: expr, operator: operator });
             return result;
         }
 
         if (isCallExpression(expr) || isCallfuncExpression(expr)) {
-            return new ExpressionStatement(expr);
+            return new ExpressionStatement({ expression: expr });
+        }
+
+        if (this.checkAny(...BinaryExpressionOperatorTokens)) {
+            expr = new BinaryExpression({ left: expr, operator: this.advance(), right: this.expression() });
         }
 
 
@@ -2205,40 +2488,39 @@ export class Parser {
         if (isDottedGetExpression(expr)) {
             this.diagnostics.push({
                 ...DiagnosticMessages.propAccessNotPermittedAfterFunctionCallInExpressionStatement('Property'),
-                range: util.createBoundingRange(expr.dot, expr.name)
+                location: util.createBoundingLocation(expr.tokens.dot, expr.tokens.name)
             });
             //we can recover gracefully here even though it's invalid syntax
-            return new ExpressionStatement(expr);
+            return new ExpressionStatement({ expression: expr });
 
             //you're not allowed to do indexedGet expressions after a function call
         } else if (isIndexedGetExpression(expr)) {
             this.diagnostics.push({
                 ...DiagnosticMessages.propAccessNotPermittedAfterFunctionCallInExpressionStatement('Index'),
-                range: util.createBoundingRange(expr.openingSquare, expr.index, expr.closingSquare)
+                location: util.createBoundingLocation(expr.tokens.openingSquare, ...expr.indexes, expr.tokens.closingSquare)
             });
             //we can recover gracefully here even though it's invalid syntax
-            return new ExpressionStatement(expr);
+            return new ExpressionStatement({ expression: expr });
             //you're not allowed to do XmlAttrGet after a function call
         } else if (isXmlAttributeGetExpression(expr)) {
             this.diagnostics.push({
                 ...DiagnosticMessages.propAccessNotPermittedAfterFunctionCallInExpressionStatement('XML attribute'),
-                range: util.createBoundingRange(expr.at, expr.name)
+                location: util.createBoundingLocation(expr.tokens.at, expr.tokens.name)
             });
             //we can recover gracefully here even though it's invalid syntax
-            return new ExpressionStatement(expr);
+            return new ExpressionStatement({ expression: expr });
         }
 
 
         //at this point, it's probably an error. However, we recover a little more gracefully by creating an assignment
         this.diagnostics.push({
-            ...DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression(),
-            range: expressionStart.range
+            ...DiagnosticMessages.expectedStatement(),
+            location: expressionStart.location
         });
-
-        throw this.lastDiagnosticAsError();
+        return new ExpressionStatement({ expression: expr });
     }
 
-    private setStatement(): DottedSetStatement | IndexedSetStatement | ExpressionStatement | IncrementStatement | AssignmentStatement {
+    private setStatement(): DottedSetStatement | IndexedSetStatement | ExpressionStatement | IncrementStatement | AssignmentStatement | AugmentedAssignmentStatement {
         /**
          * Attempts to find an expression-statement or an increment statement.
          * While calls are valid expressions _and_ statements, increment (e.g. `foo++`)
@@ -2246,39 +2528,39 @@ export class Parser {
          * priority as standalone function calls though, so we can parse them in the same way.
          */
         let expr = this.call();
-        if (this.checkAny(...AssignmentOperators) && !(isCallExpression(expr))) {
+        if (this.check(TokenKind.Equal) && !(isCallExpression(expr))) {
             let left = expr;
             let operator = this.advance();
             let right = this.expression();
 
             // Create a dotted or indexed "set" based on the left-hand side's type
             if (isIndexedGetExpression(left)) {
-                return new IndexedSetStatement(
-                    left.obj,
-                    left.index,
-                    operator.kind === TokenKind.Equal
-                        ? right
-                        : new BinaryExpression(left, operator, right),
-                    left.openingSquare,
-                    left.closingSquare,
-                    left.additionalIndexes,
-                    operator.kind === TokenKind.Equal
-                        ? operator
-                        : { kind: TokenKind.Equal, text: '=', range: operator.range }
-                );
+                return new IndexedSetStatement({
+                    obj: left.obj,
+                    indexes: left.indexes,
+                    value: right,
+                    openingSquare: left.tokens.openingSquare,
+                    closingSquare: left.tokens.closingSquare,
+                    equals: operator
+                });
             } else if (isDottedGetExpression(left)) {
-                return new DottedSetStatement(
-                    left.obj,
-                    left.name,
-                    operator.kind === TokenKind.Equal
-                        ? right
-                        : new BinaryExpression(left, operator, right),
-                    left.dot,
-                    operator.kind === TokenKind.Equal
-                        ? operator
-                        : { kind: TokenKind.Equal, text: '=', range: operator.range }
-                );
+                return new DottedSetStatement({
+                    obj: left.obj,
+                    name: left.tokens.name,
+                    value: right,
+                    dot: left.tokens.dot,
+                    equals: operator
+                });
             }
+        } else if (this.checkAny(...CompoundAssignmentOperators) && !(isCallExpression(expr))) {
+            let left = expr;
+            let operator = this.advance();
+            let right = this.expression();
+            return new AugmentedAssignmentStatement({
+                item: left,
+                operator: operator,
+                value: right
+            });
         }
         return this.expressionStatement(expr);
     }
@@ -2286,16 +2568,11 @@ export class Parser {
     private printStatement(): PrintStatement {
         let printKeyword = this.advance();
 
-        let values: (
-            | Expression
-            | PrintSeparatorTab
-            | PrintSeparatorSpace)[] = [];
+        let values: Expression[] = [];
 
         while (!this.checkEndOfStatement()) {
-            if (this.check(TokenKind.Semicolon)) {
-                values.push(this.advance() as PrintSeparatorSpace);
-            } else if (this.check(TokenKind.Comma)) {
-                values.push(this.advance() as PrintSeparatorTab);
+            if (this.checkAny(TokenKind.Semicolon, TokenKind.Comma)) {
+                values.push(new PrintSeparatorExpression({ separator: this.advance() as PrintSeparatorToken }));
             } else if (this.check(TokenKind.Else)) {
                 break; // inline branch
             } else {
@@ -2305,7 +2582,8 @@ export class Parser {
 
         //print statements can be empty, so look for empty print conditions
         if (!values.length) {
-            let emptyStringLiteral = createStringLiteral('');
+            const endOfStatementLocation = util.createBoundingLocation(printKeyword, this.peek());
+            let emptyStringLiteral = createStringLiteral('', endOfStatementLocation);
             values.push(emptyStringLiteral);
         }
 
@@ -2314,7 +2592,7 @@ export class Parser {
             // TODO: error, expected value
         }
 
-        return new PrintStatement({ print: printKeyword }, values);
+        return new PrintStatement({ print: printKeyword, expressions: values });
     }
 
     /**
@@ -2322,14 +2600,14 @@ export class Parser {
      * @returns an AST representation of a return statement.
      */
     private returnStatement(): ReturnStatement {
-        let tokens = { return: this.previous() };
+        let options = { return: this.previous() };
 
         if (this.checkEndOfStatement()) {
-            return new ReturnStatement(tokens);
+            return new ReturnStatement(options);
         }
 
         let toReturn = this.check(TokenKind.Else) ? undefined : this.expression();
-        return new ReturnStatement(tokens, toReturn);
+        return new ReturnStatement({ ...options, value: toReturn });
     }
 
     /**
@@ -2337,8 +2615,8 @@ export class Parser {
      * @returns an AST representation of an `label` statement.
      */
     private labelStatement() {
-        let tokens = {
-            identifier: this.advance(),
+        let options = {
+            name: this.advance(),
             colon: this.advance()
         };
 
@@ -2349,7 +2627,7 @@ export class Parser {
             throw new CancelStatementError();
         }
 
-        return new LabelStatement(tokens);
+        return new LabelStatement(options);
     }
 
     /**
@@ -2386,18 +2664,18 @@ export class Parser {
      * @returns an AST representation of an `end` statement.
      */
     private endStatement() {
-        let endTokens = { end: this.advance() };
+        let options = { end: this.advance() };
 
-        return new EndStatement(endTokens);
+        return new EndStatement(options);
     }
     /**
      * Parses a `stop` statement
      * @returns an AST representation of a `stop` statement
      */
     private stopStatement() {
-        let tokens = { stop: this.advance() };
+        let options = { stop: this.advance() };
 
-        return new StopStatement(tokens);
+        return new StopStatement(options);
     }
 
     /**
@@ -2410,10 +2688,9 @@ export class Parser {
         const parentAnnotations = this.enterAnnotationBlock();
 
         this.consumeStatementSeparators(true);
-        let startingToken = this.peek();
-
         const statements: Statement[] = [];
-        while (!this.isAtEnd() && !this.checkAny(TokenKind.EndSub, TokenKind.EndFunction, ...terminators)) {
+        const flatGlobalTerminators = this.globalTerminators.flat().flat();
+        while (!this.isAtEnd() && !this.checkAny(TokenKind.EndSub, TokenKind.EndFunction, ...terminators, ...flatGlobalTerminators)) {
             //grab the location of the current token
             let loopCurrent = this.current;
             let dec = this.declaration();
@@ -2459,7 +2736,7 @@ export class Parser {
         }
 
         this.exitAnnotationBlock(parentAnnotations);
-        return new Block(statements, startingToken.range);
+        return new Block({ statements: statements });
     }
 
     /**
@@ -2485,37 +2762,34 @@ export class Parser {
             for (const annotation of this.pendingAnnotations) {
                 this.diagnostics.push({
                     ...DiagnosticMessages.unusedAnnotation(),
-                    range: annotation.range
+                    location: annotation.location
                 });
             }
         }
         this.pendingAnnotations = parentAnnotations;
     }
 
-    private expression(findTypeCast = true): Expression {
+    private expression(findTypecast = true): Expression {
         let expression = this.anonymousFunction();
         let asToken: Token;
-        let typeToken: Token;
-        if (findTypeCast) {
+        let typeExpression: TypeExpression;
+        if (findTypecast) {
             do {
                 if (this.check(TokenKind.As)) {
                     this.warnIfNotBrighterScriptMode('type cast');
                     // Check if this expression is wrapped in any type casts
                     // allows for multiple casts:
                     // myVal = foo() as dynamic as string
-
-                    asToken = this.advance();
-                    typeToken = this.typeToken();
-                    if (asToken && typeToken) {
-                        expression = new TypeCastExpression(expression, asToken, typeToken);
+                    [asToken, typeExpression] = this.consumeAsTokenAndTypeExpression();
+                    if (asToken && typeExpression) {
+                        expression = new TypecastExpression({ obj: expression, as: asToken, typeExpression: typeExpression });
                     }
                 } else {
                     break;
                 }
 
-            } while (asToken && typeToken);
+            } while (asToken && typeExpression);
         }
-        this._references.expressions.add(expression);
         return expression;
     }
 
@@ -2548,8 +2822,7 @@ export class Parser {
             let operator = this.previous();
             this.consumeNewlinesIfAllowed();
             let right = this.relational();
-            this.addExpressionsToReferences(expr, right);
-            expr = new BinaryExpression(expr, operator, right);
+            expr = new BinaryExpression({ left: expr, operator: operator, right: right });
         }
 
         return expr;
@@ -2571,21 +2844,12 @@ export class Parser {
             let operator = this.previous();
             this.consumeNewlinesIfAllowed();
             let right = this.additive();
-            this.addExpressionsToReferences(expr, right);
-            expr = new BinaryExpression(expr, operator, right);
+            expr = new BinaryExpression({ left: expr, operator: operator, right: right });
         }
 
         return expr;
     }
 
-    private addExpressionsToReferences(...expressions: Expression[]) {
-        for (const expression of expressions) {
-            if (!isBinaryExpression(expression)) {
-                this.references.expressions.add(expression);
-            }
-        }
-    }
-
     // TODO: bitshift
 
     private additive(): Expression {
@@ -2595,8 +2859,7 @@ export class Parser {
             let operator = this.previous();
             this.consumeNewlinesIfAllowed();
             let right = this.multiplicative();
-            this.addExpressionsToReferences(expr, right);
-            expr = new BinaryExpression(expr, operator, right);
+            expr = new BinaryExpression({ left: expr, operator: operator, right: right });
         }
 
         return expr;
@@ -2616,8 +2879,7 @@ export class Parser {
             let operator = this.previous();
             this.consumeNewlinesIfAllowed();
             let right = this.exponential();
-            this.addExpressionsToReferences(expr, right);
-            expr = new BinaryExpression(expr, operator, right);
+            expr = new BinaryExpression({ left: expr, operator: operator, right: right });
         }
 
         return expr;
@@ -2630,8 +2892,7 @@ export class Parser {
             let operator = this.previous();
             this.consumeNewlinesIfAllowed();
             let right = this.prefixUnary();
-            this.addExpressionsToReferences(expr, right);
-            expr = new BinaryExpression(expr, operator, right);
+            expr = new BinaryExpression({ left: expr, operator: operator, right: right });
         }
 
         return expr;
@@ -2643,12 +2904,14 @@ export class Parser {
             this.current++; //advance
             let operator = this.previous();
             let right = this.relational();
-            return new UnaryExpression(operator, right);
+            return new UnaryExpression({ operator: operator, right: right });
         } else if (nextKind === TokenKind.Minus || nextKind === TokenKind.Plus) {
             this.current++; //advance
             let operator = this.previous();
-            let right = this.prefixUnary();
-            return new UnaryExpression(operator, right);
+            let right = (nextKind as any) === TokenKind.Not
+                ? this.boolean()
+                : this.prefixUnary();
+            return new UnaryExpression({ operator: operator, right: right });
         }
         return this.call();
     }
@@ -2681,28 +2944,42 @@ export class Parser {
         while (this.match(TokenKind.Newline)) { }
 
         const closingSquare = this.tryConsume(
-            DiagnosticMessages.expectedRightSquareBraceAfterArrayOrObjectIndex(),
+            DiagnosticMessages.unmatchedLeftToken(openingSquare.text, 'array or object index'),
             TokenKind.RightSquareBracket
         );
 
-        return new IndexedGetExpression(expr, indexes.shift(), openingSquare, closingSquare, questionDotToken, indexes);
+        return new IndexedGetExpression({
+            obj: expr,
+            indexes: indexes,
+            openingSquare: openingSquare,
+            closingSquare: closingSquare,
+            questionDot: questionDotToken
+        });
     }
 
     private newExpression() {
         this.warnIfNotBrighterScriptMode(`using 'new' keyword to construct a class`);
         let newToken = this.advance();
 
-        let nameExpr = this.getNamespacedVariableNameExpression();
-        let leftParen = this.consume(
+        let nameExpr = this.identifyingExpression();
+        let leftParen = this.tryConsume(
             DiagnosticMessages.unexpectedToken(this.peek().text),
             TokenKind.LeftParen,
             TokenKind.QuestionLeftParen
         );
+
+        if (!leftParen) {
+            // new expression without a following call expression
+            // wrap the name in an expression
+            const endOfStatementLocation = util.createBoundingLocation(newToken, this.peek());
+            const exprStmt = nameExpr ?? createStringLiteral('', endOfStatementLocation);
+            return new ExpressionStatement({ expression: exprStmt });
+        }
+
         let call = this.finishCall(leftParen, nameExpr);
         //pop the call from the  callExpressions list because this is technically something else
         this.callExpressions.pop();
-        let result = new NewExpression(newToken, call);
-        this._references.newExpressions.push(result);
+        let result = new NewExpression({ new: newToken, call: call });
         return result;
     }
 
@@ -2712,13 +2989,25 @@ export class Parser {
     private callfunc(callee: Expression): Expression {
         this.warnIfNotBrighterScriptMode('callfunc operator');
         let operator = this.previous();
-        let methodName = this.consume(DiagnosticMessages.expectedIdentifier(), TokenKind.Identifier, ...AllowedProperties);
-        // force it into an identifier so the AST makes some sense
-        methodName.kind = TokenKind.Identifier;
-        let openParen = this.consume(DiagnosticMessages.expectedOpenParenToFollowCallfuncIdentifier(), TokenKind.LeftParen);
-        let call = this.finishCall(openParen, callee, false);
-
-        return new CallfuncExpression(callee, operator, methodName as Identifier, openParen, call.args, call.closingParen);
+        let methodName = this.tryConsume(DiagnosticMessages.expectedIdentifier(), TokenKind.Identifier, ...AllowedProperties);
+        let openParen: Token;
+        let call: CallExpression;
+        if (methodName) {
+            // force it into an identifier so the AST makes some sense
+            methodName.kind = TokenKind.Identifier;
+            openParen = this.tryConsume(DiagnosticMessages.expectedToken(TokenKind.LeftParen), TokenKind.LeftParen);
+            if (openParen) {
+                call = this.finishCall(openParen, callee, false);
+            }
+        }
+        return new CallfuncExpression({
+            callee: callee,
+            operator: operator,
+            methodName: methodName as Identifier,
+            openingParen: openParen,
+            args: call?.args,
+            closingParen: call?.tokens?.closingParen
+        });
     }
 
     private call(): Expression {
@@ -2726,29 +3015,21 @@ export class Parser {
             return this.newExpression();
         }
         let expr = this.primary();
-        //an expression to keep for _references
-        let referenceCallExpression: Expression;
+
         while (true) {
             if (this.matchAny(TokenKind.LeftParen, TokenKind.QuestionLeftParen)) {
                 expr = this.finishCall(this.previous(), expr);
-                //store this call expression in references
-                referenceCallExpression = expr;
-
             } else if (this.matchAny(TokenKind.LeftSquareBracket, TokenKind.QuestionLeftSquare) || this.matchSequence(TokenKind.QuestionDot, TokenKind.LeftSquareBracket)) {
                 expr = this.indexedGet(expr);
-
             } else if (this.match(TokenKind.Callfunc)) {
                 expr = this.callfunc(expr);
-                //store this callfunc expression in references
-                referenceCallExpression = expr;
-
             } else if (this.matchAny(TokenKind.Dot, TokenKind.QuestionDot)) {
                 if (this.match(TokenKind.LeftSquareBracket)) {
                     expr = this.indexedGet(expr);
                 } else {
                     let dot = this.previous();
                     let name = this.tryConsume(
-                        DiagnosticMessages.expectedPropertyNameAfterPeriod(),
+                        DiagnosticMessages.expectedIdentifier(),
                         TokenKind.Identifier,
                         ...AllowedProperties
                     );
@@ -2758,9 +3039,7 @@ export class Parser {
 
                     // force it into an identifier so the AST makes some sense
                     name.kind = TokenKind.Identifier;
-                    expr = new DottedGetExpression(expr, name as Identifier, dot);
-
-                    this.addPropertyHints(name);
+                    expr = new DottedGetExpression({ obj: expr, name: name as Identifier, dot: dot });
                 }
 
             } else if (this.checkAny(TokenKind.At, TokenKind.QuestionAt)) {
@@ -2776,7 +3055,7 @@ export class Parser {
                 if (!name) {
                     break;
                 }
-                expr = new XmlAttributeGetExpression(expr, name as Identifier, dot);
+                expr = new XmlAttributeGetExpression({ obj: expr, name: name as Identifier, at: dot });
                 //only allow a single `@` expression
                 break;
 
@@ -2784,10 +3063,7 @@ export class Parser {
                 break;
             }
         }
-        //if we found a callExpression, add it to `expressions` in references
-        if (referenceCallExpression) {
-            this._references.expressions.add(referenceCallExpression);
-        }
+
         return expr;
     }
 
@@ -2802,10 +3078,25 @@ export class Parser {
                 if (args.length >= CallExpression.MaximumArguments) {
                     this.diagnostics.push({
                         ...DiagnosticMessages.tooManyCallableArguments(args.length, CallExpression.MaximumArguments),
-                        range: this.peek().range
+                        location: this.peek()?.location
                     });
                     throw this.lastDiagnosticAsError();
                 }
+                //if a newline appears where we'd next read an argument and line continuation isn't
+                //allowed in this mode, peek past the newlines: if the following token can't begin an
+                //argument expression (e.g. `end function`, `end sub`, EOF), this is clearly an
+                //unclosed-paren situation and we swallow the newlines so the diagnostic from
+                //expression() reports the surprising token rather than the newline itself.
+                if (!this.allowLineContinuation && this.check(TokenKind.Newline)) {
+                    let lookahead = this.current;
+                    while (this.tokens[lookahead]?.kind === TokenKind.Newline) {
+                        lookahead++;
+                    }
+                    const followingKind = this.tokens[lookahead]?.kind;
+                    if (followingKind === TokenKind.EndFunction || followingKind === TokenKind.EndSub || followingKind === TokenKind.Eof) {
+                        while (this.match(TokenKind.Newline)) { }
+                    }
+                }
                 try {
                     args.push(this.expression());
                 } catch (error) {
@@ -2818,12 +3109,27 @@ export class Parser {
 
         this.consumeNewlinesIfAllowed();
 
+        //if no closing `)` is in sight (e.g. we hit a newline that line-continuation is not allowed
+        //to swallow), consume newlines anyway as part of error recovery so the unmatched-left-token
+        //diagnostic points at the surprising token (e.g. `end sub`) rather than the `\n`. This also
+        //ensures the surrounding block sees a non-separator next token and emits its own
+        //`expectedNewlineOrColon` diagnostic.
+        const recoveredFromMissingRightParen = !this.check(TokenKind.RightParen);
+        if (recoveredFromMissingRightParen) {
+            while (this.match(TokenKind.Newline)) { }
+        }
+
         const closingParen = this.tryConsume(
-            DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
+            DiagnosticMessages.unmatchedLeftToken(openingParen.text, 'function call arguments'),
             TokenKind.RightParen
         );
 
-        let expression = new CallExpression(callee, openingParen, closingParen, args);
+        let expression = new CallExpression({
+            callee: callee,
+            openingParen: openingParen,
+            args: args,
+            closingParen: closingParen
+        });
         if (addToCallExpressionList) {
             this.callExpressions.push(expression);
         }
@@ -2831,172 +3137,250 @@ export class Parser {
     }
 
     /**
-     * Tries to get the next token as a type
-     * Allows for built-in types (double, string, etc.) or namespaced custom types in Brighterscript mode
-     * Will return a token of whatever is next to be parsed
-     * Will allow v1 type syntax (typed arrays, union types), but there is no validation on types used this way
+     * Creates a TypeExpression, which wraps standard ASTNodes that represent a BscType
      */
-    private typeToken(ignoreDiagnostics = false): Token {
-        let typeToken: Token;
-        let lookForCompounds = true;
-        let isACompound = false;
-        let resultToken;
-        while (lookForCompounds) {
-            lookForCompounds = false;
-
-            const isTypedFunction = this.checkAny(TokenKind.Function, TokenKind.Sub) && this.checkNext(TokenKind.LeftParen);
-
-            if (this.checkAny(...DeclarableTypes) && !isTypedFunction) {
-                // Token is a built in type
-                typeToken = this.advance();
-            } else if (this.options.mode === ParseMode.BrighterScript) {
-                try {
-                    if (this.check(TokenKind.LeftCurlyBrace)) {
-                        // could be an inline interface
-                        typeToken = this.inlineInterface();
-                    } else if (this.check(TokenKind.LeftParen)) {
-                        // could be an inline interface
-                        typeToken = this.groupedTypeExpression();
-                    } else if (isTypedFunction) {
-                        //typed function type
-                        typeToken = this.typedFunctionType();
+    private typeExpression(): TypeExpression {
+        const changedTokens: { token: Token; oldKind: TokenKind }[] = [];
+        try {
+            // handle types with 'and'/'or' operators
+            const expressionsWithOperator: { expression: Expression; operator?: Token }[] = [];
+
+            // find all expressions and operators
+            let expr: Expression = this.getTypeExpressionPart(changedTokens);
+            while (this.options.mode === ParseMode.BrighterScript && this.matchAny(TokenKind.Or, TokenKind.And)) {
+                let operator = this.previous();
+                expressionsWithOperator.push({ expression: expr, operator: operator });
+                expr = this.getTypeExpressionPart(changedTokens);
+            }
+            // add last expression
+            expressionsWithOperator.push({ expression: expr });
+
+            // handle expressions with order of operations - first "and", then "or"
+            const combineExpressions = (opToken: TokenKind) => {
+                let exprWithOp = expressionsWithOperator[0];
+                let index = 0;
+                while (exprWithOp?.operator) {
+                    if (exprWithOp.operator.kind === opToken) {
+                        const nextExpr = expressionsWithOperator[index + 1];
+                        const combinedExpr = new BinaryExpression({ left: exprWithOp.expression, operator: exprWithOp.operator, right: nextExpr.expression });
+                        // replace the two expressions with the combined one
+                        expressionsWithOperator.splice(index, 2, { expression: combinedExpr, operator: nextExpr.operator });
+                        exprWithOp = expressionsWithOperator[index];
                     } else {
-                        // see if we can get a namespaced identifer
-                        const qualifiedType = this.getNamespacedVariableNameExpression(ignoreDiagnostics);
-                        typeToken = createToken(TokenKind.Identifier, qualifiedType.getName(this.options.mode), qualifiedType.range);
+                        index++;
+                        exprWithOp = expressionsWithOperator[index];
                     }
-                } catch {
-                    //could not get an identifier - just get whatever's next
-                    typeToken = this.advance();
-                }
-            } else {
-                // just get whatever's next
-                typeToken = this.advance();
-            }
-            resultToken = resultToken ?? typeToken;
-            if (resultToken && this.options.mode === ParseMode.BrighterScript) {
-                // check for brackets for typed arrays
-                while (this.check(TokenKind.LeftSquareBracket) && this.peekNext().kind === TokenKind.RightSquareBracket) {
-                    const leftBracket = this.advance();
-                    const rightBracket = this.advance();
-                    typeToken = createToken(TokenKind.Identifier, typeToken.text + leftBracket.text + rightBracket.text, util.createBoundingRange(typeToken, leftBracket, rightBracket));
-                    resultToken = createToken(TokenKind.Dynamic, null, typeToken.range);
                 }
+            };
 
-                if (this.checkAny(TokenKind.Or, TokenKind.And)) {
-                    lookForCompounds = true;
-                    let orToken = this.advance();
-                    resultToken = createToken(TokenKind.Dynamic, null, util.createBoundingRange(resultToken, typeToken, orToken));
-                    isACompound = true;
-                }
+            combineExpressions(TokenKind.And);
+            combineExpressions(TokenKind.Or);
+
+            if (expressionsWithOperator[0]?.expression) {
+                return new TypeExpression({ expression: expressionsWithOperator[0].expression });
             }
+
+        } catch (error) {
+            // Something went wrong - reset the kind to what it was previously
+            for (const changedToken of changedTokens) {
+                changedToken.token.kind = changedToken.oldKind;
+            }
+            throw error;
         }
-        if (isACompound) {
-            resultToken = createToken(TokenKind.Dynamic, null, util.createBoundingRange(resultToken, typeToken));
-        }
-        return resultToken;
     }
 
-    private inlineInterface() {
-        const openToken = this.advance();
-        const memberTokens: Token[] = [];
-        memberTokens.push(openToken);
-        while (this.matchAny(TokenKind.Newline, TokenKind.Comment)) { }
-        while (this.checkAny(TokenKind.Identifier, ...AllowedProperties, TokenKind.StringLiteral, TokenKind.Optional)) {
-            let optionalKeyword = this.consumeTokenIf(TokenKind.Optional);
-            if (this.checkAny(TokenKind.Identifier, ...AllowedProperties, TokenKind.StringLiteral)) {
-                if (this.check(TokenKind.As)) {
-                    if (this.checkAnyNext(TokenKind.Comment, TokenKind.Newline)) {
-                        // as <EOL>
-                        // `as` is the field name
-                    } else if (this.checkNext(TokenKind.As)) {
-                        //  as as ____
-                        // first `as` is the field name
-                    } else if (optionalKeyword) {
-                        // optional as ____
-                        // optional is the field name, `as` starts type
-                        // rewind current token
-                        optionalKeyword = null;
-                        this.current--;
-                    }
+    /**
+     * Gets a single "part" of a type of a potential Union type
+     * Note: this does not NEED to be part of a union type, but the logic is the same
+     *
+     * @param changedTokens an array that is modified with any tokens that have been changed from their default kind to identifiers - eg. when a keyword is used as type
+     * @returns an expression that was successfully parsed
+     */
+    private getTypeExpressionPart(changedTokens: { token: Token; oldKind: TokenKind }[]) {
+        let expr: VariableExpression | DottedGetExpression | TypedArrayExpression | InlineInterfaceExpression | GroupingExpression | TypedFunctionTypeExpression;
+
+        if (this.checkAny(TokenKind.Sub, TokenKind.Function) && this.checkNext(TokenKind.LeftParen)) {
+            // this is a tyyed function type expression, eg. "function(type1, type2) as type3"
+            this.warnIfNotBrighterScriptMode('typed function types');
+            expr = this.typedFunctionTypeExpression();
+        } else if (this.checkAny(...DeclarableTypes)) {
+            // if this is just a type, just use directly
+            expr = new VariableExpression({ name: this.advance() as Identifier });
+        } else {
+            if (this.options.mode === ParseMode.BrightScript && !declarableTypesLower.includes(this.peek()?.text?.toLowerCase())) {
+                //inline interfaces have their own diagnostic ('inline interface'); let `{`
+                //flow through to the matcher below so it fires the more-specific warning.
+                if (!this.check(TokenKind.LeftCurlyBrace)) {
+                    // custom types arrays not allowed in Brightscript
+                    this.warnIfNotBrighterScriptMode('custom types');
+                    this.advance(); // skip custom type token
+                    return expr;
                 }
-            } else {
-                // no name after `optional` ... optional is the name
-                // rewind current token
-                optionalKeyword = null;
-                this.current--;
-            }
-            if (optionalKeyword) {
-                memberTokens.push(optionalKeyword);
             }
-            if (!this.checkAny(TokenKind.Identifier, ...this.allowedLocalIdentifiers, TokenKind.StringLiteral)) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.unexpectedToken(this.peek().text),
-                    range: this.peek().range
-                });
-                throw this.lastDiagnosticAsError();
-            }
-            if (this.checkAny(TokenKind.Identifier, ...AllowedProperties, TokenKind.StringLiteral)) {
-                this.advance();
+
+            if (this.match(TokenKind.LeftCurlyBrace)) {
+                expr = this.inlineInterface();
+            } else if (this.match(TokenKind.LeftParen)) {
+                // this is a grouping type expression, ie. "(typeExpr)"
+                let left = this.previous();
+                let typeExpr = this.typeExpression();
+                let right = this.consume(
+                    DiagnosticMessages.unmatchedLeftToken(left.text, 'type expression'),
+                    TokenKind.RightParen
+                );
+                expr = new GroupingExpression({ leftParen: left, rightParen: right, expression: typeExpr });
             } else {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.unexpectedToken(this.peek().text),
-                    range: this.peek().range
-                });
-                throw this.lastDiagnosticAsError();
+                if (this.checkAny(...AllowedTypeIdentifiers)) {
+                    // Since the next token is allowed as a type identifier, change the kind
+                    let nextToken = this.peek();
+                    changedTokens.push({ token: nextToken, oldKind: nextToken.kind });
+                    nextToken.kind = TokenKind.Identifier;
+                }
+                expr = this.identifyingExpression(AllowedTypeIdentifiers);
             }
+        }
 
-            if (this.check(TokenKind.As)) {
-                memberTokens.push(this.advance()); // as
-                memberTokens.push(this.typeToken()); // type
+        //Check if it has square brackets, thus making it an array
+        if (expr && this.check(TokenKind.LeftSquareBracket)) {
+            if (this.options.mode === ParseMode.BrightScript) {
+                // typed arrays not allowed in Brightscript
+                this.warnIfNotBrighterScriptMode('typed arrays');
+                return expr;
+            }
+
+            // Check if it is an array - that is, if it has `[]` after the type
+            // eg. `string[]` or `SomeKlass[]`
+            // This is while loop, so it supports multidimensional arrays (eg. integer[][])
+            while (this.check(TokenKind.LeftSquareBracket)) {
+                const leftBracket = this.advance();
+                if (this.check(TokenKind.RightSquareBracket)) {
+                    const rightBracket = this.advance();
+                    expr = new TypedArrayExpression({ innerType: expr, leftBracket: leftBracket, rightBracket: rightBracket });
+                }
             }
-            while (this.matchAny(TokenKind.Comma, TokenKind.Newline, TokenKind.Comment)) { }
+        }
+
+        return expr;
+    }
+
+    private typedFunctionTypeExpression() {
+        const funcOrSub = this.advance();
+        const openParen = this.consume(DiagnosticMessages.expectedToken(TokenKind.LeftParen), TokenKind.LeftParen);
+        const params: FunctionParameterExpression[] = [];
+
+        if (!this.check(TokenKind.RightParen)) {
+            do {
+                if (params.length >= CallExpression.MaximumArguments) {
+                    this.diagnostics.push({
+                        ...DiagnosticMessages.tooManyCallableParameters(params.length, CallExpression.MaximumArguments),
+                        location: this.peek().location
+                    });
+                }
+
+                params.push(this.functionParameter());
+            } while (this.match(TokenKind.Comma));
+        }
+
+        const closeParen = this.consume(
+            DiagnosticMessages.unmatchedLeftToken(openParen.text, 'function type expression'),
+            TokenKind.RightParen
+        );
+
+        let asToken: Token;
+        let returnType: TypeExpression;
+
+        if (this.check(TokenKind.As)) {
+            [asToken, returnType] = this.consumeAsTokenAndTypeExpression();
+        }
+        return new TypedFunctionTypeExpression({
+            functionType: funcOrSub,
+            rightParen: openParen,
+            params: params,
+            leftParen: closeParen,
+            as: asToken,
+            returnType: returnType
+        });
+
+    }
+
+
+    private inlineInterface() {
+        let expr: InlineInterfaceExpression;
+        const openToken = this.previous();
+        this.warnIfNotBrighterScriptMode('inline interface');
+        const members: InlineInterfaceMemberExpression[] = [];
+        while (this.match(TokenKind.Newline)) { }
+        while (this.checkAny(TokenKind.Identifier, ...AllowedProperties, TokenKind.StringLiteral, TokenKind.Optional)) {
+            const member = this.inlineInterfaceMember();
+            members.push(member);
+            while (this.matchAny(TokenKind.Comma, TokenKind.Newline)) { }
         }
         if (!this.check(TokenKind.RightCurlyBrace)) {
             this.diagnostics.push({
-                ...DiagnosticMessages.unexpectedToken(this.peek().text),
-                range: this.peek().range
+                ...DiagnosticMessages.expectedParameterNameButFound(this.peek().text),
+                location: this.peek().location
             });
             throw this.lastDiagnosticAsError();
         }
         const closeToken = this.advance();
-        memberTokens.push(closeToken);
 
-        const completeInlineInterfaceToken = createToken(TokenKind.Dynamic, null, util.createBoundingRange(...memberTokens));
-
-        return completeInlineInterfaceToken;
+        expr = new InlineInterfaceExpression({ open: openToken, members: members, close: closeToken });
+        return expr;
     }
 
-    private groupedTypeExpression() {
-        const leftParen = this.advance();
-        const typeToken = this.typeToken();
-        const rightParen = this.consume(
-            DiagnosticMessages.expectedToken(TokenKind.RightParen),
-            TokenKind.RightParen
-        );
-        return createToken(TokenKind.Dynamic, null, util.createBoundingRange(leftParen, typeToken, rightParen));
-    }
+    private inlineInterfaceMember(): InlineInterfaceMemberExpression {
+        let optionalKeyword = this.consumeTokenIf(TokenKind.Optional);
 
-    private typedFunctionType() {
-        const funcOrSub = this.advance();
-        const leftParen = this.advance();
+        if (this.checkAny(TokenKind.Identifier, ...AllowedProperties, TokenKind.StringLiteral)) {
+            if (this.check(TokenKind.As)) {
+                if (this.checkAnyNext(TokenKind.Comment, TokenKind.Newline)) {
+                    // as <EOL>
+                    // `as` is the field name
+                } else if (this.checkNext(TokenKind.As)) {
+                    //  as as ____
+                    // first `as` is the field name
+                } else if (optionalKeyword) {
+                    // optional as ____
+                    // optional is the field name, `as` starts type
+                    // rewind current token
+                    optionalKeyword = null;
+                    this.current--;
+                }
+            }
+        } else {
+            // no name after `optional` ... optional is the name
+            // rewind current token
+            optionalKeyword = null;
+            this.current--;
+        }
 
-        let params = [] as FunctionParameterExpression[];
-        if (!this.check(TokenKind.RightParen)) {
-            do {
-                params.push(this.functionParameter());
-            } while (this.match(TokenKind.Comma));
+        if (!this.checkAny(TokenKind.Identifier, ...this.allowedLocalIdentifiers, TokenKind.StringLiteral)) {
+            this.diagnostics.push({
+                ...DiagnosticMessages.expectedIdentifier(this.peek().text),
+                location: this.peek().location
+            });
+            throw this.lastDiagnosticAsError();
         }
-        const rightParen = this.advance();
-        let asToken: Token;
-        let returnType: Token;
-        if ((this.check(TokenKind.As))) {
-            // this is a function type with a return type, e.g. `function(string) as void`
-            asToken = this.advance();
-            returnType = this.typeToken();
+        let name: Token;
+        if (this.checkAny(TokenKind.Identifier, ...AllowedProperties)) {
+            name = this.identifier(...AllowedProperties);
+        } else {
+            name = this.advance();
         }
 
-        return createToken(TokenKind.Function, null, util.createBoundingRange(funcOrSub, leftParen, rightParen, asToken, returnType));
+        let typeExpression: TypeExpression;
+
+        let asToken: Token = null;
+        if (this.check(TokenKind.As)) {
+            [asToken, typeExpression] = this.consumeAsTokenAndTypeExpression();
+
+        }
+        return new InlineInterfaceMemberExpression({
+            name: name,
+            as: asToken,
+            typeExpression: typeExpression,
+            optional: optionalKeyword
+        });
     }
 
     private primary(): Expression {
@@ -3011,11 +3395,11 @@ export class Parser {
                 TokenKind.DoubleLiteral,
                 TokenKind.StringLiteral
             ):
-                return new LiteralExpression(this.previous());
+                return new LiteralExpression({ value: this.previous() });
 
             //capture source literals (LINE_NUM if brightscript, or a bunch of them if brighterscript)
             case this.matchAny(TokenKind.LineNumLiteral, ...(this.options.mode === ParseMode.BrightScript ? [] : BrighterScriptSourceLiterals)):
-                return new SourceLiteralExpression(this.previous());
+                return new SourceLiteralExpression({ value: this.previous() });
 
             //template string
             case this.check(TokenKind.BackTick):
@@ -3026,16 +3410,16 @@ export class Parser {
                 return this.templateString(true);
 
             case this.matchAny(TokenKind.Identifier, ...this.allowedLocalIdentifiers):
-                return new VariableExpression(this.previous() as Identifier);
+                return new VariableExpression({ name: this.previous() as Identifier });
 
             case this.match(TokenKind.LeftParen):
                 let left = this.previous();
                 let expr = this.expression();
                 let right = this.consume(
-                    DiagnosticMessages.unmatchedLeftParenAfterExpression(),
+                    DiagnosticMessages.unmatchedLeftToken(left.text, 'expression'),
                     TokenKind.RightParen
                 );
-                return new GroupingExpression({ left: left, right: right }, expr);
+                return new GroupingExpression({ leftParen: left, rightParen: right, expression: expr });
 
             case this.matchAny(TokenKind.LeftSquareBracket):
                 return this.arrayLiteral();
@@ -3047,7 +3431,7 @@ export class Parser {
                 let token = Object.assign(this.previous(), {
                     kind: TokenKind.Identifier
                 }) as Identifier;
-                return new VariableExpression(token);
+                return new VariableExpression({ name: token });
 
             case this.checkAny(TokenKind.Function, TokenKind.Sub):
                 return this.anonymousFunction();
@@ -3055,9 +3439,6 @@ export class Parser {
             case this.check(TokenKind.RegexLiteral):
                 return this.regexLiteralExpression();
 
-            case this.check(TokenKind.Comment):
-                return new CommentStatement([this.advance()]);
-
             default:
                 //if we found an expected terminator, don't throw a diagnostic...just return undefined
                 if (this.checkAny(...this.peekGlobalTerminators())) {
@@ -3067,7 +3448,7 @@ export class Parser {
                 } else {
                     this.diagnostics.push({
                         ...DiagnosticMessages.unexpectedToken(this.peek().text),
-                        range: this.peek().range
+                        location: this.peek()?.location
                     });
                     throw this.lastDiagnosticAsError();
                 }
@@ -3075,14 +3456,9 @@ export class Parser {
     }
 
     private arrayLiteral() {
-        let elements: Array<Expression | CommentStatement> = [];
+        let elements: Array<Expression> = [];
         let openingSquare = this.previous();
 
-        //add any comment found right after the opening square
-        if (this.check(TokenKind.Comment)) {
-            elements.push(new CommentStatement([this.advance()]));
-        }
-
         while (this.match(TokenKind.Newline)) {
         }
         let closingSquare: Token;
@@ -3092,10 +3468,7 @@ export class Parser {
                 elements.push(this.expression());
 
                 while (this.matchAny(TokenKind.Comma, TokenKind.Newline, TokenKind.Comment)) {
-                    if (this.checkPrevious(TokenKind.Comment) || this.check(TokenKind.Comment)) {
-                        let comment = this.check(TokenKind.Comment) ? this.advance() : this.previous();
-                        elements.push(new CommentStatement([comment]));
-                    }
+
                     while (this.match(TokenKind.Newline)) {
 
                     }
@@ -3111,7 +3484,7 @@ export class Parser {
             }
 
             closingSquare = this.tryConsume(
-                DiagnosticMessages.unmatchedLeftSquareBraceAfterArrayLiteral(),
+                DiagnosticMessages.unmatchedLeftToken(openingSquare.text, 'array literal'),
                 TokenKind.RightSquareBracket
             );
         } else {
@@ -3119,12 +3492,12 @@ export class Parser {
         }
 
         //this.consume("Expected newline or ':' after array literal", TokenKind.Newline, TokenKind.Colon, TokenKind.Eof);
-        return new ArrayLiteralExpression(elements, openingSquare, closingSquare);
+        return new ArrayLiteralExpression({ elements: elements, open: openingSquare, close: closingSquare });
     }
 
     private aaLiteral() {
         let openingBrace = this.previous();
-        let members: Array<AAMemberExpression | AAIndexedMemberExpression | CommentStatement> = [];
+        let members: Array<AAMemberExpression | AAIndexedMemberExpression> = [];
 
         let key = () => {
             let result = {
@@ -3147,7 +3520,7 @@ export class Parser {
             } else {
                 this.diagnostics.push({
                     ...DiagnosticMessages.unexpectedAAKey(),
-                    range: this.peek().range
+                    location: this.peek().location
                 });
                 throw this.lastDiagnosticAsError();
             }
@@ -3156,7 +3529,7 @@ export class Parser {
                 DiagnosticMessages.expectedColonBetweenAAKeyAndvalue(),
                 TokenKind.Colon
             );
-            result.range = util.getRange(result.keyToken ?? result.leftBracket, result.colon);
+            result.range = util.createBoundingRange(result.keyToken ?? result.leftBracket, result.colon);
             return result;
         };
 
@@ -3165,64 +3538,53 @@ export class Parser {
         if (!this.match(TokenKind.RightCurlyBrace)) {
             let lastAAMember: AAMemberExpression | AAIndexedMemberExpression;
             try {
-                if (this.check(TokenKind.Comment)) {
-                    lastAAMember = null;
-                    members.push(new CommentStatement([this.advance()]));
-                } else {
-                    let k = key();
-                    let expr = this.expression();
-                    lastAAMember = k.key
-                        ? new AAIndexedMemberExpression({ leftBracket: k.leftBracket, key: k.key, rightBracket: k.rightBracket, colon: k.colon, value: expr })
-                        : new AAMemberExpression(k.keyToken, k.colon, expr);
-                    members.push(lastAAMember);
-                }
+                let k = key();
+                let expr = this.expression();
+                lastAAMember = k.key
+                    ? new AAIndexedMemberExpression({ leftBracket: k.leftBracket, key: k.key, rightBracket: k.rightBracket, colon: k.colon, value: expr })
+                    : new AAMemberExpression({
+                        key: k.keyToken,
+                        colon: k.colon,
+                        value: expr
+                    });
+                members.push(lastAAMember);
 
                 while (this.matchAny(TokenKind.Comma, TokenKind.Newline, TokenKind.Colon, TokenKind.Comment)) {
                     // collect comma at end of expression
                     if (lastAAMember && this.checkPrevious(TokenKind.Comma)) {
-                        lastAAMember.commaToken = this.previous();
+                        (lastAAMember as DeepWriteable<AAMemberExpression>).tokens.comma = this.previous();
                     }
 
-                    //check for comment at the end of the current line
-                    if (this.check(TokenKind.Comment) || this.checkPrevious(TokenKind.Comment)) {
-                        let token = this.checkPrevious(TokenKind.Comment) ? this.previous() : this.advance();
-                        members.push(new CommentStatement([token]));
-                    } else {
-                        this.consumeStatementSeparators(true);
-
-                        //check for a comment on its own line
-                        if (this.check(TokenKind.Comment) || this.checkPrevious(TokenKind.Comment)) {
-                            let token = this.checkPrevious(TokenKind.Comment) ? this.previous() : this.advance();
-                            lastAAMember = null;
-                            members.push(new CommentStatement([token]));
-                            continue;
-                        }
+                    this.consumeStatementSeparators(true);
 
-                        if (this.check(TokenKind.RightCurlyBrace)) {
-                            break;
-                        }
-                        let k = key();
-                        let expr = this.expression();
-                        lastAAMember = k.key
-                            ? new AAIndexedMemberExpression({ leftBracket: k.leftBracket, key: k.key, rightBracket: k.rightBracket, colon: k.colon, value: expr })
-                            : new AAMemberExpression(k.keyToken, k.colon, expr);
-                        members.push(lastAAMember);
+                    if (this.check(TokenKind.RightCurlyBrace)) {
+                        break;
                     }
+                    let k = key();
+                    let expr = this.expression();
+                    lastAAMember = k.key
+                        ? new AAIndexedMemberExpression({ leftBracket: k.leftBracket, key: k.key, rightBracket: k.rightBracket, colon: k.colon, value: expr })
+                        : new AAMemberExpression({
+                            key: k.keyToken,
+                            colon: k.colon,
+                            value: expr
+                        });
+                    members.push(lastAAMember);
+
                 }
             } catch (error: any) {
                 this.rethrowNonDiagnosticError(error);
             }
 
             closingBrace = this.tryConsume(
-                DiagnosticMessages.unmatchedLeftCurlyAfterAALiteral(),
+                DiagnosticMessages.unmatchedLeftToken(openingBrace.text, 'associative array literal'),
                 TokenKind.RightCurlyBrace
             );
         } else {
             closingBrace = this.previous();
         }
 
-        const aaExpr = new AALiteralExpression(members, openingBrace, closingBrace);
-        this.addPropertyHints(aaExpr);
+        const aaExpr = new AALiteralExpression({ elements: members, open: openingBrace, close: closingBrace });
         return aaExpr;
     }
 
@@ -3308,7 +3670,7 @@ export class Parser {
         }
         this.diagnostics.push({
             ...diagnostic,
-            range: this.peek().range
+            location: this.peek()?.location
         });
     }
 
@@ -3332,7 +3694,7 @@ export class Parser {
         if (!optional && !consumed) {
             this.diagnostics.push({
                 ...DiagnosticMessages.expectedNewlineOrColon(),
-                range: this.peek().range
+                location: this.peek()?.location
             });
         }
         return consumed;
@@ -3391,7 +3753,8 @@ export class Parser {
     }
 
     private isAtEnd(): boolean {
-        return this.peek().kind === TokenKind.Eof;
+        const peekToken = this.peek();
+        return !peekToken || peekToken.kind === TokenKind.Eof;
     }
 
     private peekNext(): Token {
@@ -3467,153 +3830,6 @@ export class Parser {
         }
     }
 
-    /**
-     * References are found during the initial parse.
-     * However, sometimes plugins can modify the AST, requiring a full walk to re-compute all references.
-     * This does that walk.
-     */
-    private findReferences() {
-        this._references = new References();
-        const excludedExpressions = new Set<Expression>();
-
-        const visitCallExpression = (e: CallExpression | CallfuncExpression) => {
-            for (const p of e.args) {
-                this._references.expressions.add(p);
-            }
-            //add calls that were not excluded (from loop below)
-            if (!excludedExpressions.has(e)) {
-                this._references.expressions.add(e);
-            }
-
-            //if this call is part of a longer expression that includes a call higher up, find that higher one and remove it
-            if (e.callee) {
-                let node: Expression = e.callee;
-                while (node) {
-                    //the primary goal for this loop. If we found a parent call expression, remove it from `references`
-                    if (isCallExpression(node)) {
-                        this.references.expressions.delete(node);
-                        excludedExpressions.add(node);
-                        //stop here. even if there are multiple calls in the chain, each child will find and remove its closest parent, so that reduces excess walking.
-                        break;
-
-                        //when we hit a variable expression, we're definitely at the leftmost expression so stop
-                    } else if (isVariableExpression(node)) {
-                        break;
-                        //if
-
-                    } else if (isDottedGetExpression(node) || isIndexedGetExpression(node)) {
-                        node = node.obj;
-                    } else {
-                        //some expression we don't understand. log it and quit the loop
-                        this.logger.info('Encountered unknown expression while calculating function expression chain', node);
-                        break;
-                    }
-                }
-            }
-        };
-
-        this.ast.walk(createVisitor({
-            AssignmentStatement: s => {
-                this._references.assignmentStatements.push(s);
-                this.references.expressions.add(s.value);
-            },
-            ClassStatement: s => {
-                this._references.classStatements.push(s);
-            },
-            ClassFieldStatement: s => {
-                if (s.initialValue) {
-                    this._references.expressions.add(s.initialValue);
-                }
-            },
-            NamespaceStatement: s => {
-                this._references.namespaceStatements.push(s);
-            },
-            FunctionStatement: s => {
-                this._references.functionStatements.push(s);
-            },
-            ImportStatement: s => {
-                this._references.importStatements.push(s);
-            },
-            LibraryStatement: s => {
-                this._references.libraryStatements.push(s);
-            },
-            FunctionExpression: (expression, parent) => {
-                if (!isMethodStatement(parent)) {
-                    this._references.functionExpressions.push(expression);
-                }
-            },
-            NewExpression: e => {
-                this._references.newExpressions.push(e);
-                for (const p of e.call.args) {
-                    this._references.expressions.add(p);
-                }
-            },
-            ExpressionStatement: s => {
-                this._references.expressions.add(s.expression);
-            },
-            CallfuncExpression: e => {
-                visitCallExpression(e);
-            },
-            CallExpression: e => {
-                visitCallExpression(e);
-            },
-            AALiteralExpression: e => {
-                this.addPropertyHints(e);
-                this._references.expressions.add(e);
-                for (const member of e.elements) {
-                    if (isAAMemberExpression(member)) {
-                        this._references.expressions.add(member.value);
-                    } else if (isAAIndexedMemberExpression(member)) {
-                        this._references.expressions.add(member.value);
-                        this._references.expressions.add(member.key);
-                    }
-                }
-            },
-            BinaryExpression: (e, parent) => {
-                //walk the chain of binary expressions and add each one to the list of expressions
-                const expressions: Expression[] = [e];
-                let expression: Expression;
-                while ((expression = expressions.pop())) {
-                    if (isBinaryExpression(expression)) {
-                        expressions.push(expression.left, expression.right);
-                    } else {
-                        this._references.expressions.add(expression);
-                    }
-                }
-            },
-            ArrayLiteralExpression: e => {
-                for (const element of e.elements) {
-                    //keep everything except comments
-                    if (!isCommentStatement(element)) {
-                        this._references.expressions.add(element);
-                    }
-                }
-            },
-            DottedGetExpression: e => {
-                this.addPropertyHints(e.name);
-            },
-            DottedSetStatement: e => {
-                this.addPropertyHints(e.name);
-            },
-            EnumStatement: e => {
-                this._references.enumStatements.push(e);
-            },
-            ConstStatement: s => {
-                this._references.constStatements.push(s);
-            },
-            UnaryExpression: e => {
-                this._references.expressions.add(e);
-            },
-            IncrementStatement: e => {
-                this._references.expressions.add(e);
-            },
-            TypeStatement: (s) => {
-                this._references.typeStatements.push(s);
-            }
-        }), {
-            walkMode: WalkMode.visitAllRecursive
-        });
-    }
 
     public dispose() {
     }
@@ -3633,11 +3849,20 @@ export interface ParseOptions {
      * A logger that should be used for logging. If omitted, a default logger is used
      */
     logger?: Logger;
+    /**
+     * Path to the file where this source code originated
+     */
+    srcPath?: string;
     /**
      * Should locations be tracked. If false, the `range` property will be omitted
      * @default true
      */
     trackLocations?: boolean;
+    /**
+     * A map of BrightScript constants. If a constant is present in this map, it will be treated as a compile-time constant.
+     */
+    bsConsts?: Map<string, boolean>;
+
     /**
      * The minimum Roku firmware version required to run this project.
      * When set to '15.3' or higher, line continuation (multi-line expressions in `.brs` files)
@@ -3647,97 +3872,6 @@ export interface ParseOptions {
     minFirmwareVersion?: string;
 }
 
-export class References {
-    private cache = new Cache();
-    public assignmentStatements = [] as AssignmentStatement[];
-    public classStatements = [] as ClassStatement[];
-
-    public get classStatementLookup() {
-        if (!this._classStatementLookup) {
-            this._classStatementLookup = new Map();
-            for (const stmt of this.classStatements) {
-                this._classStatementLookup.set(stmt.getName(ParseMode.BrighterScript).toLowerCase(), stmt);
-            }
-        }
-        return this._classStatementLookup;
-    }
-    private _classStatementLookup: Map<string, ClassStatement>;
-
-    public functionExpressions = [] as FunctionExpression[];
-    public functionStatements = [] as FunctionStatement[];
-    /**
-     * A map of function statements, indexed by fully-namespaced lower function name.
-     */
-    public get functionStatementLookup() {
-        if (!this._functionStatementLookup) {
-            this._functionStatementLookup = new Map();
-            for (const stmt of this.functionStatements) {
-                this._functionStatementLookup.set(stmt.getName(ParseMode.BrighterScript).toLowerCase(), stmt);
-            }
-        }
-        return this._functionStatementLookup;
-    }
-    private _functionStatementLookup: Map<string, FunctionStatement>;
-
-    public interfaceStatements = [] as InterfaceStatement[];
-
-    public get interfaceStatementLookup() {
-        if (!this._interfaceStatementLookup) {
-            this._interfaceStatementLookup = new Map();
-            for (const stmt of this.interfaceStatements) {
-                this._interfaceStatementLookup.set(stmt.fullName.toLowerCase(), stmt);
-            }
-        }
-        return this._interfaceStatementLookup;
-    }
-    private _interfaceStatementLookup: Map<string, InterfaceStatement>;
-
-    public enumStatements = [] as EnumStatement[];
-
-    public get enumStatementLookup() {
-        return this.cache.getOrAdd('enums', () => {
-            const result = new Map<string, EnumStatement>();
-            for (const stmt of this.enumStatements) {
-                result.set(stmt.fullName.toLowerCase(), stmt);
-            }
-            return result;
-        });
-    }
-
-    public constStatements = [] as ConstStatement[];
-
-    public get constStatementLookup() {
-        return this.cache.getOrAdd('consts', () => {
-            const result = new Map<string, ConstStatement>();
-            for (const stmt of this.constStatements) {
-                result.set(stmt.fullName.toLowerCase(), stmt);
-            }
-            return result;
-        });
-    }
-
-    /**
-     * A collection of full expressions. This excludes intermediary expressions.
-     *
-     * Example 1:
-     * `a.b.c` is composed of `a` (variableExpression)  `.b` (DottedGetExpression) `.c` (DottedGetExpression)
-     * This will only contain the final `.c` DottedGetExpression because `.b` and `a` can both be derived by walking back from the `.c` DottedGetExpression.
-     *
-     * Example 2:
-     * `name.space.doSomething(a.b.c)` will result in 2 entries in this list. the `CallExpression` for `doSomething`, and the `.c` DottedGetExpression.
-     *
-     * Example 3:
-     * `value = SomeEnum.value > 2 or SomeEnum.otherValue < 10` will result in 4 entries. `SomeEnum.value`, `2`, `SomeEnum.otherValue`, `10`
-     */
-    public expressions = new Set<Expression>();
-
-    public importStatements = [] as ImportStatement[];
-    public libraryStatements = [] as LibraryStatement[];
-    public namespaceStatements = [] as NamespaceStatement[];
-    public typeStatements = [] as TypeStatement[];
-    public newExpressions = [] as NewExpression[];
-    public propertyHints = {} as Record<string, string>;
-}
 
 class CancelStatementError extends Error {
     constructor() {
diff --git a/src/parser/SGParser.spec.ts b/src/parser/SGParser.spec.ts
index 22f7f451e..851287f73 100644
--- a/src/parser/SGParser.spec.ts
+++ b/src/parser/SGParser.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from '../chai-config.spec';
 import { Range } from 'vscode-languageserver';
 import { DiagnosticMessages } from '../DiagnosticMessages';
-import { expectZeroDiagnostics, trim } from '../testHelpers.spec';
+import { expectDiagnostics, getTestTranspile, trim } from '../testHelpers.spec';
 import SGParser from './SGParser';
 import { createSandbox } from 'sinon';
 import { Program } from '../Program';
@@ -12,17 +12,23 @@ let sinon = createSandbox();
 describe('SGParser', () => {
 
     let program: Program;
+    const testTranspile = getTestTranspile(() => [program, rootDir]);
 
     beforeEach(() => {
         program = new Program({ rootDir: rootDir, sourceMap: false });
     });
+
     afterEach(() => {
         sinon.restore();
         program.dispose();
     });
 
-    it('Parses well formed SG component', () => {
-        const file = program.setFile<XmlFile>('components/file.xml', trim`
+    it('Parses well formed SG component', async () => {
+        program.setFile('components/Component1.brs', `
+            sub load()
+            end sub
+        `);
+        const { file } = await testTranspile<XmlFile>(trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ParentScene" extends="GrandparentScene">
                 <interface>
@@ -44,18 +50,8 @@ describe('SGParser', () => {
                         font="font:MediumBoldSystemFont"
                         />
                 </children>
-            </component>`
-        );
-        const { ast } = file.parser;
-        expect(ast.prolog).to.exist;
-        expect(ast.component).to.exist;
-        expect(ast.root).to.equal(ast.component);
-        expectZeroDiagnostics(file);
-
-        const output = file.transpile();
-        expect(
-            output.code.trimEnd()
-        ).to.equal(trim`
+            </component>
+        `, trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ParentScene" extends="GrandparentScene">
                 <interface>
@@ -73,13 +69,17 @@ describe('SGParser', () => {
                     <Label id="loadingIndicator" text="Loading..." font="font:MediumBoldSystemFont" />
                 </children>
             </component>
-        `);
+        `, undefined, 'components/file.xml');
+
+        const { ast } = file.parser;
+        expect(ast.prologElement).to.exist;
+        expect(ast.componentElement).to.exist;
+        expect(ast.rootElement).to.equal(ast.componentElement);
     });
 
     it('does not crash when missing tag name', () => {
         const parser = new SGParser();
-        parser.parse(
-            'pkg:/components/ParentScene.xml', trim`
+        parser.parse(trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="ParentScene">
             <!-- a standalone less-than symbol used to cause issues -->
@@ -92,8 +92,7 @@ describe('SGParser', () => {
 
     it('Adds error when an unexpected tag is found in xml', () => {
         const parser = new SGParser();
-        parser.parse(
-            'pkg:/components/ParentScene.xml', trim`
+        parser.parse(trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="ParentScene">
                 <interface>
@@ -103,20 +102,18 @@ describe('SGParser', () => {
             </component>
         `);
         expect(parser.diagnostics).to.be.lengthOf(2);
-        expect(parser.diagnostics[0]).to.deep.include({
+        expectDiagnostics(parser, [{
             ...DiagnosticMessages.xmlUnexpectedTag('unexpected'),
-            range: Range.create(3, 9, 3, 19)
-        });
-        expect(parser.diagnostics[1]).to.deep.include({
+            location: { range: Range.create(3, 9, 3, 19) }
+        }, {
             ...DiagnosticMessages.xmlUnexpectedTag('unexpectedToo'),
-            range: Range.create(5, 5, 5, 18)
-        });
+            location: { range: Range.create(5, 5, 5, 18) }
+        }]);
     });
 
     it('Adds error when a leaf tag is found to have children', () => {
         const parser = new SGParser();
-        parser.parse(
-            'pkg:/components/ParentScene.xml', trim`
+        parser.parse(trim`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="ParentScene">
                 <interface>
@@ -129,33 +126,30 @@ describe('SGParser', () => {
                 </script>
             </component>
         `);
-        expect(parser.diagnostics).to.be.lengthOf(2);
-        expect(parser.diagnostics[0]).to.deep.include({
+        expectDiagnostics(parser, [{
             ...DiagnosticMessages.xmlUnexpectedChildren('field'),
-            range: Range.create(3, 9, 3, 14)
-        });
-        expect(parser.diagnostics[1]).to.deep.include({
+            location: { range: Range.create(3, 9, 3, 14) }
+        }, {
             ...DiagnosticMessages.xmlUnexpectedChildren('script'),
-            range: Range.create(7, 5, 7, 11)
-        });
+            location: { range: Range.create(7, 5, 7, 11) }
+        }]);
     });
 
     it('Adds error when whitespace appears before the prolog', () => {
         const parser = new SGParser();
-        parser.parse('path/to/component/ChildScene.xml', /* not trimmed */`
+        parser.parse(/* not trimmed */`
             <?xml version="1.0" encoding="utf-8" ?>
             <component name="ChildScene" extends="ParentScene">
                 <script type="text/brightscript" uri="ChildScene.brs" />
             </component>`
         );
         expect(parser.diagnostics).to.be.lengthOf(2);
-        expect(parser.diagnostics[0]).to.deep.include({ // expecting opening tag but got prolog
-            code: DiagnosticMessages.xmlGenericParseError('').code,
-            range: Range.create(1, 12, 1, 18)
-        });
-        expect(parser.diagnostics[1]).to.deep.include({
-            ...DiagnosticMessages.xmlGenericParseError('Syntax error: whitespace found before the XML prolog'),
-            range: Range.create(0, 0, 1, 12)
-        });
+        expectDiagnostics(parser, [{ // expecting opening tag but got prolog
+            code: DiagnosticMessages.syntaxError('Expecting token of type --> OPEN <-- but found --> \'<?xml \' <--').code,
+            location: { range: Range.create(1, 12, 1, 18) }
+        }, {
+            ...DiagnosticMessages.syntaxError('Syntax error: whitespace found before the XML prolog'),
+            location: { range: Range.create(0, 0, 1, 12) }
+        }]);
     });
 });
diff --git a/src/parser/SGParser.ts b/src/parser/SGParser.ts
index bf2b5a6ce..7683de28c 100644
--- a/src/parser/SGParser.ts
+++ b/src/parser/SGParser.ts
@@ -1,11 +1,12 @@
 import type { AttributeCstNode, ContentCstNode, DocumentCstNode, ElementCstNode } from '@xml-tools/parser';
 import * as parser from '@xml-tools/parser';
 import { DiagnosticMessages } from '../DiagnosticMessages';
-import type { Diagnostic, Range } from 'vscode-languageserver';
 import util from '../util';
-import { SGAst, SGProlog, SGChildren, SGComponent, SGField, SGFunction, SGInterface, SGNode, SGScript } from './SGTypes';
-import type { SGTag, SGToken, SGAttribute, SGReferences } from './SGTypes';
+import { SGAst, SGProlog, SGChildren, SGComponent, SGInterfaceField, SGInterfaceFunction, SGInterface, SGNode, SGScript, SGAttribute } from './SGTypes';
+import type { SGElement, SGToken, SGReferences } from './SGTypes';
 import { isSGComponent } from '../astUtils/xml';
+import type { BsDiagnostic } from '../interfaces';
+import type { Location, Range } from 'vscode-languageserver';
 
 export default class SGParser {
 
@@ -19,9 +20,12 @@ export default class SGParser {
     /**
      * The list of diagnostics found during the parse process
      */
-    public diagnostics = [] as Diagnostic[];
+    public diagnostics = [] as BsDiagnostic[];
 
-    private pkgPath: string;
+    /**
+     * The options used to parse the file
+     */
+    public options: SGParseOptions;
 
     private _references: SGReferences;
 
@@ -49,37 +53,44 @@ export default class SGParser {
      * Walk the AST to extract references to useful bits of information
      */
     private findReferences() {
-        this._references = emptySGReferences();
+        this._references = this.emptySGReferences();
 
-        const { component } = this.ast;
-        if (!component) {
+        const { componentElement } = this.ast;
+        if (!componentElement) {
             return;
         }
 
-        const nameAttr = component.getAttribute('name');
-        if (nameAttr?.value) {
-            this._references.name = nameAttr.value;
-        }
-        const extendsAttr = component.getAttribute('extends');
-        if (extendsAttr?.value) {
-            this._references.extends = extendsAttr.value;
+        const nameAttr = componentElement.getAttribute('name');
+        this._references.name = nameAttr?.tokens.value;
+        const extendsAttr = componentElement.getAttribute('extends');
+        if (extendsAttr?.tokens.value) {
+            this._references.extends = extendsAttr.tokens.value;
         }
 
-        for (const script of component.scripts) {
+        for (const script of componentElement.scriptElements) {
             const uriAttr = script.getAttribute('uri');
-            if (uriAttr) {
-                const uri = uriAttr.value.text;
+            if (uriAttr?.tokens.value) {
+                const uri = uriAttr.tokens.value.text;
                 this._references.scriptTagImports.push({
-                    filePathRange: uriAttr.value.range,
+                    filePathRange: uriAttr.tokens.value.location?.range,
                     text: uri,
-                    pkgPath: util.getPkgPathFromTarget(this.pkgPath, uri)
+                    destPath: util.getPkgPathFromTarget(this.options.destPath, uri)
                 });
             }
         }
     }
 
-    public parse(pkgPath: string, fileContents: string) {
-        this.pkgPath = pkgPath;
+    private sanitizeParseOptions(options: SGParseOptions) {
+        options ??= {
+            destPath: undefined
+        };
+        options.trackLocations ??= true;
+        return options;
+    }
+
+
+    public parse(fileContents: string, options?: SGParseOptions) {
+        this.options = this.sanitizeParseOptions(options);
         this.diagnostics = [];
 
         const { cst, tokenVector, lexErrors, parseErrors } = parser.parse(fileContents);
@@ -88,13 +99,13 @@ export default class SGParser {
         if (lexErrors.length) {
             for (const err of lexErrors) {
                 this.diagnostics.push({
-                    ...DiagnosticMessages.xmlGenericParseError(`Syntax error: ${err.message}`),
-                    range: util.createRange(
+                    ...DiagnosticMessages.syntaxError(`Syntax error: ${err.message}`),
+                    location: this.getLocationFromRange(util.createRange(
                         err.line - 1,
                         err.column,
                         err.line - 1,
                         err.column + err.length
-                    )
+                    ))
                 });
             }
         }
@@ -102,12 +113,12 @@ export default class SGParser {
             const err = parseErrors[0];
             const token = err.token;
             this.diagnostics.push({
-                ...DiagnosticMessages.xmlGenericParseError(`Syntax error: ${err.message}`),
-                range: !isNaN(token.startLine) ? rangeFromTokens(token) : util.createRange(0, 0, 0, Number.MAX_VALUE)
+                ...DiagnosticMessages.syntaxError(`Syntax error: ${err.message}`),
+                location: this.getLocationFromRange(!isNaN(token.startLine) ? this.rangeFromToken(token) : util.createRange(0, 0, 0, Number.MAX_VALUE))
             });
         }
 
-        const { prolog, root } = buildAST(cst as any, this.diagnostics);
+        const { prolog, root } = this.buildAST(cst as any);
         if (!root) {
             const token1 = tokenVector[0];
             const token2 = tokenVector[1];
@@ -117,231 +128,273 @@ export default class SGParser {
                 token2?.image.trim() === '<?xml'
             ) {
                 this.diagnostics.push({
-                    ...DiagnosticMessages.xmlGenericParseError('Syntax error: whitespace found before the XML prolog'),
-                    range: rangeFromTokens(token1)
+                    ...DiagnosticMessages.syntaxError('Syntax error: whitespace found before the XML prolog'),
+                    location: this.getLocationFromRange(this.rangeFromToken(token1))
                 });
             }
         }
 
         if (isSGComponent(root)) {
-            this.ast = new SGAst(prolog, root, root);
+            this.ast = new SGAst({ prologElement: prolog, rootElement: root, componentElement: root });
         } else {
             if (root) {
                 //error: not a component
                 this.diagnostics.push({
-                    ...DiagnosticMessages.xmlUnexpectedTag(root.tag.text),
-                    range: root.tag.range
+                    ...DiagnosticMessages.xmlUnexpectedTag(root.tokens.startTagName.text),
+                    location: root.tokens.startTagName.location
                 });
             }
-            this.ast = new SGAst(prolog, root);
+            this.ast = new SGAst({ prologElement: prolog, rootElement: root });
         }
     }
-}
 
-function buildAST(cst: DocumentCstNode, diagnostics: Diagnostic[]) {
-    const { prolog: cstProlog, element } = cst.children;
+    buildAST(cst: DocumentCstNode) {
+        const { prolog: cstProlog, element } = cst.children;
+
+        let prolog: SGProlog;
+        if (cstProlog?.[0]) {
+            const ctx = cstProlog[0].children;
+            prolog = new SGProlog({
+                // <?
+                startTagOpen: this.createPartialToken(ctx.XMLDeclOpen[0], 0, 2),
+                // xml
+                startTagName: this.createPartialToken(ctx.XMLDeclOpen[0], 2, 3),
+                attributes: this.mapAttributes(ctx.attribute),
+                // ?>
+                startTagClose: this.mapToken(ctx.SPECIAL_CLOSE[0])
+            });
+        }
 
-    let prolog: SGProlog;
-    if (cstProlog?.[0]) {
-        const ctx = cstProlog[0].children;
-        prolog = new SGProlog(
-            mapToken(ctx.XMLDeclOpen[0]),
-            mapAttributes(ctx.attribute),
-            rangeFromTokens(ctx.XMLDeclOpen[0], ctx.SPECIAL_CLOSE[0])
-        );
-    }
+        let root: SGElement;
+        if (element.length > 0 && element[0]?.children?.Name) {
+            root = this.mapElement(element[0]);
+        }
 
-    let root: SGTag;
-    if (element.length > 0 && element[0]?.children?.Name) {
-        root = mapElement(element[0], diagnostics);
+        return {
+            prolog: prolog,
+            root: root
+        };
     }
 
-    return {
-        prolog: prolog,
-        root: root
-    };
-}
-
-//not exposed by @xml-tools/parser
-interface IToken {
-    image: string;
-    startOffset: number;
-    startLine?: number;
-    startColumn?: number;
-    endOffset?: number;
-    endLine?: number;
-    endColumn?: number;
-}
+    mapElement({ children }: ElementCstNode): SGElement {
+        const startTagOpen = this.mapToken(children.OPEN[0]);
+        const startTagName = this.mapToken(children.Name[0]);
+        const attributes = this.mapAttributes(children.attribute);
+        const startTagClose = this.mapToken((children.SLASH_CLOSE ?? children.START_CLOSE)?.[0]);
+        const endTagOpen = this.mapToken(children.SLASH_OPEN?.[0]);
+        const endTagName = this.mapToken(children.END_NAME?.[0]);
+        const endTagClose = this.mapToken(children.END?.[0]);
+
+        const content = children.content?.[0];
+
+        let constructorOptions = {
+            startTagOpen: startTagOpen,
+            startTagName: startTagName,
+            attributes: attributes,
+            startTagClose: startTagClose,
+            elements: [],
+            endTagOpen: endTagOpen,
+            endTagName: endTagName,
+            endTagClose: endTagClose
+        };
 
-function mapElement({ children }: ElementCstNode, diagnostics: Diagnostic[]): SGTag {
-    const nameToken = children.Name[0];
-    let range: Range;
-    const selfClosing = !!children.SLASH_CLOSE;
-    if (selfClosing) {
-        const scToken = children.SLASH_CLOSE[0];
-        range = rangeFromTokens(nameToken, scToken);
-    } else {
-        const endToken = children.END?.[0];
-        range = rangeFromTokens(nameToken, endToken);
-    }
-    const name = mapToken(nameToken);
-    const attributes = mapAttributes(children.attribute);
-    const content = children.content?.[0];
-    switch (name.text) {
-        case 'component':
-            const componentContent = mapElements(content, ['interface', 'script', 'children', 'customization'], diagnostics);
-            return new SGComponent(name, attributes, componentContent, range);
-        case 'interface':
-            const interfaceContent = mapElements(content, ['field', 'function'], diagnostics);
-            return new SGInterface(name, interfaceContent, range);
-        case 'field':
-            if (hasElements(content)) {
-                reportUnexpectedChildren(name, diagnostics);
-            }
-            return new SGField(name, attributes, range);
-        case 'function':
-            if (hasElements(content)) {
-                reportUnexpectedChildren(name, diagnostics);
-            }
-            return new SGFunction(name, attributes, range);
-        case 'script':
-            if (hasElements(content)) {
-                reportUnexpectedChildren(name, diagnostics);
-            }
-            const cdata = getCdata(content);
-            return new SGScript(name, attributes, cdata, range);
-        case 'children':
-            const childrenContent = mapNodes(content);
-            return new SGChildren(name, childrenContent, range);
-        default:
-            const nodeContent = mapNodes(content);
-            return new SGNode(name, attributes, nodeContent, range);
+        switch (startTagName.text) {
+            case 'component':
+                constructorOptions.elements = this.mapElements(content, ['interface', 'script', 'children', 'customization']);
+                return new SGComponent(constructorOptions);
+            case 'interface':
+                constructorOptions.elements = this.mapElements(content, ['field', 'function']);
+                return new SGInterface(constructorOptions);
+            case 'field':
+                if (this.hasElements(content)) {
+                    this.diagnostics.push({
+                        location: startTagName.location,
+                        ...DiagnosticMessages.xmlUnexpectedChildren(startTagName.text)
+                    });
+                }
+                return new SGInterfaceField(constructorOptions);
+            case 'function':
+                if (this.hasElements(content)) {
+                    this.diagnostics.push({
+                        location: startTagName.location,
+                        ...DiagnosticMessages.xmlUnexpectedChildren(startTagName.text)
+                    });
+                }
+                return new SGInterfaceFunction(constructorOptions);
+            case 'script':
+                if (this.hasElements(content)) {
+                    this.diagnostics.push({
+                        location: startTagName.location,
+                        ...DiagnosticMessages.xmlUnexpectedChildren(startTagName.text)
+                    });
+                }
+                const script = new SGScript(constructorOptions);
+                script.cdata = this.getCdata(content);
+                return script;
+            case 'children':
+                constructorOptions.elements = this.mapNodes(content);
+                return new SGChildren(constructorOptions);
+            default:
+                constructorOptions.elements = this.mapNodes(content);
+                return new SGNode(constructorOptions);
+        }
     }
-}
-
-function reportUnexpectedChildren(name: SGToken, diagnostics: Diagnostic[]) {
-    diagnostics.push({
-        ...DiagnosticMessages.xmlUnexpectedChildren(name.text),
-        range: name.range
-    });
-}
 
-function mapNode({ children }: ElementCstNode): SGNode {
-    const nameToken = children.Name[0];
-    let range: Range;
-    const selfClosing = !!children.SLASH_CLOSE;
-    if (selfClosing) {
-        const scToken = children.SLASH_CLOSE[0];
-        range = rangeFromTokens(nameToken, scToken);
-    } else {
-        const endToken = children.END?.[0];
-        range = rangeFromTokens(nameToken, endToken);
+    mapNode({ children }: ElementCstNode): SGNode {
+        return new SGNode({
+            //<
+            startTagOpen: this.mapToken(children.OPEN[0]),
+            // TagName
+            startTagName: this.mapToken(children.Name[0]),
+            attributes: this.mapAttributes(children.attribute),
+            // > or />
+            startTagClose: this.mapToken((children.SLASH_CLOSE ?? children.START_CLOSE)?.[0]),
+            elements: this.mapNodes(children.content?.[0]),
+            // </
+            endTagOpen: this.mapToken(children.SLASH_OPEN?.[0]),
+            // TagName
+            endTagName: this.mapToken(children.END_NAME?.[0]),
+            // >
+            endTagClose: this.mapToken(children.END?.[0])
+        });
     }
-    const name = mapToken(nameToken);
-    const attributes = mapAttributes(children.attribute);
-    const content = children.content?.[0];
-    const nodeContent = mapNodes(content);
-    return new SGNode(name, attributes, nodeContent, range);
-}
 
-function mapElements(content: ContentCstNode, allow: string[], diagnostics: Diagnostic[]): SGTag[] {
-    if (!content) {
-        return [];
-    }
-    const { element } = content.children;
-    const tags: SGTag[] = [];
-    if (element) {
-        for (const entry of element) {
-            const name = entry.children.Name?.[0];
-            if (name?.image) {
-                if (allow.includes(name.image)) {
-                    tags.push(mapElement(entry, diagnostics));
+    mapElements(content: ContentCstNode, allow: string[]): SGElement[] {
+        if (!content) {
+            return [];
+        }
+        const { element } = content.children;
+        const tags: SGElement[] = [];
+        if (element) {
+            for (const entry of element) {
+                const name = entry.children.Name?.[0];
+                if (name?.image) {
+                    if (!allow.includes(name.image)) {
+                        //unexpected tag
+                        this.diagnostics.push({
+                            ...DiagnosticMessages.xmlUnexpectedTag(name.image),
+                            location: this.getLocationFromRange(this.rangeFromToken(name))
+                        });
+                    }
+                    tags.push(this.mapElement(entry));
                 } else {
-                    //unexpected tag
-                    diagnostics.push({
-                        ...DiagnosticMessages.xmlUnexpectedTag(name.image),
-                        range: rangeFromTokens(name)
-                    });
+                    //bad xml syntax...
                 }
-            } else {
-                //bad xml syntax...
             }
         }
+        return tags;
     }
-    return tags;
-}
 
-function mapNodes(content: ContentCstNode): SGNode[] {
-    if (!content) {
-        return [];
+    mapNodes(content: ContentCstNode): SGNode[] {
+        if (!content) {
+            return [];
+        }
+        const { element } = content.children;
+        return element?.map(element => this.mapNode(element));
     }
-    const { element } = content.children;
-    return element?.map(element => mapNode(element));
-}
 
-function hasElements(content: ContentCstNode): boolean {
-    return !!content?.children.element?.length;
-}
-
-function getCdata(content: ContentCstNode): SGToken {
-    if (!content) {
-        return undefined;
+    hasElements(content: ContentCstNode): boolean {
+        return !!content?.children.element?.length;
     }
-    const { CData } = content.children;
-    return mapToken(CData?.[0]);
-}
 
-function mapToken(token: IToken, unquote = false): SGToken {
-    if (!token) {
-        return undefined;
+    getCdata(content: ContentCstNode): SGToken {
+        if (!content) {
+            return undefined;
+        }
+        const { CData } = content.children;
+        return this.mapToken(CData?.[0]);
     }
-    return {
-        text: unquote ? stripQuotes(token.image) : token.image,
-        range: unquote ? rangeFromTokenValue(token) : rangeFromTokens(token)
-    };
-}
 
-function mapAttributes(attributes: AttributeCstNode[]): SGAttribute[] {
-    return attributes?.map(({ children }) => {
-        const key = children.Name[0];
-        const value = children.STRING?.[0];
-
-        let openQuote: SGToken;
-        let closeQuote: SGToken;
-        //capture the leading and trailing quote tokens
-        const match = /^(["']).*?(["'])$/.exec(value?.image);
-        if (match) {
-            const range = rangeFromTokenValue(value);
-            openQuote = {
-                text: match[1],
-                range: util.createRange(range.start.line, range.start.character, range.start.line, range.start.character + 1)
-            };
-            closeQuote = {
-                text: match[1],
-                range: util.createRange(range.end.line, range.end.character - 1, range.end.line, range.end.character)
+    private mapToken(token: IToken): SGToken {
+        if (token) {
+            return {
+                text: token.image,
+                //TODO should this be coerced into a uri?
+                location: util.createLocationFromRange(this.options.srcPath, this.rangeFromToken(token))
             };
+        } else {
+            return undefined;
+        }
+    }
+
+    /**
+     * Build SGAttributes from the underlying XML parser attributes array
+     */
+    mapAttributes(attributes: AttributeCstNode[]) {
+        // this is a hot function and has been optimized, so don't refactor unless you know what you're doing...
+        const result = [] as SGAttribute[];
+        if (attributes) {
+            // eslint-disable-next-line @typescript-eslint/prefer-for-of
+            for (let i = 0; i < attributes.length; i++) {
+
+                const children = attributes[i].children;
+                const attr = new SGAttribute({ key: this.mapToken(children.Name[0]) });
+
+                if (children.EQUALS) {
+                    attr.tokens.equals = this.mapToken(children.EQUALS[0]);
+                }
+                if (children.STRING) {
+                    const valueToken = children.STRING[0];
+                    attr.tokens.openingQuote = this.createPartialToken(valueToken, 0, 1);
+                    attr.tokens.value = this.createPartialToken(valueToken, 1, -2);
+                    attr.tokens.closingQuote = this.createPartialToken(valueToken, -1, 1);
+                }
+                result.push(attr);
+            }
+        }
+        return result;
+    }
+
+    /**
+     * Create a partial token from the given token. This only supports single-line tokens.
+     * @param token the offset to start the new token. If negative, subtracts from token.length
+     * @param startOffset the offset to start the new token. If negative, subtracts from token.length
+     * @param length the length of the text to keep. If negative, subtracts from token.length
+     */
+    public createPartialToken(token: IToken, startOffset: number, length?: number): SGToken {
+        if (startOffset < 0) {
+            startOffset = token.image.length + startOffset;
+        }
+        if (length === undefined) {
+            length = token.image.length - startOffset;
+        }
+        if (length < 0) {
+            length = token.image.length + length;
         }
         return {
-            key: mapToken(key),
-            openQuote: openQuote,
-            value: mapToken(value, true),
-            closeQuote: closeQuote,
-            range: rangeFromTokens(key, value)
+            text: token.image.substring(startOffset, startOffset + length),
+            //xmltools startLine is 1-based, we need 0-based which is why we subtract 1 below
+            location: util.createLocation(
+                token.startLine - 1,
+                token.startColumn - 1 + startOffset,
+                token.endLine - 1,
+                token.startColumn - 1 + (startOffset + length),
+                this.options.srcPath
+            )
         };
-    }) || [];
-}
+    }
 
-//make range from `start` to `end` tokens
-function rangeFromTokens(start: IToken, end?: IToken) {
-    if (!end) {
-        end = start;
+    /**
+     * Create a range based on the xmltools token
+     */
+    public rangeFromToken(token: IToken) {
+        return util.createRange(
+            token.startLine - 1,
+            token.startColumn - 1,
+            token.endLine - 1,
+            token.endColumn
+        );
+    }
+
+    private emptySGReferences(): SGReferences {
+        return {
+            scriptTagImports: []
+        };
+    }
+
+    private getLocationFromRange(range: Range): Location {
+        return util.createLocationFromRange(util.pathToUri(this.options.srcPath), range);
     }
-    return util.createRange(
-        start.startLine - 1,
-        start.startColumn - 1,
-        end.endLine - 1,
-        end.endColumn
-    );
 }
 
 //make range not including quotes
@@ -357,15 +410,36 @@ export function rangeFromTokenValue(token: IToken) {
     );
 }
 
-function stripQuotes(value: string) {
-    if (value?.length > 1) {
-        return value.substr(1, value.length - 2);
-    }
-    return '';
+//not exposed by @xml-tools/parser
+interface IToken {
+    image: string;
+    startOffset: number;
+    startLine?: number;
+    startColumn?: number;
+    endOffset?: number;
+    endLine?: number;
+    endColumn?: number;
 }
 
-function emptySGReferences(): SGReferences {
-    return {
-        scriptTagImports: []
-    };
+export interface CstNodeLocation {
+    startOffset: number;
+    startLine: number;
+    startColumn?: number;
+    endOffset?: number;
+    endLine?: number;
+    endColumn?: number;
+}
+
+export interface SGParseOptions {
+    /**
+     * Path to the file where this source code originated
+     */
+    srcPath?: string;
+
+    destPath: string;
+    /**
+     * Should locations be tracked. If false, the `range` property will be omitted
+     * @default true
+     */
+    trackLocations?: boolean;
 }
diff --git a/src/parser/SGTypes.ts b/src/parser/SGTypes.ts
index 07d960bcf..2cdd90e10 100644
--- a/src/parser/SGTypes.ts
+++ b/src/parser/SGTypes.ts
@@ -1,199 +1,403 @@
 import { SourceNode } from 'source-map';
-import type { Range } from 'vscode-languageserver';
-import { createSGAttribute } from '../astUtils/creators';
-import { isSGChildren, isSGCustomization, isSGField, isSGFunction, isSGInterface, isSGScript } from '../astUtils/xml';
+import type { Location } from 'vscode-languageserver';
+import { createSGAttribute, createSGInterface, createSGInterfaceField, createSGInterfaceFunction, createSGToken } from '../astUtils/creators';
 import type { FileReference, TranspileResult } from '../interfaces';
 import util from '../util';
 import type { TranspileState } from './TranspileState';
 
 export interface SGToken {
     text: string;
-    range?: Range;
+    location?: Location;
 }
 
-export interface SGAttribute {
-    key: SGToken;
-    openQuote?: SGToken;
-    value: SGToken;
-    closeQuote?: SGToken;
-    range?: Range;
+export class SGAttribute {
+    public constructor(options: {
+        key: SGToken;
+        equals?: SGToken;
+        openingQuote?: SGToken;
+        value?: SGToken;
+        closingQuote?: SGToken;
+    }) {
+        this.tokens = {
+            key: options.key,
+            equals: options.equals,
+            openingQuote: options.openingQuote,
+            value: options.value,
+            closingQuote: options.closingQuote
+        };
+    }
+
+    public readonly tokens: {
+        readonly key: SGToken;
+        equals?: SGToken;
+        openingQuote?: SGToken;
+        value?: SGToken;
+        closingQuote?: SGToken;
+    };
+
+    public get key() {
+        return this.tokens.key.text;
+    }
+
+    /**
+     * The value of this attribute. This does not including the opening or closing quote
+     */
+    public get value(): string | undefined {
+        return this.tokens.value?.text;
+    }
+    public set value(val) {
+        if (val === null || val === undefined) {
+            val = '';
+        }
+        if (!this.tokens.equals) {
+            this.tokens.equals = { text: '=' };
+        }
+        if (this.tokens.value) {
+            this.tokens.value.text = val;
+        } else {
+            this.tokens.value = { text: val };
+        }
+    }
+
+    public get location(): Location {
+        if (!this._location) {
+            this._location = util.createBoundingLocation(
+                this.tokens.key,
+                this.tokens.equals,
+                this.tokens.openingQuote,
+                this.tokens.value,
+                this.tokens.closingQuote
+            );
+        }
+        return this._location;
+    }
+    private _location = null as Location;
+
+    public transpile(state: TranspileState) {
+        const result: TranspileResult = [
+            state.transpileToken(this.tokens.key)
+        ];
+        if (this.tokens.value) {
+            result.push(
+                state.transpileToken(this.tokens.equals, '='),
+                state.transpileToken(this.tokens.openingQuote, '"'),
+                state.transpileToken(this.tokens.value),
+                state.transpileToken(this.tokens.closingQuote, '"')
+            );
+        }
+        return util.sourceNodeFromTranspileResult(null, null, null, result);
+    }
+
+    public clone() {
+        return new SGAttribute(this.tokens);
+    }
 }
 
-export class SGTag {
+export class SGElement {
+
+    constructor(options: {
+        startTagOpen?: SGToken;
+        startTagName: SGToken;
+        attributes?: SGAttribute[];
+        startTagClose?: SGToken;
+        elements?: SGElement[];
+        endTagOpen?: SGToken;
+        endTagName?: SGToken;
+        endTagClose?: SGToken;
+    }) {
+        this.tokens = {
+            startTagOpen: options.startTagOpen,
+            startTagName: options.startTagName,
+            startTagClose: options.startTagClose,
+            endTagOpen: options.endTagOpen,
+            endTagName: options.endTagName,
+            endTagClose: options.endTagClose
+        };
+        this.attributes = options.attributes ?? [];
+        this.elements = options.elements ?? [];
+    }
+
+    public readonly tokens: {
+        /**
+         * The first portion of the startTag. (i.e. `<` or `<?`)
+         */
+        readonly startTagOpen?: SGToken;
+        /**
+         * The name of the opening tag (i.e. CoolTag in `<CoolTag>`).
+         */
+        readonly startTagName: SGToken;
+        /**
+         * The last bit of the startTag (i.e. `/>` for self-closing, `?>` for xml prolog, or `>` for tag with children)
+         */
+        readonly startTagClose?: SGToken;
+        /**
+         * The endTag opening char `<`
+         */
+        readonly endTagOpen?: SGToken;
+        /**
+         * The name of the ending tag (i.e. CoolTag in `</CoolTag>`)
+         */
+        readonly endTagName?: SGToken;
+        /**
+         * The endTag closing char `>`
+         */
+        readonly endTagClose?: SGToken;
+    };
+
+    /**
+     * Array of attributes found on this tag
+     */
+    public readonly attributes = [] as SGAttribute[];
+
+    /**
+     * The array of direct children AST elements of this AST node
+     */
+    public readonly elements = [] as SGElement[];
+
+    public get location() {
+        if (!this._location) {
+            this._location = util.createBoundingLocation(
+                this.tokens.startTagOpen,
+                this.tokens.startTagName,
+                this.attributes?.[this.attributes?.length - 1],
+                this.tokens.startTagClose,
+                this.elements?.[this.elements?.length - 1],
+                this.tokens.endTagOpen,
+                this.tokens.endTagName,
+                this.tokens.endTagClose
+            );
+        }
+        return this._location;
+    }
+    private _location = null as Location;
 
-    constructor(
-        public tag: SGToken,
-        public attributes: SGAttribute[] = [],
-        public range?: Range
-    ) { }
+    /**
+     * Is this a self-closing tag?
+     */
+    get isSelfClosing() {
+        return this.tokens.startTagClose && this.tokens.startTagClose?.text !== '>';
+    }
 
     get id() {
         return this.getAttributeValue('id');
     }
     set id(value: string) {
-        this.setAttribute('id', value);
-    }
-
-    getAttribute(name: string): SGAttribute | undefined {
-        return this.attributes.find(att => att.key.text.toLowerCase() === name);
+        this.setAttributeValue('id', value);
+    }
+
+    /**
+     * Get the name of this tag.
+     */
+    public get tagName() {
+        return this.tokens.startTagName?.text;
+    }
+
+    /**
+     * Find all direct children by their tag name (case insensitive).
+     * This does not step into children's children.
+     *
+     */
+    public getElementsByTagName<T extends SGElement>(tagName: string) {
+        const result = [] as T[];
+        const lowerTagName = tagName.toLowerCase();
+        for (const el of this.elements) {
+            if (el.tokens.startTagName.text.toLowerCase() === lowerTagName) {
+                result.push(el as T);
+            }
+        }
+        return result as Readonly<Array<T>>;
+    }
+
+    /**
+     * Add a child to the end of the children array
+     */
+    public addChild<T extends SGElement>(tag: T) {
+        this.elements.push(tag);
+        return tag;
+    }
+
+    /**
+     * Remove a child from the children array.
+     * @returns true if node was found and removed, false if the node wasn't there and thus nothing was done
+     */
+    public removeChild(tag: SGElement) {
+        const idx = this.elements.indexOf(tag);
+        if (idx > -1) {
+            this.elements.splice(idx, 1);
+            return true;
+        }
+        return false;
     }
 
-    getAttributeValue(name: string): string | undefined {
-        return this.getAttribute(name.toLowerCase())?.value?.text;
+    /**
+     * Does this node have the specified attribute?
+     */
+    public hasAttribute(name: string) {
+        return !!this.getAttribute(name);
     }
 
-    setAttribute(name: string, value: string) {
-        const attr = this.getAttribute(name);
-        if (attr) {
-            if (value) {
-                attr.value = { text: value };
-                attr.range = undefined;
-            } else {
-                this.attributes.splice(this.attributes.indexOf(attr), 1);
+    /**
+     * Get an SGAttribute by its name (case INsensitive)
+     */
+    public getAttribute(name: string): SGAttribute | undefined {
+        const nameLower = name.toLowerCase();
+        for (const attr of this.attributes) {
+            if (attr.tokens.key?.text.toLowerCase() === nameLower) {
+                return attr;
             }
-        } else if (value) {
-            this.attributes.push({
-                key: { text: name },
-                value: { text: value }
-            });
         }
     }
 
-    transpile(state: TranspileState): SourceNode {
-        return new SourceNode(null, null, state.srcPath, [
-            state.indentText,
-            '<',
-            state.transpileToken(this.tag),
-            ...this.transpileAttributes(state, this.attributes),
-            ...this.transpileBody(state)
-        ]);
+    /**
+     * Get an attribute value by its name
+     */
+    public getAttributeValue(name: string): string | undefined {
+        return this.getAttribute(name)?.tokens.value?.text;
     }
 
-    protected transpileBody(state: TranspileState): (string | SourceNode)[] {
-        return [' />\n'];
+    /**
+     * Set an attribute value by its name. If no attribute exists with this name, it is created
+     */
+    public setAttributeValue(name: string, value: string) {
+        if (value === undefined) {
+            this.removeAttribute(name);
+        } else {
+            let attr = this.getAttribute(name);
+            //create an attribute with this name if we don't have one yet
+            if (!attr) {
+                attr = createSGAttribute(name, value);
+                this.attributes.push(
+                    attr
+                );
+            }
+            attr.value = value;
+        }
     }
 
-    protected transpileAttributes(state: TranspileState, attributes: SGAttribute[]): (string | SourceNode)[] {
-        const result = [];
-        for (const attr of attributes) {
-            result.push(
-                ' ',
-                state.transpileToken(attr.key),
-                '=',
-                state.transpileToken(attr.openQuote ?? { text: '"' }),
-                state.transpileToken(attr.value),
-                state.transpileToken(attr.closeQuote ?? { text: '"' })
-            );
+    /**
+     * Remove an attribute by its name. DO NOT USE this to edit AST (use ASTEditor)
+     * @returns true if an attribute was found and removed. False if no attribute was found
+     */
+    public removeAttribute(name: string) {
+        const nameLower = name.toLowerCase();
+        for (let i = 0; i < this.attributes.length; i++) {
+            if (this.attributes[i].key?.toLowerCase() === nameLower) {
+                this.attributes.splice(i, 1);
+                return true;
+            }
         }
-        return result;
+        return false;
     }
-}
 
-export class SGProlog extends SGTag {
-
-    transpile(state: TranspileState) {
-        return new SourceNode(null, null, state.srcPath, [
-            '<?xml',
-            ...this.transpileAttributes(state, this.attributes),
-            ' ?>\n'
+    public transpile(state: TranspileState) {
+        return util.sourceNodeFromTranspileResult(null, null, null, [
+            state.transpileToken(this.tokens.startTagOpen, '<'), // <
+            state.transpileToken(this.tokens.startTagName),
+            this.transpileAttributes(state, this.attributes),
+            this.transpileBody(state)
         ]);
     }
-}
-
-export class SGNode extends SGTag {
-
-    constructor(
-        tag: SGToken,
-        attributes?: SGAttribute[],
-        public children: SGNode[] = [],
-        range?: Range
-    ) {
-        super(tag, attributes, range);
-    }
 
-    protected transpileBody(state: TranspileState): (string | SourceNode)[] {
-        if (this.children.length > 0) {
-            const body: (string | SourceNode)[] = ['>\n'];
+    protected transpileBody(state: TranspileState) {
+        if (this.isSelfClosing && this.elements.length === 0) {
+            return util.sourceNodeFromTranspileResult(null, null, null, [
+                ' ',
+                state.transpileToken(this.tokens.startTagClose, '/>'),
+                state.newline
+            ]);
+        } else {
+            // it is possible that the original tag isSelfClosing, but new elements have been added to it
+            // in that case, create a new startTagClose token for transpilation.
+            const startTagClose = this.isSelfClosing ? createSGToken('>', this.tokens.startTagClose.location) : this.tokens.startTagClose;
+            const chunks: TranspileResult = [
+                state.transpileToken(startTagClose, '>'),
+                state.newline
+            ];
             state.blockDepth++;
-            body.push(...this.children.map(node => node.transpile(state)));
+            for (const child of this.elements) {
+                chunks.push(
+                    state.indentText,
+                    child.transpile(state)
+                );
+            }
             state.blockDepth--;
-            body.push(state.indentText, '</', this.tag.text, '>\n');
-            return body;
-        } else {
-            return super.transpileBody(state);
+            chunks.push(
+                state.indentText,
+                state.transpileToken(this.tokens.endTagOpen, '</'),
+                state.transpileToken(this.tokens.endTagName ?? this.tokens.startTagName),
+                state.transpileToken(this.tokens.endTagClose, '>'),
+                state.newline
+            );
+            return util.sourceNodeFromTranspileResult(null, null, null, chunks);
         }
     }
-}
 
-export class SGChildren extends SGNode {
-
-    constructor(
-        tag: SGToken = { text: 'children' },
-        children: SGNode[] = [],
-        range?: Range
-    ) {
-        super(tag, [], children, range);
+    protected transpileAttributes(state: TranspileState, attributes: SGAttribute[]) {
+        const chunks = [];
+        for (const attr of attributes) {
+            chunks.push(' ', attr.transpile(state));
+        }
+        return new SourceNode(null, null, null, chunks);
     }
 }
 
-export class SGScript extends SGTag {
+export class SGProlog extends SGElement { }
 
-    constructor(
-        tag: SGToken = { text: 'script' },
-        attributes?: SGAttribute[],
-        public cdata?: SGToken,
-        range?: Range
-    ) {
-        super(tag, attributes, range);
-        if (!attributes) {
-            this.type = 'text/brightscript';
-        }
-    }
+export class SGNode extends SGElement { }
+
+export class SGChildren extends SGElement { }
+
+export class SGCustomization extends SGElement { }
+
+export class SGScript extends SGElement {
+
+    public cdata?: SGToken;
 
     get type() {
         return this.getAttributeValue('type');
     }
     set type(value: string) {
-        this.setAttribute('type', value);
+        this.setAttributeValue('type', value);
     }
 
     get uri() {
         return this.getAttributeValue('uri');
     }
     set uri(value: string) {
-        this.setAttribute('uri', value);
+        this.setAttributeValue('uri', value);
     }
 
-    protected transpileBody(state: TranspileState): (string | SourceNode)[] {
+    protected transpileBody(state: TranspileState) {
         if (this.cdata) {
-            return [
+            return util.sourceNodeFromTranspileResult(null, null, null, [
                 '>',
                 state.transpileToken(this.cdata),
                 '</',
-                this.tag.text,
-                '>\n'
-            ];
+                this.tokens.startTagName.text,
+                '>',
+                state.newline
+            ]);
         } else {
             return super.transpileBody(state);
         }
     }
 
-    protected transpileAttributes(state: TranspileState, attributes: SGAttribute[]): (string | SourceNode)[] {
+    protected transpileAttributes(state: TranspileState, attributes: SGAttribute[]) {
         const modifiedAttributes = [] as SGAttribute[];
         let foundType = false;
         const bsExtensionRegexp = /\.bs$/i;
 
         for (const attr of attributes) {
-            const lowerKey = attr.key.text.toLowerCase();
-            if (lowerKey === 'uri' && bsExtensionRegexp.exec(attr.value.text)) {
-                modifiedAttributes.push(
-                    util.cloneSGAttribute(attr, attr.value.text.replace(bsExtensionRegexp, '.brs'))
-                );
+            const lowerKey = attr.tokens.key?.text.toLowerCase();
+            if (lowerKey === 'uri' && bsExtensionRegexp.exec(attr.tokens.value?.text)) {
+                const clone = attr.clone();
+                clone.tokens.value.text.replace(bsExtensionRegexp, '.brs');
+                modifiedAttributes.push(clone);
             } else if (lowerKey === 'type') {
                 foundType = true;
-                if (attr.value.text.toLowerCase().endsWith('brighterscript')) {
+                if (attr.tokens.value?.text.toLowerCase().endsWith('brighterscript')) {
                     modifiedAttributes.push(
-                        util.cloneSGAttribute(attr, 'text/brightscript')
+                        attr.clone()
                     );
                 } else {
                     modifiedAttributes.push(attr);
@@ -211,108 +415,147 @@ export class SGScript extends SGTag {
     }
 }
 
-export class SGField extends SGTag {
-
-    constructor(
-        tag: SGToken = { text: 'field' },
-        attributes: SGAttribute[] = [],
-        range?: Range
-    ) {
-        super(tag, attributes, range);
-    }
+export class SGInterfaceField extends SGElement {
 
     get type() {
         return this.getAttributeValue('type');
     }
     set type(value: string) {
-        this.setAttribute('type', value);
+        this.setAttributeValue('type', value);
     }
 
     get alias() {
         return this.getAttributeValue('alias');
     }
     set alias(value: string) {
-        this.setAttribute('alias', value);
+        this.setAttributeValue('alias', value);
     }
 
     get value() {
         return this.getAttributeValue('value');
     }
     set value(value: string) {
-        this.setAttribute('value', value);
+        this.setAttributeValue('value', value);
     }
 
     get onChange() {
         return this.getAttributeValue('onChange');
     }
     set onChange(value: string) {
-        this.setAttribute('onChange', value);
+        this.setAttributeValue('onChange', value);
     }
 
     get alwaysNotify() {
         return this.getAttributeValue('alwaysNotify');
     }
     set alwaysNotify(value: string) {
-        this.setAttribute('alwaysNotify', value);
+        this.setAttributeValue('alwaysNotify', value);
     }
 }
 
-export const SGFieldTypes = [
-    'integer', 'int', 'longinteger', 'float', 'string', 'str', 'boolean', 'bool',
-    'vector2d', 'color', 'time', 'uri', 'node', 'floatarray', 'intarray', 'boolarray',
-    'stringarray', 'vector2darray', 'colorarray', 'timearray', 'nodearray', 'assocarray',
-    'array', 'roarray', 'rect2d', 'rect2darray'
-];
-
-export class SGFunction extends SGTag {
-
-    constructor(
-        tag: SGToken = { text: 'function' },
-        attributes: SGAttribute[] = [],
-        range?: Range
-    ) {
-        super(tag, attributes, range);
-    }
+export enum SGFieldType {
+    integer = 'integer',
+    int = 'int',
+    longinteger = 'longinteger',
+    float = 'float',
+    string = 'string',
+    str = 'str',
+    boolean = 'boolean',
+    bool = 'bool',
+    vector2d = 'vector2d',
+    color = 'color',
+    time = 'time',
+    uri = 'uri',
+    node = 'node',
+    floatarray = 'floatarray',
+    intarray = 'intarray',
+    boolarray = 'boolarray',
+    stringarray = 'stringarray',
+    vector2darray = 'vector2darray',
+    colorarray = 'colorarray',
+    timearray = 'timearray',
+    nodearray = 'nodearray',
+    assocarray = 'assocarray',
+    array = 'array',
+    roarray = 'roarray',
+    rect2d = 'rect2d',
+    rect2darray = 'rect2darray'
+}
+export const SGFieldTypes = Object.keys(SGFieldType);
 
+export class SGInterfaceFunction extends SGElement {
     get name() {
         return this.getAttributeValue('name');
     }
     set name(value: string) {
-        this.setAttribute('name', value);
+        this.setAttributeValue('name', value);
     }
 }
 
-export class SGInterface extends SGTag {
-
-    fields: SGField[] = [];
-    functions: SGFunction[] = [];
-
-    constructor(
-        tag: SGToken = { text: 'interface' },
-        content?: SGTag[],
-        range?: Range
-    ) {
-        super(tag, [], range);
-        if (content) {
-            for (const tag of content) {
-                if (isSGField(tag)) {
-                    this.fields.push(tag);
-                } else if (isSGFunction(tag)) {
-                    this.functions.push(tag);
-                }
+export type SGInterfaceMember = SGInterfaceField | SGInterfaceFunction;
+
+export class SGInterface extends SGElement {
+    public get fields() {
+        return this.getElementsByTagName<SGInterfaceField>('field');
+    }
+
+    public get functions() {
+        return this.getElementsByTagName<SGInterfaceFunction>('function');
+    }
+
+    public get members() {
+        const result = [] as Array<SGInterfaceMember>;
+        for (const node of this.elements) {
+            const tagName = node.tagName?.toLowerCase();
+            if (tagName === 'field' || tagName === 'function') {
+                result.push(node as SGInterfaceMember);
+            }
+        }
+        return result as Readonly<typeof result>;
+    }
+
+    /**
+     * Check if there's an SGField with the specified name
+     */
+    public hasField(id: string) {
+        for (const node of this.elements) {
+            const tagName = node.tagName?.toLowerCase();
+            if (tagName === 'field' && (node as SGInterfaceField).id === id) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if there's an SGFunction with the specified name
+     */
+    public hasFunction(name: string) {
+        for (const node of this.elements) {
+            const tagName = node.tagName?.toLowerCase();
+            if (tagName === 'function' && (node as SGInterfaceFunction).name === name) {
+                return true;
             }
         }
+        return false;
     }
 
-    getField(id: string) {
+    /**
+     * Find a field by its ID
+     */
+    public getField(id: string) {
         return this.fields.find(field => field.id === id);
     }
-    setField(id: string, type: string, onChange?: string, alwaysNotify?: boolean, alias?: string) {
+
+    /**
+     * Set the value of a field. Creates a new field if one does not already exist with this ID
+     */
+    public setField(id: string, type: string, onChange?: string, alwaysNotify?: boolean, alias?: string) {
         let field = this.getField(id);
         if (!field) {
-            field = new SGField();
-            field.id = id;
-            this.fields.push(field);
+            field = this.addChild(
+                createSGInterfaceField(id)
+            );
         }
         field.type = type;
         field.onChange = onChange;
@@ -322,126 +565,299 @@ export class SGInterface extends SGTag {
             field.alwaysNotify = alwaysNotify ? 'true' : 'false';
         }
         field.alias = alias;
+        return field;
+    }
+
+    /**
+     * Remove a field from the interface
+     * @returns true if a field was found and removed. Returns false if no field was found with that name
+     */
+    public removeField(id: string) {
+        for (let i = 0; i < this.elements.length; i++) {
+            const node = this.elements[i];
+            if (node.tagName?.toLowerCase() === 'field' && node.id === id) {
+                this.elements.splice(i, 1);
+                return true;
+            }
+        }
+        return false;
     }
 
-    getFunction(name: string) {
-        return this.functions.find(field => field.name === name);
+    /**
+     * Get the interface function with the specified name
+     */
+    public getFunction(name: string) {
+        return this.functions.find(func => func.name === name);
     }
-    setFunction(name: string) {
+
+    /**
+     * Add or replace a function on the interface
+     */
+    public setFunction(name: string) {
         let func = this.getFunction(name);
         if (!func) {
-            func = new SGFunction();
-            func.name = name;
-            this.functions.push(func);
-        }
-    }
-
-    protected transpileBody(state: TranspileState): (string | SourceNode)[] {
-        const body: (string | SourceNode)[] = ['>\n'];
-        state.blockDepth++;
-        if (this.fields.length > 0) {
-            body.push(...this.fields.map(node => node.transpile(state)));
+            func = this.addChild(
+                createSGInterfaceFunction(name)
+            );
         }
-        if (this.functions.length > 0) {
-            body.push(...this.functions.map(node => node.transpile(state)));
+        return func;
+    }
+
+    /**
+     * Remove a function from the interface
+     * @returns true if a function was found and removed. Returns false if no function was found with that name
+     */
+    public removeFunction(name: string) {
+        for (let i = 0; i < this.elements.length; i++) {
+            const node = this.elements[i];
+            if (node.tagName?.toLowerCase() === 'function' && node.getAttributeValue('name') === name) {
+                this.elements.splice(i, 1);
+                return true;
+            }
         }
-        state.blockDepth--;
-        body.push(state.indentText, '</', this.tag.text, '>\n');
-        return body;
+        return false;
     }
 }
 
-export class SGComponent extends SGTag {
-    constructor(
-        tag: SGToken = { text: 'component' },
-        attributes?: SGAttribute[],
-        content?: SGTag[],
-        range?: Range
-    ) {
-        super(tag, attributes, range);
-        if (content) {
-            for (const tag of content) {
-                if (isSGInterface(tag)) {
-                    this.api = tag;
-                } else if (isSGScript(tag)) {
-                    this.scripts.push(tag);
-                } else if (isSGChildren(tag)) {
-                    this.children = tag;
-                } else if (isSGCustomization(tag)) {
-                    this.customizations.push(tag);
-                }
-            }
+/**
+ * The `<component>` element in SceneGraph. Not to be confused about usages of components like `<Rectangle>`, those are considered `SGNode` instances.
+ */
+export class SGComponent extends SGElement {
+
+    /**
+     * Get all the <Field> and <Function> elements across all <Interface> nodes in this component
+     */
+    public get interfaceMembers() {
+        const members = [] as Array<SGInterfaceMember>;
+        for (const ifaceNode of this.getElementsByTagName<SGInterface>('interface')) {
+            members.push(
+                ...ifaceNode.members
+            );
         }
+        return members as Readonly<typeof members>;
     }
 
-    public api: SGInterface;
+    public get scriptElements() {
+        return this.getElementsByTagName<SGScript>('script');
+    }
 
-    public scripts: SGScript[] = [];
+    /**
+     * Get the <interface> element from this component (if present), or undefined if not.
+     * NOTE: Roku supports and merges multiple <interface> elements in a component, but this
+     * property points to the FIRST one. If you need to check whether a member exists,
+     * look through `this.interfaceMemebers` instead.
+     */
+    public get interfaceElement(): SGInterface | undefined {
+        return this.getElementsByTagName<SGInterface>('interface')[0];
+    }
 
-    public children: SGChildren;
+    /**
+     * Get the `<children>` element of this component. (not to be confused with the AST `childTags` property).
+     * If there are multiope `<children>` elements, this function will return the last `<children>` tag because that's what Roku devices do.
+     */
+    public get childrenElement() {
+        const children = this.getElementsByTagName<SGChildren>('children');
+        return children[children.length - 1];
+    }
 
-    public customizations: SGNode[] = [];
+    public get customizationElements() {
+        return this.getElementsByTagName<SGCustomization>('customization');
+    }
 
+    /**
+     * Specifies the name of the component, that allows you to create the component in your application.
+     * For example, if the name of the component is `CastMemberInfo`, you could create instances of the component declaratively
+     * in a child node element of a component `<children>` element (`<CastMemberInfo/>`), or using BrightScript in a `<script>`
+     * element (`createObject("roSGNode","CastMemberInfo")`).
+     *
+     * The name attribute is case-sensitive. You cannot successfully create or declare a component unless the component name exactly
+     *  matches the name attribute, including case. Also be aware that two components with the exact same name in the same application
+     * components directory will have undefined and generally undesirable results if you attempt to create a component object with that name in the application.
+     */
     get name() {
         return this.getAttributeValue('name');
     }
     set name(value: string) {
-        this.setAttribute('name', value);
+        this.setAttributeValue('name', value);
     }
 
+    /**
+     * Specifies the name of the built-in or extended SceneGraph scene or node class whose functionality is extended by this component.
+     *
+     * For example, `extends="Group"` specifies that the component has all of the functionality of the Group node class (it can have child nodes, has translation/scale/rotation fields, and so forth).
+     *
+     * By default, a component extends the Group node class.
+     */
     get extends() {
         return this.getAttributeValue('extends');
     }
     set extends(value: string) {
-        this.setAttribute('extends', value);
+        this.setAttributeValue('extends', value);
+    }
+
+    /**
+     * Specifies the ID of a node declared in the XML file to have the initial remote control focus when the component is instantiated.
+     */
+    get initialFocus() {
+        return this.getAttributeValue('initialFocus');
+    }
+    set initialFocus(value: string) {
+        this.setAttributeValue('initialFocus', value);
+    }
+
+    /**
+     * Specifies the version of the SceneGraph API. The default is 1.0 if not specified.
+     */
+    get version() {
+        return this.getAttributeValue('version');
+    }
+    set version(value: string) {
+        this.setAttributeValue('version', value);
+    }
+
+    /**
+     * Does the specified field exist in the component interface?
+     */
+    public hasInterfaceField(id: string) {
+        for (const ifaceNode of this.getElementsByTagName<SGInterface>('interface')) {
+            if (ifaceNode.hasField(id)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Does the specified function exist in the component interface?
+     */
+    public hasInterfaceFunction(name: string) {
+        for (const ifaceNode of this.getElementsByTagName<SGInterface>('interface')) {
+            if (ifaceNode.hasFunction(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Get an interface field with the specified name
+     */
+    public getInterfaceField(name: string): SGInterfaceField | undefined {
+        for (const ifaceNode of this.getElementsByTagName<SGInterface>('interface')) {
+            const field = ifaceNode.getField(name);
+            if (field) {
+                return field;
+            }
+        }
     }
 
-    protected transpileBody(state: TranspileState): (string | SourceNode)[] {
-        const body: (string | SourceNode)[] = ['>\n'];
-        state.blockDepth++;
-        if (this.api) {
-            body.push(this.api.transpile(state));
+    /**
+     * Return the first SGInterface node found, or insert a new one then return it
+     */
+    private ensureInterfaceNode(): SGInterface {
+        for (const el of this.elements) {
+            if (el.tokens.startTagName.text.toLowerCase() === 'interface') {
+                return el as SGInterface;
+            }
         }
-        if (this.scripts.length > 0) {
-            body.push(...this.scripts.map(node => node.transpile(state)));
+        return this.addChild(
+            createSGInterface()
+        );
+    }
+
+    /**
+     * Create or update a <field> interface element.
+     * This will create a new `<interface>` element if there are none on the component already
+     */
+    public setInterfaceField(id: string, type: string, onChange?: string, alwaysNotify?: boolean, alias?: string) {
+        let ifaceNode = this.ensureInterfaceNode();
+        return ifaceNode.setField(id, type, onChange, alwaysNotify, alias);
+    }
+
+    /**
+     * Create or update a <function> interface element.
+     * This will create a new `<interface>` element if there are none on the component already
+     */
+    public setInterfaceFunction(name: string) {
+        let ifaceNode = this.ensureInterfaceNode();
+        return ifaceNode.setFunction(name);
+    }
+
+    /**
+     * Remove an interface field.
+     * @returns true if a field was found and removed. Returns false if no field was found with that name
+     */
+    public removeInterfaceField(id: string) {
+        for (const ifaceNode of this.getElementsByTagName<SGInterface>('interface')) {
+            if (ifaceNode.removeField(id)) {
+                return true;
+            }
         }
-        if (this.children) {
-            body.push(this.children.transpile(state));
+        return false;
+    }
+
+    /**
+     * Get an interface field with the specified name
+     */
+    public getInterfaceFunction(name: string): SGInterfaceFunction | undefined {
+        for (const ifaceNode of this.getElementsByTagName<SGInterface>('interface')) {
+            const func = ifaceNode.getFunction(name);
+            if (func) {
+                return func;
+            }
         }
-        if (this.customizations.length > 0) {
-            body.push(...this.customizations.map(node => node.transpile(state)));
+    }
+
+    /**
+     * Remove an interface function.
+     * @returns true if a function was found and removed. Returns false if no function was found with that name
+     */
+    public removeInterfaceFunction(name: string) {
+        for (const ifaceNode of this.getElementsByTagName<SGInterface>('interface')) {
+            if (ifaceNode.removeFunction(name)) {
+                return true;
+            }
         }
-        state.blockDepth--;
-        body.push(state.indentText, '</', this.tag.text, '>\n');
-        return body;
+        return false;
     }
 }
 
 export interface SGReferences {
     name?: SGToken;
     extends?: SGToken;
-    scriptTagImports: Pick<FileReference, 'pkgPath' | 'text' | 'filePathRange'>[];
+    scriptTagImports: Pick<FileReference, 'destPath' | 'text' | 'filePathRange'>[];
 }
 
 export class SGAst {
 
-    constructor(
-        public prolog?: SGProlog,
-        public root?: SGTag,
-        public component?: SGComponent
-    ) {
+    constructor(options: {
+        prologElement?: SGProlog;
+        rootElement?: SGElement;
+        componentElement?: SGComponent;
+    } = {}) {
+        this.prologElement = options.prologElement;
+        this.rootElement = options.rootElement;
+        this.componentElement = options.componentElement;
     }
 
-    transpile(state: TranspileState) {
-        const chunks = [] as TranspileResult;
+    public readonly prologElement?: SGProlog;
+    public readonly rootElement?: SGElement;
+    public readonly componentElement?: SGComponent;
+
+    public transpile(state: TranspileState): SourceNode {
+        const chunks = [] as SourceNode[];
         //write XML prolog
-        if (this.prolog) {
-            chunks.push(this.prolog.transpile(state));
+        if (this.prologElement) {
+            chunks.push(
+                this.prologElement.transpile(state)
+            );
         }
-        if (this.component) {
+        if (this.componentElement) {
             //write content
-            chunks.push(this.component.transpile(state));
+            chunks.push(
+                this.componentElement.transpile(state)
+            );
         }
-        return chunks;
+        return new SourceNode(null, null, null, chunks);
     }
 }
diff --git a/src/parser/Statement.spec.ts b/src/parser/Statement.spec.ts
index 0c00bdc56..fcf6f60d6 100644
--- a/src/parser/Statement.spec.ts
+++ b/src/parser/Statement.spec.ts
@@ -1,14 +1,17 @@
 import { expect } from '../chai-config.spec';
-import type { NamespaceStatement } from './Statement';
-import { Body, CommentStatement, EmptyStatement } from './Statement';
+import { NamespaceStatement, ClassStatement } from './Statement';
+import { AssignmentStatement, Block, Body, CatchStatement, DottedSetStatement, EmptyStatement, EndStatement, ExitStatement, ExpressionStatement, ForEachStatement, ForStatement, FunctionStatement, GotoStatement, IfStatement, ImportStatement, IncrementStatement, IndexedSetStatement, LabelStatement, LibraryStatement, PrintStatement, ReturnStatement, StopStatement, ThrowStatement, TryCatchStatement, WhileStatement } from './Statement';
 import { ParseMode, Parser } from './Parser';
 import { WalkMode } from '../astUtils/visitors';
-import { isNamespaceStatement } from '../astUtils/reflection';
-import { CancellationTokenSource } from 'vscode-languageserver';
+import { isClassStatement, isNamespaceStatement } from '../astUtils/reflection';
 import { Program } from '../Program';
 import { trim } from '../testHelpers.spec';
 import type { BrsFile } from '../files/BrsFile';
 import { tempDir } from '../testHelpers.spec';
+import { createStringLiteral, createToken, createVariableExpression } from '../astUtils/creators';
+import { TokenKind } from '../lexer/TokenKind';
+import { FunctionExpression } from './Expression';
+import type { AstNode } from './AstNode';
 
 describe('Statement', () => {
     let program: Program;
@@ -32,7 +35,7 @@ describe('Statement', () => {
 
     describe('Body', () => {
         it('initializes statements array if none provided', () => {
-            const body = new Body();
+            const body = new Body({});
             expect(body.statements).to.eql([]);
         });
     });
@@ -67,19 +70,6 @@ describe('Statement', () => {
         });
     });
 
-    describe('CommentStatement', () => {
-        describe('walk', () => {
-            it('skips visitor if canceled', () => {
-                const comment = new CommentStatement([]);
-                const cancel = new CancellationTokenSource();
-                cancel.cancel();
-                comment.walk(() => {
-                    throw new Error('Should not have been called');
-                }, { walkMode: WalkMode.visitAllRecursive, cancel: cancel.token });
-            });
-        });
-    });
-
     describe('ClassStatement', () => {
         describe('getName', () => {
             it('handles null namespace name', () => {
@@ -88,7 +78,7 @@ describe('Statement', () => {
                     end class
                 `);
                 program.validate();
-                const stmt = file.parser.references.classStatements[0];
+                const stmt = file.ast.findChildren<ClassStatement>(isClassStatement)[0];
                 expect(stmt.getName(ParseMode.BrightScript)).to.equal('Animal');
                 expect(stmt.getName(ParseMode.BrighterScript)).to.equal('Animal');
             });
@@ -100,7 +90,7 @@ describe('Statement', () => {
                     end namespace
                 `);
                 program.validate();
-                const stmt = file.parser.references.classStatements[0];
+                const stmt = file.ast.findChildren<ClassStatement>(isClassStatement)[0];
                 expect(stmt.getName(ParseMode.BrightScript)).to.equal('NameA_Animal');
                 expect(stmt.getName(ParseMode.BrighterScript)).to.equal('NameA.Animal');
             });
@@ -124,4 +114,94 @@ describe('Statement', () => {
             });
         });
     });
+
+    describe('all Statements', () => {
+
+        let allStatements: AstNode[] = [];
+
+        beforeEach(() => {
+            const ident = createToken(TokenKind.Identifier, 'a');
+            const expr = createStringLiteral('');
+            const token = createToken(TokenKind.StringLiteral, '');
+            const body = new Body({ statements: [] });
+            const assignment = new AssignmentStatement({ equals: undefined, name: ident, value: expr });
+            const block = new Block({ statements: [] });
+            const expression = new ExpressionStatement({ expression: expr });
+            const exitFor = new ExitStatement({ exit: token, loopType: token });
+            const exitWhile = new ExitStatement({ exit: token, loopType: token });
+            const funs = new FunctionStatement({
+                name: ident,
+                func: new FunctionExpression({
+                    parameters: [],
+                    body: block,
+                    functionType: token,
+                    leftParen: token,
+                    rightParen: token,
+                    endFunctionType: token
+                })
+            });
+            const ifs = new IfStatement({ if: token, condition: expr, thenBranch: block });
+            const increment = new IncrementStatement({ value: expr, operator: token });
+            const print = new PrintStatement({ print: token, expressions: [] });
+            const gotos = new GotoStatement({ goto: token, label: token });
+            const labels = new LabelStatement({ name: ident, colon: token });
+            const returns = new ReturnStatement({ return: token });
+            const ends = new EndStatement({ end: token });
+            const stop = new StopStatement({ stop: token });
+            const fors = new ForStatement({ for: token, counterDeclaration: assignment, to: token, finalValue: expr, body: block, endFor: token, step: token, increment: expr });
+            const foreach = new ForEachStatement({ forEach: token, in: token, endFor: token, item: token, target: expr, body: block });
+            const whiles = new WhileStatement({ while: token, endWhile: token, condition: expr, body: block });
+            const dottedSet = new DottedSetStatement({ obj: expr, name: ident, value: expr });
+            const indexedSet = new IndexedSetStatement({ obj: expr, indexes: [expr], value: expr, openingSquare: token, closingSquare: token });
+            const library = new LibraryStatement({ library: token, filePath: token });
+            const namespace = new NamespaceStatement({ namespace: token, nameExpression: createVariableExpression('a'), body: body, endNamespace: token });
+            const cls = new ClassStatement({ class: token, name: ident, body: [], endClass: token });
+            const imports = new ImportStatement({ import: token, path: token });
+            const catchStmt = new CatchStatement({ catch: token, exceptionVariableExpression: createVariableExpression('e'), catchBranch: block });
+            const tryCatch = new TryCatchStatement({ try: token, tryBranch: block, catchStatement: catchStmt });
+            const throwSt = new ThrowStatement({ throw: createToken(TokenKind.Throw) });
+
+            allStatements = [
+                expression,
+                exitFor,
+                exitWhile,
+                funs,
+                ifs,
+                increment,
+                print,
+                gotos,
+                labels,
+                returns,
+                ends,
+                stop,
+                fors,
+                foreach,
+                whiles,
+                dottedSet,
+                indexedSet,
+                library,
+                namespace,
+                cls,
+                imports,
+                catchStmt,
+                tryCatch,
+                throwSt
+            ];
+
+        });
+
+        it('has editable leading trivia', () => {
+            for (const stmt of allStatements) {
+                const beforeTrivia = stmt.leadingTrivia;
+                expect(beforeTrivia.length, `${stmt.kind} already has leading trivia`).to.eq(0);
+                stmt.leadingTrivia.push(createToken(TokenKind.Comment, 'This is an added comment'));
+                const afterComments = stmt.leadingTrivia.filter(t => t.kind === TokenKind.Comment);
+                expect(afterComments.length, `${stmt.kind} leading trivia was not edited`).to.eq(1);
+                expect(afterComments[0].text, `${stmt.kind} leading trivia was not edited`).to.eq('This is an added comment');
+                stmt.leadingTrivia.pop();
+            }
+        });
+
+    });
+
 });
diff --git a/src/parser/Statement.ts b/src/parser/Statement.ts
index 1fc2d48a9..c4004e3ff 100644
--- a/src/parser/Statement.ts
+++ b/src/parser/Statement.ts
@@ -1,34 +1,46 @@
 /* eslint-disable no-bitwise */
 import type { Token, Identifier } from '../lexer/Token';
-import { CompoundAssignmentOperators, TokenKind } from '../lexer/TokenKind';
-import type { BinaryExpression, NamespacedVariableNameExpression, FunctionParameterExpression, LiteralExpression } from './Expression';
+import { TokenKind } from '../lexer/TokenKind';
+import type { DottedGetExpression, FunctionParameterExpression, LiteralExpression, TypecastExpression, TypeExpression } from './Expression';
 import { FunctionExpression } from './Expression';
 import { CallExpression, VariableExpression } from './Expression';
 import { util } from '../util';
-import type { Range } from 'vscode-languageserver';
+import type { Location } from 'vscode-languageserver';
 import type { BrsTranspileState } from './BrsTranspileState';
 import { ParseMode } from './Parser';
 import type { WalkVisitor, WalkOptions } from '../astUtils/visitors';
 import { InternalWalkMode, walk, createVisitor, WalkMode, walkArray } from '../astUtils/visitors';
-import { isCallExpression, isCommentStatement, isEnumMemberStatement, isExpression, isExpressionStatement, isFieldStatement, isFunctionExpression, isFunctionStatement, isIfStatement, isInterfaceFieldStatement, isInterfaceMethodStatement, isInvalidType, isLiteralExpression, isMethodStatement, isNamespaceStatement, isTypedefProvider, isUnaryExpression, isVoidType } from '../astUtils/reflection';
-import type { TranspileResult, TypedefProvider } from '../interfaces';
+import { isCallExpression, isCatchStatement, isConditionalCompileStatement, isEnumMemberStatement, isEnumStatement, isExpressionStatement, isFieldStatement, isForEachStatement, isForStatement, isFunctionExpression, isFunctionStatement, isIfStatement, isInterfaceFieldStatement, isInterfaceMethodStatement, isInvalidType, isLiteralExpression, isMethodStatement, isNamespaceStatement, isPrintSeparatorExpression, isTryCatchStatement, isTypedefProvider, isUnaryExpression, isUninitializedType, isVoidType, isWhileStatement } from '../astUtils/reflection';
+import type { GetTypeOptions } from '../interfaces';
+import { TypeChainEntry, type TranspileResult, type TypedefProvider } from '../interfaces';
 import { createIdentifier, createInvalidLiteral, createMethodStatement, createToken } from '../astUtils/creators';
 import { DynamicType } from '../types/DynamicType';
 import type { BscType } from '../types/BscType';
-import type { TranspileState } from './TranspileState';
 import { SymbolTable } from '../SymbolTable';
-import type { AstNode, Expression } from './AstNode';
-import { Statement } from './AstNode';
-
+import type { Expression } from './AstNode';
+import { AstNodeKind, Statement } from './AstNode';
+import { ClassType } from '../types/ClassType';
+import { EnumMemberType, EnumType } from '../types/EnumType';
+import { NamespaceType } from '../types/NamespaceType';
+import { InterfaceType } from '../types/InterfaceType';
+import { VoidType } from '../types/VoidType';
+import { TypedFunctionType } from '../types/TypedFunctionType';
+import { ArrayType } from '../types/ArrayType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import brsDocParser from './BrightScriptDocParser';
+import { ArrayDefaultTypeReferenceType } from '../types/ReferenceType';
 export class EmptyStatement extends Statement {
-    constructor(
-        /**
-         * Create a negative range to indicate this is an interpolated location
-         */
-        public range: Range = undefined
+    constructor(options?: { range?: Location }
     ) {
         super();
+        this.location = undefined;
     }
+    /**
+     * Create a negative range to indicate this is an interpolated location
+     */
+    public readonly location?: Location;
+
+    public readonly kind = AstNodeKind.EmptyStatement;
 
     transpile(state: BrsTranspileState) {
         return [];
@@ -39,9 +51,9 @@ export class EmptyStatement extends Statement {
 
     public clone() {
         return this.finalizeClone(
-            new EmptyStatement(
-                util.cloneRange(this.range)
-            )
+            new EmptyStatement({
+                range: util.cloneLocation(this.location)
+            })
         );
     }
 }
@@ -50,23 +62,34 @@ export class EmptyStatement extends Statement {
  * This is a top-level statement. Consider this the root of the AST
  */
 export class Body extends Statement implements TypedefProvider {
-    constructor(
-        public statements: Statement[] = []
-    ) {
+    constructor(options?: {
+        statements?: Statement[];
+    }) {
         super();
+        this.statements = options?.statements ?? [];
     }
 
-    public symbolTable = new SymbolTable('Body', () => this.parent?.getSymbolTable());
+    public readonly statements: Statement[] = [];
+    public readonly kind = AstNodeKind.Body;
 
-    public get range() {
-        //this needs to be a getter because the body has its statements pushed to it after being constructed
-        return util.createBoundingRange(
-            ...(this.statements ?? [])
-        );
+    public readonly symbolTable = new SymbolTable('Body', () => this.parent?.getSymbolTable());
+
+    public get location() {
+        if (!this._location) {
+            //this needs to be a getter because the body has its statements pushed to it after being constructed
+            this._location = util.createBoundingLocation(
+                ...(this.statements ?? [])
+            );
+        }
+        return this._location;
     }
+    public set location(value) {
+        this._location = value;
+    }
+    private _location: Location;
 
     transpile(state: BrsTranspileState) {
-        let result = [] as TranspileResult;
+        let result: TranspileResult = state.transpileAnnotations(this);
         for (let i = 0; i < this.statements.length; i++) {
             let statement = this.statements[i];
             let previousStatement = this.statements[i - 1];
@@ -76,17 +99,16 @@ export class Body extends Statement implements TypedefProvider {
                 //this is the first statement. do nothing related to spacing and newlines
 
                 //if comment is on same line as prior sibling
-            } else if (isCommentStatement(statement) && previousStatement && statement.range?.start.line === previousStatement.range?.end.line) {
+            } else if (util.hasLeadingComments(statement) && previousStatement && util.getLeadingComments(statement)?.[0]?.location?.range?.start.line === previousStatement.location?.range?.end.line) {
                 result.push(
                     ' '
                 );
-
                 //add double newline if this is a comment, and next is a function
-            } else if (isCommentStatement(statement) && nextStatement && isFunctionStatement(nextStatement)) {
+            } else if (util.hasLeadingComments(statement) && nextStatement && isFunctionStatement(nextStatement)) {
                 result.push(state.newline, state.newline);
 
                 //add double newline if is function not preceeded by a comment
-            } else if (isFunctionStatement(statement) && previousStatement && !(isCommentStatement(previousStatement))) {
+            } else if (isFunctionStatement(statement) && previousStatement && !util.hasLeadingComments(statement)) {
                 result.push(state.newline, state.newline);
             } else {
                 //separate statements by a single newline
@@ -121,80 +143,288 @@ export class Body extends Statement implements TypedefProvider {
 
     public clone() {
         return this.finalizeClone(
-            new Body(
-                this.statements?.map(s => s?.clone())
-            ),
+            new Body({
+                statements: this.statements?.map(s => s?.clone())
+            }),
             ['statements']
         );
     }
 }
 
 export class AssignmentStatement extends Statement {
-    constructor(
-        readonly equals: Token,
-        readonly name: Identifier,
-        readonly value: Expression
-    ) {
+    constructor(options: {
+        name: Identifier;
+        equals?: Token;
+        value: Expression;
+        as?: Token;
+        typeExpression?: TypeExpression;
+    }) {
         super();
-        this.range = util.createBoundingRange(name, equals, value);
+        this.value = options.value;
+        this.tokens = {
+            equals: options.equals,
+            name: options.name,
+            as: options.as
+        };
+        this.typeExpression = options.typeExpression;
+        this.location = util.createBoundingLocation(util.createBoundingLocationFromTokens(this.tokens), this.value);
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly equals?: Token;
+        readonly name: Identifier;
+        readonly as?: Token;
+    };
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isFunctionExpression)` instead.
-     */
-    public get containingFunction() {
-        return this.findAncestor<FunctionExpression>(isFunctionExpression);
-    }
+    public readonly value: Expression;
+
+    public readonly typeExpression?: TypeExpression;
+
+    public readonly kind = AstNodeKind.AssignmentStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
-        //if the value is a compound assignment, just transpile the expression itself
-        if (CompoundAssignmentOperators.includes((this.value as BinaryExpression)?.operator?.kind)) {
-            return this.value.transpile(state);
-        } else {
-            return [
-                state.transpileToken(this.name),
-                ' ',
-                state.transpileToken(this.equals),
-                ' ',
-                ...this.value.transpile(state)
-            ];
+        return [
+            state.transpileToken(this.tokens.name),
+            ' ',
+            state.transpileToken(this.tokens.equals ?? createToken(TokenKind.Equal), '='),
+            ' ',
+            ...this.value.transpile(state)
+        ];
+    }
+
+    walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'typeExpression', visitor, options);
+            walk(this, 'value', visitor, options);
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const variableTypeFromCode = this.typeExpression?.getType({ ...options, typeChain: undefined });
+        const docs = brsDocParser.parseNode(this);
+        const variableTypeFromDocs = docs?.getTypeTagBscType(options);
+        const variableType = util.chooseTypeFromCodeOrDocComment(variableTypeFromCode, variableTypeFromDocs, options) ?? this.value.getType({ ...options, typeChain: undefined });
+
+        // Note: compound assignments (eg. +=) are internally dealt with via the RHS being a BinaryExpression
+        // so this.value will be a BinaryExpression, and BinaryExpressions can figure out their own types
+        options.typeChain?.push(new TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, location: this.tokens.name?.location, astNode: this }));
+        return variableType;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.name.leadingTrivia;
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new AssignmentStatement({
+                name: util.cloneToken(this.tokens.name),
+                value: this.value?.clone(),
+                as: util.cloneToken(this.tokens.as),
+                equals: util.cloneToken(this.tokens.equals),
+                typeExpression: this.typeExpression?.clone()
+            }),
+            ['value', 'typeExpression']
+        );
+    }
+}
+
+export class AugmentedAssignmentStatement extends Statement {
+    constructor(options: {
+        item: Expression;
+        operator: Token;
+        value: Expression;
+    }) {
+        super();
+        this.value = options.value;
+        this.tokens = {
+            operator: options.operator
+        };
+        this.item = options.item;
+        this.value = options.value;
+        this.location = util.createBoundingLocation(this.item, util.createBoundingLocationFromTokens(this.tokens), this.value);
+    }
+
+    public readonly tokens: {
+        readonly operator?: Token;
+    };
+
+    public readonly item: Expression;
+
+    public readonly value: Expression;
+
+    public readonly kind = AstNodeKind.AugmentedAssignmentStatement;
+
+    public readonly location: Location | undefined;
+
+    transpile(state: BrsTranspileState) {
+        return [
+            this.item.transpile(state),
+            ' ',
+            state.transpileToken(this.tokens.operator),
+            ' ',
+            this.value.transpile(state)
+        ];
+    }
+
     walk(visitor: WalkVisitor, options: WalkOptions) {
         if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'item', visitor, options);
             walk(this, 'value', visitor, options);
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const variableType = util.binaryOperatorResultType(this.item.getType(options), this.tokens.operator, this.value.getType(options));
+
+        //const variableType = this.typeExpression?.getType({ ...options, typeChain: undefined }) ?? this.value.getType({ ...options, typeChain: undefined });
+
+        // Note: compound assignments (eg. +=) are internally dealt with via the RHS being a BinaryExpression
+        // so this.value will be a BinaryExpression, and BinaryExpressions can figure out their own types
+        // options.typeChain?.push(new TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, range: this.tokens.name.range, astNode: this }));
+        return variableType;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.item.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new AssignmentStatement(
-                util.cloneToken(this.equals),
-                util.cloneToken(this.name),
-                this.value?.clone()
-            ),
-            ['value']
+            new AugmentedAssignmentStatement({
+                item: this.item?.clone(),
+                operator: util.cloneToken(this.tokens.operator),
+                value: this.value?.clone()
+            }),
+            ['item', 'value']
         );
     }
 }
 
 export class Block extends Statement {
-    constructor(
-        readonly statements: Statement[],
-        readonly startingRange?: Range
-    ) {
+    constructor(options: {
+        statements: Statement[];
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            { range: this.startingRange },
-            ...(statements ?? [])
-        );
+        this.statements = options.statements;
+        this.symbolTable = new SymbolTable('Block', () => this.parent.getSymbolTable());
     }
 
-    public readonly range: Range | undefined;
+    public readonly statements: Statement[];
+
+    public readonly kind = AstNodeKind.Block;
+
+    private buildLocation(): Location {
+        if (this.statements?.length > 0) {
+            return util.createBoundingLocation(...this.statements ?? []);
+        }
+        let lastBitBefore: Location;
+        let firstBitAfter: Location;
+
+        if (isFunctionExpression(this.parent)) {
+            lastBitBefore = util.createBoundingLocation(
+                this.parent.tokens.functionType,
+                this.parent.tokens.leftParen,
+                ...(this.parent.parameters ?? []),
+                this.parent.tokens.rightParen,
+                this.parent.tokens.as,
+                this.parent.returnTypeExpression
+            );
+            firstBitAfter = this.parent.tokens.endFunctionType?.location;
+        } else if (isIfStatement(this.parent)) {
+            if (this.parent.thenBranch === this) {
+                lastBitBefore = util.createBoundingLocation(
+                    this.parent.tokens.then,
+                    this.parent.condition
+                );
+                firstBitAfter = util.createBoundingLocation(
+                    this.parent.tokens.else,
+                    this.parent.elseBranch,
+                    this.parent.tokens.endIf
+                );
+            } else if (this.parent.elseBranch === this) {
+                lastBitBefore = this.parent.tokens.else?.location;
+                firstBitAfter = this.parent.tokens.endIf?.location;
+            }
+        } else if (isConditionalCompileStatement(this.parent)) {
+            if (this.parent.thenBranch === this) {
+                lastBitBefore = util.createBoundingLocation(
+                    this.parent.tokens.condition,
+                    this.parent.tokens.not,
+                    this.parent.tokens.hashIf
+                );
+                firstBitAfter = util.createBoundingLocation(
+                    this.parent.tokens.hashElse,
+                    this.parent.elseBranch,
+                    this.parent.tokens.hashEndIf
+                );
+            } else if (this.parent.elseBranch === this) {
+                lastBitBefore = this.parent.tokens.hashElse?.location;
+                firstBitAfter = this.parent.tokens.hashEndIf?.location;
+            }
+        } else if (isForStatement(this.parent)) {
+            lastBitBefore = util.createBoundingLocation(
+                this.parent.increment,
+                this.parent.tokens.step,
+                this.parent.finalValue,
+                this.parent.tokens.to,
+                this.parent.counterDeclaration,
+                this.parent.tokens.for
+            );
+            firstBitAfter = this.parent.tokens.endFor?.location;
+        } else if (isForEachStatement(this.parent)) {
+            lastBitBefore = util.createBoundingLocation(
+                this.parent.target,
+                this.parent.tokens.in,
+                this.parent.tokens.item,
+                this.parent.tokens.forEach
+            );
+            firstBitAfter = this.parent.tokens.endFor?.location;
+        } else if (isWhileStatement(this.parent)) {
+            lastBitBefore = util.createBoundingLocation(
+                this.parent.condition,
+                this.parent.tokens.while
+            );
+            firstBitAfter = this.parent.tokens.endWhile?.location;
+        } else if (isTryCatchStatement(this.parent)) {
+            lastBitBefore = util.createBoundingLocation(
+                this.parent.tokens.try
+            );
+            firstBitAfter = util.createBoundingLocation(
+                this.parent.tokens.endTry,
+                this.parent.catchStatement
+            );
+        } else if (isCatchStatement(this.parent) && isTryCatchStatement(this.parent?.parent)) {
+            lastBitBefore = util.createBoundingLocation(
+                this.parent.tokens.catch,
+                this.parent.exceptionVariableExpression
+            );
+            firstBitAfter = this.parent.parent.tokens.endTry?.location;
+        }
+        if (lastBitBefore?.range && firstBitAfter?.range) {
+            return util.createLocation(
+                lastBitBefore.range.end.line,
+                lastBitBefore.range.end.character,
+                firstBitAfter.range.start.line,
+                firstBitAfter.range.start.character,
+                lastBitBefore.uri ?? firstBitAfter.uri
+            );
+        }
+    }
+
+    public get location() {
+        if (!this._location) {
+            //this needs to be a getter because the body has its statements pushed to it after being constructed
+            this._location = this.buildLocation();
+        }
+        return this._location;
+    }
+    public set location(value) {
+        this._location = value;
+    }
+    private _location: Location;
 
     transpile(state: BrsTranspileState) {
         state.blockDepth++;
@@ -202,10 +432,10 @@ export class Block extends Statement {
         for (let i = 0; i < this.statements.length; i++) {
             let previousStatement = this.statements[i - 1];
             let statement = this.statements[i];
-
+            //is not a comment
             //if comment is on same line as parent
-            if (isCommentStatement(statement) &&
-                (util.linesTouch(state.lineage[0], statement) || util.linesTouch(previousStatement, statement))
+            if (util.isLeadingCommentOnSameLine(state.lineage[0]?.location, statement) ||
+                util.isLeadingCommentOnSameLine(previousStatement?.location, statement)
             ) {
                 results.push(' ');
 
@@ -229,6 +459,10 @@ export class Block extends Statement {
         return results;
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.statements[0]?.leadingTrivia ?? [];
+    }
+
     walk(visitor: WalkVisitor, options: WalkOptions) {
         if (options.walkMode & InternalWalkMode.walkStatements) {
             walkArray(this.statements, visitor, options, this);
@@ -237,27 +471,32 @@ export class Block extends Statement {
 
     public clone() {
         return this.finalizeClone(
-            new Block(
-                this.statements?.map(s => s?.clone()),
-                util.cloneRange(this.startingRange)
-            ),
+            new Block({
+                statements: this.statements?.map(s => s?.clone())
+            }),
             ['statements']
         );
     }
 }
 
 export class ExpressionStatement extends Statement {
-    constructor(
-        readonly expression: Expression
-    ) {
+    constructor(options: {
+        expression: Expression;
+    }) {
         super();
-        this.range = this.expression?.range;
+        this.expression = options.expression;
+        this.location = this.expression?.location;
     }
+    public readonly expression: Expression;
+    public readonly kind = AstNodeKind.ExpressionStatement;
 
-    public readonly range: Range | undefined;
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
-        return this.expression.transpile(state);
+        return [
+            state.transpileAnnotations(this),
+            this.expression.transpile(state)
+        ];
     }
 
     getTypedef(state: BrsTranspileState): TranspileResult {
@@ -272,86 +511,50 @@ export class ExpressionStatement extends Statement {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.expression.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ExpressionStatement(
-                this.expression?.clone()
-            ),
+            new ExpressionStatement({
+                expression: this.expression?.clone()
+            }),
             ['expression']
         );
     }
 }
 
-export class CommentStatement extends Statement implements Expression, TypedefProvider {
-    constructor(
-        public comments: Token[]
-    ) {
+export class ExitStatement extends Statement {
+    constructor(options?: {
+        exit?: Token;
+        loopType: Token;
+    }) {
         super();
-        this.visitMode = InternalWalkMode.visitStatements | InternalWalkMode.visitExpressions;
-        if (this.comments?.length > 0) {
-            this.range = util.createBoundingRange(
-                ...this.comments
-            );
-        }
-    }
-
-    public range: Range | undefined;
-
-    get text() {
-        return this.comments.map(x => x.text).join('\n');
-    }
-
-    transpile(state: BrsTranspileState) {
-        let result = [] as TranspileResult;
-        for (let i = 0; i < this.comments.length; i++) {
-            let comment = this.comments[i];
-            if (i > 0) {
-                result.push(state.indent());
-            }
-            result.push(
-                state.transpileToken(comment)
-            );
-            //add newline for all except final comment
-            if (i < this.comments.length - 1) {
-                result.push(state.newline);
-            }
-        }
-        return result;
-    }
-
-    public getTypedef(state: TranspileState) {
-        return this.transpile(state as BrsTranspileState);
-    }
-
-    walk(visitor: WalkVisitor, options: WalkOptions) {
-        //nothing to walk
-    }
-
-    public clone() {
-        return this.finalizeClone(
-            new CommentStatement(
-                this.comments?.map(x => util.cloneToken(x))
-            ),
-            ['comments' as any]
+        this.tokens = {
+            exit: options?.exit,
+            loopType: options.loopType
+        };
+        this.location = util.createBoundingLocation(
+            this.tokens.exit,
+            this.tokens.loopType
         );
     }
-}
 
-export class ExitForStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            exitFor: Token;
-        }
-    ) {
-        super();
-        this.range = this.tokens.exitFor.range;
-    }
+    public readonly tokens: {
+        readonly exit: Token;
+        readonly loopType?: Token;
+    };
+
+    public readonly kind = AstNodeKind.ExitStatement;
 
-    public readonly range: Range;
+    public readonly location?: Location;
 
     transpile(state: BrsTranspileState) {
         return [
-            state.transpileToken(this.tokens.exitFor)
+            state.transpileToken(this.tokens.exit, 'exit'),
+            this.tokens.loopType?.leadingWhitespace ?? ' ',
+            state.transpileToken(this.tokens.loopType)
         ];
     }
 
@@ -359,56 +562,45 @@ export class ExitForStatement extends Statement {
         //nothing to walk
     }
 
-    public clone() {
-        return this.finalizeClone(
-            new ExitForStatement({
-                exitFor: util.cloneToken(this.tokens.exitFor)
-            })
-        );
-    }
-}
-
-export class ExitWhileStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            exitWhile: Token;
-        }
-    ) {
-        super();
-        this.range = this.tokens.exitWhile.range;
-    }
-
-    public readonly range: Range;
-
-    transpile(state: BrsTranspileState) {
-        return [
-            state.transpileToken(this.tokens.exitWhile)
-        ];
-    }
-
-    walk(visitor: WalkVisitor, options: WalkOptions) {
-        //nothing to walk
+    get leadingTrivia(): Token[] {
+        return this.tokens.exit?.leadingTrivia;
     }
 
     public clone() {
         return this.finalizeClone(
-            new ExitWhileStatement({
-                exitWhile: util.cloneToken(this.tokens.exitWhile)
+            new ExitStatement({
+                loopType: util.cloneToken(this.tokens.loopType),
+                exit: util.cloneToken(this.tokens.exit)
             })
         );
     }
 }
 
 export class FunctionStatement extends Statement implements TypedefProvider {
-    constructor(
-        public name: Identifier,
-        public func: FunctionExpression
-    ) {
+    constructor(options: {
+        name: Identifier;
+        func: FunctionExpression;
+    }) {
         super();
-        this.range = this.func?.range;
+        this.tokens = {
+            name: options.name
+        };
+        this.func = options.func;
+        if (this.func) {
+            this.func.symbolTable.name += `: '${this.tokens.name?.text}'`;
+        }
+
+        this.location = this.func?.location;
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly name: Identifier;
+    };
+    public readonly func: FunctionExpression;
+
+    public readonly kind = AstNodeKind.FunctionStatement as AstNodeKind;
+
+    public readonly location: Location | undefined;
 
     /**
      * Get the name of this expression based on the parse mode
@@ -418,32 +610,38 @@ export class FunctionStatement extends Statement implements TypedefProvider {
         if (namespace) {
             let delimiter = parseMode === ParseMode.BrighterScript ? '.' : '_';
             let namespaceName = namespace.getName(parseMode);
-            return namespaceName + delimiter + this.name?.text;
+            return namespaceName + delimiter + this.tokens.name?.text;
         } else {
-            return this.name.text;
+            return this.tokens.name.text;
         }
     }
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    public get namespaceName() {
-        return this.findAncestor<NamespaceStatement>(isNamespaceStatement)?.nameExpression;
+    public get leadingTrivia(): Token[] {
+        return this.func.leadingTrivia;
     }
 
-    transpile(state: BrsTranspileState) {
+    transpile(state: BrsTranspileState): TranspileResult {
         //create a fake token using the full transpiled name
         let nameToken = {
-            ...this.name,
+            ...this.tokens.name,
             text: this.getName(ParseMode.BrightScript)
         };
 
-        return this.func.transpile(state, nameToken);
+        return [
+            ...state.transpileAnnotations(this),
+            ...this.func.transpile(state, nameToken)
+        ];
     }
 
     getTypedef(state: BrsTranspileState) {
-        let result = [] as TranspileResult;
+        let result: TranspileResult = [];
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
         for (let annotation of this.annotations ?? []) {
             result.push(
                 ...annotation.getTypedef(state),
@@ -464,47 +662,84 @@ export class FunctionStatement extends Statement implements TypedefProvider {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const funcExprType = this.func.getType(options);
+        funcExprType.setName(this.getName(ParseMode.BrighterScript));
+        return funcExprType;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new FunctionStatement(
-                util.cloneToken(this.name),
-                this.func?.clone()
-            ),
+            new FunctionStatement({
+                func: this.func?.clone(),
+                name: util.cloneToken(this.tokens.name)
+            }),
             ['func']
         );
     }
 }
 
 export class IfStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            if: Token;
-            then?: Token;
-            else?: Token;
-            endIf?: Token;
-        },
-        readonly condition: Expression,
-        readonly thenBranch: Block,
-        readonly elseBranch?: IfStatement | Block,
-        readonly isInline?: boolean
-    ) {
+    constructor(options: {
+        if?: Token;
+        then?: Token;
+        else?: Token;
+        endIf?: Token;
+
+        condition: Expression;
+        thenBranch: Block;
+        elseBranch?: IfStatement | Block;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.if,
-            condition,
-            tokens.then,
-            thenBranch,
-            tokens.else,
-            elseBranch,
-            tokens.endIf
+        this.condition = options.condition;
+        this.thenBranch = options.thenBranch;
+        this.elseBranch = options.elseBranch;
+
+        this.tokens = {
+            if: options.if,
+            then: options.then,
+            else: options.else,
+            endIf: options.endIf
+        };
+
+        this.location = util.createBoundingLocation(
+            util.createBoundingLocationFromTokens(this.tokens),
+            this.condition,
+            this.thenBranch,
+            this.elseBranch
         );
     }
-    public readonly range: Range | undefined;
+
+    readonly tokens: {
+        readonly if?: Token;
+        readonly then?: Token;
+        readonly else?: Token;
+        readonly endIf?: Token;
+    };
+    public readonly condition: Expression;
+    public readonly thenBranch: Block;
+    public readonly elseBranch?: IfStatement | Block;
+
+    public readonly kind = AstNodeKind.IfStatement;
+
+    public readonly location: Location | undefined;
+
+    get isInline() {
+        const allLeadingTrivia = [
+            ...this.thenBranch.leadingTrivia,
+            ...this.thenBranch.statements.map(s => s.leadingTrivia).flat(),
+            ...(this.tokens.else?.leadingTrivia ?? []),
+            ...(this.tokens.endIf?.leadingTrivia ?? [])
+        ];
+
+        const hasNewline = allLeadingTrivia.find(t => t.kind === TokenKind.Newline);
+        return !hasNewline;
+    }
 
     transpile(state: BrsTranspileState) {
         let results = [] as TranspileResult;
         //if   (already indented by block)
-        results.push(state.transpileToken(this.tokens.if));
+        results.push(state.transpileToken(this.tokens.if ?? createToken(TokenKind.If)));
         results.push(' ');
         //conditions
         results.push(...this.condition.transpile(state));
@@ -512,7 +747,7 @@ export class IfStatement extends Statement {
         if (this.tokens.then) {
             results.push(' ');
             results.push(
-                state.transpileToken(this.tokens.then)
+                state.transpileToken(this.tokens.then, 'then')
             );
         }
         state.lineage.unshift(this);
@@ -523,18 +758,11 @@ export class IfStatement extends Statement {
         if (thenNodes.length > 0) {
             results.push(thenNodes);
         }
-        results.push('\n');
-
         //else branch
-        if (this.tokens.else) {
+        if (this.elseBranch) {
             //else
-            results.push(
-                state.indent(),
-                state.transpileToken(this.tokens.else)
-            );
-        }
+            results.push(...state.transpileEndBlockToken(this.thenBranch, this.tokens.else, 'else'));
 
-        if (this.elseBranch) {
             if (isIfStatement(this.elseBranch)) {
                 //chained elseif
                 state.lineage.unshift(this.elseBranch);
@@ -561,19 +789,12 @@ export class IfStatement extends Statement {
                 if (body.length > 0) {
                     results.push(...body);
                 }
-                results.push('\n');
             }
         }
 
         //end if
-        results.push(state.indent());
-        if (this.tokens.endIf) {
-            results.push(
-                state.transpileToken(this.tokens.endIf)
-            );
-        } else {
-            results.push('end if');
-        }
+        results.push(...state.transpileEndBlockToken(this.elseBranch ?? this.thenBranch, this.tokens.endIf, 'end if'));
+
         return results;
     }
 
@@ -589,43 +810,59 @@ export class IfStatement extends Statement {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.if?.leadingTrivia ?? [];
+    }
+
+    get endTrivia(): Token[] {
+        return this.tokens.endIf?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new IfStatement(
-                {
-                    if: util.cloneToken(this.tokens.if),
-                    else: util.cloneToken(this.tokens.else),
-                    endIf: util.cloneToken(this.tokens.endIf),
-                    then: util.cloneToken(this.tokens.then)
-                },
-                this.condition?.clone(),
-                this.thenBranch?.clone(),
-                this.elseBranch?.clone(),
-                this.isInline
-            ),
+            new IfStatement({
+                if: util.cloneToken(this.tokens.if),
+                else: util.cloneToken(this.tokens.else),
+                endIf: util.cloneToken(this.tokens.endIf),
+                then: util.cloneToken(this.tokens.then),
+                condition: this.condition?.clone(),
+                thenBranch: this.thenBranch?.clone(),
+                elseBranch: this.elseBranch?.clone()
+            }),
             ['condition', 'thenBranch', 'elseBranch']
         );
     }
 }
 
 export class IncrementStatement extends Statement {
-    constructor(
-        readonly value: Expression,
-        readonly operator: Token
-    ) {
+    constructor(options: {
+        value: Expression;
+        operator: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            value,
-            operator
+        this.value = options.value;
+        this.tokens = {
+            operator: options.operator
+        };
+        this.location = util.createBoundingLocation(
+            this.value,
+            this.tokens.operator
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly value: Expression;
+    public readonly tokens: {
+        readonly operator: Token;
+    };
+
+    public readonly kind = AstNodeKind.IncrementStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         return [
             ...this.value.transpile(state),
-            state.transpileToken(this.operator)
+            state.transpileToken(this.tokens.operator)
         ];
     }
 
@@ -635,127 +872,150 @@ export class IncrementStatement extends Statement {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.value?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new IncrementStatement(
-                this.value?.clone(),
-                util.cloneToken(this.operator)
-            ),
+            new IncrementStatement({
+                value: this.value?.clone(),
+                operator: util.cloneToken(this.tokens.operator)
+            }),
             ['value']
         );
     }
 }
 
-/** Used to indent the current `print` position to the next 16-character-width output zone. */
-export interface PrintSeparatorTab extends Token {
-    kind: TokenKind.Comma;
-}
-
-/** Used to insert a single whitespace character at the current `print` position. */
-export interface PrintSeparatorSpace extends Token {
-    kind: TokenKind.Semicolon;
-}
-
 /**
  * Represents a `print` statement within BrightScript.
  */
 export class PrintStatement extends Statement {
     /**
      * Creates a new internal representation of a BrightScript `print` statement.
-     * @param tokens the tokens for this statement
-     * @param tokens.print a print token
-     * @param expressions an array of expressions or `PrintSeparator`s to be evaluated and printed.
+     * @param options the options for this statement
+     * @param options.print a print token
+     * @param options.expressions an array of expressions to be evaluated and printed. Wrap PrintSeparator tokens (`;` or `,`) in `PrintSeparatorExpression`
      */
-    constructor(
-        readonly tokens: {
-            print: Token;
-        },
-        readonly expressions: Array<Expression | PrintSeparatorTab | PrintSeparatorSpace>
-    ) {
+    constructor(options: {
+        print?: Token;
+        expressions: Array<Expression>;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.print,
-            ...(expressions ?? [])
+        this.tokens = {
+            print: options.print
+        };
+        this.expressions = options.expressions;
+        this.location = util.createBoundingLocation(
+            this.tokens.print,
+            ...(this.expressions ?? [])
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly print?: Token;
+    };
+
+    public readonly expressions: Array<Expression>;
+
+    public readonly kind = AstNodeKind.PrintStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [
-            state.transpileToken(this.tokens.print),
-            ' '
+            state.transpileToken(this.tokens.print, 'print')
         ] as TranspileResult;
+
+        //if the first expression has no leading whitespace, add a single space between the `print` and the expression
+        if (this.expressions.length > 0 && !this.expressions[0].leadingTrivia.find(t => t?.kind === TokenKind.Whitespace)) {
+            result.push(' ');
+        }
+
+        // eslint-disable-next-line @typescript-eslint/prefer-for-of
         for (let i = 0; i < this.expressions.length; i++) {
-            const expressionOrSeparator: any = this.expressions[i];
-            if (expressionOrSeparator.transpile) {
-                result.push(...(expressionOrSeparator as ExpressionStatement).transpile(state));
-            } else {
-                result.push(
-                    state.tokenToSourceNode(expressionOrSeparator)
-                );
-            }
-            //if there's an expression after us, add a space
-            if ((this.expressions[i + 1] as any)?.transpile) {
+            const expression = this.expressions[i];
+            let leadingWhitespace = expression.leadingTrivia.find(t => t?.kind === TokenKind.Whitespace)?.text;
+            if (leadingWhitespace) {
+                result.push(leadingWhitespace);
+                //if the previous expression was NOT a separator, and this one is not also, add a space between them
+            } else if (i > 0 && !isPrintSeparatorExpression(this.expressions[i - 1]) && !isPrintSeparatorExpression(expression) && !leadingWhitespace) {
                 result.push(' ');
             }
+
+            result.push(
+                ...expression.transpile(state)
+            );
         }
         return result;
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
         if (options.walkMode & InternalWalkMode.walkExpressions) {
-            //sometimes we have semicolon Tokens in the expressions list (should probably fix that...), so only walk the actual expressions
-            walkArray(this.expressions as AstNode[], visitor, options, this, (item) => isExpression(item as any));
+            walkArray(this.expressions, visitor, options, this);
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.print?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new PrintStatement(
-                {
-                    print: util.cloneToken(this.tokens.print)
-                },
-                this.expressions?.map(e => {
-                    if (isExpression(e as any)) {
-                        return (e as Expression).clone();
-                    } else {
-                        return util.cloneToken(e as Token);
-                    }
-                })
-            ),
+            new PrintStatement({
+                print: util.cloneToken(this.tokens.print),
+                expressions: this.expressions?.map(e => e?.clone())
+            }),
             ['expressions' as any]
         );
     }
 }
 
 export class DimStatement extends Statement {
-    constructor(
-        public dimToken: Token,
-        public identifier?: Identifier,
-        public openingSquare?: Token,
-        public dimensions?: Expression[],
-        public closingSquare?: Token
-    ) {
+    constructor(options: {
+        dim?: Token;
+        name: Identifier;
+        openingSquare?: Token;
+        dimensions: Expression[];
+        closingSquare?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            dimToken,
-            identifier,
-            openingSquare,
-            ...(dimensions ?? []),
-            closingSquare
+        this.tokens = {
+            dim: options?.dim,
+            name: options.name,
+            openingSquare: options.openingSquare,
+            closingSquare: options.closingSquare
+        };
+        this.dimensions = options.dimensions;
+        this.location = util.createBoundingLocation(
+            options.dim,
+            options.name,
+            options.openingSquare,
+            ...(this.dimensions ?? []),
+            options.closingSquare
         );
     }
-    public range: Range | undefined;
+
+    public readonly tokens: {
+        readonly dim?: Token;
+        readonly name: Identifier;
+        readonly openingSquare?: Token;
+        readonly closingSquare?: Token;
+    };
+    public readonly dimensions: Expression[];
+
+    public readonly kind = AstNodeKind.DimStatement;
+
+    public readonly location: Location | undefined;
 
     public transpile(state: BrsTranspileState) {
-        let result = [
-            state.transpileToken(this.dimToken),
+        let result: TranspileResult = [
+            state.transpileToken(this.tokens.dim, 'dim'),
             ' ',
-            state.transpileToken(this.identifier!),
-            state.transpileToken(this.openingSquare!)
-        ] as TranspileResult;
-        for (let i = 0; i < this.dimensions!.length; i++) {
+            state.transpileToken(this.tokens.name),
+            state.transpileToken(this.tokens.openingSquare, '[')
+        ];
+        for (let i = 0; i < this.dimensions.length; i++) {
             if (i > 0) {
                 result.push(', ');
             }
@@ -763,7 +1023,7 @@ export class DimStatement extends Statement {
                 ...this.dimensions![i].transpile(state)
             );
         }
-        result.push(state.transpileToken(this.closingSquare!));
+        result.push(state.transpileToken(this.tokens.closingSquare, ']'));
         return result;
     }
 
@@ -774,39 +1034,61 @@ export class DimStatement extends Statement {
         }
     }
 
+    public getType(options: GetTypeOptions): BscType {
+        const numDimensions = this.dimensions?.length ?? 1;
+        let type = new ArrayType();
+        for (let i = 0; i < numDimensions - 1; i++) {
+            type = new ArrayType(type);
+        }
+        return type;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.dim?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new DimStatement(
-                util.cloneToken(this.dimToken),
-                util.cloneToken(this.identifier),
-                util.cloneToken(this.openingSquare),
-                this.dimensions?.map(e => e?.clone()),
-                util.cloneToken(this.closingSquare)
-            ),
+            new DimStatement({
+                dim: util.cloneToken(this.tokens.dim),
+                name: util.cloneToken(this.tokens.name),
+                openingSquare: util.cloneToken(this.tokens.openingSquare),
+                dimensions: this.dimensions?.map(e => e?.clone()),
+                closingSquare: util.cloneToken(this.tokens.closingSquare)
+            }),
             ['dimensions']
         );
     }
 }
 
 export class GotoStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            goto: Token;
-            label: Token;
-        }
-    ) {
+    constructor(options: {
+        goto?: Token;
+        label: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.goto,
-            tokens.label
+        this.tokens = {
+            goto: options.goto,
+            label: options.label
+        };
+        this.location = util.createBoundingLocation(
+            this.tokens.goto,
+            this.tokens.label
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly goto?: Token;
+        readonly label: Token;
+    };
+
+    public readonly kind = AstNodeKind.GotoStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         return [
-            state.transpileToken(this.tokens.goto),
+            state.transpileToken(this.tokens.goto, 'goto'),
             ' ',
             state.transpileToken(this.tokens.label)
         ];
@@ -816,6 +1098,10 @@ export class GotoStatement extends Statement {
         //nothing to walk
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.goto?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
             new GotoStatement({
@@ -827,25 +1113,36 @@ export class GotoStatement extends Statement {
 }
 
 export class LabelStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            identifier: Token;
-            colon: Token;
-        }
-    ) {
+    constructor(options: {
+        name: Token;
+        colon?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.identifier,
-            tokens.colon
+        this.tokens = {
+            name: options.name,
+            colon: options.colon
+        };
+        this.location = util.createBoundingLocation(
+            this.tokens.name,
+            this.tokens.colon
         );
     }
+    public readonly tokens: {
+        readonly name: Token;
+        readonly colon: Token;
+    };
+    public readonly kind = AstNodeKind.LabelStatement;
 
-    public readonly range: Range | undefined;
+    public readonly location: Location | undefined;
+
+    public get leadingTrivia(): Token[] {
+        return this.tokens.name.leadingTrivia;
+    }
 
     transpile(state: BrsTranspileState) {
         return [
-            state.transpileToken(this.tokens.identifier),
-            state.transpileToken(this.tokens.colon)
+            state.transpileToken(this.tokens.name),
+            state.transpileToken(this.tokens.colon, ':')
 
         ];
     }
@@ -857,7 +1154,7 @@ export class LabelStatement extends Statement {
     public clone() {
         return this.finalizeClone(
             new LabelStatement({
-                identifier: util.cloneToken(this.tokens.identifier),
+                name: util.cloneToken(this.tokens.name),
                 colon: util.cloneToken(this.tokens.colon)
             })
         );
@@ -865,25 +1162,33 @@ export class LabelStatement extends Statement {
 }
 
 export class ReturnStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            return: Token;
-        },
-        readonly value?: Expression
-    ) {
+    constructor(options?: {
+        return?: Token;
+        value?: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.return,
-            value
+        this.tokens = {
+            return: options?.return
+        };
+        this.value = options?.value;
+        this.location = util.createBoundingLocation(
+            this.tokens.return,
+            this.value
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly return?: Token;
+    };
+    public readonly value?: Expression;
+    public readonly kind = AstNodeKind.ReturnStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
         result.push(
-            state.transpileToken(this.tokens.return)
+            state.transpileToken(this.tokens.return, 'return')
         );
         if (this.value) {
             result.push(' ');
@@ -898,34 +1203,41 @@ export class ReturnStatement extends Statement {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.return?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ReturnStatement(
-                {
-                    return: util.cloneToken(this.tokens.return)
-                },
-                this.value?.clone()
-            ),
+            new ReturnStatement({
+                return: util.cloneToken(this.tokens.return),
+                value: this.value?.clone()
+            }),
             ['value']
         );
     }
 }
 
 export class EndStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            end: Token;
-        }
-    ) {
+    constructor(options?: {
+        end?: Token;
+    }) {
         super();
-        this.range = tokens.end.range;
+        this.tokens = {
+            end: options?.end
+        };
+        this.location = this.tokens.end?.location;
     }
+    public readonly tokens: {
+        readonly end?: Token;
+    };
+    public readonly kind = AstNodeKind.EndStatement;
 
-    public readonly range: Range;
+    public readonly location: Location;
 
     transpile(state: BrsTranspileState) {
         return [
-            state.transpileToken(this.tokens.end)
+            state.transpileToken(this.tokens.end, 'end')
         ];
     }
 
@@ -933,6 +1245,10 @@ export class EndStatement extends Statement {
         //nothing to walk
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.end?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
             new EndStatement({
@@ -943,20 +1259,24 @@ export class EndStatement extends Statement {
 }
 
 export class StopStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            stop: Token;
-        }
-    ) {
+    constructor(options?: {
+        stop?: Token;
+    }) {
         super();
-        this.range = tokens?.stop?.range;
+        this.tokens = { stop: options?.stop };
+        this.location = this.tokens?.stop?.location;
     }
+    public readonly tokens: {
+        readonly stop?: Token;
+    };
 
-    public readonly range: Range;
+    public readonly kind = AstNodeKind.StopStatement;
+
+    public readonly location: Location;
 
     transpile(state: BrsTranspileState) {
         return [
-            state.transpileToken(this.tokens.stop)
+            state.transpileToken(this.tokens.stop, 'stop')
         ];
     }
 
@@ -964,6 +1284,10 @@ export class StopStatement extends Statement {
         //nothing to walk
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.stop?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
             new StopStatement({
@@ -974,36 +1298,61 @@ export class StopStatement extends Statement {
 }
 
 export class ForStatement extends Statement {
-    constructor(
-        public forToken: Token,
-        public counterDeclaration: AssignmentStatement,
-        public toToken: Token,
-        public finalValue: Expression,
-        public body: Block,
-        public endForToken: Token,
-        public stepToken?: Token,
-        public increment?: Expression
-    ) {
+    constructor(options: {
+        for?: Token;
+        counterDeclaration: AssignmentStatement;
+        to?: Token;
+        finalValue: Expression;
+        body: Block;
+        endFor?: Token;
+        step?: Token;
+        increment?: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            forToken,
-            counterDeclaration,
-            toToken,
-            finalValue,
-            stepToken,
-            increment,
-            body,
-            endForToken
+        this.tokens = {
+            for: options.for,
+            to: options.to,
+            endFor: options.endFor,
+            step: options.step
+        };
+        this.counterDeclaration = options.counterDeclaration;
+        this.finalValue = options.finalValue;
+        this.body = options.body;
+        this.increment = options.increment;
+
+        this.location = util.createBoundingLocation(
+            this.tokens.for,
+            this.counterDeclaration,
+            this.tokens.to,
+            this.finalValue,
+            this.tokens.step,
+            this.increment,
+            this.body,
+            this.tokens.endFor
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly for?: Token;
+        readonly to?: Token;
+        readonly endFor?: Token;
+        readonly step?: Token;
+    };
+
+    public readonly counterDeclaration: AssignmentStatement;
+    public readonly finalValue: Expression;
+    public readonly body: Block;
+    public readonly increment?: Expression;
+
+    public readonly kind = AstNodeKind.ForStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
         //for
         result.push(
-            state.transpileToken(this.forToken),
+            state.transpileToken(this.tokens.for, 'for'),
             ' '
         );
         //i=1
@@ -1013,16 +1362,16 @@ export class ForStatement extends Statement {
         );
         //to
         result.push(
-            state.transpileToken(this.toToken),
+            state.transpileToken(this.tokens.to, 'to'),
             ' '
         );
         //final value
         result.push(this.finalValue.transpile(state));
         //step
-        if (this.stepToken) {
+        if (this.increment) {
             result.push(
                 ' ',
-                state.transpileToken(this.stepToken),
+                state.transpileToken(this.tokens.step, 'step'),
                 ' ',
                 this.increment!.transpile(state)
             );
@@ -1032,14 +1381,8 @@ export class ForStatement extends Statement {
         result.push(...this.body.transpile(state));
         state.lineage.shift();
 
-        // add new line before "end for"
-        result.push('\n');
-
         //end for
-        result.push(
-            state.indent(),
-            state.transpileToken(this.endForToken)
-        );
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endFor, 'end for'));
 
         return result;
     }
@@ -1057,62 +1400,96 @@ export class ForStatement extends Statement {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.for?.leadingTrivia ?? [];
+    }
+
+    public get endTrivia(): Token[] {
+        return this.tokens.endFor?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ForStatement(
-                util.cloneToken(this.forToken),
-                this.counterDeclaration?.clone(),
-                util.cloneToken(this.toToken),
-                this.finalValue?.clone(),
-                this.body?.clone(),
-                util.cloneToken(this.endForToken),
-                util.cloneToken(this.stepToken),
-                this.increment?.clone()
-            ),
+            new ForStatement({
+                for: util.cloneToken(this.tokens.for),
+                counterDeclaration: this.counterDeclaration?.clone(),
+                to: util.cloneToken(this.tokens.to),
+                finalValue: this.finalValue?.clone(),
+                body: this.body?.clone(),
+                endFor: util.cloneToken(this.tokens.endFor),
+                step: util.cloneToken(this.tokens.step),
+                increment: this.increment?.clone()
+            }),
             ['counterDeclaration', 'finalValue', 'body', 'increment']
         );
     }
 }
 
 export class ForEachStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            forEach: Token;
-            in: Token;
-            endFor: Token;
-        },
-        readonly item: Token,
-        readonly target: Expression,
-        readonly body: Block
-    ) {
+    constructor(options: {
+        forEach?: Token;
+        item: Token;
+        as?: Token;
+        typeExpression?: TypeExpression;
+        in?: Token;
+        target: Expression;
+        body: Block;
+        endFor?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.forEach,
-            item,
-            tokens.in,
-            target,
-            body,
-            tokens.endFor
+        this.tokens = {
+            forEach: options.forEach,
+            item: options.item,
+            as: options.as,
+            in: options.in,
+            endFor: options.endFor
+        };
+        this.body = options.body;
+        this.target = options.target;
+        this.typeExpression = options.typeExpression;
+
+        this.location = util.createBoundingLocation(
+            this.tokens.forEach,
+            this.tokens.item,
+            this.tokens.as,
+            this.typeExpression,
+            this.tokens.in,
+            this.target,
+            this.body,
+            this.tokens.endFor
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly forEach?: Token;
+        readonly item: Token;
+        readonly as: Token;
+        readonly in?: Token;
+        readonly endFor?: Token;
+    };
+    public readonly body: Block;
+    public readonly target: Expression;
+    public readonly typeExpression?: TypeExpression;
+
+    public readonly kind = AstNodeKind.ForEachStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
         //for each
         result.push(
-            state.transpileToken(this.tokens.forEach),
+            state.transpileToken(this.tokens.forEach, 'for each'),
             ' '
         );
         //item
         result.push(
-            state.transpileToken(this.item),
+            state.transpileToken(this.tokens.item),
             ' '
         );
         //in
         result.push(
-            state.transpileToken(this.tokens.in),
+            state.transpileToken(this.tokens.in, 'in'),
             ' '
         );
         //target
@@ -1122,14 +1499,9 @@ export class ForEachStatement extends Statement {
         result.push(...this.body.transpile(state));
         state.lineage.shift();
 
-        // add new line before "end for"
-        result.push('\n');
-
         //end for
-        result.push(
-            state.indent(),
-            state.transpileToken(this.tokens.endFor)
-        );
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endFor, 'end for'));
+
         return result;
     }
 
@@ -1142,48 +1514,85 @@ export class ForEachStatement extends Statement {
         }
     }
 
+    public getType(options: GetTypeOptions): BscType {
+        // Used for hovers on the statement 'item' token
+        return this.getLoopVariableType(options);
+    }
+
+    getLoopVariableType(options: GetTypeOptions): BscType {
+        if (this.typeExpression) {
+            return this.typeExpression.getType(options);
+        }
+        //register the for loop variable
+        const loopTargetType = this.target.getType({ flags: SymbolTypeFlag.runtime });
+        const loopVarType = new ArrayDefaultTypeReferenceType(loopTargetType);
+
+        return loopVarType;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.forEach?.leadingTrivia ?? [];
+    }
+
+    public get endTrivia(): Token[] {
+        return this.tokens.endFor?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ForEachStatement(
-                {
-                    forEach: util.cloneToken(this.tokens.forEach),
-                    in: util.cloneToken(this.tokens.in),
-                    endFor: util.cloneToken(this.tokens.endFor)
-                },
-                util.cloneToken(this.item),
-                this.target?.clone(),
-                this.body?.clone()
-            ),
+            new ForEachStatement({
+                forEach: util.cloneToken(this.tokens.forEach),
+                in: util.cloneToken(this.tokens.in),
+                as: util.cloneToken(this.tokens.as),
+                typeExpression: this.typeExpression?.clone(),
+                endFor: util.cloneToken(this.tokens.endFor),
+                item: util.cloneToken(this.tokens.item),
+                target: this.target?.clone(),
+                body: this.body?.clone()
+            }),
             ['target', 'body']
         );
     }
 }
 
 export class WhileStatement extends Statement {
-    constructor(
-        readonly tokens: {
-            while: Token;
-            endWhile: Token;
-        },
-        readonly condition: Expression,
-        readonly body: Block
-    ) {
+    constructor(options: {
+        while?: Token;
+        endWhile?: Token;
+        condition: Expression;
+        body: Block;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.while,
-            condition,
-            body,
-            tokens.endWhile
+        this.tokens = {
+            while: options.while,
+            endWhile: options.endWhile
+        };
+        this.body = options.body;
+        this.condition = options.condition;
+        this.location = util.createBoundingLocation(
+            this.tokens.while,
+            this.condition,
+            this.body,
+            this.tokens.endWhile
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly while?: Token;
+        readonly endWhile?: Token;
+    };
+    public readonly condition: Expression;
+    public readonly body: Block;
+
+    public readonly kind = AstNodeKind.WhileStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
         //while
         result.push(
-            state.transpileToken(this.tokens.while),
+            state.transpileToken(this.tokens.while, 'while'),
             ' '
         );
         //condition
@@ -1195,14 +1604,8 @@ export class WhileStatement extends Statement {
         result.push(...this.body.transpile(state));
         state.lineage.shift();
 
-        //trailing newline only if we have body statements
-        result.push('\n');
-
         //end while
-        result.push(
-            state.indent(),
-            state.transpileToken(this.tokens.endWhile)
-        );
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endWhile, 'end while'));
 
         return result;
     }
@@ -1216,59 +1619,79 @@ export class WhileStatement extends Statement {
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.while?.leadingTrivia ?? [];
+    }
+
+    public get endTrivia(): Token[] {
+        return this.tokens.endWhile?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new WhileStatement(
-                {
-                    while: util.cloneToken(this.tokens.while),
-                    endWhile: util.cloneToken(this.tokens.endWhile)
-                },
-                this.condition?.clone(),
-                this.body?.clone()
-            ),
+            new WhileStatement({
+                while: util.cloneToken(this.tokens.while),
+                endWhile: util.cloneToken(this.tokens.endWhile),
+                condition: this.condition?.clone(),
+                body: this.body?.clone()
+            }),
             ['condition', 'body']
         );
     }
 }
 
 export class DottedSetStatement extends Statement {
-    constructor(
-        readonly obj: Expression,
-        readonly name: Identifier,
-        readonly value: Expression,
-        readonly dot?: Token,
-        readonly equals?: Token
-    ) {
+    constructor(options: {
+        obj: Expression;
+        name: Identifier;
+        value: Expression;
+        dot?: Token;
+        equals?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            obj,
-            dot,
-            name,
-            equals,
-            value
+        this.tokens = {
+            name: options.name,
+            dot: options.dot,
+            equals: options.equals
+        };
+        this.obj = options.obj;
+        this.value = options.value;
+        this.location = util.createBoundingLocation(
+            this.obj,
+            this.tokens.dot,
+            this.tokens.equals,
+            this.tokens.name,
+            this.value
         );
     }
+    public readonly tokens: {
+        readonly name: Identifier;
+        readonly equals?: Token;
+        readonly dot?: Token;
+    };
+
+    public readonly obj: Expression;
+    public readonly value: Expression;
 
-    public readonly range: Range | undefined;
+    public readonly kind = AstNodeKind.DottedSetStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         //if the value is a compound assignment, don't add the obj, dot, name, or operator...the expression will handle that
-        if (CompoundAssignmentOperators.includes((this.value as BinaryExpression)?.operator?.kind)) {
-            return this.value.transpile(state);
-        } else {
-            return [
-                //object
-                ...this.obj.transpile(state),
-                this.dot ? state.tokenToSourceNode(this.dot) : '.',
-                //name
-                state.transpileToken(this.name),
-                ' ',
-                state.transpileToken(this.equals, '='),
-                ' ',
-                //right-hand-side of assignment
-                ...this.value.transpile(state)
-            ];
-        }
+        return [
+            //object
+            ...this.obj.transpile(state),
+            this.tokens.dot ? state.tokenToSourceNode(this.tokens.dot) : '.',
+            //name
+            state.transpileToken(this.tokens.name),
+            ' ',
+            state.transpileToken(this.tokens.equals, '='),
+            ' ',
+            //right-hand-side of assignment
+            ...this.value.transpile(state)
+        ];
+
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
@@ -1278,119 +1701,155 @@ export class DottedSetStatement extends Statement {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const objType = this.obj?.getType(options);
+        const result = objType?.getMemberType(this.tokens.name?.text, options);
+        options.typeChain?.push(new TypeChainEntry({
+            name: this.tokens.name?.text,
+            type: result, data: options.data,
+            location: this.tokens.name?.location,
+            astNode: this
+        }));
+        return result;
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.obj.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new DottedSetStatement(
-                this.obj?.clone(),
-                util.cloneToken(this.name),
-                this.value?.clone(),
-                util.cloneToken(this.dot),
-                util.cloneToken(this.equals)
-            ),
+            new DottedSetStatement({
+                obj: this.obj?.clone(),
+                dot: util.cloneToken(this.tokens.dot),
+                name: util.cloneToken(this.tokens.name),
+                equals: util.cloneToken(this.tokens.equals),
+                value: this.value?.clone()
+            }),
             ['obj', 'value']
         );
     }
 }
 
 export class IndexedSetStatement extends Statement {
-    constructor(
-        readonly obj: Expression,
-        readonly index: Expression,
-        readonly value: Expression,
-        readonly openingSquare: Token,
-        readonly closingSquare: Token,
-        readonly additionalIndexes?: Expression[],
-        readonly equals?: Token
-    ) {
+    constructor(options: {
+        obj: Expression;
+        indexes: Expression[];
+        value: Expression;
+        openingSquare?: Token;
+        closingSquare?: Token;
+        equals?: Token;
+    }) {
         super();
-        this.additionalIndexes ??= [];
-        this.range = util.createBoundingRange(
-            obj,
-            openingSquare,
-            index,
-            closingSquare,
-            equals,
-            value,
-            ...this.additionalIndexes
+        this.tokens = {
+            openingSquare: options.openingSquare,
+            closingSquare: options.closingSquare,
+            equals: options.equals
+        };
+        this.obj = options.obj;
+        this.indexes = options.indexes ?? [];
+        this.value = options.value;
+        this.location = util.createBoundingLocation(
+            this.obj,
+            this.tokens.openingSquare,
+            ...this.indexes,
+            this.tokens.closingSquare,
+            this.value
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly openingSquare?: Token;
+        readonly closingSquare?: Token;
+        readonly equals?: Token;
+    };
+    public readonly obj: Expression;
+    public readonly indexes: Expression[];
+    public readonly value: Expression;
+
+    public readonly kind = AstNodeKind.IndexedSetStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
-        //if the value is a component assignment, don't add the obj, index or operator...the expression will handle that
-        if (CompoundAssignmentOperators.includes((this.value as BinaryExpression)?.operator?.kind)) {
-            return this.value.transpile(state);
-        } else {
-            const result = [];
-            result.push(
-                //obj
-                ...this.obj.transpile(state),
-                //   [
-                state.transpileToken(this.openingSquare)
-            );
-            const indexes = [this.index, ...this.additionalIndexes ?? []];
-            for (let i = 0; i < indexes.length; i++) {
-                //add comma between indexes
-                if (i > 0) {
-                    result.push(', ');
-                }
-                let index = indexes[i];
-                result.push(
-                    ...(index?.transpile(state) ?? [])
-                );
+        const result = [];
+        result.push(
+            //obj
+            ...this.obj.transpile(state),
+            //   [
+            state.transpileToken(this.tokens.openingSquare, '[')
+        );
+        for (let i = 0; i < this.indexes.length; i++) {
+            //add comma between indexes
+            if (i > 0) {
+                result.push(', ');
             }
+            let index = this.indexes[i];
             result.push(
-                state.transpileToken(this.closingSquare),
-                ' ',
-                state.transpileToken(this.equals, '='),
-                ' ',
-                ...this.value.transpile(state)
+                ...(index?.transpile(state) ?? [])
             );
-            return result;
         }
+        result.push(
+            state.transpileToken(this.tokens.closingSquare, ']'),
+            ' ',
+            state.transpileToken(this.tokens.equals, '='),
+            ' ',
+            ...this.value.transpile(state)
+        );
+        return result;
+
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
         if (options.walkMode & InternalWalkMode.walkExpressions) {
             walk(this, 'obj', visitor, options);
-            walk(this, 'index', visitor, options);
-            walkArray(this.additionalIndexes, visitor, options, this);
+            walkArray(this.indexes, visitor, options, this);
             walk(this, 'value', visitor, options);
         }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.obj.leadingTrivia;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new IndexedSetStatement(
-                this.obj?.clone(),
-                this.index?.clone(),
-                this.value?.clone(),
-                util.cloneToken(this.openingSquare),
-                util.cloneToken(this.closingSquare),
-                this.additionalIndexes?.map(e => e?.clone()),
-                util.cloneToken(this.equals)
-            ),
-            ['obj', 'index', 'value', 'additionalIndexes']
+            new IndexedSetStatement({
+                obj: this.obj?.clone(),
+                openingSquare: util.cloneToken(this.tokens.openingSquare),
+                indexes: this.indexes?.map(x => x?.clone()),
+                closingSquare: util.cloneToken(this.tokens.closingSquare),
+                equals: util.cloneToken(this.tokens.equals),
+                value: this.value?.clone()
+            }),
+            ['obj', 'indexes', 'value']
         );
     }
 }
 
 export class LibraryStatement extends Statement implements TypedefProvider {
-    constructor(
-        readonly tokens: {
-            library: Token;
-            filePath: Token | undefined;
-        }
-    ) {
+    constructor(options: {
+        library: Token;
+        filePath?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            this.tokens?.library,
-            this.tokens?.filePath
+        this.tokens = {
+            library: options?.library,
+            filePath: options?.filePath
+        };
+        this.location = util.createBoundingLocation(
+            this.tokens.library,
+            this.tokens.filePath
         );
     }
+    public readonly tokens: {
+        readonly library: Token;
+        readonly filePath?: Token;
+    };
 
-    public readonly range: Range | undefined;
+    public readonly kind = AstNodeKind.LibraryStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
@@ -1415,30 +1874,47 @@ export class LibraryStatement extends Statement implements TypedefProvider {
         //nothing to walk
     }
 
-    public clone() {
+    get leadingTrivia(): Token[] {
+        return this.tokens.library?.leadingTrivia ?? [];
+    }
+
+    public clone() {
         return this.finalizeClone(
-            new LibraryStatement(
-                this.tokens === undefined ? undefined : {
-                    library: util.cloneToken(this.tokens?.library),
-                    filePath: util.cloneToken(this.tokens?.filePath)
-                }
-            )
+            new LibraryStatement({
+                library: util.cloneToken(this.tokens?.library),
+                filePath: util.cloneToken(this.tokens?.filePath)
+            })
         );
     }
 }
 
 export class NamespaceStatement extends Statement implements TypedefProvider {
-    constructor(
-        public keyword: Token,
-        // this should technically only be a VariableExpression or DottedGetExpression, but that can be enforced elsewhere
-        public nameExpression: NamespacedVariableNameExpression,
-        public body: Body,
-        public endKeyword: Token
-    ) {
+    constructor(options: {
+        namespace?: Token;
+        nameExpression: VariableExpression | DottedGetExpression;
+        body: Body;
+        endNamespace?: Token;
+    }) {
         super();
-        this.symbolTable = new SymbolTable(`NamespaceStatement: '${this.name}'`, () => this.parent?.getSymbolTable());
+        this.tokens = {
+            namespace: options.namespace,
+            endNamespace: options.endNamespace
+        };
+        this.nameExpression = options.nameExpression;
+        this.body = options.body;
+        this.symbolTable = new SymbolTable(`NamespaceStatement: '${this.name}'`, () => this.getRoot()?.getSymbolTable());
     }
 
+    public readonly tokens: {
+        readonly namespace?: Token;
+        readonly endNamespace?: Token;
+    };
+
+    public readonly nameExpression: VariableExpression | DottedGetExpression;
+    public readonly body: Body;
+
+    public readonly kind = AstNodeKind.NamespaceStatement;
+
     /**
      * The string name for this namespace
      */
@@ -1446,49 +1922,73 @@ export class NamespaceStatement extends Statement implements TypedefProvider {
         return this.getName(ParseMode.BrighterScript);
     }
 
-    public get range() {
-        return this.cacheRange();
+    public get location() {
+        return this.cacheLocation();
     }
-    private _range: Range | undefined;
+    private _location: Location | undefined;
 
-    public cacheRange() {
-        if (!this._range) {
-            this._range = util.createBoundingRange(
-                this.keyword,
+    public cacheLocation() {
+        if (!this._location) {
+            this._location = util.createBoundingLocation(
+                this.tokens.namespace,
                 this.nameExpression,
                 this.body,
-                this.endKeyword
+                this.tokens.endNamespace
             );
         }
-        return this._range;
+        return this._location;
     }
 
     public getName(parseMode: ParseMode) {
-        const parentNamespace = this.findAncestor<NamespaceStatement>(isNamespaceStatement);
-        let name = this.nameExpression?.getName?.(parseMode);
-        if (!name) {
-            return name;
+        const sep = parseMode === ParseMode.BrighterScript ? '.' : '_';
+        let name = util.getAllDottedGetPartsAsString(this.nameExpression, parseMode);
+        if ((this.parent as Body)?.parent?.kind === AstNodeKind.NamespaceStatement) {
+            name = (this.parent.parent as NamespaceStatement).getName(parseMode) + sep + name;
         }
+        return name;
+    }
 
-        if (parentNamespace) {
-            const sep = parseMode === ParseMode.BrighterScript ? '.' : '_';
-            name = parentNamespace.getName(parseMode) + sep + name;
-        }
+    public get leadingTrivia(): Token[] {
+        return this.tokens.namespace?.leadingTrivia;
+    }
 
-        return name;
+    public get endTrivia(): Token[] {
+        return this.tokens.endNamespace?.leadingTrivia;
+    }
+
+    public getNameParts() {
+        let parts = util.getAllDottedGetParts(this.nameExpression);
+
+        if ((this.parent as Body)?.parent?.kind === AstNodeKind.NamespaceStatement) {
+            parts = (this.parent.parent as NamespaceStatement).getNameParts().concat(parts);
+        }
+        return parts;
     }
 
     transpile(state: BrsTranspileState) {
         //namespaces don't actually have any real content, so just transpile their bodies
-        return this.body.transpile(state);
+        return [
+            state.transpileAnnotations(this),
+            state.transpileLeadingComments(this.tokens.namespace),
+            this.body.transpile(state),
+            state.transpileLeadingComments(this.tokens.endNamespace)
+        ];
     }
 
-    getTypedef(state: BrsTranspileState): TranspileResult {
-        let result = [
-            'namespace ',
+    getTypedef(state: BrsTranspileState) {
+        let result: TranspileResult = [];
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
+
+        result.push('namespace ',
             ...this.getName(ParseMode.BrighterScript),
             state.newline
-        ] as TranspileResult;
+        );
         state.blockDepth++;
         result.push(
             ...this.body.getTypedef(state)
@@ -1512,56 +2012,74 @@ export class NamespaceStatement extends Statement implements TypedefProvider {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const resultType = new NamespaceType(this.name);
+        return resultType;
+    }
+
     public clone() {
         const clone = this.finalizeClone(
-            new NamespaceStatement(
-                util.cloneToken(this.keyword),
-                this.nameExpression?.clone(),
-                this.body?.clone(),
-                util.cloneToken(this.endKeyword)
-            ),
+            new NamespaceStatement({
+                namespace: util.cloneToken(this.tokens.namespace),
+                nameExpression: this.nameExpression?.clone(),
+                body: this.body?.clone(),
+                endNamespace: util.cloneToken(this.tokens.endNamespace)
+            }),
             ['nameExpression', 'body']
         );
-        clone.cacheRange();
+        clone.cacheLocation();
         return clone;
     }
 }
 
 export class ImportStatement extends Statement implements TypedefProvider {
-    constructor(
-        readonly importToken: Token,
-        readonly filePathToken: Token | undefined
-    ) {
+    constructor(options: {
+        import?: Token;
+        path?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            importToken,
-            filePathToken
+        this.tokens = {
+            import: options.import,
+            path: options.path
+        };
+        this.location = util.createBoundingLocation(
+            this.tokens.import,
+            this.tokens.path
         );
-        if (this.filePathToken) {
+        if (this.tokens.path) {
             //remove quotes
-            this.filePath = this.filePathToken.text.replace(/"/g, '');
-            if (this.filePathToken.range) {
+            this.filePath = this.tokens.path.text.replace(/"/g, '');
+            if (this.tokens.path?.location?.range) {
                 //adjust the range to exclude the quotes
-                this.filePathToken.range = util.createRange(
-                    this.filePathToken.range.start.line,
-                    this.filePathToken.range.start.character + 1,
-                    this.filePathToken.range.end.line,
-                    this.filePathToken.range.end.character - 1
+                this.tokens.path.location = util.createLocation(
+                    this.tokens.path.location.range.start.line,
+                    this.tokens.path.location.range.start.character + 1,
+                    this.tokens.path.location.range.end.line,
+                    this.tokens.path.location.range.end.character - 1,
+                    this.tokens.path.location.uri
                 );
             }
         }
     }
-    public filePath: string | undefined;
-    public range: Range | undefined;
+
+    public readonly tokens: {
+        readonly import?: Token;
+        readonly path: Token;
+    };
+
+    public readonly kind = AstNodeKind.ImportStatement;
+
+    public readonly location: Location;
+
+    public readonly filePath: string;
 
     transpile(state: BrsTranspileState) {
         //The xml files are responsible for adding the additional script imports, but
         //add the import statement as a comment just for debugging purposes
         return [
-            `'`,
-            state.transpileToken(this.importToken),
+            state.transpileToken(this.tokens.import, 'import', true),
             ' ',
-            state.transpileToken(this.filePathToken!)
+            state.transpileToken(this.tokens.path)
         ];
     }
 
@@ -1570,10 +2088,10 @@ export class ImportStatement extends Statement implements TypedefProvider {
      */
     public getTypedef(state: BrsTranspileState) {
         return [
-            this.importToken.text,
+            this.tokens.import?.text ?? 'import',
             ' ',
             //replace any `.bs` extension with `.brs`
-            this.filePathToken!.text.replace(/\.bs"?$/i, '.brs"')
+            this.tokens.path.text.replace(/\.bs"?$/i, '.brs"')
         ];
     }
 
@@ -1581,31 +2099,39 @@ export class ImportStatement extends Statement implements TypedefProvider {
         //nothing to walk
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.import?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ImportStatement(
-                util.cloneToken(this.importToken),
-                util.cloneToken(this.filePathToken)
-            )
+            new ImportStatement({
+                import: util.cloneToken(this.tokens.import),
+                path: util.cloneToken(this.tokens.path)
+            })
         );
     }
 }
 
 export class InterfaceStatement extends Statement implements TypedefProvider {
-    constructor(
-        interfaceToken: Token,
-        name: Identifier,
-        extendsToken: Token,
-        public parentInterfaceName: NamespacedVariableNameExpression,
-        public body: Statement[],
-        endInterfaceToken: Token
-    ) {
+    constructor(options: {
+        interface: Token;
+        name: Identifier;
+        extends?: Token;
+        parentInterfaceName?: TypeExpression;
+        body: Statement[];
+        endInterface?: Token;
+    }) {
         super();
-        this.tokens.interface = interfaceToken;
-        this.tokens.name = name;
-        this.tokens.extends = extendsToken;
-        this.tokens.endInterface = endInterfaceToken;
-        this.range = util.createBoundingRange(
+        this.tokens = {
+            interface: options.interface,
+            name: options.name,
+            extends: options.extends,
+            endInterface: options.endInterface
+        };
+        this.parentInterfaceName = options.parentInterfaceName;
+        this.body = options.body;
+        this.location = util.createBoundingLocation(
             this.tokens.interface,
             this.tokens.name,
             this.tokens.extends,
@@ -1614,32 +2140,42 @@ export class InterfaceStatement extends Statement implements TypedefProvider {
             this.tokens.endInterface
         );
     }
+    public readonly parentInterfaceName?: TypeExpression;
+    public readonly body: Statement[];
 
-    public tokens = {} as {
-        interface: Token;
-        name: Identifier;
-        extends: Token;
-        endInterface: Token;
+    public readonly kind = AstNodeKind.InterfaceStatement;
+
+    public readonly tokens = {} as {
+        readonly interface?: Token;
+        readonly name: Identifier;
+        readonly extends?: Token;
+        readonly endInterface?: Token;
     };
 
-    public range: Range | undefined;
+    public readonly location: Location | undefined;
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    public get namespaceName() {
-        return this.findAncestor<NamespaceStatement>(isNamespaceStatement)?.nameExpression;
+    public get fields(): InterfaceFieldStatement[] {
+        return this.body.filter(x => isInterfaceFieldStatement(x)) as InterfaceFieldStatement[];
+    }
+
+    public get methods(): InterfaceMethodStatement[] {
+        return this.body.filter(x => isInterfaceMethodStatement(x)) as InterfaceMethodStatement[];
     }
 
-    public get fields() {
-        return this.body.filter(x => isInterfaceFieldStatement(x));
+
+    public hasParentInterface() {
+        return !!this.parentInterfaceName;
+    }
+
+    public get leadingTrivia(): Token[] {
+        return this.tokens.interface?.leadingTrivia;
     }
 
-    public get methods() {
-        return this.body.filter(x => isInterfaceMethodStatement(x));
+    public get endTrivia(): Token[] {
+        return this.tokens.endInterface?.leadingTrivia;
     }
 
+
     /**
      * The name of the interface WITH its leading namespace (if applicable)
      */
@@ -1682,11 +2218,20 @@ export class InterfaceStatement extends Statement implements TypedefProvider {
 
     public transpile(state: BrsTranspileState): TranspileResult {
         //interfaces should completely disappear at runtime
-        return [];
+        return [
+            state.transpileLeadingComments(this.tokens.interface)
+        ];
     }
 
     getTypedef(state: BrsTranspileState) {
         const result = [] as TranspileResult;
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
         for (let annotation of this.annotations ?? []) {
             result.push(
                 ...annotation.getTypedef(state),
@@ -1699,7 +2244,7 @@ export class InterfaceStatement extends Statement implements TypedefProvider {
             ' ',
             this.tokens.name.text
         );
-        const parentInterfaceName = this.parentInterfaceName?.getName(ParseMode.BrighterScript);
+        const parentInterfaceName = this.parentInterfaceName?.getName();
         if (parentInterfaceName) {
             result.push(
                 ' extends ',
@@ -1746,16 +2291,39 @@ export class InterfaceStatement extends Statement implements TypedefProvider {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const superIface = this.parentInterfaceName?.getType(options) as InterfaceType;
+
+        const resultType = new InterfaceType(this.getName(ParseMode.BrighterScript), superIface);
+        for (const statement of this.methods) {
+            const memberType = statement?.getType({ ...options, typeChain: undefined }); // no typechain info needed
+            const flag = statement.isOptional ? SymbolTypeFlag.runtime | SymbolTypeFlag.optional : SymbolTypeFlag.runtime;
+            resultType.addMember(statement?.tokens.name?.text, { definingNode: statement }, memberType, flag);
+        }
+        for (const statement of this.fields) {
+            const memberType = statement?.getType({ ...options, typeChain: undefined }); // no typechain info needed
+            const flag = statement.isOptional ? SymbolTypeFlag.runtime | SymbolTypeFlag.optional : SymbolTypeFlag.runtime;
+            resultType.addMember(statement?.tokens.name?.text, { definingNode: statement, isInstance: true }, memberType, flag);
+        }
+        options.typeChain?.push(new TypeChainEntry({
+            name: this.getName(ParseMode.BrighterScript),
+            type: resultType,
+            data: options.data,
+            astNode: this
+        }));
+        return resultType;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new InterfaceStatement(
-                util.cloneToken(this.tokens.interface),
-                util.cloneToken(this.tokens.name),
-                util.cloneToken(this.tokens.extends),
-                this.parentInterfaceName?.clone(),
-                this.body?.map(x => x?.clone()),
-                util.cloneToken(this.tokens.endInterface)
-            ),
+            new InterfaceStatement({
+                interface: util.cloneToken(this.tokens.interface),
+                name: util.cloneToken(this.tokens.name),
+                extends: util.cloneToken(this.tokens.extends),
+                parentInterfaceName: this.parentInterfaceName?.clone(),
+                body: this.body?.map(x => x?.clone()),
+                endInterface: util.cloneToken(this.tokens.endInterface)
+            }),
             ['parentInterfaceName', 'body']
         );
     }
@@ -1765,35 +2333,43 @@ export class InterfaceFieldStatement extends Statement implements TypedefProvide
     public transpile(state: BrsTranspileState): TranspileResult {
         throw new Error('Method not implemented.');
     }
-    constructor(
-        nameToken: Identifier,
-        asToken: Token,
-        typeToken: Token,
-        public type: BscType,
-        optionalToken?: Token
-    ) {
+    constructor(options: {
+        name: Identifier;
+        as?: Token;
+        typeExpression?: TypeExpression;
+        optional?: Token;
+    }) {
         super();
-        this.tokens.optional = optionalToken;
-        this.tokens.name = nameToken;
-        this.tokens.as = asToken;
-        this.tokens.type = typeToken;
-        this.range = util.createBoundingRange(
-            optionalToken,
-            nameToken,
-            asToken,
-            typeToken
+        this.tokens = {
+            optional: options.optional,
+            name: options.name,
+            as: options.as
+        };
+        this.typeExpression = options.typeExpression;
+        this.location = util.createBoundingLocation(
+            this.tokens.optional,
+            this.tokens.name,
+            this.tokens.as,
+            this.typeExpression
         );
     }
 
-    public range: Range | undefined;
+    public readonly kind = AstNodeKind.InterfaceFieldStatement;
 
-    public tokens = {} as {
-        optional?: Token;
-        name: Identifier;
-        as: Token;
-        type: Token;
+    public readonly typeExpression?: TypeExpression;
+
+    public readonly location: Location | undefined;
+
+    public readonly tokens: {
+        readonly name: Identifier;
+        readonly as: Token;
+        readonly optional?: Token;
     };
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.optional?.leadingTrivia ?? this.tokens.name.leadingTrivia;
+    }
+
     public get name() {
         return this.tokens.name.text;
     }
@@ -1803,11 +2379,20 @@ export class InterfaceFieldStatement extends Statement implements TypedefProvide
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
-        //nothing to walk
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'typeExpression', visitor, options);
+        }
     }
 
     getTypedef(state: BrsTranspileState): TranspileResult {
         const result = [] as TranspileResult;
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
         for (let annotation of this.annotations ?? []) {
             result.push(
                 ...annotation.getTypedef(state),
@@ -1824,56 +2409,66 @@ export class InterfaceFieldStatement extends Statement implements TypedefProvide
         result.push(
             this.tokens.name.text
         );
-        if (this.tokens.type?.text?.length > 0) {
+
+        if (this.typeExpression) {
             result.push(
                 ' as ',
-                this.tokens.type.text
+                ...this.typeExpression.getTypedef(state)
             );
         }
         return result;
     }
 
+    public getType(options: GetTypeOptions): BscType {
+        return this.typeExpression?.getType(options) ?? DynamicType.instance;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new InterfaceFieldStatement(
-                util.cloneToken(this.tokens.name),
-                util.cloneToken(this.tokens.as),
-                util.cloneToken(this.tokens.type),
-                this.type?.clone(),
-                util.cloneToken(this.tokens.optional)
-            )
+            new InterfaceFieldStatement({
+                name: util.cloneToken(this.tokens.name),
+                as: util.cloneToken(this.tokens.as),
+                typeExpression: this.typeExpression?.clone(),
+                optional: util.cloneToken(this.tokens.optional)
+            })
         );
     }
 
 }
 
+//TODO: there is much that is similar with this and FunctionExpression.
+//It would be nice to refactor this so there is less duplicated code
 export class InterfaceMethodStatement extends Statement implements TypedefProvider {
     public transpile(state: BrsTranspileState): TranspileResult {
         throw new Error('Method not implemented.');
     }
-    constructor(
-        functionTypeToken: Token,
-        nameToken: Identifier,
-        leftParen: Token,
-        public params: FunctionParameterExpression[],
-        rightParen: Token,
-        asToken?: Token,
-        returnTypeToken?: Token,
-        public returnType?: BscType,
-        optionalToken?: Token
-    ) {
+    constructor(options: {
+        functionType?: Token;
+        name: Identifier;
+        leftParen?: Token;
+        params?: FunctionParameterExpression[];
+        rightParen?: Token;
+        as?: Token;
+        returnTypeExpression?: TypeExpression;
+        optional?: Token;
+    }) {
         super();
-        this.tokens.optional = optionalToken;
-        this.tokens.functionType = functionTypeToken;
-        this.tokens.name = nameToken;
-        this.tokens.leftParen = leftParen;
-        this.tokens.rightParen = rightParen;
-        this.tokens.as = asToken;
-        this.tokens.returnType = returnTypeToken;
+        this.tokens = {
+            optional: options.optional,
+            functionType: options.functionType,
+            name: options.name,
+            leftParen: options.leftParen,
+            rightParen: options.rightParen,
+            as: options.as
+        };
+        this.params = options.params ?? [];
+        this.returnTypeExpression = options.returnTypeExpression;
     }
 
-    public get range() {
-        return util.createBoundingRange(
+    public readonly kind = AstNodeKind.InterfaceMethodStatement;
+
+    public get location() {
+        return util.createBoundingLocation(
             this.tokens.optional,
             this.tokens.functionType,
             this.tokens.name,
@@ -1881,30 +2476,51 @@ export class InterfaceMethodStatement extends Statement implements TypedefProvid
             ...(this.params ?? []),
             this.tokens.rightParen,
             this.tokens.as,
-            this.tokens.returnType
+            this.returnTypeExpression
         );
     }
+    /**
+     * Get the name of this method.
+     */
+    public getName(parseMode: ParseMode) {
+        return this.tokens.name.text;
+    }
 
-    public tokens = {} as {
-        optional?: Token;
-        functionType: Token;
-        name: Identifier;
-        leftParen: Token;
-        rightParen: Token;
-        as: Token | undefined;
-        returnType: Token | undefined;
+    public readonly tokens: {
+        readonly optional?: Token;
+        readonly functionType: Token;
+        readonly name: Identifier;
+        readonly leftParen?: Token;
+        readonly rightParen?: Token;
+        readonly as?: Token;
     };
 
+    public readonly params: FunctionParameterExpression[];
+    public readonly returnTypeExpression?: TypeExpression;
+
     public get isOptional() {
         return !!this.tokens.optional;
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.optional?.leadingTrivia ?? this.tokens.functionType.leadingTrivia;
+    }
+
     walk(visitor: WalkVisitor, options: WalkOptions) {
-        //nothing to walk
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'returnTypeExpression', visitor, options);
+        }
     }
 
     getTypedef(state: BrsTranspileState) {
         const result = [] as TranspileResult;
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
         for (let annotation of this.annotations ?? []) {
             result.push(
                 ...annotation.getTypedef(state),
@@ -1912,16 +2528,14 @@ export class InterfaceMethodStatement extends Statement implements TypedefProvid
                 state.indent()
             );
         }
-
         if (this.isOptional) {
             result.push(
                 this.tokens.optional!.text,
                 ' '
             );
         }
-
         result.push(
-            this.tokens.functionType.text,
+            this.tokens.functionType?.text ?? 'function',
             ' ',
             this.tokens.name.text,
             '('
@@ -1932,93 +2546,124 @@ export class InterfaceMethodStatement extends Statement implements TypedefProvid
                 result.push(', ');
             }
             const param = params[i];
-            result.push(param.name.text);
-            const typeToken = param.typeToken;
-            if (typeToken && typeToken.text.length > 0) {
+            result.push(param.tokens.name.text);
+            if (param.typeExpression) {
                 result.push(
                     ' as ',
-                    typeToken.text
+                    ...param.typeExpression.getTypedef(state)
                 );
             }
         }
         result.push(
             ')'
         );
-        const returnTypeToken = this.tokens.returnType;
-        if (returnTypeToken && returnTypeToken.text.length > 0) {
+        if (this.returnTypeExpression) {
             result.push(
                 ' as ',
-                returnTypeToken.text
+                ...this.returnTypeExpression.getTypedef(state)
             );
         }
         return result;
     }
 
+    public getType(options: GetTypeOptions): TypedFunctionType {
+        //if there's a defined return type, use that
+        let returnType = this.returnTypeExpression?.getType(options);
+        const isSub = this.tokens.functionType?.kind === TokenKind.Sub || !returnType;
+        //if we don't have a return type and this is a sub, set the return type to `void`. else use `dynamic`
+        if (!returnType) {
+            returnType = isSub ? VoidType.instance : DynamicType.instance;
+        }
+        const resultType = new TypedFunctionType(returnType);
+        resultType.isSub = isSub;
+        for (let param of this.params) {
+            resultType.addParameter(param.tokens.name.text, param.getType(options), !!param.defaultValue);
+        }
+        if (options.typeChain) {
+            // need Interface type for type chain
+            this.parent?.getType(options);
+        }
+        let funcName = this.getName(ParseMode.BrighterScript);
+        resultType.setName(funcName);
+        options.typeChain?.push(new TypeChainEntry({ name: resultType.name, type: resultType, data: options.data, astNode: this }));
+        return resultType;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new InterfaceMethodStatement(
-                util.cloneToken(this.tokens.functionType),
-                util.cloneToken(this.tokens.name),
-                util.cloneToken(this.tokens.leftParen),
-                this.params?.map(p => p?.clone()),
-                util.cloneToken(this.tokens.rightParen),
-                util.cloneToken(this.tokens.as),
-                util.cloneToken(this.tokens.returnType),
-                this.returnType?.clone(),
-                util.cloneToken(this.tokens.optional)
-            ),
+            new InterfaceMethodStatement({
+                optional: util.cloneToken(this.tokens.optional),
+                functionType: util.cloneToken(this.tokens.functionType),
+                name: util.cloneToken(this.tokens.name),
+                leftParen: util.cloneToken(this.tokens.leftParen),
+                params: this.params?.map(p => p?.clone()),
+                rightParen: util.cloneToken(this.tokens.rightParen),
+                as: util.cloneToken(this.tokens.as),
+                returnTypeExpression: this.returnTypeExpression?.clone()
+            }),
             ['params']
         );
     }
 }
 
 export class ClassStatement extends Statement implements TypedefProvider {
-
-    constructor(
-        readonly classKeyword: Token,
+    constructor(options: {
+        class?: Token;
         /**
          * The name of the class (without namespace prefix)
          */
-        readonly name: Identifier,
-        public body: Statement[],
-        readonly end: Token,
-        readonly extendsKeyword?: Token,
-        readonly parentClassName?: NamespacedVariableNameExpression
-    ) {
+        name: Identifier;
+        body: Statement[];
+        endClass?: Token;
+        extends?: Token;
+        parentClassName?: TypeExpression;
+    }) {
         super();
-        this.body = this.body ?? [];
+        this.body = options.body ?? [];
+        this.tokens = {
+            name: options.name,
+            class: options.class,
+            endClass: options.endClass,
+            extends: options.extends
+        };
+        this.parentClassName = options.parentClassName;
+        this.symbolTable = new SymbolTable(`ClassStatement: '${this.tokens.name?.text}'`, () => this.parent?.getSymbolTable());
 
         for (let statement of this.body) {
             if (isMethodStatement(statement)) {
                 this.methods.push(statement);
-                this.memberMap[statement?.name?.text.toLowerCase()] = statement;
+                this.memberMap[statement?.tokens.name?.text.toLowerCase()] = statement;
             } else if (isFieldStatement(statement)) {
                 this.fields.push(statement);
-                this.memberMap[statement.name?.text.toLowerCase()] = statement;
+                this.memberMap[statement?.tokens.name?.text.toLowerCase()] = statement;
             }
         }
 
-        this.range = util.createBoundingRange(
-            classKeyword,
-            name,
-            extendsKeyword,
-            parentClassName,
-            ...(body ?? []),
-            end
+        this.location = util.createBoundingLocation(
+            this.parentClassName,
+            ...(this.body ?? []),
+            util.createBoundingLocationFromTokens(this.tokens)
         );
     }
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    public get namespaceName() {
-        return this.findAncestor<NamespaceStatement>(isNamespaceStatement)?.nameExpression;
-    }
+    public readonly kind = AstNodeKind.ClassStatement;
+
+
+    public readonly tokens: {
+        readonly class?: Token;
+        /**
+         * The name of the class (without namespace prefix)
+         */
+        readonly name: Identifier;
+        readonly endClass?: Token;
+        readonly extends?: Token;
+    };
+    public readonly body: Statement[];
+    public readonly parentClassName: TypeExpression;
 
 
     public getName(parseMode: ParseMode) {
-        const name = this.name?.text;
+        const name = this.tokens.name?.text;
         if (name) {
             const namespace = this.findAncestor<NamespaceStatement>(isNamespaceStatement);
             if (namespace) {
@@ -2034,11 +2679,19 @@ export class ClassStatement extends Statement implements TypedefProvider {
         }
     }
 
-    public memberMap = {} as Record<string, MemberStatement>;
-    public methods = [] as MethodStatement[];
-    public fields = [] as FieldStatement[];
+    public get leadingTrivia(): Token[] {
+        return this.tokens.class?.leadingTrivia;
+    }
+
+    public get endTrivia(): Token[] {
+        return this.tokens.endClass?.leadingTrivia ?? [];
+    }
+
+    public readonly memberMap = {} as Record<string, MemberStatement>;
+    public readonly methods = [] as MethodStatement[];
+    public readonly fields = [] as FieldStatement[];
 
-    public readonly range: Range | undefined;
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         let result = [] as TranspileResult;
@@ -2060,6 +2713,13 @@ export class ClassStatement extends Statement implements TypedefProvider {
 
     getTypedef(state: BrsTranspileState) {
         const result = [] as TranspileResult;
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
         for (let annotation of this.annotations ?? []) {
             result.push(
                 ...annotation.getTypedef(state),
@@ -2069,12 +2729,12 @@ export class ClassStatement extends Statement implements TypedefProvider {
         }
         result.push(
             'class ',
-            this.name.text
+            this.tokens.name.text
         );
-        if (this.extendsKeyword && this.parentClassName) {
+        if (this.parentClassName) {
             const namespace = this.findAncestor<NamespaceStatement>(isNamespaceStatement);
             const fqName = util.getFullyQualifiedClassName(
-                this.parentClassName.getName(ParseMode.BrighterScript),
+                this.parentClassName.getName(),
                 namespace?.getName(ParseMode.BrighterScript)
             );
             result.push(
@@ -2127,7 +2787,7 @@ export class ClassStatement extends Statement implements TypedefProvider {
                 const namespace = stmt.findAncestor<NamespaceStatement>(isNamespaceStatement);
                 //find the parent class
                 stmt = state.file.getClassFileLink(
-                    stmt.parentClassName.getName(ParseMode.BrighterScript),
+                    stmt.parentClassName.getName(),
                     namespace?.getName(ParseMode.BrighterScript)
                 )?.item;
                 myIndex++;
@@ -2158,7 +2818,7 @@ export class ClassStatement extends Statement implements TypedefProvider {
             if (stmt.parentClassName) {
                 const namespace = stmt.findAncestor<NamespaceStatement>(isNamespaceStatement);
                 stmt = state.file.getClassFileLink(
-                    stmt.parentClassName.getName(ParseMode.BrighterScript),
+                    stmt.parentClassName.getName(),
                     namespace?.getName(ParseMode.BrighterScript)
                 )?.item;
                 ancestors.push(stmt);
@@ -2174,7 +2834,13 @@ export class ClassStatement extends Statement implements TypedefProvider {
     }
 
     private getMethodIdentifier(transpiledClassName: string, statement: MethodStatement) {
-        return { ...statement.name, text: `__${transpiledClassName}_method_${statement.name.text}` };
+        return { ...statement.tokens.name, text: `__${transpiledClassName}_method_${statement.tokens.name.text}` };
+    }
+
+    public getConstructorType() {
+        const constructorType = this.getConstructorFunction()?.getType({ flags: SymbolTypeFlag.runtime }) ?? new TypedFunctionType(null);
+        constructorType.returnType = this.getType({ flags: SymbolTypeFlag.runtime });
+        return constructorType;
     }
 
     /**
@@ -2182,7 +2848,7 @@ export class ClassStatement extends Statement implements TypedefProvider {
      */
     private getConstructorFunction() {
         return this.body.find((stmt) => {
-            return (stmt as MethodStatement)?.name?.text?.toLowerCase() === 'new';
+            return (stmt as MethodStatement)?.tokens.name?.text?.toLowerCase() === 'new';
         }) as MethodStatement;
     }
 
@@ -2256,26 +2922,35 @@ export class ClassStatement extends Statement implements TypedefProvider {
                 //store overridden parent methods as super{parentIndex}_{methodName}
                 if (
                     //is override method
-                    statement.override ||
+                    statement.tokens.override ||
                     //is constructor function in child class
-                    (statement.name.text.toLowerCase() === 'new' && ancestors[0])
+                    (statement.tokens.name.text.toLowerCase() === 'new' && ancestors[0])
                 ) {
                     result.push(
-                        `instance.super${parentClassIndex}_${statement.name.text} = instance.${statement.name.text}`,
+                        `instance.super${parentClassIndex}_${statement.tokens.name.text} = instance.${statement.tokens.name.text}`,
                         state.newline,
                         state.indent()
                     );
                 }
 
                 state.classStatement = this;
+                state.skipLeadingComments = true;
+                //add leading comments
+                if (statement.leadingTrivia.filter(token => token.kind === TokenKind.Comment).length > 0) {
+                    result.push(
+                        ...state.transpileComments(statement.leadingTrivia),
+                        state.indent()
+                    );
+                }
                 result.push(
                     'instance.',
-                    state.transpileToken(statement.name),
+                    state.transpileToken(statement.tokens.name),
                     ' = ',
                     state.transpileToken(this.getMethodIdentifier(transpiledClassName, statement)),
                     state.newline,
                     state.indent()
                 );
+                state.skipLeadingComments = false;
                 delete state.classStatement;
             } else {
                 //other random statements (probably just comments)
@@ -2307,28 +2982,32 @@ export class ClassStatement extends Statement implements TypedefProvider {
                 body.unshift(createMethodStatement('new', TokenKind.Sub));
             } else {
                 const params = this.getConstructorParams(ancestors);
-                const call = new ExpressionStatement(
-                    new CallExpression(
-                        new VariableExpression(createToken(TokenKind.Identifier, 'super')),
-                        createToken(TokenKind.LeftParen),
-                        createToken(TokenKind.RightParen),
-                        params.map(x => new VariableExpression(x.name))
-                    )
-                );
+                const call = new ExpressionStatement({
+                    expression: new CallExpression({
+                        callee: new VariableExpression({
+                            name: createToken(TokenKind.Identifier, 'super')
+                        }),
+                        openingParen: createToken(TokenKind.LeftParen),
+                        args: params.map(x => new VariableExpression({
+                            name: x.tokens.name
+                        })),
+                        closingParen: createToken(TokenKind.RightParen)
+                    })
+                });
                 body.unshift(
-                    new MethodStatement(
-                        [],
-                        createIdentifier('new'),
-                        new FunctionExpression(
-                            params.map(x => x.clone()),
-                            new Block([call]),
-                            createToken(TokenKind.Sub),
-                            createToken(TokenKind.EndSub),
-                            createToken(TokenKind.LeftParen),
-                            createToken(TokenKind.RightParen)
-                        ),
-                        null
-                    )
+                    new MethodStatement({
+                        modifiers: [],
+                        name: createIdentifier('new'),
+                        func: new FunctionExpression({
+                            parameters: params.map(x => x.clone()),
+                            body: new Block({ statements: [call] }),
+                            functionType: createToken(TokenKind.Sub),
+                            endFunctionType: createToken(TokenKind.EndSub),
+                            leftParen: createToken(TokenKind.LeftParen),
+                            rightParen: createToken(TokenKind.RightParen)
+                        }),
+                        override: null
+                    })
                 );
             }
         }
@@ -2362,7 +3041,7 @@ export class ClassStatement extends Statement implements TypedefProvider {
      * This invokes the builder, gets an instance of the class, then invokes the "new" function on that class.
      */
     private getTranspiledClassFunction(state: BrsTranspileState, transpiledClassName: string) {
-        let result = [] as TranspileResult;
+        let result: TranspileResult = state.transpileAnnotations(this);
 
         const constructorFunction = this.getConstructorFunction();
         let constructorParams = [];
@@ -2373,9 +3052,10 @@ export class ClassStatement extends Statement implements TypedefProvider {
         }
 
         result.push(
-            state.sourceNode(this.classKeyword, 'function'),
-            state.sourceNode(this.classKeyword, ' '),
-            state.sourceNode(this.name, this.getName(ParseMode.BrightScript)!),
+            state.transpileLeadingComments(this.tokens.class),
+            state.sourceNode(this.tokens.class, 'function'),
+            state.sourceNode(this.tokens.class, ' '),
+            state.sourceNode(this.tokens.name, this.getName(ParseMode.BrightScript)),
             `(`
         );
         let i = 0;
@@ -2407,7 +3087,7 @@ export class ClassStatement extends Statement implements TypedefProvider {
                 result.push(', ');
             }
             result.push(
-                state.transpileToken(param.name)
+                state.transpileToken(param.tokens.name)
             );
             i++;
         }
@@ -2434,16 +3114,50 @@ export class ClassStatement extends Statement implements TypedefProvider {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const superClass = this.parentClassName?.getType(options) as ClassType;
+
+        const resultType = new ClassType(this.getName(ParseMode.BrighterScript), superClass);
+
+        for (const statement of this.methods) {
+            const funcType = statement?.func.getType({ ...options, typeChain: undefined }); //no typechain needed
+            let flag = SymbolTypeFlag.runtime;
+            if (statement.accessModifier?.kind === TokenKind.Private) {
+                flag |= SymbolTypeFlag.private;
+            }
+            if (statement.accessModifier?.kind === TokenKind.Protected) {
+                flag |= SymbolTypeFlag.protected;
+            }
+            resultType.addMember(statement?.tokens.name?.text, { definingNode: statement }, funcType, flag);
+        }
+        for (const statement of this.fields) {
+            const fieldType = statement.getType({ ...options, typeChain: undefined }); //no typechain needed
+            let flag = SymbolTypeFlag.runtime;
+            if (statement.isOptional) {
+                flag |= SymbolTypeFlag.optional;
+            }
+            if (statement.tokens.accessModifier?.kind === TokenKind.Private) {
+                flag |= SymbolTypeFlag.private;
+            }
+            if (statement.tokens.accessModifier?.kind === TokenKind.Protected) {
+                flag |= SymbolTypeFlag.protected;
+            }
+            resultType.addMember(statement?.tokens.name?.text, { definingNode: statement, isInstance: true }, fieldType, flag);
+        }
+        options.typeChain?.push(new TypeChainEntry({ name: resultType.name, type: resultType, data: options.data, astNode: this }));
+        return resultType;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ClassStatement(
-                util.cloneToken(this.classKeyword),
-                util.cloneToken(this.name),
-                this.body?.map(x => x?.clone()),
-                util.cloneToken(this.end),
-                util.cloneToken(this.extendsKeyword),
-                this.parentClassName?.clone()
-            ),
+            new ClassStatement({
+                class: util.cloneToken(this.tokens.class),
+                name: util.cloneToken(this.tokens.name),
+                body: this.body?.map(x => x?.clone()),
+                endClass: util.cloneToken(this.tokens.endClass),
+                extends: util.cloneToken(this.tokens.extends),
+                parentClassName: this.parentClassName?.clone()
+            }),
             ['body', 'parentClassName']
         );
     }
@@ -2456,43 +3170,60 @@ const accessModifiers = [
 ];
 export class MethodStatement extends FunctionStatement {
     constructor(
-        modifiers: Token | Token[],
-        name: Identifier,
-        func: FunctionExpression,
-        public override: Token
+        options: {
+            modifiers?: Token | Token[];
+            name: Identifier;
+            func: FunctionExpression;
+            override?: Token;
+        }
     ) {
-        super(name, func);
-        if (modifiers) {
-            if (Array.isArray(modifiers)) {
-                this.modifiers.push(...modifiers);
+        super(options);
+        if (options.modifiers) {
+            if (Array.isArray(options.modifiers)) {
+                this.modifiers.push(...options.modifiers);
             } else {
-                this.modifiers.push(modifiers);
+                this.modifiers.push(options.modifiers);
             }
         }
-        this.range = util.createBoundingRange(
+        this.tokens = {
+            ...this.tokens,
+            override: options.override
+        };
+        this.location = util.createBoundingLocation(
             ...(this.modifiers),
-            override,
-            func
+            util.createBoundingLocationFromTokens(this.tokens),
+            this.func
         );
     }
 
-    public modifiers: Token[] = [];
+    public readonly kind = AstNodeKind.MethodStatement as AstNodeKind;
+
+    public readonly modifiers: Token[] = [];
+
+    public readonly tokens: {
+        readonly name: Identifier;
+        readonly override?: Token;
+    };
 
     public get accessModifier() {
         return this.modifiers.find(x => accessModifiers.includes(x.kind));
     }
 
-    public readonly range: Range | undefined;
+    public readonly location: Location | undefined;
 
     /**
      * Get the name of this method.
      */
     public getName(parseMode: ParseMode) {
-        return this.name.text;
+        return this.tokens.name.text;
+    }
+
+    public get leadingTrivia(): Token[] {
+        return this.func.leadingTrivia;
     }
 
     transpile(state: BrsTranspileState, name?: Identifier) {
-        if (this.name.text.toLowerCase() === 'new') {
+        if (this.tokens.name.text.toLowerCase() === 'new') {
             this.ensureSuperConstructorCall(state);
             //TODO we need to undo this at the bottom of this method
             this.injectFieldInitializersForConstructor(state);
@@ -2502,16 +3233,16 @@ export class MethodStatement extends FunctionStatement {
         const parentClassIndex = state.classStatement.getParentClassIndex(state);
         const visitor = createVisitor({
             VariableExpression: e => {
-                if (e.name.text.toLocaleLowerCase() === 'super') {
-                    state.editor.setProperty(e.name, 'text', `m.super${parentClassIndex}_new`);
+                if (e.tokens.name.text.toLocaleLowerCase() === 'super') {
+                    state.editor.setProperty(e.tokens.name, 'text', `m.super${parentClassIndex}_new`);
                 }
             },
             DottedGetExpression: e => {
                 const beginningVariable = util.findBeginningVariableExpression(e);
                 const lowerName = beginningVariable?.getName(ParseMode.BrighterScript).toLowerCase();
                 if (lowerName === 'super') {
-                    state.editor.setProperty(beginningVariable.name, 'text', 'm');
-                    state.editor.setProperty(e.name, 'text', `super${parentClassIndex}_${e.name.text}`);
+                    state.editor.setProperty(beginningVariable.tokens.name, 'text', 'm');
+                    state.editor.setProperty(e.tokens.name, 'text', `super${parentClassIndex}_${e.tokens.name.text}`);
                 }
             }
         });
@@ -2524,7 +3255,14 @@ export class MethodStatement extends FunctionStatement {
     }
 
     getTypedef(state: BrsTranspileState) {
-        const result = [] as TranspileResult;
+        const result: TranspileResult = [];
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
         for (let annotation of this.annotations ?? []) {
             result.push(
                 ...annotation.getTypedef(state),
@@ -2538,7 +3276,7 @@ export class MethodStatement extends FunctionStatement {
                 ' '
             );
         }
-        if (this.override) {
+        if (this.tokens.override) {
             result.push('override ');
         }
         result.push(
@@ -2563,7 +3301,7 @@ export class MethodStatement extends FunctionStatement {
                 //is a call statement
                 return isExpressionStatement(x) && isCallExpression(x.expression) &&
                     //is a call to super
-                    util.findBeginningVariableExpression(x.expression.callee as any)?.name.text.toLowerCase() === 'super';
+                    util.findBeginningVariableExpression(x.expression.callee as any).tokens.name?.text.toLowerCase() === 'super';
             }) !== -1;
 
         //if a call to super exists, quit here
@@ -2572,34 +3310,37 @@ export class MethodStatement extends FunctionStatement {
         }
 
         //this is a child class, and the constructor doesn't contain a call to super. Inject one
-        const superCall = new ExpressionStatement(
-            new CallExpression(
-                new VariableExpression(
-                    {
+        const superCall = new ExpressionStatement({
+            expression: new CallExpression({
+                callee: new VariableExpression({
+                    name: {
                         kind: TokenKind.Identifier,
                         text: 'super',
                         isReserved: false,
-                        range: state.classStatement!.name.range,
-                        leadingWhitespace: ''
+                        location: state.classStatement.tokens.name.location,
+                        leadingWhitespace: '',
+                        leadingTrivia: []
                     }
-                ),
-                {
+                }),
+                openingParen: {
                     kind: TokenKind.LeftParen,
                     text: '(',
                     isReserved: false,
-                    range: state.classStatement!.name.range,
-                    leadingWhitespace: ''
+                    location: state.classStatement.tokens.name.location,
+                    leadingWhitespace: '',
+                    leadingTrivia: []
                 },
-                {
+                closingParen: {
                     kind: TokenKind.RightParen,
                     text: ')',
                     isReserved: false,
-                    range: state.classStatement!.name.range,
-                    leadingWhitespace: ''
+                    location: state.classStatement.tokens.name.location,
+                    leadingWhitespace: '',
+                    leadingTrivia: []
                 },
-                []
-            )
-        );
+                args: []
+            })
+        });
         state.editor.arrayUnshift(this.func.body.statements, superCall);
     }
 
@@ -2612,22 +3353,23 @@ export class MethodStatement extends FunctionStatement {
         let newStatements = [] as Statement[];
         //insert the field initializers in order
         for (let field of state.classStatement!.fields) {
-            let thisQualifiedName = { ...field.name };
-            thisQualifiedName.text = 'm.' + field.name?.text;
-            if (field.initialValue) {
-                newStatements.push(
-                    new AssignmentStatement(field.equal, thisQualifiedName, field.initialValue)
-                );
-            } else {
-                //if there is no initial value, set the initial value to `invalid`
-                newStatements.push(
-                    new AssignmentStatement(
-                        createToken(TokenKind.Equal, '=', field.name?.range),
-                        thisQualifiedName,
-                        createInvalidLiteral('invalid', field.name?.range)
-                    )
-                );
-            }
+            let thisQualifiedName = { ...field.tokens.name };
+            thisQualifiedName.text = 'm.' + field.tokens.name?.text;
+            const fieldAssignment = field.initialValue
+                ? new AssignmentStatement({
+                    equals: field.tokens.equals,
+                    name: thisQualifiedName,
+                    value: field.initialValue
+                })
+                : new AssignmentStatement({
+                    equals: createToken(TokenKind.Equal, '=', field.tokens.name.location),
+                    name: thisQualifiedName,
+                    //if there is no initial value, set the initial value to `invalid`
+                    value: createInvalidLiteral('invalid', field.tokens.name.location)
+                });
+            // Add parent so namespace lookups work
+            fieldAssignment.parent = state.classStatement;
+            newStatements.push(fieldAssignment);
         }
         state.editor.arraySplice(this.func.body.statements, startingIndex, 0, ...newStatements);
     }
@@ -2640,61 +3382,82 @@ export class MethodStatement extends FunctionStatement {
 
     public clone() {
         return this.finalizeClone(
-            new MethodStatement(
-                this.modifiers?.map(m => util.cloneToken(m)),
-                util.cloneToken(this.name),
-                this.func?.clone(),
-                util.cloneToken(this.override)
-            ),
+            new MethodStatement({
+                modifiers: this.modifiers?.map(m => util.cloneToken(m)),
+                name: util.cloneToken(this.tokens.name),
+                func: this.func?.clone(),
+                override: util.cloneToken(this.tokens.override)
+            }),
             ['func']
         );
     }
 }
-/**
- * @deprecated use `MethodStatement`
- */
-export class ClassMethodStatement extends MethodStatement { }
 
 export class FieldStatement extends Statement implements TypedefProvider {
-
-    constructor(
-        readonly accessModifier?: Token,
-        readonly name?: Identifier,
-        readonly as?: Token,
-        readonly type?: Token,
-        readonly equal?: Token,
-        readonly initialValue?: Expression,
-        readonly optional?: Token
-    ) {
+    constructor(options: {
+        accessModifier?: Token;
+        name: Identifier;
+        as?: Token;
+        typeExpression?: TypeExpression;
+        equals?: Token;
+        initialValue?: Expression;
+        optional?: Token;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            accessModifier,
-            name,
-            as,
-            type,
-            equal,
-            initialValue
+        this.tokens = {
+            accessModifier: options.accessModifier,
+            name: options.name,
+            as: options.as,
+            equals: options.equals,
+            optional: options.optional
+        };
+        this.typeExpression = options.typeExpression;
+        this.initialValue = options.initialValue;
+
+        this.location = util.createBoundingLocation(
+            util.createBoundingLocationFromTokens(this.tokens),
+            this.typeExpression,
+            this.initialValue
         );
     }
 
-    /**
-     * Derive a ValueKind from the type token, or the initial value.
-     * Defaults to `DynamicType`
-     */
-    getType() {
-        if (this.type) {
-            return util.tokenToBscType(this.type);
-        } else if (isLiteralExpression(this.initialValue)) {
-            return this.initialValue.type;
-        } else {
-            return new DynamicType();
-        }
+    public readonly tokens: {
+        readonly accessModifier?: Token;
+        readonly name: Identifier;
+        readonly as?: Token;
+        readonly equals?: Token;
+        readonly optional?: Token;
+    };
+
+    public readonly typeExpression?: TypeExpression;
+    public readonly initialValue?: Expression;
+
+    public readonly kind = AstNodeKind.FieldStatement;
+
+    /**
+     * Derive a ValueKind from the type token, or the initial value.
+     * Defaults to `DynamicType`
+     */
+    getType(options: GetTypeOptions) {
+        let initialValueType = this.initialValue?.getType({ ...options, flags: SymbolTypeFlag.runtime });
+
+        if (isInvalidType(initialValueType) || isVoidType(initialValueType) || isUninitializedType(initialValueType)) {
+            initialValueType = undefined;
+        }
+
+        return this.typeExpression?.getType({ ...options, flags: SymbolTypeFlag.typetime }) ??
+            util.getDefaultTypeFromValueType(initialValueType) ??
+            DynamicType.instance;
     }
 
-    public readonly range: Range | undefined;
+    public readonly location: Location | undefined;
+
+    public get leadingTrivia(): Token[] {
+        return this.tokens.accessModifier?.leadingTrivia ?? this.tokens.optional?.leadingTrivia ?? this.tokens.name.leadingTrivia;
+    }
 
     public get isOptional() {
-        return !!this.optional;
+        return !!this.tokens.optional;
     }
 
     transpile(state: BrsTranspileState): TranspileResult {
@@ -2702,8 +3465,15 @@ export class FieldStatement extends Statement implements TypedefProvider {
     }
 
     getTypedef(state: BrsTranspileState) {
-        const result = [] as TranspileResult;
-        if (this.name) {
+        const result = [];
+        if (this.tokens.name) {
+            for (let comment of util.getLeadingComments(this) ?? []) {
+                result.push(
+                    comment.text,
+                    state.newline,
+                    state.indent()
+                );
+            }
             for (let annotation of this.annotations ?? []) {
                 result.push(
                     ...annotation.getTypedef(state),
@@ -2712,19 +3482,19 @@ export class FieldStatement extends Statement implements TypedefProvider {
                 );
             }
 
-            let type = this.getType();
-            if (isInvalidType(type) || isVoidType(type)) {
-                type = new DynamicType();
+            let type = this.getType({ flags: SymbolTypeFlag.typetime });
+            if (isInvalidType(type) || isVoidType(type) || isUninitializedType(type)) {
+                type = DynamicType.instance;
             }
 
             result.push(
-                this.accessModifier?.text ?? 'public',
+                this.tokens.accessModifier?.text ?? 'public',
                 ' '
             );
             if (this.isOptional) {
-                result.push(this.optional!.text, ' ');
+                result.push(this.tokens.optional.text, ' ');
             }
-            result.push(this.name?.text,
+            result.push(this.tokens.name?.text,
                 ' as ',
                 type.toTypeString()
             );
@@ -2733,70 +3503,75 @@ export class FieldStatement extends Statement implements TypedefProvider {
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
-        if (this.initialValue && options.walkMode & InternalWalkMode.walkExpressions) {
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'typeExpression', visitor, options);
             walk(this, 'initialValue', visitor, options);
         }
     }
 
     public clone() {
         return this.finalizeClone(
-            new FieldStatement(
-                util.cloneToken(this.accessModifier),
-                util.cloneToken(this.name),
-                util.cloneToken(this.as),
-                util.cloneToken(this.type),
-                util.cloneToken(this.equal),
-                this.initialValue?.clone(),
-                util.cloneToken(this.optional)
-            ),
+            new FieldStatement({
+                accessModifier: util.cloneToken(this.tokens.accessModifier),
+                name: util.cloneToken(this.tokens.name),
+                as: util.cloneToken(this.tokens.as),
+                typeExpression: this.typeExpression?.clone(),
+                equals: util.cloneToken(this.tokens.equals),
+                initialValue: this.initialValue?.clone(),
+                optional: util.cloneToken(this.tokens.optional)
+            }),
             ['initialValue']
         );
     }
 }
 
-/**
- * @deprecated use `FieldStatement`
- */
-export class ClassFieldStatement extends FieldStatement { }
-
 export type MemberStatement = FieldStatement | MethodStatement;
 
-/**
- * @deprecated use `MemeberStatement`
- */
-export type ClassMemberStatement = MemberStatement;
-
 export class TryCatchStatement extends Statement {
-    constructor(
-        public tokens: {
-            try: Token;
-            endTry?: Token;
-        },
-        public tryBranch?: Block,
-        public catchStatement?: CatchStatement
-    ) {
+    constructor(options?: {
+        try?: Token;
+        endTry?: Token;
+        tryBranch?: Block;
+        catchStatement?: CatchStatement;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.try,
-            tryBranch,
-            catchStatement,
-            tokens.endTry
+        this.tokens = {
+            try: options.try,
+            endTry: options.endTry
+        };
+        this.tryBranch = options.tryBranch;
+        this.catchStatement = options.catchStatement;
+        this.location = util.createBoundingLocation(
+            this.tokens.try,
+            this.tryBranch,
+            this.catchStatement,
+            this.tokens.endTry
         );
     }
 
-    public readonly range: Range | undefined;
+    public readonly tokens: {
+        readonly try?: Token;
+        readonly endTry?: Token;
+    };
+
+    public readonly tryBranch: Block;
+    public readonly catchStatement: CatchStatement;
+
+    public readonly kind = AstNodeKind.TryCatchStatement;
+
+    public readonly location: Location | undefined;
 
     public transpile(state: BrsTranspileState): TranspileResult {
         return [
-            state.transpileToken(this.tokens.try),
-            ...this.tryBranch!.transpile(state),
+            state.transpileToken(this.tokens.try, 'try'),
+            ...this.tryBranch.transpile(state),
             state.newline,
             state.indent(),
             ...(this.catchStatement?.transpile(state) ?? ['catch']),
             state.newline,
             state.indent(),
-            state.transpileToken(this.tokens.endTry!)
-        ] as TranspileResult;
+            state.transpileToken(this.tokens.endTry!, 'end try')
+        ];
     }
 
     public walk(visitor: WalkVisitor, options: WalkOptions) {
@@ -2806,44 +3581,68 @@ export class TryCatchStatement extends Statement {
         }
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.try?.leadingTrivia ?? [];
+    }
+
+    public get endTrivia(): Token[] {
+        return this.tokens.endTry?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new TryCatchStatement(
-                {
-                    try: util.cloneToken(this.tokens.try),
-                    endTry: util.cloneToken(this.tokens.endTry)
-                },
-                this.tryBranch?.clone(),
-                this.catchStatement?.clone()
-            ),
+            new TryCatchStatement({
+                try: util.cloneToken(this.tokens.try),
+                endTry: util.cloneToken(this.tokens.endTry),
+                tryBranch: this.tryBranch?.clone(),
+                catchStatement: this.catchStatement?.clone()
+            }),
             ['tryBranch', 'catchStatement']
         );
     }
 }
 
 export class CatchStatement extends Statement {
-    constructor(
-        public tokens: {
-            catch: Token;
-        },
-        public exceptionVariable?: Identifier,
-        public catchBranch?: Block
-    ) {
+    constructor(options?: {
+        catch?: Token;
+        exceptionVariableExpression?: Expression;
+        catchBranch?: Block;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.catch,
-            exceptionVariable,
-            catchBranch
+        this.tokens = {
+            catch: options?.catch
+        };
+        this.exceptionVariableExpression = options?.exceptionVariableExpression;
+        this.catchBranch = options?.catchBranch;
+        this.location = util.createBoundingLocation(
+            this.tokens.catch,
+            this.exceptionVariableExpression,
+            this.catchBranch
         );
     }
 
-    public range: Range | undefined;
+    public readonly tokens: {
+        readonly catch?: Token;
+    };
+
+    public readonly exceptionVariableExpression?: Expression;
+
+    public readonly catchBranch?: Block;
+
+    public readonly kind = AstNodeKind.CatchStatement;
+
+    public readonly location: Location | undefined;
 
     public transpile(state: BrsTranspileState): TranspileResult {
         return [
-            state.transpileToken(this.tokens.catch),
+            state.transpileToken(this.tokens.catch, 'catch'),
             ' ',
-            this.exceptionVariable?.text ?? 'e',
+            this.exceptionVariableExpression?.transpile(state) ?? [
+                //use the variable named `e` if it doesn't exist in this function body. otherwise use '__bsc_error' just to make sure we're out of the way
+                this.getSymbolTable()?.hasSymbol('e', SymbolTypeFlag.runtime)
+                    ? '__bsc_error'
+                    : 'e'
+            ],
             ...(this.catchBranch?.transpile(state) ?? [])
         ];
     }
@@ -2854,36 +3653,50 @@ export class CatchStatement extends Statement {
         }
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.catch?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new CatchStatement(
-                {
-                    catch: util.cloneToken(this.tokens.catch)
-                },
-                util.cloneToken(this.exceptionVariable),
-                this.catchBranch?.clone()
-            ),
+            new CatchStatement({
+                catch: util.cloneToken(this.tokens.catch),
+                exceptionVariableExpression: this.exceptionVariableExpression?.clone(),
+                catchBranch: this.catchBranch?.clone()
+            }),
             ['catchBranch']
         );
     }
 }
 
 export class ThrowStatement extends Statement {
-    constructor(
-        public throwToken: Token,
-        public expression?: Expression
-    ) {
+    constructor(options?: {
+        throw?: Token;
+        expression?: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(
-            throwToken,
-            expression
+        this.tokens = {
+            throw: options.throw
+        };
+        this.expression = options.expression;
+        this.location = util.createBoundingLocation(
+            this.tokens.throw,
+            this.expression
         );
     }
-    public range: Range | undefined;
+
+    public readonly tokens: {
+        readonly throw?: Token;
+    };
+    public readonly expression?: Expression;
+
+    public readonly kind = AstNodeKind.ThrowStatement;
+
+    public readonly location: Location | undefined;
 
     public transpile(state: BrsTranspileState) {
         const result = [
-            state.transpileToken(this.throwToken),
+            state.transpileToken(this.tokens.throw, 'throw'),
             ' '
         ] as TranspileResult;
 
@@ -2895,7 +3708,7 @@ export class ThrowStatement extends Statement {
 
             //no expression found. Rather than emit syntax errors, provide a generic error message
         } else {
-            result.push('"An error has occurred"');
+            result.push('"User-specified exception"');
         }
         return result;
     }
@@ -2906,12 +3719,16 @@ export class ThrowStatement extends Statement {
         }
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.throw?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ThrowStatement(
-                util.cloneToken(this.throwToken),
-                this.expression?.clone()
-            ),
+            new ThrowStatement({
+                throw: util.cloneToken(this.tokens.throw),
+                expression: this.expression?.clone()
+            }),
             ['expression']
         );
     }
@@ -2919,21 +3736,33 @@ export class ThrowStatement extends Statement {
 
 
 export class EnumStatement extends Statement implements TypedefProvider {
-
-    constructor(
-        public tokens: {
-            enum: Token;
-            name: Identifier;
-            endEnum: Token;
-        },
-        public body: Array<EnumMemberStatement | CommentStatement>
-    ) {
+    constructor(options: {
+        enum?: Token;
+        name: Identifier;
+        endEnum?: Token;
+        body: Array<EnumMemberStatement>;
+    }) {
         super();
-        this.body = this.body ?? [];
+        this.tokens = {
+            enum: options.enum,
+            name: options.name,
+            endEnum: options.endEnum
+        };
+        this.symbolTable = new SymbolTable('Enum');
+        this.body = options.body ?? [];
     }
 
-    public get range(): Range | undefined {
-        return util.createBoundingRange(
+    public readonly tokens: {
+        readonly enum?: Token;
+        readonly name: Identifier;
+        readonly endEnum?: Token;
+    };
+    public readonly body: Array<EnumMemberStatement>;
+
+    public readonly kind = AstNodeKind.EnumStatement;
+
+    public get location(): Location | undefined {
+        return util.createBoundingLocation(
             this.tokens.enum,
             this.tokens.name,
             ...this.body,
@@ -2941,14 +3770,6 @@ export class EnumStatement extends Statement implements TypedefProvider {
         );
     }
 
-    /**
-     * Get the name of the wrapping namespace (if it exists)
-     * @deprecated use `.findAncestor(isNamespaceStatement)` instead.
-     */
-    public get namespaceName() {
-        return this.findAncestor<NamespaceStatement>(isNamespaceStatement)?.nameExpression;
-    }
-
     public getMembers() {
         const result = [] as EnumMemberStatement[];
         for (const statement of this.body) {
@@ -2959,6 +3780,14 @@ export class EnumStatement extends Statement implements TypedefProvider {
         return result;
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.enum?.leadingTrivia;
+    }
+
+    public get endTrivia(): Token[] {
+        return this.tokens.endEnum?.leadingTrivia ?? [];
+    }
+
     /**
      * Get a map of member names and their values.
      * All values are stored as their AST LiteralExpression representation (i.e. string enum values include the wrapping quotes)
@@ -2974,22 +3803,22 @@ export class EnumStatement extends Statement implements TypedefProvider {
                 currentIntValue++;
 
                 //if explicit integer value, use it and increment the int counter
-            } else if (isLiteralExpression(member.value) && member.value.token.kind === TokenKind.IntegerLiteral) {
+            } else if (isLiteralExpression(member.value) && member.value.tokens.value.kind === TokenKind.IntegerLiteral) {
                 //try parsing as integer literal, then as hex integer literal.
-                let tokenIntValue = util.parseInt(member.value.token.text) ?? util.parseInt(member.value.token.text.replace(/&h/i, '0x'));
+                let tokenIntValue = util.parseInt(member.value.tokens.value.text) ?? util.parseInt(member.value.tokens.value.text.replace(/&h/i, '0x'));
                 if (tokenIntValue !== undefined) {
                     currentIntValue = tokenIntValue;
                     currentIntValue++;
                 }
-                result.set(member.name?.toLowerCase(), member.value.token.text);
+                result.set(member.name?.toLowerCase(), member.value.tokens.value.text);
 
                 //simple unary expressions (like `-1`)
             } else if (isUnaryExpression(member.value) && isLiteralExpression(member.value.right)) {
-                result.set(member.name?.toLowerCase(), member.value.operator.text + member.value.right.token.text);
+                result.set(member.name?.toLowerCase(), member.value.tokens.operator.text + member.value.right.tokens.value.text);
 
                 //all other values
             } else {
-                result.set(member.name?.toLowerCase(), (member.value as LiteralExpression)?.token?.text ?? 'invalid');
+                result.set(member.name?.toLowerCase(), (member.value as LiteralExpression)?.tokens?.value?.text ?? 'invalid');
             }
         }
         return result;
@@ -3027,12 +3856,22 @@ export class EnumStatement extends Statement implements TypedefProvider {
     }
 
     transpile(state: BrsTranspileState) {
-        //enum declarations do not exist at runtime, so don't transpile anything...
-        return [];
+        //enum declarations don't exist at runtime, so just transpile comments and trivia
+        return [
+            state.transpileAnnotations(this),
+            state.transpileLeadingComments(this.tokens.enum)
+        ];
     }
 
     getTypedef(state: BrsTranspileState) {
         const result = [] as TranspileResult;
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
         for (let annotation of this.annotations ?? []) {
             result.push(
                 ...annotation.getTypedef(state),
@@ -3041,7 +3880,7 @@ export class EnumStatement extends Statement implements TypedefProvider {
             );
         }
         result.push(
-            this.tokens.enum.text ?? 'enum',
+            this.tokens.enum?.text ?? 'enum',
             ' ',
             this.tokens.name.text
         );
@@ -3059,7 +3898,7 @@ export class EnumStatement extends Statement implements TypedefProvider {
         state.blockDepth--;
         result.push(
             state.indent(),
-            this.tokens.endEnum.text ?? 'end enum'
+            this.tokens.endEnum?.text ?? 'end enum'
         );
         return result;
     }
@@ -3071,31 +3910,63 @@ export class EnumStatement extends Statement implements TypedefProvider {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        const members = this.getMembers();
+
+        const resultType = new EnumType(
+            this.fullName,
+            members[0]?.getType(options).underlyingType
+        );
+        resultType.pushMemberProvider(() => this.getSymbolTable());
+        for (const statement of members) {
+            const memberType = statement.getType({ ...options, typeChain: undefined });
+            memberType.parentEnumType = resultType;
+            resultType.addMember(statement?.tokens?.name?.text, { definingNode: statement }, memberType, SymbolTypeFlag.runtime);
+        }
+        return resultType;
+    }
+
     public clone() {
         return this.finalizeClone(
-            new EnumStatement(
-                {
-                    enum: util.cloneToken(this.tokens.enum),
-                    name: util.cloneToken(this.tokens.name),
-                    endEnum: util.cloneToken(this.tokens.endEnum)
-                },
-                this.body?.map(x => x?.clone())
-            ),
+            new EnumStatement({
+                enum: util.cloneToken(this.tokens.enum),
+                name: util.cloneToken(this.tokens.name),
+                endEnum: util.cloneToken(this.tokens.endEnum),
+                body: this.body?.map(x => x?.clone())
+            }),
             ['body']
         );
     }
 }
 
 export class EnumMemberStatement extends Statement implements TypedefProvider {
-
-    public constructor(
-        public tokens: {
-            name: Identifier;
-            equal?: Token;
-        },
-        public value?: Expression
-    ) {
+    public constructor(options: {
+        name: Identifier;
+        equals?: Token;
+        value?: Expression;
+    }) {
         super();
+        this.tokens = {
+            name: options.name,
+            equals: options.equals
+        };
+        this.value = options.value;
+    }
+
+    public readonly tokens: {
+        readonly name: Identifier;
+        readonly equals?: Token;
+    };
+    public readonly value?: Expression;
+
+    public readonly kind = AstNodeKind.EnumMemberStatement;
+
+    public get location() {
+        return util.createBoundingLocation(
+            this.tokens.name,
+            this.tokens.equals,
+            this.value
+        );
     }
 
     /**
@@ -3105,31 +3976,37 @@ export class EnumMemberStatement extends Statement implements TypedefProvider {
         return this.tokens.name.text;
     }
 
-    public get range() {
-        return util.createBoundingRange(
-            this.tokens.name,
-            this.tokens.equal,
-            this.value
-        );
+    public get leadingTrivia(): Token[] {
+        return this.tokens.name.leadingTrivia;
     }
 
     /**
      * Get the value of this enum. Requires that `.parent` is set
      */
     public getValue() {
-        return (this.parent as EnumStatement).getMemberValue(this.name);
+        if (isEnumStatement(this.parent)) {
+            return (this.parent as EnumStatement)?.getMemberValue(this.name);
+        }
+        return undefined;
     }
 
+
     public transpile(state: BrsTranspileState): TranspileResult {
         return [];
     }
 
     getTypedef(state: BrsTranspileState): TranspileResult {
-        const result = [
-            this.tokens.name.text
-        ] as TranspileResult;
-        if (this.tokens.equal) {
-            result.push(' ', this.tokens.equal.text, ' ');
+        const result: TranspileResult = [];
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
+        result.push(this.tokens.name.text);
+        if (this.tokens.equals) {
+            result.push(' ', this.tokens.equals.text, ' ');
             if (this.value) {
                 result.push(
                     ...this.value.transpile(state)
@@ -3145,40 +4022,62 @@ export class EnumMemberStatement extends Statement implements TypedefProvider {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        return new EnumMemberType(
+            (this.parent as EnumStatement)?.fullName,
+            this.tokens?.name?.text,
+            this.value?.getType(options)
+        );
+    }
+
     public clone() {
         return this.finalizeClone(
-            new EnumMemberStatement(
-                {
-                    name: util.cloneToken(this.tokens.name),
-                    equal: util.cloneToken(this.tokens.equal)
-                },
-                this.value?.clone()
-            ),
+            new EnumMemberStatement({
+                name: util.cloneToken(this.tokens.name),
+                equals: util.cloneToken(this.tokens.equals),
+                value: this.value?.clone()
+            }),
             ['value']
         );
     }
 }
 
 export class ConstStatement extends Statement implements TypedefProvider {
-
-    public constructor(
-        public tokens: {
-            const: Token;
-            name: Identifier;
-            equals: Token;
-        },
-        public value: Expression
-    ) {
+    public constructor(options: {
+        const?: Token;
+        name: Identifier;
+        equals?: Token;
+        value: Expression;
+    }) {
         super();
-        this.range = util.createBoundingRange(this.tokens.const, this.tokens.name, this.tokens.equals, this.value);
+        this.tokens = {
+            const: options.const,
+            name: options.name,
+            equals: options.equals
+        };
+        this.value = options.value;
+        this.location = util.createBoundingLocation(this.tokens.const, this.tokens.name, this.tokens.equals, this.value);
     }
 
-    public range: Range | undefined;
+    public readonly tokens: {
+        readonly const: Token;
+        readonly name: Identifier;
+        readonly equals: Token;
+    };
+    public readonly value: Expression;
+
+    public readonly kind = AstNodeKind.ConstStatement;
+
+    public readonly location: Location | undefined;
 
     public get name() {
         return this.tokens.name.text;
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.const?.leadingTrivia;
+    }
+
     /**
      * The name of the statement WITH its leading namespace (if applicable)
      */
@@ -3199,20 +4098,32 @@ export class ConstStatement extends Statement implements TypedefProvider {
     }
 
     public transpile(state: BrsTranspileState): TranspileResult {
-        //const declarations don't exist at runtime, so just transpile empty
-        return [];
+        //const declarations don't exist at runtime, so just transpile comments and trivia
+        return [
+            state.transpileAnnotations(this),
+            state.transpileLeadingComments(this.tokens.const)
+        ];
     }
 
     getTypedef(state: BrsTranspileState): TranspileResult {
-        return [
-            state.tokenToSourceNode(this.tokens.const),
+        const result: TranspileResult = [];
+        for (let comment of util.getLeadingComments(this) ?? []) {
+            result.push(
+                comment.text,
+                state.newline,
+                state.indent()
+            );
+        }
+        result.push(
+            this.tokens.const ? state.tokenToSourceNode(this.tokens.const) : 'const',
             ' ',
             state.tokenToSourceNode(this.tokens.name),
             ' ',
-            state.tokenToSourceNode(this.tokens.equals),
+            this.tokens.equals ? state.tokenToSourceNode(this.tokens.equals) : '=',
             ' ',
             ...this.value.transpile(state)
-        ];
+        );
+        return result;
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
@@ -3221,36 +4132,48 @@ export class ConstStatement extends Statement implements TypedefProvider {
         }
     }
 
+    getType(options: GetTypeOptions) {
+        return this.value.getType(options);
+    }
+
     public clone() {
         return this.finalizeClone(
-            new ConstStatement(
-                {
-                    const: util.cloneToken(this.tokens.const),
-                    name: util.cloneToken(this.tokens.name),
-                    equals: util.cloneToken(this.tokens.equals)
-                },
-                this.value?.clone()
-            ),
+            new ConstStatement({
+                const: util.cloneToken(this.tokens.const),
+                name: util.cloneToken(this.tokens.name),
+                equals: util.cloneToken(this.tokens.equals),
+                value: this.value?.clone()
+            }),
             ['value']
         );
     }
 }
 
 export class ContinueStatement extends Statement {
-    constructor(
-        public tokens: {
-            continue: Token;
-            loopType: Token;
-        }
+    constructor(options: {
+        continue?: Token;
+        loopType: Token;
+    }
     ) {
         super();
-        this.range = util.createBoundingRange(
-            tokens.continue,
-            tokens.loopType
+        this.tokens = {
+            continue: options.continue,
+            loopType: options.loopType
+        };
+        this.location = util.createBoundingLocation(
+            this.tokens.continue,
+            this.tokens.loopType
         );
     }
 
-    public range: Range | undefined;
+    public readonly tokens: {
+        readonly continue?: Token;
+        readonly loopType: Token;
+    };
+
+    public readonly kind = AstNodeKind.ContinueStatement;
+
+    public readonly location: Location | undefined;
 
     transpile(state: BrsTranspileState) {
         return [
@@ -3264,6 +4187,10 @@ export class ContinueStatement extends Statement {
         //nothing to walk
     }
 
+    public get leadingTrivia(): Token[] {
+        return this.tokens.continue?.leadingTrivia ?? [];
+    }
+
     public clone() {
         return this.finalizeClone(
             new ContinueStatement({
@@ -3277,52 +4204,113 @@ export class ContinueStatement extends Statement {
 export class TypecastStatement extends Statement {
     constructor(options: {
         typecast?: Token;
-        obj: Token;
-        as?: Token;
-        type: Token;
+        typecastExpression: TypecastExpression;
     }
     ) {
         super();
         this.tokens = {
-            typecast: options.typecast,
-            obj: options.obj,
-            as: options.as,
-            type: options.type
+            typecast: options.typecast
         };
-        this.range = util.createBoundingRange(
+        this.typecastExpression = options.typecastExpression;
+        this.location = util.createBoundingLocation(
             this.tokens.typecast,
-            this.tokens.obj,
-            this.tokens.as,
-            this.tokens.type
+            this.typecastExpression
         );
     }
 
     public readonly tokens: {
         readonly typecast?: Token;
-        readonly obj: Token;
-        readonly as?: Token;
-        readonly type: Token;
     };
 
-    public readonly typecastExpression: Expression;
+    public readonly typecastExpression: TypecastExpression;
+
+    public readonly kind = AstNodeKind.TypecastStatement;
 
-    public readonly range: Range;
+    public readonly location: Location;
 
     transpile(state: BrsTranspileState) {
-        return [];
+        //the typecast statement is a comment just for debugging purposes
+        return [
+            state.transpileToken(this.tokens.typecast, 'typecast', true),
+            ' ',
+            this.typecastExpression.obj.transpile(state),
+            ' ',
+            state.transpileToken(this.typecastExpression.tokens.as, 'as'),
+            ' ',
+            this.typecastExpression.typeExpression.getName(ParseMode.BrighterScript)
+        ];
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
-        //nothing to walk
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'typecastExpression', visitor, options);
+        }
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.typecast?.leadingTrivia ?? [];
+    }
+
+    getType(options: GetTypeOptions): BscType {
+        return this.typecastExpression.getType(options);
     }
 
     public clone() {
         return this.finalizeClone(
             new TypecastStatement({
                 typecast: util.cloneToken(this.tokens.typecast),
-                obj: util.cloneToken(this.tokens.obj),
-                as: util.cloneToken(this.tokens.as),
-                type: util.cloneToken(this.tokens.type)
+                typecastExpression: this.typecastExpression?.clone()
+            }),
+            ['typecastExpression']
+        );
+    }
+}
+
+export class ConditionalCompileErrorStatement extends Statement {
+    constructor(options: {
+        hashError?: Token;
+        message: Token;
+    }) {
+        super();
+        this.tokens = {
+            hashError: options.hashError,
+            message: options.message
+        };
+        this.location = util.createBoundingLocation(util.createBoundingLocationFromTokens(this.tokens));
+    }
+
+    public readonly tokens: {
+        readonly hashError?: Token;
+        readonly message: Token;
+    };
+
+
+    public readonly kind = AstNodeKind.ConditionalCompileErrorStatement;
+
+    public readonly location: Location | undefined;
+
+    transpile(state: BrsTranspileState) {
+        return [
+            state.transpileToken(this.tokens.hashError, '#error'),
+            ' ',
+            state.transpileToken(this.tokens.message)
+
+        ];
+    }
+
+    walk(visitor: WalkVisitor, options: WalkOptions) {
+        // nothing to walk
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.hashError.leadingTrivia ?? [];
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new ConditionalCompileErrorStatement({
+                hashError: util.cloneToken(this.tokens.hashError),
+                message: util.cloneToken(this.tokens.message)
             })
         );
     }
@@ -3333,21 +4321,21 @@ export class AliasStatement extends Statement {
         alias?: Token;
         name: Token;
         equals?: Token;
-        value: Token;
+        value: VariableExpression | DottedGetExpression;
     }
     ) {
         super();
         this.tokens = {
             alias: options.alias,
             name: options.name,
-            equals: options.equals,
-            value: options.value
+            equals: options.equals
         };
-        this.range = util.createBoundingRange(
+        this.value = options.value;
+        this.location = util.createBoundingLocation(
             this.tokens.alias,
             this.tokens.name,
             this.tokens.equals,
-            this.tokens.value
+            this.value
         );
     }
 
@@ -3355,19 +4343,40 @@ export class AliasStatement extends Statement {
         readonly alias?: Token;
         readonly name: Token;
         readonly equals?: Token;
-        readonly value: Token;
     };
 
-    public readonly range: Range;
+    public readonly value: Expression;
+
+    public readonly kind = AstNodeKind.AliasStatement;
+
+    public readonly location: Location;
 
     transpile(state: BrsTranspileState) {
-        return [];
+        //transpile to a comment just for debugging purposes
+        return [
+            state.transpileToken(this.tokens.alias, 'alias', true),
+            ' ',
+            state.transpileToken(this.tokens.name),
+            ' ',
+            state.transpileToken(this.tokens.equals, '='),
+            ' ',
+            this.value.transpile(state)
+        ];
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
-        //nothing to walk
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'value', visitor, options);
+        }
     }
 
+    get leadingTrivia(): Token[] {
+        return this.tokens.alias?.leadingTrivia ?? [];
+    }
+
+    getType(options: GetTypeOptions): BscType {
+        return this.value.getType(options);
+    }
 
     public clone() {
         return this.finalizeClone(
@@ -3375,32 +4384,252 @@ export class AliasStatement extends Statement {
                 alias: util.cloneToken(this.tokens.alias),
                 name: util.cloneToken(this.tokens.name),
                 equals: util.cloneToken(this.tokens.equals),
-                value: util.cloneToken(this.tokens.value)
-            })
+                value: this.value?.clone()
+            }),
+            ['value']
         );
     }
 }
 
+export class ConditionalCompileStatement extends Statement {
+    constructor(options: {
+        hashIf?: Token;
+        not?: Token;
+        condition: Token;
+        hashElse?: Token;
+        hashEndIf?: Token;
+        thenBranch: Block;
+        elseBranch?: ConditionalCompileStatement | Block;
+    }) {
+        super();
+        this.thenBranch = options.thenBranch;
+        this.elseBranch = options.elseBranch;
+
+        this.tokens = {
+            hashIf: options.hashIf,
+            not: options.not,
+            condition: options.condition,
+            hashElse: options.hashElse,
+            hashEndIf: options.hashEndIf
+        };
+
+        this.location = util.createBoundingLocation(
+            util.createBoundingLocationFromTokens(this.tokens),
+            this.thenBranch,
+            this.elseBranch
+        );
+    }
+
+    readonly tokens: {
+        readonly hashIf?: Token;
+        readonly not?: Token;
+        readonly condition: Token;
+        readonly hashElse?: Token;
+        readonly hashEndIf?: Token;
+    };
+    public readonly thenBranch: Block;
+    public readonly elseBranch?: ConditionalCompileStatement | Block;
+
+    public readonly kind = AstNodeKind.ConditionalCompileStatement;
+
+    public readonly location: Location | undefined;
+
+    transpile(state: BrsTranspileState) {
+        let results = [] as TranspileResult;
+        //if   (already indented by block)
+        if (!state.conditionalCompileStatement) {
+            // only transpile the #if in the case when we're not in a conditionalCompileStatement already
+            results.push(state.transpileToken(this.tokens.hashIf ?? createToken(TokenKind.HashIf)));
+        }
+
+        results.push(' ');
+        //conditions
+        if (this.tokens.not) {
+            results.push('not');
+            results.push(' ');
+        }
+        results.push(state.transpileToken(this.tokens.condition));
+        state.lineage.unshift(this);
+
+        //if statement body
+        let thenNodes = this.thenBranch.transpile(state);
+        state.lineage.shift();
+        if (thenNodes.length > 0) {
+            results.push(thenNodes);
+        }
+        //else branch
+        if (this.elseBranch) {
+            const elseIsCC = isConditionalCompileStatement(this.elseBranch);
+            const endBlockToken = elseIsCC ? (this.elseBranch as ConditionalCompileStatement).tokens.hashIf ?? createToken(TokenKind.HashElseIf) : this.tokens.hashElse;
+            //else
+
+            results.push(...state.transpileEndBlockToken(this.thenBranch, endBlockToken, createToken(TokenKind.HashElse).text));
+
+            if (elseIsCC) {
+                //chained else if
+                state.lineage.unshift(this.elseBranch);
+
+                // transpile following #if with knowledge of current
+                const existingCCStmt = state.conditionalCompileStatement;
+                state.conditionalCompileStatement = this;
+                let body = this.elseBranch.transpile(state);
+                state.conditionalCompileStatement = existingCCStmt;
+
+                state.lineage.shift();
+
+                if (body.length > 0) {
+                    //zero or more spaces between the `else` and the `if`
+                    results.push(...body);
+
+                    // stop here because chained if will transpile the rest
+                    return results;
+                } else {
+                    results.push('\n');
+                }
+
+            } else {
+                //else body
+                state.lineage.unshift(this.tokens.hashElse!);
+                let body = this.elseBranch.transpile(state);
+                state.lineage.shift();
+
+                if (body.length > 0) {
+                    results.push(...body);
+                }
+            }
+        }
+
+        //end if
+        results.push(...state.transpileEndBlockToken(this.elseBranch ?? this.thenBranch, this.tokens.hashEndIf, '#end if'));
+
+        return results;
+    }
+
+    walk(visitor: WalkVisitor, options: WalkOptions) {
+        if (options.walkMode & InternalWalkMode.walkStatements) {
+            const bsConsts = options.bsConsts ?? this.getBsConsts();
+            let conditionTrue = bsConsts?.get(this.tokens.condition.text.toLowerCase());
+            if (this.tokens.not) {
+                // flips the boolean value
+                conditionTrue = !conditionTrue;
+            }
+            const walkFalseBlocks = options.walkMode & InternalWalkMode.visitFalseConditionalCompilationBlocks;
+            if (conditionTrue || walkFalseBlocks) {
+                walk(this, 'thenBranch', visitor, options);
+            }
+            if (this.elseBranch && (!conditionTrue || walkFalseBlocks)) {
+                walk(this, 'elseBranch', visitor, options);
+            }
+        }
+    }
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.hashIf?.leadingTrivia ?? [];
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new ConditionalCompileStatement({
+                hashIf: util.cloneToken(this.tokens.hashIf),
+                not: util.cloneToken(this.tokens.not),
+                condition: util.cloneToken(this.tokens.condition),
+                hashElse: util.cloneToken(this.tokens.hashElse),
+                hashEndIf: util.cloneToken(this.tokens.hashEndIf),
+                thenBranch: this.thenBranch?.clone(),
+                elseBranch: this.elseBranch?.clone()
+            }),
+            ['thenBranch', 'elseBranch']
+        );
+    }
+
+    public getBranchStatementIndex(stmt: Statement) {
+        if (this.thenBranch === stmt) {
+            return 0;
+        } else if (this.elseBranch === stmt) {
+            return 1;
+        }
+        return -1;
+    }
+}
+
+
+export class ConditionalCompileConstStatement extends Statement {
+    constructor(options: {
+        hashConst?: Token;
+        assignment: AssignmentStatement;
+    }) {
+        super();
+        this.tokens = {
+            hashConst: options.hashConst
+        };
+        this.assignment = options.assignment;
+        this.location = util.createBoundingLocation(util.createBoundingLocationFromTokens(this.tokens), this.assignment);
+    }
+
+    public readonly tokens: {
+        readonly hashConst?: Token;
+    };
+
+    public readonly assignment: AssignmentStatement;
+
+    public readonly kind = AstNodeKind.ConditionalCompileConstStatement;
+
+    public readonly location: Location | undefined;
+
+    transpile(state: BrsTranspileState) {
+        return [
+            state.transpileToken(this.tokens.hashConst, '#const'),
+            ' ',
+            state.transpileToken(this.assignment.tokens.name),
+            ' ',
+            state.transpileToken(this.assignment.tokens.equals, '='),
+            ' ',
+            ...this.assignment.value.transpile(state)
+        ];
+
+    }
+
+    walk(visitor: WalkVisitor, options: WalkOptions) {
+        // nothing to walk
+    }
+
+
+    get leadingTrivia(): Token[] {
+        return this.tokens.hashConst.leadingTrivia ?? [];
+    }
+
+    public clone() {
+        return this.finalizeClone(
+            new ConditionalCompileConstStatement({
+                hashConst: util.cloneToken(this.tokens.hashConst),
+                assignment: this.assignment?.clone()
+            }),
+            ['assignment']
+        );
+    }
+}
+
+
 export class TypeStatement extends Statement {
     constructor(options: {
         type?: Token;
         name: Token;
         equals?: Token;
-        value: Token;
+        value: TypeExpression;
     }
     ) {
         super();
         this.tokens = {
             type: options.type,
             name: options.name,
-            equals: options.equals,
-            value: options.value
+            equals: options.equals
         };
-        this.range = util.createBoundingRange(
+        this.value = options.value;
+        this.location = util.createBoundingLocation(
             this.tokens.type,
             this.tokens.name,
             this.tokens.equals,
-            this.tokens.value
+            this.value
         );
     }
 
@@ -3408,33 +4637,31 @@ export class TypeStatement extends Statement {
         readonly type?: Token;
         readonly name: Token;
         readonly equals?: Token;
-        readonly value: Token;
     };
 
-    public readonly range: Range;
+    public readonly value: TypeExpression;
+
+    public readonly kind = AstNodeKind.TypeStatement;
+
+    public readonly location: Location;
 
     transpile(state: BrsTranspileState) {
+        //type statements have no runtime representation, so they're stripped entirely
         return [];
     }
 
     walk(visitor: WalkVisitor, options: WalkOptions) {
-        //nothing to walk
+        if (options.walkMode & InternalWalkMode.walkExpressions) {
+            walk(this, 'value', visitor, options);
+        }
     }
 
-    public get fullName() {
-        const name = this.tokens.name?.text;
-        if (name) {
-            const namespace = this.findAncestor<NamespaceStatement>(isNamespaceStatement);
-            if (namespace) {
-                let namespaceName = namespace.getName(ParseMode.BrighterScript);
-                return `${namespaceName}.${name}`;
-            } else {
-                return name;
-            }
-        } else {
-            //return undefined which will allow outside callers to know that this doesn't have a name
-            return undefined;
-        }
+    get leadingTrivia(): Token[] {
+        return this.tokens.type?.leadingTrivia ?? [];
+    }
+
+    getType(options: GetTypeOptions): BscType {
+        return this.value.getType(options);
     }
 
     public clone() {
@@ -3443,8 +4670,9 @@ export class TypeStatement extends Statement {
                 type: util.cloneToken(this.tokens.type),
                 name: util.cloneToken(this.tokens.name),
                 equals: util.cloneToken(this.tokens.equals),
-                value: util.cloneToken(this.tokens.value)
-            })
+                value: this.value?.clone()
+            }),
+            ['value']
         );
     }
 }
diff --git a/src/parser/TranspileState.ts b/src/parser/TranspileState.ts
index 325fbbf00..aead3c2a7 100644
--- a/src/parser/TranspileState.ts
+++ b/src/parser/TranspileState.ts
@@ -1,8 +1,19 @@
 import { SourceNode } from 'source-map';
-import type { Range } from 'vscode-languageserver';
+import type { Location } from 'vscode-languageserver';
 import type { BsConfig } from '../BsConfig';
+import { TokenKind } from '../lexer/TokenKind';
+import { type Token } from '../lexer/Token';
+import type { RangeLike } from '../util';
+import { util } from '../util';
 import type { TranspileResult } from '../interfaces';
-import util from '../util';
+
+interface TranspileToken {
+    location?: Location;
+    text: string;
+    kind?: TokenKind;
+    leadingWhitespace?: string;
+    leadingTrivia?: Array<TranspileToken>;
+}
 
 /**
  * Holds the state of a transpile operation as it works its way through the transpile process
@@ -52,16 +63,34 @@ export class TranspileState {
 
     public newline = '\n';
 
+    private getSource(locatable: RangeLike) {
+        let srcPath = (locatable as { location: Location })?.location?.uri ?? (locatable as Location).uri;
+        if (srcPath) {
+            srcPath = util.uriToPath(srcPath);
+            //if a sourceRoot is specified, use that instead of the rootDir
+            if (this.options.sourceRoot) {
+                srcPath = srcPath.replace(
+                    this.options.rootDir,
+                    this.options.sourceRoot
+                );
+            }
+            return srcPath;
+        } else {
+            return this.srcPath;
+        }
+    }
+
     /**
      * Shorthand for creating a new source node
      */
-    public sourceNode(locatable: { range?: Range }, code: string | SourceNode | TranspileResult): SourceNode {
+    public sourceNode(locatable: RangeLike, code: string | SourceNode | TranspileResult): SourceNode {
+        let range = util.extractRange(locatable);
         return util.sourceNodeFromTranspileResult(
             //convert 0-based range line to 1-based SourceNode line
-            locatable.range ? locatable.range.start.line + 1 : null,
+            range ? range.start.line + 1 : null,
             //range and SourceNode character are both 0-based, so no conversion necessary
-            locatable.range ? locatable.range.start.character : null,
-            this.srcPath,
+            range ? range.start.character : null,
+            this.getSource(locatable),
             code
         );
     }
@@ -71,50 +100,132 @@ export class TranspileState {
      * because the entire token is passed by reference, instead of the raw string being copied to the parameter,
      * only to then be copied again for the SourceNode constructor
      */
-    public tokenToSourceNode(token: { range?: Range; text: string }) {
+    public tokenToSourceNode(token: TranspileToken) {
         return new SourceNode(
             //convert 0-based range line to 1-based SourceNode line
-            token.range ? token.range.start.line + 1 : null,
+            token.location?.range ? token.location.range.start.line + 1 : null,
             //range and SourceNode character are both 0-based, so no conversion necessary
-            token.range ? token.range.start.character : null,
-            this.srcPath,
+            token.location?.range ? token.location.range.start.character : null,
+            this.getSource(token),
             token.text
         );
     }
 
+    public transpileLeadingCommentsForAstNode(node: { leadingTrivia?: Token[] }) {
+        const leadingTrivia = node?.leadingTrivia ?? [];
+        const leadingCommentsSourceNodes = this.transpileComments(leadingTrivia);
+        if (leadingCommentsSourceNodes.length > 0) {
+            // indent in preparation for next text
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+
+        return leadingCommentsSourceNodes;
+    }
+
+    public transpileLeadingComments(token: TranspileToken) {
+        const leadingTrivia = (token?.leadingTrivia ?? []);
+        const leadingCommentsSourceNodes = this.transpileComments(leadingTrivia);
+        if (leadingCommentsSourceNodes.length > 0 && token.text) {
+            // indent in preparation for next text
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+
+        return leadingCommentsSourceNodes;
+    }
+
+    public transpileComments(tokens: TranspileToken[], prepNextLine = false): Array<string | SourceNode> {
+        const leadingCommentsSourceNodes = [];
+        const justComments = tokens.filter(t => t.kind === TokenKind.Comment || t.kind === TokenKind.Newline);
+        let newLinesSinceComment = 0;
+
+        let transpiledCommentAlready = false;
+        for (const commentToken of justComments) {
+            if (commentToken.kind === TokenKind.Newline && !transpiledCommentAlready) {
+                continue;
+            }
+            if (commentToken.kind === TokenKind.Comment) {
+                if (leadingCommentsSourceNodes.length > 0) {
+                    leadingCommentsSourceNodes.push(this.indent());
+                }
+                leadingCommentsSourceNodes.push(this.tokenToSourceNode(commentToken));
+                newLinesSinceComment = 0;
+            } else {
+                newLinesSinceComment++;
+            }
+
+            if (newLinesSinceComment === 1 || newLinesSinceComment === 2) {
+                //new line that is not touching a previous new line
+                leadingCommentsSourceNodes.push(this.newline);
+            }
+            transpiledCommentAlready = true;
+        }
+        //if we should prepare for the next line, add an indent (only if applicable)
+        if (prepNextLine && transpiledCommentAlready) {
+            leadingCommentsSourceNodes.push(this.indent());
+        }
+        return leadingCommentsSourceNodes;
+    }
+
     /**
      * Create a SourceNode from a token, accounting for missing range and multi-line text
+     * Adds all leading trivia for the token
      */
-    public transpileToken(token: { range?: Range; text: string }, defaultValue?: string) {
+    public transpileToken(token: TranspileToken, defaultValue?: string, commentOut = false, skipLeadingComments = false): TranspileResult {
+        const leadingCommentsSourceNodes = skipLeadingComments ? [] : this.transpileLeadingComments(token);
+        const commentIfCommentedOut = commentOut ? `'` : '';
+
         if (!token?.text && defaultValue !== undefined) {
-            return defaultValue;
+            return [new SourceNode(null, null, null, [...leadingCommentsSourceNodes, commentIfCommentedOut, defaultValue])];
         }
 
-        if (!token.range) {
-            return token.text;
+        if (!token?.location?.range) {
+            return [new SourceNode(null, null, null, [...leadingCommentsSourceNodes, commentIfCommentedOut, token.text])];
         }
         //split multi-line text
-        if (token.range.end.line > token.range.start.line) {
+        if (token.location.range.end.line > token.location.range.start.line) {
             const lines = token.text.split(/\r?\n/g);
             const code = [
-                this.sourceNode(token, lines[0])
+                this.sourceNode(token, [...leadingCommentsSourceNodes, commentIfCommentedOut, lines[0]])
             ] as Array<string | SourceNode>;
             for (let i = 1; i < lines.length; i++) {
                 code.push(
                     this.newline,
+                    commentIfCommentedOut,
                     new SourceNode(
                         //convert 0-based range line to 1-based SourceNode line
-                        token.range.start.line + i + 1,
+                        token.location.range.start.line + i + 1,
                         //SourceNode column is 0-based, and this starts at the beginning of the line
                         0,
-                        this.srcPath,
+                        this.getSource(token),
                         lines[i]
                     )
                 );
             }
-            return new SourceNode(null, null, null, code);
+            return [new SourceNode(null, null, null, code)];
         } else {
-            return this.tokenToSourceNode(token);
+            return [...leadingCommentsSourceNodes, commentIfCommentedOut, this.tokenToSourceNode(token)];
+        }
+    }
+
+    public transpileEndBlockToken(previousLocatable: { location?: Location }, endToken: Token, defaultValue: string, alwaysAddNewlineBeforeEndToken = true) {
+        const result = [];
+
+        if (util.hasLeadingComments(endToken)) {
+            // add comments before `end token` - they should be indented
+            if (util.isLeadingCommentOnSameLine(previousLocatable?.location, endToken)) {
+                this.blockDepth++;
+                result.push(' ');
+            } else {
+                result.push(this.newline);
+                result.push(this.indent(1));
+            }
+            result.push(...this.transpileToken({ ...endToken, text: '' }));
+            this.blockDepth--;
+            result.push(this.indent());
+        } else if (alwaysAddNewlineBeforeEndToken) {
+            result.push(this.newline, this.indent());
         }
+        result.push(this.transpileToken({ ...endToken, leadingTrivia: [] }, defaultValue));
+        return result;
     }
 }
diff --git a/src/parser/tests/Parser.spec.ts b/src/parser/tests/Parser.spec.ts
index ca503dcf7..2a69784ab 100644
--- a/src/parser/tests/Parser.spec.ts
+++ b/src/parser/tests/Parser.spec.ts
@@ -1,6 +1,5 @@
 import type { Token } from '../../lexer/Token';
 import { TokenKind, ReservedWords } from '../../lexer/TokenKind';
-import type { Range } from 'vscode-languageserver';
 
 /* A set of utilities to be used while writing tests for the BRS parser. */
 
@@ -12,8 +11,12 @@ export function token(kind: TokenKind, text?: string): Token {
         kind: kind,
         text: text!,
         isReserved: ReservedWords.has((text ?? '').toLowerCase()),
-        range: null,
-        leadingWhitespace: ''
+        //synthetic test tokens used to default to `null`, but the parser does range arithmetic
+        //on token.location.range for paths like splitting `exitwhile` into two tokens. Give a
+        //zero-width location at (0,0) so those paths work without each test having to spell it out.
+        location: { uri: '', range: { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } } },
+        leadingWhitespace: '',
+        leadingTrivia: []
     };
 }
 
@@ -24,15 +27,5 @@ export function identifier(text: string) {
     return token(TokenKind.Identifier, text);
 }
 
-/**
- * Test whether a range matches a group of elements with a `range`
- */
-export function rangeMatch(range: Range, elements: ({ range: Range })[]): boolean {
-    return range.start.line === elements[0].range.start.line &&
-        range.start.character === elements[0].range.start.character &&
-        range.end.line === elements[elements.length - 1].range.end.line &&
-        range.end.character === elements[elements.length - 1].range.end.character;
-}
-
 /** An end-of-file token. */
 export const EOF = token(TokenKind.Eof, '\0');
diff --git a/src/parser/tests/controlFlow/For.spec.ts b/src/parser/tests/controlFlow/For.spec.ts
index 0130b76d9..6a1ef52fe 100644
--- a/src/parser/tests/controlFlow/For.spec.ts
+++ b/src/parser/tests/controlFlow/For.spec.ts
@@ -3,12 +3,15 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import type { FunctionStatement } from '../../Statement';
 import type { ForStatement } from '../../Statement';
 import { LiteralExpression } from '../../Expression';
+import { isFunctionStatement } from '../../../astUtils/reflection';
+import util from '../../../util';
 
 describe('parser for loops', () => {
     it('accepts a \'step\' clause', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.For, 'for'),
             identifier('i'),
             token(TokenKind.Equal, '='),
@@ -22,16 +25,16 @@ describe('parser for loops', () => {
             token(TokenKind.EndFor, 'end for'),
             token(TokenKind.Newline, '\n'),
             EOF
-        ]) as any;
+        ]);
 
-        const statement = statements[0] as ForStatement;
+        const statement = ast.statements[0] as ForStatement;
         expect(diagnostics[0]?.message).not.to.exist;
         expect(statement.increment).to.be.instanceof(LiteralExpression);
-        expect((statement.increment as LiteralExpression).token.text).to.equal('2');
+        expect((statement.increment as LiteralExpression).tokens.value.text).to.equal('2');
     });
 
     it('supports omitted \'step\' clause', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.For, 'for'),
             identifier('i'),
             token(TokenKind.Equal, '='),
@@ -43,10 +46,10 @@ describe('parser for loops', () => {
             token(TokenKind.EndFor, 'end for'),
             token(TokenKind.Newline, '\n'),
             EOF
-        ]) as any;
+        ]);
 
         expect(diagnostics[0]?.message).not.to.exist;
-        expect((statements[0] as ForStatement).increment).not.to.exist;
+        expect((ast.statements[0] as ForStatement).increment).not.to.exist;
     });
 
     it('catches unterminated for reaching function boundary', () => {
@@ -57,12 +60,13 @@ describe('parser for loops', () => {
             end function
         `);
         expect(parser.diagnostics).to.be.lengthOf(1);
-        expect(parser.statements).to.be.lengthOf(1);
-        expect(parser.references.functionStatements[0].func.body.statements).to.be.lengthOf(1);
+        expect(parser.ast.statements).to.be.lengthOf(1);
+        const functionStatements = parser.ast.findChildren<FunctionStatement>(isFunctionStatement);
+        expect(functionStatements[0].func.body.statements).to.be.lengthOf(1);
     });
 
     it('allows \'next\' to terminate loop', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.For, 'for'),
             identifier('i'),
             token(TokenKind.Equal, '='),
@@ -77,7 +81,7 @@ describe('parser for loops', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports a single trailing colon after the `to` expression', () => {
@@ -98,51 +102,55 @@ describe('parser for loops', () => {
          * 1|   Rnd(i)
          * 2| end for
          */
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             {
                 kind: TokenKind.For,
                 text: 'for',
                 isReserved: true,
-                range: Range.create(0, 0, 0, 3)
+                location: util.createLocation(0, 0, 0, 3),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'i',
                 isReserved: false,
-                range: Range.create(0, 4, 0, 5)
+                location: util.createLocation(0, 4, 0, 5),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
                 isReserved: false,
-                range: Range.create(0, 6, 0, 7)
+                location: util.createLocation(0, 6, 0, 7),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '0',
                 isReserved: false,
-                range: Range.create(0, 8, 0, 9)
+                location: util.createLocation(0, 8, 0, 9),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.To,
                 text: 'to',
                 isReserved: false,
-                range: {
-                    start: { line: 0, character: 10 },
-                    end: { line: 0, character: 12 }
-                }
+                location: util.createLocation(0, 10, 0, 12),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '10',
                 isReserved: false,
-                range: Range.create(0, 13, 0, 15)
+                location: util.createLocation(0, 13, 0, 15),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
                 isReserved: false,
-                range: Range.create(0, 15, 0, 16)
+                location: util.createLocation(0, 15, 0, 16),
+                leadingTrivia: []
             },
             // loop body isn't significant for location tracking, so helper functions are safe
             identifier('Rnd'),
@@ -154,14 +162,15 @@ describe('parser for loops', () => {
                 kind: TokenKind.EndFor,
                 text: 'end for',
                 isReserved: false,
-                range: Range.create(2, 0, 2, 8)
+                location: util.createLocation(2, 0, 2, 8),
+                leadingTrivia: []
             },
             EOF
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].range).to.deep.include(
+        expect(ast.statements).to.be.lengthOf(1);
+        expect(ast.statements[0].location.range).to.deep.include(
             Range.create(0, 0, 2, 8)
         );
     });
diff --git a/src/parser/tests/controlFlow/ForEach.spec.ts b/src/parser/tests/controlFlow/ForEach.spec.ts
index a340992fa..5a19e811d 100644
--- a/src/parser/tests/controlFlow/ForEach.spec.ts
+++ b/src/parser/tests/controlFlow/ForEach.spec.ts
@@ -1,15 +1,16 @@
 import { expect } from '../../../chai-config.spec';
 
-import { Parser } from '../../Parser';
+import { ParseMode, Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 import { ForEachStatement } from '../../Statement';
 import { VariableExpression } from '../../Expression';
+import util from '../../../util';
 
 describe('parser foreach loops', () => {
     it('requires a name and target', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.ForEach, 'for each'),
             identifier('word'),
             identifier('in'),
@@ -23,18 +24,18 @@ describe('parser foreach loops', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
 
-        let forEach = statements[0] as any;
+        let forEach = ast.statements[0] as any;
         expect(forEach).to.be.instanceof(ForEachStatement);
 
-        expect(forEach.item).to.deep.include(identifier('word'));
+        expect(forEach.tokens.item).to.deep.include(identifier('word'));
         expect(forEach.target).to.be.instanceof(VariableExpression);
-        expect(forEach.target.name).to.deep.include(identifier('lipsum'));
+        expect(forEach.target.tokens.name).to.deep.include(identifier('lipsum'));
     });
 
     it('allows \'next\' to terminate loop', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.ForEach, 'for each'),
             identifier('word'),
             identifier('in'),
@@ -48,8 +49,8 @@ describe('parser foreach loops', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.exist;
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('location tracking', () => {
@@ -61,36 +62,41 @@ describe('parser foreach loops', () => {
          * 1|   Rnd(a)
          * 2| end for
          */
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             {
                 kind: TokenKind.ForEach,
                 text: 'for each',
                 isReserved: true,
-                range: Range.create(0, 0, 0, 8)
+                location: util.createLocation(0, 0, 0, 8),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'a',
                 isReserved: false,
-                range: Range.create(0, 9, 0, 10)
+                location: util.createLocation(0, 9, 0, 10),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'in',
                 isReserved: true,
-                range: Range.create(0, 11, 0, 13)
+                location: util.createLocation(0, 11, 0, 13),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'b',
                 isReserved: false,
-                range: Range.create(0, 14, 0, 15)
+                location: util.createLocation(0, 14, 0, 15),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
                 isReserved: false,
-                range: Range.create(0, 15, 0, 16)
+                location: util.createLocation(0, 15, 0, 16),
+                leadingTrivia: []
             },
             // loop body isn't significant for location tracking, so helper functions are safe
             identifier('Rnd'),
@@ -102,15 +108,47 @@ describe('parser foreach loops', () => {
                 kind: TokenKind.EndFor,
                 text: 'end for',
                 isReserved: false,
-                range: Range.create(2, 0, 2, 7)
+                location: util.createLocation(2, 0, 2, 7),
+                leadingTrivia: []
             },
             EOF
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].range).deep.include(
+        expect(ast.statements).to.be.lengthOf(1);
+        expect(ast.statements[0].location.range).deep.include(
             Range.create(0, 0, 2, 7)
         );
     });
+
+    it('supports optional type annotation', () => {
+        let { ast, diagnostics } = Parser.parse([
+            token(TokenKind.ForEach, 'for each'),
+            identifier('word'),
+            token(TokenKind.As, 'as'),
+            identifier('String'),
+            identifier('in'),
+            identifier('lipsum'),
+            token(TokenKind.Newline, '\n'),
+
+            // body would go here, but it's not necessary for this test
+            token(TokenKind.EndFor, 'end for'),
+            token(TokenKind.Newline, '\n'),
+            EOF
+        ], { mode: ParseMode.BrighterScript });
+
+        expect(diagnostics).to.be.lengthOf(0);
+        expect(ast.statements).to.exist;
+
+        let forEach = ast.statements[0] as ForEachStatement;
+        expect(forEach).to.be.instanceof(ForEachStatement);
+
+        expect(forEach.tokens.item).to.deep.include(identifier('word'));
+        expect(forEach.tokens.as).to.exist;
+        expect(forEach.tokens.as.text).to.equal('as');
+        expect(forEach.typeExpression).to.exist;
+        expect(forEach.typeExpression?.getName()).to.equal('String');
+        expect(forEach.target).to.be.instanceof(VariableExpression);
+        expect((forEach.target as VariableExpression).tokens.name).to.deep.include(identifier('lipsum'));
+    });
 });
diff --git a/src/parser/tests/controlFlow/If.spec.ts b/src/parser/tests/controlFlow/If.spec.ts
index 30eea60e5..ade0345bc 100644
--- a/src/parser/tests/controlFlow/If.spec.ts
+++ b/src/parser/tests/controlFlow/If.spec.ts
@@ -3,9 +3,12 @@ import * as assert from 'assert';
 import { Parser } from '../../Parser';
 import { Lexer } from '../../../lexer/Lexer';
 import { TokenKind } from '../../../lexer/TokenKind';
-import { EOF, identifier, rangeMatch, token } from '../Parser.spec';
-import { isBlock, isCommentStatement, isIfStatement } from '../../../astUtils/reflection';
-import type { Block, IfStatement } from '../../Statement';
+import { EOF, identifier, token } from '../Parser.spec';
+import { isBlock, isFunctionStatement, isIfStatement } from '../../../astUtils/reflection';
+import type { Block, FunctionStatement, IfStatement } from '../../Statement';
+import { expectDiagnosticsIncludes, expectZeroDiagnostics } from '../../../testHelpers.spec';
+import { DiagnosticMessages } from '../../../DiagnosticMessages';
+import { util } from '../../../util';
 
 describe('parser if statements', () => {
     it('allows empty if blocks', () => {
@@ -18,10 +21,10 @@ describe('parser if statements', () => {
                 stop
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
 
         expect(diagnostics[0]?.message).not.to.exist;
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('allows empty elseif blocks', () => {
@@ -34,10 +37,10 @@ describe('parser if statements', () => {
                 stop
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
 
         expect(diagnostics[0]?.message).not.to.exist;
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('allows empty else blocks', () => {
@@ -50,10 +53,10 @@ describe('parser if statements', () => {
 
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
 
         expect(diagnostics[0]?.message).not.to.exist;
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('single-line if next to else or endif', () => {
@@ -67,12 +70,12 @@ describe('parser if statements', () => {
                 font = m.fonts.reg.GetDefaultFont()
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
 
-        let ifs = statements[0];
+        let ifs = ast.statements[0];
         if (!isIfStatement(ifs) || !isIfStatement(ifs.thenBranch?.statements[1])) {
             assert.fail('Missing single-line if inside if-then');
         }
@@ -90,17 +93,17 @@ describe('parser if statements', () => {
                 ' empty line or line with just a comment causes crash
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
 
-        let ifs = statements[0];
+        let ifs = ast.statements[0];
         if (!isIfStatement(ifs) || !isIfStatement(ifs.thenBranch?.statements[0])) {
             assert.fail('Missing single-line if inside if-then');
         }
         expect(ifs.elseBranch).to.exist;
-        if (!isBlock(ifs.elseBranch) || !isCommentStatement(ifs.elseBranch.statements[0])) {
+        if (!isBlock(ifs.elseBranch)) {
             assert.fail('Missing comment inside else branch');
         }
     });
@@ -109,7 +112,7 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if true then m.top.visible = true else m.top.visible = false
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
 
         if (diagnostics.length > 0) {
             console.log(diagnostics);
@@ -117,12 +120,12 @@ describe('parser if statements', () => {
 
         expect(diagnostics).to.be.lengthOf(0);
 
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     describe('single-line if', () => {
         it('parses if only', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.If, 'if'),
                 token(TokenKind.IntegerLiteral, '1'),
                 token(TokenKind.Less, '<'),
@@ -136,11 +139,11 @@ describe('parser if statements', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses if-else', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.If, 'if'),
                 token(TokenKind.IntegerLiteral, '1'),
                 token(TokenKind.Less, '<'),
@@ -158,11 +161,11 @@ describe('parser if statements', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses if-elseif-else', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.If, 'if'),
                 token(TokenKind.IntegerLiteral, '1'),
                 token(TokenKind.Less, '<'),
@@ -189,12 +192,12 @@ describe('parser if statements', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('allows \'then\' to be skipped', () => {
             // if 1 < 2 foo = true else if 1 = 2 same = true
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.If, 'if'),
                 token(TokenKind.IntegerLiteral, '1'),
                 token(TokenKind.Less, '<'),
@@ -219,11 +222,11 @@ describe('parser if statements', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses special statements in inline block', () => {
-            const { statements, diagnostics } = Parser.parse(`
+            const { ast, diagnostics } = Parser.parse(`
                 if true print 1 else print 1
                 if true then print 1 else print 1
                 if true print "x=" ; 1 else print 1
@@ -233,8 +236,147 @@ describe('parser if statements', () => {
                 if true then return else print 1
             `);
 
-            expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements).to.be.length.greaterThan(0);
+        });
+
+        it('colon used between inline else statements', () => {
+            const { ast, diagnostics } = Parser.parse(`
+                if x print 1 else print 2 : print 3
+            `);
+
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements).to.be.lengthOf(1);
+            const ifStatement = ast.statements[0] as IfStatement;
+            expect(ifStatement.thenBranch.statements).to.be.lengthOf(1);
+            expect((ifStatement.elseBranch as Block).statements).to.be.lengthOf(2);
+        });
+
+        it('colon used between inline else if statements', () => {
+            const { ast, diagnostics } = Parser.parse(`
+                if x print 1 else if y print 2 : print 3
+            `);
+
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements).to.be.lengthOf(1);
+            const ifStatement = ast.statements[0] as IfStatement;
+            expect(ifStatement.thenBranch.statements).to.be.lengthOf(1);
+            expect((ifStatement.elseBranch as IfStatement).thenBranch.statements).to.be.lengthOf(2);
+        });
+
+        it('colon used between all kinds of statements', () => {
+            const { ast, diagnostics } = Parser.parse(`
+                if x print 1 : print 1 else if y print 2 : print 2 : print 2 else print 3 : print 3: print 3: print 3
+            `);
+
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements).to.be.lengthOf(1);
+            const ifStatement = ast.statements[0] as IfStatement;
+            expect(ifStatement.thenBranch.statements).to.be.lengthOf(2);
+            const elseIf = ifStatement.elseBranch as IfStatement;
+            expect(elseIf.thenBranch.statements).to.be.lengthOf(3);
+            expect((elseIf.elseBranch as Block).statements).to.be.lengthOf(4);
+        });
+
+        it('has diagnostic with extra else', () => {
+            const { diagnostics } = Parser.parse(`
+                if x=1 print 1 else print 2 else print 3
+            `);
+
+            expectDiagnosticsIncludes(diagnostics, [
+                DiagnosticMessages.expectedNewlineOrColon().message
+            ]);
+        });
+
+        it('nested inline if statements', () => {
+            const { ast, diagnostics } = Parser.parse(`
+                if x=1 print 1 else if x=2 print 2 : if y=1 print "y is 1" else print "y is not 1" else print 3: print 3: print 3
+            `);
+
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements).to.be.lengthOf(1);
+            const ifStatement = ast.statements[0] as IfStatement;
+            expect(ifStatement.thenBranch.statements).to.be.lengthOf(1);
+            const elseIf = ifStatement.elseBranch as IfStatement;
+            expect(elseIf.thenBranch.statements).to.be.lengthOf(2);
+            expect(isIfStatement(elseIf.thenBranch.statements[1])).to.be.true;
+            const nestedInlineIf = elseIf.thenBranch.statements[1] as IfStatement;
+            expect(nestedInlineIf.thenBranch.statements).to.be.lengthOf(1);
+            expect((nestedInlineIf.elseBranch as Block).statements).to.be.lengthOf(1);
+            expect((elseIf.elseBranch as Block).statements).to.be.lengthOf(3);
+        });
+
+        describe('expected inline if', () => {
+
+            it('non-inline statement used in inline if', () => {
+                const { ast, diagnostics } = Parser.parse(`
+                    if true print 1 else
+                        print 1
+                    end if
+                `);
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.expectedInlineIfStatement().message
+                ]);
+                expect(ast.statements.length).to.be.greaterThan(0);
+            });
+
+            it('non inline statement used in inline else if', () => {
+                const { ast, diagnostics } = Parser.parse(`
+                    if x print 1 else if y
+                        print 2
+                    end if
+                `);
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.expectedInlineIfStatement().message
+                ]);
+                expect(ast.statements.length).to.be.greaterThan(0);
+            });
+
+            it('colon used after inline else', () => {
+                const { ast, diagnostics } = Parser.parse(`
+                    if x print 1 else : print 2 : print 3: end if
+                `);
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.expectedInlineIfStatement().message
+                ]);
+                expect(ast.statements.length).to.be.greaterThan(0);
+            });
+
+            it('new line used in inline else', () => {
+                const { ast, diagnostics } = Parser.parse(`
+                    if x print 1 else
+                        print 2
+                        print 3
+                    end if
+                `);
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.expectedInlineIfStatement().message
+                ]);
+                expect(ast.statements.length).to.be.greaterThan(0);
+            });
+
+
+            it('colon used after inline else if', () => {
+                const { diagnostics } = Parser.parse(`
+                    if x print 1 else if y : print 2
+                `);
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.expectedTerminator(['end if', 'else if', 'else'], 'then', 'block').message
+                ]);
+            });
+
+            it('new line used in inline else if', () => {
+                const { ast, diagnostics } = Parser.parse(`
+                    if x print 1 else if y
+                        print 2
+                    end if
+                `);
+                expectDiagnosticsIncludes(diagnostics, [
+                    DiagnosticMessages.expectedInlineIfStatement().message
+                ]);
+                expect(ast.statements.length).to.be.greaterThan(0);
+            });
+
         });
     });
 
@@ -247,10 +389,10 @@ describe('parser if statements', () => {
                     bar = true
                 end if
             `);
-            let { statements, diagnostics } = Parser.parse(tokens);
+            let { ast, diagnostics } = Parser.parse(tokens);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses if-else', () => {
@@ -263,10 +405,10 @@ describe('parser if statements', () => {
                     bar = false
                 end if
             `);
-            let { statements, diagnostics } = Parser.parse(tokens);
+            let { ast, diagnostics } = Parser.parse(tokens);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses if-elseif-else', () => {
@@ -281,10 +423,10 @@ describe('parser if statements', () => {
                     foo = false
                 end if
             `);
-            let { statements, diagnostics } = Parser.parse(tokens);
+            let { ast, diagnostics } = Parser.parse(tokens);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('allows \'then\' to be skipped', () => {
@@ -299,10 +441,10 @@ describe('parser if statements', () => {
                     foo = false
                 end if
             `);
-            let { statements, diagnostics } = Parser.parse(tokens);
+            let { ast, diagnostics } = Parser.parse(tokens);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('sets endif token properly', () => {
@@ -318,12 +460,12 @@ describe('parser if statements', () => {
                     end if 'comment
                 end sub
             `);
-            let { statements, diagnostics } = Parser.parse(tokens) as any;
+            let { ast, diagnostics } = Parser.parse(tokens) as any;
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
 
             //the endif token should be set
-            let ifs = statements[0].func.body.statements[0];
+            let ifs = ast.statements[0].func.body.statements[0];
             if (!isIfStatement(ifs) || !isIfStatement(ifs.elseBranch)) {
                 assert.fail('Unexpected statement found');
             }
@@ -344,18 +486,18 @@ describe('parser if statements', () => {
                 end if
             end sub
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports trailing colons for one-line if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2: return true: end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches one-line if statement missing first colon', () => {
@@ -363,9 +505,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2 return true : end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches one-line if statement with multiple statements missing first colon', () => {
@@ -373,9 +515,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2 print "ok" : return true : end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches one-line if statement missing second colon', () => {
@@ -383,9 +525,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2 : return true end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches one-line if statement with else missing colons', () => {
@@ -393,9 +535,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2 : return true: else return false end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches one-line if statement with colon and missing end if', () => {
@@ -403,9 +545,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2: return true
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.lengthOf(0);
+        expect(ast.statements).to.be.lengthOf(0);
     });
 
     it('catches one-line if multi-statement with colon and missing end if', () => {
@@ -413,9 +555,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2: print "ok": return true
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.lengthOf(0);
+        expect(ast.statements).to.be.lengthOf(0);
     });
 
     it('catches one-line if statement with colon and missing endif inside a function', () => {
@@ -425,9 +567,9 @@ describe('parser if statements', () => {
                 if true : return true
             end function
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(2);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches extraneous colon at the end of one-line if-else', () => {
@@ -435,9 +577,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2 then return true else return false:
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(1);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches colon before if, unless there is `then` before', () => {
@@ -447,9 +589,9 @@ describe('parser if statements', () => {
             : if 1 < 2: return true: end if
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(1);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches extraneous colon+end if at the end of one-line if-else', () => {
@@ -457,9 +599,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2 then return true else return false: end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(2);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('recovers from extraneous endif at the end of one-line if-else', () => {
@@ -469,9 +611,9 @@ describe('parser if statements', () => {
                 if 1 < 2: return true: else return false end if
             end function
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(2);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('recovers from missing end-if', () => {
@@ -484,10 +626,11 @@ describe('parser if statements', () => {
             function test2()
             end function
         `);
-        let { statements, diagnostics, references } = Parser.parse(tokens);
+        const { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.lengthOf(2);
-        expect(references.functionStatements).to.be.lengthOf(2);
+        expect(ast.statements).to.be.lengthOf(2);
+        const functionStatements = ast.findChildren<FunctionStatement>(isFunctionStatement);
+        expect(functionStatements).to.be.lengthOf(2);
     });
 
     it('catches extraneous colon at the end of one-line if', () => {
@@ -495,9 +638,9 @@ describe('parser if statements', () => {
         let { tokens } = Lexer.scan(`
             if 1 < 2 then return true:
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(1);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches multi-line if inside a one-line if branch', () => {
@@ -507,9 +650,9 @@ describe('parser if statements', () => {
                 return true
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(1);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports multiple statements in one-line if statements', () => {
@@ -519,9 +662,9 @@ describe('parser if statements', () => {
                 return true
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(1);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches multi-line if inside a one-line if else branch', () => {
@@ -531,9 +674,9 @@ describe('parser if statements', () => {
                 return true
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(1);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('catches else statement missing colon', () => {
@@ -543,9 +686,9 @@ describe('parser if statements', () => {
               return true
             else return false end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.be.lengthOf(1);
+        expect(ast.statements).to.be.lengthOf(1);
     });
 
     it('supports if statement with condition and action on one line, but end if on separate line', () => {
@@ -553,36 +696,36 @@ describe('parser if statements', () => {
             if 1 < 2: return true
             end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports colon after return in single-line if statement', () => {
         let { tokens } = Lexer.scan(`
             if false : print "true" : end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports if elseif endif single line', () => {
         let { tokens } = Lexer.scan(`
             if true: print "8 worked": else if true: print "not run": else: print "not run": end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports comment at the end of one-line if', () => {
         let { tokens } = Lexer.scan(`
             if 1 > 2 then return true 'OK
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports colon at the beginning of a line', () => {
@@ -590,18 +733,18 @@ describe('parser if statements', () => {
             if 1 < 2 then: if 1 < 4 then return false
             : end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports one-line functions inside of one-line if statement', () => {
         let { tokens } = Lexer.scan(`
             if true then : test = sub() : print "yes" : end sub : end if
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('single-line if block statements have correct range', () => {
@@ -611,16 +754,19 @@ describe('parser if statements', () => {
             if false then print "true" else print "false"
             if false then print "true" else print "false": a = 20
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
+        let { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(0);
 
-        const then1 = (statements[0] as IfStatement).thenBranch;
-        expect(rangeMatch(then1.range, then1.statements)).to.be.true;
-        const then2 = (statements[1] as IfStatement).thenBranch;
-        expect(rangeMatch(then2.range, then2.statements)).to.be.true;
-        const else1 = (statements[2] as IfStatement).elseBranch as Block;
-        expect(rangeMatch(else1.range, else1.statements)).to.be.true;
-        const else2 = (statements[3] as IfStatement).elseBranch as Block;
-        expect(rangeMatch(else2.range, else2.statements)).to.be.true;
+        const then1 = (ast.statements[0] as IfStatement).thenBranch;
+        expect(then1.location).to.eql(util.createBoundingLocation(...then1.statements));
+
+        const then2 = (ast.statements[1] as IfStatement).thenBranch;
+        expect(then2.location).to.eql(util.createBoundingLocation(...then2.statements));
+
+        const else1 = (ast.statements[2] as IfStatement).elseBranch as Block;
+        expect(else1.location).to.eql(util.createBoundingLocation(...else1.statements));
+
+        const else2 = (ast.statements[3] as IfStatement).elseBranch as Block;
+        expect(else2.location).to.eql(util.createBoundingLocation(...else2.statements));
     });
 });
diff --git a/src/parser/tests/controlFlow/While.spec.ts b/src/parser/tests/controlFlow/While.spec.ts
index c85930281..04c864661 100644
--- a/src/parser/tests/controlFlow/While.spec.ts
+++ b/src/parser/tests/controlFlow/While.spec.ts
@@ -4,11 +4,14 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import type { FunctionStatement } from '../../Statement';
+import { isFunctionStatement } from '../../../astUtils/reflection';
+import util from '../../../util';
 
 describe('parser while statements', () => {
 
     it('while without exit', () => {
-        const { statements, diagnostics } = Parser.parse([
+        const { ast, diagnostics } = Parser.parse([
             token(TokenKind.While, 'while'),
             token(TokenKind.True, 'true'),
             token(TokenKind.Newline, '\n'),
@@ -20,11 +23,11 @@ describe('parser while statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('while with exit', () => {
-        const { statements, diagnostics } = Parser.parse([
+        const { ast, diagnostics } = Parser.parse([
             token(TokenKind.While, 'while'),
             token(TokenKind.True, 'true'),
             token(TokenKind.Newline, '\n'),
@@ -38,7 +41,7 @@ describe('parser while statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('supports trailing colon at end of condition', () => {
@@ -58,8 +61,9 @@ describe('parser while statements', () => {
             end function
         `);
         expect(parser.diagnostics).to.be.lengthOf(1);
-        expect(parser.statements).to.be.lengthOf(1);
-        expect(parser.references.functionStatements[0].func.body.statements).to.be.lengthOf(1);
+        expect(parser.ast.statements).to.be.lengthOf(1);
+        const functionStatements = parser.ast.findChildren<FunctionStatement>(isFunctionStatement);
+        expect(functionStatements[0].func.body.statements).to.be.lengthOf(1);
     });
 
     it('location tracking', () => {
@@ -71,24 +75,27 @@ describe('parser while statements', () => {
          * 1|   Rnd(0)
          * 2| end while
          */
-        const { statements, diagnostics } = Parser.parse([
+        const { ast, diagnostics } = Parser.parse([
             {
                 kind: TokenKind.While,
                 text: 'while',
                 isReserved: true,
-                range: Range.create(0, 0, 0, 5)
+                location: util.createLocation(0, 0, 0, 5),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.True,
                 text: 'true',
                 isReserved: true,
-                range: Range.create(0, 6, 0, 10)
+                location: util.createLocation(0, 6, 0, 10),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
                 isReserved: false,
-                range: Range.create(0, 10, 0, 11)
+                location: util.createLocation(0, 10, 0, 11),
+                leadingTrivia: []
             },
             // loop body isn't significant for location tracking, so helper functions are safe
             identifier('Rnd'),
@@ -100,14 +107,15 @@ describe('parser while statements', () => {
                 kind: TokenKind.EndWhile,
                 text: 'end while',
                 isReserved: false,
-                range: Range.create(2, 0, 2, 9)
+                location: util.createLocation(2, 0, 2, 9),
+                leadingTrivia: []
             },
             EOF
         ]);
 
         expect(diagnostics[0]?.message).not.to.exist;
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].range).deep.include(
+        expect(ast.statements).to.be.lengthOf(1);
+        expect(ast.statements[0].location.range).deep.include(
             Range.create(0, 0, 2, 9)
         );
     });
diff --git a/src/parser/tests/expression/Additive.spec.ts b/src/parser/tests/expression/Additive.spec.ts
index d68242a19..59b5604bf 100644
--- a/src/parser/tests/expression/Additive.spec.ts
+++ b/src/parser/tests/expression/Additive.spec.ts
@@ -4,10 +4,13 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import { util } from '../../../util';
+import { expectZeroDiagnostics } from '../../../testHelpers.spec';
+import type { AssignmentStatement } from '../../Statement';
 
 describe('parser additive expressions', () => {
     it('parses left-associative addition chains', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.IntegerLiteral, '1'),
@@ -19,11 +22,11 @@ describe('parser additive expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('parses left-associative subtraction chains', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.IntegerLiteral, '1'),
@@ -35,7 +38,7 @@ describe('parser additive expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('tracks starting and ending locations', () => {
@@ -44,60 +47,67 @@ describe('parser additive expressions', () => {
         // ^^ columns ^^
         //
         // _ = 1 + 2 + 3
-        let { statements, diagnostics } = Parser.parse(<any>[
+        const parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: '_',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 1)
+                location: util.createLocation(0, 0, 0, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 2, 0, 2)
+                location: util.createLocation(0, 2, 0, 2)
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '1',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 4, 0, 5)
+                location: util.createLocation(0, 4, 0, 5)
             },
             {
                 kind: TokenKind.Plus,
                 text: '+',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 6, 0, 7)
+                location: util.createLocation(0, 6, 0, 7)
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '2',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 8, 0, 9)
+                location: util.createLocation(0, 8, 0, 9)
             },
             {
                 kind: TokenKind.Plus,
                 text: '+',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 10, 0, 11)
+                location: util.createLocation(0, 10, 0, 11)
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '3',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 12, 0, 13)
+                location: util.createLocation(0, 12, 0, 13)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 13, 0, 14)
+                location: util.createLocation(0, 13, 0, 14)
             }
-        ]) as any;
+        ]);
 
-        expect(diagnostics[0]?.message).to.not.exist;
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].value.range).to.deep.include(
+        expectZeroDiagnostics(parser);
+        expect((parser.ast.statements[0] as AssignmentStatement).value.location.range).to.deep.include(
             Range.create(0, 4, 0, 13)
         );
     });
diff --git a/src/parser/tests/expression/ArrayLiterals.spec.ts b/src/parser/tests/expression/ArrayLiterals.spec.ts
index 8bc2b4876..8ef980d81 100644
--- a/src/parser/tests/expression/ArrayLiterals.spec.ts
+++ b/src/parser/tests/expression/ArrayLiterals.spec.ts
@@ -4,16 +4,17 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
-import { expectDiagnostics, expectDiagnosticsIncludes } from '../../../testHelpers.spec';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectZeroDiagnostics } from '../../../testHelpers.spec';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { isArrayLiteralExpression, isAssignmentStatement, isDottedGetExpression, isLiteralExpression } from '../../../astUtils/reflection';
 import type { AssignmentStatement } from '../../Statement';
 import type { ArrayLiteralExpression } from '../../Expression';
+import { util } from '../../../util';
 
 describe('parser array literals', () => {
     describe('empty arrays', () => {
         it('on one line', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -22,11 +23,11 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('on multiple lines', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -41,13 +42,13 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     describe('filled arrays', () => {
         it('on one line', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -61,11 +62,11 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('on multiple lines with commas', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -83,11 +84,11 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('on multiple lines without commas', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -103,13 +104,13 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     describe('contents', () => {
         it('can contain primitives', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -123,11 +124,11 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('can contain other arrays', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -151,11 +152,11 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('can contain expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftSquareBracket, '['),
@@ -170,19 +171,19 @@ describe('parser array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     describe('unfinished', () => {
         it('will still be parsed', () => {
             // no closing brace:
-            let { statements, diagnostics } = Parser.parse(`_ = [1, data.foo`);
+            let { ast, diagnostics } = Parser.parse(`_ = [1, data.foo`);
 
-            expectDiagnostics(diagnostics, [DiagnosticMessages.unmatchedLeftSquareBraceAfterArrayLiteral()]);
-            expect(statements).to.be.lengthOf(1);
-            expect(isAssignmentStatement(statements[0])).to.be.true;
-            const assignStmt = statements[0] as AssignmentStatement;
+            expectDiagnostics(diagnostics, [DiagnosticMessages.unmatchedLeftToken('[', 'array literal')]);
+            expect(ast.statements).to.be.lengthOf(1);
+            expect(isAssignmentStatement(ast.statements[0])).to.be.true;
+            const assignStmt = ast.statements[0] as AssignmentStatement;
             expect(isArrayLiteralExpression(assignStmt.value));
             const arryLitExpr = assignStmt.value as ArrayLiteralExpression;
             expect(isLiteralExpression(arryLitExpr.elements[0])).to.be.true;
@@ -196,7 +197,7 @@ describe('parser array literals', () => {
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.unmatchedLeftSquareBraceAfterArrayLiteral()
+                DiagnosticMessages.unmatchedLeftToken('[', 'array literal')
             ]);
         });
 
@@ -207,7 +208,7 @@ describe('parser array literals', () => {
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.unmatchedLeftSquareBraceAfterArrayLiteral()
+                DiagnosticMessages.unmatchedLeftToken('[', 'array literal')
             ]);
         });
     });
@@ -224,93 +225,105 @@ describe('parser array literals', () => {
          * 4|
          * 5| ]
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        const parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'a',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 1)
+                location: util.createLocation(0, 0, 0, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 2, 0, 3)
+                location: util.createLocation(0, 2, 0, 3)
             },
             {
                 kind: TokenKind.LeftSquareBracket,
                 text: '[',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 4, 0, 5)
+                location: util.createLocation(0, 4, 0, 5)
             },
             {
                 kind: TokenKind.RightSquareBracket,
                 text: ']',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 8, 0, 9)
+                location: util.createLocation(0, 8, 0, 9)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 9, 0, 10)
+                location: util.createLocation(0, 9, 0, 10)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(1, 0, 1, 1)
+                location: util.createLocation(1, 0, 1, 1)
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'b',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 0, 2, 1)
+                location: util.createLocation(2, 0, 2, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 2, 2, 3)
+                location: util.createLocation(2, 2, 2, 3)
             },
             {
                 kind: TokenKind.LeftSquareBracket,
                 text: '[',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 4, 2, 5)
+                location: util.createLocation(2, 4, 2, 5)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(3, 0, 3, 1)
+                location: util.createLocation(3, 0, 3, 1)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(4, 0, 4, 1)
+                location: util.createLocation(4, 0, 4, 1)
             },
             {
                 kind: TokenKind.RightSquareBracket,
                 text: ']',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(5, 0, 5, 1)
+                location: util.createLocation(5, 0, 5, 1)
             },
             {
                 kind: TokenKind.Eof,
                 text: '',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(5, 1, 5, 2)
+                location: util.createLocation(5, 1, 5, 2)
             }
-        ]) as any;
+        ]);
 
-        expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(2);
-        expect(statements[0].value.range).deep.include(
+        expectZeroDiagnostics(parser);
+        expect((parser.ast.statements[0] as AssignmentStatement).value.location.range).deep.include(
             Range.create(0, 4, 0, 9)
         );
-        expect(statements[1].value.range).deep.include(
+        expect((parser.ast.statements[1] as AssignmentStatement).value.location.range).deep.include(
             Range.create(2, 4, 5, 1)
         );
     });
diff --git a/src/parser/tests/expression/AssociativeArrayLiterals.spec.ts b/src/parser/tests/expression/AssociativeArrayLiterals.spec.ts
index d3daf4f6c..e951cd82a 100644
--- a/src/parser/tests/expression/AssociativeArrayLiterals.spec.ts
+++ b/src/parser/tests/expression/AssociativeArrayLiterals.spec.ts
@@ -6,14 +6,15 @@ import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 import type { AssignmentStatement } from '../../Statement';
 import type { AAIndexedMemberExpression, AALiteralExpression, AAMemberExpression } from '../../Expression';
-import { isAAIndexedMemberExpression, isAALiteralExpression, isAAMemberExpression, isAssignmentStatement, isCommentStatement, isDottedGetExpression, isLiteralExpression } from '../../../astUtils/reflection';
+import { isAAIndexedMemberExpression, isAALiteralExpression, isAAMemberExpression, isAssignmentStatement, isDottedGetExpression, isLiteralExpression } from '../../../astUtils/reflection';
 import { expectDiagnostics, expectDiagnosticsIncludes, expectZeroDiagnostics } from '../../../testHelpers.spec';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
+import { util } from '../../../util';
 
 describe('parser associative array literals', () => {
     describe('empty associative arrays', () => {
         it('on one line', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftCurlyBrace, '{'),
@@ -22,11 +23,11 @@ describe('parser associative array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('on multiple lines', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftCurlyBrace, '{'),
@@ -41,13 +42,13 @@ describe('parser associative array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     describe('filled arrays', () => {
         it('on one line', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftCurlyBrace, '{'),
@@ -67,11 +68,11 @@ describe('parser associative array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('on multiple lines with commas', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftCurlyBrace, '{'),
@@ -95,11 +96,11 @@ describe('parser associative array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('on multiple lines without commas', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.LeftCurlyBrace, '{'),
@@ -121,12 +122,12 @@ describe('parser associative array literals', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     it('allows separating properties with colons', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Sub, 'sub'),
             identifier('main'),
             token(TokenKind.LeftParen, '('),
@@ -152,11 +153,11 @@ describe('parser associative array literals', () => {
             EOF
         ]);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('allows a mix of quoted and unquoted keys', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.LeftCurlyBrace, '{'),
@@ -180,11 +181,11 @@ describe('parser associative array literals', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('captures commas', () => {
-        let { statements } = Parser.parse(`
+        let { ast } = Parser.parse(`
             _ = {
                 p1: 1,
                 p2: 2, 'comment
@@ -194,15 +195,13 @@ describe('parser associative array literals', () => {
                 p5: 5,
             }
         `);
-        const commas = ((statements[0] as AssignmentStatement).value as AALiteralExpression).elements
-            .map(s => !isCommentStatement(s) && !!s.commaToken);
+        const commas = ((ast.statements[0] as AssignmentStatement).value as AALiteralExpression).elements
+            .map(s => !!s.tokens.comma);
         expect(commas).to.deep.equal([
             true, // p1
             true, // p2
-            false, // comment
             false, // p3
             false, // p4
-            false, // comment
             true // p5
         ]);
     });
@@ -210,11 +209,11 @@ describe('parser associative array literals', () => {
     describe('unfinished', () => {
         it('will still be parsed', () => {
             // No closing brace:
-            let { statements, diagnostics } = Parser.parse(`_ = {name: "john", age: 42, address: data.address`);
-            expectDiagnostics(diagnostics, [DiagnosticMessages.unmatchedLeftCurlyAfterAALiteral()]);
-            expect(statements).to.be.lengthOf(1);
-            expect(isAssignmentStatement(statements[0])).to.be.true;
-            const assignStmt = statements[0] as AssignmentStatement;
+            let { ast, diagnostics } = Parser.parse(`_ = {name: "john", age: 42, address: data.address`);
+            expectDiagnostics(diagnostics, [DiagnosticMessages.unmatchedLeftToken('{', 'associative array literal')]);
+            expect(ast.statements).to.be.lengthOf(1);
+            expect(isAssignmentStatement(ast.statements[0])).to.be.true;
+            const assignStmt = ast.statements[0] as AssignmentStatement;
             expect(isAALiteralExpression(assignStmt.value));
             const aaLitExpr = assignStmt.value as AALiteralExpression;
             expect(aaLitExpr.elements).to.be.lengthOf(3);
@@ -232,7 +231,7 @@ describe('parser associative array literals', () => {
             `);
             expectDiagnostics(diagnostics, [
                 DiagnosticMessages.unexpectedToken('\n'),
-                DiagnosticMessages.unmatchedLeftCurlyAfterAALiteral()
+                DiagnosticMessages.unmatchedLeftToken('{', 'associative array literal')
             ]);
         });
 
@@ -244,20 +243,20 @@ describe('parser associative array literals', () => {
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.unmatchedLeftCurlyAfterAALiteral()
+                DiagnosticMessages.unmatchedLeftToken('{', 'associative array literal')
             ]);
         });
     });
 
     describe('computed keys', () => {
         it('parses [expr] computed key syntax', () => {
-            const { statements, diagnostics } = Parser.parse(`
+            const { ast, diagnostics } = Parser.parse(`
                 _ = {
                     [someEnum.key]: "value"
                 }
             `);
             expectZeroDiagnostics(diagnostics);
-            const aaLit = (statements[0] as AssignmentStatement).value as AALiteralExpression;
+            const aaLit = (ast.statements[0] as AssignmentStatement).value as AALiteralExpression;
             expect(isAALiteralExpression(aaLit)).to.be.true;
             const member = aaLit.elements[0] as AAIndexedMemberExpression;
             expect(isAAIndexedMemberExpression(member)).to.be.true;
@@ -268,13 +267,13 @@ describe('parser associative array literals', () => {
         });
 
         it('parses [literal] computed key syntax', () => {
-            const { statements, diagnostics } = Parser.parse(`
+            const { ast, diagnostics } = Parser.parse(`
                 _ = {
                     ["my-key"]: "value"
                 }
             `);
             expectZeroDiagnostics(diagnostics);
-            const aaLit = (statements[0] as AssignmentStatement).value as AALiteralExpression;
+            const aaLit = (ast.statements[0] as AssignmentStatement).value as AALiteralExpression;
             const member = aaLit.elements[0] as AAIndexedMemberExpression;
             expect(isAAIndexedMemberExpression(member)).to.be.true;
             expect(member.key).to.exist;
@@ -293,32 +292,32 @@ describe('parser associative array literals', () => {
         });
 
         it('supports multiple computed keys in one AA', () => {
-            const { statements, diagnostics } = Parser.parse(`
+            const { ast, diagnostics } = Parser.parse(`
                 _ = {
                     [myEnum.a]: 1,
                     [myEnum.b]: 2
                 }
             `);
             expectZeroDiagnostics(diagnostics);
-            const aaLit = (statements[0] as AssignmentStatement).value as AALiteralExpression;
+            const aaLit = (ast.statements[0] as AssignmentStatement).value as AALiteralExpression;
             expect(aaLit.elements).to.have.lengthOf(2);
             expect(isAAIndexedMemberExpression(aaLit.elements[0])).to.be.true;
             expect(isAAIndexedMemberExpression(aaLit.elements[1])).to.be.true;
         });
 
         it('supports mixing computed and non-computed keys', () => {
-            const { statements, diagnostics } = Parser.parse(`
+            const { ast, diagnostics } = Parser.parse(`
                 _ = {
                     normalKey: 1,
                     [myEnum.computed]: 2
                 }
             `);
             expectZeroDiagnostics(diagnostics);
-            const aaLit = (statements[0] as AssignmentStatement).value as AALiteralExpression;
+            const aaLit = (ast.statements[0] as AssignmentStatement).value as AALiteralExpression;
             const first = aaLit.elements[0] as AAMemberExpression;
             const second = aaLit.elements[1] as AAIndexedMemberExpression;
             expect(isAAMemberExpression(first)).to.be.true;
-            expect(first.keyToken).to.exist;
+            expect(first.tokens.key).to.exist;
             expect(isAAIndexedMemberExpression(second)).to.be.true;
             expect(second.key).to.exist;
         });
@@ -336,93 +335,105 @@ describe('parser associative array literals', () => {
          * 5|
          * 6| }
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        const parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'a',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 1)
+                location: util.createLocation(0, 0, 0, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 2, 0, 3)
+                location: util.createLocation(0, 2, 0, 3)
             },
             {
                 kind: TokenKind.LeftCurlyBrace,
                 text: '{',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 4, 0, 5)
+                location: util.createLocation(0, 4, 0, 5)
             },
             {
                 kind: TokenKind.RightCurlyBrace,
                 text: '}',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 8, 0, 9)
+                location: util.createLocation(0, 8, 0, 9)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 9, 0, 10)
+                location: util.createLocation(0, 9, 0, 10)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(1, 0, 1, 1)
+                location: util.createLocation(1, 0, 1, 1)
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'b',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 0, 2, 1)
+                location: util.createLocation(2, 0, 2, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 2, 2, 3)
+                location: util.createLocation(2, 2, 2, 3)
             },
             {
                 kind: TokenKind.LeftCurlyBrace,
                 text: '{',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 4, 2, 5)
+                location: util.createLocation(2, 4, 2, 5)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(3, 0, 3, 1)
+                location: util.createLocation(3, 0, 3, 1)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(4, 0, 4, 1)
+                location: util.createLocation(4, 0, 4, 1)
             },
             {
                 kind: TokenKind.RightCurlyBrace,
                 text: '}',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(5, 0, 5, 1)
+                location: util.createLocation(5, 0, 5, 1)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(5, 1, 5, 2)
+                location: util.createLocation(5, 1, 5, 2)
             }
-        ]) as any;
+        ]);
 
-        expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(2);
-        expect(statements[0].value.range).to.deep.include(
+        expectZeroDiagnostics(parser);
+        expect((parser.ast.statements[0] as AssignmentStatement).value.location.range).to.deep.include(
             Range.create(0, 4, 0, 9)
         );
-        expect(statements[1].value.range).to.deep.include(
+        expect((parser.ast.statements[1] as AssignmentStatement).value.location.range).to.deep.include(
             Range.create(2, 4, 5, 1)
         );
     });
diff --git a/src/parser/tests/expression/Boolean.spec.ts b/src/parser/tests/expression/Boolean.spec.ts
index d7d18ac93..98e867045 100644
--- a/src/parser/tests/expression/Boolean.spec.ts
+++ b/src/parser/tests/expression/Boolean.spec.ts
@@ -4,11 +4,14 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import { util } from '../../../util';
+import { expectZeroDiagnostics } from '../../../testHelpers.spec';
+import type { AssignmentStatement } from '../../Statement';
 
 describe('parser boolean expressions', () => {
 
     it('parses boolean ANDs', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.True, 'true'),
@@ -18,11 +21,11 @@ describe('parser boolean expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('parses boolean ORs', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.True, 'true'),
@@ -32,7 +35,7 @@ describe('parser boolean expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('location tracking', () => {
@@ -42,48 +45,53 @@ describe('parser boolean expressions', () => {
          *  +----------------------
          * 0| a = true and false
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        const parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'a',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 1)
+                location: util.createLocation(0, 0, 0, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 2, 0, 3)
+                location: util.createLocation(0, 2, 0, 3)
             },
             {
                 kind: TokenKind.True,
                 text: 'true',
+                leadingTrivia: [],
                 isReserved: true,
-                range: Range.create(0, 4, 0, 8)
+                location: util.createLocation(0, 4, 0, 8)
             },
             {
                 kind: TokenKind.And,
                 text: 'and',
+                leadingTrivia: [],
                 isReserved: true,
-                range: Range.create(0, 9, 0, 12)
+                location: util.createLocation(0, 9, 0, 12)
             },
             {
                 kind: TokenKind.False,
                 text: 'false',
+                leadingTrivia: [],
                 isReserved: true,
-                range: Range.create(0, 13, 0, 18)
+                location: util.createLocation(0, 13, 0, 18)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 18, 0, 19)
+                location: util.createLocation(0, 18, 0, 19)
             }
-        ]) as any;
+        ]);
 
-        expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].value.range).deep.include(
+        expectZeroDiagnostics(parser);
+        expect((parser.ast.statements[0] as AssignmentStatement).value.location.range).deep.include(
             Range.create(0, 4, 0, 18)
         );
     });
diff --git a/src/parser/tests/expression/Call.spec.ts b/src/parser/tests/expression/Call.spec.ts
index 29a23a5fb..06c032062 100644
--- a/src/parser/tests/expression/Call.spec.ts
+++ b/src/parser/tests/expression/Call.spec.ts
@@ -9,18 +9,19 @@ import type { ExpressionStatement, FunctionStatement } from '../../Statement';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { expectDiagnostics, expectDiagnosticsIncludes } from '../../../testHelpers.spec';
 import { isAssignmentStatement, isCallExpression, isDottedGetExpression, isDottedSetStatement, isExpressionStatement, isIndexedGetExpression, isReturnStatement } from '../../../astUtils/reflection';
+import { util } from '../../../util';
 
 describe('parser call expressions', () => {
     it('parses named function calls', () => {
-        const { statements, diagnostics } = Parser.parse([
+        const { ast, diagnostics } = Parser.parse([
             identifier('RebootSystem'),
-            { kind: TokenKind.LeftParen, text: '(', range: null as any },
+            { kind: TokenKind.LeftParen, text: '(', location: null as any, leadingTrivia: [] },
             token(TokenKind.RightParen, ')'),
             EOF
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('does not invalidate the rest of the file on incomplete statement', () => {
@@ -31,12 +32,12 @@ describe('parser call expressions', () => {
             sub DoThingTwo()
             end sub
         `);
-        const { statements, diagnostics } = Parser.parse(tokens);
+        const { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.length.greaterThan(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
 
         //ALL of the diagnostics should be on the `DoThin` line
-        let lineNumbers = diagnostics.map(x => x.range.start.line);
+        let lineNumbers = diagnostics.map(x => x.location.range.start.line);
         for (let lineNumber of lineNumbers) {
             expect(lineNumber).to.equal(2);
         }
@@ -51,21 +52,21 @@ describe('parser call expressions', () => {
             sub DoThingTwo()
             end sub
         `);
-        const { statements, diagnostics } = Parser.parse(tokens);
+        const { ast, diagnostics } = Parser.parse(tokens);
         //there should only be 1 error
         expectDiagnostics(diagnostics, [
             DiagnosticMessages.unexpectedToken(':'),
-            DiagnosticMessages.expectedRightParenAfterFunctionCallArguments()
+            DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments')
         ]);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
         //the error should be BEFORE the `name = "bob"` statement
-        expect(diagnostics[0].range.end.character).to.be.lessThan(25);
+        expect(diagnostics[0].location.range.end.character).to.be.lessThan(25);
     });
 
     it('allows closing parentheses on separate line in BrighterScript mode', () => {
-        const { statements, diagnostics } = Parser.parse([
+        const { ast, diagnostics } = Parser.parse([
             identifier('RebootSystem'),
-            { kind: TokenKind.LeftParen, text: '(', range: null as any },
+            { kind: TokenKind.LeftParen, text: '(', location: null as any, leadingTrivia: [] },
             token(TokenKind.Newline, '\\n'),
             token(TokenKind.Newline, '\\n'),
             token(TokenKind.RightParen, ')'),
@@ -73,11 +74,11 @@ describe('parser call expressions', () => {
         ], { mode: ParseMode.BrighterScript });
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('includes partial statements and expressions', () => {
-        const { statements, diagnostics } = Parser.parse(`
+        const { ast, diagnostics } = Parser.parse(`
             function processData(data)
                 data.foo.bar. = "hello"
                 data.foo.func().
@@ -88,57 +89,57 @@ describe('parser call expressions', () => {
 
         expect(diagnostics).to.be.lengthOf(4);
         expectDiagnostics(diagnostics, [
-            DiagnosticMessages.expectedPropertyNameAfterPeriod(),
-            DiagnosticMessages.expectedPropertyNameAfterPeriod(),
-            DiagnosticMessages.expectedPropertyNameAfterPeriod(),
-            DiagnosticMessages.expectedPropertyNameAfterPeriod()
+            DiagnosticMessages.expectedIdentifier(),
+            DiagnosticMessages.expectedIdentifier(),
+            DiagnosticMessages.expectedIdentifier(),
+            DiagnosticMessages.expectedIdentifier()
         ]);
-        expect(statements).to.be.lengthOf(1);
-        const bodyStatements = (statements[0] as FunctionStatement).func.body.statements;
+        expect(ast.statements).to.be.lengthOf(1);
+        const bodyStatements = (ast.statements[0] as FunctionStatement).func.body.statements;
         expect(bodyStatements).to.be.lengthOf(4); // each line is a statement
 
         // first should be: data.foo.bar = "hello"
         expect(isDottedSetStatement(bodyStatements[0])).to.be.true;
         const setStmt = bodyStatements[0] as any;
-        expect(setStmt.name.text).to.equal('bar');
-        expect(setStmt.obj.name.text).to.equal('foo');
-        expect(setStmt.obj.obj.name.text).to.equal('data');
-        expect(setStmt.value.token.text).to.equal('"hello"');
+        expect(setStmt.tokens.name.text).to.equal('bar');
+        expect(setStmt.obj.tokens.name.text).to.equal('foo');
+        expect(setStmt.obj.obj.tokens.name.text).to.equal('data');
+        expect(setStmt.value.tokens.value.text).to.equal('"hello"');
 
         // 2nd should be: data.foo.func()
         expect(isExpressionStatement(bodyStatements[1])).to.be.true;
         expect(isCallExpression((bodyStatements[1] as any).expression)).to.be.true;
         const callExpr = (bodyStatements[1] as any).expression;
-        expect(callExpr.callee.name.text).to.be.equal('func');
-        expect(callExpr.callee.obj.name.text).to.be.equal('foo');
-        expect(callExpr.callee.obj.obj.name.text).to.be.equal('data');
+        expect(callExpr.callee.tokens.name.text).to.be.equal('func');
+        expect(callExpr.callee.obj.tokens.name.text).to.be.equal('foo');
+        expect(callExpr.callee.obj.obj.tokens.name.text).to.be.equal('data');
 
         // 3rd should be: result = data.foo
         expect(isAssignmentStatement(bodyStatements[2])).to.be.true;
         const assignStmt = (bodyStatements[2] as any);
-        expect(assignStmt.name.text).to.equal('result');
-        expect(assignStmt.value.name.text).to.equal('foo');
+        expect(assignStmt.tokens.name.text).to.equal('result');
+        expect(assignStmt.value.tokens.name.text).to.equal('foo');
 
         // 4th should be: return result
         expect(isReturnStatement(bodyStatements[3])).to.be.true;
         const returnStmt = (bodyStatements[3] as any);
-        expect(returnStmt.value.name.text).to.equal('result');
+        expect(returnStmt.value.tokens.name.text).to.equal('result');
     });
 
     it('accepts arguments', () => {
-        const { statements, diagnostics } = Parser.parse([
+        const { ast, diagnostics } = Parser.parse([
             identifier('add'),
-            { kind: TokenKind.LeftParen, text: '(', range: null as any },
+            { kind: TokenKind.LeftParen, text: '(', location: null as any, leadingTrivia: [] },
             token(TokenKind.IntegerLiteral, '1'),
-            { kind: TokenKind.Comma, text: ',', range: null as any },
+            { kind: TokenKind.Comma, text: ',', location: null as any, leadingTrivia: [] },
             token(TokenKind.IntegerLiteral, '2'),
             token(TokenKind.RightParen, ')'),
             EOF
         ]) as any;
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
-        expect(statements[0].expression.args).to.be.ok;
+        expect(ast.statements).to.be.length.greaterThan(0);
+        expect(ast.statements[0].expression.args).to.be.ok;
     });
 
     it('location tracking', () => {
@@ -148,79 +149,87 @@ describe('parser call expressions', () => {
          *  +----------------------
          * 0| foo("bar", "baz")
          */
-        const { statements, diagnostics } = Parser.parse(<any>[
+        const { ast, diagnostics } = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'foo',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 3)
+                location: util.createLocation(0, 0, 0, 3)
             },
             {
                 kind: TokenKind.LeftParen,
                 text: '(',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 3, 0, 4)
+                location: util.createLocation(0, 3, 0, 4)
             },
             {
                 kind: TokenKind.StringLiteral,
                 text: `"bar"`,
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 4, 0, 9)
+                location: util.createLocation(0, 4, 0, 9)
             },
             {
                 kind: TokenKind.Comma,
                 text: ',',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 9, 0, 10)
+                location: util.createLocation(0, 9, 0, 10)
             },
             {
                 kind: TokenKind.StringLiteral,
                 text: `"baz"`,
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 11, 0, 16)
+                location: util.createLocation(0, 11, 0, 16)
             },
             {
                 kind: TokenKind.RightParen,
                 text: ')',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 16, 0, 17)
+                location: util.createLocation(0, 16, 0, 17)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 17, 0, 18)
+                location: util.createLocation(0, 17, 0, 18)
             }
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].range).to.deep.include(
+        expect(ast.statements).to.be.lengthOf(1);
+        expect(ast.statements[0].location?.range).to.deep.include(
             Range.create(0, 0, 0, 17)
         );
     });
 
     describe('unfinished', () => {
         it('continues parsing inside unfinished function calls', () => {
-            const { statements, diagnostics } = Parser.parse(`
+            const { ast, diagnostics } = Parser.parse(`
                 sub doSomething(data)
                     otherFunc(data.foo, data.bar[0]
                 end sub
             `);
 
-            expect(diagnostics).to.be.lengthOf(1);
+            expect(diagnostics).to.be.lengthOf(2);
             expectDiagnostics(diagnostics, [
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments()
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments'),
+                DiagnosticMessages.expectedNewlineOrColon()
             ]);
-            expect(statements).to.be.lengthOf(1);
-            const bodyStatements = (statements[0] as FunctionStatement).func.body.statements;
+            expect(ast.statements).to.be.lengthOf(1);
+            const bodyStatements = (ast.statements[0] as FunctionStatement).func.body.statements;
             expect(bodyStatements).to.be.lengthOf(1);
 
             // Function statement should still be parsed
             expect(isExpressionStatement(bodyStatements[0])).to.be.true;
             expect(isCallExpression((bodyStatements[0] as ExpressionStatement).expression)).to.be.true;
             const callExpr = (bodyStatements[0] as ExpressionStatement).expression as any;
-            expect(callExpr.callee.name.text).to.equal('otherFunc');
+            expect(callExpr.callee.tokens.name.text).to.equal('otherFunc');
 
             // args should still be parsed, as well!
             expect(callExpr.args).to.be.lengthOf(2);
@@ -235,7 +244,7 @@ describe('parser call expressions', () => {
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments()
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments')
             ]);
         });
 
@@ -246,21 +255,21 @@ describe('parser call expressions', () => {
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments()
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments')
             ]);
         });
 
         it('gets correct diagnostic for missing close paren with invalid expression as arg', () => {
-            let { diagnostics, statements } = Parser.parse(`
+            let { ast, diagnostics } = Parser.parse(`
                 sub process(data)
                     someFunc(data.name. ,
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.expectedRightParenAfterFunctionCallArguments()
+                DiagnosticMessages.unmatchedLeftToken('(', 'function call arguments')
             ]);
-            expect(statements).to.be.lengthOf(1);
-            const bodyStatements = (statements[0] as FunctionStatement).func.body.statements;
+            expect(ast.statements).to.be.lengthOf(1);
+            const bodyStatements = (ast.statements[0] as FunctionStatement).func.body.statements;
             expect(bodyStatements).to.be.lengthOf(1);
         });
     });
diff --git a/src/parser/tests/expression/Exponential.spec.ts b/src/parser/tests/expression/Exponential.spec.ts
index 14248e2d6..dbf5a34e2 100644
--- a/src/parser/tests/expression/Exponential.spec.ts
+++ b/src/parser/tests/expression/Exponential.spec.ts
@@ -7,7 +7,7 @@ import { EOF, identifier, token } from '../Parser.spec';
 describe('parser', () => {
     describe('exponential expressions', () => {
         it('parses exponential operators', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '2'),
@@ -17,11 +17,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses repeated exponential operators as left-associative', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '2'),
@@ -33,7 +33,7 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 });
diff --git a/src/parser/tests/expression/Function.spec.ts b/src/parser/tests/expression/Function.spec.ts
index d01a88cff..edfe72ebb 100644
--- a/src/parser/tests/expression/Function.spec.ts
+++ b/src/parser/tests/expression/Function.spec.ts
@@ -4,12 +4,15 @@ import { ParseMode, Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import { util } from '../../../util';
+import { expectZeroDiagnostics } from '../../../testHelpers.spec';
+import type { AssignmentStatement } from '../../Statement';
 
 describe('parser', () => {
 
     describe('function expressions', () => {
         it('parses minimal empty function expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -21,11 +24,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses colon-separated function declarations', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -40,11 +43,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses non-empty function expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -59,11 +62,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses functions with implicit-dynamic arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -78,11 +81,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses functions with typed arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -105,11 +108,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses functions with default argument expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -138,11 +141,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses functions with typed arguments and default expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -170,11 +173,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses return types', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'function'),
@@ -188,13 +191,13 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     describe('sub expressions', () => {
         it('parses minimal sub expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Sub, 'sub'),
@@ -206,11 +209,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses non-empty sub expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Sub, 'sub'),
@@ -225,11 +228,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses subs with implicit-dynamic arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'sub'),
@@ -244,11 +247,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses subs with typed arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Function, 'sub'),
@@ -271,11 +274,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses subs with default argument expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Sub, 'sub'),
@@ -304,11 +307,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses subs with typed arguments and default expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.Sub, 'sub'),
@@ -336,13 +339,13 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     describe('usage', () => {
         it('allows sub expressions in call arguments in BrighterScript mode', () => {
-            const { statements, diagnostics } = Parser.parse([
+            const { ast, diagnostics } = Parser.parse([
                 identifier('acceptsCallback'),
                 token(TokenKind.LeftParen, '('),
                 token(TokenKind.Newline, '\\n'),
@@ -362,11 +365,11 @@ describe('parser', () => {
             ], { mode: ParseMode.BrighterScript });
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('allows function expressions in assignment RHS', () => {
-            const { statements, diagnostics } = Parser.parse([
+            const { ast, diagnostics } = Parser.parse([
                 identifier('anonymousFunction'),
                 token(TokenKind.Equal, '='),
 
@@ -383,7 +386,7 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
@@ -396,60 +399,67 @@ describe('parser', () => {
          * 1|
          * 2| end sub
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        const parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: '_',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 1)
+                location: util.createLocation(0, 0, 0, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 2, 0, 3)
+                location: util.createLocation(0, 2, 0, 3)
             },
             {
                 kind: TokenKind.Sub,
                 text: 'sub',
+                leadingTrivia: [],
                 isReserved: true,
-                range: Range.create(0, 4, 0, 7)
+                location: util.createLocation(0, 4, 0, 7)
             },
             {
                 kind: TokenKind.LeftParen,
                 text: '(',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 11, 0, 12)
+                location: util.createLocation(0, 11, 0, 12)
             },
             {
                 kind: TokenKind.RightParen,
                 text: ')',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 12, 0, 13)
+                location: util.createLocation(0, 12, 0, 13)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 13, 0, 14)
+                location: util.createLocation(0, 13, 0, 14)
             },
             {
                 kind: TokenKind.EndSub,
                 text: 'end sub',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 0, 2, 7)
+                location: util.createLocation(2, 0, 2, 7)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 7, 2, 8)
+                location: util.createLocation(2, 7, 2, 8)
             }
-        ]) as any;
+        ]);
 
-        expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].value.range).to.deep.include(
+        expectZeroDiagnostics(parser);
+        expect((parser.ast.statements[0] as AssignmentStatement).value.location.range).to.deep.include(
             Range.create(0, 4, 2, 7)
         );
     });
diff --git a/src/parser/tests/expression/Indexing.spec.ts b/src/parser/tests/expression/Indexing.spec.ts
index 34cf5b3d6..fb8d7ec1e 100644
--- a/src/parser/tests/expression/Indexing.spec.ts
+++ b/src/parser/tests/expression/Indexing.spec.ts
@@ -7,16 +7,17 @@ import { Range } from 'vscode-languageserver';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import type { IndexedSetStatement } from '../../Statement';
 import { AssignmentStatement } from '../../Statement';
-import { expectDiagnostics, expectDiagnosticsIncludes } from '../../../testHelpers.spec';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectZeroDiagnostics } from '../../../testHelpers.spec';
 import { isAssignmentStatement, isDottedGetExpression, isIndexedGetExpression, isIndexedSetStatement, isLiteralExpression, isVariableExpression } from '../../../astUtils/reflection';
 import type { DottedGetExpression, IndexedGetExpression, VariableExpression } from '../../Expression';
 import { WalkMode } from '../../../astUtils/visitors';
+import { util } from '../../../util';
 
 
 describe('parser indexing', () => {
     describe('one level', () => {
         it('dotted', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 identifier('foo'),
@@ -26,12 +27,12 @@ describe('parser indexing', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
 
         it('bracketed', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 identifier('foo'),
@@ -42,13 +43,13 @@ describe('parser indexing', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
 
         describe('dotted and bracketed', () => {
             it('single dot', () => {
-                let { statements, diagnostics } = Parser.parse([
+                let { ast, diagnostics } = Parser.parse([
                     identifier('_'),
                     token(TokenKind.Equal, '='),
                     identifier('foo'),
@@ -60,11 +61,11 @@ describe('parser indexing', () => {
                 ]);
 
                 expect(diagnostics).to.be.empty;
-                expect(statements[0]).to.be.instanceof(AssignmentStatement);
+                expect(ast.statements[0]).to.be.instanceof(AssignmentStatement);
             });
 
             it('multiple dots', () => {
-                let { diagnostics, statements } = Parser.parse([
+                let { ast, diagnostics } = Parser.parse([
                     identifier('_'),
                     token(TokenKind.Equal, '='),
                     identifier('foo'),
@@ -80,12 +81,12 @@ describe('parser indexing', () => {
 
                 expect(diagnostics.length).to.equal(3);
                 expectDiagnostics(diagnostics, [
-                    DiagnosticMessages.expectedPropertyNameAfterPeriod(), // expected name after first dot
+                    DiagnosticMessages.expectedIdentifier(), // expected name after first dot
                     DiagnosticMessages.expectedNewlineOrColon(), // expected newline after "_ = foo" statement
                     DiagnosticMessages.unexpectedToken('.') // everything after the 2nd dot is ignored
                 ]);
                 // expect statement "_ = foo" to still be included
-                expect(statements.length).to.equal(1);
+                expect(ast.statements.length).to.equal(1);
             });
         });
 
@@ -97,90 +98,102 @@ describe('parser indexing', () => {
              * 0| a = foo.bar
              * 1| b = foo[2]
              */
-            let { statements, diagnostics } = Parser.parse(<any>[
+            const parser = Parser.parse([
                 {
                     kind: TokenKind.Identifier,
                     text: 'a',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(0, 0, 0, 1)
+                    location: util.createLocation(0, 0, 0, 1)
                 },
                 {
                     kind: TokenKind.Equal,
                     text: '=',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(0, 2, 0, 3)
+                    location: util.createLocation(0, 2, 0, 3)
                 },
                 {
                     kind: TokenKind.Identifier,
                     text: 'foo',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(0, 4, 0, 7)
+                    location: util.createLocation(0, 4, 0, 7)
                 },
                 {
                     kind: TokenKind.Dot,
                     text: '.',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(0, 7, 0, 8)
+                    location: util.createLocation(0, 7, 0, 8)
                 },
                 {
                     kind: TokenKind.Identifier,
                     text: 'bar',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(0, 8, 0, 11)
+                    location: util.createLocation(0, 8, 0, 11)
                 },
                 {
                     kind: TokenKind.Newline,
                     text: '\n',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(0, 11, 0, 12)
+                    location: util.createLocation(0, 11, 0, 12)
                 },
                 {
                     kind: TokenKind.Identifier,
                     text: 'b',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(1, 0, 1, 1)
+                    location: util.createLocation(1, 0, 1, 1)
                 },
                 {
                     kind: TokenKind.Equal,
                     text: '=',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(1, 2, 1, 3)
+                    location: util.createLocation(1, 2, 1, 3)
                 },
                 {
                     kind: TokenKind.Identifier,
                     text: 'bar',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(1, 4, 1, 7)
+                    location: util.createLocation(1, 4, 1, 7)
                 },
                 {
                     kind: TokenKind.LeftSquareBracket,
                     text: '[',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(1, 7, 1, 8)
+                    location: util.createLocation(1, 7, 1, 8)
                 },
                 {
                     kind: TokenKind.IntegerLiteral,
                     text: '2',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(1, 8, 1, 9)
+                    location: util.createLocation(1, 8, 1, 9)
                 },
                 {
                     kind: TokenKind.RightSquareBracket,
                     text: ']',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(1, 9, 1, 10)
+                    location: util.createLocation(1, 9, 1, 10)
                 },
                 {
                     kind: TokenKind.Eof,
                     text: '\0',
+                    leadingTrivia: [],
                     isReserved: false,
-                    range: Range.create(1, 10, 1, 11)
+                    location: util.createLocation(1, 10, 1, 11)
                 }
             ]);
 
-            expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.lengthOf(2);
-            expect(statements.map(s => (s as any).value.range)).to.deep.equal([
+            expectZeroDiagnostics(parser);
+            expect(parser.ast.statements.map(s => (s as AssignmentStatement).value.location.range)).to.deep.equal([
                 Range.create(0, 4, 0, 11),
                 Range.create(1, 4, 1, 10)
             ]);
@@ -194,7 +207,7 @@ describe('parser indexing', () => {
         const nodes = [];
         parser.ast.findChild<AssignmentStatement>(isAssignmentStatement).value.walk((x) => {
             if (isLiteralExpression(x)) {
-                nodes.push(x.token.text);
+                nodes.push(x.tokens.value.text);
             }
         }, { walkMode: WalkMode.visitAllRecursive });
         expect(nodes).to.eql(['0', '1', '2']);
@@ -207,7 +220,7 @@ describe('parser indexing', () => {
         const nodes = [];
         parser.ast.findChild<IndexedSetStatement>(isIndexedSetStatement).walk((x) => {
             if (isLiteralExpression(x)) {
-                nodes.push(x.token.text);
+                nodes.push(x.tokens.value.text);
             }
         }, { walkMode: WalkMode.visitAllRecursive });
         expect(nodes).to.eql(['0', '1', '2', '"value"']);
@@ -215,7 +228,7 @@ describe('parser indexing', () => {
 
     describe('multi-level', () => {
         it('dotted', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 identifier('foo'),
@@ -225,11 +238,11 @@ describe('parser indexing', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('bracketed', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 identifier('foo'),
@@ -246,11 +259,11 @@ describe('parser indexing', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('mixed', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 identifier('foo'),
@@ -265,25 +278,25 @@ describe('parser indexing', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 
     describe('unfinished brackets', () => {
         it('parses expression inside of brackets', () => {
-            let { statements, diagnostics } = Parser.parse(`_ = foo[bar.baz.`);
+            let { ast, diagnostics } = Parser.parse(`_ = foo[bar.baz.`);
 
             expect(diagnostics.length).to.be.greaterThan(0);
-            expect(statements).to.be.lengthOf(1);
-            expect(isAssignmentStatement(statements[0])).to.be.true;
-            const assignStmt = statements[0] as AssignmentStatement;
-            expect(assignStmt.name.text).to.equal('_');
+            expect(ast.statements).to.be.lengthOf(1);
+            expect(isAssignmentStatement(ast.statements[0])).to.be.true;
+            const assignStmt = ast.statements[0] as AssignmentStatement;
+            expect(assignStmt.tokens.name.text).to.equal('_');
             expect(isIndexedGetExpression(assignStmt.value)).to.be.true;
             const indexedGetExpr = assignStmt.value as IndexedGetExpression;
-            expect((indexedGetExpr.obj as VariableExpression).name.text).to.equal('foo');
-            expect(isDottedGetExpression(indexedGetExpr.index)).to.be.true;
-            const dottedGetExpr = indexedGetExpr.index as DottedGetExpression;
-            expect(dottedGetExpr.name.text).to.equal('baz');
+            expect((indexedGetExpr.obj as VariableExpression).tokens.name.text).to.equal('foo');
+            expect(isDottedGetExpression(indexedGetExpr.indexes[0])).to.be.true;
+            const dottedGetExpr = indexedGetExpr.indexes[0] as DottedGetExpression;
+            expect(dottedGetExpr.tokens.name.text).to.equal('baz');
             expect(isVariableExpression(dottedGetExpr.obj)).to.be.true;
         });
 
@@ -294,7 +307,7 @@ describe('parser indexing', () => {
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.expectedRightSquareBraceAfterArrayOrObjectIndex()
+                DiagnosticMessages.unmatchedLeftToken('[', 'array or object index')
             ]);
         });
 
@@ -305,7 +318,7 @@ describe('parser indexing', () => {
                 end sub
             `);
             expectDiagnosticsIncludes(diagnostics, [
-                DiagnosticMessages.expectedRightSquareBraceAfterArrayOrObjectIndex()
+                DiagnosticMessages.unmatchedLeftToken('[', 'array or object index')
             ]);
         });
     });
diff --git a/src/parser/tests/expression/Multiplicative.spec.ts b/src/parser/tests/expression/Multiplicative.spec.ts
index d566b5010..7875f3914 100644
--- a/src/parser/tests/expression/Multiplicative.spec.ts
+++ b/src/parser/tests/expression/Multiplicative.spec.ts
@@ -8,7 +8,7 @@ describe('parser', () => {
 
     describe('multiplicative expressions', () => {
         it('parses left-associative multiplication chains', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.FloatLiteral, '3.0'),
@@ -20,11 +20,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses left-associative division chains', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.FloatLiteral, '7.0'),
@@ -36,11 +36,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses left-associative modulo chains', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.FloatLiteral, '7.0'),
@@ -52,11 +52,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses left-associative integer-division chains', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.FloatLiteral, '32.5'),
@@ -68,7 +68,7 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 });
diff --git a/src/parser/tests/expression/NullCoalescenceExpression.spec.ts b/src/parser/tests/expression/NullCoalescenceExpression.spec.ts
index a9dfccc1a..b28b4cfe3 100644
--- a/src/parser/tests/expression/NullCoalescenceExpression.spec.ts
+++ b/src/parser/tests/expression/NullCoalescenceExpression.spec.ts
@@ -15,7 +15,7 @@ import {
     NullCoalescingExpression
 } from '../../Expression';
 import { Program } from '../../../Program';
-import { expectZeroDiagnostics, getTestTranspile } from '../../../testHelpers.spec';
+import { expectDiagnosticsIncludes, expectZeroDiagnostics, getTestTranspile } from '../../../testHelpers.spec';
 
 describe('NullCoalescingExpression', () => {
     it('throws exception when used in brightscript scope', () => {
@@ -25,28 +25,27 @@ describe('NullCoalescingExpression', () => {
     });
 
     describe('null coalescing as statements are not supported', () => {
-        it(`rejects various consequents with primitive values:`, () => {
+        it(`creates diagnostic when used as a statement`, () => {
             //test as property
-            for (const test in [
+            for (const test of [
                 'true',
                 'false',
                 'len("person") = 10',
-                'm.getResponse()',
-                'm.myZombies[3].ifFed = true'
+                'm.getResponse()'
             ]) {
 
                 let { tokens } = Lexer.scan(`${test} ?? "human"`);
-                let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
-                expect(diagnostics).to.not.be.empty;
-                expect(statements).to.be.empty;
+                let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                expectDiagnosticsIncludes(diagnostics, DiagnosticMessages.unexpectedToken('??').code);
+                expect(ast.statements).not.to.be.empty;
             }
         });
     });
 
-    describe('invalid coalescene - variety of test cases', () => {
-        it(`rejects various consequents with primitive values:`, () => {
+    describe('different coalescence types- variety of test cases', () => {
+        it(`accepts various consequents with primitive values:`, () => {
             //test as property
-            for (const test in [
+            for (const test of [
                 'result = true',
                 'result = false',
                 'result = len("person") = 10',
@@ -55,15 +54,16 @@ describe('NullCoalescingExpression', () => {
             ]) {
 
                 let { tokens } = Lexer.scan(`${test} ?? "human"`);
-                let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
-                expect(diagnostics).to.not.be.empty;
-                expect(statements).to.be.empty;
+                let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                expect(diagnostics).to.be.empty;
+                expect(ast.statements[0]).instanceof(AssignmentStatement);
+                expect((ast.statements[0] as AssignmentStatement).value).instanceof(NullCoalescingExpression);
             }
         });
 
-        it(`supports non-primitive alternates:`, () => {
+        it(`supports non-primitive alternates`, () => {
             //test as property
-            for (const consequent in [
+            for (const consequent of [
                 'true',
                 'false',
                 'len("person") = 10',
@@ -73,11 +73,10 @@ describe('NullCoalescingExpression', () => {
             ]) {
 
                 let { tokens } = Lexer.scan(`result = "text" ?? ${consequent}`);
-                let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
                 expectZeroDiagnostics(diagnostics);
-                expect(statements[0]).instanceof(AssignmentStatement);
-                expect((statements[0] as AssignmentStatement).value).instanceof(NullCoalescingExpression);
-
+                expect(ast.statements[0]).instanceof(AssignmentStatement);
+                expect((ast.statements[0] as AssignmentStatement).value).instanceof(NullCoalescingExpression);
             }
         });
     });
@@ -85,9 +84,9 @@ describe('NullCoalescingExpression', () => {
     describe('in assignment', () => {
         it(`simple case`, () => {
             let { tokens } = Lexer.scan(`a = user ?? {"id": "default"}`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
 
         it(`multi line arrays case`, () => {
@@ -95,72 +94,72 @@ describe('NullCoalescingExpression', () => {
           "one"
           "two"
           "three"]`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
         it(`multi line assoc array`, () => {
             let { tokens } = Lexer.scan(`a = user ?? {
           "b": "test"
           }`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
 
         it(`in func call with array args`, () => {
             let { tokens } = Lexer.scan(`m.eatBrains(user ?? defaultUser)`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(1);
             expect(callExpression.args[0]).instanceof(NullCoalescingExpression);
         });
 
         it(`in func call with more args`, () => {
             let { tokens } = Lexer.scan(`m.eatBrains(user ?? defaultUser, true, 12)`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(3);
             expect(callExpression.args[0]).instanceof(NullCoalescingExpression);
         });
 
         it(`in func call with more args, and comparing value`, () => {
             let { tokens } = Lexer.scan(`m.eatBrains((items ?? ["1","2"]).count() = 3, true, 12)`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(3);
         });
 
         it(`in array`, () => {
             let { tokens } = Lexer.scan(`a = [letter ?? "b", "c"]`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
-            expect((statements[0] as AssignmentStatement).value).instanceof(ArrayLiteralExpression);
-            let literalExpression = (statements[0] as AssignmentStatement).value as ArrayLiteralExpression;
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
+            expect((ast.statements[0] as AssignmentStatement).value).instanceof(ArrayLiteralExpression);
+            let literalExpression = (ast.statements[0] as AssignmentStatement).value as ArrayLiteralExpression;
             expect(literalExpression.elements[0]).instanceOf(NullCoalescingExpression);
             expect(literalExpression.elements[1]).instanceOf(LiteralExpression);
         });
 
         it(`in aa`, () => {
             let { tokens } = Lexer.scan(`a = {"v1": letter ?? "b", "v2": "c"}`);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
-            expect((statements[0] as AssignmentStatement).value).instanceof(AALiteralExpression);
-            let literalExpression = (statements[0] as AssignmentStatement).value as AALiteralExpression;
-            expect((literalExpression.elements[0] as AAMemberExpression).keyToken.text).is.equal('"v1"');
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
+            expect((ast.statements[0] as AssignmentStatement).value).instanceof(AALiteralExpression);
+            let literalExpression = (ast.statements[0] as AssignmentStatement).value as AALiteralExpression;
+            expect((literalExpression.elements[0] as AAMemberExpression).tokens.key.text).is.equal('"v1"');
             expect((literalExpression.elements[0] as AAMemberExpression).value).instanceOf(NullCoalescingExpression);
-            expect((literalExpression.elements[1] as AAMemberExpression).keyToken.text).is.equal('"v2"');
+            expect((literalExpression.elements[1] as AAMemberExpression).tokens.key.text).is.equal('"v2"');
             expect((literalExpression.elements[1] as AAMemberExpression).value).instanceOf(LiteralExpression);
         });
 
@@ -169,10 +168,10 @@ describe('NullCoalescingExpression', () => {
                 ? "person is " ; person
             end for
             `);
-            let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+            let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ForEachStatement);
-            expect((statements[0] as ForEachStatement).target).instanceof(NullCoalescingExpression);
+            expect(ast.statements[0]).instanceof(ForEachStatement);
+            expect((ast.statements[0] as ForEachStatement).target).instanceof(NullCoalescingExpression);
         });
 
     });
@@ -189,26 +188,26 @@ describe('NullCoalescingExpression', () => {
             program.dispose();
         });
 
-        it('uses the proper prefix when aliased package is installed', () => {
+        it('uses the proper prefix when aliased package is installed', async () => {
             program.setFile('source/roku_modules/rokucommunity_bslib/bslib.brs', '');
-            testTranspile(`
-                sub main()
+            await testTranspile(`
+                sub main(user)
                     a = user ?? false
                 end sub
             `, `
-                sub main()
+                sub main(user)
                     a = rokucommunity_bslib_coalesce(user, false)
                 end sub
             `);
         });
 
-        it('properly transpiles null coalesence assignments - simple', () => {
-            testTranspile(`
-                sub main()
+        it('properly transpiles null coalesence assignments - simple', async () => {
+            await testTranspile(`
+                sub main(user)
                     a = user ?? {"id": "default"}
                 end sub
             `, `
-                sub main()
+                sub main(user)
                     a = bslib_coalesce(user, {
                         "id": "default"
                     })
@@ -216,8 +215,8 @@ describe('NullCoalescingExpression', () => {
             `);
         });
 
-        it('properly transpiles null coalesence assignments - complex consequent', () => {
-            testTranspile(`
+        it('properly transpiles null coalesence assignments - complex consequent', async () => {
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user.getAccount() ?? {"id": "default"}
@@ -239,13 +238,13 @@ describe('NullCoalescingExpression', () => {
             `);
         });
 
-        it('transpiles null coalesence assignment for variable alternate- complex consequent', () => {
-            testTranspile(`
-                sub main()
+        it('transpiles null coalesence assignment for variable alternate- complex consequent', async () => {
+            await testTranspile(`
+                sub main(obj)
                     a = obj.link ?? false
                 end sub
             `, `
-                sub main()
+                sub main(obj)
                     a = (function(obj)
                             __bsConsequent = obj.link
                             if __bsConsequent <> invalid then
@@ -258,8 +257,8 @@ describe('NullCoalescingExpression', () => {
             `);
         });
 
-        it('does not capture restricted OS functions', () => {
-            testTranspile(`
+        it('does not capture restricted OS functions', async () => {
+            await testTranspile(`
                 sub main()
                     num = 1
                     test(num.ToStr() = "1" ?? [
@@ -306,8 +305,8 @@ describe('NullCoalescingExpression', () => {
             `);
         });
 
-        it('properly transpiles null coalesence assignments - complex alternate', () => {
-            testTranspile(`
+        it('properly transpiles null coalesence assignments - complex alternate', async () => {
+            await testTranspile(`
                 sub main()
                     user = {}
                     settings = {}
@@ -329,8 +328,8 @@ describe('NullCoalescingExpression', () => {
             `);
         });
 
-        it('ignores enum variable names', () => {
-            testTranspile(`
+        it('ignores enum variable names', async () => {
+            await testTranspile(`
                 enum Direction
                     up = "up"
                 end enum
@@ -353,8 +352,8 @@ describe('NullCoalescingExpression', () => {
             `);
         });
 
-        it('ignores const variable names', () => {
-            testTranspile(`
+        it('ignores const variable names', async () => {
+            await testTranspile(`
                 const USER = "user"
                 sub main()
                     settings = {}
diff --git a/src/parser/tests/expression/PrefixUnary.spec.ts b/src/parser/tests/expression/PrefixUnary.spec.ts
index 7f8529777..1b6536f3d 100644
--- a/src/parser/tests/expression/PrefixUnary.spec.ts
+++ b/src/parser/tests/expression/PrefixUnary.spec.ts
@@ -4,11 +4,14 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import { expectZeroDiagnostics } from '../../../testHelpers.spec';
+import type { AssignmentStatement } from '../../Statement';
+import { util } from '../../../util';
 
 describe('parser prefix unary expressions', () => {
 
     it('parses unary \'not\'', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.Not, 'not'),
@@ -17,11 +20,11 @@ describe('parser prefix unary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('parses consecutive unary \'not\'', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.Not, 'not'),
@@ -34,11 +37,11 @@ describe('parser prefix unary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('parses unary \'-\'', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.Minus, '-'),
@@ -47,11 +50,11 @@ describe('parser prefix unary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('parses consecutive unary \'-\'', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.Minus, '-'),
@@ -64,7 +67,7 @@ describe('parser prefix unary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.length.greaterThan(0);
+        expect(ast.statements).to.be.length.greaterThan(0);
     });
 
     it('location tracking', () => {
@@ -74,42 +77,46 @@ describe('parser prefix unary expressions', () => {
          *  +----------------------
          * 1| _false = not true
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        let parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: '_false',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 6)
+                location: util.createLocation(0, 0, 0, 6)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 7, 0, 8)
+                location: util.createLocation(0, 7, 0, 8)
             },
             {
                 kind: TokenKind.Not,
                 text: 'not',
+                leadingTrivia: [],
                 isReserved: true,
-                range: Range.create(0, 9, 0, 12)
+                location: util.createLocation(0, 9, 0, 12)
             },
             {
                 kind: TokenKind.True,
                 text: 'true',
+                leadingTrivia: [],
                 isReserved: true,
-                range: Range.create(0, 13, 0, 17)
+                location: util.createLocation(0, 13, 0, 17)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 17, 0, 18)
+                location: util.createLocation(0, 17, 0, 18)
             }
         ]);
 
-        expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect((statements[0] as any).value.range).to.deep.include(
+        expectZeroDiagnostics(parser);
+        expect((parser.ast.statements[0] as AssignmentStatement).value.location.range).to.deep.include(
             Range.create(0, 9, 0, 17)
         );
     });
diff --git a/src/parser/tests/expression/Primary.spec.ts b/src/parser/tests/expression/Primary.spec.ts
index 23e807519..111a75c5f 100644
--- a/src/parser/tests/expression/Primary.spec.ts
+++ b/src/parser/tests/expression/Primary.spec.ts
@@ -1,27 +1,29 @@
 import { expect } from '../../../chai-config.spec';
-
 import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import { util } from '../../../util';
+import type { AssignmentStatement } from '../../Statement';
+import { expectZeroDiagnostics } from '../../../testHelpers.spec';
 
 describe('parser primary expressions', () => {
 
     it('parses numeric literals', () => {
         let equals = token(TokenKind.Equal, '=');
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             equals,
             token(TokenKind.IntegerLiteral, '5'),
             EOF
         ]);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.have.length.greaterThan(0);
+        expect(ast.statements).to.have.length.greaterThan(0);
     });
 
     it('parses string literals', () => {
         let equals = token(TokenKind.Equal, '=');
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             equals,
             token(TokenKind.StringLiteral, 'hello'),
@@ -29,11 +31,11 @@ describe('parser primary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.have.length.greaterThan(0);
+        expect(ast.statements).to.have.length.greaterThan(0);
     });
 
     it('parses expressions in parentheses', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.Equal, '='),
             token(TokenKind.IntegerLiteral, '1'),
@@ -47,7 +49,7 @@ describe('parser primary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.have.length.greaterThan(0);
+        expect(ast.statements).to.have.length.greaterThan(0);
 
     });
 
@@ -60,102 +62,116 @@ describe('parser primary expressions', () => {
          * 1| b = "foo"
          * 2| c = ( 0 )
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        let parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'a',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 1)
+                location: util.createLocation(0, 0, 0, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 2, 0, 3)
+                location: util.createLocation(0, 2, 0, 3)
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '5',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 4, 0, 5)
+                location: util.createLocation(0, 4, 0, 5)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 5, 0, 6)
+                location: util.createLocation(0, 5, 0, 6)
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'b',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(1, 0, 1, 1)
+                location: util.createLocation(1, 0, 1, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(1, 2, 1, 3)
+                location: util.createLocation(1, 2, 1, 3)
             },
             {
                 kind: TokenKind.StringLiteral,
                 text: `"foo"`,
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(1, 4, 1, 9)
+                location: util.createLocation(1, 4, 1, 9)
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(1, 9, 1, 10)
+                location: util.createLocation(1, 9, 1, 10)
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'c',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 0, 2, 1)
+                location: util.createLocation(2, 0, 2, 1)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 2, 2, 3)
+                location: util.createLocation(2, 2, 2, 3)
             },
             {
                 kind: TokenKind.LeftParen,
                 text: '(',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 4, 2, 5)
+                location: util.createLocation(2, 4, 2, 5)
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 6, 2, 7)
+                location: util.createLocation(2, 6, 2, 7)
             },
             {
                 kind: TokenKind.RightParen,
                 text: ')',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(2, 8, 2, 9)
+                location: util.createLocation(2, 8, 2, 9)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(1, 9, 1, 10) //TODO are these numbers right?
+                location: util.createLocation(1, 9, 1, 10) //TODO are these numbers right?
             }
-        ]) as any;
+        ]);
+        const assignments = parser.ast.statements as AssignmentStatement[];
 
-        expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(3);
-        expect(statements[0].value.range).to.deep.include(
+        expectZeroDiagnostics(parser);
+        expect(assignments[0].value.location.range).to.deep.include(
             Range.create(0, 4, 0, 5)
         );
-        expect(statements[1].value.range).to.deep.include(
+        expect(assignments[1].value.location.range).to.deep.include(
             Range.create(1, 4, 1, 9)
         );
-        expect(statements[2].value.range).to.deep.include(
+        expect(assignments[2].value.location.range).to.deep.include(
             Range.create(2, 4, 2, 9)
         );
     });
diff --git a/src/parser/tests/expression/RegexLiteralExpression.spec.ts b/src/parser/tests/expression/RegexLiteralExpression.spec.ts
index 5b4a2f8f9..7c876b103 100644
--- a/src/parser/tests/expression/RegexLiteralExpression.spec.ts
+++ b/src/parser/tests/expression/RegexLiteralExpression.spec.ts
@@ -16,8 +16,8 @@ describe('RegexLiteralExpression', () => {
     });
 
     describe('transpile', () => {
-        it('captures flags', () => {
-            testTranspile(`
+        it('captures flags', async () => {
+            await testTranspile(`
                 sub main()
                     print /hello/gi
                 end sub
@@ -28,8 +28,8 @@ describe('RegexLiteralExpression', () => {
             `);
         });
 
-        it('handles when no flags', () => {
-            testTranspile(`
+        it('handles when no flags', async () => {
+            await testTranspile(`
                 sub main()
                     print /hello/
                 end sub
@@ -40,8 +40,8 @@ describe('RegexLiteralExpression', () => {
             `);
         });
 
-        it('handles weird escapes', () => {
-            testTranspile(`
+        it('handles weird escapes', async () => {
+            await testTranspile(`
                 sub main()
                     print /\\r\\n\\//
                 end sub
@@ -52,8 +52,8 @@ describe('RegexLiteralExpression', () => {
             `);
         });
 
-        it('escapes quotemark', () => {
-            testTranspile(`
+        it('escapes quotemark', async () => {
+            await testTranspile(`
                 sub main()
                     print /"/
                 end sub
@@ -75,8 +75,8 @@ describe('RegexLiteralExpression', () => {
             ]);
         });
 
-        it('handles edge cases', () => {
-            testTranspile(`
+        it('handles edge cases', async () => {
+            await testTranspile(`
                 sub main()
                     print /1/
                     ? /1/
diff --git a/src/parser/tests/expression/Relational.spec.ts b/src/parser/tests/expression/Relational.spec.ts
index a7f5dccc8..a09c31994 100644
--- a/src/parser/tests/expression/Relational.spec.ts
+++ b/src/parser/tests/expression/Relational.spec.ts
@@ -8,7 +8,7 @@ describe('parser', () => {
 
     describe('relational expressions', () => {
         it('parses less-than expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '5'),
@@ -18,11 +18,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses less-than-or-equal-to expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '5'),
@@ -32,12 +32,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
 
         });
 
         it('parses greater-than expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '5'),
@@ -47,12 +47,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
 
         });
 
         it('parses greater-than-or-equal-to expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '5'),
@@ -62,11 +62,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
 
         it('parses equality expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '5'),
@@ -76,12 +76,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
 
         });
 
         it('parses inequality expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('_'),
                 token(TokenKind.Equal, '='),
                 token(TokenKind.IntegerLiteral, '5'),
@@ -91,7 +91,7 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.be.length.greaterThan(0);
+            expect(ast.statements).to.be.length.greaterThan(0);
         });
     });
 });
diff --git a/src/parser/tests/expression/SourceLiteralExpression.spec.ts b/src/parser/tests/expression/SourceLiteralExpression.spec.ts
index b888a415d..63e9c0273 100644
--- a/src/parser/tests/expression/SourceLiteralExpression.spec.ts
+++ b/src/parser/tests/expression/SourceLiteralExpression.spec.ts
@@ -17,8 +17,8 @@ describe('SourceLiteralExpression', () => {
 
     describe('transpile', () => {
 
-        it('allows bs source literals local vars in brs mode', () => {
-            testTranspile(`
+        it('allows bs source literals local vars in brs mode', async () => {
+            await testTranspile(`
                 sub main()
                     source_file_path = true
                     source_line_num = true
@@ -40,8 +40,8 @@ describe('SourceLiteralExpression', () => {
             `, undefined, undefined, 'source/main.brs');
         });
 
-        it('computes SOURCE_FILE_PATH', () => {
-            testTranspile(`
+        it('computes SOURCE_FILE_PATH', async () => {
+            await testTranspile(`
                 sub main()
                     print SOURCE_FILE_PATH
                 end sub
@@ -52,8 +52,8 @@ describe('SourceLiteralExpression', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('computes SOURCE_LINE_NUM', () => {
-            testTranspile(`
+        it('computes SOURCE_LINE_NUM', async () => {
+            await testTranspile(`
                 sub main()
                     print SOURCE_LINE_NUM
                     print "hello world"
@@ -68,8 +68,8 @@ describe('SourceLiteralExpression', () => {
             `);
         });
 
-        it('computes FUNCTION_NAME', () => {
-            testTranspile(`
+        it('computes FUNCTION_NAME', async () => {
+            await testTranspile(`
                 sub main1()
                     print FUNCTION_NAME
                 end sub
@@ -88,8 +88,8 @@ describe('SourceLiteralExpression', () => {
             `);
         });
 
-        it('computes SOURCE_FUNCTION_NAME', () => {
-            testTranspile(`
+        it('computes SOURCE_FUNCTION_NAME', async () => {
+            await testTranspile(`
                 sub main1()
                     print SOURCE_FUNCTION_NAME
                 end sub
@@ -108,8 +108,8 @@ describe('SourceLiteralExpression', () => {
             `);
         });
 
-        it('SOURCE_FUNCTION_NAME computes nested anon', () => {
-            testTranspile(`
+        it('SOURCE_FUNCTION_NAME computes nested anon', async () => {
+            await testTranspile(`
                 namespace NameA
                     sub main()
                         speak = sub()
@@ -132,8 +132,8 @@ describe('SourceLiteralExpression', () => {
             `);
         });
 
-        it('computes SOURCE_LOCATION', () => {
-            testTranspile(`
+        it('computes SOURCE_LOCATION', async () => {
+            await testTranspile(`
                 sub main()
                     print SOURCE_LOCATION
                 end sub
@@ -144,8 +144,8 @@ describe('SourceLiteralExpression', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('computes PKG_PATH', () => {
-            testTranspile(`
+        it('computes PKG_PATH', async () => {
+            await testTranspile(`
                 sub main()
                     print PKG_PATH
                 end sub
@@ -156,8 +156,8 @@ describe('SourceLiteralExpression', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('computes PKG_LOCATION', () => {
-            testTranspile(`
+        it('computes PKG_LOCATION', async () => {
+            await testTranspile(`
                 sub main()
                     print PKG_LOCATION
                 end sub
@@ -168,21 +168,21 @@ describe('SourceLiteralExpression', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('retains LINE_NUM', () => {
-            testTranspile(`
+        it('retains LINE_NUM', async () => {
+            await testTranspile(`
                 sub main()
                     print LINE_NUM
                 end sub
             `);
         });
 
-        it('accounts for sourceRoot in SOURCE_FILE_PATH', () => {
+        it('accounts for sourceRoot in SOURCE_FILE_PATH', async () => {
             let sourceRoot = s`${process.cwd()} / sourceRoot`;
             program = new Program({
                 rootDir: rootDir,
                 sourceRoot: sourceRoot
             });
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     print SOURCE_FILE_PATH
                 end sub
@@ -193,13 +193,13 @@ describe('SourceLiteralExpression', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('accounts for sourceRoot in SOURCE_LOCATION', () => {
+        it('accounts for sourceRoot in SOURCE_LOCATION', async () => {
             let sourceRoot = s`${process.cwd()} / sourceRoot`;
             program = new Program({
                 rootDir: rootDir,
                 sourceRoot: sourceRoot
             });
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     print SOURCE_LOCATION
                 end sub
diff --git a/src/parser/tests/expression/TemplateStringExpression.spec.ts b/src/parser/tests/expression/TemplateStringExpression.spec.ts
index 72258dd4a..7c597ea5a 100644
--- a/src/parser/tests/expression/TemplateStringExpression.spec.ts
+++ b/src/parser/tests/expression/TemplateStringExpression.spec.ts
@@ -1,6 +1,4 @@
-/* eslint-disable @typescript-eslint/no-for-in-array */
-/* eslint no-template-curly-in-string: 0 */
-
+/* eslint-disable no-template-curly-in-string */
 import { expect } from '../../../chai-config.spec';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { Lexer } from '../../../lexer/Lexer';
@@ -22,7 +20,7 @@ describe('TemplateStringExpression', () => {
             it('generates correct locations for quasis', () => {
                 let { tokens } = Lexer.scan('print `0xAAAAAA${"0xBBBBBB"}0xCCCCCC`');
                 expect(
-                    tokens.filter(x => /"?0x/.test(x.text)).map(x => x.range)
+                    tokens.filter(x => /"?0x/.test(x.text)).map(x => x.location?.range)
                 ).to.eql([
                     util.createRange(0, 7, 0, 15), // 0xAAAAAA
                     util.createRange(0, 17, 0, 27), // "0xBBBBBB"
@@ -36,7 +34,7 @@ describe('TemplateStringExpression', () => {
                 tokens.shift();
                 expect(
                     //compute the length of the token char spread
-                    tokens.filter(x => x.text !== '').map(x => [x.range.end.character - x.range.start.character, x.text])
+                    tokens.filter(x => x.text !== '').map(x => [x.location.range.end.character - x.location.range.start.character, x.text])
                 ).to.eql([
                     '`',
                     '${',
@@ -56,16 +54,16 @@ describe('TemplateStringExpression', () => {
 
             it(`simple case`, () => {
                 let { tokens } = Lexer.scan(`a = \`hello      world\``);
-                let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
                 expect(diagnostics).to.be.lengthOf(0);
-                expect(statements[0]).instanceof(AssignmentStatement);
+                expect(ast.statements[0]).instanceof(AssignmentStatement);
             });
 
             it(`complex case`, () => {
                 let { tokens } = Lexer.scan(`a = \`hello \${a.text} world \${"template" + m.getChars()} test\``);
-                let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
                 expect(diagnostics).to.be.lengthOf(0);
-                expect(statements[0]).instanceof(AssignmentStatement);
+                expect(ast.statements[0]).instanceof(AssignmentStatement);
             });
 
             it(`complex case`, () => {
@@ -75,24 +73,24 @@ describe('TemplateStringExpression', () => {
                     the end.
                     goodnight\`
                 `);
-                let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
                 expect(diagnostics[0]?.message).not.to.exist;
-                expect(statements[0]).instanceof(AssignmentStatement);
+                expect(ast.statements[0]).instanceof(AssignmentStatement);
             });
 
             it(`complex case that tripped up the transpile tests`, () => {
 
                 let { tokens } = Lexer.scan('a = ["one", "two", `I am a complex example\n${a.isRunning(["a","b","c"])}`]');
-                let { statements, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
+                let { ast, diagnostics } = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
                 expectZeroDiagnostics(diagnostics);
-                expect(statements[0]).instanceof(AssignmentStatement);
+                expect(ast.statements[0]).instanceof(AssignmentStatement);
             });
         });
 
         it('catches missing closing backtick', () => {
             let { tokens } = Lexer.scan('name = `hello world');
             let parser = Parser.parse(tokens, { mode: ParseMode.BrighterScript });
-            expect(parser.diagnostics[0]?.message).to.equal(DiagnosticMessages.unterminatedTemplateStringAtEndOfFile().message);
+            expect(parser.diagnostics[0]?.message).to.equal(DiagnosticMessages.unterminatedTemplateString().message);
         });
     });
 
@@ -110,9 +108,9 @@ describe('TemplateStringExpression', () => {
             program.dispose();
         });
 
-        it('uses the proper prefix when aliased package is installed', () => {
+        it('uses the proper prefix when aliased package is installed', async () => {
             program.setFile('source/roku_modules/rokucommunity_bslib/bslib.brs', '');
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     a = \`\${LINE_NUM},\${LINE_NUM}\`
                 end sub
@@ -123,8 +121,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly transpiles simple template string with no leading text', () => {
-            testTranspile(`
+        it('properly transpiles simple template string with no leading text', async () => {
+            await testTranspile(`
                     sub main()
                         a = \`\${LINE_NUM},\${LINE_NUM}\`
                     end sub
@@ -136,8 +134,8 @@ describe('TemplateStringExpression', () => {
             );
         });
 
-        it('properly transpiles simple template string', () => {
-            testTranspile(`
+        it('properly transpiles simple template string', async () => {
+            await testTranspile(`
                 sub main()
                     a = \`hello world\`
                 end sub
@@ -148,20 +146,20 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly transpiles one line template string with expressions', () => {
-            testTranspile(`
+        it('properly transpiles one line template string with expressions', async () => {
+            await testTranspile(`
                 sub main()
-                    a = \`hello \${LINE_NUM.text} world \${"template" + "".getChars()} test\`
+                    a = \`hello \${LINE_NUM.text} world \${"template" + "".trim()} test\`
                 end sub
             `, `
                 sub main()
-                    a = ("hello " + bslib_toString(LINE_NUM.text) + " world " + bslib_toString("template" + "".getChars()) + " test")
+                    a = ("hello " + bslib_toString(LINE_NUM.text) + " world " + bslib_toString("template" + "".trim()) + " test")
                 end sub
             `);
         });
 
-        it('handles escaped characters', () => {
-            testTranspile(`
+        it('handles escaped characters', async () => {
+            await testTranspile(`
                 sub main()
                     a = \`\\r\\n\\\`\\$\`
                 end sub
@@ -172,8 +170,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('handles escaped unicode char codes', () => {
-            testTranspile(`
+        it('handles escaped unicode char codes', async () => {
+            await testTranspile(`
                 sub main()
                     a = \`\\c2\\c987\`
                 end sub
@@ -184,8 +182,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly transpiles simple multiline template string', () => {
-            testTranspile(`
+        it('properly transpiles simple multiline template string', async () => {
+            await testTranspile(`
                 sub main()
                     a = \`hello world\nI am multiline\`
                 end sub
@@ -196,8 +194,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly handles newlines', () => {
-            testTranspile(`
+        it('properly handles newlines', async () => {
+            await testTranspile(`
                 sub main()
                     a = \`\n\`
                 end sub
@@ -208,8 +206,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly handles clrf', () => {
-            testTranspile(`
+        it('properly handles clrf', async () => {
+            await testTranspile(`
                 sub main()
                     a = \`\r\n\`
                 end sub
@@ -220,20 +218,20 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly transpiles more complex multiline template string', () => {
-            testTranspile(`
-                sub main()
-                    a = \`I am multiline\n\${a.isRunning()}\nmore\`
+        it('properly transpiles more complex multiline template string', async () => {
+            await testTranspile(`
+                sub main(data)
+                    a = \`I am multiline\n\${data.isRunning()}\nmore\`
                 end sub
             `, `
-                sub main()
-                    a = ("I am multiline" + chr(10) + bslib_toString(a.isRunning()) + chr(10) + "more")
+                sub main(data)
+                    a = ("I am multiline" + chr(10) + bslib_toString(data.isRunning()) + chr(10) + "more")
                 end sub
             `);
         });
 
-        it('properly transpiles complex multiline template string in array def', () => {
-            testTranspile(`
+        it('properly transpiles complex multiline template string in array def', async () => {
+            await testTranspile(`
                 sub main()
                     a = [
                         "one",
@@ -256,8 +254,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly transpiles complex multiline template string in array def, with nested template', () => {
-            testTranspile(`
+        it('properly transpiles complex multiline template string in array def, with nested template', async () => {
+            await testTranspile(`
                 sub main()
                     a = [
                         "one",
@@ -286,8 +284,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('properly transpiles two expressions side-by-side', () => {
-            testTranspile(`
+        it('properly transpiles two template strings side-by-side', async () => {
+            await testTranspile(`
                 sub main()
                     a = \`\${"hello"}\${"world"}\`
                 end sub
@@ -298,8 +296,8 @@ describe('TemplateStringExpression', () => {
             `);
         });
 
-        it('skips calling toString on strings', () => {
-            testTranspile(`
+        it('skips calling toString on strings', async () => {
+            await testTranspile(`
                 sub main()
                     text = \`Hello \${"world"}\`
                 end sub
@@ -311,8 +309,8 @@ describe('TemplateStringExpression', () => {
         });
 
         describe('tagged template strings', () => {
-            it('properly transpiles with escaped characters and quasis', () => {
-                testTranspile(`
+            it('properly transpiles with escaped characters and quasis', async () => {
+                await testTranspile(`
                     function zombify(strings, values)
                     end function
                     sub main()
@@ -328,8 +326,8 @@ describe('TemplateStringExpression', () => {
                 `);
             });
 
-            it('handles multiple embedded expressions', () => {
-                testTranspile(`
+            it('handles multiple embedded expressions', async () => {
+                await testTranspile(`
                     function zombify(strings, values)
                     end function
                     sub main()
@@ -345,8 +343,8 @@ describe('TemplateStringExpression', () => {
                 `);
             });
 
-            it('wraps result in parens when we have at least one expression', () => {
-                testTranspile(`
+            it('wraps result in parens when we have at least one expression', async () => {
+                await testTranspile(`
                     sub main()
                         print \`hello \${1}\`
                     end sub
@@ -357,8 +355,8 @@ describe('TemplateStringExpression', () => {
                 `);
             });
 
-            it('wraps result in parens when we have at least one escaped char', () => {
-                testTranspile(`
+            it('wraps result in parens when we have at least one escaped char', async () => {
+                await testTranspile(`
                     sub main()
                         print \`hello \\nworld\`
                     end sub
@@ -369,8 +367,8 @@ describe('TemplateStringExpression', () => {
                 `);
             });
 
-            it('wraps result in parens when we have an expression and at least one escaped char', () => {
-                testTranspile(`
+            it('wraps result in parens when we have an expression and at least one escaped char', async () => {
+                await testTranspile(`
                     sub main()
                         num = 1
                         print \`hello \${num} \\nworld\`
@@ -383,8 +381,8 @@ describe('TemplateStringExpression', () => {
                 `);
             });
 
-            it('does not wrap a plain string with parens', () => {
-                testTranspile(`
+            it('does not wrap a plain string with parens', async () => {
+                await testTranspile(`
                     sub main()
                         print \`hello world\`
                     end sub
@@ -395,8 +393,8 @@ describe('TemplateStringExpression', () => {
                 `);
             });
 
-            it('can be concatenated with regular string', () => {
-                testTranspile(`
+            it('can be concatenated with regular string', async () => {
+                await testTranspile(`
                     sub main()
                         thing = "this" + \`that\`
                         otherThing = \`that\` + "this"
@@ -420,6 +418,6 @@ describe('TemplateStringExpression', () => {
             end function
         `);
         const ann = parser.ast.statements[0].annotations![0];
-        expect(ann.range).to.eql(util.createRange(1, 12, 3, 14));
+        expect(ann.location?.range).to.eql(util.createRange(1, 12, 3, 14));
     });
 });
diff --git a/src/parser/tests/expression/TernaryExpression.spec.ts b/src/parser/tests/expression/TernaryExpression.spec.ts
index 74fa61e7c..d7c2328d5 100644
--- a/src/parser/tests/expression/TernaryExpression.spec.ts
+++ b/src/parser/tests/expression/TernaryExpression.spec.ts
@@ -46,16 +46,16 @@ describe('ternary expressions', () => {
     });
 
     it(`supports boolean expression condition`, () => {
-        let { statements, diagnostics } = parseBs(`being = isZombie = false ? "human" : "zombie"`);
-        expect(statements[0]).to.be.instanceof(AssignmentStatement);
-        expect((statements[0] as AssignmentStatement).value).to.be.instanceof(TernaryExpression);
+        let { ast, diagnostics } = parseBs(`being = isZombie = false ? "human" : "zombie"`);
+        expect(ast.statements[0]).to.be.instanceof(AssignmentStatement);
+        expect((ast.statements[0] as AssignmentStatement).value).to.be.instanceof(TernaryExpression);
         expectZeroDiagnostics(diagnostics);
     });
 
     it(`supports function condition`, () => {
-        let { statements, diagnostics } = parseBs(`a = user.getAccount() ? "logged in" : "not logged in"`);
-        expect(statements[0]).to.be.instanceof(AssignmentStatement);
-        expect((statements[0] as AssignmentStatement).value).to.be.instanceof(TernaryExpression);
+        let { ast, diagnostics } = parseBs(`a = user.getAccount() ? "logged in" : "not logged in"`);
+        expect(ast.statements[0]).to.be.instanceof(AssignmentStatement);
+        expect((ast.statements[0] as AssignmentStatement).value).to.be.instanceof(TernaryExpression);
         expectZeroDiagnostics(diagnostics);
     });
 
@@ -100,13 +100,13 @@ describe('ternary expressions', () => {
 
     describe('in assignment', () => {
         it(`simple case`, () => {
-            let { statements, diagnostics } = parseBs(`a = true ? "human" : "zombie"`);
+            let { ast, diagnostics } = parseBs(`a = true ? "human" : "zombie"`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
 
         it(`multi line arrays case`, () => {
-            let { statements, diagnostics } = parseBs(`
+            let { ast, diagnostics } = parseBs(`
                 a = true ? [
                         "one"
                         "two"
@@ -118,27 +118,27 @@ describe('ternary expressions', () => {
                     ]
             `);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
 
         it(`single line assoc array`, () => {
-            let { statements, diagnostics } = parseBs(`a = true ? {"a":"a"} : {}`);
+            let { ast, diagnostics } = parseBs(`a = true ? {"a":"a"} : {}`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
 
         it(`multi line assoc array`, () => {
-            let { statements, diagnostics } = parseBs(`
+            let { ast, diagnostics } = parseBs(`
                 a = true ? {"a":"a"} : {
                     "b": "test"
                 }`
             );
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
 
         it(`multi line assoc array - both sides`, () => {
-            let { statements, diagnostics } = parseBs(`
+            let { ast, diagnostics } = parseBs(`
                 a = true ? {
                         "a":"a"
                         "b":"b"
@@ -147,106 +147,106 @@ describe('ternary expressions', () => {
                     }
             `);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
         });
 
         it(`in func call with array args`, () => {
-            let { statements, diagnostics } = parseBs(`m.eatBrains(a.count() > 10 ? ["a","B"] : ["c", "d"])`);
+            let { ast, diagnostics } = parseBs(`m.eatBrains(a.count() > 10 ? ["a","B"] : ["c", "d"])`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(1);
             expect(callExpression.args[0]).instanceof(TernaryExpression);
         });
 
         it(`in func call with aa args`, () => {
-            let { statements, diagnostics } = parseBs(`m.eatBrains(a.count() > 10 ? {"a":1} : {"b": ["c", "d"]})`);
+            let { ast, diagnostics } = parseBs(`m.eatBrains(a.count() > 10 ? {"a":1} : {"b": ["c", "d"]})`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(1);
             expect(callExpression.args[0]).instanceof(TernaryExpression);
         });
 
         it(`in simple func call`, () => {
-            let { statements, diagnostics } = parseBs(`m.eatBrains(a = true ? "a" : "b")`);
+            let { ast, diagnostics } = parseBs(`m.eatBrains(a = true ? "a" : "b")`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(1);
             expect(callExpression.args[0]).instanceof(TernaryExpression);
         });
 
         it(`in func call with more args`, () => {
-            let { statements, diagnostics } = parseBs(`m.eatBrains(a = true ? "a" : "b", true, 12)`);
+            let { ast, diagnostics } = parseBs(`m.eatBrains(a = true ? "a" : "b", true, 12)`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(3);
             expect(callExpression.args[0]).instanceof(TernaryExpression);
         });
 
         it(`in func call with more args, and comparing value`, () => {
-            let { statements, diagnostics } = parseBs(`m.eatBrains((a = true ? "a" : "b").count() = 3, true, 12)`);
+            let { ast, diagnostics } = parseBs(`m.eatBrains((a = true ? "a" : "b").count() = 3, true, 12)`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ExpressionStatement);
-            expect((statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
-            let callExpression = (statements[0] as ExpressionStatement).expression as CallExpression;
+            expect(ast.statements[0]).instanceof(ExpressionStatement);
+            expect((ast.statements[0] as ExpressionStatement).expression).instanceof(CallExpression);
+            let callExpression = (ast.statements[0] as ExpressionStatement).expression as CallExpression;
             expect(callExpression.args.length).to.equal(3);
         });
 
         it(`in array`, () => {
-            let { statements, diagnostics } = parseBs(`a = [a = true ? {"a":"a"} : {"b":"b"}, "c"]`);
+            let { ast, diagnostics } = parseBs(`a = [a = true ? {"a":"a"} : {"b":"b"}, "c"]`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
-            expect((statements[0] as AssignmentStatement).value).instanceof(ArrayLiteralExpression);
-            let literalExpression = (statements[0] as AssignmentStatement).value as ArrayLiteralExpression;
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
+            expect((ast.statements[0] as AssignmentStatement).value).instanceof(ArrayLiteralExpression);
+            let literalExpression = (ast.statements[0] as AssignmentStatement).value as ArrayLiteralExpression;
             expect(literalExpression.elements[0]).instanceOf(TernaryExpression);
             expect(literalExpression.elements[1]).instanceOf(LiteralExpression);
         });
 
         it(`in aa`, () => {
-            let { statements, diagnostics } = parseBs(`a = {"v1": a = true ? {"a":"a"} : {"b":"b"}, "v2": "c"}`);
+            let { ast, diagnostics } = parseBs(`a = {"v1": a = true ? {"a":"a"} : {"b":"b"}, "v2": "c"}`);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(AssignmentStatement);
-            expect((statements[0] as AssignmentStatement).value).instanceof(AALiteralExpression);
-            let literalExpression = (statements[0] as AssignmentStatement).value as AALiteralExpression;
-            expect((literalExpression.elements[0] as AAMemberExpression).keyToken.text).is.equal('"v1"');
+            expect(ast.statements[0]).instanceof(AssignmentStatement);
+            expect((ast.statements[0] as AssignmentStatement).value).instanceof(AALiteralExpression);
+            let literalExpression = (ast.statements[0] as AssignmentStatement).value as AALiteralExpression;
+            expect((literalExpression.elements[0] as AAMemberExpression).tokens.key.text).is.equal('"v1"');
             expect((literalExpression.elements[0] as any).value).instanceOf(TernaryExpression);
-            expect((literalExpression.elements[1] as AAMemberExpression).keyToken.text).is.equal('"v2"');
+            expect((literalExpression.elements[1] as AAMemberExpression).tokens.key.text).is.equal('"v2"');
             expect((literalExpression.elements[1] as any).value).instanceOf(LiteralExpression);
         });
 
         it(`in for each`, () => {
-            let { statements, diagnostics } = parseBs(
+            let { ast, diagnostics } = parseBs(
                 `for each person in isZombieMode ? zombies : humans
                     ? "person is " ; person
                 end for
             `);
             expectZeroDiagnostics(diagnostics);
-            expect(statements[0]).instanceof(ForEachStatement);
-            expect((statements[0] as ForEachStatement).target).instanceof(TernaryExpression);
+            expect(ast.statements[0]).instanceof(ForEachStatement);
+            expect((ast.statements[0] as ForEachStatement).target).instanceof(TernaryExpression);
         });
 
         it('creates TernaryExpression with missing alternate', () => {
-            const { statements } = parseBs(`
+            const { ast } = parseBs(`
                 print name = "bob" ? "human":
             `);
-            const expr = (statements[0] as PrintStatement).expressions[0];
+            const expr = (ast.statements[0] as PrintStatement).expressions[0];
             expect(expr).to.be.instanceof(TernaryExpression);
             expect(expr).property('alternate').to.be.undefined;
             expect(expr).property('consequent').not.to.be.undefined;
         });
 
         it('creates TernaryExpression with missing consequent', () => {
-            const { statements } = parseBs(`
+            const { ast } = parseBs(`
                 print name = "bob" ? : "human"
             `);
-            const expr = (statements[0] as PrintStatement).expressions[0];
+            const expr = (ast.statements[0] as PrintStatement).expressions[0];
             expect(expr).to.be.instanceof(TernaryExpression);
             expect(expr).property('consequent').to.be.undefined;
             expect(expr).property('alternate').not.to.be.undefined;
@@ -265,8 +265,8 @@ describe('ternary expressions', () => {
             program.dispose();
         });
 
-        it('transpiles top-level ternary expression', () => {
-            testTranspile(`
+        it('transpiles top-level ternary expression', async () => {
+            await testTranspile(`
                 a += true ? 1 : 2
             `, `
                 if true then
@@ -277,8 +277,8 @@ describe('ternary expressions', () => {
             `, undefined, undefined, false);
         });
 
-        it('transpiles ternary in RHS of AssignmentStatement to IfStatement', () => {
-            testTranspile(`
+        it('transpiles ternary in RHS of AssignmentStatement to IfStatement', async () => {
+            await testTranspile(`
                 sub main()
                     a = true ? 1 : 2
                 end sub
@@ -293,13 +293,15 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('transpiles ternary in RHS of incrementor AssignmentStatement to IfStatement', () => {
-            testTranspile(`
+        it('transpiles ternary in RHS of incrementor AssignmentStatement to IfStatement', async () => {
+            await testTranspile(`
                 sub main()
+                    a = 1
                     a += true ? 1 : 2
                 end sub
             `, `
                 sub main()
+                    a = 1
                     if true then
                         a += 1
                     else
@@ -309,8 +311,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('transpiles ternary in RHS of DottedSetStatement to IfStatement', () => {
-            testTranspile(`
+        it('transpiles ternary in RHS of DottedSetStatement to IfStatement', async () => {
+            await testTranspile(`
                 sub main()
                     m.a = true ? 1 : 2
                 end sub
@@ -325,8 +327,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('transpiles ternary in RHS of incrementor DottedSetStatement to IfStatement', () => {
-            testTranspile(`
+        it('transpiles ternary in RHS of incrementor DottedSetStatement to IfStatement', async () => {
+            await testTranspile(`
                 sub main()
                     m.a += true ? 1 : 2
                 end sub
@@ -341,8 +343,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('transpiles ternary in RHS of IndexedSetStatement to IfStatement', () => {
-            testTranspile(`
+        it('transpiles ternary in RHS of IndexedSetStatement to IfStatement', async () => {
+            await testTranspile(`
                 sub main()
                     m["a"] = true ? 1 : 2
                 end sub
@@ -357,8 +359,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('transpiles ternary in RHS of incrementor IndexedSetStatement to IfStatement', () => {
-            testTranspile(`
+        it('transpiles ternary in RHS of incrementor IndexedSetStatement to IfStatement', async () => {
+            await testTranspile(`
                 sub main()
                     m["a"] += true ? 1 : 2
                 end sub
@@ -373,9 +375,9 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('uses the proper prefix when aliased package is installed', () => {
+        it('uses the proper prefix when aliased package is installed', async () => {
             program.setFile('source/roku_modules/rokucommunity_bslib/bslib.brs', '');
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     result = [
@@ -392,8 +394,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('simple consequents', () => {
-            testTranspile(`
+        it('simple consequents', async () => {
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? "no user" : "logged in"
@@ -409,7 +411,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? 1 : "logged in"
@@ -425,7 +427,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? 1.2 : "logged in"
@@ -441,7 +443,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? {} : "logged in"
@@ -457,7 +459,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? [] : "logged in"
@@ -474,8 +476,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('simple alternates', () => {
-            testTranspile(`
+        it('simple alternates', async () => {
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? "logged in" : "no user"
@@ -491,7 +493,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? "logged in" : 1
@@ -507,7 +509,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? "logged in" : 1.2
@@ -523,7 +525,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? "logged in" :  []
@@ -539,7 +541,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     user = {}
                     a = user = invalid ? "logged in" :  {}
@@ -556,8 +558,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('does not capture restricted OS functions', () => {
-            testTranspile(`
+        it('does not capture restricted OS functions', async () => {
+            await testTranspile(`
                 sub main()
                     test(true ? invalid : [
                         createObject("roDeviceInfo")
@@ -601,14 +603,14 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('complex conditions do not cause scope capture', () => {
-            testTranspile(`
+        it('complex conditions do not cause scope capture', async () => {
+            await testTranspile(`
                 sub main()
-                    a = str("true") = "true" ? true : false
+                    a = str(123) = "123" ? true : false
                 end sub
             `, `
                 sub main()
-                    if str("true") = "true" then
+                    if str(123) = "123" then
                         a = true
                     else
                         a = false
@@ -616,7 +618,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     a = m.top.service.IsTrue() ? true : false
                 end sub
@@ -630,7 +632,7 @@ describe('ternary expressions', () => {
                 end sub
             `);
 
-            testTranspile(`
+            await testTranspile(`
                 sub test(param1)
                 end sub
 
@@ -651,8 +653,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('captures scope for function call conseqent', () => {
-            testTranspile(`
+        it('captures scope for function call conseqent', async () => {
+            await testTranspile(`
                 sub main()
                     zombie = {}
                     result = [
@@ -675,8 +677,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('captures scope for function call alternate', () => {
-            testTranspile(`
+        it('captures scope for function call alternate', async () => {
+            await testTranspile(`
                 sub main()
                     zombie = {}
                     result = [
@@ -699,8 +701,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('captures scope for complex consequent', () => {
-            testTranspile(`
+        it('captures scope for complex consequent', async () => {
+            await testTranspile(`
                 sub main()
                     settings = {}
                     result = [
@@ -723,8 +725,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('ignores enum variable names for scope capturing', () => {
-            testTranspile(`
+        it('ignores enum variable names for scope capturing', async () => {
+            await testTranspile(`
                 enum Direction
                     up = "up"
                     down = "down"
@@ -751,8 +753,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('ignores const variable names for scope capturing', () => {
-            testTranspile(`
+        it('ignores const variable names for scope capturing', async () => {
+            await testTranspile(`
                 enum Direction
                     up = "up"
                     down = "down"
@@ -780,8 +782,8 @@ describe('ternary expressions', () => {
             `);
         });
 
-        it('supports scope-captured outer, and simple inner', () => {
-            testTranspile(
+        it('supports scope-captured outer, and simple inner', async () => {
+            await testTranspile(
                 `
                     sub main()
                         zombie = {}
@@ -803,8 +805,8 @@ describe('ternary expressions', () => {
             );
         });
 
-        it('supports nested ternary in assignment', () => {
-            testTranspile(
+        it('supports nested ternary in assignment', async () => {
+            await testTranspile(
                 `
                     sub main()
                         result = true ? (false ? "one" : "two") : "three"
@@ -826,8 +828,8 @@ describe('ternary expressions', () => {
             );
         });
 
-        it('supports nested ternary in DottedSet', () => {
-            testTranspile(
+        it('supports nested ternary in DottedSet', async () => {
+            await testTranspile(
                 `
                     sub main()
                         m.result = true ? (false ? "one" : "two") : "three"
@@ -849,8 +851,8 @@ describe('ternary expressions', () => {
             );
         });
 
-        it('supports nested ternary in IndexedSet', () => {
-            testTranspile(
+        it('supports nested ternary in IndexedSet', async () => {
+            await testTranspile(
                 `
                     sub main()
                         m["result"] = true ? (false ? "one" : "two") : "three"
@@ -872,8 +874,8 @@ describe('ternary expressions', () => {
             );
         });
 
-        it('supports ternary in indexedSet key', () => {
-            testTranspile(
+        it('supports ternary in indexedSet key', async () => {
+            await testTranspile(
                 `
                     sub main()
                         m[m.isShiftPressed ? "a" : "b"] = 0
@@ -895,8 +897,8 @@ describe('ternary expressions', () => {
             );
         });
 
-        it('supports scope-captured outer, and simple inner', () => {
-            testTranspile(
+        it('supports scope-captured outer, and simple inner', async () => {
+            await testTranspile(
                 `
                     sub main()
                         zombie = {}
@@ -924,8 +926,8 @@ describe('ternary expressions', () => {
             );
         });
 
-        it('uses scope capture for property access', () => {
-            testTranspile(
+        it('uses scope capture for property access', async () => {
+            await testTranspile(
                 `
                     sub main()
                         person = {}
@@ -951,22 +953,22 @@ describe('ternary expressions', () => {
             );
         });
 
-        it('uses `invalid` in place of missing consequent ', () => {
-            testTranspile(
+        it('uses `invalid` in place of missing consequent ', async () => {
+            await testTranspile(
                 `print name = "bob" ? :"zombie"`,
                 `print bslib_ternary(name = "bob", invalid, "zombie")`
                 , 'none', undefined, false);
         });
 
-        it('uses `invalid` in place of missing alternate ', () => {
-            testTranspile(
+        it('uses `invalid` in place of missing alternate ', async () => {
+            await testTranspile(
                 `print name = "bob" ? "human"`,
                 `print bslib_ternary(name = "bob", "human", invalid)`
                 , 'none', undefined, false);
         });
 
-        it('uses `invalid` in place of missing alternate and consequent ', () => {
-            testTranspile(
+        it('uses `invalid` in place of missing alternate and consequent ', async () => {
+            await testTranspile(
                 `print name = "bob" ?:`,
                 `print bslib_ternary(name = "bob", invalid, invalid)`
                 , 'none', undefined, false);
diff --git a/src/parser/tests/expression/TypeExpression.spec.ts b/src/parser/tests/expression/TypeExpression.spec.ts
new file mode 100644
index 000000000..8df44f55a
--- /dev/null
+++ b/src/parser/tests/expression/TypeExpression.spec.ts
@@ -0,0 +1,127 @@
+import { assert, expect } from '../../../chai-config.spec';
+import { ParseMode } from '../../Parser';
+import { parse } from '../../Parser.spec';
+import { expectTypeToBe, expectZeroDiagnostics } from '../../../testHelpers.spec';
+import { isFunctionStatement, isReferenceType, isTypeExpression } from '../../../astUtils/reflection';
+import { SymbolTypeFlag } from '../../../SymbolTypeFlag';
+import { IntegerType } from '../../../types/IntegerType';
+import { StringType } from '../../../types/StringType';
+import { UnionType } from '../../../types/UnionType';
+
+describe('TypeExpressions', () => {
+
+    it('parses a type expressions after "as"', () => {
+        let { ast, diagnostics } = parse(`
+            sub foo(p1 as integer, p2 as string, p3 as Namespaced.SomeType)
+                print p1
+                print p2
+                print p3
+            end sub
+
+        `, ParseMode.BrighterScript);
+        expectZeroDiagnostics(diagnostics);
+        expect(ast.statements.length).to.eq(1);
+        const funcStmt = ast.statements[0];
+        if (isFunctionStatement(funcStmt)) {
+            expect(funcStmt.func.parameters.length).to.eq(3);
+            for (const param of funcStmt.func.parameters) {
+                expect(isTypeExpression(param.typeExpression)).to.be.true;
+            }
+            expectTypeToBe(funcStmt.func.parameters[0].getType({ flags: SymbolTypeFlag.typetime }), IntegerType);
+            expectTypeToBe(funcStmt.func.parameters[1].getType({ flags: SymbolTypeFlag.typetime }), StringType);
+            expect(isReferenceType(funcStmt.func.parameters[2].getType({ flags: SymbolTypeFlag.typetime }))).to.be.true;
+
+        } else {
+            assert.fail(`expected ${funcStmt} to be FunctionStatement`);
+        }
+    });
+
+    it('parses a union expression of multiple types', () => {
+        let { ast, diagnostics } = parse(`
+            sub foo(p1 as integer or Namespaced.SomeType or string)
+                print p1
+            end sub
+
+        `, ParseMode.BrighterScript);
+        expectZeroDiagnostics(diagnostics);
+        expect(ast.statements.length).to.eq(1);
+        const funcStmt = ast.statements[0];
+        if (isFunctionStatement(funcStmt)) {
+            expect(funcStmt.func.parameters.length).to.eq(1);
+            expect(isTypeExpression(funcStmt.func.parameters[0].typeExpression)).to.be.true;
+            const p1Type = funcStmt.func.parameters[0].getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(p1Type, UnionType);
+            expect(p1Type.toString()).to.eq('integer or Namespaced.SomeType or string');
+        } else {
+            assert.fail(`expected ${funcStmt} to be FunctionStatement`);
+        }
+    });
+
+    it('parses a union expression of multiple unknown types', () => {
+        let { ast, diagnostics } = parse(`
+            sub foo(p1 as Alpha or Beta or Charlie or Delta)
+                print p1
+            end sub
+
+        `, ParseMode.BrighterScript);
+        expectZeroDiagnostics(diagnostics);
+        expect(ast.statements.length).to.eq(1);
+        const funcStmt = ast.statements[0];
+        if (isFunctionStatement(funcStmt)) {
+            expect(funcStmt.func.parameters.length).to.eq(1);
+            expect(isTypeExpression(funcStmt.func.parameters[0].typeExpression)).to.be.true;
+            const p1Type = funcStmt.func.parameters[0].getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(p1Type, UnionType);
+            expect(p1Type.toString()).to.eq('Alpha or Beta or Charlie or Delta');
+        } else {
+            assert.fail(`expected ${funcStmt} to be FunctionStatement`);
+        }
+    });
+
+    it('parses a union expression of multiple unknown namespaced types', () => {
+        let { ast, diagnostics } = parse(`
+            sub foo(p1 as NS1.Alpha or NS1.NS2.Beta or NS1.NS2.NS3.Charlie or Delta)
+                print p1
+            end sub
+
+        `, ParseMode.BrighterScript);
+        expectZeroDiagnostics(diagnostics);
+        expect(ast.statements.length).to.eq(1);
+        const funcStmt = ast.statements[0];
+        if (isFunctionStatement(funcStmt)) {
+            expect(funcStmt.func.parameters.length).to.eq(1);
+            expect(isTypeExpression(funcStmt.func.parameters[0].typeExpression)).to.be.true;
+            const p1Type = funcStmt.func.parameters[0].getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(p1Type, UnionType);
+            expect(p1Type.toString()).to.eq('NS1.Alpha or NS1.NS2.Beta or NS1.NS2.NS3.Charlie or Delta');
+        } else {
+            assert.fail(`expected ${funcStmt} to be FunctionStatement`);
+        }
+    });
+
+    it('parses multiple union expressions on same line', () => {
+        let { ast, diagnostics } = parse(`
+            sub foo(p1 as Alpha or Beta or Charlie, p2 as Delta or Epsilon or Foxtrot or Gamma)
+                print p1
+            end sub
+
+        `, ParseMode.BrighterScript);
+        expectZeroDiagnostics(diagnostics);
+        expect(ast.statements.length).to.eq(1);
+        const funcStmt = ast.statements[0];
+        if (isFunctionStatement(funcStmt)) {
+            expect(funcStmt.func.parameters.length).to.eq(2);
+            expect(isTypeExpression(funcStmt.func.parameters[0].typeExpression)).to.be.true;
+            expect(isTypeExpression(funcStmt.func.parameters[1].typeExpression)).to.be.true;
+            const p1Type = funcStmt.func.parameters[0].getType({ flags: SymbolTypeFlag.typetime });
+            const p2Type = funcStmt.func.parameters[1].getType({ flags: SymbolTypeFlag.typetime });
+            expectTypeToBe(p1Type, UnionType);
+            expect(p1Type.toString()).to.eq('Alpha or Beta or Charlie');
+            expectTypeToBe(p2Type, UnionType);
+            expect(p2Type.toString()).to.eq('Delta or Epsilon or Foxtrot or Gamma');
+        } else {
+            assert.fail(`expected ${funcStmt} to be FunctionStatement`);
+        }
+    });
+
+});
diff --git a/src/parser/tests/expression/UnaryExpression.spec.ts b/src/parser/tests/expression/UnaryExpression.spec.ts
index cfa0be582..39aa387fa 100644
--- a/src/parser/tests/expression/UnaryExpression.spec.ts
+++ b/src/parser/tests/expression/UnaryExpression.spec.ts
@@ -11,8 +11,8 @@ describe('UnaryExpression', () => {
         });
     });
 
-    it('handles advanced cases', () => {
-        const { file } = testTranspile(`
+    it('handles advanced cases', async () => {
+        await testTranspile(`
             Sub Main()
                 x = 96
                 y = 56
@@ -46,6 +46,6 @@ describe('UnaryExpression', () => {
                 print x.toStr() + y.toStr() + w.toStr() + h.toStr()
             End Sub
         `);
-        expectZeroDiagnostics(file);
+        expectZeroDiagnostics(program);
     });
 });
diff --git a/src/parser/tests/statement/AssignmentOperators.spec.ts b/src/parser/tests/statement/AssignmentOperators.spec.ts
index 9c66abacc..35b84cea6 100644
--- a/src/parser/tests/statement/AssignmentOperators.spec.ts
+++ b/src/parser/tests/statement/AssignmentOperators.spec.ts
@@ -6,7 +6,7 @@ import { EOF, identifier, token } from '../Parser.spec';
 
 describe('parser assignment operators', () => {
     it('+=', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.PlusEqual),
             token(TokenKind.StringLiteral, `"lorem"`),
@@ -14,11 +14,11 @@ describe('parser assignment operators', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
     });
 
     it('-=', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.MinusEqual),
             token(TokenKind.IntegerLiteral, '1'),
@@ -26,11 +26,11 @@ describe('parser assignment operators', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
     });
 
     it('*=', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.StarEqual),
             token(TokenKind.IntegerLiteral, '3'),
@@ -38,11 +38,11 @@ describe('parser assignment operators', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
     });
 
     it('/=', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.ForwardslashEqual),
             token(TokenKind.IntegerLiteral, '4'),
@@ -50,11 +50,11 @@ describe('parser assignment operators', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
     });
 
     it('\\=', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.BackslashEqual),
             token(TokenKind.IntegerLiteral, '5'),
@@ -62,11 +62,11 @@ describe('parser assignment operators', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
     });
 
     it('<<=', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.LeftShiftEqual),
             token(TokenKind.IntegerLiteral, '6'),
@@ -74,11 +74,11 @@ describe('parser assignment operators', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
     });
 
     it('>>=', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('_'),
             token(TokenKind.RightShiftEqual),
             token(TokenKind.IntegerLiteral, '7'),
@@ -86,6 +86,6 @@ describe('parser assignment operators', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
+        expect(ast.statements).to.exist;
     });
 });
diff --git a/src/parser/tests/statement/ConstStatement.spec.ts b/src/parser/tests/statement/ConstStatement.spec.ts
index 5c0d6d1c9..b3a38b1d1 100644
--- a/src/parser/tests/statement/ConstStatement.spec.ts
+++ b/src/parser/tests/statement/ConstStatement.spec.ts
@@ -1,5 +1,5 @@
 import { expectCompletionsIncludes, expectDiagnostics, expectZeroDiagnostics, getTestGetTypedef, getTestTranspile } from '../../../testHelpers.spec';
-import { util } from '../../../util';
+import { util, standardizePath as s } from '../../../util';
 import { Program } from '../../../Program';
 import { createSandbox } from 'sinon';
 import { ParseMode, Parser } from '../../Parser';
@@ -7,9 +7,9 @@ import { expect } from '../../../chai-config.spec';
 import type { ConstStatement } from '../../Statement';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { LiteralExpression } from '../../Expression';
-import { CompletionItemKind } from 'vscode-languageserver-protocol';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { rootDir } from '../../../testHelpers.spec';
+import { CompletionItemKind } from 'vscode-languageserver';
 
 const sinon = createSandbox();
 
@@ -34,7 +34,7 @@ describe('ConstStatement', () => {
                 const = {
                     name: "Bob"
                 }
-                print const.name = {}
+                print const.name = "John"
             end sub
         `);
         program.validate();
@@ -42,7 +42,7 @@ describe('ConstStatement', () => {
     });
 
     it('supports basic structure', () => {
-        parser.parse('const API_KEY = "abc"', { mode: ParseMode.BrighterScript });
+        parser.parse('const API_KEY = "abc"', { mode: ParseMode.BrighterScript, srcPath: s`${rootDir}/source/main.bs` });
         expectZeroDiagnostics(parser);
         const statement = parser.ast.statements[0] as ConstStatement;
         expect(statement.tokens.const?.kind).to.eql(TokenKind.Const);
@@ -52,13 +52,13 @@ describe('ConstStatement', () => {
         });
         const value = statement.value as LiteralExpression;
         expect(value).to.be.instanceof(LiteralExpression);
-        expect(value.token?.text).to.eql('"abc"');
+        expect(value.tokens.value?.text).to.eql('"abc"');
         //ensure range is correct
-        expect(statement.range).to.eql(util.createRange(0, 0, 0, 21));
+        expect(statement.location?.range).to.eql(util.createRange(0, 0, 0, 21));
     });
 
-    it('produces typedef', () => {
-        testGetTypedef(`
+    it('produces typedef', async () => {
+        await testGetTypedef(`
             const API_KEY = "abc"
             const SOME_OBJ = {}
             const SOME_ARR = []
@@ -68,11 +68,20 @@ describe('ConstStatement', () => {
     it('allows const with the name `optional`', () => {
         program.setFile('source/main.bs', `
             const optional = true
+            sub main()
+                print optional
+            end sub
+        `);
+        program.validate();
+        expectZeroDiagnostics(program);
+    });
+
+    it('allows const with the name `optional` in a namespace', () => {
+        program.setFile('source/main.bs', `
             namespace alpha
                 const optional = true
             end namespace
             sub main()
-                print optional
                 print alpha.optional
             end sub
         `);
@@ -82,8 +91,8 @@ describe('ConstStatement', () => {
 
     describe('transpile', () => {
 
-        it('transpiles simple consts', () => {
-            testTranspile(`
+        it('transpiles simple consts', async () => {
+            await testTranspile(`
                 const API_KEY = "abc"
                 sub main()
                     print API_KEY
@@ -95,8 +104,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('transpiles arrays', () => {
-            testTranspile(`
+        it('transpiles arrays', async () => {
+            await testTranspile(`
                 const WORDS = [
                     "alpha"
                     "beta"
@@ -114,8 +123,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('transpiles objects', () => {
-            testTranspile(`
+        it('transpiles objects', async () => {
+            await testTranspile(`
                 const DEFAULTS = {
                     alpha: true
                     beta: true
@@ -133,8 +142,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('supports consts inside namespaces', () => {
-            testTranspile(`
+        it('supports consts inside namespaces', async () => {
+            await testTranspile(`
                 namespace network
                     const API_KEY = "abc"
                     sub get()
@@ -155,8 +164,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('supports property access on complex objects', () => {
-            testTranspile(`
+        it('supports property access on complex objects', async () => {
+            await testTranspile(`
                 const DEFAULTS = {
                     enabled: true
                 }
@@ -172,21 +181,21 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('supports calling methods on consts', () => {
-            testTranspile(`
+        it('supports calling methods on consts', async () => {
+            await testTranspile(`
                 const API_KEY ="ABC"
                 sub main()
-                    print API_KEY.toString()
+                    print API_KEY.toStr()
                 end sub
             `, `
                 sub main()
-                    print "ABC".toString()
+                    print "ABC".toStr()
                 end sub
             `);
         });
 
-        it('transpiles within += operator', () => {
-            testTranspile(`
+        it('transpiles within += operator', async () => {
+            await testTranspile(`
                 namespace constants
                     const API_KEY = "test"
                 end namespace
@@ -205,8 +214,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('transpiles nested consts that reference other consts within same namespace', () => {
-            testTranspile(`
+        it('transpiles nested consts that reference other consts within same namespace', async () => {
+            await testTranspile(`
                 namespace theming
                     const FLAG_A = "A"
                     const FLAG_B = "B"
@@ -225,17 +234,17 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('transpiles nested consts that reference other consts in different namespaces', () => {
-            testTranspile(`
-                namespace aa.bb
+        it('transpiles nested consts that reference other consts in different namespaces', async () => {
+            await testTranspile(`
+                namespace alpha.beta
                     const FLAG_A = "A"
                 end namespace
-                namespace main
+                namespace charlie
                     const FLAG_B = "B"
-                    const AD_BREAK_START = { a: aa.bb.FLAG_A, b: FLAG_B }
+                    const AD_BREAK_START = { a: alpha.beta.FLAG_A, b: FLAG_B }
                 end namespace
                 sub main()
-                    print main.AD_BREAK_START
+                    print charlie.AD_BREAK_START
                 end sub
             `, `
                 sub main()
@@ -247,14 +256,14 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('transpiles nested consts that reference other consts across files', () => {
+        it('transpiles nested consts that reference other consts across files', async () => {
             program.setFile('source/constants.bs', `
                 namespace theming
                     const PRIMARY_COLOR = "blue"
                 end namespace
                 const FLAG_B = "B"
             `);
-            testTranspile(`
+            await testTranspile(`
                 const SECONDARY_COLOR = theming.PRIMARY_COLOR
                 const AD_BREAK_START = { a: SECONDARY_COLOR, b: FLAG_B }
                 sub main()
@@ -270,8 +279,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('recursively resolves nested consts that reference other consts', () => {
-            testTranspile(`
+        it('recursively resolves nested consts that reference other consts', async () => {
+            await testTranspile(`
                 const FLAG_A = "A"
                 const FLAG_B = FLAG_A
                 const AD_BREAK_START = { a: FLAG_A, b: FLAG_B }
@@ -288,8 +297,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('handles the exact example from the issue - nested consts with namespace references', () => {
-            testTranspile(`
+        it('handles the exact example from the issue - nested consts with namespace references', async () => {
+            await testTranspile(`
                 namespace aa.bb
                     const FLAG_A = "test"
                 end namespace
@@ -308,10 +317,10 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('handles cyclical const references without infinite loop', () => {
+        it('handles cyclical const references without infinite loop', async () => {
             //the cycle is also reported via a diagnostic; this test only verifies
             //the transpile output doesn't recurse forever.
-            testTranspile(`
+            await testTranspile(`
                 const A = B
                 const B = C
                 const C = A
@@ -325,8 +334,8 @@ describe('ConstStatement', () => {
             `, 'trim', 'source/main.bs', false);
         });
 
-        it('resolves consts inside array literals', () => {
-            testTranspile(`
+        it('resolves consts inside array literals', async () => {
+            await testTranspile(`
                 const FLAG_A = "A"
                 const FLAG_B = "B"
                 const MY_ARRAY = [FLAG_A, FLAG_B, "C"]
@@ -344,8 +353,8 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('resolves enum used in const - same file', () => {
-            testTranspile(`
+        it('resolves enum used in const - same file', async () => {
+            await testTranspile(`
                 namespace Theming
                     enum Color
                         RED = "#FF0000"
@@ -363,7 +372,7 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('resolves enum used in const - cross file', () => {
+        it('resolves enum used in const - cross file', async () => {
             program.setFile('source/theming.bs', `
                 namespace Theming
                     enum Color
@@ -372,7 +381,7 @@ describe('ConstStatement', () => {
                     end enum
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 namespace Theming
                     const PRIMARY_COLOR = Theming.Color.BLUE
                 end namespace
@@ -386,7 +395,7 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('resolves const -> enum -> const -> enum chain across files', () => {
+        it('resolves const -> enum -> const -> enum chain across files', async () => {
             program.setFile('source/theming1.bs', `
                 namespace Theming
                     const BACKGROUND_COLOR = Theming.Color.BLACK
@@ -405,7 +414,7 @@ describe('ConstStatement', () => {
                     const OVERLAY_COLOR = Theming.BACKGROUND_COLOR
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 sub test()
                     aa = {
                         backgroundOverlay: {
@@ -424,7 +433,7 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('resolves enum refs inside an aa-literal const used cross-file (issue #1618)', () => {
+        it('resolves enum refs inside an aa-literal const used cross-file (issue #1618)', async () => {
             program.setFile('source/map.bs', `
                 namespace name.space
                     enum someEnum
@@ -440,7 +449,7 @@ describe('ConstStatement', () => {
                     }
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 namespace name.space
                     class someClass
                         public function someFunc(key as dynamic) as object
@@ -472,7 +481,7 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('resolves enum refs in computed keys of an aa-literal const used cross-file', () => {
+        it('resolves enum refs in computed keys of an aa-literal const used cross-file', async () => {
             program.setFile('source/map.bs', `
                 namespace name.space
                     enum someEnum
@@ -486,7 +495,7 @@ describe('ConstStatement', () => {
                     }
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 namespace name.space
                     sub useMap(key as dynamic) as object
                         return name.space.myMap[key]
@@ -502,7 +511,7 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('inlines a const aa-literal at multiple consumer call sites in the same file', () => {
+        it('inlines a const aa-literal at multiple consumer call sites in the same file', async () => {
             program.setFile('source/consts.bs', `
                 namespace ns
                     enum E
@@ -511,7 +520,7 @@ describe('ConstStatement', () => {
                     const M = { "x": ns.E.X }
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     a = ns.M
                     b = ns.M
@@ -528,7 +537,7 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('handles diamond const reference graph (one base const reached via two paths)', () => {
+        it('handles diamond const reference graph (one base const reached via two paths)', async () => {
             program.setFile('source/consts.bs', `
                 namespace ns
                     enum E
@@ -539,7 +548,7 @@ describe('ConstStatement', () => {
                     const B = { "b": ns.C }
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     print ns.A
                     print ns.B
@@ -560,7 +569,7 @@ describe('ConstStatement', () => {
             `);
         });
 
-        it('does not infinite-loop on circular const-of-aa references', function() {
+        it('does not infinite-loop on circular const-of-aa references', async function () {
             this.timeout(2000);
             program.setFile('source/consts.bs', `
                 namespace ns
@@ -572,7 +581,7 @@ describe('ConstStatement', () => {
             //transpile completes without recursing forever. The runtime semantics
             //of the cyclic ref are inherently broken, but the compile must not hang.
             //(A diagnostic is also emitted; see the dedicated cycle-diagnostic tests.)
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     print ns.A
                 end sub
@@ -594,10 +603,13 @@ describe('ConstStatement', () => {
             `);
             program.validate();
             //matches the class-hierarchy convention: one diagnostic per const in the cycle,
-            //each rotated so the diagnostic's const is at the head of the chain
+            //each rotated so the diagnostic's const is at the head of the chain. v1 also
+            //fires the bare single-symbol form during reference resolution.
             expectDiagnostics(program, [
-                DiagnosticMessages.circularReferenceDetected(['A', 'B', 'A'], 'source').message,
-                DiagnosticMessages.circularReferenceDetected(['B', 'A', 'B'], 'source').message
+                DiagnosticMessages.circularReferenceDetected('B').message,
+                DiagnosticMessages.circularReferenceDetected('B').message,
+                DiagnosticMessages.circularReferenceDetected(['A', 'B', 'A']).message,
+                DiagnosticMessages.circularReferenceDetected(['B', 'A', 'B']).message
             ]);
         });
 
@@ -610,8 +622,8 @@ describe('ConstStatement', () => {
             `);
             program.validate();
             expectDiagnostics(program, [
-                DiagnosticMessages.circularReferenceDetected(['ns.A', 'ns.B', 'ns.A'], 'source').message,
-                DiagnosticMessages.circularReferenceDetected(['ns.B', 'ns.A', 'ns.B'], 'source').message
+                DiagnosticMessages.circularReferenceDetected(['ns.A', 'ns.B', 'ns.A']).message,
+                DiagnosticMessages.circularReferenceDetected(['ns.B', 'ns.A', 'ns.B']).message
             ]);
         });
 
@@ -625,9 +637,9 @@ describe('ConstStatement', () => {
             `);
             program.validate();
             expectDiagnostics(program, [
-                DiagnosticMessages.circularReferenceDetected(['ns.A', 'ns.B', 'ns.C', 'ns.A'], 'source').message,
-                DiagnosticMessages.circularReferenceDetected(['ns.B', 'ns.C', 'ns.A', 'ns.B'], 'source').message,
-                DiagnosticMessages.circularReferenceDetected(['ns.C', 'ns.A', 'ns.B', 'ns.C'], 'source').message
+                DiagnosticMessages.circularReferenceDetected(['ns.A', 'ns.B', 'ns.C', 'ns.A']).message,
+                DiagnosticMessages.circularReferenceDetected(['ns.B', 'ns.C', 'ns.A', 'ns.B']).message,
+                DiagnosticMessages.circularReferenceDetected(['ns.C', 'ns.A', 'ns.B', 'ns.C']).message
             ]);
         });
 
@@ -647,7 +659,7 @@ describe('ConstStatement', () => {
             expectZeroDiagnostics(program);
         });
 
-        it('resolves complex multi-file const-enum chain', () => {
+        it('resolves complex multi-file const-enum chain', async () => {
             program.setFile('source/colors.bs', `
                 namespace Theme
                     enum Color
@@ -662,7 +674,7 @@ describe('ConstStatement', () => {
                     const ALT_COLOR = Theme.MAIN_COLOR
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     colors = {
                         main: Theme.ALT_COLOR
@@ -688,10 +700,10 @@ describe('ConstStatement', () => {
                     log()
                 end sub
             `);
-
+            program.validate();
+            // log(|)
             expectCompletionsIncludes(
-                // log(|)
-                program.getCompletions('source/main.bs', util.createPosition(3, 24)),
+                program.getCompletions('source/main.bs', util.createPosition(3, 34)),
                 [{
                     label: 'API_KEY',
                     kind: CompletionItemKind.Constant
@@ -699,8 +711,8 @@ describe('ConstStatement', () => {
             );
         });
 
-        it('transpiles simple const in a unary expression', () => {
-            testTranspile(`
+        it('transpiles simple const in a unary expression', async () => {
+            await testTranspile(`
                 const foo = 1
                 sub main()
                     bar = -foo
@@ -712,8 +724,8 @@ describe('ConstStatement', () => {
             `, undefined, 'source/main.bs');
         });
 
-        it('transpiles complex const in a unary expression', () => {
-            testTranspile(`
+        it('transpiles complex const in a unary expression', async () => {
+            await testTranspile(`
                 namespace some.consts
                     const foo = 1
                 end namespace
@@ -736,7 +748,7 @@ describe('ConstStatement', () => {
                     log(constants.)
                 end sub
             `);
-
+            program.validate();
             expectCompletionsIncludes(
                 // log(|)
                 program.getCompletions('source/main.bs', util.createPosition(5, 34)),
diff --git a/src/parser/tests/statement/Continue.spec.ts b/src/parser/tests/statement/Continue.spec.ts
index dee6d432d..211489a0f 100644
--- a/src/parser/tests/statement/Continue.spec.ts
+++ b/src/parser/tests/statement/Continue.spec.ts
@@ -96,8 +96,8 @@ describe('parser continue statements', () => {
         expectZeroDiagnostics(program);
     });
 
-    it('transpiles properly', () => {
-        testTranspile(`
+    it('transpiles properly', async () => {
+        await testTranspile(`
             sub main()
                 while true
                     continue while
diff --git a/src/parser/tests/statement/Declaration.spec.ts b/src/parser/tests/statement/Declaration.spec.ts
index 529879679..3a5a64cf3 100644
--- a/src/parser/tests/statement/Declaration.spec.ts
+++ b/src/parser/tests/statement/Declaration.spec.ts
@@ -4,10 +4,12 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import { expectZeroDiagnostics } from '../../../testHelpers.spec';
+import { util } from '../../../util';
 
 describe('parser variable declarations', () => {
     it('allows newlines before assignments', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Newline),
             token(TokenKind.Newline),
             token(TokenKind.Newline),
@@ -18,12 +20,12 @@ describe('parser variable declarations', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('allows newlines after assignments', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('hasNewlines'),
             token(TokenKind.Equal),
             token(TokenKind.True),
@@ -32,12 +34,12 @@ describe('parser variable declarations', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('parses literal value assignments', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('foo'),
             token(TokenKind.Equal),
             token(TokenKind.IntegerLiteral, '5'),
@@ -45,12 +47,12 @@ describe('parser variable declarations', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('parses evaluated value assignments', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('bar'),
             token(TokenKind.Equal),
             token(TokenKind.IntegerLiteral, '5'),
@@ -60,12 +62,12 @@ describe('parser variable declarations', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('parses variable aliasing', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('baz'),
             token(TokenKind.Equal),
             identifier('foo'),
@@ -73,8 +75,8 @@ describe('parser variable declarations', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('location tracking', () => {
@@ -84,36 +86,39 @@ describe('parser variable declarations', () => {
          *  +------------------
          * 0| foo = invalid
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        const parser = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'foo',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 0, 0, 3)
+                location: util.createLocation(0, 0, 0, 3)
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 4, 0, 5)
+                location: util.createLocation(0, 4, 0, 5)
             },
             {
                 kind: TokenKind.Invalid,
                 text: 'invalid',
+                leadingTrivia: [],
                 isReserved: true,
-                range: Range.create(0, 6, 0, 13)
+                location: util.createLocation(0, 6, 0, 13)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
+                leadingTrivia: [],
                 isReserved: false,
-                range: Range.create(0, 13, 0, 14)
+                location: util.createLocation(0, 13, 0, 14)
             }
         ]);
 
-        expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].range).to.deep.include(
+        expectZeroDiagnostics(parser);
+        expect(parser.ast.statements[0].location?.range).to.deep.include(
             Range.create(0, 0, 0, 13)
         );
     });
diff --git a/src/parser/tests/statement/Dim.spec.ts b/src/parser/tests/statement/Dim.spec.ts
index 2d3d4dbdb..a1eeb5936 100644
--- a/src/parser/tests/statement/Dim.spec.ts
+++ b/src/parser/tests/statement/Dim.spec.ts
@@ -2,6 +2,7 @@ import { expect } from '../../../chai-config.spec';
 import type { DimStatement } from '../../Statement';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { Parser } from '../../Parser';
+import { expectDiagnostics } from '../../../testHelpers.spec';
 
 describe('parser DimStatement', () => {
     it('parses properly', () => {
@@ -30,8 +31,8 @@ describe('parser DimStatement', () => {
         const dimStatement = (parser.ast.statements[0] as DimStatement);
         //the statement should still exist and have null identifier
         expect(dimStatement).to.exist;
-        expect(dimStatement.identifier).to.not.exist;
-        expect(parser.diagnostics.map(x => x.message)).to.include(DiagnosticMessages.expectedIdentifierAfterKeyword('dim').message);
+        expect(dimStatement.tokens.name).to.not.exist;
+        expect(parser.diagnostics.map(x => x.message)).to.include(DiagnosticMessages.expectedIdentifier('dim').message);
     });
 
     it('flags missing left bracket', () => {
@@ -39,8 +40,12 @@ describe('parser DimStatement', () => {
         const dimStatement = (parser.ast.statements[0] as DimStatement);
         //the statement should still exist and have null dimensions
         expect(dimStatement).to.exist;
-        expect(dimStatement.openingSquare).to.not.exist;
-        expect(parser.diagnostics.map(x => x.message)).to.include(DiagnosticMessages.missingLeftSquareBracketAfterDimIdentifier().message);
+        expect(dimStatement.tokens.openingSquare).to.not.exist;
+        expectDiagnostics(parser, [
+            DiagnosticMessages.missingExpressionsInDimStatement().message,
+            DiagnosticMessages.expectedToken('[').message,
+            DiagnosticMessages.unexpectedToken(']').message
+        ]);
     });
 
     it('flags missing right bracket', () => {
@@ -48,8 +53,10 @@ describe('parser DimStatement', () => {
         const dimStatement = (parser.ast.statements[0] as DimStatement);
         //the statement should still exist and have null dimensions
         expect(dimStatement).to.exist;
-        expect(dimStatement.closingSquare).to.not.exist;
-        expect(parser.diagnostics.map(x => x.message)).to.include(DiagnosticMessages.missingRightSquareBracketAfterDimIdentifier().message);
+        expect(dimStatement.tokens.closingSquare).to.not.exist;
+        expectDiagnostics(parser, [
+            DiagnosticMessages.unmatchedLeftToken('[', 'dim identifier').message
+        ]);
     });
 
     it('flags missing expression(s)', () => {
@@ -66,12 +73,12 @@ function validatePass(text: string, dimStatementIndex: number, identifierText: s
     const parser = Parser.parse(text);
     const dimStatement = (parser.ast.statements[dimStatementIndex] as DimStatement);
     expect(dimStatement).to.exist;
-    expect(dimStatement.dimToken).to.exist;
-    expect(dimStatement.identifier).to.exist;
-    expect(dimStatement.identifier!.text).to.equal(identifierText);
-    expect(dimStatement.openingSquare).to.exist;
+    expect(dimStatement.tokens.dim).to.exist;
+    expect(dimStatement.tokens.name).to.exist;
+    expect(dimStatement.tokens.name!.text).to.equal(identifierText);
+    expect(dimStatement.tokens.openingSquare).to.exist;
     expect(dimStatement.dimensions).to.exist;
     expect(dimStatement.dimensions!.length).to.equal(dimensionsCount);
-    expect(dimStatement.closingSquare).to.exist;
-    expect(dimStatement.range).to.exist;
+    expect(dimStatement.tokens.closingSquare).to.exist;
+    expect(dimStatement.location).to.exist;
 }
diff --git a/src/parser/tests/statement/Enum.spec.ts b/src/parser/tests/statement/Enum.spec.ts
index 24c5dff5f..397143939 100644
--- a/src/parser/tests/statement/Enum.spec.ts
+++ b/src/parser/tests/statement/Enum.spec.ts
@@ -1,17 +1,16 @@
 import { expect } from '../../../chai-config.spec';
 import { LiteralExpression } from '../../Expression';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
-import { expectCompletionsExcludes, expectCompletionsIncludes, expectDiagnostics, expectInstanceOf, expectZeroDiagnostics, getTestTranspile, trim } from '../../../testHelpers.spec';
+import { expectDiagnostics, expectDiagnosticsIncludes, expectInstanceOf, expectZeroDiagnostics, getTestTranspile, trim } from '../../../testHelpers.spec';
 import { ParseMode, Parser } from '../../Parser';
 import { util, standardizePath as s } from '../../../util';
 import { EnumStatement, InterfaceStatement } from '../../Statement';
 import { Program } from '../../../Program';
 import { createSandbox } from 'sinon';
 import type { BrsFile } from '../../../files/BrsFile';
-import { CancellationTokenSource, CompletionItemKind } from 'vscode-languageserver-protocol';
+import { CancellationTokenSource } from 'vscode-languageserver-protocol';
 import { WalkMode } from '../../../astUtils/visitors';
 import { isEnumStatement } from '../../../astUtils/reflection';
-import { URI } from 'vscode-uri';
 import { rootDir } from '../../../testHelpers.spec';
 
 const sinon = createSandbox();
@@ -100,7 +99,7 @@ describe('EnumStatement', () => {
             LiteralExpression,
             LiteralExpression
         ]);
-        expect(values.map(x => x.token.text)).to.eql([
+        expect(values.map(x => x.tokens.value.text)).to.eql([
             '1',
             '2',
             '3',
@@ -126,7 +125,7 @@ describe('EnumStatement', () => {
             LiteralExpression,
             LiteralExpression
         ]);
-        expect(values.map(x => x.token.text)).to.eql([
+        expect(values.map(x => x.tokens.value.text)).to.eql([
             '"u"',
             '"d"',
             '"l"',
@@ -160,8 +159,8 @@ describe('EnumStatement', () => {
         `, { mode: ParseMode.BrighterScript });
 
         expectZeroDiagnostics(parser);
-        expect(parser.statements[0]).instanceof(EnumStatement);
-        expect(parser.statements[1]).instanceof(InterfaceStatement);
+        expect(parser.ast.statements[0]).instanceof(EnumStatement);
+        expect(parser.ast.statements[1]).instanceof(InterfaceStatement);
     });
 
     it('allows enum at bottom of file', () => {
@@ -176,8 +175,8 @@ describe('EnumStatement', () => {
         `, { mode: ParseMode.BrighterScript });
 
         expectZeroDiagnostics(parser);
-        expect(parser.statements[0]).instanceof(InterfaceStatement);
-        expect(parser.statements[1]).instanceof(EnumStatement);
+        expect(parser.ast.statements[0]).instanceof(InterfaceStatement);
+        expect(parser.ast.statements[1]).instanceof(EnumStatement);
     });
 
     it('allows enum in namespace', () => {
@@ -195,7 +194,7 @@ describe('EnumStatement', () => {
         program.validate();
 
         expectZeroDiagnostics(program);
-        expect(file.parser.references.enumStatements.map(x => x.fullName)).to.eql([
+        expect(file.ast.findChildren<EnumStatement>(isEnumStatement).map(x => x.fullName)).to.eql([
             'entities.Person',
             'Direction'
         ]);
@@ -223,14 +222,37 @@ describe('EnumStatement', () => {
                 end enum
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.duplicateEnumDeclaration('source', 'Direction'),
+            expectDiagnosticsIncludes(program, [{
+                ...DiagnosticMessages.nameCollision('Enum', 'Enum', 'Direction'),
+                relatedInformation: [{
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/source/main.bs`),
+                        util.createRange(5, 21, 5, 30)
+                    ),
+                    message: 'Enum declared here'
+                },
+                {
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/source/main.bs`),
+                        util.createRange(1, 21, 1, 30)
+                    ),
+                    message: `In scope 'source'`
+                }]
+            }, {
+                ...DiagnosticMessages.nameCollision('Enum', 'Enum', 'Direction'),
                 relatedInformation: [{
-                    location: util.createLocation(
-                        URI.file(s`${rootDir}/source/main.bs`).toString(),
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/source/main.bs`),
                         util.createRange(1, 21, 1, 30)
                     ),
                     message: 'Enum declared here'
+                },
+                {
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/source/main.bs`),
+                        util.createRange(5, 21, 5, 30)
+                    ),
+                    message: `In scope 'source'`
                 }]
             }]);
         });
@@ -247,14 +269,21 @@ describe('EnumStatement', () => {
                 end enum
             `);
             program.validate();
-            expectDiagnostics(program, [{
-                ...DiagnosticMessages.duplicateEnumDeclaration('source', 'Direction'),
+            expectDiagnosticsIncludes(program, [{
+                ...DiagnosticMessages.nameCollision('Enum', 'Enum', 'Direction'),
                 relatedInformation: [{
-                    location: util.createLocation(
-                        URI.file(s`${rootDir}/source/lib.bs`).toString(),
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/source/lib.bs`),
                         util.createRange(1, 21, 1, 30)
                     ),
                     message: 'Enum declared here'
+                },
+                {
+                    location: util.createLocationFromRange(
+                        util.pathToUri(s`${rootDir}/source/main.bs`),
+                        util.createRange(1, 21, 1, 30)
+                    ),
+                    message: `In scope 'source'`
                 }]
             }]);
         });
@@ -290,7 +319,7 @@ describe('EnumStatement', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.duplicateIdentifier('name'),
-                range: util.createRange(3, 20, 3, 24)
+                location: { range: util.createRange(3, 20, 3, 24) }
             }]);
         });
 
@@ -304,7 +333,7 @@ describe('EnumStatement', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.enumValueMustBeType('integer'),
-                range: util.createRange(3, 24, 3, 27)
+                location: { range: util.createRange(3, 24, 3, 27) }
             }]);
         });
 
@@ -318,7 +347,7 @@ describe('EnumStatement', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.enumValueMustBeType('string'),
-                range: util.createRange(3, 24, 3, 25)
+                location: { range: util.createRange(3, 24, 3, 25) }
             }]);
         });
 
@@ -332,7 +361,7 @@ describe('EnumStatement', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.enumValueIsRequired('string'),
-                range: util.createRange(3, 20, 3, 21)
+                location: { range: util.createRange(3, 20, 3, 21) }
             }]);
         });
 
@@ -367,7 +396,7 @@ describe('EnumStatement', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.enumValueMustBeType('integer'),
-                range: util.createRange(2, 33, 2, 35)
+                location: { range: util.createRange(2, 33, 2, 35) }
             }]);
         });
 
@@ -392,7 +421,7 @@ describe('EnumStatement', () => {
             program.validate();
             expectDiagnostics(program, [{
                 ...DiagnosticMessages.enumValueIsRequired('string'),
-                range: util.createRange(2, 20, 2, 21)
+                location: { range: util.createRange(2, 20, 2, 21) }
             }]);
         });
 
@@ -410,11 +439,11 @@ describe('EnumStatement', () => {
             `);
             program.validate();
             expectDiagnostics(program, [{
-                ...DiagnosticMessages.unknownEnumValue('DOWN', 'Direction'),
-                range: util.createRange(7, 36, 7, 40)
+                ...DiagnosticMessages.cannotFindName('DOWN', 'Direction.DOWN', 'Direction', 'enum'),
+                location: { range: util.createRange(7, 36, 7, 40) }
             }, {
-                ...DiagnosticMessages.unknownEnumValue('down', 'Direction'),
-                range: util.createRange(8, 36, 8, 40)
+                ...DiagnosticMessages.cannotFindName('down', 'Direction.down', 'Direction', 'enum'),
+                location: { range: util.createRange(8, 36, 8, 40) }
             }]);
         });
 
@@ -434,11 +463,11 @@ describe('EnumStatement', () => {
             `);
             program.validate();
             expectDiagnostics(program, [{
-                ...DiagnosticMessages.unknownEnumValue('DOWN', 'Enums.Direction'),
-                range: util.createRange(2, 42, 2, 46)
+                ...DiagnosticMessages.cannotFindName('DOWN', 'Enums.Direction.DOWN', 'Enums.Direction', 'enum'),
+                location: { range: util.createRange(2, 42, 2, 46) }
             }, {
-                ...DiagnosticMessages.unknownEnumValue('down', 'Enums.Direction'),
-                range: util.createRange(3, 42, 3, 46)
+                ...DiagnosticMessages.cannotFindName('down', 'Enums.Direction.down', 'Enums.Direction', 'enum'),
+                location: { range: util.createRange(3, 42, 3, 46) }
             }]);
         });
     });
@@ -519,26 +548,8 @@ describe('EnumStatement', () => {
     });
 
     describe('transpile', () => {
-        it('supports non-namespaced enum from within a namespace', () => {
-            program.options.autoImportComponentScript = true;
-            testTranspile(`
-                namespace alpha
-                    sub test()
-                        print Direction.up
-                    end sub
-                end namespace
-                enum Direction
-                    up = "up"
-                end enum
-            `, `
-                sub alpha_test()
-                    print "up"
-                end sub
-            `);
-        });
-
-        it('transpiles negative number', () => {
-            testTranspile(`
+        it('transpiles negative number', async () => {
+            await testTranspile(`
                 sub main()
                     print Direction.up
                 end sub
@@ -552,8 +563,8 @@ describe('EnumStatement', () => {
             `, undefined, undefined, false);
         });
 
-        it('includes original value when no value could be computed', () => {
-            testTranspile(`
+        it('includes original value when no value could be computed', async () => {
+            await testTranspile(`
                 sub main()
                     print Direction.up
                 end sub
@@ -566,8 +577,8 @@ describe('EnumStatement', () => {
                 end sub
             `, undefined, undefined, false);
         });
-        it('writes all literal values as-is (even if there are errors)', () => {
-            testTranspile(`
+        it('writes all literal values as-is (even if there are errors)', async () => {
+            await testTranspile(`
                 sub main()
                     print Direction.up
                     print Direction.down
@@ -593,8 +604,8 @@ describe('EnumStatement', () => {
             `, 'trim', undefined, false);
         });
 
-        it('supports default-as-integer', () => {
-            testTranspile(`
+        it('supports default-as-integer', async () => {
+            await testTranspile(`
                 enum Direction
                     up
                     down
@@ -611,8 +622,8 @@ describe('EnumStatement', () => {
             `);
         });
 
-        it('supports string enums', () => {
-            testTranspile(`
+        it('supports string enums', async () => {
+            await testTranspile(`
                 enum Direction
                     up = "up"
                     down = "down"
@@ -637,7 +648,7 @@ describe('EnumStatement', () => {
                         val2
                     end enum
 
-                    function foo() as integer
+                    function foo() as MyEnum
                         return MyEnum.val1
                     end function
                 end namespace
@@ -646,7 +657,7 @@ describe('EnumStatement', () => {
             expectZeroDiagnostics(program);
         });
 
-        it('replaces enum values from separate file with literals', () => {
+        it('replaces enum values from separate file with literals', async () => {
             program.setFile('source/enum.bs', `
                 enum CharacterType
                     Human = "Human"
@@ -659,7 +670,7 @@ describe('EnumStatement', () => {
                     end enum
                 end namespace
             `);
-            testTranspile(`
+            await testTranspile(`
                 sub test()
                     print CharacterType.Human
                     print CharacterType.Zombie
@@ -676,8 +687,8 @@ describe('EnumStatement', () => {
             `);
         });
 
-        it('replaces enums in if statements', () => {
-            testTranspile(`
+        it('replaces enums in if statements', async () => {
+            await testTranspile(`
                 enum CharacterType
                     zombie = "zombie"
                 end enum
@@ -694,411 +705,161 @@ describe('EnumStatement', () => {
                 end sub
             `);
         });
-    });
 
-    describe('completions', () => {
-        it('does not crash when completing enum members with unsupported values', () => {
-            program.setFile('source/main.bs', `
-                sub Main()
-                    direction.obj
+        it('handles both sides of a logical expression', async () => {
+            await testTranspile(`
+                sub main()
+                    dir = m.direction = Direction.up
+                    dir = Direction.up = m.direction
                 end sub
                 enum Direction
-                    up
-                    down
-                    obj = {}
+                    up = "up"
+                    down = "down"
                 end enum
+            `, `
+                sub main()
+                    dir = m.direction = "up"
+                    dir = "up" = m.direction
+                end sub
             `);
-            //      direction.|obj
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 30)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'obj',
-                kind: CompletionItemKind.EnumMember
-            }]);
         });
 
-        it('gets enum statement completions from global enum', () => {
-            program.setFile('source/main.bs', `
-                sub Main()
-                    direction.down
+        it('handles when found in boolean expressions', async () => {
+            await testTranspile(`
+                sub main()
+                    result = Direction.up = "up" or Direction.down = "down" and Direction.up = Direction.down
                 end sub
                 enum Direction
-                    up
-                    down
+                    up = "up"
+                    down = "down"
                 end enum
+            `, `
+                sub main()
+                    result = "up" = "up" or "down" = "down" and "up" = "down"
+                end sub
             `);
-            //      |direction.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 20)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
-            //      dire|ction.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 24)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
-            //      direction|.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 29)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
         });
 
-        it('gets enum member completions from global enum', () => {
-            program.setFile('source/main.bs', `
-                sub Main()
-                    direction.down
+        it('replaces enum values in if statements', async () => {
+            await testTranspile(`
+                sub main()
+                    if m.direction = Direction.up
+                        print Direction.up
+                    end if
                 end sub
                 enum Direction
-                    up
-                    down
+                    up = "up"
+                    down = "down"
                 end enum
+            `, `
+                sub main()
+                    if m.direction = "up"
+                        print "up"
+                    end if
+                end sub
             `);
-            //      direction.|down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 30)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }]);
-            //      direction.do|wn
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 32)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }]);
-            //      direction.down|
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 34)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }]);
         });
 
-        it('gets enum statement completions from namespaced enum', () => {
-            program.setFile('source/main.bs', `
-                sub Main()
-                    enums.direction.down
+        it('replaces enum values in function default parameter value expressions', async () => {
+            await testTranspile(`
+                sub speak(dir = Direction.up)
+                end sub
+                enum Direction
+                    up = "up"
+                end enum
+            `, `
+                sub speak(dir = "up")
                 end sub
-                namespace enums
-                    enum Direction
-                        up
-                        down
-                    end enum
-                end namespace
             `);
-            //      enums.|direction.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 26)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
-            //      enums.dire|ction.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 30)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
-            //      enums.direction|.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 35)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
         });
 
-        it('gets enum member completions from namespaced enum', () => {
-            program.setFile('source/main.bs', `
-                sub Main()
-                    enums.direction.down
+        it('replaces enum values in for loops', async () => {
+            await testTranspile(`
+                sub main()
+                    for i = Loop.start to Loop.end step Loop.step
+                    end for
+                end sub
+                enum Loop
+                    start = 0
+                    end = 10
+                    step = 1
+                end enum
+            `, `
+                sub main()
+                    for i = 0 to 10 step 1
+                    end for
                 end sub
-                namespace enums
-                    enum Direction
-                        up
-                        down
-                    end enum
-                end namespace
             `);
-            program.validate();
-            //      enums.direction.|down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 36)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }]);
-            //      enums.direction.do|wn
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 38)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }]);
-            //      enums.direction.down|
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(2, 40)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }]);
         });
 
-        it('excludes enum member completions from namespace enum', () => {
-            program.setFile('source/main.bs', `
-                sub Main()
-                    direction.ba
+        it('transpiles enum values when used in complex expressions', async () => {
+            await testTranspile(`
+                sub main()
+                    print Direction.up.toStr()
+                end sub
+                enum Direction
+                    up = "up"
+                    down = "down"
+                end enum
+            `, `
+                sub main()
+                    print "up".toStr()
                 end sub
-                namespace enums
-                    enum Direction
-                        up
-                        down
-                    end enum
-                end namespace
             `);
-            program.validate();
-            //should NOT find Direction because it's not directly available at the top level (you need to go through `enums.` to get at it)
-            //      dire|ction.down
-            expectCompletionsExcludes(program.getCompletions('source/main.bs', util.createPosition(2, 24)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
         });
 
-        it('infers namespace for enum statement completions', () => {
-            program.setFile('source/main.bs', `
-                namespace enums
-                    sub Main()
-                        direction.down
-                    end sub
-                    enum Direction
-                        up
-                        down
+        it('works when enum is in a namespace', async () => {
+            program.setFile('components/Colors.bs', `
+                namespace Colors
+                    enum Primary
+                        red = "#FF0000"
                     end enum
                 end namespace
-                enum Logic
-                    yes
-                    no
-                end enum
             `);
-            //          dire|ction.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(3, 33)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }, {
-                label: 'Logic',
-                kind: CompletionItemKind.Enum
-            }]);
-        });
 
-        it('infers namespace for enum member completions', () => {
-            program.setFile('source/main.bs', `
-                namespace enums
-                    sub Main()
-                        direction.down
-                    end sub
-                    enum Direction
-                        up
-                        down
-                    end enum
-                end namespace
+            program.setFile('components/Button.xml', `
+                <component name="Button" extends="Group">
+                    <script type="text/brightscript" uri="pkg:/components/Button.bs" />
+                </component>
             `);
-            //          direction.do|wn
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(3, 36)), [{
-                label: 'up',
-                kind: CompletionItemKind.EnumMember
-            }, {
-                label: 'down',
-                kind: CompletionItemKind.EnumMember
-            }]);
-        });
+            const file = program.setFile('components/Button.bs', `
+                import "Colors.bs"
 
-        it('supports explicit namespace for enum statement completions', () => {
-            program.setFile('source/main.bs', `
-                namespace enums
-                    sub Main()
-                        enums.direction.down
+                namespace alpha
+                    sub testIt()
+                        print Colors.Primary.red
+                        aa = {
+                            value: Colors.Primary.red
+                        }
                     end sub
-                    enum Direction
-                        up
-                        down
-                    end enum
                 end namespace
-            `);
-            //          enums.dire|ction.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(3, 38)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
-        });
 
-        it('supports explicit namespace for enum statement completions', () => {
-            program.setFile('source/main.bs', `
-                namespace logger
-                    sub log()
-                        enums.direction.down
+                namespace Colors
+                    sub testIt()
+                        print Primary.red
                     end sub
                 end namespace
-                namespace enums
-                    enum Direction
-                        up
-                        down
-                    end enum
-                end namespace
             `);
-            //          enums.dire|ction.down
-            expectCompletionsIncludes(program.getCompletions('source/main.bs', util.createPosition(3, 38)), [{
-                label: 'Direction',
-                kind: CompletionItemKind.Enum
-            }]);
+            program.validate();
+            expectZeroDiagnostics(program);
+            await testTranspile(file, `
+                'import "Colors.bs"
+                sub alpha_testIt()
+                    print "#FF0000"
+                    aa = {
+                        value: "#FF0000"
+                    }
+                end sub
+                sub Colors_testIt()
+                    print "#FF0000"
+                end sub
+            `);
         });
     });
 
-    it('transpiles simple enum in a unary expression', () => {
-        testTranspile(`
-            enum SomeEnum
-                foo = 1
-            end enum
-            sub main()
-                bar = -SomeEnum.foo
-            end sub
-        `, `
-            sub main()
-                bar = - 1
-            end sub
-        `, undefined, 'source/main.bs');
-    });
-
-    it('transpiles comples enum in a unary expression', () => {
-        testTranspile(`
-            namespace name.space
-                enum SomeEnum
-                    foo = 1
-                end enum
-            end namespace
-            sub main()
-                bar = -name.space.SomeEnum.foo
-            end sub
-        `, `
-            sub main()
-                bar = - 1
-            end sub
-        `, undefined, 'source/main.bs');
-    });
-
-    it('handles both sides of a logical expression', () => {
-        testTranspile(`
-            sub main()
-                dir = m.direction = Direction.up
-                dir = Direction.up = m.direction
-            end sub
-            enum Direction
-                up = "up"
-                down = "down"
-            end enum
-        `, `
-            sub main()
-                dir = m.direction = "up"
-                dir = "up" = m.direction
-            end sub
-        `);
-    });
-
-    it('handles when found in boolean expressions', () => {
-        testTranspile(`
-            sub main()
-                result = Direction.up = "up" or Direction.down = "down" and Direction.up = Direction.down
-            end sub
-            enum Direction
-                up = "up"
-                down = "down"
-            end enum
-        `, `
-            sub main()
-                result = "up" = "up" or "down" = "down" and "up" = "down"
-            end sub
-        `);
-    });
-
-    it('replaces enum values in if statements', () => {
-        testTranspile(`
-            sub main()
-                if m.direction = Direction.up
-                    print Direction.up
-                end if
-            end sub
-            enum Direction
-                up = "up"
-                down = "down"
-            end enum
-        `, `
-            sub main()
-                if m.direction = "up"
-                    print "up"
-                end if
-            end sub
-        `);
-    });
-
-    it('replaces enum values in function default parameter value expressions', () => {
-        testTranspile(`
-            sub speak(dir = Direction.up)
-            end sub
-            enum Direction
-                up = "up"
-            end enum
-        `, `
-            sub speak(dir = "up")
-            end sub
-        `);
-    });
-
-    it('replaces enum values in for loops', () => {
-        testTranspile(`
-            sub main()
-                for i = Loop.start to Loop.end step Loop.step
-                end for
-            end sub
-            enum Loop
-                start = 0
-                end = 10
-                step = 1
-            end enum
-        `, `
-            sub main()
-                for i = 0 to 10 step 1
-                end for
-            end sub
-        `);
-    });
-
-    it('transpiles enum values when used in complex expressions', () => {
-        testTranspile(`
-            sub main()
-                print Direction.up.toStr()
-            end sub
-            enum Direction
-                up = "up"
-                down = "down"
-            end enum
-        `, `
-            sub main()
-                print "up".toStr()
-            end sub
-        `);
-    });
-
     describe('computed AA keys', () => {
-        it('transpiles enum member as AA key', () => {
-            testTranspile(`
+        it('transpiles enum member as AA key', async () => {
+            await testTranspile(`
                 enum MyKey
                     first = "key1"
                 end enum
@@ -1133,8 +894,8 @@ describe('EnumStatement', () => {
             ]);
         });
 
-        it('transpiles const as AA key', () => {
-            testTranspile(`
+        it('transpiles const as AA key', async () => {
+            await testTranspile(`
                 const MY_KEY = "myKey"
                 sub main()
                     myAA = {
@@ -1150,8 +911,8 @@ describe('EnumStatement', () => {
             `);
         });
 
-        it('transpiles namespaced enum member as AA key', () => {
-            testTranspile(`
+        it('transpiles namespaced enum member as AA key', async () => {
+            await testTranspile(`
                 namespace Keys
                     enum MyKey
                         first = "key1"
@@ -1171,8 +932,8 @@ describe('EnumStatement', () => {
             `);
         });
 
-        it('transpiles literal string as AA key', () => {
-            testTranspile(`
+        it('transpiles literal string as AA key', async () => {
+            await testTranspile(`
                 sub main()
                     myAA = {
                         ["my-hyphenated-key"]: "value1"
@@ -1187,8 +948,8 @@ describe('EnumStatement', () => {
             `);
         });
 
-        it('transpiles multiple computed keys in one AA', () => {
-            testTranspile(`
+        it('transpiles multiple computed keys in one AA', async () => {
+            await testTranspile(`
                 enum Keys
                     a = "keyA"
                     b = "keyB"
@@ -1209,8 +970,8 @@ describe('EnumStatement', () => {
             `);
         });
 
-        it('transpiles mixed computed and normal keys', () => {
-            testTranspile(`
+        it('transpiles mixed computed and normal keys', async () => {
+            await testTranspile(`
                 enum Keys
                     first = "key1"
                 end enum
@@ -1230,8 +991,8 @@ describe('EnumStatement', () => {
             `);
         });
 
-        it('transpiles const from enum', () => {
-            testTranspile(`
+        it('transpiles const from enum', async () => {
+            await testTranspile(`
                 enum Keys
                     first = "key1"
                 end enum
@@ -1335,9 +1096,14 @@ describe('EnumStatement', () => {
                 end sub
             `);
             program.validate();
+            //v1 also fires the bare single-symbol "Circular reference detected 'B'" form
+            //during reference resolution (in addition to the rotated chain diagnostics).
             expectDiagnostics(program, [
-                DiagnosticMessages.circularReferenceDetected(['A', 'B', 'A'], 'source').message,
-                DiagnosticMessages.circularReferenceDetected(['B', 'A', 'B'], 'source').message,
+                DiagnosticMessages.circularReferenceDetected('B').message,
+                DiagnosticMessages.circularReferenceDetected('B').message,
+                DiagnosticMessages.circularReferenceDetected('B').message,
+                DiagnosticMessages.circularReferenceDetected(['A', 'B', 'A']).message,
+                DiagnosticMessages.circularReferenceDetected(['B', 'A', 'B']).message,
                 DiagnosticMessages.computedAAKeyMustBeStringExpression()
             ]);
         });
diff --git a/src/parser/tests/statement/For.spec.ts b/src/parser/tests/statement/For.spec.ts
index 2db413589..404957763 100644
--- a/src/parser/tests/statement/For.spec.ts
+++ b/src/parser/tests/statement/For.spec.ts
@@ -17,8 +17,8 @@ describe('ForStatement', () => {
         program.dispose();
     });
 
-    it('transpiles a simple loop', () => {
-        testTranspile(`
+    it('transpiles a simple loop', async () => {
+        await testTranspile(`
             sub main()
                 for i = 0 to 10
                     print i
@@ -27,8 +27,8 @@ describe('ForStatement', () => {
         `);
     });
 
-    it('transpiles with a for loop with a step value', () => {
-        testTranspile(`
+    it('transpiles with a for loop with a step value', async () => {
+        await testTranspile(`
             sub main()
                 for i = 0 to 10 step 2
                     print i
@@ -37,8 +37,8 @@ describe('ForStatement', () => {
         `);
     });
 
-    it('adds newline to end of empty loop declaration', () => {
-        testTranspile(`
+    it('adds newline to end of empty loop declaration', async () => {
+        await testTranspile(`
             sub main()
                 for i = 0 to 10
                 end for
diff --git a/src/parser/tests/statement/ForEach.spec.ts b/src/parser/tests/statement/ForEach.spec.ts
index b1d42412c..fd06f0f68 100644
--- a/src/parser/tests/statement/ForEach.spec.ts
+++ b/src/parser/tests/statement/ForEach.spec.ts
@@ -18,8 +18,8 @@ describe('ForEachStatement', () => {
         program.dispose();
     });
 
-    it('transpiles a simple loop', () => {
-        testTranspile(`
+    it('transpiles a simple loop', async () => {
+        await testTranspile(`
             sub doLoop(data)
                 for each i in data
                     print i
@@ -28,8 +28,8 @@ describe('ForEachStatement', () => {
         `);
     });
 
-    it('adds newline to end of empty loop declaration', () => {
-        testTranspile(`
+    it('adds newline to end of empty loop declaration', async () => {
+        await testTranspile(`
             sub doLoop(data)
                 for each i in data
                 end for
diff --git a/src/parser/tests/statement/Function.spec.ts b/src/parser/tests/statement/Function.spec.ts
index e6dab558b..8e831f33c 100644
--- a/src/parser/tests/statement/Function.spec.ts
+++ b/src/parser/tests/statement/Function.spec.ts
@@ -5,6 +5,7 @@ import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { isFunctionStatement } from '../../../astUtils/reflection';
 import type { FunctionStatement } from '../../Statement';
+import { expectZeroDiagnostics } from '../../../testHelpers.spec';
 
 describe('parser', () => {
 
@@ -28,14 +29,14 @@ describe('parser', () => {
 
                 end sub
             `);
-            let { statements, diagnostics } = Parser.parse(tokens);
+            let { ast, diagnostics } = Parser.parse(tokens);
             expect(diagnostics).to.be.lengthOf(1);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses minimal empty function declarations', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'function'),
                 identifier('foo'),
                 token(TokenKind.LeftParen, '('),
@@ -46,12 +47,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses non-empty function declarations', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'function'),
                 identifier('foo'),
                 token(TokenKind.LeftParen, '('),
@@ -65,12 +66,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses functions with implicit-dynamic arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'function'),
                 identifier('add2'),
                 token(TokenKind.LeftParen, '('),
@@ -84,12 +85,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses functions with typed arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'function'),
                 identifier('repeat'),
                 token(TokenKind.LeftParen, '('),
@@ -107,12 +108,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses functions with default argument expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'function'),
                 identifier('add'),
                 token(TokenKind.LeftParen, '('),
@@ -140,12 +141,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses functions with typed arguments and default expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'function'),
                 identifier('add'),
                 token(TokenKind.LeftParen, '('),
@@ -172,12 +173,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses return types', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'function'),
                 identifier('foo'),
                 token(TokenKind.LeftParen, '('),
@@ -190,7 +191,7 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics[0]?.message).to.not.exist;
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
@@ -212,9 +213,9 @@ describe('parser', () => {
                     return 1
                 end function
             `);
-            const { statements, diagnostics } = Parser.parse(tokens);
+            const { ast, diagnostics } = Parser.parse(tokens);
             expect(diagnostics).to.be.lengthOf(4);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
     });
@@ -230,14 +231,14 @@ describe('parser', () => {
 
                 end sub
             `);
-            let { statements, diagnostics } = Parser.parse(tokens);
+            let { ast, diagnostics } = Parser.parse(tokens);
             expect(diagnostics).to.be.lengthOf(1);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses minimal sub declarations', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Sub, 'sub'),
                 identifier('bar'),
                 token(TokenKind.LeftParen, '('),
@@ -248,12 +249,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses non-empty sub declarations', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Sub, 'sub'),
                 identifier('foo'),
                 token(TokenKind.LeftParen, '('),
@@ -267,12 +268,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses subs with implicit-dynamic arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'sub'),
                 identifier('add2'),
                 token(TokenKind.LeftParen, '('),
@@ -286,12 +287,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses subs with typed arguments', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Function, 'sub'),
                 identifier('repeat'),
                 token(TokenKind.LeftParen, '('),
@@ -309,12 +310,12 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics[0]?.message).not.to.exist;
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
 
         });
 
         it('parses subs with default argument expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Sub, 'sub'),
                 identifier('add'),
                 token(TokenKind.LeftParen, '('),
@@ -342,11 +343,11 @@ describe('parser', () => {
             ]);
 
             expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
         });
 
         it('parses subs with typed arguments and default expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 token(TokenKind.Sub, 'sub'),
                 identifier('add'),
                 token(TokenKind.LeftParen, '('),
@@ -372,8 +373,8 @@ describe('parser', () => {
                 EOF
             ]);
 
-            expect(diagnostics).to.be.lengthOf(0);
-            expect(statements).to.length.greaterThan(0);
+            expectZeroDiagnostics(diagnostics);
+            expect(ast.statements).to.length.greaterThan(0);
         });
 
         it('does not allow type designators at end of name', () => {
@@ -390,9 +391,9 @@ describe('parser', () => {
                 sub DoubleSub#()
                 end sub
             `);
-            const { statements, diagnostics } = Parser.parse(tokens);
+            const { ast, diagnostics } = Parser.parse(tokens);
             expect(diagnostics).to.be.lengthOf(4);
-            expect(statements).to.length.greaterThan(0);
+            expect(ast.statements).to.length.greaterThan(0);
         });
     });
 });
diff --git a/src/parser/tests/statement/Increment.spec.ts b/src/parser/tests/statement/Increment.spec.ts
index f4d80222b..6ff119e19 100644
--- a/src/parser/tests/statement/Increment.spec.ts
+++ b/src/parser/tests/statement/Increment.spec.ts
@@ -5,22 +5,24 @@ import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
+import util from '../../../util';
+import { expectDiagnostics } from '../../../testHelpers.spec';
 
 describe('parser postfix unary expressions', () => {
     it('parses postfix \'++\' for variables', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('foo'),
             token(TokenKind.PlusPlus, '++'),
             EOF
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('parses postfix \'--\' for dotted get expressions', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('obj'),
             token(TokenKind.Dot, '.'),
             identifier('property'),
@@ -29,12 +31,12 @@ describe('parser postfix unary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('parses postfix \'++\' for indexed get expressions', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             identifier('obj'),
             token(TokenKind.LeftSquareBracket, '['),
             identifier('property'),
@@ -44,8 +46,8 @@ describe('parser postfix unary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('disallows consecutive postfix operators', () => {
@@ -55,11 +57,7 @@ describe('parser postfix unary expressions', () => {
             token(TokenKind.PlusPlus, '++'),
             EOF
         ]);
-
-        expect(diagnostics).to.be.lengthOf(1);
-        expect(diagnostics[0]).deep.include({
-            message: 'Consecutive increment/decrement operators are not allowed'
-        });
+        expectDiagnostics(diagnostics, [DiagnosticMessages.unexpectedOperator().code]);
     });
 
     it('disallows postfix \'--\' for function call results', () => {
@@ -73,12 +71,12 @@ describe('parser postfix unary expressions', () => {
 
         expect(diagnostics).to.be.lengthOf(1);
         expect(diagnostics[0]).to.deep.include({
-            ...DiagnosticMessages.incrementDecrementOperatorsAreNotAllowedAsResultOfFunctionCall()
+            ...DiagnosticMessages.unexpectedOperator()
         });
     });
 
     it('allows \'++\' at the end of a function', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Sub, 'sub'),
             identifier('foo'),
             token(TokenKind.LeftParen, '('),
@@ -92,8 +90,8 @@ describe('parser postfix unary expressions', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('location tracking', () => {
@@ -103,30 +101,33 @@ describe('parser postfix unary expressions', () => {
          *  +--------------
          * 0| someNumber++
          */
-        let { statements, diagnostics } = Parser.parse(<any>[
+        let { ast, diagnostics } = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'someNumber',
                 isReserved: false,
-                range: Range.create(0, 0, 0, 10)
+                leadingTrivia: [],
+                location: util.createLocation(0, 0, 0, 10)
             },
             {
                 kind: TokenKind.PlusPlus,
                 text: '++',
                 isReserved: false,
-                range: Range.create(0, 10, 0, 12)
+                leadingTrivia: [],
+                location: util.createLocation(0, 10, 0, 12)
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
                 isReserved: false,
-                range: Range.create(0, 12, 0, 13)
+                leadingTrivia: [],
+                location: util.createLocation(0, 12, 0, 13)
             }
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].range).deep.include(
+        expect(ast.statements).to.be.lengthOf(1);
+        expect(ast.statements[0].location?.range).deep.include(
             Range.create(0, 0, 0, 12)
         );
     });
diff --git a/src/parser/tests/statement/InterfaceStatement.spec.ts b/src/parser/tests/statement/InterfaceStatement.spec.ts
index 7aae48e90..d50ea62c1 100644
--- a/src/parser/tests/statement/InterfaceStatement.spec.ts
+++ b/src/parser/tests/statement/InterfaceStatement.spec.ts
@@ -12,8 +12,8 @@ describe('InterfaceStatement', () => {
         });
     });
 
-    it('allows strange keywords as property names', () => {
-        testGetTypedef(`
+    it('allows strange keywords as property names', async () => {
+        await testGetTypedef(`
             interface Person
                 public as string
                 protected as string
@@ -26,8 +26,8 @@ describe('InterfaceStatement', () => {
         `, undefined, undefined, undefined, true);
     });
 
-    it('allows strange keywords as method names', () => {
-        testGetTypedef(`
+    it('allows strange keywords as method names', async () => {
+        await testGetTypedef(`
             interface Person
                 sub public() as string
                 sub protected() as string
@@ -40,8 +40,8 @@ describe('InterfaceStatement', () => {
         `, undefined, undefined, undefined, true);
     });
 
-    it('includes comments', () => {
-        testGetTypedef(`
+    it('includes comments', async () => {
+        await testGetTypedef(`
             interface Person
                 'some comment
                 sub someFunc() as string
@@ -49,8 +49,8 @@ describe('InterfaceStatement', () => {
         `, undefined, undefined, undefined, true);
     });
 
-    it('includes annotations', () => {
-        testGetTypedef(`
+    it('includes annotations', async () => {
+        await testGetTypedef(`
             @IFace
             interface Person
                 @Method
@@ -74,8 +74,8 @@ describe('InterfaceStatement', () => {
         expectZeroDiagnostics(program);
     });
 
-    it('allows comments after an interface', () => {
-        testTranspile(`
+    it('allows comments after an interface', async () => {
+        await testTranspile(`
             interface Iface1
                 name as dynamic
             end interface
@@ -88,8 +88,8 @@ describe('InterfaceStatement', () => {
         `);
     });
 
-    it('allows parameters in interface method signatures', () => {
-        testGetTypedef(`
+    it('allows parameters in interface method signatures', async () => {
+        await testGetTypedef(`
             interface Person
                 sub someFunc(name as string, age as integer) as string
                 someField as string
@@ -97,12 +97,21 @@ describe('InterfaceStatement', () => {
         `, undefined, undefined, undefined, true);
     });
 
+    it('includes "optional" modifier in typedef', async () => {
+        await testGetTypedef(`
+            interface Person
+                name as string
+                optional age as integer
+            end interface
+        `);
+    });
+
     it('supports empty interfaces', () => {
-        const file = program.setFile('source/main.bs', `
+        program.setFile('source/main.bs', `
            interface SomeInterface
            end interface
         `);
         program.validate();
-        expectZeroDiagnostics(file);
+        expectZeroDiagnostics(program);
     });
 });
diff --git a/src/parser/tests/statement/LibraryStatement.spec.ts b/src/parser/tests/statement/LibraryStatement.spec.ts
index f506b7964..8376187b2 100644
--- a/src/parser/tests/statement/LibraryStatement.spec.ts
+++ b/src/parser/tests/statement/LibraryStatement.spec.ts
@@ -41,12 +41,12 @@ describe('parser library statements', () => {
                 library = "Gotham City Library"
             end sub
         `);
-        const { statements, diagnostics } = Parser.parse(tokens) as any;
+        const { ast, diagnostics } = Parser.parse(tokens) as any;
         //make sure the assignment is present in the function body
-        let assignment = statements[0].func.body.statements[0];
+        let assignment = ast.statements[0].func.body.statements[0];
         expect(diagnostics).to.be.lengthOf(0);
         expect(assignment).to.be.instanceOf(AssignmentStatement);
-        expect(assignment.name.text).to.equal('library');
+        expect(assignment.tokens.name.text).to.equal('library');
     });
 
     it('does not prevent usage of `library` as object property name', () => {
@@ -57,9 +57,9 @@ describe('parser library statements', () => {
                 }
             end sub
         `);
-        const { statements, diagnostics } = Parser.parse(tokens) as any;
+        const { ast, diagnostics } = Parser.parse(tokens) as any;
         //make sure the assignment is present in the function body
-        expect(statements[0].func.body.statements[0].value.elements[0].keyToken.text).to.equal('library');
+        expect(ast.statements[0].func.body.statements[0].value.elements[0].tokens.key.text).to.equal('library');
         expect(diagnostics).to.be.lengthOf(0);
     });
 
@@ -70,9 +70,9 @@ describe('parser library statements', () => {
                 library = "Your Library"
             end sub
         `);
-        const { statements, diagnostics } = Parser.parse(tokens);
+        const { ast, diagnostics } = Parser.parse(tokens);
         expect(diagnostics).to.be.lengthOf(1);
         //function statement should still exist
-        expect(statements[statements.length - 1]).to.be.instanceOf(BrsFunction);
+        expect(ast.statements[ast.statements.length - 1]).to.be.instanceOf(BrsFunction);
     });
 });
diff --git a/src/parser/tests/statement/Misc.spec.ts b/src/parser/tests/statement/Misc.spec.ts
index cef3684fc..d8a64576c 100644
--- a/src/parser/tests/statement/Misc.spec.ts
+++ b/src/parser/tests/statement/Misc.spec.ts
@@ -6,6 +6,7 @@ import { Range } from 'vscode-languageserver';
 import type { AAMemberExpression } from '../../Expression';
 import { expectZeroDiagnostics } from '../../../testHelpers.spec';
 import type { Statement } from '../../AstNode';
+import { isAAMemberExpression, isDottedSetStatement } from '../../../astUtils/reflection';
 
 describe('parser', () => {
     describe('`end` keyword', () => {
@@ -36,7 +37,7 @@ describe('parser', () => {
             let { diagnostics } = Parser.parse(tokens);
             expect(diagnostics).to.be.lengthOf(1);
             //specifically check for the error location, because the identifier location was wrong in the past
-            expect(diagnostics[0].range).to.deep.include(
+            expect(diagnostics[0].location.range).to.deep.include(
                 Range.create(1, 4, 1, 8)
             );
         });
@@ -68,12 +69,12 @@ describe('parser', () => {
                     ${disallowedIdentifier} = true
                 end sub
             `);
-            let { statements, diagnostics } = Parser.parse(tokens);
+            let { ast, diagnostics } = Parser.parse(tokens);
             if (diagnostics.length === 0) {
                 console.log(DisallowedLocalIdentifiersText);
                 throw new Error(`'${disallowedIdentifier}' cannot be used as an identifier, but was not detected as an error`);
             }
-            statementList.push(statements);
+            statementList.push(ast.statements);
         });
     });
 
@@ -117,7 +118,6 @@ describe('parser', () => {
             TokenKind.EndWhile,
             TokenKind.Eval,
             TokenKind.Exit,
-            TokenKind.ExitFor,
             TokenKind.ExitWhile,
             TokenKind.False,
             TokenKind.For,
@@ -258,12 +258,35 @@ describe('parser', () => {
             end function
             `
         );
-        let { diagnostics, statements } = Parser.parse(tokens) as any;
-        expect(diagnostics).to.exist.and.be.lengthOf(0, 'Error count should be 0');
-        expect(statements[0].func.body.statements[0].value.elements[0].text).to.equal('rem: 1');
-        expect(statements[0].func.body.statements[1].value.elements[1].text).to.equal('rem: 2');
-        expect(statements[0].func.body.statements[2].value.elements[0].text).to.equal('rem: 3: name: "bob"');
-        expect(statements[0].func.body.statements[3].name.text).to.equal('rem');
+        let { ast, diagnostics } = Parser.parse(tokens) as any;
+        expectZeroDiagnostics(diagnostics);
+        const mainStatements = ast.statements[0].func.body.statements;
+
+        // 1st AA has no elements - `rem` denotes comment
+        expect(mainStatements[0].value.elements.length).to.eq(0);
+        let commentBeforeClose = mainStatements[0].value.tokens.close.leadingTrivia[2];
+        expect(commentBeforeClose.kind).to.equal(TokenKind.Comment);
+        expect(commentBeforeClose.text).to.equal('rem: 1');
+
+        // 2nd AA has 1 element - `rem` after colon denotes comment, but first AA member is valid
+        expect(mainStatements[1].value.elements.length).to.eq(1);
+        expect(isAAMemberExpression(mainStatements[1].value.elements[0])).to.true;
+        expect(mainStatements[1].value.elements[0].tokens.key.text).to.equal('name');
+        expect(mainStatements[1].value.elements[0].value.tokens.value.text).to.equal('"bob"');
+        commentBeforeClose = mainStatements[1].value.tokens.close.leadingTrivia[2];
+        expect(commentBeforeClose.kind).to.equal(TokenKind.Comment);
+        expect(commentBeforeClose.text).to.equal('rem: 2');
+
+        // 3nd AA has no elements - `rem` colons are included in comments
+        expect(mainStatements[2].value.elements.length).to.eq(0);
+        commentBeforeClose = mainStatements[2].value.tokens.close.leadingTrivia[2];
+        expect(commentBeforeClose.kind).to.equal(TokenKind.Comment);
+        expect(commentBeforeClose.text).to.equal('rem: 3: name: "bob"');
+
+        // `rem` CAN be uses a property of an AA, when preceded by '.'
+        expect(isDottedSetStatement(mainStatements[3])).to.true;
+        expect(mainStatements[3].tokens.name.kind).to.equal(TokenKind.Identifier);
+        expect(mainStatements[3].tokens.name.text).to.equal('rem');
     });
 
     it('handles quoted AA keys', () => {
@@ -278,79 +301,10 @@ describe('parser', () => {
                 }
             end function
         `);
-        let { statements, diagnostics } = Parser.parse(tokens);
-        let element = ((statements as any)[0].func.body.statements[0].value.elements[0] as AAMemberExpression);
+        let { ast, diagnostics } = Parser.parse(tokens);
+        let element = ((ast.statements as any)[0].func.body.statements[0].value.elements[0] as AAMemberExpression);
         expect(diagnostics[0]?.message).not.to.exist;
-        expect(element.keyToken.text).to.equal('"has-second-layer"');
-    });
-
-    it('extracts property names for completion', () => {
-        const { tokens } = Lexer.scan(`
-            function main(arg as string)
-                aa1 = {
-                    "sprop1": 0,
-                    prop1: 1
-                    prop2: {
-                        prop3: 2
-                    }
-                }
-                aa2 = {
-                    prop4: {
-                        prop5: 5,
-                        "sprop2": 0,
-                        prop6: 6
-                    },
-                    prop7: 7
-                }
-                calling({
-                    prop8: 8,
-                    prop9: 9
-                })
-                aa1.field1 = 1
-                aa1.field2.field3 = 2
-                calling(aa2.field4, 3 + aa2.field5.field6)
-            end function
-        `);
-
-        const expected = [
-            'field1', 'field2', 'field3', 'field4', 'field5', 'field6',
-            'prop1', 'prop2', 'prop3', 'prop4', 'prop5', 'prop6', 'prop7', 'prop8', 'prop9'
-        ];
-
-        const parser = Parser.parse(tokens);
-        const { propertyHints: initialHints } = parser.references;
-        expect(Object.keys(initialHints).sort()).to.deep.equal(expected, 'Initial hints');
-
-        parser.invalidateReferences();
-        const { propertyHints: refreshedHints } = parser.references;
-        expect(Object.keys(refreshedHints).sort()).to.deep.equal(expected, 'Refreshed hints');
+        expect(element.tokens.key.text).to.equal('"has-second-layer"');
     });
 
-    it('extracts property names matching JavaScript reserved names', () => {
-        const { tokens } = Lexer.scan(`
-            function main(arg as string)
-                aa1 = {
-                    "constructor": 0,
-                    constructor: 1
-                    valueOf: {
-                        toString: 2
-                    }
-                }
-                aa1.constructor = 1
-                aa1.valueOf.toString = 2
-            end function
-        `);
-
-        const expected = [
-            'constructor', 'tostring', 'valueof'
-        ];
-
-        const parser = Parser.parse(tokens);
-        const { propertyHints: initialHints } = parser.references;
-        expect(Object.keys(initialHints).sort()).to.deep.equal(expected, 'Initial hints');
-
-        parser.invalidateReferences();
-        const { propertyHints: refreshedHints } = parser.references;
-        expect(Object.keys(refreshedHints).sort()).to.deep.equal(expected, 'Refreshed hints');
-    });
 });
diff --git a/src/parser/tests/statement/PrintStatement.spec.ts b/src/parser/tests/statement/PrintStatement.spec.ts
index 4e8a172cc..803464de6 100644
--- a/src/parser/tests/statement/PrintStatement.spec.ts
+++ b/src/parser/tests/statement/PrintStatement.spec.ts
@@ -6,6 +6,7 @@ import { Range } from 'vscode-languageserver';
 import { Program } from '../../../Program';
 import { rootDir } from '../../../testHelpers.spec';
 import { getTestTranspile } from '../../../testHelpers.spec';
+import util from '../../../util';
 
 describe('parser print statements', () => {
 
@@ -19,26 +20,26 @@ describe('parser print statements', () => {
     });
 
     it('parses singular print statements', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Print),
             token(TokenKind.StringLiteral, 'Hello, world'),
             EOF
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('supports empty print', () => {
-        let { statements, diagnostics } = Parser.parse([token(TokenKind.Print), EOF]);
+        let { ast, diagnostics } = Parser.parse([token(TokenKind.Print), EOF]);
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('parses print lists with no separator', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Print),
             token(TokenKind.StringLiteral, 'Foo'),
             token(TokenKind.StringLiteral, 'bar'),
@@ -47,12 +48,12 @@ describe('parser print statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('parses print lists with separators', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Print),
             token(TokenKind.StringLiteral, 'Foo'),
             token(TokenKind.Semicolon),
@@ -63,8 +64,8 @@ describe('parser print statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('location tracking', () => {
@@ -74,38 +75,41 @@ describe('parser print statements', () => {
          *  +--------------
          * 1| print "foo"
          */
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             {
                 kind: TokenKind.Print,
                 text: 'print',
                 isReserved: true,
-                range: Range.create(0, 0, 1, 5),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 0, 0, 5),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.StringLiteral,
                 text: `"foo"`,
                 isReserved: false,
-                range: Range.create(0, 6, 0, 11),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 6, 0, 11),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
                 isReserved: false,
-                range: Range.create(0, 11, 0, 12),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 11, 0, 12),
+                leadingWhitespace: '',
+                leadingTrivia: []
             }
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.lengthOf(1);
-        expect(statements[0].range).to.deep.include(Range.create(0, 0, 0, 11));
+        expect(ast.statements).to.be.lengthOf(1);
+        expect(ast.statements[0].location?.range).to.deep.include(Range.create(0, 0, 0, 11));
     });
 
     describe('transpile', () => {
-        it('retains comma separators', () => {
-            testTranspile(`
+        it('retains comma separators', async () => {
+            await testTranspile(`
                 sub main()
                     a$ = "string"
                     print a$, a$, a$
@@ -113,8 +117,8 @@ describe('parser print statements', () => {
             `);
         });
 
-        it('retains semicolon separators', () => {
-            testTranspile(`
+        it('retains semicolon separators', async () => {
+            await testTranspile(`
                 sub main()
                     a$ = "string"
                     print a$; a$; a$
@@ -122,8 +126,8 @@ describe('parser print statements', () => {
             `);
         });
 
-        it('supports no space between function calls', () => {
-            testTranspile(`
+        it('supports no space between function calls', async () => {
+            await testTranspile(`
                 function getText()
                     return "text"
                 end function
@@ -134,8 +138,8 @@ describe('parser print statements', () => {
             `);
         });
 
-        it('supports print in loop', () => {
-            testTranspile(`
+        it('supports print in loop', async () => {
+            await testTranspile(`
                 sub main()
                     paramArr = ["This", "is", true, "and", "this", "is", 1]
                     print "This is one line of stuff:";
@@ -164,8 +168,8 @@ describe('parser print statements', () => {
             `);
         });
 
-        it('handles roku documentation examples', () => {
-            testTranspile(`
+        it('handles roku documentation examples', async () => {
+            await testTranspile(`
                 sub main()
                     x=5:print 25; " is equal to"; x^2
                     a$="string":print a$;a$,a$;" ";a$
@@ -185,8 +189,8 @@ describe('parser print statements', () => {
                     x = 5
                     print 25; " is equal to"; x ^ 2
                     a$ = "string"
-                    print a$; a$, a$; " "; a$
-                    print "zone 1", "zone 2", "zone 3", "zone 4"
+                    print a$;a$,a$;" ";a$
+                    print "zone 1","zone 2","zone 3","zone 4"
                     print "print statement #1 "
                     print "print statement #2"
                     print "this is a five " 5 "!!"
@@ -198,7 +202,7 @@ describe('parser print statements', () => {
                     print [
                         5
                     ]
-                    print tab(5) "tabbed 5"; tab(25) "tabbed 25"
+                    print tab(5) "tabbed 5";tab(25) "tabbed 25"
                     print tab(40) pos(0) 'prints 40 at position 40
                     print "these" tab(pos(0) + 5) "words" tab(pos(0) + 5) "are"
                     print tab(pos(0) + 5) "evenly" tab(pos(0) + 5) "spaced"
diff --git a/src/parser/tests/statement/ReturnStatement.spec.ts b/src/parser/tests/statement/ReturnStatement.spec.ts
index 0c65b1ea6..3ab47e9ca 100644
--- a/src/parser/tests/statement/ReturnStatement.spec.ts
+++ b/src/parser/tests/statement/ReturnStatement.spec.ts
@@ -5,10 +5,11 @@ import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import type { FunctionStatement } from '../../Statement';
 import { Range } from 'vscode-languageserver';
+import util from '../../../util';
 
 describe('parser return statements', () => {
     it('parses void returns', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Function, 'function'),
             identifier('foo'),
             token(TokenKind.LeftParen, '('),
@@ -21,11 +22,11 @@ describe('parser return statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.ok;
+        expect(ast.statements).to.ok;
     });
 
     it('parses literal returns', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Function, 'function'),
             identifier('foo'),
             token(TokenKind.LeftParen, '('),
@@ -39,11 +40,11 @@ describe('parser return statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.ok;
+        expect(ast.statements).to.be.ok;
     });
 
     it('parses expression returns', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Function, 'function'),
             identifier('foo'),
             token(TokenKind.LeftParen, '('),
@@ -51,7 +52,7 @@ describe('parser return statements', () => {
             token(TokenKind.Newline, '\\n'),
             token(TokenKind.Return, 'return'),
             identifier('RebootSystem'),
-            { kind: TokenKind.LeftParen, text: '(', range: null as any },
+            { kind: TokenKind.LeftParen, text: '(', location: null as any, leadingTrivia: [] },
             token(TokenKind.RightParen, ')'),
             token(TokenKind.Newline, '\\n'),
             token(TokenKind.EndFunction, 'end function'),
@@ -59,7 +60,7 @@ describe('parser return statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect(statements).to.be.ok;
+        expect(ast.statements).to.be.ok;
     });
 
     it('location tracking', () => {
@@ -71,7 +72,7 @@ describe('parser return statements', () => {
          * 1|   return 5
          * 2| end function
          */
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Function, 'function'),
             identifier('foo'),
             token(TokenKind.LeftParen, '('),
@@ -81,13 +82,15 @@ describe('parser return statements', () => {
                 kind: TokenKind.Return,
                 text: 'return',
                 isReserved: true,
-                range: Range.create(1, 2, 1, 8)
+                location: util.createLocation(1, 2, 1, 8),
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '5',
                 isReserved: false,
-                range: Range.create(1, 9, 1, 10)
+                location: util.createLocation(1, 9, 1, 10),
+                leadingTrivia: []
             },
             token(TokenKind.Newline, '\\n'),
             token(TokenKind.EndFunction, 'end function'),
@@ -95,7 +98,7 @@ describe('parser return statements', () => {
         ]);
 
         expect(diagnostics).to.be.lengthOf(0);
-        expect((statements[0] as FunctionStatement).func.body.statements[0]?.range).to.exist.and.to.deep.include(
+        expect((ast.statements[0] as FunctionStatement).func.body.statements[0]?.location?.range).to.exist.and.to.deep.include(
             Range.create(1, 2, 1, 10)
         );
     });
diff --git a/src/parser/tests/statement/Set.spec.ts b/src/parser/tests/statement/Set.spec.ts
index e52797d95..27e031cb9 100644
--- a/src/parser/tests/statement/Set.spec.ts
+++ b/src/parser/tests/statement/Set.spec.ts
@@ -4,11 +4,12 @@ import { Parser } from '../../Parser';
 import { TokenKind } from '../../../lexer/TokenKind';
 import { EOF, identifier, token } from '../Parser.spec';
 import { Range } from 'vscode-languageserver';
+import util from '../../../util';
 
 describe('parser indexed assignment', () => {
     describe('dotted', () => {
         it('assigns anonymous functions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('foo'),
                 token(TokenKind.Dot, '.'),
                 identifier('bar'),
@@ -22,12 +23,12 @@ describe('parser indexed assignment', () => {
             ]);
 
             expect(diagnostics).to.be.empty;
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
 
         it('assigns boolean expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('foo'),
                 token(TokenKind.Dot, '.'),
                 identifier('bar'),
@@ -40,12 +41,12 @@ describe('parser indexed assignment', () => {
             ]);
 
             expect(diagnostics).to.be.empty;
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
 
         it('assignment operator', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('foo'),
                 token(TokenKind.Dot, '.'),
                 identifier('bar'),
@@ -56,14 +57,14 @@ describe('parser indexed assignment', () => {
             ]);
 
             expect(diagnostics).to.be.empty;
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
     });
 
     describe('bracketed', () => {
         it('assigns anonymous functions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('someArray'),
                 token(TokenKind.LeftSquareBracket, '['),
                 token(TokenKind.IntegerLiteral, '0'),
@@ -78,12 +79,12 @@ describe('parser indexed assignment', () => {
             ]);
 
             expect(diagnostics).to.be.empty;
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
 
         it('assigns boolean expressions', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('someArray'),
                 token(TokenKind.LeftSquareBracket, '['),
                 token(TokenKind.IntegerLiteral, '0'),
@@ -97,12 +98,12 @@ describe('parser indexed assignment', () => {
             ]);
 
             expect(diagnostics).to.be.empty;
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
 
         it('assignment operator', () => {
-            let { statements, diagnostics } = Parser.parse([
+            let { ast, diagnostics } = Parser.parse([
                 identifier('someArray'),
                 token(TokenKind.LeftSquareBracket, '['),
                 token(TokenKind.IntegerLiteral, '0'),
@@ -113,8 +114,8 @@ describe('parser indexed assignment', () => {
             ]);
 
             expect(diagnostics).to.be.empty;
-            expect(statements).to.exist;
-            expect(statements).not.to.be.null;
+            expect(ast.statements).to.exist;
+            expect(ast.statements).not.to.be.null;
         });
     });
 
@@ -126,103 +127,116 @@ describe('parser indexed assignment', () => {
          * 0| arr[0] = 1
          * 1| obj.a = 5
          */
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             {
                 kind: TokenKind.Identifier,
                 text: 'arr',
                 isReserved: false,
-                range: Range.create(0, 0, 0, 3),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 0, 0, 3),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.LeftSquareBracket,
                 text: '[',
                 isReserved: false,
-                range: Range.create(0, 3, 0, 4),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 3, 0, 4),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '0',
                 isReserved: false,
-                range: Range.create(0, 4, 0, 5),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 4, 0, 5),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.RightSquareBracket,
                 text: ']',
                 isReserved: false,
-                range: Range.create(0, 5, 0, 6),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 5, 0, 6),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
                 isReserved: false,
-                range: Range.create(0, 7, 0, 8),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 7, 0, 8),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '1',
                 isReserved: false,
-                range: Range.create(0, 9, 0, 10),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 9, 0, 10),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Newline,
                 text: '\n',
                 isReserved: false,
-                range: Range.create(0, 10, 0, 11),
-                leadingWhitespace: ''
+                location: util.createLocation(0, 10, 0, 11),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'obj',
                 isReserved: false,
-                range: Range.create(1, 0, 1, 3),
-                leadingWhitespace: ''
+                location: util.createLocation(1, 0, 1, 3),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Dot,
                 text: '.',
                 isReserved: false,
-                range: Range.create(1, 3, 1, 4),
-                leadingWhitespace: ''
+                location: util.createLocation(1, 3, 1, 4),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Identifier,
                 text: 'a',
                 isReserved: false,
-                range: Range.create(1, 4, 1, 5),
-                leadingWhitespace: ''
+                location: util.createLocation(1, 4, 1, 5),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Equal,
                 text: '=',
                 isReserved: false,
-                range: Range.create(1, 6, 1, 7),
-                leadingWhitespace: ''
+                location: util.createLocation(1, 6, 1, 7),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.IntegerLiteral,
                 text: '5',
                 isReserved: false,
-                range: Range.create(1, 8, 1, 9),
-                leadingWhitespace: ''
+                location: util.createLocation(1, 8, 1, 9),
+                leadingWhitespace: '',
+                leadingTrivia: []
             },
             {
                 kind: TokenKind.Eof,
                 text: '\0',
                 isReserved: false,
-                range: Range.create(1, 10, 1, 11),
-                leadingWhitespace: ''
+                location: util.createLocation(1, 10, 1, 11),
+                leadingWhitespace: '',
+                leadingTrivia: []
             }
         ]);
 
         expect(diagnostics).to.be.empty;
-        expect(statements).to.be.lengthOf(2);
-        expect(statements.map(s => s.range)).to.deep.equal([
+        expect(ast.statements).to.be.lengthOf(2);
+        expect(ast.statements.map(s => s.location?.range)).to.deep.equal([
             Range.create(0, 0, 0, 10),
             Range.create(1, 0, 1, 9)
         ]);
diff --git a/src/parser/tests/statement/Stop.spec.ts b/src/parser/tests/statement/Stop.spec.ts
index c43cc6346..9b26f99ef 100644
--- a/src/parser/tests/statement/Stop.spec.ts
+++ b/src/parser/tests/statement/Stop.spec.ts
@@ -7,7 +7,7 @@ import { EOF, token } from '../Parser.spec';
 
 describe('stop statement', () => {
     it('cannot be used as a local variable', () => {
-        let { statements, diagnostics } = Parser.parse([
+        let { ast, diagnostics } = Parser.parse([
             token(TokenKind.Stop, 'stop'),
             token(TokenKind.Equal, '='),
             token(TokenKind.True, 'true'),
@@ -16,8 +16,8 @@ describe('stop statement', () => {
 
         //should be an error
         expect(diagnostics).to.be.length.greaterThan(0);
-        expect(statements).to.exist;
-        expect(statements).not.to.be.null;
+        expect(ast.statements).to.exist;
+        expect(ast.statements).not.to.be.null;
     });
 
     it('is valid as a statement', () => {
diff --git a/src/parser/tests/statement/Throw.spec.ts b/src/parser/tests/statement/Throw.spec.ts
index ccb8bf785..e18a4b4f3 100644
--- a/src/parser/tests/statement/Throw.spec.ts
+++ b/src/parser/tests/statement/Throw.spec.ts
@@ -3,15 +3,17 @@ import type { TryCatchStatement, ThrowStatement } from '../../Statement';
 import { DiagnosticMessages } from '../../../DiagnosticMessages';
 import { LiteralExpression } from '../../Expression';
 import { Parser } from '../../Parser';
+import { expectDiagnostics, expectZeroDiagnostics } from '../../../testHelpers.spec';
 
 describe('parser ThrowStatement', () => {
     it('parses properly', () => {
         const parser = Parser.parse(`
             try
                 throw "some message"
-            catch
+            catch e
             end try
         `);
+        expectZeroDiagnostics(parser);
         const throwStatement = (parser.ast.statements[0] as TryCatchStatement).tryBranch!.statements[0] as ThrowStatement;
         //the statement should still exist and have null expression
         expect(throwStatement).to.exist;
@@ -25,7 +27,9 @@ describe('parser ThrowStatement', () => {
             catch
             end try
         `);
-        expect(parser.diagnostics[0]?.message).to.eql(DiagnosticMessages.missingExceptionExpressionAfterThrowKeyword().message);
+        expectDiagnostics(parser, [
+            DiagnosticMessages.missingExceptionExpressionAfterThrowKeyword().message
+        ]);
         const throwStatement = (parser.ast.statements[0] as TryCatchStatement).tryBranch!.statements[0] as ThrowStatement;
         //the statement should still exist and have null expression
         expect(throwStatement).to.exist;
diff --git a/src/parser/tests/statement/TryCatch.spec.ts b/src/parser/tests/statement/TryCatch.spec.ts
index 4c35d3db6..168a8f780 100644
--- a/src/parser/tests/statement/TryCatch.spec.ts
+++ b/src/parser/tests/statement/TryCatch.spec.ts
@@ -1,6 +1,10 @@
 import { expect } from '../../../chai-config.spec';
 import { Parser } from '../../Parser';
 import { TryCatchStatement } from '../../Statement';
+import { isFunctionExpression } from '../../../astUtils/reflection';
+import type { FunctionExpression, VariableExpression } from '../../Expression';
+import { expectDiagnosticsIncludes } from '../../../testHelpers.spec';
+import { DiagnosticMessages } from '../../../DiagnosticMessages';
 
 describe('parser try/catch', () => {
     it('can parse try catch statements', () => {
@@ -14,14 +18,16 @@ describe('parser try/catch', () => {
             end sub
         `);
         expect(parser.diagnostics[0]?.message).not.to.exist;
-        const stmt = parser.references.functionExpressions[0].body.statements[0] as TryCatchStatement;
+
+        const functionExpressions = parser.ast.findChildren<FunctionExpression>(isFunctionExpression);
+        const stmt = functionExpressions[0].body.statements[0] as TryCatchStatement;
         expect(stmt).to.be.instanceof(TryCatchStatement);
         expect(stmt.tokens.try?.text).to.eql('try');
         expect(stmt.tryBranch).to.exist.and.ownProperty('statements').to.be.lengthOf(1);
         expect(stmt.catchStatement).to.exist;
         const cstmt = stmt.catchStatement;
         expect(cstmt!.tokens.catch?.text).to.eql('catch');
-        expect(cstmt!.exceptionVariable!.text).to.eql('e');
+        expect((cstmt!.exceptionVariableExpression as VariableExpression).getName()).to.eql('e');
         expect(cstmt!.catchBranch).to.exist.and.ownProperty('statements').to.be.lengthOf(1);
         expect(stmt.tokens.endTry?.text).to.eql('end try');
     });
@@ -138,7 +144,9 @@ describe('parser try/catch', () => {
                 end try
             end sub
         `);
-        expect(parser.diagnostics).to.be.lengthOf(1);
+        expectDiagnosticsIncludes(parser, [
+            DiagnosticMessages.expectedCatchBlockInTryCatch().message
+        ]);
     });
 
     it('recovers from missing catch and end-try when reaching function boundary', () => {
@@ -149,6 +157,9 @@ describe('parser try/catch', () => {
                     print "error"
             end sub
         `);
-        expect(parser.diagnostics).to.be.lengthOf(1);
+        expectDiagnosticsIncludes(parser, [
+            DiagnosticMessages.expectedCatchBlockInTryCatch().message,
+            DiagnosticMessages.expectedTerminator('end try', 'try-catch', 'statement').message
+        ]);
     });
 });
diff --git a/src/preprocessor/Chunk.ts b/src/preprocessor/Chunk.ts
deleted file mode 100644
index 89cac98a6..000000000
--- a/src/preprocessor/Chunk.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import type { Token } from '../lexer/Token';
-import type { Range } from 'vscode-languageserver';
-import util from '../util';
-
-/**
- * A set of operations that must be implemented to properly handle conditional compilation chunks.
- *
- */
-export interface Visitor {
-    visitBrightScript(chunk: BrightScriptChunk): Token[];
-    visitDeclaration(chunk: DeclarationChunk): Token[];
-    visitIf(chunk: HashIfStatement): Token[];
-    visitError(chunk: ErrorChunk): never;
-}
-
-/**
- * The base construct of the conditional-compilation preprocessor. Represents one of many things,
- * but typically has a one-to-many relationship with tokens in the input BrightScript files.
- */
-export interface Chunk {
-    accept(visitor: Visitor): Token[];
-}
-
-/** A series of BrightScript tokens that will be parsed and interpreted directly. */
-export class BrightScriptChunk implements Chunk {
-    constructor(readonly tokens: Token[]) { }
-
-    accept(visitor: Visitor) {
-        return visitor.visitBrightScript(this);
-    }
-}
-
-/**
- * A conditional compilation directive that declares a constant value that's in-scope only during
- * preprocessing.
- *
- * Typically takes the form of:
- *
- * @example
- * #const foo = true
- */
-export class DeclarationChunk implements Chunk {
-    constructor(readonly name: Token, readonly value: Token) { }
-
-    accept(visitor: Visitor) {
-        return visitor.visitDeclaration(this);
-    }
-}
-
-/**
- * The combination of a conditional compilation value (or identifier) and the chunk to include if
- * `condition` evaluates to `true`.
- */
-export interface HashElseIfStatement {
-    condition: Token;
-    thenChunks: Chunk[];
-}
-
-/**
- * A directive that adds the "conditional" to "conditional compilation". Typically takes the form
- * of:
- *
- * @example
- * #if foo
- *     someBrightScriptGoesHere()
- * #else if bar
- *     compileSomeOtherCode()
- * #else
- *     otherwise("compile this!")
- * #end if
- */
-export class HashIfStatement implements Chunk {
-    constructor(
-        readonly condition: Token,
-        readonly thenChunks: Chunk[],
-        readonly elseIfs: HashElseIfStatement[],
-        readonly elseChunks?: Chunk[]
-    ) { }
-
-    accept(visitor: Visitor) {
-        return visitor.visitIf(this);
-    }
-}
-
-/**
- * A forced BrightScript compilation error with a message attached.  Typically takes the form of:
- *
- * @example
- * #error Some message describing the error goes here.
- */
-export class ErrorChunk implements Chunk {
-    constructor(
-        readonly hashError: Token,
-        readonly message: Token
-    ) {
-        this.range = util.createBoundingRange(this.hashError, this.message);
-    }
-    public readonly range: Range;
-
-    accept(visitor: Visitor) {
-        return visitor.visitError(this);
-    }
-}
diff --git a/src/preprocessor/Preprocessor.spec.ts b/src/preprocessor/Preprocessor.spec.ts
deleted file mode 100644
index dc7be5657..000000000
--- a/src/preprocessor/Preprocessor.spec.ts
+++ /dev/null
@@ -1,234 +0,0 @@
-import { identifier, token, EOF } from '../parser/tests/Parser.spec';
-import { TokenKind } from '../lexer/TokenKind';
-import { Preprocessor } from './Preprocessor';
-import { BrightScriptChunk, DeclarationChunk, ErrorChunk, HashIfStatement } from './Chunk';
-import { expect } from '../chai-config.spec';
-import { createSandbox } from 'sinon';
-let sinon = createSandbox();
-
-describe('preprocessor', () => {
-    afterEach(() => {
-        sinon.restore();
-    });
-    it('forwards brightscript chunk contents unmodified', () => {
-        let unprocessed = [
-            identifier('foo'),
-            token(TokenKind.LeftParen, '('),
-            token(TokenKind.RightParen, ')'),
-            token(TokenKind.Newline, '\n'),
-            EOF
-        ];
-
-        let { processedTokens } = new Preprocessor().filter([new BrightScriptChunk(unprocessed)]);
-        expect(processedTokens).to.eql(unprocessed);
-    });
-
-    describe('#const', () => {
-        it('removes #const declarations from output', () => {
-            let { processedTokens } = new Preprocessor().filter([
-                new DeclarationChunk(
-                    identifier('lorem'),
-                    token(TokenKind.False, 'false')
-                )
-            ]);
-            expect(processedTokens).to.eql([]);
-        });
-
-        describe('values', () => {
-            it('allows `true`', () => {
-                expect(
-                    () => new Preprocessor().filter([
-                        new DeclarationChunk(
-                            identifier('lorem'),
-                            token(TokenKind.True, 'true')
-                        )
-                    ])
-                ).not.to.throw;
-            });
-
-            it('allows `false`', () => {
-                expect(() => new Preprocessor().filter([
-                    new DeclarationChunk(
-                        identifier('ipsum'),
-                        token(TokenKind.False, 'false')
-                    )
-                ])
-                ).not.to.throw;
-            });
-
-            it('allows identifiers', () => {
-                expect(() => new Preprocessor().filter([
-                    // 'ipsum' must be defined before it's referenced
-                    new DeclarationChunk(
-                        identifier('ipsum'),
-                        token(TokenKind.False, 'false')
-                    ),
-                    new DeclarationChunk(
-                        identifier('dolor'),
-                        token(TokenKind.True, 'true')
-                    )
-                ])
-                ).not.to.throw;
-            });
-
-            it('disallows strings', () => {
-                expect(() => new Preprocessor().filter([
-                    new DeclarationChunk(
-                        identifier('sit'),
-                        token(TokenKind.String, 'good boy!')
-                    )
-                ])
-                ).to.throw;//('#const declarations can only have');
-            });
-
-            it('disallows re-declaration of values', () => {
-                expect(() => new Preprocessor().filter([
-                    new DeclarationChunk(
-                        identifier('lorem'),
-                        token(TokenKind.False, 'false')
-                    ),
-                    new DeclarationChunk(
-                        identifier('lorem'),
-                        token(TokenKind.True, 'true')
-                    )
-                ])
-                ).to.throw;
-            });
-        });
-    });
-
-    describe('#error', () => {
-        it('throws error when #error directives encountered', () => {
-            expect(() => new Preprocessor().filter([
-                new ErrorChunk(token(TokenKind.HashError, '#error'), token(TokenKind.HashError, 'I\'m an error message!'))
-            ])
-            ).to.throw;
-        });
-
-        it('doesn\'t throw when branched around', () => {
-            expect(() => new Preprocessor().filter([
-                new HashIfStatement(
-                    token(TokenKind.False, 'false'),
-                    [
-                        new ErrorChunk(
-                            token(TokenKind.HashError, '#error'),
-                            token(TokenKind.HashError, 'I\'m an error message!')
-                        )
-                    ],
-                    [] // no else-ifs necessary
-                )
-            ])
-            ).not.to.throw;
-        });
-    });
-
-    describe('#if', () => {
-        let elseChunk;
-        let elseIfChunk;
-        let ifChunk;
-
-        beforeEach(() => {
-            ifChunk = new BrightScriptChunk([]);
-            elseIfChunk = new BrightScriptChunk([]);
-            elseChunk = new BrightScriptChunk([]);
-
-            sinon.spy(ifChunk, 'accept');
-            sinon.spy(elseIfChunk, 'accept');
-            sinon.spy(elseChunk, 'accept');
-        });
-
-        it('enters #if branch', () => {
-            new Preprocessor().filter([
-                new HashIfStatement(
-                    token(TokenKind.True, 'true'),
-                    [ifChunk],
-                    [
-                        {
-                            condition: token(TokenKind.True, 'true'),
-                            thenChunks: [elseIfChunk]
-                        }
-                    ],
-                    [elseChunk]
-                )
-            ]);
-
-            expect(ifChunk.accept.callCount).to.equal(1);
-            expect(elseIfChunk.accept.callCount).to.equal(0);
-            expect(elseChunk.accept.callCount).to.equal(0);
-        });
-
-        it('enters #else if branch', () => {
-            new Preprocessor().filter([
-                new HashIfStatement(
-                    token(TokenKind.False, 'false'),
-                    [ifChunk],
-                    [
-                        {
-                            condition: token(TokenKind.True, 'true'),
-                            thenChunks: [elseIfChunk]
-                        }
-                    ],
-                    [elseChunk]
-                )
-            ]);
-
-            expect(ifChunk.accept.callCount).to.equal(0);
-            expect(elseIfChunk.accept.callCount).to.equal(1);
-            expect(elseChunk.accept.callCount).to.equal(0);
-        });
-
-        it('enters #else branch', () => {
-            new Preprocessor().filter([
-                new HashIfStatement(
-                    token(TokenKind.False, 'false'),
-                    [ifChunk],
-                    [
-                        {
-                            condition: token(TokenKind.False, 'false'),
-                            thenChunks: [elseIfChunk]
-                        }
-                    ],
-                    [elseChunk]
-                )
-            ]);
-
-            expect(ifChunk.accept.callCount).to.equal(0);
-            expect(elseIfChunk.accept.callCount).to.equal(0);
-            expect(elseChunk.accept.callCount).to.equal(1);
-        });
-
-        it('enters no branches if none pass', () => {
-            new Preprocessor().filter([
-                new HashIfStatement(
-                    token(TokenKind.False, 'false'),
-                    [ifChunk],
-                    [] // no else-if chunks
-                    // NOTE: no 'else" chunk!
-                )
-            ]);
-
-            expect(ifChunk.accept.callCount).to.equal(0);
-            expect(elseIfChunk.accept.callCount).to.equal(0);
-            expect(elseChunk.accept.callCount).to.equal(0);
-        });
-
-        it('uses #const values to determine truth', () => {
-            new Preprocessor().filter([
-                new DeclarationChunk(
-                    identifier('lorem'),
-                    token(TokenKind.True, 'true')
-                ),
-                new HashIfStatement(
-                    identifier('lorem'),
-                    [ifChunk],
-                    [] // no else-if chunks
-                    // NOTE: no 'else" chunk!
-                )
-            ]);
-
-            expect(ifChunk.accept.callCount).to.equal(1);
-            expect(elseIfChunk.accept.callCount).to.equal(0);
-            expect(elseChunk.accept.callCount).to.equal(0);
-        });
-    });
-});
diff --git a/src/preprocessor/Preprocessor.ts b/src/preprocessor/Preprocessor.ts
deleted file mode 100644
index 9edb9b8d4..000000000
--- a/src/preprocessor/Preprocessor.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import type { Token } from '../lexer/Token';
-import { TokenKind } from '../lexer/TokenKind';
-import type * as CC from './Chunk';
-import type { Diagnostic } from 'vscode-languageserver';
-import { DiagnosticMessages } from '../DiagnosticMessages';
-import { PreprocessorParser } from './PreprocessorParser';
-import type { Manifest } from './Manifest';
-import { getBsConst } from './Manifest';
-
-/**
- * A simple pre-processor that executes BrightScript's conditional compilation directives by
- * selecting chunks of tokens to be considered for later evaluation.
- */
-export class Preprocessor implements CC.Visitor {
-    private constants = new Map<string, boolean>();
-
-    /** The set of errors encountered when pre-processing conditional compilation directives. */
-    public diagnostics = [] as Diagnostic[];
-
-    public processedTokens: Token[] = [];
-
-    /**
-     * Filters the tokens contained within a set of chunks based on a set of constants.
-     * @param tokens the tokens
-     * @param manifest a manifest used to extract bs_const properties from
-     * @returns an object containing an array of `errors` and an array of `processedTokens` filtered by conditional
-     *          compilation directives included within
-     */
-    public process(tokens: Token[], manifest: Manifest) {
-        this.processedTokens = [];
-        let parser = PreprocessorParser.parse(tokens);
-        //absorb the parser's diagnostic messages
-        this.diagnostics.push(...parser.diagnostics);
-
-        //if we found diagnostics, quit now
-        if (parser.diagnostics.length > 0) {
-            return this;
-        }
-        let bsConst = getBsConst(manifest);
-        this.filter(parser.chunks, bsConst);
-        return this;
-    }
-
-    public filter(chunks: ReadonlyArray<CC.Chunk>, bsConst?: Map<string, boolean>) {
-        this.constants = new Map(bsConst);
-
-        this.processedTokens = chunks
-            .map(chunk => chunk.accept(this))
-            .reduce(
-                (allTokens: Token[], chunkTokens: Token[]) => [
-                    ...allTokens,
-                    ...chunkTokens
-                ], []
-            );
-        return this;
-    }
-
-    public static process(tokens: Token[], manifest: Manifest) {
-        return new Preprocessor().process(tokens, manifest);
-    }
-
-    /**
-     * Emits an error via this processor's `events` property, then throws it.
-     * @param diagnostic the ParseError to emit then throw
-     */
-    private addError(diagnostic: Diagnostic) {
-        this.diagnostics.push(diagnostic);
-        return diagnostic;
-    }
-
-
-    /**
-     * Handles a simple chunk of BrightScript tokens by returning the tokens contained within.
-     * @param chunk the chunk to extract tokens from
-     * @returns the array of tokens contained within `chunk`
-     */
-    public visitBrightScript(chunk: CC.BrightScriptChunk) {
-        return chunk.tokens;
-    }
-
-    /**
-     * Handles a BrightScript `#const` directive, creating a variable in-scope only for the
-     * conditional compilation pass.
-     * @param chunk the `#const` directive, including the name and variable to use for the constant
-     * @returns an empty array, since `#const` directives are always removed from the evaluated script.
-     */
-    public visitDeclaration(chunk: CC.DeclarationChunk) {
-        const nameLower = chunk.name?.text?.toLocaleLowerCase();
-        if (this.constants.has(nameLower)) {
-            this.addError({
-                ...DiagnosticMessages.duplicateConstDeclaration(chunk.name.text),
-                range: chunk.name.range
-            });
-        }
-
-        let value;
-        switch (chunk.value.kind) {
-            case TokenKind.True:
-                value = true;
-                break;
-            case TokenKind.False:
-                value = false;
-                break;
-            case TokenKind.Identifier:
-                if (this.constants.has(nameLower)) {
-                    value = this.constants.get(nameLower);
-                    break;
-                }
-
-                this.addError({
-                    ...DiagnosticMessages.constAliasDoesNotExist(chunk.value.text),
-                    range: chunk.value.range
-                });
-                break;
-            default:
-                this.addError({
-                    ...DiagnosticMessages.invalidHashConstValue(),
-                    range: chunk.value.range
-                });
-        }
-
-        this.constants.set(nameLower, value);
-
-        return [];
-    }
-
-    /**
-     * Throws an error, stopping "compilation" of the program.
-     * @param chunk the error to report to users
-     * @throws a JavaScript error with the provided message
-     */
-    public visitError(chunk: CC.ErrorChunk): never {
-        // eslint-disable-next-line @typescript-eslint/no-throw-literal
-        throw this.addError({
-            ...DiagnosticMessages.hashError(chunk.message.text),
-            range: chunk.range
-        });
-    }
-
-    /**
-     * Produces tokens from a branch of a conditional-compilation `#if`, or no tokens if no branches evaluate to `true`.
-     * @param chunk the `#if` directive, any `#else if` or `#else` directives, and their associated BrightScript chunks.
-     * @returns an array of tokens to include in the final executed script.
-     */
-    public visitIf(chunk: CC.HashIfStatement): Token[] {
-        if (this.evaluateCondition(chunk.condition)) {
-            return chunk.thenChunks
-                .map(chunk => chunk.accept(this))
-                .reduce((allTokens, chunkTokens: Token[]) => [...allTokens, ...chunkTokens], []);
-        } else {
-            for (const elseIf of chunk.elseIfs) {
-                if (this.evaluateCondition(elseIf.condition)) {
-                    return elseIf.thenChunks
-                        .map(chunk => chunk.accept(this))
-                        .reduce(
-                            (allTokens, chunkTokens: Token[]) => [...allTokens, ...chunkTokens],
-                            []
-                        );
-                }
-            }
-        }
-
-        if (chunk.elseChunks) {
-            return chunk.elseChunks
-                .map(chunk => chunk.accept(this))
-                .reduce((allTokens, chunkTokens: Token[]) => [...allTokens, ...chunkTokens], []);
-        }
-
-        return [];
-    }
-
-    /**
-     * Resolves a token to a JavaScript boolean value, or logs a diagnostic error.
-     * @param token the token to resolve to either `true`, `false`, or `undefined`
-     */
-    public evaluateCondition(token: Token): boolean | undefined {
-        switch (token.kind) {
-            case TokenKind.True:
-                return true;
-            case TokenKind.False:
-                return false;
-            case TokenKind.Identifier:
-                const nameLower = token.text?.toLowerCase();
-                if (this.constants.has(nameLower)) {
-                    return !!this.constants.get(nameLower);
-                }
-                this.addError({
-                    ...DiagnosticMessages.referencedConstDoesNotExist(),
-                    range: token.range
-                });
-                break;
-            default:
-                this.addError({
-                    ...DiagnosticMessages.invalidHashIfValue(),
-                    range: token.range
-                });
-        }
-    }
-}
diff --git a/src/preprocessor/PreprocessorParser.spec.ts b/src/preprocessor/PreprocessorParser.spec.ts
deleted file mode 100644
index 7111fe6d8..000000000
--- a/src/preprocessor/PreprocessorParser.spec.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { PreprocessorParser } from './PreprocessorParser';
-import { identifier, token } from '../parser/tests/Parser.spec';
-import { TokenKind } from '../lexer/TokenKind';
-import { expect } from '../chai-config.spec';
-import type { BrightScriptChunk } from './Chunk';
-
-describe('preprocessor parser', () => {
-    let parser: PreprocessorParser;
-
-    beforeEach(() => {
-        parser = new PreprocessorParser();
-    });
-
-    it('parses chunks of brightscript', () => {
-        let { chunks, diagnostics } = parser.parse([
-            identifier('someFunction'),
-            token(TokenKind.LeftParen, '('),
-            token(TokenKind.RightParen, ')'),
-            token(TokenKind.Newline, '\n'),
-            token(TokenKind.Eof, '\0')
-        ]);
-
-        expect(diagnostics).to.eql([]);
-        expect((chunks[0] as BrightScriptChunk).tokens.map(x => x.kind)).to.eql([
-            TokenKind.Identifier,
-            TokenKind.LeftParen,
-            TokenKind.RightParen,
-            TokenKind.Newline
-        ]);
-    });
-
-    it('parses #const', () => {
-        let { chunks, diagnostics } = parser.parse([
-            token(TokenKind.HashConst, '#const'),
-            identifier('foo'),
-            token(TokenKind.Equal, '='),
-            token(TokenKind.True, 'true'),
-            token(TokenKind.Newline, '\n'),
-            token(TokenKind.Eof, '\0')
-        ]);
-
-        expect(diagnostics).to.be.empty;
-        expect(chunks).to.exist;
-    });
-
-    it('parses #error', () => {
-        let { chunks, diagnostics } = parser.parse([
-            token(TokenKind.HashError, '#error'),
-            token(TokenKind.HashErrorMessage, 'I\'m an error message!'),
-            token(TokenKind.Eof, '\0')
-        ]);
-
-        expect(diagnostics).to.eql([]);
-        expect(chunks).to.exist;
-    });
-
-    describe('conditionals', () => {
-        it('#if only', () => {
-            let { chunks, diagnostics } = parser.parse([
-                token(TokenKind.HashIf, '#if'),
-                identifier('foo'),
-                token(TokenKind.Newline, '\n'),
-                identifier('fooIsTrue'),
-                token(TokenKind.LeftParen, '('),
-                token(TokenKind.RightParen, ')'),
-                token(TokenKind.Newline, '\n'),
-                token(TokenKind.HashEndIf, '#endif'),
-                token(TokenKind.Eof, '\0')
-            ]);
-
-            expect(diagnostics).to.eql([]);
-            expect(chunks).to.exist;
-        });
-
-        it('#if and #else', () => {
-            let { chunks, diagnostics } = parser.parse([
-                token(TokenKind.HashIf, '#if'),
-                identifier('foo'),
-                token(TokenKind.Newline, '\n'),
-
-                identifier('fooIsTrue'),
-                token(TokenKind.LeftParen, '('),
-                token(TokenKind.RightParen, ')'),
-                token(TokenKind.Newline, '\n'),
-
-                token(TokenKind.HashElse, '#else'),
-                token(TokenKind.Newline, '\n'),
-
-                identifier('fooIsFalse'),
-                token(TokenKind.LeftParen, '('),
-                token(TokenKind.RightParen, ')'),
-                token(TokenKind.Newline, '\n'),
-
-                token(TokenKind.HashEndIf, '#endif'),
-                token(TokenKind.Eof, '\0')
-            ]);
-
-            expect(diagnostics).to.eql([]);
-            expect(chunks).to.exist;
-        });
-
-        it('#if #else if and #else', () => {
-            let { chunks, diagnostics } = parser.parse([
-                token(TokenKind.HashIf, '#if'),
-                identifier('foo'),
-                token(TokenKind.Newline, '\n'),
-
-                identifier('fooIsTrue'),
-                token(TokenKind.LeftParen, '('),
-                token(TokenKind.RightParen, ')'),
-                token(TokenKind.Newline, '\n'),
-
-                token(TokenKind.HashElseIf, '#elseif'),
-                identifier('bar'),
-                token(TokenKind.Newline, '\n'),
-
-                identifier('bar'),
-                token(TokenKind.LeftParen, '('),
-                token(TokenKind.RightParen, ')'),
-                token(TokenKind.Newline, '\n'),
-
-                token(TokenKind.HashElse, '#else'),
-                token(TokenKind.Newline, '\n'),
-
-                identifier('neither'),
-                token(TokenKind.LeftParen, '('),
-                token(TokenKind.RightParen, ')'),
-                token(TokenKind.Newline, '\n'),
-
-                token(TokenKind.HashEndIf, '#endif'),
-                token(TokenKind.Eof, '\0')
-            ]);
-
-            expect(diagnostics).to.eql([]);
-            expect(chunks).to.exist;
-        });
-    });
-});
diff --git a/src/preprocessor/PreprocessorParser.ts b/src/preprocessor/PreprocessorParser.ts
deleted file mode 100644
index f5014b9a2..000000000
--- a/src/preprocessor/PreprocessorParser.ts
+++ /dev/null
@@ -1,260 +0,0 @@
-import type { Token } from '../lexer/Token';
-import { TokenKind, AllowedLocalIdentifiers, ReservedWords, DisallowedLocalIdentifiers, AllowedProperties } from '../lexer/TokenKind';
-import * as CC from './Chunk';
-import type { Diagnostic } from 'vscode-languageserver';
-import type { DiagnosticInfo } from '../DiagnosticMessages';
-import { DiagnosticMessages } from '../DiagnosticMessages';
-
-/** * Parses `Tokens` into chunks of tokens, excluding conditional compilation directives. */
-export class PreprocessorParser {
-    public diagnostics: Diagnostic[] = [];
-
-    public tokens: Token[] = [];
-
-    private current = 0;
-
-    /**
-     * an array of chunks (conditional compilation directives and the associated BrightScript)
-     */
-    public chunks: CC.Chunk[] = [];
-
-    /**
-     * Parses an array of tokens into an array of "chunks" - conditional compilation directives and their
-     * associated BrightScript.
-     *
-     * @param tokens the array of tokens to parse
-     */
-    public parse(tokens: Token[]) {
-        this.tokens = tokens;
-        this.diagnostics = [];
-        this.current = 0;
-
-        this.chunks = this.nChunks();
-        return this;
-    }
-
-    public static parse(tokens: Token[]) {
-        return new PreprocessorParser().parse(tokens);
-    }
-
-    /**
-     * Parses tokens to produce an array containing a variable number of heterogeneous chunks.
-     * @returns a heterogeneous array of chunks
-     */
-    private nChunks(): CC.Chunk[] {
-        let chunks: CC.Chunk[] = [];
-
-        while (true) {
-            let c = this.hashConst();
-            if (c) {
-                chunks.push(c);
-            }
-
-            let maybeEof = this.eof();
-            if (maybeEof) {
-                chunks.push(maybeEof);
-                break;
-            } else if (!c) {
-                break;
-            }
-        }
-
-        return chunks;
-    }
-
-    /**
-     * Parses tokens to produce a "declaration" chunk if possible, otherwise falls back to `hashIf`.
-     * @returns a "declaration" chunk if one is detected, otherwise whatever `hashIf` returns
-     */
-    private hashConst(): CC.Chunk | undefined {
-        if (this.match(TokenKind.HashConst)) {
-            let name = this.consume(
-                DiagnosticMessages.expectedIdentifierAfterKeyword('#const'),
-                TokenKind.Identifier,
-                //look for any alphanumeric token, we will throw out the bad ones in the next check
-                ...AllowedLocalIdentifiers,
-                ...AllowedProperties,
-                ...DisallowedLocalIdentifiers
-            );
-
-            //disallow using keywords for const names
-            if (ReservedWords.has(name.text.toLowerCase())) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.constNameCannotBeReservedWord(),
-                    range: name.range
-                });
-            }
-
-            this.consume(
-                DiagnosticMessages.expectedEqualAfterConstName(),
-                TokenKind.Equal
-            );
-            let value = this.advance();
-            //consume trailing newlines
-            while (this.match(TokenKind.Newline)) { }
-            return new CC.DeclarationChunk(name, value);
-        }
-
-        return this.hashIf();
-    }
-
-    /**
-     * Parses tokens to produce an "if" chunk (including "else if" and "else" chunks) if possible,
-     * otherwise falls back to `hashError`.
-     * @returns an "if" chunk if one is detected, otherwise whatever `hashError` returns
-     */
-    private hashIf(): CC.Chunk | undefined {
-        if (this.match(TokenKind.HashIf)) {
-            let startingLine = this.previous().range?.start?.line;
-            let elseChunk: CC.Chunk[] | undefined;
-
-            let ifCondition = this.advance();
-            this.match(TokenKind.Newline);
-
-            let thenChunk = this.nChunks();
-
-            let elseIfs: CC.HashElseIfStatement[] = [];
-
-            while (this.match(TokenKind.HashElseIf)) {
-                let condition = this.advance();
-                this.match(TokenKind.Newline);
-
-                elseIfs.push({
-                    condition: condition,
-                    thenChunks: this.nChunks()
-                });
-            }
-
-            if (this.match(TokenKind.HashElse)) {
-                this.match(TokenKind.Newline);
-
-                elseChunk = this.nChunks();
-            }
-
-            this.consume(
-                DiagnosticMessages.expectedHashElseIfToCloseHashIf(startingLine),
-                TokenKind.HashEndIf
-            );
-            this.match(TokenKind.Newline);
-
-            return new CC.HashIfStatement(ifCondition, thenChunk, elseIfs, elseChunk);
-        }
-
-        return this.hashError();
-    }
-
-    /**
-     * Parses tokens to produce an "error" chunk (including the associated message) if possible,
-     * otherwise falls back to a chunk of plain BrightScript.
-     * @returns an "error" chunk if one is detected, otherwise whatever `brightScriptChunk` returns
-     */
-    private hashError(): CC.Chunk | undefined {
-        if (this.check(TokenKind.HashError)) {
-            let hashErr = this.advance();
-            let message = this.advance();
-            return new CC.ErrorChunk(hashErr, message);
-        }
-
-        return this.brightScriptChunk();
-    }
-
-    /**
-     * Parses tokens to produce a chunk of BrightScript.
-     * @returns a chunk of plain BrightScript if any is detected, otherwise `undefined` to indicate
-     *          that no non-conditional compilation directives were found.
-     */
-    private brightScriptChunk(): CC.BrightScriptChunk | undefined {
-        let chunkTokens: Token[] = [];
-        while (
-            !this.check(
-                TokenKind.HashIf,
-                TokenKind.HashElseIf,
-                TokenKind.HashElse,
-                TokenKind.HashEndIf,
-                TokenKind.HashConst,
-                TokenKind.HashError
-            )
-        ) {
-            let token = this.advance();
-            if (token) {
-                chunkTokens.push(token);
-            }
-
-            if (this.isAtEnd()) {
-                break;
-            }
-        }
-
-        if (chunkTokens.length > 0) {
-            return new CC.BrightScriptChunk(chunkTokens);
-        } else {
-            return undefined;
-        }
-    }
-
-    private eof(): CC.BrightScriptChunk | undefined {
-        if (this.isAtEnd()) {
-            return new CC.BrightScriptChunk([this.peek()]);
-        } else {
-            return undefined;
-        }
-    }
-
-    /**
-     * If the next token is any of the provided tokenKinds, advance and return true.
-     * Otherwise return false
-     */
-    private match(...tokenKinds: TokenKind[]) {
-        for (let tokenKind of tokenKinds) {
-            if (this.check(tokenKind)) {
-                this.advance();
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private consume(diagnosticInfo: DiagnosticInfo, ...tokenKinds: TokenKind[]): Token {
-        let foundTokenKind = tokenKinds
-            .map(tokenKind => this.peek().kind === tokenKind)
-            .reduce((foundAny, foundCurrent) => foundAny || foundCurrent, false);
-
-        if (foundTokenKind) {
-            return this.advance();
-        } else {
-            this.diagnostics.push({
-                ...diagnosticInfo,
-                range: this.peek().range
-            });
-            throw new Error(this.diagnostics[this.diagnostics.length - 1].message);
-        }
-    }
-
-    private advance(): Token {
-        if (!this.isAtEnd()) {
-            this.current++;
-        }
-        return this.previous();
-    }
-
-    private check(...tokenKinds: TokenKind[]) {
-        if (this.isAtEnd()) {
-            return false;
-        }
-
-        return tokenKinds.some(tokenKind => this.peek().kind === tokenKind);
-    }
-
-    private isAtEnd() {
-        return this.peek().kind === TokenKind.Eof;
-    }
-
-    private peek() {
-        return this.tokens[this.current];
-    }
-
-    private previous() {
-        return this.tokens[this.current - 1];
-    }
-}
diff --git a/src/roku-types/data.json b/src/roku-types/data.json
index e87e5da51..d698fd030 100644
--- a/src/roku-types/data.json
+++ b/src/roku-types/data.json
@@ -1,5 +1,5 @@
 {
-    "generatedDate": "2025-10-10T15:16:43.437Z",
+    "generatedDate": "2026-01-20T14:44:40.832Z",
     "nodes": {
         "animation": {
             "description": "Extends [**AnimationBase**](https://developer.roku.com/docs/references/scenegraph/abstract-nodes/animationbase.md\n\nThe Animation node class provides animations of renderable nodes, by applying interpolator functions to the values in specified renderable node fields. For an animation to take effect, an Animation node definition must include a child field interpolator node ([FloatFieldInterpolator](https://developer.roku.com/docs/references/scenegraph/animation-nodes/floatfieldinterpolator.md\"FloatFieldInterpolator\"), [Vector2DFieldInterpolator](https://developer.roku.com/docs/references/scenegraph/animation-nodes/vector2dfieldinterpolator.md\"Vector2DFieldInterpolator\"), [ColorFieldInterpolator](https://developer.roku.com/docs/references/scenegraph/animation-nodes/colorfieldinterpolator.md\"ColorFieldInterpolator\")) definition for each renderable node field that is animated.\n\nThe Animation node class provides a simple linear interpolator function, where the animation takes place smoothly and simply from beginning to end. The Animation node class also provides several more complex interpolator functions to allow custom animation effects. For example, you can move a graphic image around the screen at differing speeds and curved trajectories at different times in the animation by specifying the appropriate function in the easeFunction field (quadratic and exponential are two examples of functions that can be specified). The interpolator functions are divided into two parts: the beginning of the animation (ease-in), and the end of the animation (ease-out). You can apply a specified interpolator function to either or both ease-in and ease-out, or specify no function for either or both (which is the linear function). You can also change the portion of the animation that is ease-in and ease-out to arbitrary fractional values for a quadratic interpolator function applied to both ease-in and ease-out.",
@@ -2773,6 +2773,13 @@
                 "url": "https://developer.roku.com/docs/references/scenegraph/label-nodes/label-base.md"
             },
             "fields": [
+                {
+                    "accessPermission": "READ_WRITE",
+                    "default": "system default",
+                    "description": "Specifies the Font node to be used",
+                    "name": "font",
+                    "type": "Font"
+                },
                 {
                     "accessPermission": "READ_WRITE",
                     "default": "false",
@@ -2842,13 +2849,6 @@
                     "name": "ellipsizeOnBoundary",
                     "type": "Boolean"
                 },
-                {
-                    "accessPermission": "READ_WRITE",
-                    "default": "system default",
-                    "description": "Specifies the Font node to be used",
-                    "name": "font",
-                    "type": "Font"
-                },
                 {
                     "accessPermission": "READ_WRITE",
                     "default": "0",
@@ -3737,7 +3737,7 @@
                     "default": "\"\"",
                     "description": "Specifies the bitmap to use for the group alpha mask. The alpha value of each pixel rendered in the group is multiplied by the value of a pixel in the alpha mask. The mapping from pixel coordinates in the group to mask pixel coordinates is controlled by the maskSize and maskOffset field values. Those fields define a coordinate system for the mask bitmap relative to the group coordinate system. This mask coordinate system is used to map mask pixels to their corresponding pixels in the MaskGroup node",
                     "name": "maskUri",
-                    "type": "URI string"
+                    "type": "uri"
                 }
             ],
             "interfaces": [],
@@ -6956,7 +6956,7 @@
                 {
                     "accessPermission": "WRITE_ONLY",
                     "default": "{ }",
-                    "description": "The significance and priority order of the attributes and values for the audio tracks available in the video stream. > A language matching any country code does not match a track that specifies the same language but with no country code. Provide the attribute fields from highest to lowest significance (for example, if the \\*\\*language\\*\\* should take precedence over the \\*\\*description\\*\\*, list \\*\\*language\\*\\* first. For the audio track languages, provide the language code values from highest to lowest priority (for example, if English for the United States \\\\\\[\"en-US\"\\\\\\] has precedence over English for the United Kingdom \\\\\\[\"en-UK\"\\\\\\], list the language codes in the following order: \\\\\\[\"en-US\", \"en-UK\"\\\\\\].\n\n| Field | Type | Description |\n| --- | --- | --- |\n| values | roAssociativeArray | Specify values for the following audio track attributes. List the attributes from highest to lowest significance.    <table><thead><tr><th>Field</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>language</td><td>array of Strings</td><td>A list of (ISO-639)/country (ISO-3166) codes for the audio track. List the languages in priority order (highest to lowest).</td></tr><tr><td>descriptive</td><td>array of Strings</td><td>A flag indicating whether descriptives exist for the video playing in the stream. This is equivalent to the HLS \"public.accessibility.describes-video\" characteristic.</td></tr></tbody></table>   |\n| overrideSystem | boolean | Specify whether to use the app's preferences over the system preferences (true) or use the app's preferences only when the system preferences do not match any of the available tracks (false), which allows the app to provide additional rules in this case. The default value is false. |\n\n\\*\\*Example\\*\\* \\`\\`\\` video.audioSelectionPreferences = { values: \\[ { language: \\[\"en-US\", \"en-UK\", \"en\", \"en-\\*\"\\] }, { descriptive: \"false\" } \\], overrideSystem: true } \\`\\`\\` \\*\\*Explanation\\*\\* The audio language with the highest priority is \"en-US\". The next highest priority language is \"en-UK\", then \"en\" with no country code, and finally \"en\" with any country code.",
+                    "description": "The significance and priority order of the attributes and values for the audio tracks available in the video stream. > A language matching any country code does not match a track that specifies the same language but with no country code. Provide the attribute fields from highest to lowest significance (for example, if the \\*\\*language\\*\\* should take precedence over the \\*\\*description\\*\\*, list \\*\\*language\\*\\* first. For the audio track languages, provide the language code values from highest to lowest priority (for example, if English for the United States \\\\\\[\"en-US\"\\\\\\] has precedence over English for the United Kingdom \\\\\\[\"en-UK\"\\\\\\], list the language codes in the following order: \\\\\\[\"en-US\", \"en-UK\"\\\\\\].\n\n| Field | Type | Description |\n| --- | --- | --- |\n| values | roArray of roAssociativeArrays | Specify values for the following audio track attributes. List the attributes from highest to lowest significance.    <table><thead><tr><th>Field</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>language</td><td>array of Strings</td><td>A list of (ISO-639)/country (ISO-3166) codes for the audio track. List the languages in priority order (highest to lowest).</td></tr><tr><td>descriptive</td><td>array of Strings</td><td>A flag indicating whether descriptives exist for the video playing in the stream. This is equivalent to the HLS \"public.accessibility.describes-video\" characteristic.</td></tr></tbody></table>   |\n| overrideSystem | boolean | Specify whether to use the app's preferences over the system preferences (true) or use the app's preferences only when the system preferences do not match any of the available tracks (false), which allows the app to provide additional rules in this case. The default value is false. |\n\n\\*\\*Example\\*\\* \\`\\`\\` video.audioSelectionPreferences = { values: \\[ { language: \\[\"en-US\", \"en-UK\", \"en\", \"en-\\*\"\\] }, { descriptive: \"false\" } \\], overrideSystem: true } \\`\\`\\` \\*\\*Explanation\\*\\* The audio language with the highest priority is \"en-US\". The next highest priority language is \"en-UK\", then \"en\" with no country code, and finally \"en\" with any country code.",
                     "name": "audioSelectionPreferences",
                     "type": "roAssociativeArray"
                 },
@@ -7425,7 +7425,7 @@
                 {
                     "accessPermission": "WRITE_ONLY",
                     "default": "{ }",
-                    "description": "The significance and priority order of the attributes and values for the subtitle tracks available in the video stream. Provide the attribute fields from highest to lowest significance (for example, if \\*\\*language\\*\\* should take precedence over all other attributes, list it first). For the subtitle track languages, provide the language codes from highest to lowest priority (for example, if Spanish for Latin America and the Caribbean \\\\\\[\"es-419\"\\\\\\] has precedence over Spanish \\\\\\[\"es\"\\\\\\], list the language codes in the following order: \\\\\\[\"es-419\", \"es\"\\\\\\].\n\n| Field | Type | Description |\n| --- | --- | --- |\n| values | roAssociativeArray | Specify values for the following subtitle track attributes. List the attributes from highest to lowest significance.    <table><thead><tr><th>Field</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>language</td><td>array of Strings</td><td>A list of language (ISO-639)/country (ISO-3166) codes for the subtitles. List the language codes in priority order (highest to lowest).</td></tr><tr><td>caption</td><td>string</td><td>A flag indicating whether captions exist for the video stream. This is equivalent to the HLS \"public.accessibility.transcribes-spoken-dialog\" characteristic.</td></tr><tr><td>descriptive</td><td>string</td><td>A flag indicating whether descriptives exist for the music and sounds in the video stream. This is equivalent to the HLS \"public.accessibility.describes-music-and-sound\" characteristic.</td></tr><tr><td>easyReader</td><td>string</td><td>A flag indicating whether subtitles are easy to read.</td></tr></tbody></table>   |\n| overrideSystem | boolean | Specify whether to use the app's preferences over the system preferences (true) or use the app's preferences only when the system preferences do not match any of the available tracks (false), which allows the app to provide additional rules in this case. The default value is false. |\n\n\\*\\*Example\\*\\* \\`\\`\\` video.subtitleSelectionPreferences = { values: \\[ { language: \\[\"es-419\", \"es\", \"es-\\*\", \"fr\", \"en-US\", \"en-UK\", \"en\"\\] }, { caption: \"true\" }, { descriptive: \\[\"false\"\\] }, { easyReader: \"true\" } \\], overrideSystem: true } \\`\\`\\` \\*\\*Explanation\\*\\* The subititle language with the highest priority is \"es\" with a country code of \"419\". The next highest priority language is \"es\" with no country code, and then \"es\" with any country code.",
+                    "description": "The significance and priority order of the attributes and values for the subtitle tracks available in the video stream. Provide the attribute fields from highest to lowest significance (for example, if \\*\\*language\\*\\* should take precedence over all other attributes, list it first). For the subtitle track languages, provide the language codes from highest to lowest priority (for example, if Spanish for Latin America and the Caribbean \\\\\\[\"es-419\"\\\\\\] has precedence over Spanish \\\\\\[\"es\"\\\\\\], list the language codes in the following order: \\\\\\[\"es-419\", \"es\"\\\\\\].\n\n| Field | Type | Description |\n| --- | --- | --- |\n| values | roArray of roAssociativeArrays | Specify values for the following subtitle track attributes. List the attributes from highest to lowest significance.    <table><thead><tr><th>Field</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>language</td><td>array of Strings</td><td>A list of language (ISO-639)/country (ISO-3166) codes for the subtitles. List the language codes in priority order (highest to lowest).</td></tr><tr><td>caption</td><td>string</td><td>A flag indicating whether captions exist for the video stream. This is equivalent to the HLS \"public.accessibility.transcribes-spoken-dialog\" characteristic.</td></tr><tr><td>descriptive</td><td>string</td><td>A flag indicating whether descriptives exist for the music and sounds in the video stream. This is equivalent to the HLS \"public.accessibility.describes-music-and-sound\" characteristic.</td></tr><tr><td>easyReader</td><td>string</td><td>A flag indicating whether subtitles are easy to read.</td></tr></tbody></table>   |\n| overrideSystem | boolean | Specify whether to use the app's preferences over the system preferences (true) or use the app's preferences only when the system preferences do not match any of the available tracks (false), which allows the app to provide additional rules in this case. The default value is false. |\n\n\\*\\*Example\\*\\* \\`\\`\\` video.subtitleSelectionPreferences = { values: \\[ { language: \\[\"es-419\", \"es\", \"es-\\*\", \"fr\", \"en-US\", \"en-UK\", \"en\"\\] }, { caption: \"true\" }, { descriptive: \\[\"false\"\\] }, { easyReader: \"true\" } \\], overrideSystem: true } \\`\\`\\` \\*\\*Explanation\\*\\* The subititle language with the highest priority is \"es\" with a country code of \"419\". The next highest priority language is \"es\" with no country code, and then \"es\" with any country code.",
                     "name": "subtitleSelectionPreferences",
                     "type": "roAssociativeArray"
                 },
@@ -7672,6 +7672,10 @@
                     "name": "ifArraySet",
                     "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifarrayset.md"
                 },
+                {
+                    "name": "ifArraySizeInfo",
+                    "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifarraysizeinfo.md"
+                },
                 {
                     "name": "ifArraySlice",
                     "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifarrayslice.md"
@@ -7793,7 +7797,7 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "string"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roAudioResource"
@@ -7834,16 +7838,6 @@
                     ],
                     "returnType": "roBitmap"
                 },
-                {
-                    "params": [
-                        {
-                            "isRequired": true,
-                            "name": "param1",
-                            "type": "string"
-                        }
-                    ],
-                    "returnType": "roBitmap"
-                },
                 {
                     "params": [
                         {
@@ -8534,7 +8528,7 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "string"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roPath"
@@ -8585,12 +8579,12 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "string"
+                            "type": "dynamic"
                         },
                         {
                             "isRequired": true,
                             "name": "param2",
-                            "type": "string"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roRegex"
@@ -8696,7 +8690,7 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "string"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roRegistrySection"
@@ -8834,17 +8828,17 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "boolean"
+                            "type": "dynamic"
                         },
                         {
                             "isRequired": true,
                             "name": "param2",
-                            "type": "integer"
+                            "type": "dynamic"
                         },
                         {
                             "isRequired": true,
                             "name": "param3",
-                            "type": "integer"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roScreen"
@@ -8854,7 +8848,7 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "boolean"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roScreen"
@@ -8899,7 +8893,7 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "string"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roSGNode"
@@ -9158,7 +9152,7 @@
                         {
                             "isRequired": true,
                             "name": "param1",
-                            "type": "string"
+                            "type": "dynamic"
                         }
                     ],
                     "returnType": "roTextureRequest"
@@ -9251,9 +9245,16 @@
             "url": "https://developer.roku.com/docs/references/brightscript/components/rourltransfer.md"
         },
         "routils": {
+            "availableSince": "15.0",
             "constructors": [],
+            "description": "_Available since Roku OS 15.0_\n\nThe **roUtils** component provides a unique namespace for a library of global functions, including the **DeepCopy()** function for copying objects and their nested objects and the **isSameObject()** function for checking whether two BrightScript objects refer to the same instance.",
             "events": [],
-            "interfaces": [],
+            "interfaces": [
+                {
+                    "name": "ifUtils",
+                    "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifutils.md"
+                }
+            ],
             "methods": [
                 {
                     "description": "Performs a deep copy of the source node object (it copies the obejct and all of its nested objects). If the source object contains items that are not copyable, they are skipped.",
@@ -9293,7 +9294,8 @@
                     "returnType": "Boolean"
                 }
             ],
-            "name": "roUtils"
+            "name": "roUtils",
+            "url": "https://developer.roku.com/docs/references/brightscript/components/routils.md"
         },
         "rovideoplayer": {
             "constructors": [
@@ -9386,21 +9388,21 @@
                     "name": "GetDevID",
                     "params": [],
                     "returnDescription": "App's Developer ID",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the app's channel ID.",
                     "name": "GetID",
                     "params": [],
                     "returnDescription": "Channel ID; e.g., \"12345\" or \"dev\"",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the title value from the manifest.",
                     "name": "GetTitle",
                     "params": [],
                     "returnDescription": "Title of the app",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the named manifest value, or an empty string if the entry is does not exist.",
@@ -9415,21 +9417,21 @@
                         }
                     ],
                     "returnDescription": "Manifest value; empty string",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the conglomerate version number from the manifest, as formatted major\\_version + minor\\_version + build\\_version.",
                     "name": "GetVersion",
                     "params": [],
                     "returnDescription": "App version number. e.g. \"1.2.3\"",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns true if the application is sideloaded, i.e. the app ID is \"dev\".",
                     "name": "IsDev",
                     "params": [],
                     "returnDescription": "True/ False",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifAppInfo",
@@ -9449,21 +9451,21 @@
                     "description": "Returns a roAssociativeArray that includes an exit code indicating why an app was terminated, a timestamp, the state of the app and Roku media player at the time the app was exited, and the memory limit exceeded (if applicable). This helps developers monitor and debug memory issues with their apps.",
                     "name": "GetLastExitInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the user's screensaver wait time setting in number of minutes, or zero if the screensaver is disabled.",
                     "name": "GetScreensaverTimeout",
                     "params": [],
                     "returnDescription": "The number of minutes set for the screensaver wait time.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an [roTimespan](https://developer.roku.com/docs/references/brightscript/components/rotimespan.md\"roTimespan\") object, which is \"marked\" when the user clicked on the application button on the home screen.Calling the TotalMilliseconds() method on the returned roTimespan object returns the total number of milliseconds since the application started.",
                     "name": "GetUptime",
                     "params": [],
                     "returnDescription": "An [roTimespan](/docs/references/brightscript/components/rotimespan.md \"roTimespan\") object.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "This method returns true if an app with the specified channelID and the minimum version required is installed.",
@@ -9485,7 +9487,7 @@
                         }
                     ],
                     "returnDescription": "A boolean indicating whether the specified BrightScript app is installed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables or disables the automatic screen reader and override any manifest setting.This is useful for apps that want to temporarily turn off the automatic screen reader for specific screens.",
@@ -9499,7 +9501,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Updates video or audio [content metadata](/docs/developer-program/getting-started/architecture/content-metadata.md) during playback. This method takes a subset of content metadata parameters to be updated. These values override any previously ones sent to the Roku Media Player, and they are used until this function is called again or until the [**roAppManager**](https://developer.roku.com/docs/references/brightscript/components/roappmanager.md instance is deleted.",
@@ -9513,7 +9515,7 @@
                             "type": "roAssociativeArray"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "This method allows an app to tell Roku when the user is signed in or signed out of the appIf the app is removed, the Roku OS will call SetUserSignedIn(false) on the app's behalf.",
@@ -9527,7 +9529,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Specifies a list of text strings, such as user profile names, that can be matched to voice requests.",
@@ -9541,13 +9543,13 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Triggers a voice request for the viewer to select a user profile if the device is paired with a hands-free Roku Voice remote control. This function should be called by apps that support voice commands and display a user profile selection screen upon launch, which is when this method should be called.",
                     "name": "StartVoiceActionSelectionRequest",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifAppManager",
@@ -9576,7 +9578,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether memory alerts have been enabled.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the estimated kilobytes (Kb) of memory available for the app. This can be used to determine when to release memory when an app receives low-memory warnings.",
@@ -9589,7 +9591,7 @@
                     "description": "Returns the amount of foreground and background memory the app may use and the maximum amount of memory that the RokuOS may allocate on behalf of the app (the memory that shows up in the app's heap memory statistics). This helps developers debug memory issues and find out the maximum available memory for scenarios such as when their app has been suspended and is in the background, is playing a video, and so on.",
                     "name": "GetChannelMemoryLimit",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the usage percentage of memory limit for the app.",
@@ -9639,20 +9641,20 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Deletes all the entries in the array.",
                     "name": "Clear",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns the length of the array, which is one more than the index of highest entry.",
                     "name": "Count",
                     "params": [],
                     "returnDescription": "The length of the array.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Deletes the indicated array entry, and shifts all entries up. This decreases the array length by one.",
@@ -9660,27 +9662,28 @@
                     "params": [
                         {
                             "default": null,
+                            "description": "The entry to be removed from the array.",
                             "isRequired": true,
                             "name": "index",
                             "type": "Integer"
                         }
                     ],
                     "returnDescription": "A flag indicating whether the specified array entry has been removed. If the entry was successfully deleted, returns true. If index is out of range, returns false and does not change the array.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the last (highest index) array entry without removing it. If the array is empty, returns invalid",
                     "name": "Peek",
                     "params": [],
                     "returnDescription": "Invalid",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the last entry (highest index) from the array and removes it from the array. If the array is empty, returns invalid and does not change the array.",
                     "name": "Pop",
                     "params": [],
                     "returnDescription": "The last (highest index) array entry.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Adds the specified value to the end of the array.",
@@ -9694,14 +9697,14 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Removes the first entry (zero index) from the beginning of the array and shifts the other entries up. This method is similar to the [Pop method](#pushtvalue-as-dynamic-as-void), but removes the first entry in the array instead of the last one.",
                     "name": "Shift",
                     "params": [],
                     "returnDescription": "The first entry (zero index) removed from the array.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Adds the specified value to the beginning of the array (at the zero index) and shifts the other entries down. This method is similar to the [Push method](#push-as-dynamic), but adds the new entry to the beginning of the array instead of to the end.",
@@ -9715,7 +9718,7 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifArray",
@@ -9760,7 +9763,7 @@
                         }
                     ],
                     "returnDescription": "The array entry corresponding to the provided index, or invalid if the entry has not been set.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 }
             ],
             "name": "ifArrayGet",
@@ -9789,7 +9792,7 @@
                         }
                     ],
                     "returnDescription": "A String containing the array elements.",
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "ifArrayJoin",
@@ -9840,13 +9843,62 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifArraySet",
             "properties": [],
             "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifarrayset.md"
         },
+        "ifarraysizeinfo": {
+            "availableSince": "15.0",
+            "description": "_Available since Roku OS 15.0_\n\nThe **ifArraySizeInfo()** interface includes set of functions that provide developers with more control over array capacities. These functions reduce the memory overhead when using the [**ParseJSON()** function](https://developer.roku.com/docs/references/brightscript/language/global-utility-functions.mdparsejsonjsonstring-as-string-flags---as-string-as-object) on large JSON body data sets.",
+            "implementers": [
+                {
+                    "description": "An array stores an indexed collection of BrightScript objects. Each entry of an array can be a different type, or they may all of the same type.",
+                    "name": "roArray",
+                    "url": "https://developer.roku.com/docs/references/brightscript/components/roarray.md"
+                }
+            ],
+            "methods": [
+                {
+                    "description": "Returns the current storage capacity of the array (specifically, how many items could be stored without allocating additional storage).",
+                    "name": "Capacity",
+                    "params": [],
+                    "returnType": "integer"
+                },
+                {
+                    "description": "Returns a flag indicating whether the array will automatically expand to store new items.",
+                    "name": "IsResizable",
+                    "params": [],
+                    "returnDescription": "A flag indicating whether the array will automatically expand to store new items.",
+                    "returnType": "boolean"
+                },
+                {
+                    "description": "Sends a request to allocate or increase storage capacity of the array to hold at least the specified number of items.",
+                    "name": "Reserve",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "minSize",
+                            "type": "Integer"
+                        }
+                    ],
+                    "returnType": "boolean"
+                },
+                {
+                    "description": "Sends a request to free or decrease storage to the minimum needed to store the current number of items.",
+                    "name": "ShrinkToFit",
+                    "params": [],
+                    "returnDescription": "Returns true unless the array is not resizable or storage reallocation fails.",
+                    "returnType": "boolean"
+                }
+            ],
+            "name": "ifArraySizeInfo",
+            "properties": [],
+            "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifarraysizeinfo.md"
+        },
         "ifarrayslice": {
             "implementers": [
                 {
@@ -9881,7 +9933,7 @@
                         }
                     ],
                     "returnDescription": "\n\n or \n\nShallow copy of specified portion of the array",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifArraySlice",
@@ -9901,7 +9953,7 @@
                     "description": "Reverses the order of elements in an array.",
                     "name": "Reverse",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Performs a stable sort on an array.",
@@ -9976,7 +10028,7 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Appends an associative array to this calling object. If any key in the **aa** parameter is already associated with a value in the calling object, the current value is discarded and is replaced with the value provided in the **aa** parameter.",
@@ -9990,20 +10042,20 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Remove all key/values from the associative array.",
                     "name": "Clear",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns the number of keys in the associative array.",
                     "name": "Count",
                     "params": [],
                     "returnDescription": "The number of keys in the associative array.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Deletes an entry from an associative array based on the key.",
@@ -10018,7 +10070,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether an entry is associated with the specified key exists. If there is no associated object then false is returned. If there is such an object then true is returned.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Looks for an entry in the associative array associated with the specified key.",
@@ -10033,21 +10085,21 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether an entry is associated with the specified key exists. If there is no associated object then false is returned. If there is such an object then true is returned.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns an array containing the associative array key/value pairs in lexicographical order of key.",
                     "name": "Items",
                     "params": [],
                     "returnDescription": "An array of associative array keys/value pairs.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns an array containing the associative array keys in lexicographical order.",
                     "name": "Keys",
                     "params": [],
                     "returnDescription": "An array of associative array keys.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the value in the array associated with the specified key. The key comparison is case-insensitive, unless the **SetModeCaseSensitive()** method has been called.",
@@ -10062,7 +10114,7 @@
                         }
                     ],
                     "returnDescription": "Returns the value in the array associated with the specified key. If there is no value associated with the key, the type \"invalid\" is returned.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Same as the [Lookup()](#lookupkey-as-string-as-dynamic) method except that the key comparison is always case insensitive, regardless of the case mode.",
@@ -10077,13 +10129,13 @@
                         }
                     ],
                     "returnDescription": "Returns the value in the array associated with the specified key. If there is no value associated with the key, the type \"invalid\" is returned.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Makes all subsequent associative array lookups case sensitive (by default, lookups are case insensitive).",
                     "name": "SetModeCaseSensitive",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifAssociativeArray",
@@ -10133,7 +10185,7 @@
                         }
                     ],
                     "returnDescription": "An ID associated with the spoken string to be used to notify observer callbacks.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "If the screen reader is enabled, causes text to speech to continue to suppress any application background sound for the amount of time specified by duration (in milliseconds).This can be used to add clarity for longer spoken text that may have pauses that might otherwise allow application background sound to be heard. This method does nothing if screen reader is currently disabled.",
@@ -10148,7 +10200,7 @@
                         }
                     ],
                     "returnDescription": "The number of milliseconds that the background sound has been silenced.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifAudioGuide",
@@ -10169,21 +10221,21 @@
                     "name": "GetAudioProperties",
                     "params": [],
                     "returnDescription": "An associative array that may be set to one of the following values (these are values that may involve reading a larger portion of the file and thus may take longer to retrieve than tags):",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the cover art, if available.",
                     "name": "GetCoverArt",
                     "params": [],
                     "returnDescription": "An associative array with two entries: \"bytes\" and \"type\".",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns an associative array that contains a simple set of tags that are common to most audio formats.",
                     "name": "GetTags",
                     "params": [],
                     "returnDescription": "An associative array that may be set to one of the following values:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Sets the URL to the audio file. Only file URLs are initially supported",
@@ -10197,7 +10249,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifAudioMetaData",
@@ -10225,34 +10277,34 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Clears the content list.",
                     "name": "ClearContent",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Puts the Audio Player into pause mode. It is an error to Pause if player is not in play mode.",
                     "name": "Pause",
                     "params": [],
                     "returnDescription": "A flag indicating whether the Audio Player was successfully set to pause mode.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Puts the Audio Player into play mode starting at the current item in the Content List. This will stop any currently playing content.",
                     "name": "Play",
                     "params": [],
                     "returnDescription": "A flag indicating whether the Audio Player was successfully set to play mode.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Puts the Audio Player into play mode starting from the pause point. It is an error to Resume if the player is not in pause mode.",
                     "name": "Resume",
                     "params": [],
                     "returnDescription": "A flag indicating whether the Audio Player was successfully set to play mode.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Set the start point of playback for the current item to offsetMs milliseconds.",
@@ -10267,7 +10319,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the Audio Player was successfully set to the specified offset.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the content list to be played by the Audio Player.",
@@ -10280,7 +10332,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Enables/disables the automatic replaying of the Content List.",
@@ -10294,7 +10346,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the next item in the Content List to be played.",
@@ -10308,7 +10360,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Specifies the timedMetaData keys that the app is interested in receiving from the timedMetaData event.",
@@ -10322,14 +10374,14 @@
                             "type": "roArray"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Stops the Audio Player from playing or pausing and cleanup.",
                     "name": "Stop",
                     "params": [],
                     "returnDescription": "A flag indicating whether the Audio Player was successfully stopped.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifAudioPlayer",
@@ -10350,27 +10402,27 @@
                     "name": "GetMetaData",
                     "params": [],
                     "returnDescription": "An associative array with the following integer values:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks whether this audio resource is currently playing.",
                     "name": "IsPlaying",
                     "params": [],
                     "returnDescription": "A flag indicating whether the calling audio resource is playing.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the device-dependent maximum number of audio streams that can be mixed together and presented simultaneously.",
                     "name": "MaxSimulStreams",
                     "params": [],
                     "returnDescription": "Typically, 1-2.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Stops playing the audio resource. If the resource is not currently playing, has no effect.",
                     "name": "Stop",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nThis method triggers the start of the audio resource sound playback. The effect of Trigger(volume) is identical to Trigger(volume, 0).\n\n or \n\nTriggers the start of the audio resource sound playback. This method will interrupt any playing sound when the index is the same. It will mix with any playing sound if the index is different.",
@@ -10392,7 +10444,7 @@
                         }
                     ],
                     "returnDescription": "",
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifAudioResource",
@@ -10414,7 +10466,7 @@
                     "name": "GetBoolean",
                     "params": [],
                     "returnDescription": "The boolean value stored in the calling boolean object.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the calling boolean object to the specified true/false value.",
@@ -10428,7 +10480,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifBoolean",
@@ -10471,7 +10523,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the file was successfully appended to the calling ByteArray.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the contents of the Byte Array to the specified string using UTF-8 encoding. Any data currently in the Byte Array is discarded.",
@@ -10499,7 +10551,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the contents of the Byte Array to the specified value. Any data currently in the Byte Array is discarded.",
@@ -10513,7 +10565,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nCalculates a CRC-32 of the contents of the Byte Array.\n\n or \n\nCalculates a CRC-32 of a subset of bytes within the Byte Array.",
@@ -10535,7 +10587,7 @@
                         }
                     ],
                     "returnDescription": "The calculated CRC-32 checksum.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the signed byte at the specified zero-based index in the Byte ArrayUse the [ifArrayGet.GetEntry()](https://developer.roku.com/docs/references/brightscript/interfaces/ifarrayget.mdgetentryindex-as-integer-as-dynamic) method or the \\[ \\] array operator to read an unsigned byte in the Byte Array.",
@@ -10550,7 +10602,7 @@
                         }
                     ],
                     "returnDescription": "The signed byte at the specified zero-based index in the Byte Array.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the signed long (four bytes) starting at the specified zero-based index in the Byte Array.",
@@ -10565,14 +10617,14 @@
                         }
                     ],
                     "returnDescription": "A signed long.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns true if the CPU architecture is little-endian.",
                     "name": "IsLittleEndianCPU",
                     "params": [],
                     "returnDescription": "A flag indicating whether the CPU architecture is little-endian.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nReads the specified file into the Byte Array. Any data currently in the Byte Array is discarded.",
@@ -10601,7 +10653,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the bytes were successfully read into the Byte Array.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "If the size of the Byte Array is less than min\\_size, expands the Byte Array to min\\_size. Also sets the auto-resize attribute of the Byte Array to the specified value.",
@@ -10622,28 +10674,28 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns the contents of the Byte Array as a string. The contents must be valid UTF-8 (or ASCII subset), or the result is undefined",
                     "name": "ToAsciiString",
                     "params": [],
                     "returnDescription": "A String containing the contents of the ByteArray.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a base-64 string representing the contents of the Byte Array.",
                     "name": "ToBase64String",
                     "params": [],
                     "returnDescription": "A base-64 string representing the contents of the Byte Array.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a hexadecimal string representing the contents of the Byte Array, two digits per byte.",
                     "name": "ToHexString",
                     "params": [],
                     "returnDescription": "A hexadecimal string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nWrites the bytes contained in the Byte Array to the specified file.\n\n or \n\nWrites a subset of the bytes contained in the Byte Array to the specified file.",
@@ -10672,7 +10724,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the bytes were successfully written to the file.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifByteArray",
@@ -10693,7 +10745,7 @@
                     "name": "IsActiveSource",
                     "params": [],
                     "returnDescription": "A flag indicating whether the device is the active source (true). If the device is not the active source, this flag is set to false.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifCECStatus",
@@ -10712,7 +10764,7 @@
                 {
                     "name": "ClearOrder",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "This function is equivalent to doOrder() for transactional purchases. The user's billing status must first be confirmed with RequestPartnerOrder() prior to calling this function.",
@@ -10753,14 +10805,14 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Displays the Streaming Store Product Purchase Screen populated with information from the current Order.",
                     "name": "DoOrder",
                     "params": [],
                     "returnDescription": "A flag indicating whether the user approved the order (true if the order was approved; false otherwise).",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "It is recommended that developers use [billing testing](/docs/developer-program/roku-pay/testing/billing-testing.md) instead of this method.",
@@ -10774,26 +10826,26 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "The **getAllPurchases** function is similar to the [**getPurchases** function](#getpurchases-as-void) except that it requests the historical list of all canceled, expired, and terminated subscriptions over the lifetime of the current user account—in addition to the active subscriptions. You can use this method to leverage purchase history in order to implement subscription renewal flows and more easily determine if subscriptions have expired.",
                     "name": "GetAllPurchases",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Requests the list of in-app products that are linked to the running app.",
                     "name": "GetCatalog",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Retrieves a Roku Partner Unique Customer Identifier (roku\\_pucid), or retrieves an access token, oAuth token, or other authentication artifact (channel\\_data).",
                     "name": "GetChannelCred",
                     "params": [],
                     "returnDescription": "An associative array that contains the following fields:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Generates a signed JSON web token (JWT) in the Roku cloud and returns it to the app. This token can then be used by the publisher's web services to verify that a message originated from a genuine Roku device. The following example demonstrates how to generate the device attestation token:",
@@ -10808,21 +10860,21 @@
                         }
                     ],
                     "returnDescription": "The generated JWT token. The following demonstrates a sample JWT that is returned to the app. Developers can use a [JWT debugger](https://jwt.io/#debugger-io) to decode this token.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a unique number for this object that can be used to identify whether a roChannelStoreEvent event originated from this object, by comparing with the roChannelStoreEvent object's GetSourceIdentity() value.",
                     "name": "GetIdentity",
                     "params": [],
                     "returnDescription": "The unique number generated for the object.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Retrieves the current Order.",
                     "name": "GetOrder",
                     "params": [],
                     "returnDescription": "The returned object is an roList of roAssociativeArray items, where each item contains the following parameter names with specified value type:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "This function works like GetUserData(), but allows the caller to specify which user data elements to return. The specified values are also displayed in the user data dialog screen.",
@@ -10844,33 +10896,33 @@
                         }
                     ],
                     "returnDescription": "An roAssociativeArray containing the Roku account information passed in the method.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Requests the list of purchases associated with the current user account.",
                     "name": "GetPurchases",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Requests the list of globally available in-app products, which are available to all apps.",
                     "name": "GetStoreCatalog",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "The GetUserData() function provides a way to request user authorization to share the user’s account information with the calling app.",
                     "name": "GetUserData",
                     "params": [],
                     "returnDescription": "When called, the method presents a dialog screen containing the user’s account information, along with two buttons labeled Share and Don’t Share.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Retrieves the state, zip code, and country associated with the customer's Roku account. The location information returned by this command can be used to determine a customer's eligibility for regional-specific subscription products and content.",
                     "name": "GetUserRegionData",
                     "params": [],
                     "returnDescription": "An associative array that contains the following fields:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks the user's billing status and is a prerequisite for ConfirmPartnerOrder() when doing transactional purchases.",
@@ -10911,7 +10963,7 @@
                             "type": "roAssociativeArray"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Stores an access token, oAuth token, or other authentication artifact that can be retrieved by calling the [GetChannelCred()](https://developer.roku.com/docs/references/brightscript/interfaces/ifchannelstore.mdgetchannelcred-as-object)method. This data is stored securely in the Roku cloud and can be retrieved by other devices linked to the same Roku account. This method can be used to store an authentication artifact with Roku for a signed in user, associating that user with a particular Roku account. For more information, see [Automatic Account Link](/docs/developer-program/authentication/universal-authentication-protocol-for-single-sign-on.md).",
@@ -10926,7 +10978,7 @@
                         }
                     ],
                     "returnDescription": "This command returns an roAssociativeArray with the following values:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifChannelStore",
@@ -10954,7 +11006,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Provides a global search and replace of sprite [roRegions](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegions\"). Replaces regions that match oldRegion with newRegion",
@@ -10975,19 +11027,19 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Draws any dirty sprites (that is, whatever is new or has changed since the last Draw). No compositor or sprite operations will be reflected on the display until Draw() is called. After calling Draw(), you must call Finish() (if single buffered) or SwapBuffers() (if double buffered) before the changes will be user visible",
                     "name": "Draw",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Redraws all sprites even if not dirty. After calling Draw(), you must call Finish() (if single buffered) or SwapBuffers() (if double buffered) before the changes will be user visible",
                     "name": "DrawAll",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Creates a new sprite that consists of a sequence of frames to be animated. The frames are defined by the regionArray which is an [roArray](https://developer.roku.com/docs/references/brightscript/components/roarray.md\"roArray\") of [roRegions](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegions\"). Position the sprite at coordinate x,y. If z is provided, position the sprite in front of all other sprites with equal or lower z value",
@@ -11023,7 +11075,7 @@
                         }
                     ],
                     "returnDescription": "Returns an [roSprite](/docs/references/brightscript/components/rosprite.md \"roSprite\") object.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Creates a new sprite, using an roRegion to define the sprite's bitmap. Position the sprite at coordinate x,y. If z is provided, position the sprite in front of all other sprites with equal or lower z value. Sprites with negative z values are not rendered or displayed on the screen.",
@@ -11059,7 +11111,7 @@
                         }
                     ],
                     "returnDescription": "Returns an [roSprite](/docs/references/brightscript/components/rosprite.md \"roSprite\") object.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Sets the destBitmap ([roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or [roScreen](https://developer.roku.com/docs/references/brightscript/components/roscreen.md\"roScreen\")) and the background color.",
@@ -11080,7 +11132,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifCompositor",
@@ -11109,7 +11161,22 @@
                         }
                     ],
                     "returnDescription": "A dateString corresponding to the specified format.",
-                    "returnType": "String"
+                    "returnType": "string"
+                },
+                {
+                    "description": "Returns the localized date of the device.",
+                    "name": "asDateStringLoc",
+                    "params": [
+                        {
+                            "default": null,
+                            "description": "Specify the format of the date string to be returned:  *   full *   long *   medium *   short *   custom formatting string using date symbols (for example, \"MMM d, y\")",
+                            "isRequired": true,
+                            "name": "format",
+                            "type": "String"
+                        }
+                    ],
+                    "returnDescription": "A date string corresponding to the specified format:",
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the localized date of the device.",
@@ -11131,14 +11198,43 @@
                     "name": "AsDateStringNoParam",
                     "params": [],
                     "returnDescription": "A date/time string in long-date format (for example, Tuesday October 9, 2012)",
-                    "returnType": "String"
+                    "returnType": "string"
+                },
+                {
+                    "description": "Returns a Long representing the date/time as the number of milliseconds from the Unix epoch (00:00:00 1/1/1970 GMT).",
+                    "name": "AsMillisecondsLong",
+                    "params": [],
+                    "returnDescription": "A Long representing the date/time as the number of milliseconds from the Unix epoch.",
+                    "returnType": "Long"
                 },
                 {
                     "description": "Returns an Integer representing the date/time as the number of seconds from the Unix epoch (00:00:00 1/1/1970 GMT).",
                     "name": "AsSeconds",
                     "params": [],
                     "returnDescription": "Number of seconds as Integer.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
+                },
+                {
+                    "description": "Returns a LongInteger representing the date/time as the number of seconds from the Unix epoch (00:00:00 1/1/1970 GMT).",
+                    "name": "AsSecondsLong",
+                    "params": [],
+                    "returnDescription": "Number of seconds as a LongInteger.",
+                    "returnType": "object"
+                },
+                {
+                    "description": "Returns the localized time of the device.",
+                    "name": "asTimeStringLoc",
+                    "params": [
+                        {
+                            "default": null,
+                            "description": "Specify the format of the time string to be returned:  *   short *   short-h12 *   short-h24 *   custom formatting string using time symbols (for example, \"h:mm a\")",
+                            "isRequired": true,
+                            "name": "format",
+                            "type": "String"
+                        }
+                    ],
+                    "returnDescription": "A time string corresponding to the specified format:",
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a LongInteger representing the date/time as the number of seconds from the Unix epoch (00:00:00 1/1/1970 GMT).",
@@ -11174,7 +11270,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the date/time value using the number of seconds from the Unix epoch.",
@@ -11188,7 +11284,20 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
+                },
+                {
+                    "description": "Sets the date/time value using the number of seconds from the Unix epoch.",
+                    "name": "FromSecondsLong",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "numSeconds",
+                            "type": "LongInteger"
+                        }
+                    ],
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the date/time value using the number of seconds from the Unix epoch.",
@@ -11208,83 +11317,83 @@
                     "name": "GetDayOfMonth",
                     "params": [],
                     "returnDescription": "Date value as an Integer (1-31).",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the date/time value's day of week.",
                     "name": "GetDayOfWeek",
                     "params": [],
                     "returnDescription": "Day value as an Integer (Sunday=0, Monday=1, ..., Saturday=6).",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the date/time value's hour within the day.",
                     "name": "GetHours",
                     "params": [],
                     "returnDescription": "Hour value as an Integer (0-23)",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the date/time value's last day of the month.",
                     "name": "GetLastDayOfMonth",
                     "params": [],
                     "returnDescription": "Day as an Integer (28-31)",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the date/time value's millisecond within the second.",
                     "name": "GetMilliseconds",
                     "params": [],
                     "returnDescription": "Millisecond value as an Integer (0-999).",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the date/time value's minute within the hour.",
                     "name": "GetMinutes",
                     "params": [],
                     "returnDescription": "Minute value as an Integer (0-59)",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the date/time value's month.",
                     "name": "GetMonth",
                     "params": [],
                     "returnDescription": "Month value as an Integer (1=Jan, 12=Dec).",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the date/time value's second within the minute.",
                     "name": "GetSeconds",
                     "params": [],
                     "returnDescription": "Second value as an Integer (0-59).",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the offset in minutes from the system time zone to UTC. For example, if the system time zone is in PDT / UTC-7 the value returned would be 420.",
                     "name": "GetTimeZoneOffset",
                     "params": [],
                     "returnDescription": "Minutes of offset as Integer.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the day of the week.",
                     "name": "GetWeekday",
                     "params": [],
                     "returnDescription": "Week value as a String (e.g. \"Monday\").",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the date/time value's year",
                     "name": "GetYear",
                     "params": [],
                     "returnDescription": "Returns the year value as an Integer, e.g. 2015",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Sets the date/time value to the current UTC date and time.",
                     "name": "Mark",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nReturns an ISO 8601 representation of the date/time value.\n\n or \n\nReturns an ISO 8601 representation of the date/time value with milliseconds precision.",
@@ -11299,13 +11408,13 @@
                         }
                     ],
                     "returnDescription": "ISO 8601 as String, e.g. \"2021-03-25T18:53:03+0000\"\n\n or \n\nISO 8601 as String with milliseconds precision, e.g. \"2021-03-25T18:53:03.220+0000\"",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Offsets the date/time value from an assumed UTC date/time to a local date/time using the system time zone setting. This function is not idempotent, and multiple calls will do multiple timezone adjustments to the time yielding an incorrect result.",
                     "name": "ToLocalTime",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifDateTime",
@@ -11392,7 +11501,7 @@
                         }
                     ],
                     "returnDescription": "An associative array that includes a flag indicating whether the audio format can be played, and the closest audio format supported by the device.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks whether the device can decode and play the specified video format.",
@@ -11407,7 +11516,7 @@
                         }
                     ],
                     "returnDescription": "An associative array that includes a flag indicating whether the video format can be played, and the closest video format supported by the device.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Notifies the app when a system overlay event (such as the [confirm partner button HUD](/docs/developer-program/getting-started/architecture/channel-manifest.md#special-purpose-attributes) or the caption control overlay) is displayed. This notification gives the app the opportunity to do any processing they may want to when the app loses or regains focus.",
@@ -11422,7 +11531,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the system overlay event notifications are enabled (true) or disabled (false).",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Notifies the app when the screen reader changes. This function enables the sending of an [roDeviceInfoEvent](https://developer.roku.com/docs/references/brightscript/events/rodeviceinfoevent.md when the screen reader changes. To receive events, you must have first called [SetMessagePort](https://developer.roku.com/docs/references/brightscript/interfaces/ifsetmessageport.md on the roDeviceInfo object specifying the message port that is to receive the events",
@@ -11437,7 +11546,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether screen reader change event notifications are enabled (true) or disabled (false).",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Notifies the app when the audio or video codec changes. This function enables the sending of an [roDeviceInfoEvent](https://developer.roku.com/docs/references/brightscript/events/rodeviceinfoevent.md when the codec changes. To receive events, you must have first called [SetMessagePort](https://developer.roku.com/docs/references/brightscript/interfaces/ifsetmessageport.md on the roDeviceInfo object specifying the message port that is to receive the events",
@@ -11467,7 +11576,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether network connection status event notifications are enabled (true) or disabled (false).",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Notifies the app when a network connection status event occurs. This function enables the sending of an [roDeviceInfoEvent](https://developer.roku.com/docs/references/brightscript/events/rodeviceinfoevent.md when the network connection status changes. To receive events, you must have first called [SetMessagePort](https://developer.roku.com/docs/references/brightscript/interfaces/ifsetmessageport.md on the roDeviceInfo object specifying the message port that is to receive the events",
@@ -11482,7 +11591,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether network connection status event notifications are enabled (true) or disabled (false).",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "A flag indicating whether lowGeneralMemoryLevel event notifications are enabled (true) or disabled (false).",
@@ -11496,7 +11605,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether lowGeneralMemoryLevel event notifications are enabled (true) or disabled (false).",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Notifies the app when a screensaver exit event occurs. This function enables the sending of an [roDeviceInfoEvent](https://developer.roku.com/docs/references/brightscript/events/rodeviceinfoevent.md when a user has exited the screensaver.",
@@ -11511,7 +11620,22 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether screensaver exit event notifications are enabled (true) or disabled (false).",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
+                },
+                {
+                    "description": "Notifies the app when the device's system clock becomes valid.",
+                    "name": "EnableValidClockEvent",
+                    "params": [
+                        {
+                            "default": null,
+                            "description": "A flag specifying whether to enable valid system clock events.",
+                            "isRequired": true,
+                            "name": "enable",
+                            "type": "Boolean"
+                        }
+                    ],
+                    "returnDescription": "A flag indicating whether valid system clock events are enabled (true) or disabled (false).",
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Notifies the app when the device's system clock becomes valid.",
@@ -11533,7 +11657,7 @@
                     "name": "ForceInternetStatusCheck",
                     "params": [],
                     "returnDescription": "True indicates only that a new internet check has been initiated; otherwise, false. To get the actual internet connection status, use the [**GetInternetStatus()**](getinternetstatus-as-boolean) method.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers must update their apps to use the [GetRIDA()](/docs/references/brightscript/interfaces/ifdeviceinfo.md#getrida-as-string) method to get the unique identifier.\n",
@@ -11542,7 +11666,7 @@
                     "name": "GetAdvertisingId",
                     "params": [],
                     "returnDescription": "A Universally Unique Identifier (UUID) as specified in IETF-RFC 4122 with 36 characters (32 alphanumeric characters and four hyphens). The characters are grouped in the form 8-4-4-4-12, for example \"123e4567-e89b-12d3-a456-426655440000\"",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers should use the [CanDecodeAudio()](#candecodeaudioaudio_format-as-object-as-object) function instead.\n",
@@ -11551,21 +11675,21 @@
                     "name": "GetAudioDecodeInfo",
                     "params": [],
                     "returnDescription": "An associative array with EDID (EIA.2FCEA-861) audio decoder information for the device connected to the HDMI port (or the device itself for a Roku TV).",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks for the type of audio output.",
                     "name": "GetAudioOutputChannel",
                     "params": [],
                     "returnDescription": "The selected audio output, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Determines whether global captions are turned on or off, or are in instant replay mode.",
                     "name": "GetCaptionsMode",
                     "params": [],
                     "returnDescription": "The current global setting for the Mode property, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks the current value of the specified global setting property.",
@@ -11580,14 +11704,14 @@
                         }
                     ],
                     "returnDescription": "The value of the specified global setting property, which may be as follows:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a unique identifier for the device. The ID is persistent and cannot be reset. This value can be used to manage or identify devices linked to the app’s content services.",
                     "name": "GetChannelClientId",
                     "params": [],
                     "returnDescription": "A unique identifier. This identifier is different across apps so each app will get a different identifier when calling this function",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers must update their apps to use the [GetChannelClientId](/docs/references/brightscript/interfaces/ifdeviceinfo.md#getchannelclientid-as-string) method to get the unique identifier.\n",
@@ -11596,42 +11720,42 @@
                     "name": "GetClientTrackingId",
                     "params": [],
                     "returnDescription": "A unique identifier. This identifier is different across apps so each app will get a different identifier when calling this function",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks whether the system settings for Time (**Setting > System > Time**) is set to a 12 or 24-hour format.",
                     "name": "GetClockFormat",
                     "params": [],
                     "returnDescription": "The time format:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks for the information associated with the hardware's connection",
                     "name": "GetConnectionInfo",
                     "params": [],
                     "returnDescription": "An associative array with the following key-value pairs:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks whether the device has a WiFi or wired connection, or if it is not connected through any type of network.",
                     "name": "GetConnectionType",
                     "params": [],
                     "returnDescription": "The type of internet connection the device is using. This may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks for the country code of the app.",
                     "name": "GetCountryCode",
                     "params": [],
                     "returnDescription": "A value that indicates the Streaming Store associated with a user’s Roku account. Typically, the value returned will be an ISO 3166-1 (2-letter) country code representing the country. Alternatively, if the app owner entered into an additional agreement to have the app published to a curated [Roku Powered Streaming Store](https://www.roku.com/roku-powered) instead of the user country, then a Roku Powered Streaming Store Identifier will instead be returned. This may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Gets the current locale value based on the user's language setting.",
                     "name": "GetCurrentLocale",
                     "params": [],
                     "returnDescription": "A string representing the current locale based on the user's language setting. The string is an ISO 639-1 (2-letter) language code followed by an underscore and a ISO 3166-1 (2-letter) country code. This may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers must update their apps to use the 32-character alphanumeric unique identifier returned by [GetChannelClientId()](/docs/references/brightscript/interfaces/ifdeviceinfo.md#getchannelclientid-as-string).\n",
@@ -11640,42 +11764,42 @@
                     "name": "GetDeviceUniqueId",
                     "params": [],
                     "returnDescription": "A string of 12 zeros (\"000000000000\")",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks the aspect ratio for the display screen.",
                     "name": "GetDisplayAspectRatio",
                     "params": [],
                     "returnDescription": "The aspect ratio, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks the UI resolution of the device.",
                     "name": "GetDisplayMode",
                     "params": [],
                     "returnDescription": "The configured graphics layer resolution, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks for the display properties of the screen.",
                     "name": "GetDisplayProperties",
                     "params": [],
                     "returnDescription": "An associative array with the following key/value pairs for the display properties of the screen:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks the display size of a screen.",
                     "name": "GetDisplaySize",
                     "params": [],
                     "returnDescription": "An associative array with the screen width and height. Specifically, the keys \"w\" and \"h\" contain the values for the screen width and height respectively. This may be one of the following:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Gets the text corresponding to the button selection in the Player Info Settings/Display Type page.",
                     "name": "GetDisplayType",
                     "params": [],
                     "returnDescription": "The display type, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers must update their apps to use the replacement API [GetDrmInfoEx()](/docs/references/brightscript/interfaces/ifdeviceinfo.md#getdrminfoex-as-object) to return the supported DRM system and features.\n",
@@ -11684,34 +11808,41 @@
                     "name": "GetDrmInfo",
                     "params": [],
                     "returnDescription": "An associative array with the supported DRM system and features. For example, a device that supports PlayReady inside a trusted environment with secure stop returns:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks for the DRM system used by the app.",
                     "name": "GetDrmInfoEx",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks the IP address assigned to the device by your internet service provider (ISP). This IP address is visible to the internet and all other computers outside your local network.",
                     "name": "GetExternalIp",
                     "params": [],
                     "returnDescription": "The external IP address assigned to the device.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a string describing the device that may be used for network device selection. The string is subject to change and should not be used as a persistent key or ID",
                     "name": "GetFriendlyName",
                     "params": [],
                     "returnDescription": "A user-assigned device name or a description of the device such as model name and/or serial number.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks the general memory levels of the device.",
                     "name": "GetGeneralMemoryLevel",
                     "params": [],
                     "returnDescription": "Returns the general memory levels of the app, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
+                },
+                {
+                    "description": "Checks the graphics features supported by the device.",
+                    "name": "GetGraphicsFeatures",
+                    "params": [],
+                    "returnDescription": "An associative array containing the following key/value pairs:",
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks the graphics features supported by the device.",
@@ -11725,119 +11856,126 @@
                     "name": "GetGraphicsPlatform",
                     "params": [],
                     "returnDescription": "The device's graphics platform, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks the internet connection status of the device.",
                     "name": "GetInternetStatus",
                     "params": [],
                     "returnDescription": "True if the cached internet status shows a connection; false, otherwise.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks the local IP address of the device.",
                     "name": "GetIPAddrs",
                     "params": [],
                     "returnDescription": "An associative array, where each key is the name of a network interface and the value is the IP-address of the interface. Typically, the associative array only contains a single interface.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks if the device has an active connection.",
                     "name": "GetLinkStatus",
                     "params": [],
                     "returnDescription": "A flag indicating whether the device has an active connection.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the model name of the Roku device. See the [Hardware Specification](/docs/specs/hardware.md) for the list of the current, updatable, and legacy Roku models.",
                     "name": "GetModel",
                     "params": [],
                     "returnDescription": "A five-character alphanumeric string (for example, \"3050X\") .",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns detailed information about the device model.",
                     "name": "GetModelDetails",
                     "params": [],
                     "returnDescription": "An associative array containing the following information about the device model:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the model display name of the Roku device.",
                     "name": "GetModelDisplayName",
                     "params": [],
                     "returnDescription": "The model display name (for example, \"Roku 2 XD\")",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a string describing the type of device. For future compatibility, the caller should by default assume \"STB\" when anything other than described value is returned",
                     "name": "GetModelType",
                     "params": [],
                     "returnDescription": "The device type, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns an roAssociativeArray containing the **major**, **minor**, **revision**, and **build** numbers of the Roku OS running on the device.",
                     "name": "GetOSVersion",
                     "params": [],
                     "returnDescription": "An roAssociativeArray containing the following fields:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks the two-letter ISO 639-1 language terminology code of the preferred caption language set on the Roku device.",
                     "name": "GetPreferredCaptionLanguage",
                     "params": [],
                     "returnDescription": "The two-letter ISO 639-1 language terminology code, which may be one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a randomly generated unique identifier. Each time this function is called, a different identifier is returned",
                     "name": "GetRandomUUID",
                     "params": [],
                     "returnDescription": "A Universally Unique Identifier (UUID) version 4 as specified in IETF-RFC 4122 with 36 characters (32 alphanumeric characters and four hyphens). The characters are grouped in the form 8-4-4-4-12, for example \"123e4567-e89b-12d3-a456-426655440000\"",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a unique identifier for the device.",
                     "name": "GetRIDA",
                     "params": [],
                     "returnDescription": "A Universally Unique Identifier (UUID). This identifier is persistent, but it can be reset by the user from the device's **Settings** menu or by performing a factory reset on the device",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks for the user interface sound effects volume level.",
                     "name": "GetSoundEffectsVolume",
                     "params": [],
                     "returnDescription": "The UI sounds effects volume as a percentage. A return value of 0 indicates that UI sound effects are muted, and a value of 100 indicates that they are set to the maximum volume level",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Checks the supported graphics resolutions.",
                     "name": "GetSupportedGraphicsResolutions",
                     "params": [],
                     "returnDescription": "A list of associative arrays. Each associative array contains the following key/value pairs for the graphics resolutions:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks for the user's current system time zone setting.",
                     "name": "GetTimeZone",
                     "params": [],
                     "returnDescription": "A string representing the user's current system time zone setting. For example, this method may return values such as:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks for the UI resolution of the screen.",
                     "name": "GetUIResolution",
                     "params": [],
                     "returnDescription": "An associative array with the following key-value pairs describing the current UI resolution:",
-                    "returnType": "Object"
+                    "returnType": "object"
+                },
+                {
+                    "description": "Returns the system's uptime since the last reboot (in milliseconds as a Long). This function is similar to the [global utility Uptime function](https://developer.roku.com/docs/references/brightscript/language/global-utility-functions.mduptimedummy-as-integer-as-float), but makes it easier for developers to handle monotonic milliseconds.",
+                    "name": "GetUptimeMillisecondsAsLong",
+                    "params": [],
+                    "returnDescription": "A Long indicating the the system's uptime since the last reboot (in milliseconds).",
+                    "returnType": "Long"
                 },
                 {
                     "description": "Returns the ISO 3166-1 (2-letter) country code associated with the user's Roku account.",
                     "name": "GetUserCountryCode",
                     "params": [],
                     "returnDescription": "An ISO 3166-1 (2-letter) country code.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers must update their apps to use [GetOSVersion()](/docs/references/brightscript/interfaces/ifdeviceinfo.md#getosversion-as-object) method to get the current Roku OS version running on a device.\n",
@@ -11846,7 +11984,7 @@
                     "name": "GetVersion",
                     "params": [],
                     "returnDescription": "A 13-character string (for example \"034.08E01185A\"). The third through sixth characters are the major/minor version number (\"4.08\") and the ninth through twelfth are the build number (\"1185\")",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers should use the [CanDecodeVideo()](#candecodevideovideo_format-as-object-as-object) function instead.\n",
@@ -11855,14 +11993,14 @@
                     "name": "GetVideoDecodeInfo",
                     "params": [],
                     "returnDescription": "An associative array with the EDID (EIA.2FCEA-861) information describing the video display",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks the video playback resolution.",
                     "name": "GetVideoMode",
                     "params": [],
                     "returnDescription": "The video playback resolution, which maybe one of the following values:",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "The \"1080p\\_hardware\" argument is deprecated. Apps should use the GetVideoMode() and CanDecodeVideo() functions instead\n",
@@ -11879,7 +12017,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the current device/firmware supports the passed in feature string.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers must update their apps to use [IsRIDADisabled()](/docs/references/brightscript/interfaces/ifdeviceinfo.md#isridadisabled-as-boolean) to get the Ad Id tracking status.\n",
@@ -11888,27 +12026,33 @@
                     "name": "IsAdIdTrackingDisabled",
                     "params": [],
                     "returnDescription": "Returns true if the user has disabled Ad Id tracking by selecting \"Limit ad tracking\" from the Roku Settings menu, false otherwise.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if the screen reader is enabled.",
                     "name": "IsAudioGuideEnabled",
                     "params": [],
                     "returnDescription": "A flag indicating whether the screen reader is enabled.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
+                },
+                {
+                    "description": "Returns a flag indicating whether the Auto Adjust Display Refresh Rate setting is enabled on a device.",
+                    "name": "isAutoAdjustRefreshRateEnabled",
+                    "params": [],
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns a flag indicating whether autoplay is enabled on a device. Developers can use this function to ensure that the autoplay device setting is respected when customers browse content in their apps.",
                     "name": "IsAutoplayEnabled",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if the device's system clock is valid.",
                     "name": "IsClockValid",
                     "params": [],
                     "returnDescription": "A flag indicating whether the system clock on the device is valid.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "deprecatedDescription": "**This method is deprecated**.\n\nDevelopers must use the [ifHdmiStatus](/docs/references/brightscript/interfaces/ifhdmistatus.md) interface functions instead.\n",
@@ -11917,7 +12061,14 @@
                     "name": "IsHDMIConnected",
                     "params": [],
                     "returnDescription": "A flag indicating whether an HDMI connection to a TV has been detected.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
+                },
+                {
+                    "description": "Indicates whether a passthrough device that owns the codec (a TV, audio receiver, or soundbar connected to a Roku device via HDMI) is rendering audio.",
+                    "name": "IsPassthruCodecActive",
+                    "params": [],
+                    "returnDescription": "A flag indicating whether the passthrough device is rendering audio.",
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Indicates whether a passthrough device that owns the codec (a TV, audio receiver, or soundbar connected to a Roku device via HDMI) is rendering audio.",
@@ -11931,14 +12082,14 @@
                     "name": "IsRIDADisabled",
                     "params": [],
                     "returnDescription": "A flag indicating whether RIDA tracking is disabled on the device (RIDA tracking can be disabled by selecting \"Limit ad tracking\" from the **Settings>Privacy>Advertising** menu). If RIDA tracking is disabled, this returns true; false otherwise.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the device is in demo mode.",
                     "name": "IsStoreDemoMode",
                     "params": [],
                     "returnDescription": "A flag indicating whether the device is in demo mode.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the current global setting for the Mode property.",
@@ -11953,14 +12104,14 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the Mode property was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks for the number of seconds passed since the last remote keypress.",
                     "name": "TimeSinceLastKeypress",
                     "params": [],
                     "returnDescription": "The number of seconds since the last remote keypress was received.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifDeviceInfo",
@@ -11982,7 +12133,7 @@
                     "name": "GetDouble",
                     "params": [],
                     "returnDescription": "The double value stored in the calling Double object.",
-                    "returnType": "Double"
+                    "returnType": "double"
                 },
                 {
                     "description": "Sets the calling Double object to the specified double value.",
@@ -11996,7 +12147,7 @@
                             "type": "Double"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifDouble",
@@ -12035,7 +12186,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Draws a line from (xStart, yStart) to (xEnd, yEnd) with RGBA color.",
@@ -12077,7 +12228,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Draws the source object, where src is an [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object, at position x,y.",
@@ -12106,7 +12257,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the object was successfully drawn.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Draws a point at (x,y) with the given size and RGBA color.",
@@ -12141,7 +12292,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Fills the specified rectangle from left (x), top (y) to right (x + width), bottom (y + height) with the RGBA color.",
@@ -12183,7 +12334,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nDraws the source object, where src is an [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object, at position x,y rotated by angle theta degrees.\n\n or \n\nDraws and rotates the source object, where src is an [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object at position x,y, rotated by angle theta degrees.",
@@ -12226,7 +12377,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the object was successfully drawn.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nDraws the source object, where src is an [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object, at position x,y, scaled in the x direction by scaleX and in the y direction by scaleY. scaleX and scaleY should each be greater than zero and less than one to reduce the object size, or greater than one to increase the object size\n\n or \n\nDraws the source object, where src is an [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object, at position x,y, scaled in the x direction by scaleX and in the y direction by scaleY. scaleX and scaleY should each be greater than zero and less than one to reduce the object size, or greater than one to increase the object size.",
@@ -12276,7 +12427,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the object was successfully drawn.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Draws the text at position (x,y) using the specified RGBA color and [roFont](https://developer.roku.com/docs/references/brightscript/components/rofont.md\"roFont\") font object. Text is drawn anti-aliased. The background image/color behind the text will show through the spaces and holes in the text. To have the text erase the background, make a call to [DrawRect()](#drawrectx-as-integer-y-as-integer-width-as-integer-height-as-integer-rgba-as-integer-as-void) before calling DrawText(). The size, bold, and italic attributes are specified when creating the [roFont](https://developer.roku.com/docs/references/brightscript/components/rofont.md\"roFont\").",
@@ -12319,7 +12470,64 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the object was successfully drawn.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
+                },
+                {
+                    "description": "**OVERLOADED METHOD**\n\nDraws and then scales and rotates the source object, where src is an [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object; at position x,y; scaled in the x direction by scaleX and in the y direction by scaleY; and rotated by angle theta degrees.",
+                    "name": "DrawTransformedObject",
+                    "params": [
+                        {
+                            "default": null,
+                            "description": "The x-coordinate of the source object.",
+                            "isRequired": true,
+                            "name": "x",
+                            "type": "Integer"
+                        },
+                        {
+                            "default": null,
+                            "description": "The y-coordinate of the source object.",
+                            "isRequired": true,
+                            "name": "y",
+                            "type": "Integer"
+                        },
+                        {
+                            "default": null,
+                            "description": "The position which to rotate the source object. This may be 0, 90, 180, and 270 degrees.",
+                            "isRequired": true,
+                            "name": "theta",
+                            "type": "Float"
+                        },
+                        {
+                            "default": null,
+                            "description": "The x direction in which the source object is to be scaled.",
+                            "isRequired": true,
+                            "name": "scaleX",
+                            "type": "Float"
+                        },
+                        {
+                            "default": null,
+                            "description": "The y direction in which the source object is to be scaled.",
+                            "isRequired": true,
+                            "name": "scaleY",
+                            "type": "Float"
+                        },
+                        {
+                            "default": null,
+                            "description": "The [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object to be drawn.",
+                            "isRequired": true,
+                            "name": "src",
+                            "type": "Object"
+                        },
+                        {
+                            "default": null,
+                            "description": "The RGBA color of the source object.",
+                            "isRequired": false,
+                            "name": "rgba",
+                            "type": "Integer"
+                        }
+                    ],
+                    "returnDescription": "A flag indicating whether the object was successfully drawn.",
+                    "returnType": "boolean"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nDraws and then scales and rotates the source object, where src is an [roBitmap](https://developer.roku.com/docs/references/brightscript/components/robitmap.md\"roBitmap\") or an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\") object; at position x,y; scaled in the x direction by scaleX and in the y direction by scaleY; and rotated by angle theta degrees.",
@@ -12382,14 +12590,14 @@
                     "description": "Realizes the bitmap by finishing all queued draw calls. Until Finish() is called, prior graphics operations may not be user visible. For example, they may be in the graphics display pipeline, or in a server queue.",
                     "name": "Finish",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Checks if the alpha blending is enabled.",
                     "name": "GetAlphaEnable",
                     "params": [],
                     "returnDescription": "A flag indicating whether alpha blending is enabled.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Gets the RGBA pixel values for the specified rectangle.",
@@ -12425,14 +12633,14 @@
                         }
                     ],
                     "returnDescription": "An roByteArray representing the RGBA pixel values for the specified rectangle.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Gets the height of the bitmap in pixels.",
                     "name": "GetHeight",
                     "params": [],
                     "returnDescription": "The height of the bitmap in pixels.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Gets PNG image data for the specified area of the bitmap. The PNG is in 32-bit RGBA format.",
@@ -12468,14 +12676,14 @@
                         }
                     ],
                     "returnDescription": "An roByteArray object containing PNG image data for the specified area of the bitmap. If the coordinates are out of bounds, or the PNG conversion fails for any reason, then invalid is returned",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Gets the width of the bitmap.",
                     "name": "GetWidth",
                     "params": [],
                     "returnDescription": "The width of the bitmap in pixels.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Enables alpha blending when the source bitmap is the destination. The setting of the source bitmap's alpha enable is ignored.",
@@ -12489,7 +12697,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifDraw2D",
@@ -12517,7 +12725,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful:",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Specifies the private key to be used for signing.",
@@ -12532,7 +12740,7 @@
                         }
                     ],
                     "returnDescription": "An integer indicating whether the operation was successful:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Specifies the private key to be used for signing.",
@@ -12547,7 +12755,7 @@
                         }
                     ],
                     "returnDescription": "An integer indicating whether the operation was successful:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Specifies the public key to be used for verification.",
@@ -12562,7 +12770,7 @@
                         }
                     ],
                     "returnDescription": "An integer indicating whether the operation was successful:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Specifies the signing algorithm to be used for signing and verification.",
@@ -12577,7 +12785,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful:",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Generates a signature based on the specified message.",
@@ -12592,7 +12800,7 @@
                         }
                     ],
                     "returnDescription": "An roByteArray containing the signature. If an error occurs, \"invalid\" is returned.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Verifies the given message and signature. The message and the signature should both be roByteArrays.",
@@ -12614,7 +12822,7 @@
                         }
                     ],
                     "returnDescription": "Indicates the result of the validation. This may be one of the following values:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifDsa",
@@ -12660,27 +12868,27 @@
                     "name": "IsEmpty",
                     "params": [],
                     "returnDescription": "A flag indicating whether the enumeration contains no elements (true), or contains elements (false).",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the current position is not past the end of the enumeration.",
                     "name": "IsNext",
                     "params": [],
                     "returnDescription": "A flag indicating whether the current position is not past the end (true), or is past the end (false).",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Increments the position of an enumeration. If the last element of the enumeration is returned, this method sets the current position to indicate that it is now past the end.",
                     "name": "Next",
                     "params": [],
                     "returnDescription": "The value at the current position of the enumeration. If the current position is already past the end (that is, the last element has already been returned by a previous call to this method), \"invalid\" is returned.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Resets the current position to the first element of the enumeration.",
                     "name": "Reset",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifEnum",
@@ -12701,7 +12909,7 @@
                     "name": "Final",
                     "params": [],
                     "returnDescription": "The last remaining encrypted or decrypted bytes.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Processes the included [roByteArray](https://developer.roku.com/docs/references/brightscript/components/robytearray.md containing encrypted/decrypted data.",
@@ -12716,14 +12924,14 @@
                         }
                     ],
                     "returnDescription": "An [roByteArray](/docs/references/brightscript/components/robytearray.md \"roByteArray\") containing the result.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Reinitializes an existing cipher context. This can be called to reuse an existing [roEVPCipher](https://developer.roku.com/docs/references/brightscript/components/roevpdigest.md\"roEVPCipher\") object to encrypt new data",
                     "name": "Reinit",
                     "params": [],
                     "returnDescription": "Returns 0 on success or non-zero on failure.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Configures and initializes a new cipher context.",
@@ -12766,7 +12974,7 @@
                         }
                     ],
                     "returnDescription": "Returns 0 on success or non-zero on failure.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Updates the included [roByteArray](https://developer.roku.com/docs/references/brightscript/components/robytearray.md containing encrypted/decrypted data.",
@@ -12781,7 +12989,7 @@
                         }
                     ],
                     "returnDescription": "An [roByteArray](/docs/references/brightscript/components/robytearray.md \"roByteArray\") containing a subset of the result. Some or all of the result may not be returned until the next call to Update().",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifEVPCipher",
@@ -12802,7 +13010,7 @@
                     "name": "Final",
                     "params": [],
                     "returnDescription": "Hex string (digest of data)",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Digests the provided data.",
@@ -12817,14 +13025,14 @@
                         }
                     ],
                     "returnDescription": "A Hex string (Digested array data).",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Re-initializes an existing message digest context. This can be called to reuse an existing [roEVPDigest](https://developer.roku.com/docs/references/brightscript/components/roevpdigest.md\"roEVPDigest\") object to digest new data.",
                     "name": "Reinit",
                     "params": [],
                     "returnDescription": "Returns 0 on success or non-zero on failure.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Initializes a new message digest context.",
@@ -12839,7 +13047,7 @@
                         }
                     ],
                     "returnDescription": "Returns 0 on success or non-zero on failure.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Adds more data to be digested.",
@@ -12853,7 +13061,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifEVPDigest",
@@ -12889,7 +13097,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the files were successfully copied.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Creates the directory specified by the path parameter. All directories in path except the last one must already exist; that is, only one directory can be created.",
@@ -12904,7 +13112,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the path was successfully created.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Permanently removes the file or directory specified by the path parameter. If path is a directory, its contents are recursively removed.",
@@ -12919,7 +13127,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the path was successfully deleted.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if the specified directory path exists on the device.",
@@ -12934,7 +13142,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the specified path directory exists on the device.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the file names in the specified directory path matching the provided regex.",
@@ -12956,7 +13164,7 @@
                         }
                     ],
                     "returnDescription": "An [roList](/docs/references/brightscript/components/rolist.md \"roList\") of Strings representing the directory listing of names in dirPath that match the regex.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the file names in the specified directory path and any sudirectories matching the provided regex.",
@@ -12978,7 +13186,7 @@
                         }
                     ],
                     "returnDescription": "An [roList](/docs/references/brightscript/components/rolist.md \"roList\") of Strings representing the directory listing of names in dirPath that match the regex. Each item in the list is the name of the file relative to dirPath.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the file names in the specified directory path.",
@@ -12993,7 +13201,7 @@
                         }
                     ],
                     "returnDescription": "An [roList](/docs/references/brightscript/components/rolist.md \"roList\") of strings representing the directory listing of names in dirPath.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns information about the specified volume. The function can only be called on external volumes; internal volumes do not return meaningful information.",
@@ -13008,14 +13216,14 @@
                         }
                     ],
                     "returnDescription": "An roAssociativeArray containing the following key-value pairs about the specified external volume:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the available volumes on the device.",
                     "name": "GetVolumeList",
                     "params": [],
                     "returnDescription": "An [roList](/docs/references/brightscript/components/rolist.md \"roList\") containing strings representing the available volumes.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the file names in the specified directory path matching the provided shell-like pattern. This method is similar to the [Find()](#finddirpath-as-string-regex-as-string-as-object) method except that it uses shell-like pattern matching rather than regular expression matching.",
@@ -13037,7 +13245,7 @@
                         }
                     ],
                     "returnDescription": "An [roList](/docs/references/brightscript/components/rolist.md \"roList\") of Strings representing the directory listing of names in dirPath that match the shell-like pattern.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Renames the directory.",
@@ -13059,7 +13267,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the directory was successfully renamed. If the provided target directory (**toPath**) exists, it is not overwritten; instead the operation fails and this method returns false",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the keys in the specified directory path.",
@@ -13074,7 +13282,7 @@
                         }
                     ],
                     "returnDescription": "An [roAssociativeArray](/docs/references/brightscript/components/roassociativearray.md \"roAssociativeArray\") containing the following key-value pairs for the specified path:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifFileSystem",
@@ -13096,7 +13304,7 @@
                     "name": "GetFloat",
                     "params": [],
                     "returnDescription": "The float value stored in the calling Float object.",
-                    "returnType": "Float"
+                    "returnType": "float"
                 },
                 {
                     "description": "Sets the calling Float object to the specified float value.",
@@ -13110,7 +13318,7 @@
                             "type": "Float"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifFloat",
@@ -13129,22 +13337,22 @@
                 {
                     "name": "GetAscent",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "name": "GetDescent",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "name": "GetMaxAdvance",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "name": "GetOneLineHeight",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Each glyph and the needed spacing between glyphs is measured. The returned number of pixels will be no larger than MaxWidth. MaxWidth is generally the amount of pixels available for rendering on this line.",
@@ -13163,7 +13371,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifFont",
@@ -13213,7 +13421,7 @@
                         }
                     ],
                     "returnDescription": "A valid font string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nReturns the system font at its default size. Calling this method is the same as calling the [GetDefaultFont()](#getdefaultfontsize-as-integer-bold-as-boolean-italic-as-boolean-as-object) method with the following syntax: `reg.GetDefaultFont(reg.GetDefaultFontSize(), false, false)`.\n\n or \n\nReturns the system font. The system font is always available, even if the [Register()](#registerpath-as-string-as-boolean) method has not been called",
@@ -13242,21 +13450,21 @@
                         }
                     ],
                     "returnDescription": "The system font as its default size.\n\n or \n\nAn roFont object representing the system font.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the default font size.",
                     "name": "GetDefaultFontSize",
                     "params": [],
                     "returnDescription": "The default font size.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the names of the font families that have been registered via the [Register()](#registerpath-as-string-as-boolean) method. Each name can be passed as the first parameter to the [GetFont()](#getfontfamily-as-string-size-as-integer-bold-as-boolean-italic-as-boolean-as-object) method.",
                     "name": "GetFamilies",
                     "params": [],
                     "returnDescription": "An [roArray](/docs/references/brightscript/components/roarray.md \"roArray\") of strings that represent the names of the font families that have been registered.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns a font from the specified family, selected from the fonts previously registered via the [Register()](#registerpath-as-string-as-boolean) method.",
@@ -13292,7 +13500,7 @@
                         }
                     ],
                     "returnDescription": "An [roFont](/docs/references/brightscript/components/rofont.md \"roFont\") object representing a font from the specified family.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Registers a font file (.ttf or .otf format). Each font file defines one or more font families (usually one).",
@@ -13306,7 +13514,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the fonts in the specified file were successfully installed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifFontRegistry",
@@ -13327,7 +13535,7 @@
                     "description": "You can get a plain (non-referenced) version of the value by calling the this method.",
                     "name": "GetSub",
                     "params": [],
-                    "returnType": "Function"
+                    "returnType": "function"
                 },
                 {
                     "description": "This method can be used for in/out function parameters. If you have a boxed object, you can change the value in the object via this method, without changing the variable reference itself.",
@@ -13340,7 +13548,7 @@
                             "type": "Function"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifFunction",
@@ -13376,7 +13584,7 @@
                     "name": "GetMessagePort",
                     "params": [],
                     "returnDescription": "The message port.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifGetMessagePort",
@@ -13397,14 +13605,14 @@
                     "name": "GetHdcpVersion",
                     "params": [],
                     "returnDescription": "The version number of the HDCP link: 1.4 or 2.2.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks whether the HDMI or MHL output is connected to an HDMI device.",
                     "name": "IsConnected",
                     "params": [],
                     "returnDescription": "A flag indicating whether the HDMI or MHL output is connected to an HDMI device.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if the current established HDCP link is the specified version or higher",
@@ -13419,7 +13627,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the current established HDCP link is the specified `version`.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifHdmiStatus",
@@ -13440,7 +13648,7 @@
                     "name": "Final",
                     "params": [],
                     "returnDescription": "The final MAC.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Digests the data in an array generates a MAC. Calling this method is the same as making the following calls:",
@@ -13455,14 +13663,14 @@
                         }
                     ],
                     "returnDescription": "An [roByteArray](/docs/references/brightscript/components/robytearray.md \"roByteArray\") containing the generated MAC.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Re-initializes an existing HMAC context. This can be called to reuse an existing roHMAC object to authenticate new data.",
                     "name": "Reinit",
                     "params": [],
                     "returnDescription": "An integer indicating whether the function succeeded (0) or failed (1).",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Initializes new HMAC context.",
@@ -13484,7 +13692,7 @@
                         }
                     ],
                     "returnDescription": "An integer indicating whether the function succeeded (0) or failed (1).",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Adds more data to be digested. The data in the array is added to the current digest.",
@@ -13498,7 +13706,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifHMAC",
@@ -13558,7 +13766,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the cookies were successfully added to the cache.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Adds the specified HTTP header to the list of headers that will be sent in the HTTP request.",
@@ -13580,19 +13788,19 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the HTTP header was successfully added.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Removes all cookies from the cookie cache.",
                     "name": "ClearCookies",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Enables any Set-Cookie headers returned from the request to be interpreted and the resulting cookies to be added to the cookie cache.",
                     "name": "EnableCookies",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns any cookies from the cookie cache that match the specified domain and path. Expired cookies are not returned.",
@@ -13614,14 +13822,14 @@
                         }
                     ],
                     "returnDescription": "An roArray of roAssociativeArrays, where each associative array represents a cookie. The roAssociativeArrays contain the following key-value pairs:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Initializes the object to be sent to the Roku client certificate.",
                     "name": "InitClientCertificates",
                     "params": [],
                     "returnDescription": "A flag indicating whether the object sent to to the Roku client certificate was successfully initialized.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the maximum depth of the certificate chain that will be accepted.",
@@ -13635,7 +13843,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Set the certificates file used for SSL to the specified .pem file.",
@@ -13650,7 +13858,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the certificate was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the HTTP headers to be sent in the HTTP request.",
@@ -13665,7 +13873,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the HTTP header was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifHttpAgent",
@@ -13686,14 +13894,14 @@
                     "name": "GetMetadata",
                     "params": [],
                     "returnDescription": "An associative array containing the following key-value pairs with image metadata:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns all of the raw EXIF metadata.",
                     "name": "GetRawExif",
                     "params": [],
                     "returnDescription": "An associative array with all of the raw EXIF metadata. See the [EXIF section](/docs/references/brightscript/components/roimagemetadata.md#exif-background) for details about EXIF metadata.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the raw data for an Exif tag. The method provides direct access to a specific raw EXIF tag",
@@ -13715,14 +13923,14 @@
                         }
                     ],
                     "returnDescription": "The raw data of an Exif tag. It the Exif tag doesn't exist it returns invalid.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns a thumbnail image if one is embedded in the image metadata and the corresponding associative array with image data. This only generates a thumbnail if one exists.",
                     "name": "GetThumbnail",
                     "params": [],
                     "returnDescription": "An associative array that with **bytes** and **type** keys with the image data:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Sets the URL to the image. Only file URLs are supported",
@@ -13736,7 +13944,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifImageMetaData",
@@ -13757,7 +13965,7 @@
                     "name": "EnableTransportEvents",
                     "params": [],
                     "returnDescription": "A flag indicating whether transport event notifications were successfully registered.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Marks a transport command as handled, unhandled, or handled with an error.",
@@ -13771,14 +13979,14 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the event response operation was successful.",
-                    "returnType": "Void"
+                    "returnType": "Boolean"
                 },
                 {
                     "description": "Returns the message port (if any) currently associated with the object.",
                     "name": "GetMessagePort",
                     "params": [],
                     "returnDescription": "The message port value.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Sets the roMessagePort to be used to receive events.",
@@ -13792,7 +14000,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifInput",
@@ -13814,7 +14022,7 @@
                     "name": "GetInt",
                     "params": [],
                     "returnDescription": "The integer value stored in the calling Integer object.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Sets the calling Integer object to the specified integer value.",
@@ -13828,7 +14036,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifInt",
@@ -13849,7 +14057,7 @@
                     "name": "ToStr",
                     "params": [],
                     "returnDescription": "A decimal string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "ifIntOps",
@@ -13881,7 +14089,7 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Adds an element to the tail of the list.",
@@ -13894,69 +14102,69 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Removes all elements from the list",
                     "name": "Clear",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns the number of elements in the list.",
                     "name": "Count",
                     "params": [],
                     "returnDescription": "The number of elements in the list.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Retrieves the entry at the head of the list.",
                     "name": "GetHead",
                     "params": [],
                     "returnDescription": "The entry retrieved from the head of the list.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Gets the entry at current index or position from the list and increments the index or position in the list.",
                     "name": "GetIndex",
                     "params": [],
                     "returnDescription": "The entry retrieved from the list. This method returns invalid if the end of the list is reached.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Retrieves the entry at the tail of the list.",
                     "name": "GetTail",
                     "params": [],
                     "returnDescription": "The entry retrieved from the tail of the list.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Removes the entry at the head of the list.",
                     "name": "RemoveHead",
                     "params": [],
                     "returnDescription": "The entry removed from the head of the list.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Removes the entry at the current index or position from the list and increments the index or position in the list.",
                     "name": "RemoveIndex",
                     "params": [],
                     "returnDescription": "The entry removed from the list. This method returns invalid if the end of the list is reached.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Removes the entry at the tail of the list.",
                     "name": "RemoveTail",
                     "params": [],
                     "returnDescription": "The entry removed from the tail of the list.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Resets the current index or position in list to the head element.",
                     "name": "ResetIndex",
                     "params": [],
                     "returnDescription": "A flag indicating whether the index has been reset.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifList",
@@ -13982,7 +14190,7 @@
                     "name": "ToArray",
                     "params": [],
                     "returnDescription": "An element list as an array.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifListToArray",
@@ -14018,7 +14226,7 @@
                         }
                     ],
                     "returnDescription": "An asset path.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Replaces \"^n\" in pluralString with count and returns the result.",
@@ -14050,7 +14258,7 @@
                         }
                     ],
                     "returnDescription": "The result of the operation. If count is 0, this returns zeroString. If count is 1, it returns oneString.",
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "ifLocalization",
@@ -14071,7 +14279,7 @@
                     "name": "GetLongInt",
                     "params": [],
                     "returnDescription": "The longinteger value stored in the calling Loninteger object.",
-                    "returnType": "LongInteger"
+                    "returnType": "longinteger"
                 },
                 {
                     "description": "Sets the calling Longinteger object to the specified longinteger value.",
@@ -14085,7 +14293,7 @@
                             "type": "LongInteger"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifLongInt",
@@ -14106,14 +14314,14 @@
                     "name": "GetMessage",
                     "params": [],
                     "returnDescription": "An event object.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "This method is similar to the [GetMessage()](#getmessage-as-dynamic) method, but the returned object (if not invalid) remains in the message queue. A later call to [WaitMessage()](#waitmessagetimeout-as-integer-as-dynamic), [GetMessage()](#getmessage-as-dynamic) or PeekMessage() will return the same message.",
                     "name": "PeekMessage",
                     "params": [],
                     "returnDescription": "An event object.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Waits until an event object is available or timeout milliseconds have passed.",
@@ -14128,7 +14336,7 @@
                         }
                     ],
                     "returnDescription": "If an event is available, it is returned. If the timeout expires, invalid is returned.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 }
             ],
             "name": "ifMessagePort",
@@ -14149,7 +14357,7 @@
                     "name": "CanRecord",
                     "params": [],
                     "returnDescription": "A flag indicating whether the microphone can be opened.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Opens the microphone and records to create a WAV file at the specified output file path. Only tmp:/ paths are supported.",
@@ -14164,7 +14372,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the recording was performed and saved successfully.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the text to be displayed in the system microphone UI.",
@@ -14178,21 +14386,21 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Opens the microphone and begins streaming microphone events to the app. The app must have called the [SetMessagePort()](https://developer.roku.com/docs/references/brightscript/interfaces/ifsetmessageport.mdsetmessageportport-as-object--as-void) method previously.",
                     "name": "StartRecording",
                     "params": [],
                     "returnDescription": "A flag indicating whether the microphone was opened successfully.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Stops recording and closes the microphone. This method is useful if the microphone was previously opened via the [StartRecording()](#startrecording-as-boolean) method and the app needs to cancel the current recording prematurely, (for example, the duration limit was reached or an application error).",
                     "name": "StopRecording",
                     "params": [],
                     "returnDescription": "A flag indicating whether the microphone was opened and closed successfully.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifMicrophone",
@@ -14222,21 +14430,21 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the path was successfully changed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the current path is valid (the path is correctly formed). This does not check whether the file actually exists.",
                     "name": "IsValid",
                     "params": [],
                     "returnDescription": "A flag indicating whether the current path is valid.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns an [roAssociativeArray](https://sdkdocs-archive.staging.web.roku.com/roAssociativeArray_1611481.html) containing keys for the parent directories, extensions, and file name in the file path.",
                     "name": "Split",
                     "params": [],
                     "returnDescription": "An [roAssociativeArray](/docs/references/brightscript/components/roassociativearray.md \"roAssociativeArray\") that contains the following keys:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifPath",
@@ -14264,7 +14472,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns details about the current and next program on an app.",
@@ -14279,7 +14487,7 @@
                         }
                     ],
                     "returnDescription": "An roAssociativeArray containing two roArray components: one for the current program and another for the next program on the app. Each roArray contains the following key/value pairs detailing the program:",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the programs falling within the given time range.",
@@ -14315,7 +14523,7 @@
                     "name": "GetVersion",
                     "params": [],
                     "returnDescription": "The version number of the program guide.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifProgramGuide",
@@ -14345,7 +14553,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the string matches the matching pattern.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "If the matching pattern contains N parenthetical substrings, the relevant substrings are returned as an array of length N+1, where array\\[0\\] is again the entire match and each additional entry in the array is the match for the corresponding parenthetical expression.",
@@ -14360,7 +14568,7 @@
                         }
                     ],
                     "returnDescription": "An roArray of matched substrings from str. If no match was made, an empty array is returned. If a match was made, the entire match is returned in array\\[0\\]. If there are no parenthetical substrings this is the only entry in the array",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns all matches of the specific regular expression pattern in the target string.",
@@ -14375,7 +14583,7 @@
                         }
                     ],
                     "returnDescription": "An roArray where the first element is the full matched string and if there are any capture groups those are returned in subsequent array elements",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Replaces the first occurrence of a matching pattern in str with replacement and returns the result. The replacement may contain numbered back-references to parenthetical substrings.",
@@ -14397,7 +14605,7 @@
                         }
                     ],
                     "returnDescription": "A string with the result of the replace operation.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Replaces all occurrences of a matching pattern in str with replacement and returns the result. The replacement may contain numbered back-references to parenthetical substrings.",
@@ -14419,7 +14627,7 @@
                         }
                     ],
                     "returnDescription": "A string with the result of the replace all operation.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Uses the matching pattern as a separator and splits the string on the separator boundaries.",
@@ -14434,7 +14642,7 @@
                         }
                     ],
                     "returnDescription": "An roList of substrings of str that were separated by strings which match the pattern in the CreateObject call. The separator strings are not returned. If no matches were found, the returned list contains a single item with the string unchanged.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifRegex",
@@ -14455,81 +14663,81 @@
                     "name": "Copy",
                     "params": [],
                     "returnDescription": "An roRegion Object.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the roBitmap object of the bitmap to which this region refers. A region is always a section of a bitmap.",
                     "name": "GetBitmap",
                     "params": [],
                     "returnDescription": "An roBitmap object of the bitmap.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the collision type.",
                     "name": "GetCollisionType",
                     "params": [],
                     "returnDescription": "The collision type, which may be one of the following values:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the height of the region.",
                     "name": "GetHeight",
                     "params": [],
                     "returnDescription": "The height of the region.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the pre-translation x value.",
                     "name": "GetPretranslationX",
                     "params": [],
                     "returnDescription": "The pre-translation x value.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the pre-translation y value.",
                     "name": "GetPretranslationY",
                     "params": [],
                     "returnDescription": "The pre-translation y value.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the scaling mode.",
                     "name": "GetScaleMode",
                     "params": [],
                     "returnDescription": "The scaling mode, which may be one of the following values:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "name": "GetTime",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the width of the region.",
                     "name": "GetWidth",
                     "params": [],
                     "returnDescription": "The width of the region.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns if the region can be wrapped.",
                     "name": "GetWrap",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the x coordinate of the region in its bitmap.",
                     "name": "GetX",
                     "params": [],
                     "returnDescription": "The x coordinate value",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the y coordinate of the region in its bitmap.",
                     "name": "GetY",
                     "params": [],
                     "returnDescription": "The y coordinate value",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Adds the passed parameters x,y, w, and h to the values of those roRegion fields. Respects the wrap setting when adjusting the fields by the offsets.",
@@ -14564,7 +14772,7 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Initializes the fields of this region to be the same as the values of the fields in the srcRegion.",
@@ -14578,7 +14786,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the collision circle used for type-2 collision tests. The center of the circle is the (x,y) position of the sprite plus the specified offsets. The radius specifies the size of the circle.",
@@ -14606,7 +14814,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the collision rectangle used for type-1 collision tests. The upper left corner of the rectangle is the (x,y) position of the sprite plus the specified offsets. The width and height specify the size of the rectangle.",
@@ -14641,7 +14849,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the type of region to be used for collision tests with this sprite.",
@@ -14655,7 +14863,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the pre-translation for DrawObject, DrawRotatedObject, and DrawScaledObject.",
@@ -14676,7 +14884,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the scaling mode used for DrawScaledObject.",
@@ -14690,7 +14898,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the duration of each frame of any animated sprite that uses this region.",
@@ -14704,7 +14912,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Wraps any part of a region that extends beyond the bounds of its bitmap to the other side of the bitmap and renders it there.",
@@ -14718,7 +14926,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifRegion",
@@ -14747,28 +14955,28 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the registry section was successfully deleted.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Flushes the contents of the registry out to persistent storage in order to permanently store a token or other setting on the device.",
                     "name": "Flush",
                     "params": [],
                     "returnDescription": "A flag indicating whether the registry was successfully flushed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the registry sections on the device.",
                     "name": "GetSectionList",
                     "params": [],
                     "returnDescription": "An roList with one entry for each registry section. Each registry section is an roString containing the name of the section. The section itself can be accessed by creating an [roRegistrySection](/docs/references/brightscript/components/roregistrysection.md \"roRegistrySection\") object using that name.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the number of bytes available in the app's device registry (32K). This function can be used, for example, to check the remaining space and remove older entries before writing newer ones. The following code demonstrates how to do this:",
                     "name": "GetSpaceAvailable",
                     "params": [],
                     "returnDescription": "An integer representing the the number of bytes available in the device registry.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifRegistry",
@@ -14797,7 +15005,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the key was successfully deleted.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if the specified key resides in the registry.",
@@ -14812,21 +15020,21 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the key is in the registry.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Flushes the contents of the registry out to persistent storage in order to permanently store a token or other setting on the device. Developers should explicitly this method after performing a write or series of writes. This method is transactional and all writes between calls to it are atomic.",
                     "name": "Flush",
                     "params": [],
                     "returnDescription": "A flag indicating whether the registry was successfully flushed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Gets a list of the keys in the registry.",
                     "name": "GetKeyList",
                     "params": [],
                     "returnDescription": "An roList containing one entry per registry key in this section.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Reads and returns the value of the specified key.",
@@ -14841,7 +15049,7 @@
                         }
                     ],
                     "returnDescription": "The value of the key.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Reads multiple values from the registry.",
@@ -14856,7 +15064,7 @@
                         }
                     ],
                     "returnDescription": "An associative array containing the keys and corresponding values read from the registry.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Replaces the value of the specified key. Does not guarantee a commit to non-volatile storage until an explicit [Flush()](#flush-as-boolean) is done.",
@@ -14878,7 +15086,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the value of the key was successfully updated.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Writes multiple values to the registry.",
@@ -14892,7 +15100,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the values were successfully updated.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifRegistrySection",
@@ -14921,7 +15129,7 @@
                         }
                     ],
                     "returnDescription": "The model number of the specified Roku remote control, or 0 if the specified remote does not exist.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Checks if the specified Roku remote control supports the passed in feature string.",
@@ -14943,7 +15151,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the Roku remote control supports the passed in feature string.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the specified Roku remote control is awake.",
@@ -14958,13 +15166,93 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the specified Roku remote control is awake.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifRemoteInfo",
             "properties": [],
             "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifremoteinfo.md"
         },
+        "ifrenderthreadqueue": {
+            "availableSince": "15.0",
+            "description": "_Available since Roku OS 15.0_",
+            "implementers": [
+                {
+                    "description": "The **roRenderThreadQueue** node queues messages to be consumed by handlers on the render thread. This enables asynchronous communication between Task nodes and the render thread. Messages passed using this mechanism will not block the render thread like a rendezvous.",
+                    "name": "roRenderThreadQueue",
+                    "url": "https://developer.roku.com/docs/references/brightscript/components/rorenderthreadqueue.md"
+                }
+            ],
+            "methods": [
+                {
+                    "description": "Registers a handler for messages received on the async message channel with the given message ID. The handler is called on the render thread for each message received.",
+                    "name": "AddMessageHandler",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "message_id",
+                            "type": "String"
+                        },
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "handler",
+                            "type": "String"
+                        }
+                    ],
+                    "returnDescription": "Returns an object that can be used to unregister the handler, if required.",
+                    "returnType": "object"
+                },
+                {
+                    "description": "Posts a message to the queue. The call returns immediately and does not block the calling thread.",
+                    "name": "CopyMessage",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "message_id",
+                            "type": "String"
+                        },
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "data",
+                            "type": "Object"
+                        }
+                    ],
+                    "returnType": "void"
+                },
+                {
+                    "description": "Returns the total number of objects for the channel that were copied by the **PostMessage()** function instead of being moved.",
+                    "name": "NumCopies",
+                    "params": [],
+                    "returnType": "integer"
+                },
+                {
+                    "description": "Posts a message to the queue. The data is _moved_ and becomes unavailable to the calling thread. The call returns immediately and does not block the calling thread.",
+                    "name": "PostMessage",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "message_id",
+                            "type": "String"
+                        },
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "data",
+                            "type": "Object"
+                        }
+                    ],
+                    "returnType": "void"
+                }
+            ],
+            "name": "ifRenderThreadQueue",
+            "properties": [],
+            "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifrenderthreadqueue.md"
+        },
         "ifrsa": {
             "implementers": [
                 {
@@ -14987,7 +15275,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the algorithm was successfully set (true) or the string was not recognized (false).",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Specifies the private key to use for signing.",
@@ -15001,7 +15289,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Specifies the public key to be used for verification.",
@@ -15015,7 +15303,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Generates a signature based on the specified digest.",
@@ -15030,7 +15318,7 @@
                         }
                     ],
                     "returnDescription": "An roByteArray containing the signature, or invalid if an error occurred. Typical values include the following:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Verifies the given digest and signature. Both digest and signature should be roByteArrays. If the digest algorithm is not set (using the [SetDigestAlgorithm](#setdigestalgorithmdigestalgorithm-as-string-as-boolean) method) before calling Verify(), the digest associated with the signature is not expected to be encapsulated. This would be equivalent to simply calling the openssl function RSA\\_public\\_decrypt(signature) and then comparing the result with the digest",
@@ -15052,7 +15340,7 @@
                         }
                     ],
                     "returnDescription": "Indicates the result of the validation. This may be one of the following values:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifRSA",
@@ -15073,7 +15361,7 @@
                     "description": "This function first operates the same as a call to [ifDraw2D](https://developer.roku.com/docs/references/brightscript/interfaces/ifdraw2d.md\"ifDraw2D\"), completing all queued drawing operations on the back buffer (draw surface).",
                     "name": "SwapBuffers",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifScreen",
@@ -15116,7 +15404,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifSetMessagePort",
@@ -15175,14 +15463,14 @@
                     "name": "boundingRect",
                     "params": [],
                     "returnDescription": "An associative array with the node bounding rectangle.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the node local bounding rectangle. The local bounding rectangle of a node is the axis-aligned rectangle, that includes the union of the bounding rectangle of the geometry of the node, and the bounding rectangles of all of the node children, transformed into the local coordinate system of the node.",
                     "name": "localBoundingRect",
                     "params": [],
                     "returnDescription": "An associative array with the node local bounding rectangle.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the local bounding rectangle of this node's identified sub part in the node's local coordinate system. If the subpart does not exist, the node's local bounding rectangle is returned.",
@@ -15197,14 +15485,14 @@
                         }
                     ],
                     "returnDescription": "An associative array with the local bounding rectangle of the node's identified sub part.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the bounding rectangle for scene components (component nodes extended from a [Scene](https://developer.roku.com/docs/references/scenegraph/scene.md\"Scene\") or [OverhangPanelSetScene](https://developer.roku.com/docs/references/scenegraph/sliding-panels-nodes/overhangpanelsetscene.md\"OverhangPanelSetScene\") node class).",
                     "name": "sceneBoundingRect",
                     "params": [],
                     "returnDescription": "An associative array with the bounding rectangle.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the bounding rectangle of this node's subpart in its Scene's coordinate system If the subpart does not exist or if the node is not an ancestor of a Scene node, this will return the node's bounding rectangle.",
@@ -15219,7 +15507,7 @@
                         }
                     ],
                     "returnDescription": "An associative array with the bounding rectangle.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the bounding rectangle of this node's identified sub part, as transformed by this node's transformation matrix, in its parent node's coordinate system. If the subpart does not exist, the node's bounding rectangle is returned.",
@@ -15234,7 +15522,7 @@
                         }
                     ],
                     "returnDescription": "An associative array with the bounding rectangle.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 }
             ],
             "name": "ifSGNodeBoundingRect",
@@ -15279,7 +15567,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the children nodes were successfully appended.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Creates a child node of type nodeType, and adds the new node to the end of the subject node list of children.",
@@ -15294,7 +15582,7 @@
                         }
                     ],
                     "returnDescription": "The child node that was created.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Creates a specific number of new child nodes of a specific type or extended type.",
@@ -15316,21 +15604,21 @@
                         }
                     ],
                     "returnDescription": "An roArray containing the new child nodes created.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns an array with every existing node created by the currently running app.",
                     "name": "getAll",
                     "params": [],
                     "returnDescription": "An roArray with the all the existing nodes created by the app.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns a string with every existing node created by the currently running app (similar to the [getAll()](#getall-as-object) method) organized as an XML forest of trees according to the usual parent-child node relationship. Cycles are handled with a reference entry in the tree rather than indefinite recursion.",
                     "name": "getAllMeta",
                     "params": [],
                     "returnDescription": "A string with the all the existing nodes created by the app.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the child node specified by the index.",
@@ -15345,14 +15633,14 @@
                         }
                     ],
                     "returnDescription": "The child node at the index position; otherwise, \"invalid\".",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns the current number of children in the subject node list of children. This is always a non-negative number.",
                     "name": "getChildCount",
                     "params": [],
                     "returnDescription": "The number of child nodes in the tree.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Retrieves a specific number of child nodes from the subject node, starting at a specific position.",
@@ -15374,7 +15662,7 @@
                         }
                     ],
                     "returnDescription": "An roArray containing the child nodes retrieved. If num\\_children is -1, all the child nodes are returned.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the parent node of a node has been added to a list of children.",
@@ -15387,14 +15675,14 @@
                     "description": "Returns an array with every existing node without a parent created by the currently running app.",
                     "name": "getRoots",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns a string with every existing node without a parent created by the currently running app.",
                     "name": "getRootsMeta",
                     "params": [],
                     "returnDescription": "A string with every existing node without a parent created by the currently running app.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the node's root Scene. This returns a valid Scene even if the node is not parented.",
@@ -15445,7 +15733,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the children nodes were successfully inserted.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Finds a child node in the subject node list of children, and if found, remove it from the list of children. The match is made on the basis of actual object identity, that is, the value of the pointer to the child node.",
@@ -15475,7 +15763,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the child node that was successfully removed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Removes an array of child nodes from the subject node.",
@@ -15490,7 +15778,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the children nodes were successfully removed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Removes a specific number of child nodes from the subject node starting at a specific position.",
@@ -15512,7 +15800,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the children nodes were successfully removed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Moves the subject node to another parent node.",
@@ -15578,7 +15866,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the children nodes were successfully replaced.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nTakes the key-value pairs in an roAssociativeArray and maps the values to the respective field name in the calling node.\n\n or \n\nEach roAssociativeArray in the roArray is mapped to a node in the `children` field name of the calling node.",
@@ -15629,7 +15917,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Returns a copy of the entire node tree or just a shallow copy.",
@@ -15643,7 +15931,7 @@
                         }
                     ],
                     "returnDescription": "A node tree.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the node that is a descendant of the nearest component ancestor of the subject node (possibly the subject node itself) and whose id field is set to name. The search for the descendant node is a breadth-first search that includes child nodes in nodes that are declared as custom components defined in other XML component files. These together allow finding siblings and cousins of a node within the context of a component. If a node with the specified name is not found, an invalid object is returned",
@@ -15658,7 +15946,21 @@
                         }
                     ],
                     "returnDescription": "The node that is a descendant of the nearest component ancestor of the subject node.",
-                    "returnType": "Object"
+                    "returnType": "object"
+                },
+                {
+                    "description": "Checks whether the specified callable function exists.",
+                    "name": "hasFunc",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "callableFunc",
+                            "type": "String"
+                        }
+                    ],
+                    "returnDescription": "A flag indicating whether the the specified callable function exists.",
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether a specific roSGNode refers to the same SceneGraph node object as the subject node.",
@@ -15672,7 +15974,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the nodes refer to the same SceneGraph node object.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the subtype of the subject node is a descendant of the subtype nodeType in the SceneGraph node class hierarchy.",
@@ -15687,7 +15989,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the subtype of the subject node is a descendant of the subtype nodeType.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the subtype of the parent of the nodeType in the SceneGraph node class hierarchy.",
@@ -15702,14 +16004,14 @@
                         }
                     ],
                     "returnDescription": "The subtype of the parent node.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the subtype of the subject node as specified when it was created.",
                     "name": "subtype",
                     "params": [],
                     "returnDescription": "The subtype of the subject node.",
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "ifSGNodeDict",
@@ -15753,7 +16055,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the field have been successfully added.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Adds the field(s) and corresponding field value(s) defined as key-value pair(s) in the associative array fields to the subject node. The types of the added fields are determined by the values which correspond to the allowable types for an `<interface>` field.",
@@ -15768,7 +16070,21 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the fields have been successfully added.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
+                },
+                {
+                    "description": "Indicates whether the **GetRef()** function will succeed in the current context. The **GetRef()** call will only succeed if is called on the render thread and the **SetRef()** function had previoulsy been called on the **field\\_name**.",
+                    "name": "canGetRef",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "field_name",
+                            "type": "String"
+                        }
+                    ],
+                    "returnDescription": "This function returns true if the call to the **GetRef()** function will succeed in the current context.",
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the appropriately-typed value from the specified field of the subject node.",
@@ -15783,14 +16099,14 @@
                         }
                     ],
                     "returnDescription": "A typed value.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the names and values of all the fields in the node.",
                     "name": "getFields",
                     "params": [],
                     "returnDescription": "An roAssociativeArray containing key-value pairs with the element names and values.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the type of a specific field of the subject node.",
@@ -15805,14 +16121,28 @@
                         }
                     ],
                     "returnDescription": "The field type.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the names and types of all the fields in the node.",
                     "name": "getFieldTypes",
                     "params": [],
                     "returnDescription": "An roAssociativeArray containing key-value pairs with the element names and types.",
-                    "returnType": "Object"
+                    "returnType": "object"
+                },
+                {
+                    "description": "Returns a reference to the value of an **roSGNode** field, which must be an associative array. If the field is not an associative array, the call fails. The specified field must have previously been given a value via **SetRef()**.",
+                    "name": "getRef",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "field_name",
+                            "type": "String"
+                        }
+                    ],
+                    "returnDescription": "This function returns true a reference to the field’s value. This function returns `<invalid>` if accessing the field via reference is not valid.",
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks whether a field exists in the node.",
@@ -15827,23 +16157,57 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the subject node has a field whose name exactly matches fieldName, or whose fully lowercase analog is identical to that of fieldName.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
-                    "description": "**OVERLOADED METHOD**\n\nCalls a function when a field of the subject node changes. The function called must be in the scope of the current component.\n\n or \n\nThis overloaded form sends an [roSGNodeEvent](https://developer.roku.com/docs/references/brightscript/components/rosgnode.md\"roSGNodeEvent\") message to the [roMessagePort](https://developer.roku.com/docs/references/brightscript/components/romessageport.md\"roMessagePort\") identified by port when the subject node field identified by fieldName changes value.",
-                    "name": "observeField",
+                    "description": "Moves data _out_ of a field. The field must be of type _assocarray_.",
+                    "name": "moveFromField",
                     "params": [
                         {
                             "default": null,
-                            "description": "The name of the field to be monitored.",
                             "isRequired": true,
-                            "name": "fieldName",
+                            "name": "field_name",
                             "type": "String"
-                        },
-                        {
-                            "default": null,
-                            "description": "The name of the method to be executed when the value of the field changes. OR The [roMessagePort](https://developer.roku.com/docs/references/brightscript/components/romessageport.md\"roMessagePort\") to receive a [roSGNodeEvent](https://developer.roku.com/docs/references/brightscript/components/rosgnode.md\"roSGNodeEvent\") message when the value of the field changes.",
-                            "isRequired": true,
+                        }
+                    ],
+                    "returnDescription": "The associative array that was moved from the source field.",
+                    "returnType": "object"
+                },
+                {
+                    "description": "Moves an object into an **roSGNode** field, which must be an associative array. If the destinaton field is not an associative array, the call fails. When the move succeeds, the source object is empty after the call. This function may be called from any thread.",
+                    "name": "moveIntoField",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "field_name",
+                            "type": "String"
+                        },
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "data",
+                            "type": "Object"
+                        }
+                    ],
+                    "returnDescription": "The number of nested objects within an object that were copied, rather than moved, because of external references.",
+                    "returnType": "integer"
+                },
+                {
+                    "description": "**OVERLOADED METHOD**\n\nCalls a function when a field of the subject node changes. The function called must be in the scope of the current component.\n\n or \n\nThis overloaded form sends an [roSGNodeEvent](https://developer.roku.com/docs/references/brightscript/components/rosgnode.md\"roSGNodeEvent\") message to the [roMessagePort](https://developer.roku.com/docs/references/brightscript/components/romessageport.md\"roMessagePort\") identified by port when the subject node field identified by fieldName changes value.",
+                    "name": "observeField",
+                    "params": [
+                        {
+                            "default": null,
+                            "description": "The name of the field to be monitored.",
+                            "isRequired": true,
+                            "name": "fieldName",
+                            "type": "String"
+                        },
+                        {
+                            "default": null,
+                            "description": "The name of the method to be executed when the value of the field changes. OR The [roMessagePort](https://developer.roku.com/docs/references/brightscript/components/romessageport.md\"roMessagePort\") to receive a [roSGNodeEvent](https://developer.roku.com/docs/references/brightscript/components/rosgnode.md\"roSGNodeEvent\") message when the value of the field changes.",
+                            "isRequired": true,
                             "name": "functionNameOrPort",
                             "type": "String or Object"
                         },
@@ -15856,7 +16220,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nSets up a connection between the observed node's field and the current component from which this call is made. This method is similar to the [observeField()](https://developer.roku.com/docs/references/brightscript/interfaces/ifsgnodefield.mdobservefieldfieldname-as-string-functionname-as-string-as-boolean \"observeField(fieldName as String, functionName as String)\") method.",
@@ -15885,7 +16249,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets up a connection between the observed node's field and the current component from which this call is made. This method is similar to the [observeField()](https://developer.roku.com/docs/references/brightscript/interfaces/ifsgnodefield.mdobservefieldfieldname-as-string-functionname-as-string-as-boolean \"observeField(fieldName as String, functionName as String)\") method.",
@@ -15900,10 +16264,10 @@
                         },
                         {
                             "default": null,
-                            "description": "The [roMessagePort](https://developer.roku.com/docs/references/brightscript/components/romessageport.md\"roMessagePort\") to receive a [roSGNodeEvent](https://developer.roku.com/docs/references/brightscript/components/rosgnode.md\"roSGNodeEvent\") message when the value of the field changes.",
+                            "description": "The name of the method to be executed when the value of the field changes. OR The [roMessagePort](https://developer.roku.com/docs/references/brightscript/components/romessageport.md\"roMessagePort\") to receive a [roSGNodeEvent](https://developer.roku.com/docs/references/brightscript/components/rosgnode.md\"roSGNodeEvent\") message when the value of the field changes.",
                             "isRequired": true,
-                            "name": "port",
-                            "type": "Object"
+                            "name": "functionNameOrPort",
+                            "type": "String or Object"
                         },
                         {
                             "default": null,
@@ -15914,7 +16278,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Makes subsequent operations on the node fields to queue on the node itself rather than on the [Scene](https://developer.roku.com/docs/references/scenegraph/scene.md\"Scene\") node render thread. This prevents the operations from being executed immediately.",
@@ -15929,7 +16293,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating the current state of **queueNode**.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Removes a field from the subject node. Fields defined in [content metadata](/docs/developer-program/getting-started/architecture/content-metadata.md \" Content Meta-Data\") and the related SceneGraph node class metadata bindings can be removed, but will be dynamically re-added at any time they are explicitly accessed.",
@@ -15944,22 +16308,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the field has been successfully removed.",
-                    "returnType": "Boolean"
-                },
-                {
-                    "description": "Removes one or more fields from the subject node.",
-                    "name": "removeFields",
-                    "params": [
-                        {
-                            "default": null,
-                            "description": "An roArray containing the names of the fields to be removed.",
-                            "isRequired": true,
-                            "name": "fieldNames",
-                            "type": "Object"
-                        }
-                    ],
-                    "returnDescription": "A flag indicating whether the fields have been successfully removed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the value of a subject node field. This will fail and stop script execution if the value is not of the appropriate type.",
@@ -15981,7 +16330,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the field was successfully updated.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the values for one or more fields.",
@@ -15996,7 +16345,27 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the fields have been successfully updated.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
+                },
+                {
+                    "description": "Assigns an associative array to the field of a **roSGNode** via reference. This avoids the expense of copying when directly assigning a field to the value.",
+                    "name": "setRef",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "field_name",
+                            "type": "String"
+                        },
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "data",
+                            "type": "Object"
+                        }
+                    ],
+                    "returnDescription": "This function returns true if successful; otherwise it return false, indicating that the reference could not be set.",
+                    "returnType": "Void"
                 },
                 {
                     "description": "Signals start and/or stop points for measuring app launch and Electronic Program Grid (EPG) launch times.",
@@ -16010,14 +16379,14 @@
                         }
                     ],
                     "returnDescription": "When you fire a launch event, the system will return an integer indicating the result of its signaling:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "A runtime debugging method for helping minimize Rendezvous spread. This method can be called on any node from any thread.",
                     "name": "threadinfo",
                     "params": [],
                     "returnDescription": "An roAssociativeArray with the following information:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Removes the previously established connections between the subject node field identified by fieldName and any callback functions or message ports.",
@@ -16032,7 +16401,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Removes the connection between the observing component and the observed node's field.",
@@ -16047,7 +16416,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSGNodeField",
@@ -16069,14 +16438,14 @@
                     "name": "hasFocus",
                     "params": [],
                     "returnDescription": "A flag indicating whether the subject node has the remote control focus.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the subject node or any of its descendants in the SceneGraph node tree have remote control focus.",
                     "name": "isInFocusChain",
                     "params": [],
                     "returnDescription": "A flag indicating whether the subject node or any of its descendants in the SceneGraph node tree have the remote control focus.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the current remote control focus to the subject node.",
@@ -16091,7 +16460,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether focus on the subject node has successfully been updated.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSGNodeFocus",
@@ -16113,7 +16482,7 @@
                     "name": "getHttpAgent",
                     "params": [],
                     "returnDescription": "The roHttpAgent object for the node, which may be one of the following:",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Sets an roHttpAgent object for the node.",
@@ -16128,7 +16497,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the roHttpAgent object was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSGNodeHttpAgentAccess",
@@ -16148,7 +16517,7 @@
                     "description": "Removes the SceneGraph scene from the display screen.",
                     "name": "Close",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Creates the SceneGraph scene object based on the specified sceneType object.",
@@ -16163,7 +16532,7 @@
                         }
                     ],
                     "returnDescription": "The roSGScene object associated with the screen.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns a global reference object for the SceneGraph application.",
@@ -16205,7 +16574,7 @@
                     "name": "Show",
                     "params": [],
                     "returnDescription": "A flag indicating whether the screen is displayed.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSGScreen",
@@ -16230,42 +16599,42 @@
                     "description": "Performs an orderly close of socket. After a close, most operations on the socket will return invalid.",
                     "name": "Close",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns the roSocketAddress object bound to this socket.",
                     "name": "GetAddress",
                     "params": [],
                     "returnDescription": "roSocketAddress Object.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the number of bytes in the receive buffer.",
                     "name": "GetCountRcvBuf",
                     "params": [],
                     "returnDescription": "Number of bytes.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the number of bytes in the send buffer.",
                     "name": "GetCountSendBuf",
                     "params": [],
                     "returnDescription": "Number of bytes.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the roSocketAddress for the remote address of the last message received via the [receive()](#receivedata-as-object-startindex-as-integer-length-as-integer-as-integer) method. This method can also be used to return the remote address on newly accepted sockets.",
                     "name": "GetReceivedFromAddress",
                     "params": [],
                     "returnDescription": "The roSocketAddress for the remote address of the last message received.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the roSocketAddress for the remote address of the next message to be sent. This method can also be used to return the remote address on newly accepted sockets.",
                     "name": "GetSendToAddress",
                     "params": [],
                     "returnDescription": "The roSocketAddress for the remote address of the next message to be sent.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Reads data from the socket.",
@@ -16294,7 +16663,7 @@
                         }
                     ],
                     "returnDescription": "The number of bytes read.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Reads data from the socket and stores the result in a string.",
@@ -16309,7 +16678,7 @@
                         }
                     ],
                     "returnDescription": "The received byte length string. If no bytes are received, the string is empty.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Sends up to length bytes of data to the socket.",
@@ -16338,7 +16707,7 @@
                         }
                     ],
                     "returnDescription": "The number of bytes sent.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Sends the whole string to the socket, if possible.",
@@ -16353,7 +16722,7 @@
                         }
                     ],
                     "returnDescription": "The number of bytes sent.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Sets the address using a BSD bind() call",
@@ -16368,7 +16737,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the address was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the remote address for next message to be sent.",
@@ -16383,14 +16752,14 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the address was successfully stored as the first half of underlying BSD sendto() call.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Indicates whether the last operation was successful.",
                     "name": "Status",
                     "params": [],
                     "returnDescription": "This method returns 0 if the last operation was successful or an error number if it failed.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifSocket",
@@ -16411,28 +16780,28 @@
                     "name": "GetAddress",
                     "params": [],
                     "returnDescription": "The IPV4 address.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the hostname.",
                     "name": "GetHostName",
                     "params": [],
                     "returnDescription": "The hostname.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the port number.",
                     "name": "GetPort",
                     "params": [],
                     "returnDescription": "The port number.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Checks whether the component contains a valid IP address.",
                     "name": "IsAddressValid",
                     "params": [],
                     "returnDescription": "A flag indicating whether the component contains a valid IP address.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the IPV4 address.",
@@ -16447,7 +16816,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the IPV4 address was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the hostname. The port number is unchanged.",
@@ -16462,7 +16831,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the hostname was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "deprecatedDescription": "This function is deprecated and should not be used. Use the [setMessagePort()](/docs/references/brightscript/interfaces/ifsetmessageport.md#setmessageportport-as-object--as-void) function instead.\n",
@@ -16479,7 +16848,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the port number was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSocketAddress",
@@ -16505,7 +16874,14 @@
                     "description": "Returns a unique identifier that can be compared to the value returned by the [roSocketEvent.getSocketID()](https://developer.roku.com/docs/references/brightscript/events/rosocketevent.mdgetsocketid-as-integer) method to match the underlying socket to receive the event.",
                     "name": "GetID",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
+                },
+                {
+                    "description": "Returns the message port (if any) currently associated with the object",
+                    "name": "GetMessagePort",
+                    "params": [],
+                    "returnDescription": "The message port.",
+                    "returnType": "Object"
                 },
                 {
                     "description": "Returns the message port (if any) currently associated with the object",
@@ -16519,21 +16895,21 @@
                     "name": "IsException",
                     "params": [],
                     "returnDescription": "A flag indicating whether underlying select determines non-blocking read of OOB data is possible.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether underlying select determines non-blocking read is possible.",
                     "name": "IsReadable",
                     "params": [],
                     "returnDescription": "A flag indicating whether underlying select determines non-blocking read is possible.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether underlying select determines non-blocking write is possible.",
                     "name": "IsWritable",
                     "params": [],
                     "returnDescription": "A flag indicating whether underlying select determines non-blocking write is possible.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables roSocketEvent events to be sent via the message port when the underlying socket gets an exception or OOB data.",
@@ -16547,7 +16923,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Enables roSocketEvent events to be sent via the message port when the underlying socket becomes readable.",
@@ -16561,7 +16937,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Enables roSocketEvent events to be sent via the message port when the underlying socket becomes writable.",
@@ -16575,6 +16951,20 @@
                             "type": "Boolean"
                         }
                     ],
+                    "returnType": "void"
+                },
+                {
+                    "description": "Sets the roMessagePort to be used to receive events.",
+                    "name": "SetMessagePort",
+                    "params": [
+                        {
+                            "default": null,
+                            "description": "The port to be used to receive events.",
+                            "isRequired": true,
+                            "name": "port",
+                            "type": "Object"
+                        }
+                    ],
                     "returnType": "Void"
                 },
                 {
@@ -16618,28 +17008,28 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether broadcast messages may be sent or received.",
                     "name": "GetBroadcast",
                     "params": [],
                     "returnDescription": "A flag indicating whether broadcast messages may be sent or received.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether multicast messages are enabled for local loopback.",
                     "name": "GetMulticastLoop",
                     "params": [],
                     "returnDescription": "A flag indicating whether multicast messages are enabled for local loopback. If this flag is true, multicast message sent locally are to be received locally.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the TTL integer value for multicast messages. This is the number of hops a packet is allowed before a router drops the packet.",
                     "name": "GetMulticastTTL",
                     "params": [],
                     "returnDescription": "The multicast messages value.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Joins a specific multicast group.",
@@ -16654,7 +17044,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables broadcast messages to be sent or received.",
@@ -16669,7 +17059,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation succeeded.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables local loopback of multicast messages.",
@@ -16684,7 +17074,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the TTL integer value for multicast messages.",
@@ -16699,7 +17089,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the TTL value was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSocketCastOption",
@@ -16720,28 +17110,28 @@
                     "name": "Accept",
                     "params": [],
                     "returnDescription": "An roStreamSocket if the connection is pending; invalid otherwise. Use status to distinguish among success (eSuccess() or isConnected()), not ready (eOK()), and error.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Establishes a connection.",
                     "name": "Connect",
                     "params": [],
                     "returnDescription": "A flag indicating whether a socket connection has successfully been created. The connection might still not be complete if the socket is non-blocking",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether a [connect](#connect-as-boolean) or [accept](#accept-as-object) function has been completed on this socket.",
                     "name": "IsConnected",
                     "params": [],
                     "returnDescription": "A flag indicating whether a connection has been established or accepted on this socket.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether if the [listen()](#listenbacklog-as-integer-as-boolean) method has been successfully called on this socket.",
                     "name": "IsListening",
                     "params": [],
                     "returnDescription": "A flag indicating whether the [listen()](#listenbacklog-as-integer-as-boolean) method has been successfully called on this socket.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Puts the socket into the listen state.",
@@ -16756,7 +17146,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether listening can be done (generally, if bound address is valid).",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSocketConnection",
@@ -16777,28 +17167,28 @@
                     "name": "GetKeepAlive",
                     "params": [],
                     "returnDescription": "A flag indicating whether keep alive is set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the max time in seconds that the socket close() blocks to allow send data to be flushed in synchronous mode.",
                     "name": "GetLinger",
                     "params": [],
                     "returnDescription": "The max time in seconds.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the max TCP segment size.",
                     "name": "GetMaxSeg",
                     "params": [],
                     "returnDescription": "The segment size.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Checks whether the no delay property is enabled on the socket. This means that data is sent as soon as it is available rather than once there is enough data to fill a segment.",
                     "name": "GetNoDelay",
                     "params": [],
                     "returnDescription": "A flag indicating whether the no delay property is enabled.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sends no-data packets to keep the connection alive.",
@@ -16813,7 +17203,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether keep alive was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the max time in seconds that the socket close() blocks to allow send data to be flushed in synchronous mode.",
@@ -16828,7 +17218,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the linger was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the max TCP segment size.",
@@ -16843,7 +17233,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the max TCP segment size was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables the no delay property on the socket. This means that data is sent as soon as it is available rather than once there is enough data to fill a segment.",
@@ -16858,7 +17248,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the no delay property was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSocketConnectionoption",
@@ -16879,35 +17269,35 @@
                     "name": "eConnAborted",
                     "params": [],
                     "returnDescription": "A flag indicating whether an ECONNABORTED error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether a connection refused (ECONNREFUSED) has occurred.",
                     "name": "eConnRefused",
                     "params": [],
                     "returnDescription": "A flag indicating whether an ECONNREFUSED error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether a connection reset error (ECONNRESET) has occurred.",
                     "name": "eConnReset",
                     "params": [],
                     "returnDescription": "A flag indicating whether an ECONNRESET error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an is connected error (EISCONN) has occurred.",
                     "name": "eIsConn",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EISCONN error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether a not connected error (ENOTCONN) has occurred.",
                     "name": "eNotConn",
                     "params": [],
                     "returnDescription": "A flag indicating whether an ENOTCONN error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSocketConnectionstatus",
@@ -16933,49 +17323,49 @@
                     "name": "GetOOBInline",
                     "params": [],
                     "returnDescription": "A flag indicating whether OOB data is read inline with regular data.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the current receive buffer size.",
                     "name": "GetRcvBuf",
                     "params": [],
                     "returnDescription": "The buffer size.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the current receive timeout.",
                     "name": "GetReceiveTimeout",
                     "params": [],
                     "returnDescription": "The number of seconds for the receive timeout.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Checks whether an address that has been previously assigned can be immediately reassigned.",
                     "name": "GetReuseAddr",
                     "params": [],
                     "returnDescription": "A flag indicating whether the previously assigned address can be reassigned.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the current send buffer size.",
                     "name": "GetSendBuf",
                     "params": [],
                     "returnDescription": "The buffer size.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the current send timeout.",
                     "name": "GetSendTimeout",
                     "params": [],
                     "returnDescription": "The number of seconds for the send timeout.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the TTL (Time To Live) value for all IP packets on the socket.",
                     "name": "GetTTL",
                     "params": [],
                     "returnDescription": "The TTL value.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Enables Out Of Bounds (OOB) data to be read inline with regular data.",
@@ -16990,7 +17380,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the OOB inline data feature was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the current receive buffer size.",
@@ -17004,7 +17394,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the current receive timeout (in seconds).",
@@ -17019,7 +17409,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the receive timeout was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables a previously assigned address to be immediately reassigned.",
@@ -17034,7 +17424,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the reuse address feature was successfully set.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Sets the current send buffer size.",
@@ -17048,7 +17438,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the current send timeout (in seconds).",
@@ -17063,7 +17453,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the send timeout was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the TTL value for all IP packets on the socket.",
@@ -17078,7 +17468,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the TTL was successfully set.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSocketOption",
@@ -17104,69 +17494,69 @@
                     "name": "eAgain",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EAGAIN error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an EALREADY error has occurred.",
                     "name": "eAlready",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EALREADY error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an EBADADDR error has occurred.",
                     "name": "eBadAddr",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EBADADDR error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an EDESTADDRREQ error has occurred.",
                     "name": "eDestAddrReq",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EDESTADDRREQ error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an EHOSTUNREACH error has occurred.",
                     "name": "eHostUnreach",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EHOSTUNREACH error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an EINPROGRESS error has occurred.",
                     "name": "eInProgress",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EINPROGRESS error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an EINVALID error has occurred.",
                     "name": "eInvalid",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EINVALID error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether there is no hard error, but possibly one of the following async conditions: EAGAIN, EALREADY, EINPROGRESS, EWOULDBLOCK.",
                     "name": "eOK",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EOK error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether there are no errors (the error number is 0).",
                     "name": "eSuccess",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an EWOULDBLOCK error has occurred.",
                     "name": "eWouldBlock",
                     "params": [],
                     "returnDescription": "A flag indicating whether an EWOULDBLOCK error has occurred.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifSocketStatus",
@@ -17192,7 +17582,7 @@
                     "name": "GetSourceIdentity",
                     "params": [],
                     "returnDescription": "The ID value of the source or event object.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifSourceIdentity",
@@ -17213,70 +17603,70 @@
                     "name": "CheckCollision",
                     "params": [],
                     "returnDescription": "An roSprite object. If there are no collisions, this method returns invalid.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns an roArray of all roSprite objects this sprite collides sprites. The collision area is the entire sprite's bounding box, and the sprites must actually be overlapped to detect a collision. That is, if a fast moving sprite moves \"through\" another sprite without actually overlapping when this call is made, no collision is detected.",
                     "name": "CheckMultipleCollisions",
                     "params": [],
                     "returnDescription": "roArray of colliding sprites. If there are no collisions, this method returns invalid.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the value of collidable flags variable.",
                     "name": "GetCollidableFlags",
                     "params": [],
                     "returnDescription": "The value of the flag variable.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns any user data associated with the sprite previously set via the [SetData()](#setdatadata-as-dynamic-as-void) method.",
                     "name": "GetData",
                     "params": [],
                     "returnDescription": "Any user-defined data associated with the sprite. Returns invalid if there is no user data associated with this sprite.",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Checks whether the sprite is drawable.",
                     "name": "GetDrawableFlag",
                     "params": [],
                     "returnDescription": "A flag indicating whether the sprite is drawable.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the value of member flags variable.",
                     "name": "GetMemberFlags",
                     "params": [],
                     "returnDescription": "The value of the member flag variable.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an roRegion object that specifies the region of a bitmap that is the sprite's display graphic.",
                     "name": "GetRegion",
                     "params": [],
                     "returnDescription": "roRegion object.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the x-coordinate of the sprite.",
                     "name": "GetX",
                     "params": [],
                     "returnDescription": "The x-coordinate of the sprite.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the y-coordinate of the sprite.",
                     "name": "GetY",
                     "params": [],
                     "returnDescription": "The y-coordinate of the sprite.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the z value of the sprite.",
                     "name": "GetZ",
                     "params": [],
                     "returnDescription": "The z value of the sprite.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Move the sprite to a new position based on offsets to the current position.",
@@ -17297,7 +17687,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Move the sprite to a new set of coordinates.",
@@ -17318,7 +17708,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Adjusts the part of an [roRegion](https://developer.roku.com/docs/references/brightscript/components/roregion.md\"roRegion\")'s bitmap that is being displayed as the sprite. Wrap is taken into consideration.",
@@ -17353,13 +17743,13 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Removes the sprite from the managing roComposite object and deletes the sprite.",
                     "name": "Remove",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets bits to determine which sprites will be checked for collisions. The sprites that are checked must have the corresponding bits sets in their MemberFlags.",
@@ -17373,7 +17763,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Associates user-defined data with the sprite. The data can be any type including intrinsic types or objects.",
@@ -17387,7 +17777,7 @@
                             "type": "Dynamic"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets whether this sprite is drawable or just used for collision tests. An undrawable sprite can be used to define a region in the background that needs collision testing. It can also be used as an auxiliary collision region for a more complex sprite defined in another sprite.",
@@ -17401,7 +17791,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Defines the sprite membership though flags. The flags are used with CollidableFlags to define which sprites are allowed to collide.",
@@ -17415,7 +17805,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the region of the sprite to the passed roRegion object. If one already is set, it is replaced.",
@@ -17429,7 +17819,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the z value of the sprite. The z value defines the order in which sprites are drawn. Sprites with higher z values are drawn after (in front of) sprites with lower z values. The default z value is 0.",
@@ -17443,7 +17833,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifSprite",
@@ -17479,7 +17869,14 @@
                     "name": "GetString",
                     "params": [],
                     "returnDescription": "The string value stored in the calling String object.",
-                    "returnType": "String"
+                    "returnType": "string"
+                },
+                {
+                    "description": "Checks whether a string is empty.",
+                    "name": "IsEmpty",
+                    "params": [],
+                    "returnDescription": "A flag indicating whether the string is empty (true), or contains characters (false).",
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether a string is empty.",
@@ -17500,7 +17897,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifString",
@@ -17535,35 +17932,35 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Decodes the specified string with escape sequences for reserved Uniform Resource Identifier (URI) characters. If the escaped string includes invalid escape sequences, the decode will fail and an empty string will be returned.",
                     "name": "DecodeUri",
                     "params": [],
                     "returnDescription": "An unencoded version of the provided encoded Uniform Resource Identifier (URI).",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Decodes the specified string with escape sequences for reserved Uniform Resource Identifier (URI) component characters. If the escaped string includes invalid escape sequences, the decode will fail and an empty string will be returned.",
                     "name": "DecodeUriComponent",
                     "params": [],
                     "returnDescription": "An unencoded version of the provided encoded Uniform Resource Identifier (URI).",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Encodes the specified string with escape sequences for reserved Uniform Resource Identifier (URI) characters. Non-ASCII characters are encoded as UTF-8 escape sequences.",
                     "name": "EncodeUri",
                     "params": [],
                     "returnDescription": "The provided string encoded as a Uniform Resource Identifier (URI).",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Encodes the specified string with escape sequences for reserved Uniform Resource Identifier (URI) component characters.",
                     "name": "EncodeUriComponent",
                     "params": [],
                     "returnDescription": "The provided string encoded as a Uniform Resource Identifier (URI).",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nChecks whether the string ends with the substring specified in **matchString**, starting at the end of the string.\n\n or \n\nChecks whether the string ends with the substring specified in **matchString**, starting at the position specified in the **length** parameter.",
@@ -17585,14 +17982,22 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether a matching substring was found.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "URL encodes the specified string per [RFC 3986](https://www.ietf.org/rfc/rfc3986.txt \"RFC 3986\") and returns the encoded string. Non-ASCII characters are encoded as UTF-8 escape sequences. This functionality is essentially the same as roUrlTransfer.Escape, but without the overhead of creating a roUrlTransfer object.",
                     "name": "Escape",
                     "params": [],
                     "returnDescription": "The URL-encoded version of the specified string.",
-                    "returnType": "String"
+                    "returnType": "string"
+                },
+                {
+                    "description": "Returns a format conversion using the specified printf-like [format string](https://developer.roku.com/docs/references/brightscript/language/global-string-functions.mdformat-strings) and matching dynamic parameters.",
+                    "isVariadic": true,
+                    "name": "Format",
+                    "params": [],
+                    "returnDescription": "The formatted string.",
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a format conversion using the specified printf-like [format string](https://developer.roku.com/docs/references/brightscript/language/global-string-functions.mdformat-strings) and matching dynamic parameters.",
@@ -17607,7 +18012,7 @@
                     "name": "GetEntityEncode",
                     "params": [],
                     "returnDescription": "The encoded string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nReturns the zero-based index of the first occurrence of substring in the string. If the substring does not occur in the string, this method returns -1\n\n or \n\nReturns the zero-based index of the first occurrence of substring in the string, starting at the specified zero-based start\\_index. If the substring does not occur in the string after start\\_index, returns -1",
@@ -17629,7 +18034,7 @@
                         }
                     ],
                     "returnDescription": "The index of the first instance of the substring within the string.\n\n or \n\nThe index of the first instance of the substring within the string, based on the specified starting position.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns a string consisting of the first len characters of the string.",
@@ -17644,14 +18049,14 @@
                         }
                     ],
                     "returnDescription": "The string generated by the method.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the number of characters in the string.",
                     "name": "Len",
                     "params": [],
                     "returnDescription": "Number of characters.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nReturns a string consisting of the last characters of the string, starting at the zero-based start\\_index.\n\n or \n\nReturns a string consisting of num\\_chars characters of the string, starting at the zero-based start\\_index. If there are fewer than num\\_chars in the string after start\\_index, returns the remaining characters in the string.",
@@ -17673,7 +18078,7 @@
                         }
                     ],
                     "returnDescription": "The string generated by the method.\n\n or \n\n",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a copy of the string with all instances of **fromStr** replaced with **toStr**. If **fromStr** is empty the return value is the same as the source string.",
@@ -17694,7 +18099,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a string consisting of the last len characters of the string.",
@@ -17709,7 +18114,7 @@
                         }
                     ],
                     "returnDescription": "The string generated by the method.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Sets the roString object to the specified first set of characters of the provided string.",
@@ -17730,7 +18135,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Splits the input string using the separator string as a delimiter. An empty separator string indicates to split the string by character.",
@@ -17745,7 +18150,7 @@
                         }
                     ],
                     "returnDescription": "An array of the split token strings (not including the delimiter).",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nChecks whether the string starts with the substring specified in **matchString**, starting at the beginning of the string (position 0).\n\n or \n\nChecks whether the string starts with the substring specified in **matchString**, starting at the **matchPos** parameter (0-based character offset).",
@@ -17767,21 +18172,21 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether a matching substring was found.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns the value of the string interpreted as a floating point number.",
                     "name": "ToFloat",
                     "params": [],
                     "returnDescription": "The floating point number representation of the string.",
-                    "returnType": "Float"
+                    "returnType": "float"
                 },
                 {
                     "description": "Returns the value of the string interpreted as a decimal number.",
                     "name": "ToInt",
                     "params": [],
                     "returnDescription": "The decimal number representation of the string.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Splits the string into separate substrings separated by a single delimiter character.",
@@ -17796,21 +18201,21 @@
                         }
                     ],
                     "returnDescription": "An roList containing the each of the substrings. The delimiters are not returned.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the string with any leading and trailing whitespace characters (space, TAB, LF, CR, VT, FF, NO-BREAK SPACE, et al) removed.",
                     "name": "Trim",
                     "params": [],
                     "returnDescription": "The trimmed string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "URL decodes the specified string per [RFC 3986](https://www.ietf.org/rfc/rfc3986.txt \"RFC 3986\") and returns the decoded string.",
                     "name": "Unescape",
                     "params": [],
                     "returnDescription": "The URL-decoded string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "ifStringOps",
@@ -17838,6 +18243,27 @@
                             "type": "String"
                         }
                     ],
+                    "returnType": "void"
+                },
+                {
+                    "description": "Returns the message port (if any) currently associated with the object",
+                    "name": "GetMessagePort",
+                    "params": [],
+                    "returnDescription": "The message port.",
+                    "returnType": "Object"
+                },
+                {
+                    "description": "Sets the roMessagePort to be used to receive events.",
+                    "name": "SetMessagePort",
+                    "params": [
+                        {
+                            "default": null,
+                            "description": "The port to be used to receive events.",
+                            "isRequired": true,
+                            "name": "port",
+                            "type": "Object"
+                        }
+                    ],
                     "returnType": "Void"
                 },
                 {
@@ -17880,63 +18306,63 @@
                     "description": "Interrupts and stops any current text to speech spoken string, to be used when the app does not want to the text to speech to continue.",
                     "name": "Flush",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns an array containing the current list of languages available for text-to-speech.",
                     "name": "GetAvailableLanguages",
                     "params": [],
                     "returnDescription": "A list of languages.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns an array containing the current list of voices available for text-to-speech.",
                     "name": "GetAvailableVoices",
                     "params": [],
                     "returnDescription": "A list of voices.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the name of the currently-selected text-to-speech language.",
                     "name": "GetLanguage",
                     "params": [],
                     "returnDescription": "The language name.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the pitch at which text is spoken. The possible values range from -60 to +60.",
                     "name": "GetPitch",
                     "params": [],
                     "returnDescription": "The pitch.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the rate at which text is spoken. The value ranges from -40 to 200 with a default value of 0.",
                     "name": "GetRate",
                     "params": [],
                     "returnDescription": "The rate.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the currently-selected voice.",
                     "name": "GetVoice",
                     "params": [],
                     "returnDescription": "The selected voice.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the volume at which text is spoken. The value ranges from 0 for muted to 1000 for the highest volume. The default value is 1000.",
                     "name": "GetVolume",
                     "params": [],
                     "returnDescription": "The volume.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Checks whether text-to-speech is enabled. Text-to-speech may be enabled or disabled for various technical reasons (for example, on some platforms, text-to-speech may only be enabled once in connected mode). This is not affected by the state of any of its clients. In particular, it does not depend on whether a CVAA compliant accessibility feature is enabled or not.",
                     "name": "IsEnabled",
                     "params": [],
                     "returnDescription": "A flag indicating whether text-to-speech is enabled.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Returns an ID for the spoken string to notify observer callbacks about a specific spoken string.",
@@ -17951,7 +18377,7 @@
                         }
                     ],
                     "returnDescription": "The ID for the spoken string.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Sets the language specified by `name` for text to speech, from one of the available languages returned by the [GetAvailableLanguages()](#getavailablelanguages-as-object) method.",
@@ -17965,7 +18391,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the pitch at which text is spoken.",
@@ -17979,7 +18405,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the rate at which text is spoken.",
@@ -17993,7 +18419,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the voice specified by name for text to speech, from one of the available voices returned by the [GetAvailableVoices()](#getavailablevoices-as-object) method.",
@@ -18007,7 +18433,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the volume at which text is spoken.",
@@ -18021,7 +18447,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Causes text to speech to continue to suppress any application background sound for the amount of time specified by `duration`.",
@@ -18036,7 +18462,7 @@
                         }
                     ],
                     "returnDescription": "The duration for the speech suppression.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifTextToSpeech",
@@ -18064,13 +18490,13 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Removes all bitmaps from the roTextureManager.",
                     "name": "Cleanup",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Makes a request for an roBitmap with the attributes specified by the roTextureRequest. The roTextureManager will pass an roTextureRequestEvent to the message port when completed.",
@@ -18084,7 +18510,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Removes a bitmap from the roTextureManager with the specified URL.",
@@ -18098,7 +18524,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifTextureManager",
@@ -18118,14 +18544,14 @@
                     "description": "Returns a unique id for the request.",
                     "name": "GetId",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the state of the request.",
                     "name": "GetState",
                     "params": [],
                     "returnDescription": "The state value, which may be one of the following:",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Sets the request to be either asynchronous (true) or synchronous (false). The default is asynchronous",
@@ -18139,7 +18565,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the scaling mode to be used.",
@@ -18153,7 +18579,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the desired size of the roBitmap. The default is to return a bitmap in its native size.",
@@ -18174,7 +18600,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifTextureRequest",
@@ -18202,13 +18628,20 @@
                         }
                     ],
                     "returnDescription": "The number of seconds.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Sets the \"Mark\" point to the current time. The Mark point is also automatically set to the current time when an roTimespan object is created.",
                     "name": "Mark",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
+                },
+                {
+                    "description": "Returns the total number of microseconds from the \"Mark\" point to the current time.",
+                    "name": "TotalMicroseconds",
+                    "params": [],
+                    "returnDescription": "The number of microseconds.",
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the total number of microseconds from the \"Mark\" point to the current time.",
@@ -18222,14 +18655,14 @@
                     "name": "TotalMilliseconds",
                     "params": [],
                     "returnDescription": "The number of milliseconds.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the total number of seconds from the \"Mark\" point to the current time.",
                     "name": "TotalSeconds",
                     "params": [],
                     "returnDescription": "The number of seconds.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "ifTimeSpan",
@@ -18293,7 +18726,7 @@
                         }
                     ],
                     "returnDescription": "The string.\n\n or \n\nThe formatted string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "ifToStr",
@@ -18312,7 +18745,7 @@
                 {
                     "name": "AsyncCancel",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Starts a transfer without waiting for it to complete, similar to the [AsyncGetToString()](#asyncgettostring-as-boolean) method. However, the response body will be written to a file on the device's filesystem instead of being returned in a String object.",
@@ -18327,21 +18760,21 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the request was issued.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Starts a GET request to a server, but does not wait for the transfer to complete.",
                     "name": "AsyncGetToString",
                     "params": [],
                     "returnDescription": "A flag indicating whether the request was issued.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Begins an HTTP HEAD request without waiting for it to complete. When the HEAD completes, an [roUrlEvent](https://developer.roku.com/docs/references/brightscript/events/rourlevent.md\"roUrlEvent\") will be sent to the message port associated with the object. If false is returned then the request could not be issued and no events will be delivered.",
                     "name": "AsyncHead",
                     "params": [],
                     "returnDescription": "A flag indicating whether the request was issued.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Uses the HTTP POST method to send the contents of the specified file to the current URL. When the POST request completes, an [roUrlTransfer](https://developer.roku.com/docs/references/brightscript/interfaces/ifurltransfer.md\"roUrlTransfer\") will be sent to the message port associated with the object. If false is returned then the request could not be issued and no events will be delivered.",
@@ -18356,7 +18789,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the request was issued.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Uses the HTTP POST method to send the contents of the specified file (fromFile) to the current URL. When the POST request completes successfully, an [roUrlTransfer](https://developer.roku.com/docs/references/brightscript/interfaces/ifurltransfer.md\"roUrlTransfer\") will be sent to the message port associated with the object. If false is returned then the request could not be issued and no events will be delivered. This function is the same as AsyncPostFromFile, except that the HTTP response is written to the file specified by the toFile parameter.",
@@ -18378,7 +18811,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the request was issued.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Uses the HTTP POST method to send the supplied string to the current URL. When the POST request completes, an [roUrlTransfer](https://developer.roku.com/docs/references/brightscript/interfaces/ifurltransfer.md\"roUrlTransfer\") will be sent to the message port associated with the object. If false is returned then the request could not be issued and no events will be delivered.",
@@ -18393,7 +18826,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the request was issued.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables gzip encoding of transfers",
@@ -18407,7 +18840,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether this operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables a fresh connection using CURLOPT\\_FRESH\\_CONNECT.",
@@ -18422,7 +18855,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Verifies that the certificate belongs to the host using CURLOPT\\_SSL\\_VERIFYHOST.",
@@ -18437,7 +18870,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Verifies that the certificate has a chain of trust up to a valid root certificate using CURLOPT\\_SSL\\_VERIFYPEER.",
@@ -18452,7 +18885,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Enables automatic resumption of `AsyncGetToFile` and `GetToFile` requests",
@@ -18467,7 +18900,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "URL encodes the specified string per [RFC 3986](https://www.ietf.org/rfc/rfc3986.txt \"RFC 3986\") and return the encoded string",
@@ -18482,28 +18915,28 @@
                         }
                     ],
                     "returnDescription": "The URL-encoded string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "If any of the `roUrlEvent` functions indicate failure then this function may provide more information regarding the failure.",
                     "name": "GetFailureReason",
                     "params": [],
                     "returnDescription": "Failure reason.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns a unique number for this object that can be used to identify whether events originated from this object. The value can be any arbitrary value as assigned by the Roku OS, and should only be used for comparison purposes. For example, the value should not be used as an array index. For use as a look-up key, one option would be to use `GetIdentity().ToStr()` as an associative array key.",
                     "name": "GetIdentity",
                     "params": [],
                     "returnDescription": "A unique number for the object.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the current request method.",
                     "name": "GetRequest",
                     "params": [],
                     "returnDescription": "The request method.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Connect to the remote service as specified in the URL and write the response body to a file on the Roku device's filesystem. This function does not return until the exchange is complete and may block for a long time. The HTTP response code from the server is returned. It is not possible to access any of the response headers. If this information is required use the [AsyncGetToFile()](#asyncgettofilefilename-as-string-as-boolean) method instead.",
@@ -18518,21 +18951,28 @@
                         }
                     ],
                     "returnDescription": "The HTTP response code.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Connects to the remote service as specified in the URL and returns the response body as a string. This function waits for the transfer to complete and it may block for a long time. This calls discards the headers and response codes. If that information is required, use the [AsyncGetToString()](#asyncgettostring-as-boolean) method.",
                     "name": "GetToString",
                     "params": [],
                     "returnDescription": "The response body.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the current URL.",
                     "name": "GetUrl",
                     "params": [],
                     "returnDescription": "The URL.",
-                    "returnType": "String"
+                    "returnType": "string"
+                },
+                {
+                    "description": "Returns the user agent of the device, which can then be passed into server-side ad requests.",
+                    "name": "GetUserAgent",
+                    "params": [],
+                    "returnDescription": "The device user agent, which has the following syntax: \"Roku/DVP-major.minor (major.minor.revision.build-plid)\". For example, Roku/DVP‑12.0 (12.0.0.4171‑29).",
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the user agent of the device, which can then be passed into server-side ad requests.",
@@ -18546,7 +18986,7 @@
                     "name": "Head",
                     "params": [],
                     "returnDescription": "An [roUrlTransfer](/docs/references/brightscript/interfaces/ifurltransfer.md \"roUrlTransfer\") object. If a catastrophic failure occurs (for example, an asynchronous operation is already active), invalid is returned",
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Uses the HTTP POST method to send the contents of the specified file to the current URL. The HTTP response code is returned. Any response body is discarded",
@@ -18561,7 +19001,7 @@
                         }
                     ],
                     "returnDescription": "The HTTP response code.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Uses the HTTP POST method to send the supplied string to the current URL. The HTTP response code is returned. Any response body is discarded",
@@ -18576,7 +19016,7 @@
                         }
                     ],
                     "returnDescription": "The HTTP response code.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the body of the response even if the HTTP status code indicates that an error occurred.",
@@ -18591,7 +19031,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "An optional function that enables HTTP/2 support. If version is set to `\"http2\"`, HTTP/2 will be used for all underlying transfers.",
@@ -18605,7 +19045,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Terminates the transfer automatically if the transfer rate drops below the specified rate (bytes\\_per\\_second) over a specific interval (period\\_in\\_seconds).",
@@ -18627,7 +19067,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Changes the request method from the normal GET, HEAD or POST to the value passed as a string.",
@@ -18655,7 +19095,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Enables HTTP authentication using the specified user name and password.",
@@ -18677,7 +19117,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Decodes the specified string per [RFC 3986](https://www.ietf.org/rfc/rfc3986.txt \"RFC 3986\") and returns the unencoded string.",
@@ -18692,7 +19132,7 @@
                         }
                     ],
                     "returnDescription": "The decoded string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "deprecatedDescription": "This method is deprecated. Use the [Escape()](/docs/references/brightscript/interfaces/ifurltransfer.md#escapetext-as-string-as-string) method.\n",
@@ -18708,13 +19148,63 @@
                         }
                     ],
                     "returnDescription": "The encoded string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "ifUrlTransfer",
             "properties": [],
             "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifurltransfer.md"
         },
+        "ifutils": {
+            "availableSince": "15.0",
+            "description": "_Available since Roku OS 15.0_",
+            "implementers": [
+                {
+                    "description": "The **roUtils** component provides a unique namespace for a library of global functions, including the **DeepCopy()** function for copying objects and their nested objects and the **isSameObject()** function for checking whether two BrightScript objects refer to the same instance.",
+                    "name": "roUtils",
+                    "url": "https://developer.roku.com/docs/references/brightscript/components/routils.md"
+                }
+            ],
+            "methods": [
+                {
+                    "description": "Performs a deep copy of a node object (it copies the obejct and all of its nested objects). If the object contains items that are not copyable, they are skipped.",
+                    "name": "DeepCopy",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "data",
+                            "type": "Object"
+                        }
+                    ],
+                    "returnDescription": "This function returns a copy of the specified object.",
+                    "returnType": "object"
+                },
+                {
+                    "description": "Checks whether two BrightScript objects refer to the same instance and returns a flag indicating the result.",
+                    "name": "IsSameObject",
+                    "params": [
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "data1",
+                            "type": "Object"
+                        },
+                        {
+                            "default": null,
+                            "isRequired": true,
+                            "name": "data2",
+                            "type": "Object"
+                        }
+                    ],
+                    "returnDescription": "Returns true if **data1** and **data2** reference the same object; otherwise, this returns false.",
+                    "returnType": "boolean"
+                }
+            ],
+            "name": "ifUtils",
+            "properties": [],
+            "url": "https://developer.roku.com/docs/references/brightscript/interfaces/ifutils.md"
+        },
         "ifvideoplayer": {
             "implementers": [
                 {
@@ -18736,7 +19226,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Changes the currently playing audio track. For content with multiple audio tracks, the current track can be selected programmatically using this function.",
@@ -18750,62 +19240,62 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Clears all content from the roVideoPlayer. If the player is currently playing, it stops. Next, the current player position is reset so the next time the [Play()](#play-as-boolean) method is called, playback starts at the first item of the content list (unless the [Seek()](#seekoffsetms-as-integer-as-boolean) method is called prior to Play()).",
                     "name": "ClearContent",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Returns the audio tracks contained in the current stream.",
                     "name": "GetAudioTracks",
                     "params": [],
                     "returnDescription": "An roArray, where each element in the array represents a single audio track that contains the following attributes: ${getaudiotracksvalues}",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "This method returns the roCaptionRenderer instance associated with this roVideoPlayer.",
                     "name": "GetCaptionRenderer",
                     "params": [],
                     "returnDescription": "The roCaptionRenderer instance associated with this roVideoPlayer.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the duration of the video, in seconds. This information may not be available until after the video starts playing.",
                     "name": "GetPlaybackDuration",
                     "params": [],
                     "returnDescription": "The duration of the video. A value of 0 is returned if the duration is unknown.",
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Puts the roVideoPlayer object into pause mode. If the player is already in pause mode, this will generate an error.",
                     "name": "Pause",
                     "params": [],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Puts the roVideoPlayer object into play mode starting at the beginning of the content list. This will stop any currently playing Content List.",
                     "name": "Play",
                     "params": [],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Begins downloading and buffering of a video that may be selected by a user. This method can be used to reduce buffering delays after a user has selected a video for playback. It is typically called when the user is in the roSpringboardScreen (or equivalent), anticipating that the user will select a video on the springboard screen for download.",
                     "name": "PreBuffer",
                     "params": [],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Puts the roVideoPlayer object into play mode starting from the pause point. This method must be called when the roVideoPlayer object is in pause mode; otherwise, it will generate an error.",
                     "name": "Resume",
                     "params": [],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the start point of playback for the current video to a specific offset.",
@@ -18819,7 +19309,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets CGMS (Copy Guard Management System) on analog outputs to the desired level.",
@@ -18833,7 +19323,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the content to be played by the roVideoPlayer.",
@@ -18847,7 +19337,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "**OVERLOADED METHOD**\n\nSets the target display window for the video.\n\n or \n\nSets the target display window for the video. This is similar to the [SetDestinationRect()](#setdestinationrectrect-as-object-as-void) function except that the values are specified as separate parameters.",
@@ -18883,7 +19373,7 @@
                         }
                     ],
                     "returnDescription": "",
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Mutes the audio during video playback. This is useful, for example, for implementing a video preview feature in an app.",
@@ -18897,7 +19387,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Automatically replays the content list. This method buffers on every loop to the beginning of the content list.",
@@ -18911,7 +19401,7 @@
                             "type": "Boolean"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "deprecatedDescription": "This function is deprecated. Roku no longer supports Macrovision and this function exists as a no-op so that legacy scripts do not break.",
@@ -18926,7 +19416,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the max resolution required by your video.",
@@ -18947,7 +19437,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the next item in the Content List to be played.",
@@ -18961,7 +19451,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the interval to receive playback position events from the roVideoPlayer.",
@@ -18975,7 +19465,7 @@
                             "type": "Integer"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Specifies the timedMetaData keys that the BrightScript app is interested in receiving from the timedMetaData event.",
@@ -18989,14 +19479,14 @@
                             "type": "roArray"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Stops playback and resets the seek position; keeps the player’s current position unchanged.",
                     "name": "Stop",
                     "params": [],
                     "returnDescription": "A flag indicating whether the operation was successful.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "ifVideoPlayer",
@@ -19031,14 +19521,14 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Adds a new unnamed/empty child element and returns it. This should generally be followed by a call to the [SetName()](#setnamename-as-string-as-void) method of the child element. Alternatively, the [AddElement()](#addelementname-as-string-as-object) or [AddElementWidthBody()](#addelementwithbodyname-as-string-body-as-object-as-object) method can be used to combine this step with additional construction into one call.",
                     "name": "AddBodyElement",
                     "params": [],
                     "returnDescription": "Object value.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Adds a new child element with the specified name and returns the new element.",
@@ -19053,7 +19543,7 @@
                         }
                     ],
                     "returnDescription": "The new element added.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Adds a new child element with the specified name and text from the specified body string, and returns the new element.",
@@ -19075,7 +19565,7 @@
                         }
                     ],
                     "returnDescription": "The new element added.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Adds text to the element.",
@@ -19089,13 +19579,13 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Removes all attributes and children from the element, as well as setting the name to empty.",
                     "name": "Clear",
                     "params": [],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Serializes the element to XML document text.",
@@ -19110,7 +19600,7 @@
                         }
                     ],
                     "returnDescription": "A serialized string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Serializes the element to XML document text. The specified header is used to begin the output (for example, as a custom XML declaration).",
@@ -19125,42 +19615,42 @@
                         }
                     ],
                     "returnDescription": "A serialized string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the XML attributes of the element.",
                     "name": "GetAttributes",
                     "params": [],
                     "returnDescription": "An associative array representing the XML attributes of the element.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the body of the element. If the element contains child elements, `GetBody()` returns an [roXMLList](https://developer.roku.com/docs/references/brightscript/components/roxmllist.md\"roXMLList\") representing those elements, like GetChildElements(). If there are no children but the element contains text, `GetBody()` returns an [roString](https://developer.roku.com/docs/references/brightscript/components/rostring.md\"roString\") like `GetText()`. If the element is empty, `GetBody()` returns invalid.",
                     "name": "GetBody",
                     "params": [],
                     "returnDescription": "Object body.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "If this element contains any child elements, this method returns an [roXMLList](https://developer.roku.com/docs/references/brightscript/components/roxmllist.md\"roXMLList\") representing those elements. If there are no child elements, returns invalid.",
                     "name": "GetChildElements",
                     "params": [],
                     "returnDescription": "An element list.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "If this element contains any child elements, this method returns an [roList](https://developer.roku.com/docs/references/brightscript/components/rolist.md\"roList\") representing those elements. If there are no child elements, returns invalid. The difference between this function and `GetChildElements()` is that `GetChildNodes()` handles the case of mixed XML content, i.e., content with both child elements and text such as: Child TextMore Text. In this case `GetChildNodes()` called with the top level as an argument would return an roList with two elements. The first element would be an `roXMLElement` containing the information about. The second would be an `roString` containing \"More Text\".",
                     "name": "GetChildNodes",
                     "params": [],
                     "returnDescription": "An element list.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the name of the element.",
                     "name": "GetName",
                     "params": [],
                     "returnDescription": "Element name.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns an [roXMLList](https://developer.roku.com/docs/references/brightscript/components/roxmllist.md\"roXMLList\") representing all child elements of this element whose case-sensitive name is specified. If only one element matches the name, an roXMLList containing one element is returned. If no elements match, an empty roXMLList is returned.",
@@ -19175,7 +19665,7 @@
                         }
                     ],
                     "returnDescription": "An element list.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns an [roXMLList](https://developer.roku.com/docs/references/brightscript/components/roxmllist.md\"roXMLList\") representing all child elements of this element whose case-insensitive name is specified. If only one element matches the name, an roXMLList containing one element is returned. If no elements match, an empty roXMLList is returned.",
@@ -19190,14 +19680,14 @@
                         }
                     ],
                     "returnDescription": "An element list.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns any text contained in the element. This returns immediate body text only (for example, it does not include text from child elements).",
                     "name": "GetText",
                     "params": [],
                     "returnDescription": "The text in the element.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks whether the element has the specified attribute.",
@@ -19212,7 +19702,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the element has the specified attribute.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the element has the specified name.",
@@ -19227,7 +19717,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the element has the specified name.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Parses a string of XML.",
@@ -19242,7 +19732,7 @@
                         }
                     ],
                     "returnDescription": "A flag indicating whether the operation was successful. In that case, other methods below can then be used to extract information about the parsed element.",
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Sets the element text from the specified string",
@@ -19256,7 +19746,7 @@
                             "type": "Object"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 },
                 {
                     "description": "Sets the name of the element.",
@@ -19270,7 +19760,7 @@
                             "type": "String"
                         }
                     ],
-                    "returnType": "Void"
+                    "returnType": "void"
                 }
             ],
             "name": "ifXMLElement",
@@ -19291,14 +19781,14 @@
                     "name": "GetAttributes",
                     "params": [],
                     "returnDescription": "The object item.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "If the list contains exactly one item, this function returns the child elements of that item. Otherwise it returns invalid.",
                     "name": "GetChildElements",
                     "params": [],
                     "returnDescription": "The object item.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns a new XMLList that contains all roXMLElements that matched the passed in name (case-sensitive matching is used). This is the same as using the dot operator on an roXMLList.",
@@ -19313,7 +19803,7 @@
                         }
                     ],
                     "returnDescription": "An XMLList that contains the matches.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns a new XMLList that contains all roXMLElements that matched the passed in name (case-insensitive matching is used). This is the same as using the dot operator on an roXMLList.",
@@ -19328,21 +19818,21 @@
                         }
                     ],
                     "returnDescription": "An XMLList that contains the matches.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "If the list contains exactly one item, this function returns the text of that item. Otherwise, it returns an empty string.",
                     "name": "GetText",
                     "params": [],
                     "returnDescription": "The object string.",
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "If the list contains exactly one item, this function returns that item. Otherwise, it returns itself.",
                     "name": "Simplify",
                     "params": [],
                     "returnDescription": "The object item.",
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "ifXMLList",
@@ -19364,7 +19854,7 @@
                     "description": "Returns an associative array with the following key/value pair:",
                     "name": "GetInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "roAppMemoryNotificationEvent",
@@ -19384,79 +19874,79 @@
                     "description": "Checks whether a segment in an adaptive stream (HLS, Smooth, or DASH) has been downloaded. This method returns true if a segment in an adaptive stream (HLS, Smooth, or DASH) has been downloaded; otherwise, it returns false. Specific information about the event can be obtained by calling the GetMessage(), GetIndex() and GetInfo() methods on the event.",
                     "name": "isDownloadSegmentInfo",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an event has been fired when the format of all tracks in the media stream have been identified.",
                     "name": "isFormatDetected",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Audio playback completed at end of content.",
                     "name": "isFullResult",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "A stream has been selected to start playing.",
                     "name": "isListItemSelected",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Audio playback was interrupted",
                     "name": "isPartialResult",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Audio playback was paused by the user.",
                     "name": "isPaused",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Audio playback failed due to an error",
                     "name": "isRequestFailed",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Stream playback has completed successfully.",
                     "name": "isRequestSucceeded",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Audio playback has resumed",
                     "name": "isResumed",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the individual segments in an HLS or smooth stream are about to be downloaded. This method returns true if segments in the stream are going to be downloaded; otherwise, it returns false.",
                     "name": "isSegmentDownloadStarted",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Status information is available.",
                     "name": "isStatusMessage",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether playback has begun of a segment in an HLS, DASH, or smooth stream. This method returns true if the playback of a segment in an HLS, DASH, or smooth stream has begun; otherwise, it returns false. Specific information about the event can be obtained by calling the GetMessage(), GetIndex() and GetInfo() methods on the event.",
                     "name": "isStreamSegmentInfo",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "This event is fired when an ID3 timecode has passed with an event that includes key/value pairs for timed metadata that the Brightscript app is interested in.",
                     "name": "isTimedMetaData",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roAudioPlayerEvent",
@@ -19476,19 +19966,19 @@
                     "description": "The index value of this event is not used and is always set to 0.",
                     "name": "GetIndex",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an associative array with the following key/value pairs:",
                     "name": "GetInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the string \"CECStatus\".",
                     "name": "GetMessage",
                     "params": [],
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "roCECStatusEvent",
@@ -19508,19 +19998,19 @@
                     "description": "Checks whether the previous GET request has completed failed.",
                     "name": "isRequestFailed",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if the previous GET request did not complete. This method returns true if the request was not complete; otherwise, it returns false.",
                     "name": "isRequestInterrupted",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the previous GET request has completed successfully.",
                     "name": "isRequestSucceeded",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roChannelStoreEvent",
@@ -19553,13 +20043,13 @@
                     "description": "Indicates whether the user has changed the closed caption mode or track. This method returns true if the caption mode changed; otherwise, it returns false.",
                     "name": "isCaptionModeChanged",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if the device status has changed. This method returns true if the device status has changed; otherwise, it returns false.",
                     "name": "isStatusMessage",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roDeviceInfoEvent",
@@ -19579,13 +20069,13 @@
                     "description": "Checks if a storage device was inserted in the USB port. This method returns true if a storage device was inserted; otherwise, it returns false.",
                     "name": "isStorageDeviceAdded",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks if a storage device was removed from the USB port. This method returns true if a storage device was removed; otherwise, it returns false.",
                     "name": "isStorageDeviceRemoved",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roFileSystemEvent",
@@ -19600,7 +20090,7 @@
                     "description": "Checks if an HDMI status event has occurred. This method returns true if an HDMI status event has occurred; otherwise, it returns false.",
                     "name": "isHdmiStatus",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roHdmiStatusEvent",
@@ -19620,13 +20110,13 @@
                     "description": "Returns an roAssociativeArray describing the input event, which may be one of the following values:",
                     "name": "GetInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks if an input event was received. This method returns true if an input event was received; otherwise, it returns false.",
                     "name": "isInput",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roInputEvent",
@@ -19646,13 +20136,13 @@
                     "description": "Checks if the microphone recording session has been closed. This method returns true if the recording session is closed; otherwise, it returns false.",
                     "name": "IsRecordingDone",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the microphone is open. This method returns true when the microphone is open; otherwise, it returns false.",
                     "name": "IsRecordingInfo",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roMicrophoneEvent",
@@ -19672,31 +20162,31 @@
                     "description": "Retrieves the new field value at the time of the change.",
                     "name": "getData",
                     "params": [],
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Retrieves the name of the field that changed.",
                     "name": "getField",
                     "params": [],
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Retrieves an AA that contains the values of selected \"context\" fields, which were [specified in an earlier-executed call](https://developer.roku.com/docs/references/brightscript/interfaces/ifsgnodefield.mdevent-field-aggregation) to `observeField()` or `observeFieldScoped()`. (If no such \"context\" fields were designated previously, `getInfo()` returns an empty AA.) The array is keyed on the names of the \"context\" fields, and the entry values are the instantaneous values of the corresponding fields, at the point when the observed field changed.",
                     "name": "getInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Retrieves the ID of the node that changed.",
                     "name": "getNode",
                     "params": [],
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 },
                 {
                     "description": "Retrieves a pointer to the node. This can be used for nodes without an ID.",
                     "name": "getRoSGNode",
                     "params": [],
-                    "returnType": "Dynamic"
+                    "returnType": "dynamic"
                 }
             ],
             "name": "roSGNodeEvent",
@@ -19716,7 +20206,7 @@
                     "description": "Checks whether the screen has been closed and is no longer displayed to the user. This method returns true if the screen was closed; otherwise, it returns false.",
                     "name": "isScreenClosed",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roSGScreenEvent",
@@ -19740,7 +20230,7 @@
                     "description": "Returns the ID of the socket this event is for. The ID of a socket can be obtained from ifSocketAsync.GetID(). Use [ifSocketStatus](https://developer.roku.com/docs/references/brightscript/interfaces/ifsocketstatus.md\"ifSocketStatus\") or [ifSocketConnectionStatus](https://developer.roku.com/docs/references/brightscript/interfaces/ifsocketconnectionstatus.md\"ifSocketConnectionStatus\") on the indicated socket to query the new status for the socket.",
                     "name": "GetSocketID",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 }
             ],
             "name": "roSocketEvent",
@@ -19755,7 +20245,7 @@
                     "description": "Returns an AssociativeArray containing information describing the event, which may be one of the following values:",
                     "name": "GetInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "roSystemLogEvent",
@@ -19775,19 +20265,19 @@
                     "description": "Returns the description of the speech, which may be one of the following values:",
                     "name": "GetData",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "The text to speech service may be shared among any number of clients; therefore, the IDs returned to a given client are not necessarily contiguous. The value is only meaningful if [GetData()](https://developer.roku.com/docs/references/brightscript/events/rotexttospeechevent.mdgetinfo-as-object \"GetData()\") returned 0, 1 or 2; it returns 0 otherwise.",
                     "name": "GetIndex",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an associative array with the following key-value pairs, depending the value returned by the [GetData()](https://developer.roku.com/docs/references/brightscript/events/rotexttospeechevent.mdgetinfo-as-object \"GetData()\") method:",
                     "name": "GetInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 }
             ],
             "name": "roTextToSpeechEvent",
@@ -19807,25 +20297,25 @@
                     "description": "Returns an roBitmap from the request if the state is ready.",
                     "name": "GetBitmap",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns the unique id of the request.",
                     "name": "GetId",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the state of the request. See [ifTextureRequest](https://developer.roku.com/docs/references/brightscript/interfaces/iftexturerequest.md\"ifTextureRequest\").GetState() for the list of states.",
                     "name": "GetState",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the URI of the request.",
                     "name": "GetURI",
                     "params": [],
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "roTextureRequestEvent",
@@ -19845,37 +20335,37 @@
                     "description": "Returns the Unicode character value generated by a keyboard key press event.",
                     "name": "GetChar",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the ID of the remote button or character value represented by the event. Values 0x20..0x10FFFF represent a Unicode character value. Other values represent a remote button ID. GetID() returns the same value for a release event as for the press event.",
                     "name": "GetID",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an integer representing pressed or released keys on the remote. This table can be accessed at runtime by calling `bslCore.brs: bslUniversalControlEventCodes()`:",
                     "name": "GetInt",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the ID of the remote button that generated an event.",
                     "name": "GetKey",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an identifier associated with the type and ID of the remote control that generated the event. For example, if multiple wireless remotes are paired, this may be used to distinguish the event sources. Some remote controls, such as IR remotes, can not be distinguished using this API.",
                     "name": "GetRemoteID",
                     "params": [],
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Checks whether a press event has occurred. This method returns true if a press event has occurred; otherwise, it returns false.",
                     "name": "IsPress",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roUniversalControlEvent",
@@ -19895,49 +20385,49 @@
                     "description": "Returns a description of the failure that occurred.",
                     "name": "GetFailureReason",
                     "params": [],
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the type of event, which may be one of the following values:",
                     "name": "GetInt",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns the protocol response code associated with this event. For a successful HTTP request this will be the HTTP status code 200. For unexpected errors the return value is negative. There are lots of possible negative errors from the CURL library but it's often best just to look at the text version via GetFailureReason().",
                     "name": "GetResponseCode",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an [roAssociativeArray](https://developer.roku.com/docs/references/brightscript/components/roassociativearray.md\"roAssociativeArray\") containing all the headers returned by the server for appropriate protocols (such as HTTP). Headers are only returned when the status code is greater than or equal to 200 and less than 300",
                     "name": "GetResponseHeaders",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "This method returns an [roArray](https://developer.roku.com/docs/references/brightscript/components/roarray.md\"roArray\") of [roAssociativeArrays](https://developer.roku.com/docs/references/brightscript/components/roassociativearray.md\"roAssociativeArray\"), where each associative array contains a single header name/value pair. Use this function if you need access to duplicate headers, since GetResponseHeaders() returns only the last name/value pair for a given name. All headers are returned regardless of the status code",
                     "name": "GetResponseHeadersArray",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Returns a magic number that can be matched with the value returned by the [roUrlTransfer.GetIdentity()](https://developer.roku.com/docs/references/brightscript/interfaces/ifurltransfer.mdgetidentity-as-integer) method to determine the source of the roUrlTransfer event.",
                     "name": "GetSourceIdentity",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "For transfer complete AsyncGetToString, AsyncPostFromString and AsnycPostFromFile requests this will be the actual response body from the server. This method returns the string associated with the event.",
                     "name": "GetString",
                     "params": [],
-                    "returnType": "String"
+                    "returnType": "string"
                 },
                 {
                     "description": "Returns the IP address of the destination.",
                     "name": "GetTargetIpAddress",
                     "params": [],
-                    "returnType": "String"
+                    "returnType": "string"
                 }
             ],
             "name": "roUrlEvent",
@@ -19957,103 +20447,103 @@
                     "description": "Returns current position in the stream (in seconds) from the beginning.",
                     "name": "GetIndex",
                     "params": [],
-                    "returnType": "Integer"
+                    "returnType": "integer"
                 },
                 {
                     "description": "Returns an roAssociativeArray array with the following key-value pairs:",
                     "name": "GetInfo",
                     "params": [],
-                    "returnType": "Object"
+                    "returnType": "object"
                 },
                 {
                     "description": "Checks whether closed caption mode or track has been changed by the user. This method returns true if closed caption mode or track has been changed by the user; otherwise, it returns false. Specific information about the event can be obtained by calling the GetMessage(), GetIndex(), and GetInfo() methods on the event.",
                     "name": "isCaptionModeChanged",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether a segment in an adaptive stream (HLS, Smooth, or DASH) has been downloaded. This method returns true if a segment in an adaptive stream (HLS, Smooth, or DASH) has been downloaded; otherwise, it returns false. Specific information about the event can be obtained by calling the GetMessage(), GetIndex() and GetInfo() methods on the event.",
                     "name": "isDownloadSegmentInfo",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an event has been fired when the format of all tracks in the media stream have been identified.",
                     "name": "isFormatDetected",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether video playback has completed at the end of the content list. This method returns true if video playback has completed at the end of the content list; otherwise, it returns false.",
                     "name": "isFullResult",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the video player is about to start playing a new item in the content list. This method returns true if a new item in the content list was selected; otherwise, it returns false.",
                     "name": "isListItemSelected",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether video playback was paused by the user. This method returns true if video playback was paused; otherwise, it returns false.",
                     "name": "isPaused",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the current position in the video stream has changed. This event is sent periodically while playing, as determined by the last call to [ifVideoPlayer.SetPositionNotificationPeriod](https://developer.roku.com/docs/references/brightscript/interfaces/ifvideoplayer.mdsetpositionnotificationperiodperiod-as-integer-as-void \"ifVideoPlayer.SetPositionNotificationPeriod\"). This method returns true if the current position in the video stream has changed; otherwise, it returns false. Specific information about the event can be obtained by calling the GetIndex() and GetInfo() methods on the event.",
                     "name": "isPlaybackPosition",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether video playback has failed. This method returns true if video playback failed; otherwise, it returns false.",
                     "name": "isRequestFailed",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the player has finished playing an item in the content list. This method returns true if the player has finished playing a content list item; otherwise, it returns false. Specific information about the event can be obtained by calling the GetIndex() method on the event.",
                     "name": "isRequestSucceeded",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether video playback has resumed. This method returns true if video playback has resumed; otherwise, it returns false.",
                     "name": "isResumed",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the individual segments in an HLS or smooth stream are about to be downloaded. This method returns true if segments in the stream are going to be downloaded; otherwise, it returns false.",
                     "name": "isSegmentDownloadStarted",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether status information or other diagnostic message is available. This method returns true if status information or diagnostic message is available; otherwise, it returns false. Specific information about the event can be obtained by calling the GetMessage() method on the event.",
                     "name": "isStatusMessage",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether playback has begun of a segment in an HLS, DASH, or smooth stream. This method returns true if the playback of a segment in an HLS, DASH, or smooth stream has begun; otherwise, it returns false. Specific information about the event can be obtained by calling the GetMessage(), GetIndex() and GetInfo() methods on the event.",
                     "name": "isStreamSegmentInfo",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether the video stream has started playing. This method returns true if the video stream has started playing; otherwise, it returns false. Specific information about the event can be obtained by calling the GetIndex() and GetInfo() methods on the event.",
                     "name": "isStreamStarted",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 },
                 {
                     "description": "Checks whether an ID3 timecode has passed with an event that includes key-value pairs for timed metadata that the BrightScript app is interested in.",
                     "name": "isTimedMetaData",
                     "params": [],
-                    "returnType": "Boolean"
+                    "returnType": "boolean"
                 }
             ],
             "name": "roVideoPlayerEvent",
diff --git a/src/roku-types/index.ts b/src/roku-types/index.ts
index 271afcf77..c2900f7d9 100644
--- a/src/roku-types/index.ts
+++ b/src/roku-types/index.ts
@@ -25,6 +25,7 @@ export interface BRSBaseMethodData extends PossiblyDeprecated {
         isRequired: boolean;
         type: string;
     }[];
+    isVariadic?: boolean;
     returnType: string;
 }
 export interface BRSEventMethodData extends BRSBaseMethodData {
@@ -57,6 +58,8 @@ export interface SGNodeData extends BrightScriptDocLookup {
     fields: BRSFieldData[];
     events: BrightScriptDocLookup[];
     interfaces: BrightScriptDocLookup[];
+    extends?: BrightScriptDocLookup;
+    methods?: BRSInterfaceMethodData[];
 }
 
 export interface BRSComponentData extends BrightScriptDocLookup, PossiblyDeprecated {
diff --git a/src/testHelpers.spec.ts b/src/testHelpers.spec.ts
index 7836aa2c9..2819c77be 100644
--- a/src/testHelpers.spec.ts
+++ b/src/testHelpers.spec.ts
@@ -1,7 +1,7 @@
-import type { BscFile, BsDiagnostic } from './interfaces';
+import type { BsDiagnostic } from './interfaces';
 import * as assert from 'assert';
 import chalk from 'chalk';
-import type { CodeDescription, CompletionItem, CompletionList, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, integer, Range } from 'vscode-languageserver';
+import type { CodeDescription, CompletionItem, CompletionList, Diagnostic, DiagnosticRelatedInformation, DiagnosticSeverity, DiagnosticTag, Location } from 'vscode-languageserver';
 import { createSandbox } from 'sinon';
 import { expect } from './chai-config.spec';
 import type { CodeActionShorthand } from './CodeActionUtil';
@@ -9,16 +9,20 @@ import { codeActionUtil } from './CodeActionUtil';
 import type { BrsFile } from './files/BrsFile';
 import type { Program } from './Program';
 import { standardizePath as s } from './util';
-import type { CodeWithSourceMap } from 'source-map';
 import { getDiagnosticLine } from './diagnosticUtils';
 import { firstBy } from 'thenby';
 import undent from 'undent';
+import type { BscFile } from './files/BscFile';
+import type { BscType } from './types/BscType';
+import type { LspDiagnostic } from './lsp/LspProject';
+import { Project } from './lsp/Project';
+import { isProgram, isProject } from './astUtils/reflection';
 import type { WorkspaceConfig } from './lsp/ProjectManager';
 
 export const cwd = s`${__dirname}/../`;
 export const tempDir = s`${__dirname}/../.tmp`;
 export const rootDir = s`${tempDir}/rootDir`;
-export const stagingDir = s`${tempDir}/stagingDir`;
+export const outDir = s`${tempDir}/outDir`;
 export const workspaceSettings: WorkspaceConfig = {
     workspaceFolder: rootDir,
     languageServer: {
@@ -37,12 +41,25 @@ afterEach(() => {
     sinon.restore();
 });
 
-type DiagnosticCollection = { getDiagnostics(): Array<Diagnostic> } | { diagnostics: Diagnostic[] } | Diagnostic[];
+type DiagnosticCollection = { getDiagnostics(): Array<BsDiagnostic | LspDiagnostic>; getFile?: (path: string, normalize: boolean) => BscFile } | { diagnostics?: BsDiagnostic[] } | BsDiagnostic[] | LspDiagnostic[];
 type DiagnosticCollectionAsync = DiagnosticCollection | { getDiagnostics(): Promise<Array<Diagnostic>> };
 
 function getDiagnostics(arg: DiagnosticCollection): BsDiagnostic[] {
     if (Array.isArray(arg)) {
         return arg as BsDiagnostic[];
+
+        //project.getDiagnostics() returns LspDiagonstics
+    } else if (arg instanceof Project) {
+        const diagnostics = arg.getDiagnostics();
+        return diagnostics.map(diagnostic => {
+            return {
+                ...diagnostic,
+                location: {
+                    uri: diagnostic.uri,
+                    range: diagnostic.range
+                }
+            } as BsDiagnostic;
+        });
     } else if ((arg as any).getDiagnostics) {
         return (arg as any).getDiagnostics();
     } else if ((arg as any).diagnostics) {
@@ -56,10 +73,10 @@ function sortDiagnostics(diagnostics: BsDiagnostic[]) {
     return diagnostics.sort(
         firstBy<BsDiagnostic>('code')
             .thenBy<BsDiagnostic>('message')
-            .thenBy<BsDiagnostic>((a, b) => (a.range?.start?.line ?? 0) - (b.range?.start?.line ?? 0))
-            .thenBy<BsDiagnostic>((a, b) => (a.range?.start?.character ?? 0) - (b.range?.start?.character ?? 0))
-            .thenBy<BsDiagnostic>((a, b) => (a.range?.end?.line ?? 0) - (b.range?.end?.line ?? 0))
-            .thenBy<BsDiagnostic>((a, b) => (a.range?.end?.character ?? 0) - (b.range?.end?.character ?? 0))
+            .thenBy<BsDiagnostic>((a, b) => (a.location?.range?.start?.line ?? 0) - (b.location?.range?.start?.line ?? 0))
+            .thenBy<BsDiagnostic>((a, b) => (a.location?.range?.start?.character ?? 0) - (b.location?.range?.start?.character ?? 0))
+            .thenBy<BsDiagnostic>((a, b) => (a.location?.range?.end?.line ?? 0) - (b.location?.range?.end?.line ?? 0))
+            .thenBy<BsDiagnostic>((a, b) => (a.location?.range?.end?.character ?? 0) - (b.location?.range?.end?.character ?? 0))
     );
 }
 
@@ -77,9 +94,9 @@ function cloneObject<TOriginal, TTemplate>(original: TOriginal, template: TTempl
 }
 
 export interface PartialDiagnostic {
-    range?: Range;
+    location?: Partial<Location>;
     severity?: DiagnosticSeverity;
-    code?: integer | string;
+    code?: number | string;
     codeDescription?: Partial<CodeDescription>;
     source?: string;
     message?: string;
@@ -87,6 +104,7 @@ export interface PartialDiagnostic {
     relatedInformation?: Partial<DiagnosticRelatedInformation>[];
     data?: unknown;
     file?: Partial<BscFile>;
+    legacyCode?: number | string;
 }
 
 /**
@@ -96,8 +114,14 @@ export function cloneDiagnostic(actualDiagnosticInput: BsDiagnostic, expectedDia
     const actualDiagnostic = cloneObject(
         actualDiagnosticInput,
         expectedDiagnostic,
-        ['message', 'code', 'range', 'severity', 'relatedInformation']
+        ['message', 'code', 'severity', 'relatedInformation', 'legacyCode']
     );
+    //clone Location if available
+    if (expectedDiagnostic?.location) {
+        actualDiagnostic.location = actualDiagnosticInput.location
+            ? cloneObject(actualDiagnosticInput.location, expectedDiagnostic.location, ['uri', 'range']) as any
+            : undefined;
+    }
     //deep clone relatedInformation if available
     if (actualDiagnostic.relatedInformation) {
         for (let j = 0; j < actualDiagnostic.relatedInformation.length; j++) {
@@ -108,14 +132,6 @@ export function cloneDiagnostic(actualDiagnosticInput: BsDiagnostic, expectedDia
             ) as any;
         }
     }
-    //deep clone file info if available
-    if (actualDiagnostic.file) {
-        actualDiagnostic.file = cloneObject(
-            actualDiagnostic.file,
-            expectedDiagnostic?.file,
-            ['srcPath', 'pkgPath']
-        ) as any;
-    }
     return actualDiagnostic;
 }
 
@@ -153,9 +169,14 @@ export function normalizeDiagnostics(actualDiagnostics: BsDiagnostic[], expected
         expectedDiagnostics.map(x => {
             let result = x;
             if (typeof x === 'string') {
-                result = { message: x };
+                if (!x.includes(' ') && x.toLowerCase() === x) {
+                    // it's all lowercase and there's no spaces, so probably a code
+                    result = { code: x };
+                } else {
+                    result = { message: x };
+                }
             } else if (typeof x === 'number') {
-                result = { code: x };
+                result = { legacyCode: x };
             }
             return result as unknown as BsDiagnostic;
         })
@@ -166,7 +187,8 @@ export function normalizeDiagnostics(actualDiagnostics: BsDiagnostic[], expected
         const actualDiagnostic = cloneDiagnostic(actualDiagnostics[i], expectedDiagnostic);
         actualDiagnostics[i] = actualDiagnostic as any;
     }
-    return [actualDiagnostics, expectedDiagnostics];
+    const sortedActual = sortDiagnostics(actualDiagnostics);
+    return [sortedActual, expectedDiagnostics];
 }
 
 /**
@@ -174,32 +196,38 @@ export function normalizeDiagnostics(actualDiagnostics: BsDiagnostic[], expected
  * @param arg - any object that contains diagnostics (such as `Program`, `Scope`, or even an array of diagnostics)
  * @param expected an array of expected diagnostics. if it's a string, assume that's a diagnostic error message
  */
-export function expectDiagnosticsIncludes(arg: DiagnosticCollection, expected: Array<PartialDiagnostic | string | number>) {
+export function expectDiagnosticsIncludes(arg: DiagnosticCollection, expected: PartialDiagnostic | string | number | Array<PartialDiagnostic | string | number>) {
+    let actualExpected = Array.isArray(expected) ? expected : [expected];
     const actualDiagnostics = getDiagnostics(arg);
     const expectedDiagnostics =
-        expected.map(x => {
+        actualExpected.map(x => {
             let result = x;
             if (typeof x === 'string') {
-                result = { message: x };
+                if (!x.includes(' ') && x.toLowerCase() === x) {
+                    // it's all lowercase and there's no spaces, so probably a code
+                    result = { code: x };
+                } else {
+                    result = { message: x };
+                }
             } else if (typeof x === 'number') {
-                result = { code: x };
+                result = { legacyCode: x };
             }
             return result as unknown as BsDiagnostic;
         });
 
-    let expectedFound = 0;
 
+    const foundDiagnostics: PartialDiagnostic | string | number | Array<PartialDiagnostic | string | number> = [];
     for (const expectedDiagnostic of expectedDiagnostics) {
-        const foundDiag = actualDiagnostics.find((actualDiag) => {
+        actualDiagnostics.find((actualDiag) => {
             const actualDiagnosticClone = cloneDiagnostic(actualDiag, expectedDiagnostic);
-            return JSON.stringify(actualDiagnosticClone) === JSON.stringify(expectedDiagnostic);
+            if (JSON.stringify(actualDiagnosticClone) === JSON.stringify(expectedDiagnostic)) {
+                foundDiagnostics.push(actualDiagnosticClone);
+                return true;
+            }
+            return false;
         });
-        if (foundDiag) {
-            expectedFound++;
-        }
-
     }
-    expect(expectedFound).to.eql(expectedDiagnostics.length);
+    expect(foundDiagnostics).to.eql(expectedDiagnostics);
 }
 
 /**
@@ -212,11 +240,22 @@ export function expectZeroDiagnostics(arg: DiagnosticCollection) {
         for (const diagnostic of diagnostics) {
             //escape any newlines
             diagnostic.message = diagnostic.message.replace(/\r/g, '\\r').replace(/\n/g, '\\n');
-            message += `\n        • bs${diagnostic.code} "${diagnostic.message}" at ${diagnostic.file?.srcPath ?? ''}#(${diagnostic.range?.start.line}:${diagnostic.range?.start.character})-(${diagnostic.range?.end.line}:${diagnostic.range?.end.character})`;
-            //print the line containing the error (if we can find it)srcPath
-            const line = diagnostic.file?.fileContents?.split(/\r?\n/g)?.[diagnostic.range?.start.line];
-            if (line) {
-                message += '\n' + getDiagnosticLine(diagnostic, line, chalk.red);
+            message += `\n        • bs:${diagnostic.code} "${diagnostic.message}" at ${diagnostic.location?.uri ?? ''}#(${diagnostic.location?.range?.start.line}:${diagnostic.location?.range?.start.character})-(${diagnostic.location?.range?.end.line}:${diagnostic.location?.range?.end.character})`;
+
+            let program: Program;
+            if (isProject(arg)) {
+                program = arg['builder'].program;
+            } else if (isProgram(arg)) {
+                program = arg;
+            }
+
+            if (program) {
+                const file = program.getFile(diagnostic.location.uri);
+                const line = (file as BrsFile)?.fileContents?.split(/\r?\n/g)?.[diagnostic.location.range?.start.line];
+                //print the line containing the error (if we can find it)
+                if (line) {
+                    message += '\n' + getDiagnosticLine(diagnostic, line, chalk.red);
+                }
             }
         }
         assert.fail(message);
@@ -253,7 +292,11 @@ export function expectCodeActions(test: () => any, expected: CodeActionShorthand
         sinon.restore();
     }
 
-    const args = stub.getCalls().map(x => x.args[0]);
+    const args = stub.getCalls().map(x => x.args[0])
+        //the bs:disable-{line,file} suggestions fire for every diagnostic with a `code`
+        //(see CodeActionsProcessor.suggestDisableDiagnosticQuickFixes); the legacy specs
+        //predate that feature, so filter them out here.
+        .filter(arg => !arg.title?.startsWith('Disable '));
     //delete any `diagnostics` arrays to help with testing performance (since it's circular...causes all sorts of issues)
     for (let arg of args) {
         delete arg.diagnostics;
@@ -273,32 +316,43 @@ export function expectInstanceOf<T>(items: any[], constructors: Array<new (...ar
 
 export function getTestTranspile(scopeGetter: () => [program: Program, rootDir: string]) {
     return getTestFileAction((file) => {
-        return file.program['_getTranspiledFileContents'](file);
+        return (file as BrsFile).program.getTranspiledFileContents(file.srcPath);
     }, scopeGetter);
 }
 
 export function getTestGetTypedef(scopeGetter: () => [program: Program, rootDir: string]) {
-    return getTestFileAction((file) => {
+    return getTestFileAction(async (file) => {
+        const program = (file as BrsFile).program;
+        program.options.emitDefinitions = true;
+        const result = await program.getTranspiledFileContents(file.srcPath);
         return {
-            code: (file as BrsFile).getTypedef(),
+            code: result.typedef,
             map: undefined
-        } as any as CodeWithSourceMap;
+        };
     }, scopeGetter);
 }
 
 function getTestFileAction(
-    action: (file: BscFile) => CodeWithSourceMap,
+    action: (file: BscFile) => Promise<{ code: string; map?: string }>,
     scopeGetter: () => [program: Program, rootDir: string]
 ) {
-    return function testFileAction(source: string, expected?: string, formatType: 'trim' | 'none' = 'trim', pkgPath = 'source/main.bs', failOnDiagnostic = true) {
+    return async function testFileAction<TFile extends BscFile = BscFile>(sourceOrFile: string | TFile, expected?: string, formatType: 'trim' | 'none' = 'trim', destPath = 'source/main.bs', failOnDiagnostic = true) {
         let [program, rootDir] = scopeGetter();
-        expected = expected ? expected : source;
-        let file = program.setFile<BrsFile>({ src: s`${rootDir}/${pkgPath}`, dest: pkgPath }, source);
+        let file: TFile;
+        if (typeof sourceOrFile === 'string') {
+            expected = expected ? expected : sourceOrFile;
+            file = program.setFile<TFile>({ src: s`${rootDir}/${destPath}`, dest: destPath }, sourceOrFile);
+        } else {
+            file = sourceOrFile;
+            if (!expected) {
+                throw new Error('`expected` is required when passing a file');
+            }
+        }
         program.validate();
         if (failOnDiagnostic !== false) {
             expectZeroDiagnostics(program);
         }
-        let codeWithMap = action(file);
+        let codeWithMap = await action(file);
 
         let sources = [trimMap(codeWithMap.code), expected];
 
@@ -311,7 +365,7 @@ function getTestFileAction(
         expect(sources[0]).to.equal(sources[1]);
         return {
             file: file,
-            source: source,
+            source: sourceOrFile,
             expected: expected,
             actual: codeWithMap.code,
             map: codeWithMap.map
@@ -417,6 +471,13 @@ export function mapToObject<T>(map: Map<any, T>) {
     return result;
 }
 
+/**
+ * Test that a type is what was expected
+ */
+export function expectTypeToBe(someType: BscType, expectedTypeClass: any) {
+    expect(someType?.constructor?.name).to.eq(expectedTypeClass.name);
+}
+
 export function stripConsoleColors(inputString) {
     // Regular expression to match ANSI escape codes for colors
     // eslint-disable-next-line no-control-regex
diff --git a/src/types/ArrayType.spec.ts b/src/types/ArrayType.spec.ts
index f3bc305e7..9732101c7 100644
--- a/src/types/ArrayType.spec.ts
+++ b/src/types/ArrayType.spec.ts
@@ -4,30 +4,63 @@ import { ArrayType } from './ArrayType';
 import { DynamicType } from './DynamicType';
 import { BooleanType } from './BooleanType';
 import { StringType } from './StringType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { TypedFunctionType } from './TypedFunctionType';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { IntegerType } from './IntegerType';
 
 describe('ArrayType', () => {
     it('is equivalent to array types', () => {
-        expect(new ArrayType().isAssignableTo(new ArrayType())).to.be.true;
-        expect(new ArrayType().isAssignableTo(new DynamicType())).to.be.true;
+        expect(new ArrayType().isTypeCompatible(new ArrayType())).to.be.true;
+        expect(new ArrayType().isTypeCompatible(new DynamicType())).to.be.true;
     });
 
     it('catches arrays containing different inner types', () => {
-        expect(new ArrayType(new BooleanType()).isAssignableTo(new ArrayType(new BooleanType()))).to.be.true;
-        expect(new ArrayType(new BooleanType()).isAssignableTo(new ArrayType(new StringType()))).to.be.false;
+        expect(new ArrayType(new BooleanType()).isTypeCompatible(new ArrayType(new BooleanType()))).to.be.true;
+        expect(new ArrayType(new BooleanType()).isTypeCompatible(new ArrayType(new StringType()))).to.be.false;
     });
 
     it('is not equivalent to other types', () => {
-        expect(new ArrayType().isAssignableTo(new BooleanType())).to.be.false;
+        expect(new ArrayType().isEqual(new BooleanType())).to.be.false;
     });
 
-    describe('isConveribleTo', () => {
-        expect(new ArrayType().isConvertibleTo(new BooleanType())).to.be.false;
-        expect(new ArrayType().isConvertibleTo(new ArrayType())).to.be.true;
+    it('isTypeCompatible', () => {
+        expect(new ArrayType().isTypeCompatible(new BooleanType())).to.be.false;
+        expect(new ArrayType().isTypeCompatible(new ArrayType())).to.be.true;
     });
 
     describe('toString', () => {
-        it('prints inner types', () => {
-            expect(new ArrayType(new BooleanType(), new StringType()).toString()).to.eql('Array<boolean | string>');
+        it('prints default type', () => {
+            expect(new ArrayType(new BooleanType(), new StringType()).toString()).to.eql('Array<boolean or string>');
+        });
+    });
+
+    describe('built in interfaces', () => {
+        it('adds built in interfaces', () => {
+            const myArray = new ArrayType();
+            expectTypeToBe(myArray.getMemberType('push', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+            expectTypeToBe(myArray.getMemberType('sort', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+            expectTypeToBe(myArray.getMemberType('next', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        });
+
+        it('correctly sets types for typed array', () => {
+            const myArray = new ArrayType(IntegerType.instance);
+            const popType = myArray.getMemberType('pop', { flags: SymbolTypeFlag.runtime }) as TypedFunctionType;
+            expectTypeToBe(popType.returnType, IntegerType);
+            const pushType = myArray.getMemberType('push', { flags: SymbolTypeFlag.runtime }) as TypedFunctionType;
+            expectTypeToBe(pushType.params[0].type, IntegerType);
+        });
+
+        it('correctly gets optional params for sorts', () => {
+            const myArray = new ArrayType();
+            const sortType = myArray.getMemberType('sort', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe((sortType as TypedFunctionType).params[0].type, StringType);
+            expect((sortType as TypedFunctionType).params[0].isOptional).to.be.true;
+            const sortByType = myArray.getMemberType('sortBy', { flags: SymbolTypeFlag.runtime });
+            expectTypeToBe((sortByType as TypedFunctionType).params[0].type, StringType);
+            expectTypeToBe((sortByType as TypedFunctionType).params[1].type, StringType);
+            expect((sortByType as TypedFunctionType).params[1].isOptional).to.be.true;
+
         });
     });
 });
diff --git a/src/types/ArrayType.ts b/src/types/ArrayType.ts
index b2a5d7b22..57326a900 100644
--- a/src/types/ArrayType.ts
+++ b/src/types/ArrayType.ts
@@ -1,51 +1,122 @@
-import type { BscType } from './BscType';
+
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { isArrayType, isDynamicType, isEnumMemberType, isInvalidType, isObjectType, isTypeStatementType } from '../astUtils/reflection';
+import type { TypeCompatibilityData } from '../interfaces';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import type { BuiltInInterfaceOverride } from './BuiltInInterfaceAdder';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
 import { DynamicType } from './DynamicType';
+import { IntegerType } from './IntegerType';
+import { unionTypeFactory } from './UnionType';
+import { getUniqueType, isUnionTypeCompatible } from './helpers';
+import { util } from '../util';
 
-export class ArrayType implements BscType {
+export class ArrayType extends BscType {
     constructor(...innerTypes: BscType[]) {
+        super();
         this.innerTypes = innerTypes;
     }
-    public innerTypes: BscType[] = [];
 
-    public isAssignableTo(targetType: BscType) {
-        if (targetType instanceof DynamicType) {
-            return true;
-        } else if (!(targetType instanceof ArrayType)) {
-            return false;
-        }
-        //this array type is assignable to the target IF
-        //1. all of the types in this array are present in the target
-        outer: for (let innerType of this.innerTypes) {
-            //find this inner type in the target
+    public readonly kind = BscTypeKind.ArrayType;
+    public isBuiltIn = true;
 
-            // eslint-disable-next-line no-unreachable-loop
-            for (let targetInnerType of targetType.innerTypes) {
-                //TODO is this loop correct? It ends after 1 iteration but we might need to do more iterations
+    public innerTypes: BscType[] = [];
 
-                if (innerType.isAssignableTo(targetInnerType)) {
-                    continue outer;
-                }
+    public _defaultType: BscType;
+    private isCheckingInnerTypesForDefaultType = false;
 
-                //our array contains a type that the target array does not...so these arrays are different
-                return false;
-            }
+    public get defaultType(): BscType {
+        if (this._defaultType) {
+            return this._defaultType;
         }
-        return true;
+        if (this.innerTypes?.length === 0 || this.isCheckingInnerTypesForDefaultType) {
+            return DynamicType.instance;
+        }
+        this.isCheckingInnerTypesForDefaultType = true;
+
+        let resultType = this.innerTypes[0];
+        if (this.innerTypes?.length > 1) {
+            resultType = getUniqueType(this.innerTypes, unionTypeFactory) ?? DynamicType.instance;
+        }
+        if (isEnumMemberType(resultType)) {
+            resultType = resultType.parentEnumType ?? resultType;
+        }
+        this._defaultType = util.getDefaultTypeFromValueType(resultType);
+        this.isCheckingInnerTypesForDefaultType = false;
+        return this._defaultType;
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        while (isTypeStatementType(targetType)) {
+            targetType = targetType.wrappedType;
+        }
+        if (isDynamicType(targetType)) {
+            return true;
+        } else if (isObjectType(targetType)) {
+            return true;
+        } else if (isInvalidType(targetType)) {
+            return true;
+        } else if (isUnionTypeCompatible(this, targetType)) {
+            return true;
+        } else if (isArrayType(targetType)) {
+            const compatible = this.defaultType.isTypeCompatible(targetType.defaultType, data);
+            if (data) {
+                data.actualType = targetType.defaultType;
+                data.expectedType = this.defaultType;
+            }
+            return compatible;
+        } else if (this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data)) {
+            return true;
+        }
+        return false;
     }
 
     public toString() {
-        return `Array<${this.innerTypes.map((x) => x.toString()).join(' | ')}>`;
+        return `Array<${this.defaultType.toString()}>`;
     }
 
     public toTypeString(): string {
-        return 'object';
+        //typed arrays have no first-class representation in BrightScript; collapse to
+        //`dynamic` at transpile so the runtime accepts arbitrary array values.
+        return 'dynamic';
+    }
+
+    public isEqual(targetType: BscType): boolean {
+        if (isArrayType(targetType)) {
+            if (targetType.innerTypes.length !== this.innerTypes.length) {
+                return false;
+            }
+            for (let i = 0; i < this.innerTypes.length; i++) {
+                if (!this.innerTypes[i].isEqual(targetType.innerTypes[i])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
     }
 
-    public clone() {
-        return new ArrayType(...this.innerTypes?.map(x => x?.clone()) ?? []);
+    addBuiltInInterfaces() {
+        if (!this.hasAddedBuiltInInterfaces) {
+            const overrideMap = new Map<string, BuiltInInterfaceOverride>();
+            const defaultType = this.defaultType;
+            overrideMap
+                // ifArray
+                .set('peek', { returnType: defaultType })
+                .set('pop', { returnType: defaultType })
+                .set('push', { parameterTypes: [defaultType] })
+                .set('shift', { returnType: defaultType })
+                .set('unshift', { parameterTypes: [defaultType] })
+                .set('append', { parameterTypes: [this] })
+                // ifArrayGet
+                .set('get', { returnType: defaultType })
+                // ifArraySet
+                .set('get', { parameterTypes: [IntegerType.instance, defaultType] })
+                //ifEnum
+                .set('next', { returnType: defaultType });
+            BuiltInInterfaceAdder.addBuiltInInterfacesToType(this, overrideMap);
+        }
+        this.hasAddedBuiltInInterfaces = true;
     }
 }
diff --git a/src/types/AssociativeArrayType.ts b/src/types/AssociativeArrayType.ts
new file mode 100644
index 000000000..25d826b96
--- /dev/null
+++ b/src/types/AssociativeArrayType.ts
@@ -0,0 +1,66 @@
+import { SymbolTable } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { isAssociativeArrayType, isAssociativeArrayTypeLike, isClassType, isDynamicType, isObjectType } from '../astUtils/reflection';
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { DynamicType } from './DynamicType';
+import { isUnionTypeCompatible } from './helpers';
+
+export class AssociativeArrayType extends BscType {
+
+
+    public readonly kind = BscTypeKind.AssociativeArrayType;
+
+    public isBuiltIn = true;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        if (isDynamicType(targetType)) {
+            return true;
+        } else if (isObjectType(targetType)) {
+            return true;
+        } else if (isUnionTypeCompatible(this, targetType)) {
+            return true;
+        } else if (isAssociativeArrayTypeLike(targetType)) {
+            return true;
+        } else if (this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data)) {
+            return true;
+        } else if (isClassType(targetType)) {
+            return true;
+        }
+        return false;
+    }
+
+    public toString() {
+        return 'roAssociativeArray';
+    }
+
+    public toTypeString(): string {
+        return 'object';
+    }
+
+    getMemberType(name: string, options: GetTypeOptions) {
+        // if a member has specifically been added, cool. otherwise, assume dynamic
+        const memberType = super.getMemberType(name, options);
+        if (!memberType && !options.ignoreDefaultDynamicMembers) {
+            return DynamicType.instance;
+        }
+        return memberType;
+    }
+
+    isEqual(otherType: BscType) {
+        return isAssociativeArrayType(otherType) && this.checkCompatibilityBasedOnMembers(otherType, SymbolTypeFlag.runtime);
+    }
+
+    private builtInMemberTable: SymbolTable;
+
+    getBuiltInMemberTable(): SymbolTable {
+        if (this.builtInMemberTable) {
+            return this.builtInMemberTable;
+        }
+        this.builtInMemberTable = new SymbolTable(`${this.__identifier} Built-in Members`);
+        this.pushMemberProvider(() => this.builtInMemberTable);
+        return this.builtInMemberTable;
+
+    }
+}
diff --git a/src/types/BaseFunctionType.ts b/src/types/BaseFunctionType.ts
new file mode 100644
index 000000000..a6bc71955
--- /dev/null
+++ b/src/types/BaseFunctionType.ts
@@ -0,0 +1,26 @@
+import type { TypeCompatibilityData } from '../interfaces';
+import { BscType } from './BscType';
+import { DynamicType } from './DynamicType';
+
+export abstract class BaseFunctionType extends BscType {
+
+    public returnType: BscType = DynamicType.instance;
+    public isBuiltIn = true;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean {
+        throw new Error('Method not implemented.');
+    }
+
+    public toString() {
+        return this.toTypeString();
+
+    }
+
+    public toTypeString(): string {
+        return 'Function';
+    }
+
+    isEqual(targetType: BscType): boolean {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/src/types/BooleanType.spec.ts b/src/types/BooleanType.spec.ts
index 8d14a4067..40fb07ce9 100644
--- a/src/types/BooleanType.spec.ts
+++ b/src/types/BooleanType.spec.ts
@@ -2,10 +2,17 @@ import { expect } from '../chai-config.spec';
 
 import { BooleanType } from './BooleanType';
 import { DynamicType } from './DynamicType';
+import { IntegerType } from './IntegerType';
 
 describe('BooleanType', () => {
-    it('is equivalent to boolean types', () => {
-        expect(new BooleanType().isAssignableTo(new BooleanType())).to.be.true;
-        expect(new BooleanType().isAssignableTo(new DynamicType())).to.be.true;
+    it('is equal to boolean type', () => {
+        expect(new BooleanType().isEqual(new BooleanType())).to.be.true;
+        expect(new BooleanType().isEqual(new DynamicType())).to.be.false;
+    });
+
+    it('is compatible with only correct types', () => {
+        expect(new BooleanType().isTypeCompatible(new BooleanType())).to.be.true;
+        expect(new BooleanType().isTypeCompatible(new DynamicType())).to.be.true;
+        expect(new BooleanType().isTypeCompatible(IntegerType.instance)).to.be.false;
     });
 });
diff --git a/src/types/BooleanType.ts b/src/types/BooleanType.ts
index caea6b49e..11d53a7df 100644
--- a/src/types/BooleanType.ts
+++ b/src/types/BooleanType.ts
@@ -1,31 +1,37 @@
-import type { BscType } from './BscType';
-import { DynamicType } from './DynamicType';
+import { isBooleanType, isBooleanTypeLike, isDynamicType, isObjectType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isNativeInterfaceCompatible, isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
 
-export class BooleanType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
+export class BooleanType extends BscType {
+    public readonly kind = BscTypeKind.BooleanType;
+    public isBuiltIn = true;
 
-    public isAssignableTo(targetType: BscType) {
+    public static instance = new BooleanType();
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         return (
-            targetType instanceof BooleanType ||
-            targetType instanceof DynamicType
+            isBooleanTypeLike(targetType) ||
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType) ||
+            isNativeInterfaceCompatible(this, targetType, 'roboolean', data)
         );
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
-    }
-
     public toString() {
-        return this.typeText ?? 'boolean';
+        return 'boolean';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new BooleanType(this.typeText);
+    isEqual(targetType: BscType): boolean {
+        return isBooleanType(targetType);
     }
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('boolean', BooleanType.instance);
diff --git a/src/types/BscType.ts b/src/types/BscType.ts
index 9fb796788..433bbc9d7 100644
--- a/src/types/BscType.ts
+++ b/src/types/BscType.ts
@@ -1,7 +1,180 @@
-export interface BscType {
-    isAssignableTo(targetType: BscType): boolean;
-    isConvertibleTo(targetType: BscType): boolean;
-    toString(): string;
-    toTypeString(): string;
-    clone(): BscType;
+import type { GetSymbolTypeOptions, SymbolTableProvider } from '../SymbolTable';
+import { SymbolTable } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { ExtraSymbolData, TypeCompatibilityData } from '../interfaces';
+import { isArrayType, isInheritableType, isReferenceType } from '../astUtils/reflection';
+import { TypesCreated } from './helpers';
+import type { BscTypeKind } from './BscTypeKind';
+
+export abstract class BscType {
+
+    public readonly memberTable: SymbolTable;
+
+    protected __identifier: string;
+    protected hasAddedBuiltInInterfaces = false;
+    public isBuiltIn = false;
+
+    public readonly kind: BscTypeKind = null;
+
+    constructor(name = '') {
+        this.__identifier = `${this.constructor.name}${name ? ': ' + name : ''}`;
+        this.memberTable = new SymbolTable(this.__identifier);
+        if (TypesCreated[this.constructor.name] === undefined) {
+            TypesCreated[this.constructor.name] = 0;
+        }
+        TypesCreated[this.constructor.name]++;
+    }
+
+    pushMemberProvider(provider: SymbolTableProvider) {
+        this.memberTable.pushParentProvider(provider);
+    }
+
+    popMemberProvider() {
+        this.memberTable.popParentProvider();
+    }
+
+    getBuiltInMemberTable(): SymbolTable {
+        return this.memberTable;
+    }
+
+    addMember(name: string, data: ExtraSymbolData, type: BscType, flags: SymbolTypeFlag) {
+        this.memberTable.addSymbol(name, data, type, flags);
+    }
+
+    getMemberType(name: string, options: GetSymbolTypeOptions) {
+        this.addBuiltInInterfaces();
+        return this.memberTable.getSymbolType(name, options);
+    }
+
+    getMemberTable() {
+        this.addBuiltInInterfaces();
+        return this.memberTable;
+    }
+
+    addCallFuncMember(name: string, data: ExtraSymbolData, type: BscType, flags: SymbolTypeFlag) {
+        throw new Error('Method not implemented.');
+    }
+
+    getCallFuncTable(): SymbolTable {
+        throw new Error('Method not implemented.');
+    }
+
+    getCallFuncType(name: string, options: GetSymbolTypeOptions): BscType {
+        return undefined;
+    }
+
+    isResolvable(): boolean {
+        return true;
+    }
+
+    /**
+     * Check if this type can be assigned to the target type
+     * @param targetType the type that we're trying to assign this type to
+     * @deprecated
+     */
+    isAssignableTo(targetType: BscType): boolean {
+        return targetType.isTypeCompatible(this);
+    }
+
+    /**
+     * Check if a different type can be assigned to this type - eg. does the other type convert into this type?
+     * @param _otherType the type to check if it can be used as this type, or can automatically be converted into this type
+     */
+    isTypeCompatible(_otherType: BscType, data?: TypeCompatibilityData): boolean {
+        throw new Error('Method not implemented.');
+    }
+    toString(): string {
+        throw new Error('Method not implemented.');
+    }
+    toTypeString(): string {
+        throw new Error('Method not implemented.');
+    }
+
+    isEqual(targetType: BscType, data: TypeCompatibilityData = {}): boolean {
+        throw new Error('Method not implemented.');
+    }
+
+    checkCompatibilityBasedOnMembers(targetType: BscType, flags: SymbolTypeFlag, data: TypeCompatibilityData = {}, memberTable?: SymbolTable, targetMemberTable?: SymbolTable) {
+        if (!targetType) {
+            return false;
+        }
+        let isSuperSet = true;
+        data.missingFields ||= [];
+        data.fieldMismatches ||= [];
+        data.depth = data.depth ? data.depth + 1 : 1;
+        //data.chain ||= [];
+        this.addBuiltInInterfaces();
+        targetType.addBuiltInInterfaces();
+
+        if (this === targetType) {
+            return true;
+        }
+
+        if (isReferenceType(targetType) && !targetType.isResolvable()) {
+            data.unresolveableTarget = targetType.fullName;
+            // we can't resolve the other type. Assume it does not fail on member checks
+            return true;
+        }
+
+        if (data.depth > 16) {
+            // some sort of circular reference
+            return false;
+        }
+        const mySymbols = (memberTable ?? this.getMemberTable())?.getAllSymbols(flags);
+        const targetTable = (targetMemberTable ?? targetType.getMemberTable());
+        for (const memberSymbol of mySymbols) {
+            const targetTypesOfSymbol = targetTable
+                .getSymbolTypes(memberSymbol.name, { flags: flags })
+                ?.map(symbol => symbol.type);
+            if (!targetTypesOfSymbol || targetTypesOfSymbol.length === 0) {
+                // eslint-disable-next-line no-bitwise
+                if (!(memberSymbol.flags & SymbolTypeFlag.optional)) {
+                    data.missingFields.push({ name: memberSymbol.name, expectedType: memberSymbol.type });
+                    isSuperSet = false;
+                }
+
+            } else {
+                isSuperSet =
+                    (targetTypesOfSymbol ?? []).reduce((superSetSoFar, typeOfTargetSymbol) => {
+                        if (!superSetSoFar) {
+                            return superSetSoFar;
+                        }
+                        const typesAreInheritableWithSameName = isInheritableType(memberSymbol.type) && isInheritableType(typeOfTargetSymbol) &&
+                            memberSymbol.type.name.toLowerCase() === typeOfTargetSymbol.name.toLowerCase();
+
+                        let typesAreArraysWithSameDefaultOrUnknownDefault = false;
+                        if (isArrayType(memberSymbol.type) && isArrayType(typeOfTargetSymbol)) {
+                            if (memberSymbol.type.defaultType.isResolvable() && typeOfTargetSymbol.defaultType.isResolvable()) {
+                                typesAreArraysWithSameDefaultOrUnknownDefault = memberSymbol.type.defaultType.isEqual(typeOfTargetSymbol.defaultType);
+                            } else {
+                                typesAreArraysWithSameDefaultOrUnknownDefault = true;
+                            }
+                        }
+                        const myMemberAllowsTargetType = typesAreInheritableWithSameName || typesAreArraysWithSameDefaultOrUnknownDefault || memberSymbol.type?.isTypeCompatible(typeOfTargetSymbol, { depth: data.depth });
+                        if (!myMemberAllowsTargetType) {
+                            data.fieldMismatches.push({ name: memberSymbol.name, expectedType: memberSymbol.type, actualType: targetType.getMemberType(memberSymbol.name, { flags: flags }) });
+                        }
+                        return superSetSoFar && myMemberAllowsTargetType;
+                    }, true) && isSuperSet;
+            }
+
+        }
+        data.depth = 0;
+        return isSuperSet;
+    }
+
+    addBuiltInInterfaces() {
+        if (!this.hasAddedBuiltInInterfaces) {
+            BuiltInInterfaceAdder.addBuiltInInterfacesToType(this);
+        }
+        this.hasAddedBuiltInInterfaces = true;
+    }
+
+    /**
+     * The level of priority of this type when in a binary operation
+     * For example Float is higher priority than integer, so Float + Int => Float
+     * Lower numbers have higher priority
+     */
+    readonly binaryOpPriorityLevel: number = 0;
 }
diff --git a/src/types/BscTypeKind.ts b/src/types/BscTypeKind.ts
new file mode 100644
index 000000000..0fbb40347
--- /dev/null
+++ b/src/types/BscTypeKind.ts
@@ -0,0 +1,28 @@
+export enum BscTypeKind {
+    ArrayType = 'ArrayType',
+    AssociativeArrayType = 'AssociativeArrayType',
+    BooleanType = 'BooleanType',
+    ClassType = 'ClassType',
+    ComponentType = 'ComponentType',
+    DoubleType = 'DoubleType',
+    DynamicType = 'DynamicType',
+    EnumType = 'EnumType',
+    EnumMemberType = 'EnumMemberType',
+    FloatType = 'FloatType',
+    FunctionType = 'FunctionType',
+    TypedFunctionType = 'TypedFunctionType',
+    IntegerType = 'IntegerType',
+    InterfaceType = 'InterfaceType',
+    IntersectionType = 'IntersectionType',
+    InvalidType = 'InvalidType',
+    LongIntegerType = 'LongIntegerType',
+    NamespaceType = 'NamespaceType',
+    ObjectType = 'ObjectType',
+    ReferenceType = 'ReferenceType',
+    RoFunctionType = 'RoFunctionType',
+    StringType = 'StringType',
+    TypeStatementType = 'TypeStatementType',
+    UninitializedType = 'UninitializedType',
+    UnionType = 'UnionType',
+    VoidType = 'VoidType'
+}
diff --git a/src/types/BuiltInInterfaceAdder.spec.ts b/src/types/BuiltInInterfaceAdder.spec.ts
new file mode 100644
index 000000000..55a1a6a04
--- /dev/null
+++ b/src/types/BuiltInInterfaceAdder.spec.ts
@@ -0,0 +1,137 @@
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import { StringType } from './StringType';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { IntegerType } from './IntegerType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { TypedFunctionType } from './TypedFunctionType';
+import { BooleanType } from './BooleanType';
+import { FunctionType } from './FunctionType';
+import { DoubleType } from './DoubleType';
+import { DynamicType } from './DynamicType';
+import { ClassType } from './ClassType';
+import { ArrayType } from './ArrayType';
+import { expect } from 'chai';
+import { EnumMemberType, EnumType } from './EnumType';
+
+describe('BuiltInInterfaceAdder', () => {
+
+    it('should add members to StringType', () => {
+        const myType = new StringType();
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expectTypeToBe(myType.getMemberType('trim', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('split', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('getString', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('replace', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+    });
+
+    it('should have correct types for string members', () => {
+        const myType = new StringType();
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+        const leftType = myType.getMemberType('left', { flags: SymbolTypeFlag.runtime });
+        expectTypeToBe(leftType, TypedFunctionType);
+        const leftFuncType = leftType as TypedFunctionType;
+        expect(leftFuncType.params.length).to.equal(1);
+        expectTypeToBe(leftFuncType.params[0].type, IntegerType);
+        expectTypeToBe(leftFuncType.returnType, StringType);
+    });
+
+    it('should add members to IntegerType', () => {
+        const myType = new IntegerType();
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expectTypeToBe(myType.getMemberType('toStr', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('getInt', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+    });
+
+    it('should add members to BooleanType', () => {
+        const myType = new BooleanType();
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expectTypeToBe(myType.getMemberType('toStr', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('getBoolean', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+    });
+
+    it('should add members to DoubleType', () => {
+        const myType = new DoubleType();
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expectTypeToBe(myType.getMemberType('toStr', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('getDouble', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+    });
+
+    it('should add members to FunctionType', () => {
+        const myType = new FunctionType();
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expectTypeToBe(myType.getMemberType('toStr', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('getSub', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+    });
+
+    it('should add members to TypedFunctionType', () => {
+        const myType = new TypedFunctionType(DynamicType.instance);
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expectTypeToBe(myType.getMemberType('toStr', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('getSub', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+    });
+
+    it('should add members to ArrayType', () => {
+        const myType = new ArrayType();
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expectTypeToBe(myType.getMemberType('push', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('getEntry', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+        expectTypeToBe(myType.getMemberType('join', { flags: SymbolTypeFlag.runtime }), TypedFunctionType);
+    });
+
+    it('should not add members to ClassType', () => {
+        const myType = new ClassType('Klass');
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+
+        expect(myType.getMemberType('clear', { flags: SymbolTypeFlag.runtime }).isResolvable()).to.be.false;
+        expect(myType.getMemberType('lookUp', { flags: SymbolTypeFlag.runtime }).isResolvable()).to.be.false;
+    });
+
+    it('should allow classes to override AA members', () => {
+        const myType = new ClassType('Klass');
+        myType.addMember('clear', null, new BooleanType(), SymbolTypeFlag.runtime);
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+        expectTypeToBe(myType.getMemberType('clear', { flags: SymbolTypeFlag.runtime }), BooleanType);
+    });
+
+    it('should not include members that have already been overrided', () => {
+        const myType = new ClassType('Klass');
+        myType.addMember('clear', null, new BooleanType(), SymbolTypeFlag.runtime);
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(myType);
+        const myMembers = myType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime);
+        expect(myMembers.filter(member => member.name.toLowerCase() === 'clear').length).to.eq(1);
+    });
+
+    it('should only add built ins to original ancestor', () => {
+        const sup = new ClassType('SuperKlass');
+        const sub = new ClassType('Klass', sup);
+        sup.addMember('clear', null, new BooleanType(), SymbolTypeFlag.runtime);
+        BuiltInInterfaceAdder.addBuiltInInterfacesToType(sub);
+        expectTypeToBe(sub.getMemberType('clear', { flags: SymbolTypeFlag.runtime }), BooleanType);
+    });
+
+
+    it('should respect overrides', () => {
+        const myArray = new ArrayType(IntegerType.instance);
+        const popType = myArray.getMemberType('pop', { flags: SymbolTypeFlag.runtime }) as TypedFunctionType;
+        expectTypeToBe(popType.returnType, IntegerType);
+        const pushType = myArray.getMemberType('push', { flags: SymbolTypeFlag.runtime }) as TypedFunctionType;
+        expectTypeToBe(pushType.params[0].type, IntegerType);
+    });
+
+    it('works with enums', () => {
+        const myEnum = new EnumType('myEnum', StringType.instance);
+        const myEnumMember = new EnumMemberType('myEnum', 'member', StringType.instance);
+        myEnum.addMember('member', {}, myEnumMember, SymbolTypeFlag.runtime);
+        const enumTrim = myEnum.getMemberType('trim', { flags: SymbolTypeFlag.runtime });
+        expect(enumTrim).to.be.undefined;
+        const memberTrim = myEnumMember.getMemberType('trim', { flags: SymbolTypeFlag.runtime });
+        expectTypeToBe(memberTrim, TypedFunctionType);
+    });
+});
diff --git a/src/types/BuiltInInterfaceAdder.ts b/src/types/BuiltInInterfaceAdder.ts
new file mode 100644
index 000000000..41e12796c
--- /dev/null
+++ b/src/types/BuiltInInterfaceAdder.ts
@@ -0,0 +1,233 @@
+import type { BRSInterfaceData, BRSInterfaceMethodData, SGNodeData } from '../roku-types';
+import { components, events, interfaces, nodes } from '../roku-types';
+import { Cache } from '../Cache';
+import type { TypedFunctionType } from './TypedFunctionType';
+import type { SymbolTable } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import type { BscType } from './BscType';
+import { isArrayType, isAssociativeArrayType, isBooleanType, isCallableType, isComponentType, isDoubleType, isEnumMemberType, isFloatType, isIntegerType, isInterfaceType, isInvalidType, isLongIntegerType, isStringType } from '../astUtils/reflection';
+import type { ComponentType } from './ComponentType';
+import { util } from '../util';
+import type { UnionType } from './UnionType';
+import type { ExtraSymbolData } from '../interfaces';
+import type { IntersectionType } from './IntersectionType';
+
+
+export interface BuiltInInterfaceOverride {
+    type?: BscType;
+    parameterTypes?: BscType[];
+    returnType?: BscType;
+}
+
+const builtInSymbolData: ExtraSymbolData = {
+    completionPriority: 1,
+    isBuiltIn: true
+};
+
+// eslint-disable-next-line @typescript-eslint/no-extraneous-class
+export class BuiltInInterfaceAdder {
+
+    static readonly primitiveTypeInstanceCache = new Cache<string, BscType>();
+
+    static typedFunctionFactory: (type: BscType) => TypedFunctionType;
+    static intersectionTypeFactory: (types: BscType[]) => IntersectionType;
+    static unionTypeFactory: (types: BscType[]) => UnionType;
+
+    static getLookupTable: () => SymbolTable;
+
+    static addBuiltInInterfacesToType(thisType: BscType, overrides?: Map<string, BuiltInInterfaceOverride>) {
+        const builtInMemberTable = thisType.getBuiltInMemberTable();
+        if (!builtInMemberTable) {
+            // no memberTable to add to
+            // this could be because it's a class that has a parent
+            // the original ancestor should get the built ins
+            return;
+        }
+        //const realMemberTable = thisType.getMemberTable();
+        //const checkForExistingMembers = realMemberTable && realMemberTable !== builtInMemberTable;
+        const builtInComponent = this.getMatchingRokuComponent(thisType);
+        if (!builtInComponent) {
+            // TODO: Perhaps have error here, but docs have some references to unknown types
+            //throw new Error(`Unknown Roku component '${this.getMatchingRokuComponentName(thisType)}' for type '${thisType.toString()}'`);
+            return;
+        }
+        if (!this.typedFunctionFactory) {
+            throw new Error(`Unable to build typed functions - no typed function factory`);
+        }
+        const interfacesToLoop = builtInComponent.interfaces ?? [builtInComponent];
+
+        //add any direct methods from this component to the member table
+        if (this.isBrightScriptComponent(thisType)) {
+            for (const method of builtInComponent.methods ?? []) {
+                const methodFuncType = this.buildMethodFromDocData(method, overrides, thisType);
+                let flags = SymbolTypeFlag.runtime;
+                //set the deprecated flag if applicable
+                if ((method as any).isDeprecated) {
+                    flags |= SymbolTypeFlag.deprecated; // eslint-disable-line no-bitwise
+                }
+                builtInMemberTable.addSymbol(method.name, { ...builtInSymbolData, description: method.description }, methodFuncType, flags);
+            }
+        }
+
+        for (const iface of interfacesToLoop) {
+            const lowerIfaceName = iface.name.toLowerCase();
+            const ifaceData = (interfaces[lowerIfaceName] ?? events[lowerIfaceName]) as BRSInterfaceData;
+
+            if (builtInComponent.interfaces) {
+                // this type has interfaces - add them directly as members
+                const ifaceType = this.getLookupTable()?.getSymbolType(iface.name, { flags: SymbolTypeFlag.typetime });
+                if (ifaceType) {
+                    builtInMemberTable.addSymbol(iface.name, { ...builtInSymbolData }, ifaceType, SymbolTypeFlag.runtime);
+                }
+            }
+
+            for (const method of ifaceData.methods ?? []) {
+                if (ifaceData.name.toLowerCase() === 'ifintops' && method.name.toLowerCase() === 'tostr') {
+                    // handle special case - this messed up the .toStr() method on integers
+                    continue;
+                }
+                const methodFuncType = this.buildMethodFromDocData(method, overrides, thisType);
+                builtInMemberTable.addSymbol(method.name, { ...builtInSymbolData, description: method.description }, methodFuncType, SymbolTypeFlag.runtime);
+            }
+            for (const property of ifaceData.properties ?? []) {
+                const override = overrides?.get(property.name.toLowerCase());
+                builtInMemberTable.addSymbol(property.name, { ...builtInSymbolData, description: property.description }, override?.type ??
+                    this.getPrimitiveType(property.type) ?? this.getPrimitiveType('dynamic'), SymbolTypeFlag.runtime);
+            }
+        }
+    }
+
+    private static builtInMethodCache = new Cache<BRSInterfaceMethodData, TypedFunctionType>();
+
+    private static buildMethodFromDocData(method: BRSInterfaceMethodData, overrides?: Map<string, BuiltInInterfaceOverride>, thisType?: BscType): TypedFunctionType {
+        const override = overrides?.get(method.name.toLowerCase());
+        const getMethodType = () => {
+
+            let returnType = override?.returnType ?? this.getPrimitiveType(method.returnType);
+            if (!returnType && method.returnType.toLowerCase() === (thisType as any)?.name?.toLowerCase()) {
+                returnType = thisType;
+            }
+            const methodFuncType = this.typedFunctionFactory(returnType);
+            methodFuncType.name = method.name;
+            methodFuncType.isVariadic = method.isVariadic ?? false;
+            // eslint-disable-next-line @typescript-eslint/prefer-for-of
+            for (let i = 0; i < method.params.length; i++) {
+                const param = method.params[i];
+                let paramType = override?.parameterTypes?.[i] ?? this.getPrimitiveType(param.type);
+                if (!paramType && param.type.toLowerCase() === (thisType as any)?.name?.toLowerCase()) {
+                    paramType = thisType;
+                }
+                paramType ??= this.primitiveTypeInstanceCache.get('dynamic');
+                methodFuncType.addParameter(param.name, paramType, !param.isRequired);
+            }
+            return methodFuncType;
+        };
+
+        if (override) {
+            return getMethodType();
+        }
+
+        return this.builtInMethodCache.getOrAdd(method, getMethodType);
+    }
+
+    private static getPrimitiveType(typeName: string): BscType {
+        if (typeName.includes(' or ')) {
+            if (!this.unionTypeFactory) {
+                throw new Error(`Unable to build union types - no union type factory`);
+            }
+            // union types!
+            const unionOfTypeNames = typeName.split(' or ');
+            return this.unionTypeFactory(unionOfTypeNames.map(name => this.getPrimitiveType(name)));
+        }
+        const returnType = this.primitiveTypeInstanceCache.get(typeName.toLowerCase());
+        if (!returnType) {
+            if (!this.getLookupTable) {
+                throw new Error(`Unable to find type instance '${typeName}'`);
+            }
+            return this.getLookupTable()?.getSymbolType(typeName, { flags: SymbolTypeFlag.typetime, fullName: typeName, tableProvider: this.getLookupTable });
+        }
+
+        return returnType;
+    }
+
+    static getMatchingRokuComponentName(theType: BscType) {
+        if (isStringType(theType)) {
+            return 'roString';
+        } else if (isIntegerType(theType)) {
+            return 'roInt';
+        } else if (isBooleanType(theType)) {
+            return 'roBoolean';
+        } else if (isFloatType(theType)) {
+            return 'roFloat';
+        } else if (isDoubleType(theType)) {
+            return 'roDouble';
+        } else if (isLongIntegerType(theType)) {
+            return 'roLongInteger';
+        } else if (isInvalidType(theType)) {
+            return 'roInvalid';
+        } else if (isCallableType(theType)) {
+            return 'roFunction';
+        } else if (isAssociativeArrayType(theType)) {
+            return 'roAssociativeArray';
+        } else if (isArrayType(theType)) {
+            return 'roArray';
+        } else if (isEnumMemberType(theType)) {
+            return this.getMatchingRokuComponentName(theType.underlyingType);
+        } else if (isInterfaceType(theType)) {
+            return theType.name;
+        } else if (isComponentType(theType)) {
+            return 'roSGNode';
+        }
+    }
+
+    static isBrightScriptComponent(theType: BscType) {
+        const componentName = this.getMatchingRokuComponentName(theType);
+        if (!componentName) {
+            // No component matches the given type
+            return;
+        }
+        const lowerComponentName = componentName.toLowerCase();
+        return !!components[lowerComponentName];
+    }
+
+    //the return type is a union of the three data types. Just pick the first item from each collection, as every item in the collection should have the same shape
+    static getMatchingRokuComponent(theType: BscType): typeof components['roappinfo'] & typeof interfaces['ifappinfo'] & typeof events['rourlevent'] {
+        const componentName = this.getMatchingRokuComponentName(theType);
+        if (!componentName) {
+            // No component matches the given type
+            return;
+        }
+        const lowerComponentName = componentName.toLowerCase();
+        return components[lowerComponentName] ?? interfaces[lowerComponentName] ?? events[lowerComponentName];
+    }
+
+    static addBuiltInFieldsToNodeType(thisType: ComponentType) {
+        const nodeName = thisType.name;
+        const memberTable = thisType.memberTable;
+        if (!memberTable) {
+            // no memberTable to add to
+            return;
+        }
+        const builtInNode = nodes[nodeName.toLowerCase()] as SGNodeData;
+        if (!builtInNode) {
+            return;
+        }
+        if (!this.typedFunctionFactory) {
+            throw new Error(`Unable to build typed functions - no typed function factory`);
+        }
+        const lookupTable = this.getLookupTable();
+        for (const field of builtInNode.fields) {
+            memberTable.addSymbol(field.name, { ...builtInSymbolData, description: field.description }, util.getNodeFieldType(field.type, lookupTable), SymbolTypeFlag.runtime);
+        }
+        for (const method of builtInNode.methods ?? []) {
+            const methodFuncType = this.buildMethodFromDocData(method, null, thisType);
+            let flags = SymbolTypeFlag.runtime;
+            //set the deprecated flag if applicable
+            if (method.isDeprecated) {
+                flags |= SymbolTypeFlag.deprecated; // eslint-disable-line no-bitwise
+            }
+            memberTable.addSymbol(method.name, { ...builtInSymbolData, description: method.description }, methodFuncType, flags);
+        }
+    }
+
+}
diff --git a/src/types/CallFuncableType.ts b/src/types/CallFuncableType.ts
new file mode 100644
index 000000000..efc205a98
--- /dev/null
+++ b/src/types/CallFuncableType.ts
@@ -0,0 +1,107 @@
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import type { GetSymbolTypeOptions, SymbolTableProvider } from '../SymbolTable';
+import { SymbolTable } from '../SymbolTable';
+import type { BscType } from './BscType';
+import { InheritableType } from './InheritableType';
+import util from '../util';
+import { ReferenceType } from './ReferenceType';
+import type { ExtraSymbolData, TypeCompatibilityData } from '../interfaces';
+import type { BaseFunctionType } from './BaseFunctionType';
+import { isAnyReferenceType, isCallFuncableType, isPrimitiveType, isReferenceType, isTypedFunctionType } from '../astUtils/reflection';
+import { addAssociatedTypesTableAsSiblingToMemberTable } from './helpers';
+
+/**
+ * A Type to represent types that support Callfunc syntax for members, eg. `someType@.someCallfunc()`
+ */
+export abstract class CallFuncableType extends InheritableType {
+    constructor(name: string, parentType?: CallFuncableType | ReferenceType) {
+        super(name, parentType);
+        this.callFuncMemberTable = new SymbolTable(`${this.name}: CallFunc`, () => (this.parentType as CallFuncableType)?.callFuncMemberTable);
+        this.callFuncAssociatedTypesTable = new SymbolTable(`${this.name}: CallFuncAssociatedTypes`, () => (this.parentType as CallFuncableType)?.callFuncAssociatedTypesTable);
+    }
+
+    public readonly callFuncMemberTable: SymbolTable;
+    public readonly callFuncAssociatedTypesTable: SymbolTable;
+
+
+    isEqual(targetType: BscType, data: TypeCompatibilityData = {}): boolean {
+        if (this === targetType) {
+            return true;
+        }
+        if (isReferenceType(targetType)) {
+            return super.isEqual(targetType, data);
+        }
+
+        if (!isCallFuncableType(targetType)) {
+            return false;
+        }
+        return super.isEqual(targetType, data) &&
+            this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data, this.callFuncMemberTable, targetType.callFuncMemberTable) &&
+            targetType.checkCompatibilityBasedOnMembers(this, SymbolTypeFlag.runtime, data, targetType.callFuncMemberTable, this.callFuncMemberTable);
+    }
+
+
+    /**
+     * Adds a function to the call func member table
+     * Also adds any associated custom types to its own table, so they can be used through a callfunc
+     */
+    addCallFuncMember(name: string, data: ExtraSymbolData, funcType: BaseFunctionType, flags: SymbolTypeFlag, associatedTypesTableProvider?: SymbolTableProvider) {
+        const originalTypesToCheck = new Set<BscType>();
+        if (isTypedFunctionType(funcType)) {
+            const paramTypes = (funcType.params ?? []).map(p => p.type);
+            for (const paramType of paramTypes) {
+                originalTypesToCheck.add(paramType);
+            }
+        }
+        if (funcType.returnType) {
+            originalTypesToCheck.add(funcType.returnType);
+        }
+        const additionalTypesToCheck = new Set<BscType>();
+
+        for (const type of originalTypesToCheck) {
+            if (!type.isBuiltIn) {
+                util.getCustomTypesInSymbolTree(additionalTypesToCheck, type, (subSymbolType: BscType) => {
+                    return !originalTypesToCheck.has(subSymbolType);
+                });
+            }
+        }
+
+        for (const type of [...originalTypesToCheck.values(), ...additionalTypesToCheck.values()]) {
+            if (!isPrimitiveType(type) && type.isResolvable()) {
+                // This type is a reference type, but was able to be resolved here
+                // add it to the table of associated types, so it can be used through a callfunc
+                const extraData = {};
+                if (associatedTypesTableProvider) {
+                    associatedTypesTableProvider().getSymbolType(type.toString(), { flags: SymbolTypeFlag.typetime, data: extraData });
+                }
+                let targetType = isAnyReferenceType(type) ? type.getTarget?.() : type;
+
+                this.callFuncAssociatedTypesTable.addSymbol(type.toString(), { ...extraData, isFromCallFunc: true }, targetType, SymbolTypeFlag.typetime);
+            }
+        }
+
+        // add this function to be available through callfunc
+        this.callFuncMemberTable.addSymbol(name, data, funcType, flags);
+    }
+
+    getCallFuncTable() {
+        return this.callFuncMemberTable;
+    }
+
+    getCallFuncType(name: string, options: GetSymbolTypeOptions) {
+        const callFuncType = this.callFuncMemberTable.getSymbolType(name, options);
+
+        if (isTypedFunctionType(callFuncType)) {
+            const typesToCheck = [...callFuncType.params.map(p => p.type), callFuncType.returnType];
+
+            for (const type of typesToCheck) {
+                addAssociatedTypesTableAsSiblingToMemberTable(type, this.callFuncAssociatedTypesTable, SymbolTypeFlag.runtime);
+            }
+        } else {
+            // return a reference type for potentially finding this in the future
+            return new ReferenceType(name, name, options.flags, () => this.callFuncMemberTable);
+        }
+
+        return callFuncType;
+    }
+}
diff --git a/src/types/ClassType.spec.ts b/src/types/ClassType.spec.ts
new file mode 100644
index 000000000..0817fff0c
--- /dev/null
+++ b/src/types/ClassType.spec.ts
@@ -0,0 +1,87 @@
+import { expect } from 'chai';
+import { ClassType } from './ClassType';
+import { StringType } from './StringType';
+import { SymbolTable } from '../SymbolTable';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { ReferenceType } from './ReferenceType';
+import { isReferenceType } from '../astUtils/reflection';
+import { IntegerType } from './IntegerType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+
+describe('ClassType', () => {
+
+    it('can have a super class', () => {
+        const superKlass = new ClassType('SuperKlass');
+        const subKlass = new ClassType('SubKlass', superKlass);
+
+        expect(subKlass.parentType).to.exist;
+        expect(subKlass.parentType.toString()).to.equal('SuperKlass');
+    });
+
+    it('should be assignable to a super klass, or higher ancestor', () => {
+        const grandSuperKlass = new ClassType('GrandSuperKlass');
+        const superKlass = new ClassType('SuperKlass', grandSuperKlass);
+        const subKlass = new ClassType('SubKlass', superKlass);
+
+        expect(subKlass.isTypeCompatible(subKlass)).to.be.true;
+        expect(superKlass.isTypeCompatible(subKlass)).to.be.true;
+        expect(grandSuperKlass.isTypeCompatible(superKlass)).to.be.true;
+    });
+
+    it('should not be assignable to a class that is not an ancestor', () => {
+        const otherKlass = new ClassType('OtherKlass');
+
+        const superKlass = new ClassType('SuperKlass');
+        const subKlass = new ClassType('SubKlass', superKlass);
+
+        expect(superKlass.isTypeCompatible(subKlass)).to.be.true;
+        expect(otherKlass.isTypeCompatible(subKlass)).to.be.false;
+    });
+
+    it('will look in super classes for members', () => {
+        const superKlass = new ClassType('SuperKlass');
+        superKlass.addMember('title', null, StringType.instance, SymbolTypeFlag.runtime);
+        const subKlass = new ClassType('SubKlass', superKlass);
+        expectTypeToBe(subKlass.getMemberType('title', { flags: SymbolTypeFlag.runtime }), StringType);
+    });
+
+    it('allow ReferenceTypes as super classes', () => {
+        const myTable = new SymbolTable('test');
+        const futureSuperKlass = new ReferenceType('SuperKlass', 'SuperKlass', SymbolTypeFlag.typetime, () => myTable);
+        const subKlass = new ClassType('SubKlass', futureSuperKlass);
+        expect(subKlass.isResolvable()).to.be.true;
+        expect(subKlass.parentType?.isResolvable()).to.be.false;
+        const superKlass = new ClassType('SuperKlass');
+        myTable.addSymbol('SuperKlass', null, superKlass, SymbolTypeFlag.typetime);
+        expect(subKlass.parentType.isResolvable()).to.be.true;
+    });
+
+    it('allows members of future super classes to be resolved', () => {
+        const myTable = new SymbolTable('test');
+        const futureSuperKlass = new ReferenceType('SuperKlass', 'SuperKlass', SymbolTypeFlag.typetime, () => myTable);
+        const subKlass = new ClassType('SubKlass', futureSuperKlass);
+        expect(subKlass.parentType.isResolvable()).to.be.false;
+        const futureTitleType = subKlass.getMemberType('title', { flags: SymbolTypeFlag.runtime });
+        expect(isReferenceType(futureTitleType)).to.be.true;
+        expect(futureTitleType.isResolvable()).to.be.false;
+        const superKlass = new ClassType('SuperKlass');
+        superKlass.addMember('title', null, StringType.instance, SymbolTypeFlag.runtime);
+        // eslint-disable-next-line no-bitwise
+        myTable.addSymbol('SuperKlass', null, superKlass, SymbolTypeFlag.typetime | SymbolTypeFlag.runtime);
+        expect(futureTitleType.isResolvable()).to.be.true;
+        expectTypeToBe(futureTitleType, StringType);
+    });
+
+    describe('toJSString', () => {
+        it('includes superclass members', () => {
+            const superKlass = new ClassType('SuperKlass');
+            const subKlass = new ClassType('SubKlass', superKlass);
+            superKlass.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            superKlass.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+
+            expect((subKlass as any).toJSString).to.exist;
+            expect((subKlass as any).toJSString()).to.equal('{ age: integer; name: string; }');
+        });
+    });
+
+});
diff --git a/src/types/ClassType.ts b/src/types/ClassType.ts
new file mode 100644
index 000000000..8b9a19aea
--- /dev/null
+++ b/src/types/ClassType.ts
@@ -0,0 +1,70 @@
+import { SymbolTable } from '../SymbolTable';
+import { isClassType, isDynamicType, isInvalidType, isObjectType, isTypeStatementType } from '../astUtils/reflection';
+import type { TypeCompatibilityData } from '../interfaces';
+import type { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import { InheritableType } from './InheritableType';
+import type { ReferenceType } from './ReferenceType';
+import { isUnionTypeCompatible } from './helpers';
+
+export class ClassType extends InheritableType {
+
+    constructor(public name: string, superClass?: ClassType | ReferenceType) {
+        super(name, superClass);
+    }
+
+    public readonly kind = BscTypeKind.ClassType;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        while (isTypeStatementType(targetType)) {
+            targetType = targetType.wrappedType;
+        }
+        if (this.isEqual(targetType, data)) {
+            return true;
+        } else if (
+            isInvalidType(targetType) ||
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data)) {
+            return true;
+        } else if (isClassType(targetType)) {
+            return this.isTypeDescendent(targetType);
+        }
+        return false;
+    }
+
+    isEqual(targetType: BscType, data?: TypeCompatibilityData): boolean {
+        if (targetType === this) {
+            return true;
+        }
+        return isClassType(targetType) && super.isEqual(targetType, data);
+    }
+
+    private builtInMemberTable: SymbolTable;
+
+    getBuiltInMemberTable(): SymbolTable {
+
+        if (!this.parentType) {
+            if (this.builtInMemberTable) {
+                return this.builtInMemberTable;
+            }
+            this.builtInMemberTable = new SymbolTable(`${this.__identifier} Built-in Members`);
+            this.pushMemberProvider(() => this.builtInMemberTable);
+            return this.builtInMemberTable;
+        }
+    }
+
+    private hasStartedAddingBuiltInInterfaces = false;
+
+    addBuiltInInterfaces() {
+        if (!this.hasAddedBuiltInInterfaces && !this.hasStartedAddingBuiltInInterfaces) {
+            this.hasStartedAddingBuiltInInterfaces = true;
+            if (this.parentType) {
+                this.parentType.addBuiltInInterfaces();
+            }
+            BuiltInInterfaceAdder.addBuiltInInterfacesToType(this);
+        }
+        this.hasAddedBuiltInInterfaces = true;
+    }
+}
diff --git a/src/types/ComponentType.ts b/src/types/ComponentType.ts
new file mode 100644
index 000000000..59f47ae55
--- /dev/null
+++ b/src/types/ComponentType.ts
@@ -0,0 +1,124 @@
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { SymbolTable } from '../SymbolTable';
+import { isComponentType, isDynamicType, isInvalidType, isObjectType, isReferenceType, isTypeStatementType } from '../astUtils/reflection';
+import type { TypeCompatibilityData } from '../interfaces';
+import type { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import { isUnionTypeCompatible } from './helpers';
+import util from '../util';
+import { CallFuncableType } from './CallFuncableType';
+
+export class ComponentType extends CallFuncableType {
+
+    constructor(public name: string, superComponent?: ComponentType) {
+        super(name, superComponent);
+    }
+
+    public readonly kind = BscTypeKind.ComponentType;
+
+    public get parentComponent() {
+        return this.parentType as ComponentType;
+    }
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        while (isTypeStatementType(targetType)) {
+            targetType = targetType.wrappedType;
+        }
+        if (this.isEqual(targetType)) {
+            return true;
+        } else if (isInvalidType(targetType) ||
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data)) {
+            return true;
+        } else if (isComponentType(targetType)) {
+            return this.isTypeDescendent(targetType);
+        }
+        return false;
+    }
+
+    public static instance = new ComponentType('Node');
+
+    isEqual(targetType: BscType, data: TypeCompatibilityData = {}): boolean {
+        if (isReferenceType(targetType) && targetType.isResolvable()) {
+            targetType = targetType.getTarget?.() ?? targetType;
+        }
+        if (this === targetType) {
+            return true;
+        }
+        if (!isComponentType(targetType)) {
+            return false;
+        }
+
+        const thisNameLower = this.name.toLowerCase();
+        const targetNameLower = targetType.name.toLowerCase();
+        if (thisNameLower !== targetNameLower) {
+            return false;
+        }
+        if (this.isBuiltIn && targetType.isBuiltIn) {
+            return true;
+        }
+
+        if (!this.isParentTypeEqual(targetType, data)) {
+            return false;
+        }
+        if (!this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data) ||
+            !targetType.checkCompatibilityBasedOnMembers(this, SymbolTypeFlag.runtime, data)) {
+            return false;
+        }
+        if (!this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data, this.callFuncMemberTable, targetType.callFuncMemberTable) ||
+            !targetType.checkCompatibilityBasedOnMembers(this, SymbolTypeFlag.runtime, data, targetType.callFuncMemberTable, this.callFuncMemberTable)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public toString() {
+        return util.getSgNodeTypeName(this.name);
+    }
+
+    private builtInMemberTable: SymbolTable;
+
+    getBuiltInMemberTable(): SymbolTable {
+        if (!this.parentType) {
+            if (this.builtInMemberTable) {
+                return this.builtInMemberTable;
+            }
+            this.builtInMemberTable = new SymbolTable(`${this.__identifier} Built-in Members`);
+            this.pushMemberProvider(() => this.builtInMemberTable);
+            return this.builtInMemberTable;
+        }
+    }
+
+    private hasStartedAddingBuiltInInterfaces = false;
+
+    addBuiltInInterfaces() {
+        if (!this.hasAddedBuiltInInterfaces && !this.hasStartedAddingBuiltInInterfaces) {
+            this.hasStartedAddingBuiltInInterfaces = true;
+            if (this.parentType) {
+                this.parentType.addBuiltInInterfaces();
+            }
+            BuiltInInterfaceAdder.addBuiltInInterfacesToType(this);
+        }
+        this.hasAddedBuiltInInterfaces = true;
+        this.addBuiltInFields();
+    }
+
+    private hasAddedBuiltInFields = false;
+    private hasStartedAddingBuiltInFields = false;
+
+
+    addBuiltInFields() {
+        if (!this.hasAddedBuiltInFields && !this.hasStartedAddingBuiltInFields) {
+            this.hasStartedAddingBuiltInFields = true;
+            if (isComponentType(this.parentType)) {
+                this.parentType.addBuiltInFields();
+            }
+            BuiltInInterfaceAdder.addBuiltInFieldsToNodeType(this);
+        }
+        this.hasAddedBuiltInFields = true;
+    }
+}
+
diff --git a/src/types/CustomType.ts b/src/types/CustomType.ts
deleted file mode 100644
index 3285f5091..000000000
--- a/src/types/CustomType.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { isCustomType, isDynamicType } from '../astUtils/reflection';
-import type { BscType } from './BscType';
-
-export class CustomType implements BscType {
-
-    constructor(public name: string) {
-    }
-
-    public toString() {
-        return this.name;
-    }
-
-    public toTypeString(): string {
-        return 'object';
-    }
-
-    public isAssignableTo(targetType: BscType) {
-        //TODO for now, if the custom types have the same name, assume they're the same thing
-        if (isCustomType(targetType) && targetType.name === this.name) {
-            return true;
-        } else if (isDynamicType(targetType)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
-    }
-
-    public clone() {
-        return new CustomType(this.name);
-    }
-}
diff --git a/src/types/DoubleType.spec.ts b/src/types/DoubleType.spec.ts
index bc518545e..24c5a4a79 100644
--- a/src/types/DoubleType.spec.ts
+++ b/src/types/DoubleType.spec.ts
@@ -1,11 +1,21 @@
 import { expect } from '../chai-config.spec';
+import { BooleanType } from './BooleanType';
 
 import { DoubleType } from './DoubleType';
 import { DynamicType } from './DynamicType';
+import { IntegerType } from './IntegerType';
 
 describe('DoubleType', () => {
-    it('is equivalent to double types', () => {
-        expect(new DoubleType().isAssignableTo(new DoubleType())).to.be.true;
-        expect(new DoubleType().isAssignableTo(new DynamicType())).to.be.true;
+
+    it('is equal to double type', () => {
+        expect(new DoubleType().isEqual(new DoubleType())).to.be.true;
+        expect(new DoubleType().isEqual(new DynamicType())).to.be.false;
+    });
+
+    it('is compatible with only correct types', () => {
+        expect(new DoubleType().isTypeCompatible(new DoubleType())).to.be.true;
+        expect(new DoubleType().isTypeCompatible(new DynamicType())).to.be.true;
+        expect(new DoubleType().isTypeCompatible(IntegerType.instance)).to.be.true;
+        expect(new DoubleType().isTypeCompatible(BooleanType.instance)).to.be.false;
     });
 });
diff --git a/src/types/DoubleType.ts b/src/types/DoubleType.ts
index a63829312..6501922f4 100644
--- a/src/types/DoubleType.ts
+++ b/src/types/DoubleType.ts
@@ -1,43 +1,41 @@
-import type { BscType } from './BscType';
-import { DynamicType } from './DynamicType';
-import { FloatType } from './FloatType';
-import { IntegerType } from './IntegerType';
-import { LongIntegerType } from './LongIntegerType';
-
-export class DoubleType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
-
-    public isAssignableTo(targetType: BscType) {
+import { isDoubleTypeLike, isDynamicType, isNumberTypeLike, isObjectType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isEnumTypeCompatible, isNativeInterfaceCompatibleNumber, isUnionTypeCompatible } from './helpers';
+
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
+
+export class DoubleType extends BscType {
+    public readonly kind = BscTypeKind.DoubleType;
+
+    public static instance = new DoubleType();
+
+    public isBuiltIn = true;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         return (
-            targetType instanceof DoubleType ||
-            targetType instanceof DynamicType
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isNumberTypeLike(targetType) ||
+            isUnionTypeCompatible(this, targetType, data) ||
+            isEnumTypeCompatible(this, targetType, data) ||
+            isNativeInterfaceCompatibleNumber(this, targetType, data)
         );
     }
-
-    public isConvertibleTo(targetType: BscType) {
-        if (
-            targetType instanceof DynamicType ||
-            targetType instanceof IntegerType ||
-            targetType instanceof FloatType ||
-            targetType instanceof DoubleType ||
-            targetType instanceof LongIntegerType
-        ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
     public toString() {
-        return this.typeText ?? 'double';
+        return 'double';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new DoubleType(this.typeText);
+    public isEqual(targetType: BscType): boolean {
+        return isDoubleTypeLike(targetType);
     }
+
+    readonly binaryOpPriorityLevel = 1;
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('double', DoubleType.instance);
diff --git a/src/types/DynamicType.spec.ts b/src/types/DynamicType.spec.ts
index 19d64d6e1..ccb57c330 100644
--- a/src/types/DynamicType.spec.ts
+++ b/src/types/DynamicType.spec.ts
@@ -1,11 +1,23 @@
 import { expect } from '../chai-config.spec';
+import { BooleanType } from './BooleanType';
+import { ClassType } from './ClassType';
+import { DoubleType } from './DoubleType';
 
 import { DynamicType } from './DynamicType';
-import { StringType } from './StringType';
+import { IntegerType } from './IntegerType';
 
 describe('DynamicType', () => {
-    it('is equivalent to dynamic types', () => {
-        expect(new DynamicType().isAssignableTo(new StringType())).to.be.true;
-        expect(new DynamicType().isAssignableTo(new DynamicType())).to.be.true;
+    it('is equal to dynamic type', () => {
+        expect(new DynamicType().isEqual(new DynamicType())).to.be.true;
+        expect(new DynamicType().isEqual(new DoubleType())).to.be.false;
+        expect(new DynamicType().isEqual(new ClassType('test'))).to.be.false;
+    });
+
+    it('is compatible with only all types', () => {
+        expect(new DynamicType().isTypeCompatible(new DoubleType())).to.be.true;
+        expect(new DynamicType().isTypeCompatible(new DynamicType())).to.be.true;
+        expect(new DynamicType().isTypeCompatible(IntegerType.instance)).to.be.true;
+        expect(new DynamicType().isTypeCompatible(BooleanType.instance)).to.be.true;
+        expect(new DynamicType().isTypeCompatible(new ClassType('test'))).to.be.true;
     });
 });
diff --git a/src/types/DynamicType.ts b/src/types/DynamicType.ts
index 468e926c4..09cc65b0d 100644
--- a/src/types/DynamicType.ts
+++ b/src/types/DynamicType.ts
@@ -1,12 +1,22 @@
-import type { BscType } from './BscType';
+import type { TypeCompatibilityData } from '../interfaces';
+import { isDynamicType, isUninitializedType, isVoidType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { GetSymbolTypeOptions } from '../SymbolTable';
 
-export class DynamicType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
+export class DynamicType extends BscType {
+
+    public readonly kind = BscTypeKind.DynamicType;
 
     public static readonly instance = new DynamicType();
 
+    public isBuiltIn = true;
+
+    get returnType() {
+        return DynamicType.instance;
+    }
+
     public isAssignableTo(targetType: BscType) {
         //everything can be dynamic, so as long as a type is provided, this is true
         return !!targetType;
@@ -15,20 +25,35 @@ export class DynamicType implements BscType {
     /**
      * The dynamic type is convertible to everything.
      */
-    public isConvertibleTo(targetType: BscType) {
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         //everything can be dynamic, so as long as a type is provided, this is true
+        if (isVoidType(targetType) || isUninitializedType(targetType)) {
+            return false;
+        }
         return !!targetType;
     }
 
     public toString() {
-        return this.typeText ?? 'dynamic';
+        return 'dynamic';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new DynamicType(this.typeText);
+    public isEqual(targetType: BscType) {
+        return isDynamicType(targetType);
+    }
+
+    getMemberType(memberName: string, options: GetSymbolTypeOptions) {
+        return DynamicType.instance;
     }
+
+    getCallFuncType(name: string, options: GetSymbolTypeOptions) {
+        return DynamicType.instance;
+    }
+
+
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('dynamic', DynamicType.instance);
diff --git a/src/types/EnumType.spec.ts b/src/types/EnumType.spec.ts
new file mode 100644
index 000000000..24a8986a2
--- /dev/null
+++ b/src/types/EnumType.spec.ts
@@ -0,0 +1,35 @@
+import { expect } from '../chai-config.spec';
+import { ClassType } from './ClassType';
+import { EnumMemberType, EnumType } from './EnumType';
+
+describe('EnumType', () => {
+    it('is equal to appropriate enum type', () => {
+        expect(new EnumType('hello').isEqual(new ClassType('hello'))).to.be.false;
+        expect(new EnumType('hello').isEqual(new EnumType('hello'))).to.be.true;
+        expect(new EnumType('hello').isEqual(new EnumType('notHello'))).to.be.false;
+    });
+
+    it('is compatible with enum type that is the same', () => {
+        expect(new EnumType('hello').isTypeCompatible(new ClassType('hello'))).to.be.false;
+        expect(new EnumType('hello').isTypeCompatible(new EnumType('hello'))).to.be.true;
+        expect(new EnumType('hello').isTypeCompatible(new EnumType('notHello'))).to.be.false;
+    });
+
+    it('is compatible with appropriate enum member type', () => {
+        const myEnum = new EnumType('hello');
+        expect(myEnum.isTypeCompatible(new EnumType('hello'))).to.be.true;
+        const enumMember = new EnumMemberType(myEnum.name, 'someMember');
+        const enumMember2 = new EnumMemberType('other', 'someMember');
+        expect(myEnum.isTypeCompatible(enumMember)).to.be.true;
+        expect(myEnum.isTypeCompatible(enumMember2)).to.be.false;
+    });
+});
+
+
+describe('EnumMemberType', () => {
+    it('is equal to appropriate enum member type', () => {
+        expect(new EnumMemberType('a', 'b').isEqual(new EnumMemberType('a', 'b'))).to.be.true;
+        expect(new EnumMemberType('a', 'b').isEqual(new EnumMemberType('a', 'c'))).to.be.false;
+        expect(new EnumMemberType('a', 'b').isEqual(new EnumMemberType('d', 'b'))).to.be.false;
+    });
+});
diff --git a/src/types/EnumType.ts b/src/types/EnumType.ts
new file mode 100644
index 000000000..cda5c018e
--- /dev/null
+++ b/src/types/EnumType.ts
@@ -0,0 +1,124 @@
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { isDynamicType, isEnumMemberType, isEnumType, isObjectType, isTypeStatementType } from '../astUtils/reflection';
+import type { TypeCompatibilityData } from '../interfaces';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { DynamicType } from './DynamicType';
+import { isUnionTypeCompatible } from './helpers';
+
+export class EnumType extends BscType {
+    constructor(
+        public name: string,
+        /**
+         * The runtime type for this enum (i.e. what type the value will be transpiled into)
+         */
+        public underlyingType: BscType = DynamicType.instance
+    ) {
+        super(name);
+    }
+
+    public readonly kind = BscTypeKind.EnumType;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        while (isTypeStatementType(targetType)) {
+            targetType = targetType.wrappedType;
+        }
+        return (
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            this.isEqual(targetType) ||
+            (isEnumMemberType(targetType) &&
+                (targetType.parentEnumType === this ||
+                    targetType.enumName.toLowerCase() === this.name.toLowerCase())) ||
+            isUnionTypeCompatible(this, targetType, data)
+        );
+    }
+
+    public toString() {
+        return this.name;
+    }
+
+    public toTypeString(): string {
+        return 'dynamic';
+    }
+
+    public isEqual(targetType: BscType, data?: TypeCompatibilityData): boolean {
+        return isEnumType(targetType) &&
+            targetType?.name.toLowerCase() === this.name.toLowerCase() &&
+            this.underlyingType.isEqual(targetType.underlyingType, data) &&
+            this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data) &&
+            targetType.checkCompatibilityBasedOnMembers(this, SymbolTypeFlag.runtime, data);
+    }
+
+    private _defaultMemberType: EnumMemberType;
+
+    public get defaultMemberType() {
+        if (this._defaultMemberType) {
+            return this._defaultMemberType;
+        }
+        const defaultMember = new EnumMemberType(this.name, 'default', this.underlyingType);
+        defaultMember.parentEnumType = this;
+        this._defaultMemberType = defaultMember;
+        return this._defaultMemberType;
+    }
+}
+
+
+export class EnumMemberType extends BscType {
+    constructor(
+        public enumName: string,
+        public memberName: string,
+        /**
+         * The runtime type for this enum (i.e. what type the value will be transpiled into)
+         */
+        public underlyingType: BscType = DynamicType.instance
+    ) {
+        super(`${enumName}.${memberName}`);
+    }
+
+    public readonly kind = BscTypeKind.EnumMemberType;
+
+    public parentEnumType: EnumType;
+
+    public isAssignableTo(targetType: BscType) {
+        return (
+            this.isEqual(targetType) ||
+            (isEnumType(targetType) &&
+                targetType?.name.toLowerCase() === this.enumName.toLowerCase()) ||
+            isDynamicType(targetType)
+        );
+    }
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+
+
+        if (isEnumMemberType(targetType)) {
+            if (this.enumName.toLowerCase() === targetType.enumName.toLowerCase()) {
+                return true;
+            }
+        } else if (isEnumType(targetType)) {
+            if (this.enumName.toLowerCase() === targetType.toString().toLowerCase()) {
+                return true;
+            }
+        }
+
+        return (
+            this.isEqual(targetType) ||
+            isDynamicType(targetType)
+        );
+    }
+
+    public toString() {
+        return this.enumName;
+    }
+
+    public toTypeString(): string {
+        return 'dynamic';
+    }
+
+    public isEqual(targetType: BscType): boolean {
+        return isEnumMemberType(targetType) &&
+            targetType?.enumName.toLowerCase() === this.enumName.toLowerCase() &&
+            targetType?.memberName.toLowerCase() === this.memberName.toLowerCase();
+    }
+}
diff --git a/src/types/FloatType.spec.ts b/src/types/FloatType.spec.ts
index b6f39b698..a23ca3c92 100644
--- a/src/types/FloatType.spec.ts
+++ b/src/types/FloatType.spec.ts
@@ -4,8 +4,8 @@ import { DynamicType } from './DynamicType';
 import { FloatType } from './FloatType';
 
 describe('FloatType', () => {
-    it('is equivalent to double types', () => {
-        expect(new FloatType().isAssignableTo(new FloatType())).to.be.true;
-        expect(new FloatType().isAssignableTo(new DynamicType())).to.be.true;
+    it('is compatible to double types', () => {
+        expect(new FloatType().isTypeCompatible(new FloatType())).to.be.true;
+        expect(new FloatType().isTypeCompatible(new DynamicType())).to.be.true;
     });
 });
diff --git a/src/types/FloatType.ts b/src/types/FloatType.ts
index 26edd47f5..8559a9c40 100644
--- a/src/types/FloatType.ts
+++ b/src/types/FloatType.ts
@@ -1,44 +1,43 @@
-import type { BscType } from './BscType';
-import { DoubleType } from './DoubleType';
-import { DynamicType } from './DynamicType';
-import { IntegerType } from './IntegerType';
-import { LongIntegerType } from './LongIntegerType';
-
-export class FloatType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
-
-    public isAssignableTo(targetType: BscType) {
+import { isDynamicType, isFloatTypeLike, isNumberTypeLike, isObjectType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isEnumTypeCompatible, isNativeInterfaceCompatibleNumber, isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
+
+export class FloatType extends BscType {
+
+    public readonly kind = BscTypeKind.FloatType;
+
+    public static instance = new FloatType();
+
+    public isBuiltIn = true;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         return (
-            targetType instanceof FloatType ||
-            targetType instanceof DynamicType
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isNumberTypeLike(targetType) ||
+            isUnionTypeCompatible(this, targetType, data) ||
+            isEnumTypeCompatible(this, targetType, data) ||
+            isNativeInterfaceCompatibleNumber(this, targetType, data)
         );
-    }
 
-    public isConvertibleTo(targetType: BscType) {
-        if (
-            targetType instanceof DynamicType ||
-            targetType instanceof IntegerType ||
-            targetType instanceof FloatType ||
-            targetType instanceof DoubleType ||
-            targetType instanceof LongIntegerType
-        ) {
-            return true;
-        } else {
-            return false;
-        }
     }
 
     public toString() {
-        return this.typeText ?? 'float';
+        return 'float';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new FloatType(this.typeText);
+    public isEqual(targetType: BscType): boolean {
+        return isFloatTypeLike(targetType);
     }
+
+    readonly binaryOpPriorityLevel = 2;
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('float', FloatType.instance);
diff --git a/src/types/FunctionType.spec.ts b/src/types/FunctionType.spec.ts
deleted file mode 100644
index 4617e7d71..000000000
--- a/src/types/FunctionType.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { expect } from '../chai-config.spec';
-
-import { DynamicType } from './DynamicType';
-import { FunctionType } from './FunctionType';
-import { IntegerType } from './IntegerType';
-import { StringType } from './StringType';
-import { VoidType } from './VoidType';
-
-describe('FunctionType', () => {
-    it('is equivalent to dynamic type', () => {
-        expect(new FunctionType(new VoidType()).isAssignableTo(new DynamicType())).to.be.true;
-    });
-
-    it('validates using param and return types', () => {
-        expect(new FunctionType(new VoidType()).isAssignableTo(new FunctionType(new VoidType()))).to.be.true;
-
-        //different parameter count
-        expect(
-            new FunctionType(new VoidType()).addParameter('a', new IntegerType(), false).isAssignableTo(
-                new FunctionType(new VoidType())
-            )
-        ).to.be.false;
-
-        //different parameter types
-        expect(
-            new FunctionType(new VoidType()).addParameter('a', new IntegerType(), false).isAssignableTo(
-                new FunctionType(new VoidType()).addParameter('a', new StringType(), false)
-            )
-        ).to.be.false;
-
-        //different return type
-        expect(
-            new FunctionType(new VoidType()).isAssignableTo(
-                new FunctionType(new IntegerType())
-            )
-        ).to.be.false;
-    });
-});
diff --git a/src/types/FunctionType.ts b/src/types/FunctionType.ts
index c673d046c..84d8fd3f0 100644
--- a/src/types/FunctionType.ts
+++ b/src/types/FunctionType.ts
@@ -1,89 +1,44 @@
+import { isCallableType, isDynamicType, isFunctionTypeLike, isObjectType } from '../astUtils/reflection';
+import { BaseFunctionType } from './BaseFunctionType';
 import type { BscType } from './BscType';
-import { DynamicType } from './DynamicType';
-
-export class FunctionType implements BscType {
-    constructor(
-        public returnType: BscType
-    ) {
-
-    }
-
-    /**
-     * The name of the function for this type. Can be undefined
-     */
-    public name: string | undefined;
-
-    /**
-     * Determines if this is a sub or not
-     */
-    public isSub = false;
-
-    public params = [] as Array<{ name: string; type: BscType; isOptional: boolean }>;
-
-    public setName(name: string) {
-        this.name = name;
-        return this;
-    }
-
-    public addParameter(name: string, type: BscType, isOptional: boolean) {
-        this.params.push({
-            name: name,
-            type: type,
-            isOptional: isOptional === true ? true : false
-        });
-        return this;
-    }
-
-    public isAssignableTo(targetType: BscType) {
-        if (targetType instanceof DynamicType) {
+import { BscTypeKind } from './BscTypeKind';
+import { isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
+
+export class FunctionType extends BaseFunctionType {
+    public readonly kind = BscTypeKind.FunctionType;
+
+    public static instance = new FunctionType();
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        if (
+            isDynamicType(targetType) ||
+            isCallableType(targetType) ||
+            isFunctionTypeLike(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data)
+        ) {
             return true;
-        } else if (targetType instanceof FunctionType) {
-            //compare all parameters
-            let len = Math.max(this.params.length, targetType.params.length);
-            for (let i = 0; i < len; i++) {
-                let myParam = this.params[i];
-                let targetParam = targetType.params[i];
-                if (!myParam || !targetParam || !myParam.type.isAssignableTo(targetParam.type)) {
-                    return false;
-                }
-            }
-
-            //compare return type
-            if (!this.returnType || !targetType.returnType || !this.returnType.isAssignableTo(targetType.returnType)) {
-                return false;
-            }
-
-            //made it here, all params and return type are equivalent
-            return true;
-        } else {
-            return false;
         }
-    }
-
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
+        return false;
     }
 
     public toString() {
-        let paramTexts: string[] = [];
-        for (let param of this.params) {
-            paramTexts.push(`${param.name}${param.isOptional ? '?' : ''} as ${param.type.toString()}`);
-        }
-        return `${this.isSub ? 'sub' : 'function'} ${this.name}(${paramTexts.join(', ')}) as ${this.returnType.toString()}`;
+        return this.toTypeString();
 
     }
 
     public toTypeString(): string {
-        return 'Function';
+        return 'function';
     }
 
-    public clone() {
-        const result = new FunctionType(this.returnType);
-        for (let param of this.params) {
-            result.addParameter(param.name, param.type, param.isOptional);
+    isEqual(targetType: BscType) {
+        if (isFunctionTypeLike(targetType)) {
+            return true;
         }
-        result.isSub = this.isSub;
-        result.returnType = this.returnType?.clone();
-        return result;
+        return false;
     }
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('function', FunctionType.instance);
diff --git a/src/types/InheritableType.ts b/src/types/InheritableType.ts
new file mode 100644
index 000000000..6483694d4
--- /dev/null
+++ b/src/types/InheritableType.ts
@@ -0,0 +1,181 @@
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
+import { isInheritableType, isReferenceType } from '../astUtils/reflection';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { BscType } from './BscType';
+import type { ReferenceType } from './ReferenceType';
+import { DynamicType } from './DynamicType';
+
+export abstract class InheritableType extends BscType {
+
+    constructor(public name: string, public readonly parentType?: InheritableType | ReferenceType) {
+        super(name);
+        if (parentType) {
+            this.memberTable.pushParentProvider(() => this.parentType.memberTable);
+        }
+    }
+
+    changeUnknownMemberToDynamic = false;
+
+    getMemberType(memberName: string, options: GetTypeOptions) {
+        let hasRoAssociativeArrayAsAncestor = this.name.toLowerCase() === 'roassociativearray' || this.getAncestorTypeList()?.find(ancestorType => ancestorType.name.toLowerCase() === 'roassociativearray');
+
+        if (hasRoAssociativeArrayAsAncestor) {
+            return super.getMemberType(memberName, options) ?? (!options?.ignoreDefaultDynamicMembers ? DynamicType.instance : undefined);
+        }
+
+        const resultType = super.getMemberType(memberName, { ...options, fullName: memberName, tableProvider: () => this.memberTable });
+
+        if (this.changeUnknownMemberToDynamic && !resultType.isResolvable()) {
+            if (options.ignoreDefaultDynamicMembers) {
+                return resultType;
+            }
+            return DynamicType.instance;
+        }
+        return resultType;
+    }
+
+    public toString() {
+        return this.name;
+    }
+
+    public toTypeString(): string {
+        return 'dynamic';
+    }
+
+    protected getAncestorTypeList(): InheritableType[] {
+        const ancestors = [];
+        let currentParentType = this.parentType;
+        while (currentParentType) {
+            if (isInheritableType(currentParentType)) {
+                ancestors.push(currentParentType);
+                currentParentType = currentParentType.parentType;
+            } else {
+                break;
+            }
+        }
+        return ancestors;
+    }
+
+    /**
+     *  Checks if other type is an ancestor of this
+     */
+    isTypeAncestor(otherType: BscType) {
+        if (!isInheritableType(otherType)) {
+            return false;
+        }
+        // Check if targetType is an ancestor of this
+        const ancestors = this.getAncestorTypeList();
+        if (ancestors?.find(ancestorType => ancestorType.isEqual(otherType))) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *  Checks if other type is an descendent of this
+     */
+    isTypeDescendent(otherType: BscType) {
+        if (!isInheritableType(otherType)) {
+            return false;
+        }
+        return otherType.isTypeAncestor(this);
+    }
+
+    /**
+     * Gets a string representation of the Interface that looks like javascript
+     * Useful for debugging
+     */
+    private toJSString() {
+        // eslint-disable-next-line no-bitwise
+        const flags = 3 as SymbolTypeFlag; //SymbolTypeFlags.runtime | SymbolTypeFlags.typetime;
+        let result = '{';
+        const memberSymbols = (this.memberTable?.getAllSymbols(flags) || []).sort((a, b) => a.name.localeCompare(b.name));
+        for (const symbol of memberSymbols) {
+            let symbolTypeString = symbol.type.toString();
+            if (isInheritableType(symbol.type)) {
+                symbolTypeString = symbol.type.toJSString();
+            }
+            result += ' ' + symbol.name + ': ' + symbolTypeString + ';';
+        }
+        if (memberSymbols.length > 0) {
+            result += ' ';
+        }
+        return result + '}';
+    }
+
+    isEqual(targetType: BscType, data: TypeCompatibilityData = {}): boolean {
+        if (this === targetType) {
+            return true;
+        }
+        if (isReferenceType(targetType)) {
+            const lowerTargetName = (targetType.memberKey ?? targetType.fullName).toLowerCase();
+            const myLowerName = this.name.toLowerCase();
+
+            if (myLowerName === lowerTargetName) {
+                return true;
+            }
+            //check non-namespaced version
+            if (myLowerName.split('.').pop() === lowerTargetName) {
+                return true;
+            }
+        }
+        if (!isInheritableType(targetType)) {
+            return false;
+        }
+        if (!targetType) {
+            return false;
+        }
+        if (this === targetType) {
+            return true;
+        }
+        if (data?.allowNameEquality) {
+            const thisKind = (this as any).kind;
+            if (thisKind && thisKind === (targetType as any).kind) {
+                if (this.toString().toLowerCase() === targetType.toString().toLowerCase()) {
+                    return true;
+                }
+            }
+        }
+
+        if (this.isAncestorUnresolvedReferenceType() || targetType.isAncestorUnresolvedReferenceType()) {
+            return this.name.toLowerCase() === targetType.name?.toLowerCase() &&
+                this.isParentTypeEqual(targetType, data);
+        }
+        return this.name.toLowerCase() === targetType.name?.toLowerCase() &&
+            this.isParentTypeEqual(targetType, data) &&
+            this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data) &&
+            targetType.checkCompatibilityBasedOnMembers(this, SymbolTypeFlag.runtime, data);
+    }
+
+    protected isParentTypeEqual(targetType: BscType, data?: TypeCompatibilityData): boolean {
+        if (isInheritableType(targetType)) {
+            const targetParent = targetType.parentType;
+            if (this.parentType && !targetParent) {
+                return false;
+            } else if (!this.parentType && !targetParent) {
+                return true;
+            } else if (!this.parentType && targetParent) {
+                return false;
+            }
+            if (isReferenceType(targetParent) || isReferenceType(this.parentType)) {
+                let thisParentName = isReferenceType(this.parentType) ? this.parentType.memberKey ?? this.parentType.fullName : this.parentType.name;
+                let targetParentName = isReferenceType(targetParent) ? targetParent.memberKey ?? targetParent.fullName : targetParent.name;
+                return thisParentName.toLowerCase() === targetParentName.toLowerCase();
+            }
+            return this.parentType.isEqual(targetParent, data);
+        }
+        return false;
+    }
+
+    protected isAncestorUnresolvedReferenceType() {
+        let p = this as InheritableType | ReferenceType;
+        while (p) {
+            if (isReferenceType(p) && !p.isResolvable()) {
+                return true;
+            }
+            p = (p as InheritableType).parentType;
+
+        }
+        return false;
+    }
+}
diff --git a/src/types/InlineInterfaceType.ts b/src/types/InlineInterfaceType.ts
new file mode 100644
index 000000000..cf303bfec
--- /dev/null
+++ b/src/types/InlineInterfaceType.ts
@@ -0,0 +1,18 @@
+
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { InterfaceType } from './InterfaceType';
+
+export class InlineInterfaceType extends InterfaceType {
+    public constructor(
+    ) {
+        super('');
+    }
+
+    public toString() {
+        const ownSymbols = this.getMemberTable().getOwnSymbols(SymbolTypeFlag.runtime);
+
+        // eslint-disable-next-line no-bitwise
+        const membersList = ownSymbols.map(s => `${s.flags & SymbolTypeFlag.optional ? 'optional ' : ''}${s.name} as ${s.type.toString()}`).join(', ');
+        return `{${membersList}}`;
+    }
+}
diff --git a/src/types/IntegerType.spec.ts b/src/types/IntegerType.spec.ts
index b9353c24c..51b95cfb8 100644
--- a/src/types/IntegerType.spec.ts
+++ b/src/types/IntegerType.spec.ts
@@ -1,11 +1,17 @@
 import { expect } from '../chai-config.spec';
-
 import { DynamicType } from './DynamicType';
 import { IntegerType } from './IntegerType';
 
 describe('IntegerType', () => {
-    it('is equivalent to other integer types', () => {
-        expect(new IntegerType().isAssignableTo(new IntegerType())).to.be.true;
-        expect(new IntegerType().isAssignableTo(new DynamicType())).to.be.true;
+    it('is equal to other integer types', () => {
+        expect(new IntegerType().isEqual(new IntegerType())).to.be.true;
+        expect(new IntegerType().isEqual(new DynamicType())).to.be.false;
+    });
+
+    it('is compatible with to other integer types', () => {
+        expect(new IntegerType().isTypeCompatible(new IntegerType())).to.be.true;
+        expect(new IntegerType().isTypeCompatible(new DynamicType())).to.be.true;
     });
+
+
 });
diff --git a/src/types/IntegerType.ts b/src/types/IntegerType.ts
index 81d159986..00c4ec317 100644
--- a/src/types/IntegerType.ts
+++ b/src/types/IntegerType.ts
@@ -1,44 +1,41 @@
-import type { BscType } from './BscType';
-import { DoubleType } from './DoubleType';
-import { DynamicType } from './DynamicType';
-import { FloatType } from './FloatType';
-import { LongIntegerType } from './LongIntegerType';
-
-export class IntegerType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
-
-    public isAssignableTo(targetType: BscType) {
+import { isDynamicType, isIntegerTypeLike, isNumberTypeLike, isObjectType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isEnumTypeCompatible, isNativeInterfaceCompatibleNumber, isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
+
+export class IntegerType extends BscType {
+    public readonly kind = BscTypeKind.IntegerType;
+
+    public static instance = new IntegerType();
+
+    public isBuiltIn = true;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         return (
-            targetType instanceof IntegerType ||
-            targetType instanceof DynamicType
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isNumberTypeLike(targetType) ||
+            isUnionTypeCompatible(this, targetType, data) ||
+            isEnumTypeCompatible(this, targetType, data) ||
+            isNativeInterfaceCompatibleNumber(this, targetType, data)
         );
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        if (
-            targetType instanceof DynamicType ||
-            targetType instanceof IntegerType ||
-            targetType instanceof FloatType ||
-            targetType instanceof DoubleType ||
-            targetType instanceof LongIntegerType
-        ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     public toString() {
-        return this.typeText ?? 'integer';
+        return 'integer';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new IntegerType(this.typeText);
+    isEqual(otherType: BscType) {
+        return isIntegerTypeLike(otherType);
     }
+
+    readonly binaryOpPriorityLevel = 4;
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('integer', IntegerType.instance);
diff --git a/src/types/InterfaceType.spec.ts b/src/types/InterfaceType.spec.ts
index 857147e5f..5665fd220 100644
--- a/src/types/InterfaceType.spec.ts
+++ b/src/types/InterfaceType.spec.ts
@@ -1,71 +1,113 @@
 import { expect } from '../chai-config.spec';
 import { assert } from 'sinon';
-import { objectToMap } from '../testHelpers.spec';
 import type { BscType } from './BscType';
 import { DynamicType } from './DynamicType';
 import { IntegerType } from './IntegerType';
 import { InterfaceType } from './InterfaceType';
 import { ObjectType } from './ObjectType';
 import { StringType } from './StringType';
+import type { ReferenceType } from './ReferenceType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { AssociativeArrayType } from './AssociativeArrayType';
+import { ArrayType } from './ArrayType';
+import { BooleanType } from './BooleanType';
+import { typeCompatibilityMessage } from '../DiagnosticMessages';
+import type { TypeCompatibilityData } from '../interfaces';
 
 describe('InterfaceType', () => {
-    describe('toString', () => {
+    describe('toJSString', () => {
         it('returns empty curly braces when no members', () => {
-            expect(iface({}).toString()).to.eql('{}');
+            expect((iface({}) as any).toJSString()).to.eql('{}');
         });
 
         it('includes member types', () => {
-            expect(iface({ name: new StringType() }).toString()).to.eql('{ name: string; }');
+            expect((iface({ name: new StringType() }) as any).toJSString()).to.eql('{ name: string; }');
         });
 
         it('includes nested object types', () => {
             expect(
-                iface({
+                (iface({
                     name: new StringType(),
                     parent: iface({
                         age: new IntegerType()
                     })
                 }
-                ).toString()
+                ) as any).toJSString()
             ).to.eql('{ name: string; parent: { age: integer; }; }');
         });
     });
 
-    describe('isConvertibleTo', () => {
+    describe('isTypeCompatible', () => {
         it('works', () => {
-            expectAssignable({
+            expectCompatible({
                 name: new StringType()
             }, {
                 name: new StringType()
             });
         });
+
+        it('does not crash when given non types', () => {
+            const iface = new InterfaceType('roArray');
+            expect(iface.isTypeCompatible(undefined)).to.be.false;
+            expect(iface.isTypeCompatible(null)).to.be.false;
+        });
+
+        it('roku component types are compatible with BscTypes', () => {
+            // TODO: Fix String type compatibility -  reason is because of overloaded members (Mid(), StartsWith(), etc)
+            // SEE: https://github.com/rokucommunity/brighterscript/issues/926
+            // expectTypeCrossCompatible(new StringType(), new InterfaceType('roString'));
+            expectTypeCrossCompatible(new ArrayType(), new InterfaceType('roArray'));
+            expectTypeCrossCompatible(new AssociativeArrayType(), new InterfaceType('roAssociativeArray'));
+            expectTypeCrossCompatible(new BooleanType(), new InterfaceType('roBoolean'));
+            expectTypeCrossCompatible(new IntegerType(), new InterfaceType('roInt'));
+        });
+
+
     });
 
     describe('equals', () => {
-        it('matches equal objects', () => {
+        it('matches same objects', () => {
+            const ifaceObj = iface({ name: new StringType() });
+            expect(ifaceObj.isEqual(ifaceObj)).to.be.true;
+        });
+        it('does not match interfaces with same members', () => {
             expect(
-                iface({ name: new StringType() }).equals(iface({ name: new StringType() }))
-            ).to.be.true;
+                iface({ name: new StringType() }).isEqual(iface({ name: new StringType() }))
+            ).to.be.false;
         });
 
+
         it('does not match inequal objects', () => {
             expect(
-                iface({ name: new StringType() }).equals(iface({ name: new IntegerType() }))
+                iface({ name: new StringType() }).isEqual(iface({ name: new IntegerType() }))
             ).to.be.false;
         });
+
+        it('works for recursive types', () => {
+            let linkListNode1 = iface({ name: StringType.instance }, 'LinkNode');
+            linkListNode1.addMember('next', {}, linkListNode1, SymbolTypeFlag.runtime);
+
+            let linkListNode2 = iface({ name: StringType.instance }, 'LinkNode');
+            linkListNode2.addMember('next', {}, linkListNode2, SymbolTypeFlag.runtime);
+
+            let compatData = {} as TypeCompatibilityData;
+            let typesAreEqual = linkListNode1.isEqual(linkListNode2, compatData);
+            expect(typesAreEqual).to.be.true;
+            expect(compatData?.fieldMismatches ?? []).to.be.empty;
+        });
     });
 
-    describe('isAssignableTo', () => {
-        it('rejects being assignable to other types', () => {
+    describe('isTypeCompatible', () => {
+        it('rejects being able to assign other types to this', () => {
             expect(
                 iface({
                     name: new StringType()
-                }).isAssignableTo(new IntegerType())
+                }).isTypeCompatible(new IntegerType())
             ).to.be.false;
         });
 
         it('matches exact properties', () => {
-            expectAssignable({
+            expectCompatible({
                 name: new StringType()
             }, {
                 name: new StringType()
@@ -73,7 +115,7 @@ describe('InterfaceType', () => {
         });
 
         it('matches an object with more properties being assigned to an object with less', () => {
-            expectAssignable({
+            expectCompatible({
                 name: new StringType()
             }, {
                 name: new StringType(),
@@ -82,7 +124,7 @@ describe('InterfaceType', () => {
         });
 
         it('rejects assigning an object with less properties to one with more', () => {
-            expectNotAssignable({
+            expectNotCompatible({
                 name: new StringType(),
                 age: new IntegerType()
             }, {
@@ -91,19 +133,21 @@ describe('InterfaceType', () => {
         });
 
         it('matches properties in mismatched order', () => {
-            expect(
-                new InterfaceType(new Map([
-                    ['name', new StringType()],
-                    ['age', new IntegerType()]
-                ])).isAssignableTo(new InterfaceType(new Map([
-                    ['age', new IntegerType()],
-                    ['name', new StringType()]
-                ])))
-            ).to.be.true;
+            const ifaceOne = iface({
+                name: new StringType(),
+                age: new IntegerType()
+            });
+            const ifaceTwo = iface({
+                age: new IntegerType(),
+                name: new StringType()
+            });
+
+            expect(ifaceOne.isTypeCompatible(ifaceTwo)).to.be.true;
+            expect(ifaceTwo.isTypeCompatible(ifaceOne)).to.be.true;
         });
 
         it('rejects with member having mismatched type', () => {
-            expectNotAssignable({
+            expectNotCompatible({
                 name: new StringType()
             }, {
                 name: new IntegerType()
@@ -111,7 +155,7 @@ describe('InterfaceType', () => {
         });
 
         it('rejects with object member having mismatched type', () => {
-            expectNotAssignable({
+            expectNotCompatible({
                 parent: iface({
                     name: new StringType()
                 })
@@ -123,7 +167,7 @@ describe('InterfaceType', () => {
         });
 
         it('rejects with object member having missing prop type', () => {
-            expectNotAssignable({
+            expectNotCompatible({
                 parent: iface({
                     name: new StringType(),
                     age: new IntegerType()
@@ -136,7 +180,7 @@ describe('InterfaceType', () => {
         });
 
         it('accepts with object member having same prop types', () => {
-            expectAssignable({
+            expectCompatible({
                 parent: iface({
                     name: new StringType(),
                     age: new IntegerType()
@@ -150,58 +194,76 @@ describe('InterfaceType', () => {
         });
 
         it('accepts with source member having dyanmic prop type', () => {
-            expectAssignable({
+            expectCompatible({
+                parent: new DynamicType()
+            }, {
                 parent: iface({
                     name: new StringType(),
                     age: new IntegerType()
                 })
-            }, {
-                parent: new DynamicType()
             });
         });
 
-        it('accepts with target member having dyanmic prop type', () => {
-            expectAssignable({
-                parent: new DynamicType()
-            }, {
+        it('accepts with target member having dynamic prop type', () => {
+            expectCompatible({
                 parent: iface({
                     name: new StringType(),
                     age: new IntegerType()
                 })
+            }, {
+                parent: new DynamicType()
             });
         });
 
         it('accepts with target member having "object" prop type', () => {
-            expectAssignable({
-                parent: new ObjectType()
-            }, {
+            expectCompatible({
                 parent: iface({
                     name: new StringType(),
                     age: new IntegerType()
                 })
+            }, {
+                parent: new ObjectType()
             });
         });
     });
 });
 
-function iface(members: Record<string, BscType>) {
-    return new InterfaceType(
-        objectToMap(members)
-    );
+let ifaceCount = 0;
+
+function iface(members: Record<string, BscType>, name?: string, parentType?: InterfaceType | ReferenceType) {
+    name = name ?? 'SomeIFace' + ifaceCount;
+    ifaceCount++;
+    const ifaceType = new InterfaceType(name, parentType);
+
+    for (const key in members) {
+        ifaceType.addMember(key, null, members[key], SymbolTypeFlag.runtime);
+    }
+    return ifaceType;
 }
 
-function expectAssignable(targetMembers: Record<string, BscType>, sourceMembers: Record<string, BscType>) {
+function expectCompatible(sourceMembers: Record<string, BscType>, targetMembers: Record<string, BscType>) {
     const targetIface = iface(targetMembers);
     const sourceIface = iface(sourceMembers);
-    if (!sourceIface.isAssignableTo(targetIface)) {
-        assert.fail(`expected type ${targetIface.toString()} to be assignable to type ${sourceIface.toString()}`);
+    if (!sourceIface.isTypeCompatible(targetIface)) {
+        assert.fail(`expected type ${(targetIface as any).toJSString()} to be assignable to type ${(sourceIface as any).toJSString()}`);
     }
 }
 
-function expectNotAssignable(targetMembers: Record<string, BscType>, sourceMembers: Record<string, BscType>) {
+function expectNotCompatible(sourceMembers: Record<string, BscType>, targetMembers: Record<string, BscType>) {
     const targetIface = iface(targetMembers);
     const sourceIface = iface(sourceMembers);
-    if (sourceIface.isAssignableTo(targetIface)) {
-        assert.fail(`expected type ${targetIface.toString()} to not be assignable to type ${sourceIface.toString()}`);
+    if (sourceIface.isTypeCompatible(targetIface)) {
+        assert.fail(`expected type ${(targetIface as any).toJSString()} to not be assignable to type ${(sourceIface as any).toJSString()}`);
+    }
+}
+
+function expectTypeCrossCompatible(source: BscType, target: BscType) {
+    let data = {};
+    if (!source.isTypeCompatible(target, data)) {
+        assert.fail(typeCompatibilityMessage(target.toString(), source.toString(), data));
+    }
+    data = {};
+    if (!target.isTypeCompatible(source, data)) {
+        assert.fail(typeCompatibilityMessage(source.toString(), target.toString(), data));
     }
 }
diff --git a/src/types/InterfaceType.ts b/src/types/InterfaceType.ts
index 0422a9eb7..e94affc0f 100644
--- a/src/types/InterfaceType.ts
+++ b/src/types/InterfaceType.ts
@@ -1,81 +1,45 @@
-import { isDynamicType, isInterfaceType, isObjectType } from '../astUtils/reflection';
+import type { TypeCompatibilityData } from '../interfaces';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { isCallFuncableTypeLike, isDynamicType, isInterfaceType, isInvalidType, isObjectType } from '../astUtils/reflection';
 import type { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isUnionTypeCompatible } from './helpers';
+import type { ReferenceType } from './ReferenceType';
+import { CallFuncableType } from './CallFuncableType';
 
-export class InterfaceType implements BscType {
+export class InterfaceType extends CallFuncableType {
     public constructor(
-        public members: Map<string, BscType>
+        public name: string,
+        public readonly superInterface?: InterfaceType | ReferenceType
     ) {
-
+        super(name, superInterface);
     }
 
-    /**
-     * The name of the interface. Can be undefined.
-     */
-    public name: string | undefined;
-
-    public isAssignableTo(targetType: BscType) {
-        //we must have all of the members of the target type, and they must be equivalent types
-        if (isInterfaceType(targetType)) {
-            for (const [targetMemberName, targetMemberType] of targetType.members) {
-                const ourMemberType = this.members.get(targetMemberName);
-                //we don't have the target member
-                if (!ourMemberType) {
-                    return false;
-                }
-                //our member's type is not assignable to the target member type
-                if (!ourMemberType.isAssignableTo(targetMemberType)) {
-                    return false;
-                }
-            }
-            //we have all of the target member's types. we are assignable!
-            return true;
+    public readonly kind = BscTypeKind.InterfaceType;
 
-            //we are always assignable to dynamic or object
-        } else if (isDynamicType(targetType) || isObjectType(targetType)) {
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        if (isInvalidType(targetType) ||
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data)) {
             return true;
-
-            //not assignable to any other object types
-        } else {
-            return false;
-        }
-    }
-
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
-    }
-
-    public toString() {
-        let result = '{';
-        for (const [key, type] of this.members.entries()) {
-            result += ' ' + key + ': ' + type.toString() + ';';
         }
-        if (this.members.size > 0) {
-            result += ' ';
+        if (isCallFuncableTypeLike(targetType)) {
+            return this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data) &&
+                this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data, this.callFuncMemberTable, targetType.callFuncMemberTable);
         }
-        return result + '}';
-    }
-
-    public toTypeString(): string {
-        return 'object';
-    }
 
-    public equals(targetType: BscType): boolean {
-        if (isInterfaceType(targetType)) {
-            if (targetType.members.size !== this.members.size) {
-                return false;
-            }
-            return targetType.isAssignableTo(this);
+        const ancestorTypes = this.getAncestorTypeList();
+        if (ancestorTypes?.find(ancestorType => ancestorType.isEqual(targetType))) {
+            return true;
         }
-        return false;
+        return this.checkCompatibilityBasedOnMembers(targetType, SymbolTypeFlag.runtime, data);
     }
 
-    public clone() {
-        let members = new Map<string, BscType>();
-        for (const [key, member] of this.members) {
-            members.set(key, member?.clone());
-        }
-        const result = new InterfaceType(members);
-        result.name = this.name;
-        return result;
+    /**
+     *  Is this the exact same interface as the target?
+     */
+    isEqual(targetType: BscType, data?: TypeCompatibilityData): boolean {
+        return isInterfaceType(targetType) && super.isEqual(targetType, data);
     }
 }
diff --git a/src/types/IntersectionType.spec.ts b/src/types/IntersectionType.spec.ts
new file mode 100644
index 000000000..ccdd52a83
--- /dev/null
+++ b/src/types/IntersectionType.spec.ts
@@ -0,0 +1,189 @@
+import { expect } from 'chai';
+import { StringType } from './StringType';
+import { IntegerType } from './IntegerType';
+import { IntersectionType } from './IntersectionType';
+import { FloatType } from './FloatType';
+import { InterfaceType } from './InterfaceType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { BooleanType } from './BooleanType';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { SymbolTable } from '../SymbolTable';
+import { ReferenceType } from './ReferenceType';
+
+
+describe('IntersectionType', () => {
+
+    it('has all the members of all types', () => {
+        const iFace = new InterfaceType('Iface');
+        iFace.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        iFace.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        const iFace2 = new InterfaceType('Iface2');
+        iFace2.addMember('age', null, FloatType.instance, SymbolTypeFlag.runtime);
+        const addressInterfaceType = new InterfaceType('address');
+        iFace2.addMember('address', null, addressInterfaceType, SymbolTypeFlag.runtime);
+        iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+        const myIntersection = new IntersectionType([iFace, iFace2]);
+        const ageType = myIntersection.getMemberType('age', { flags: SymbolTypeFlag.runtime });
+        const addressType = myIntersection.getMemberType('address', { flags: SymbolTypeFlag.runtime });
+        const nameType = myIntersection.getMemberType('name', { flags: SymbolTypeFlag.runtime });
+
+        expectTypeToBe(nameType, StringType);
+
+        expectTypeToBe(addressType, InterfaceType);
+        expect(addressType).to.equal(addressInterfaceType);
+
+        expectTypeToBe(ageType, IntersectionType);
+        expect((ageType as IntersectionType).types.length).to.eq(2);
+        expect((ageType as IntersectionType).types).to.include(FloatType.instance);
+        expect((ageType as IntersectionType).types).to.include(IntegerType.instance);
+    });
+
+    it('can assign to a more specific Intersection', () => {
+        const myInter = new IntersectionType([StringType.instance, FloatType.instance]);
+        const otherInter = new IntersectionType([FloatType.instance, StringType.instance, BooleanType.instance]);
+
+        expect(myInter.isTypeCompatible(otherInter)).to.be.true;
+        expect(otherInter.isTypeCompatible(myInter)).to.be.false;
+    });
+
+
+    it('will get a string representation in order given', () => {
+        const iFace1 = new InterfaceType('SomeIface');
+        iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        iFace1.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+        const myInter = new IntersectionType([FloatType.instance, StringType.instance, BooleanType.instance, iFace1]);
+
+        expect(myInter.toString()).to.eq('float and string and boolean and SomeIface');
+    });
+
+    it('isResolvable if any inner type is resolvable', () => {
+        const refTable = new SymbolTable('test');
+        const refType = new ReferenceType('SomeType', 'SomeType', SymbolTypeFlag.typetime, () => refTable);
+        const myInter1 = new IntersectionType([refType, StringType.instance]);
+        expect(myInter1.isResolvable()).to.be.true;
+
+        const myInter2 = new IntersectionType([refType]);
+        expect(myInter2.isResolvable()).to.be.false;
+    });
+
+    it('inner type order does not affect equality', () => {
+        const inter1 = new IntersectionType([StringType.instance, IntegerType.instance, FloatType.instance]);
+        const inter2 = new IntersectionType([FloatType.instance, StringType.instance, IntegerType.instance]);
+        expect(inter1.isEqual(inter2)).to.be.true;
+    });
+
+    it('more specific intersections are compatible with less specific ones', () => {
+        const inter1 = new IntersectionType([StringType.instance, BooleanType.instance, FloatType.instance]);
+        const inter2 = new IntersectionType([FloatType.instance, BooleanType.instance]);
+        expect(inter1.isTypeCompatible(inter2)).to.be.false;
+        expect(inter2.isTypeCompatible(inter1)).to.be.true;
+    });
+
+
+    it('more specific member interface is compatible with less specific ones', () => {
+        const iFace1 = new InterfaceType('iFace1');
+        iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+        const iFace2 = new InterfaceType('iFace2');
+        iFace2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        iFace2.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+        const inter1 = new IntersectionType([iFace1, StringType.instance]);
+        const inter2 = new IntersectionType([iFace2, StringType.instance]);
+        expect(inter2.isTypeCompatible(inter1)).to.be.false;
+        expect(inter1.isTypeCompatible(inter2)).to.be.true;
+    });
+
+
+    it('interface is compatible with intersection with common members and vice versa', () => {
+        const iFace1 = new InterfaceType('iFace1');
+        iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+        const iFace2 = new InterfaceType('iFace2');
+        iFace2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+
+        const iFace3 = new InterfaceType('iFace3');
+        iFace3.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+        const inter = new IntersectionType([iFace2, iFace3]);
+        expect(iFace1.isTypeCompatible(inter)).to.be.true;
+        expect(inter.isTypeCompatible(iFace1)).to.be.true;
+    });
+
+    it('is not compatible when it must satisfy conflicting member types', () => {
+        const iFace1 = new InterfaceType('iFace1');
+        iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+
+        const iFace2 = new InterfaceType('iFace2');
+        iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+        const inter = new IntersectionType([iFace1, iFace2]);
+
+        const iFace3 = new InterfaceType('iFace3');
+        iFace3.addMember('age', null, BooleanType.instance, SymbolTypeFlag.runtime);
+        iFace3.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+        expect(inter.isTypeCompatible(iFace3)).to.be.false;
+        expect(iFace3.isTypeCompatible(inter)).to.be.false;
+    });
+
+
+    describe('getMemberType', () => {
+        it('will find the intersection of inner types', () => {
+            const iFace1 = new InterfaceType('iFace1');
+            iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+            const iFace2 = new InterfaceType('iFace2');
+            iFace2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('height', null, StringType.instance, SymbolTypeFlag.runtime);
+
+            const myInter = new IntersectionType([iFace1, iFace2]);
+
+            const options = { flags: SymbolTypeFlag.runtime };
+            const ageType = myInter.getMemberType('age', options);
+            expectTypeToBe(ageType, IntegerType);
+            const nameType = myInter.getMemberType('name', options);
+            expectTypeToBe(nameType, StringType);
+            const heightType = myInter.getMemberType('height', options);
+            expectTypeToBe(heightType, IntersectionType);
+            const heightTypes = (heightType as IntersectionType).types;
+            expect(heightTypes).to.include(FloatType.instance);
+            expect(heightTypes).to.include(StringType.instance);
+        });
+
+
+        it('will not return reference types if at least one inner type includes the member', () => {
+            const iFace1 = new InterfaceType('iFace1');
+            iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+            const iFace2 = new InterfaceType('iFace2');
+            iFace2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+            const myInter = new IntersectionType([iFace1, iFace2]);
+            const options = { flags: SymbolTypeFlag.runtime };
+            const heightType1 = myInter.getMemberType('height', options);
+            expectTypeToBe(heightType1, FloatType);
+
+            // adding new member to iFace2, result will be intersection
+            iFace2.addMember('height', null, BooleanType.instance, SymbolTypeFlag.runtime);
+            const heightType2 = myInter.getMemberType('height', options);
+            expectTypeToBe(heightType2, IntersectionType);
+            const heightTypes2 = (heightType2 as IntersectionType).types;
+            expect(heightTypes2.length).to.eq(2);
+            expectTypeToBe(heightTypes2[0], FloatType);
+            expectTypeToBe(heightTypes2[1], BooleanType);
+        });
+    });
+
+});
diff --git a/src/types/IntersectionType.ts b/src/types/IntersectionType.ts
new file mode 100644
index 000000000..9498aedaf
--- /dev/null
+++ b/src/types/IntersectionType.ts
@@ -0,0 +1,282 @@
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
+import { isDynamicType, isIntersectionType, isObjectType, isTypedFunctionType, isTypeStatementType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { ReferenceTypeWithDefault, ReferenceType } from './ReferenceType';
+import { addAssociatedTypesTableAsSiblingToMemberTable, getAllTypesFromCompoundType, isEnumTypeCompatible, isTypeWithPotentialDefaultDynamicMember, joinTypesString, reduceTypesForIntersectionType } from './helpers';
+import { BscTypeKind } from './BscTypeKind';
+import type { TypeCacheEntry } from '../SymbolTable';
+import { SymbolTable } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import { util } from '../util';
+import { DynamicType } from './DynamicType';
+
+export function intersectionTypeFactory(types: BscType[]) {
+    return new IntersectionType(types);
+}
+
+export class IntersectionType extends BscType {
+    constructor(
+        public types: BscType[]
+    ) {
+        super(joinTypesString(types, 'and', BscTypeKind.IntersectionType));
+        this.callFuncAssociatedTypesTable = new SymbolTable(`Intersection: CallFuncAssociatedTypes`);
+    }
+
+    public readonly kind = BscTypeKind.IntersectionType;
+
+    public readonly callFuncAssociatedTypesTable: SymbolTable;
+
+    public addType(type: BscType) {
+        this.types.push(type);
+    }
+
+    isResolvable(): boolean {
+        for (const type of this.types) {
+            // resolvable if any inner type is resolvable
+            if (type.isResolvable()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private getMemberTypeFromInnerTypes(name: string, options: GetTypeOptions): BscType {
+        const typeFromMembers = this.types.map((innerType) => {
+            return innerType?.getMemberType(name, { ...options, ignoreDefaultDynamicMembers: true });
+        });
+        let filteredTypes = reduceTypesForIntersectionType(typeFromMembers.map(t => t).filter(t => t !== undefined));
+
+        if (filteredTypes.length === 0 && this.types.some(isTypeWithPotentialDefaultDynamicMember)) {
+            const typesFromMembersWithDynamicAA = this.types.map((innerType) => {
+                return innerType?.getMemberType(name, options);
+            });
+            filteredTypes = reduceTypesForIntersectionType(typesFromMembersWithDynamicAA.map(t => t).filter(t => t !== undefined));
+        }
+        if (filteredTypes.length === 0) {
+            return undefined;
+        } else if (filteredTypes.length === 1) {
+            return filteredTypes[0];
+        }
+        return new IntersectionType(filteredTypes);
+    }
+
+    private getCallFuncFromInnerTypes(name: string, options: GetTypeOptions): BscType {
+        const typeFromMembers = reduceTypesForIntersectionType(this.types.map((innerType) => innerType?.getCallFuncType(name, options)).filter(t => t !== undefined));
+
+        if (typeFromMembers.length === 0) {
+            return undefined;
+        } else if (typeFromMembers.length === 1) {
+            return typeFromMembers[0];
+        }
+        return new IntersectionType(typeFromMembers);
+    }
+
+    getMemberType(name: string, options: GetTypeOptions) {
+        const innerTypesMemberType = this.getMemberTypeFromInnerTypes(name, options);
+        if (!innerTypesMemberType) {
+            // We don't have any members of any inner types that match
+            // so instead, create reference type that will
+            return new ReferenceType(name, name, options.flags, () => {
+                return {
+                    name: `IntersectionType MemberTable: '${this.__identifier}'`,
+                    getSymbolType: (innerName: string, innerOptions: GetTypeOptions) => {
+                        const referenceTypeInnerMemberTypes = this.getMemberTypeFromInnerTypes(name, options);
+                        if (!referenceTypeInnerMemberTypes) {
+                            if (this.hasMemberTypeWithDefaultDynamicMember && !innerOptions.ignoreDefaultDynamicMembers) {
+                                return DynamicType.instance;
+                            }
+                            return undefined;
+                        }
+                        return referenceTypeInnerMemberTypes;
+                    },
+                    setCachedType: (innerName: string, innerCacheEntry: TypeCacheEntry, innerOptions: GetTypeOptions) => {
+                        // TODO: is this even cachable? This is a NO-OP for now, and it shouldn't hurt anything
+                    },
+                    addSibling: (symbolTable: SymbolTable) => {
+                        // TODO: I don't know what this means in this context?
+                    }
+                };
+            });
+        }
+        if (!innerTypesMemberType?.isResolvable()) {
+            const shouldCreateDynamicAAMember = this.hasMemberTypeWithDefaultDynamicMember && !options.ignoreDefaultDynamicMembers;
+            if (shouldCreateDynamicAAMember) {
+                return new ReferenceTypeWithDefault(innerTypesMemberType, DynamicType.instance);
+            }
+        }
+        return innerTypesMemberType;
+    }
+
+    getCallFuncType(name: string, options: GetTypeOptions) {
+        const resultCallFuncType = this.getCallFuncFromInnerTypes(name, options);
+        if (!resultCallFuncType) {
+            // We don't have any members of any inner types that match
+            // so instead, create reference type that will
+            return new ReferenceType(name, name, options.flags, () => {
+                return {
+                    name: `IntersectionType CallFunc MemberTable: '${this.__identifier}'`,
+                    getSymbolType: (innerName: string, innerOptions: GetTypeOptions) => {
+                        const referenceTypeInnerMemberType = this.getCallFuncFromInnerTypes(name, options);
+                        if (!referenceTypeInnerMemberType) {
+                            if (this.hasMemberTypeWithDefaultDynamicMember && !innerOptions.ignoreDefaultDynamicMembers) {
+                                return DynamicType.instance;
+                            }
+                        }
+                        return referenceTypeInnerMemberType;
+                    },
+                    setCachedType: (innerName: string, innerCacheEntry: TypeCacheEntry, innerOptions: GetTypeOptions) => {
+                        // TODO: is this even cachable? This is a NO-OP for now, and it shouldn't hurt anything
+                    },
+                    addSibling: (symbolTable: SymbolTable) => {
+                        // TODO: I don't know what this means in this context?
+                    }
+                };
+            });
+        }
+
+        if (!resultCallFuncType?.isResolvable()) {
+            const shouldCreateDynamicAAMember = this.hasMemberTypeWithDefaultDynamicMember && !options.ignoreDefaultDynamicMembers;
+            if (shouldCreateDynamicAAMember) {
+                return new ReferenceTypeWithDefault(resultCallFuncType, DynamicType.instance);
+            }
+        }
+
+        if (isTypedFunctionType(resultCallFuncType)) {
+            const typesToCheck = [...resultCallFuncType.params.map(p => p.type), resultCallFuncType.returnType];
+
+            for (const type of typesToCheck) {
+                addAssociatedTypesTableAsSiblingToMemberTable(type, this.callFuncAssociatedTypesTable, SymbolTypeFlag.runtime);
+            }
+        }
+        return resultCallFuncType;
+    }
+
+    get returnType() {
+        return util.getReturnTypeOfIntersectionOfFunctions(this);
+    }
+
+
+    isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean {
+        while (isTypeStatementType(targetType)) {
+            targetType = targetType.wrappedType;
+        }
+        if (isDynamicType(targetType) || isObjectType(targetType) || this === targetType) {
+            return true;
+        }
+        if (isEnumTypeCompatible(this, targetType, data)) {
+            return true;
+        }
+        if (isIntersectionType(targetType)) {
+            // check if this all the types of this type are in the target (eg, target is a super set of this types)
+            let allMembersSatisfied = true;
+            for (const memberType of this.types) {
+                let foundCompatibleInnerType = false;
+                for (const targetInnerType of targetType.types) {
+                    if (memberType.isTypeCompatible(targetInnerType, data)) {
+                        foundCompatibleInnerType = true;
+                        break;
+                    }
+                }
+                if (!foundCompatibleInnerType) {
+                    allMembersSatisfied = false;
+                }
+            }
+            return allMembersSatisfied;
+        }
+        let foundCompatibleInnerType = true;
+        for (const innerType of this.types) {
+            if (!innerType.isTypeCompatible(targetType, data)) {
+                foundCompatibleInnerType = false;
+            }
+        }
+
+        return foundCompatibleInnerType;
+    }
+    toString(): string {
+        return joinTypesString(this.types, 'and', BscTypeKind.IntersectionType);
+    }
+
+    /**
+     * Used for transpilation
+     */
+    toTypeString(): string {
+        const uniqueTypeStrings = new Set<string>(getAllTypesFromCompoundType(this).map(t => t.toTypeString()));
+
+        if (uniqueTypeStrings.size === 1) {
+            return uniqueTypeStrings.values().next().value;
+        }
+        return 'dynamic';
+    }
+
+    checkAllMemberTypes(predicate: (BscType) => boolean) {
+        return this.types.reduce((acc, type) => {
+            return acc && predicate(type);
+        }, true);
+    }
+
+    isEqual(targetType: BscType): boolean {
+        if (!isIntersectionType(targetType)) {
+            return false;
+        }
+        if (this === targetType) {
+            return true;
+        }
+        for (const type of this.types) {
+            let foundMatch = false;
+            for (const targetTypeInner of targetType.types) {
+                if (type.isEqual(targetTypeInner)) {
+                    foundMatch = true;
+                    break;
+                }
+            }
+            if (!foundMatch) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    getMemberTable(): SymbolTable {
+        const intersectionTable = new SymbolTable(this.__identifier + ' IntersectionTable');
+
+        for (const type of this.types) {
+            type.addBuiltInInterfaces();
+            for (const symbol of type.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime)) {
+                const foundType = this.getMemberTypeFromInnerTypes(symbol.name, { flags: SymbolTypeFlag.runtime });
+                intersectionTable.addSymbol(symbol.name, {}, foundType, SymbolTypeFlag.runtime);
+            }
+        }
+        const firstType = this.types[0];
+        if (!firstType) {
+            return intersectionTable;
+        }
+        firstType.addBuiltInInterfaces();
+        for (const symbol of firstType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime)) {
+            const foundType = this.getMemberTypeFromInnerTypes(symbol.name, { flags: SymbolTypeFlag.runtime });
+            intersectionTable.addSymbol(symbol.name, {}, foundType, SymbolTypeFlag.runtime);
+        }
+        return intersectionTable;
+    }
+
+
+    private _hasMemberTypeWithDefaultDynamicMember: boolean = undefined;
+    get hasMemberTypeWithDefaultDynamicMember(): boolean {
+        if (this._hasMemberTypeWithDefaultDynamicMember !== undefined) {
+            return this._hasMemberTypeWithDefaultDynamicMember;
+        }
+        this._hasMemberTypeWithDefaultDynamicMember = false;
+
+        for (const type of this.types) {
+            if (isTypeWithPotentialDefaultDynamicMember(type)) {
+                this._hasMemberTypeWithDefaultDynamicMember = true;
+                break;
+            }
+        }
+        return this._hasMemberTypeWithDefaultDynamicMember;
+    }
+}
+
+BuiltInInterfaceAdder.intersectionTypeFactory = (types: BscType[]) => {
+    return new IntersectionType(types);
+};
diff --git a/src/types/InvalidType.spec.ts b/src/types/InvalidType.spec.ts
index aea20cb0b..968f5cdcc 100644
--- a/src/types/InvalidType.spec.ts
+++ b/src/types/InvalidType.spec.ts
@@ -4,8 +4,13 @@ import { DynamicType } from './DynamicType';
 import { InvalidType } from './InvalidType';
 
 describe('InvalidType', () => {
-    it('is equivalent to invalid types', () => {
-        expect(new InvalidType().isAssignableTo(new InvalidType())).to.be.true;
-        expect(new InvalidType().isAssignableTo(new DynamicType())).to.be.true;
+    it('is compatible to invalid types', () => {
+        expect(new InvalidType().isTypeCompatible(new InvalidType())).to.be.true;
+        expect(new InvalidType().isTypeCompatible(new DynamicType())).to.be.true;
+    });
+
+    it('is equal to invalid types', () => {
+        expect(new InvalidType().isEqual(new InvalidType())).to.be.true;
+        expect(new InvalidType().isEqual(new DynamicType())).to.be.false;
     });
 });
diff --git a/src/types/InvalidType.ts b/src/types/InvalidType.ts
index 842cff597..bd0d6f78d 100644
--- a/src/types/InvalidType.ts
+++ b/src/types/InvalidType.ts
@@ -1,22 +1,31 @@
-import type { BscType } from './BscType';
-import { DynamicType } from './DynamicType';
+import { isDynamicType, isInvalidTypeLike, isObjectType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
 
-export class InvalidType implements BscType {
+export class InvalidType extends BscType {
     constructor(
         public typeText?: string
-    ) { }
+    ) {
+        super();
+    }
+
+    public readonly kind = BscTypeKind.InvalidType;
+
+    public static instance = new InvalidType('invalid');
+
+    public isBuiltIn = true;
 
-    public isAssignableTo(targetType: BscType) {
+    public isTypeCompatible(targetType: BscType) {
         return (
-            targetType instanceof InvalidType ||
-            targetType instanceof DynamicType
+            isInvalidTypeLike(targetType) ||
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType)
         );
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
-    }
-
     public toString() {
         return this.typeText ?? 'invalid';
     }
@@ -25,7 +34,9 @@ export class InvalidType implements BscType {
         return this.toString();
     }
 
-    public clone() {
-        return new InvalidType(this.typeText);
+    isEqual(targetType: BscType): boolean {
+        return isInvalidTypeLike(targetType);
     }
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('invalid', InvalidType.instance);
diff --git a/src/types/LongIntegerType.spec.ts b/src/types/LongIntegerType.spec.ts
index 974ecc214..eb2e12340 100644
--- a/src/types/LongIntegerType.spec.ts
+++ b/src/types/LongIntegerType.spec.ts
@@ -1,11 +1,19 @@
 import { expect } from '../chai-config.spec';
 
 import { DynamicType } from './DynamicType';
+import { FloatType } from './FloatType';
 import { LongIntegerType } from './LongIntegerType';
 
 describe('LongIntegerType', () => {
-    it('is equivalent to other long integer types', () => {
-        expect(new LongIntegerType().isAssignableTo(new LongIntegerType())).to.be.true;
-        expect(new LongIntegerType().isAssignableTo(new DynamicType())).to.be.true;
+    it('is equal to other longinteger types', () => {
+        expect(new LongIntegerType().isEqual(new LongIntegerType())).to.be.true;
+        expect(new LongIntegerType().isEqual(new DynamicType())).to.be.false;
     });
+
+    it('is compatible with to other integer types', () => {
+        expect(new LongIntegerType().isTypeCompatible(new LongIntegerType())).to.be.true;
+        expect(new LongIntegerType().isTypeCompatible(new FloatType())).to.be.true;
+        expect(new LongIntegerType().isTypeCompatible(new DynamicType())).to.be.true;
+    });
+
 });
diff --git a/src/types/LongIntegerType.ts b/src/types/LongIntegerType.ts
index f104102cf..481405d53 100644
--- a/src/types/LongIntegerType.ts
+++ b/src/types/LongIntegerType.ts
@@ -1,44 +1,41 @@
-import type { BscType } from './BscType';
-import { DoubleType } from './DoubleType';
-import { DynamicType } from './DynamicType';
-import { FloatType } from './FloatType';
-import { IntegerType } from './IntegerType';
-
-export class LongIntegerType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
-
-    public isAssignableTo(targetType: BscType) {
+import { isDynamicType, isLongIntegerTypeLike, isNumberTypeLike, isObjectType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isEnumTypeCompatible, isNativeInterfaceCompatibleNumber, isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
+
+export class LongIntegerType extends BscType {
+    public readonly kind = BscTypeKind.LongIntegerType;
+
+    public static instance = new LongIntegerType();
+
+    public isBuiltIn = true;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         return (
-            targetType instanceof LongIntegerType ||
-            targetType instanceof DynamicType
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isNumberTypeLike(targetType) ||
+            isUnionTypeCompatible(this, targetType, data) ||
+            isEnumTypeCompatible(this, targetType, data) ||
+            isNativeInterfaceCompatibleNumber(this, targetType, data)
         );
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        if (
-            targetType instanceof DynamicType ||
-            targetType instanceof IntegerType ||
-            targetType instanceof FloatType ||
-            targetType instanceof DoubleType ||
-            targetType instanceof LongIntegerType
-        ) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     public toString() {
-        return this.typeText ?? 'longinteger';
+        return 'longinteger';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new LongIntegerType(this.typeText);
+    isEqual(targetType: BscType): boolean {
+        return isLongIntegerTypeLike(targetType);
     }
+
+    readonly binaryOpPriorityLevel = 3;
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('longinteger', LongIntegerType.instance);
diff --git a/src/types/NamespaceType.ts b/src/types/NamespaceType.ts
new file mode 100644
index 000000000..91337a307
--- /dev/null
+++ b/src/types/NamespaceType.ts
@@ -0,0 +1,32 @@
+import { isNamespaceType } from '../astUtils/reflection';
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+
+export class NamespaceType extends BscType {
+
+    constructor(public name: string) {
+        super(name);
+    }
+
+    public readonly kind = BscTypeKind.NamespaceType;
+
+    public toString() {
+        return this.name;
+    }
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        return this.isEqual(targetType);
+    }
+
+
+    getMemberType(name: string, options: GetTypeOptions) {
+        const fullName = this.toString() + '.' + name;
+        return super.getMemberType(name, { ...options, fullName: fullName, tableProvider: () => this.memberTable });
+    }
+
+    isEqual(targetType: BscType): boolean {
+        return isNamespaceType(targetType) && targetType.name === this.name;
+    }
+
+}
diff --git a/src/types/ObjectType.spec.ts b/src/types/ObjectType.spec.ts
index cff94e67a..9ca334b8b 100644
--- a/src/types/ObjectType.spec.ts
+++ b/src/types/ObjectType.spec.ts
@@ -5,7 +5,7 @@ import { ObjectType } from './ObjectType';
 
 describe('ObjectType', () => {
     it('is equivalent to other object types', () => {
-        expect(new ObjectType().isAssignableTo(new ObjectType())).to.be.true;
-        expect(new ObjectType().isAssignableTo(new DynamicType())).to.be.true;
+        expect(new ObjectType().isTypeCompatible(new ObjectType())).to.be.true;
+        expect(new ObjectType().isTypeCompatible(new DynamicType())).to.be.true;
     });
 });
diff --git a/src/types/ObjectType.ts b/src/types/ObjectType.ts
index 4f0d7e242..39a715de6 100644
--- a/src/types/ObjectType.ts
+++ b/src/types/ObjectType.ts
@@ -1,31 +1,47 @@
-import type { BscType } from './BscType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { isObjectType } from '../astUtils/reflection';
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
 import { DynamicType } from './DynamicType';
 
-export class ObjectType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
+export class ObjectType extends BscType {
 
-    public isAssignableTo(targetType: BscType) {
-        return (
-            targetType instanceof ObjectType ||
-            targetType instanceof DynamicType
-        );
-    }
+    public readonly kind = BscTypeKind.ObjectType;
+
+    public isBuiltIn = true;
 
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        //Brightscript allows anything passed "as object", so as long as a type is provided, this is true
+        return !!targetType;
     }
 
+    public static instance = new ObjectType();
+
     public toString() {
-        return this.typeText ?? 'object';
+        return 'object';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new ObjectType(this.typeText);
+    getMemberType(name: string, options: GetTypeOptions) {
+        if (options.ignoreDefaultDynamicMembers) {
+            return undefined;
+        }
+        return DynamicType.instance;
+    }
+
+    isEqual(otherType: BscType) {
+        return isObjectType(otherType) && this.checkCompatibilityBasedOnMembers(otherType, SymbolTypeFlag.runtime);
+    }
+
+    get returnType() {
+        return DynamicType.instance;
     }
 }
+
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('object', ObjectType.instance);
diff --git a/src/types/ReferenceType.spec.ts b/src/types/ReferenceType.spec.ts
new file mode 100644
index 000000000..91f19dd3a
--- /dev/null
+++ b/src/types/ReferenceType.spec.ts
@@ -0,0 +1,180 @@
+import { expect } from 'chai';
+import { SymbolTable } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { DynamicType } from './DynamicType';
+import { IntegerType } from './IntegerType';
+import { TypePropertyReferenceType, ReferenceType, BinaryOperatorReferenceType, ArrayDefaultTypeReferenceType } from './ReferenceType';
+import { StringType } from './StringType';
+import { FloatType } from './FloatType';
+import { ClassType } from './ClassType';
+import { isTypePropertyReferenceType, isReferenceType } from '../astUtils/reflection';
+import { TypedFunctionType } from './TypedFunctionType';
+import { NamespaceType } from './NamespaceType';
+import { createToken } from '../astUtils/creators';
+import { TokenKind } from '../lexer/TokenKind';
+import { util } from '../util';
+import { ArrayType } from './ArrayType';
+
+const runtimeFlag = SymbolTypeFlag.runtime;
+
+describe('ReferenceType', () => {
+    it('can be checked with reflection', () => {
+        const table = new SymbolTable('test');
+        const ref = new ReferenceType('someVar', 'someVar', runtimeFlag, () => table);
+        expect(isReferenceType(ref)).to.be.true;
+    });
+
+
+    it('defaults to dynamic type if it can not resolve', () => {
+        expectTypeToBe(new ReferenceType('test', 'test', runtimeFlag, () => undefined), DynamicType);
+        const table = new SymbolTable('testTable');
+        expectTypeToBe(new ReferenceType('test', 'test', runtimeFlag, () => table), DynamicType);
+        table.addSymbol('someVar', null, StringType.instance, SymbolTypeFlag.runtime);
+        expectTypeToBe(new ReferenceType('test', 'test', runtimeFlag, () => table), DynamicType);
+    });
+
+    it('can resolve based on a symbol table', () => {
+        const table = new SymbolTable('test');
+        const ref = new ReferenceType('someVar', 'someVar', runtimeFlag, () => table);
+        table.addSymbol('someVar', null, StringType.instance, SymbolTypeFlag.runtime);
+        expectTypeToBe(ref, StringType);
+    });
+
+    it('resolves before checking assigning and convertible', () => {
+        const table = new SymbolTable('test');
+        const ref = new ReferenceType('someVar', 'someVar', runtimeFlag, () => table);
+        table.addSymbol('someVar', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        expect(ref.isTypeCompatible(FloatType.instance)).to.be.true;
+    });
+
+    it('resolves before stringifying', () => {
+        const table = new SymbolTable('test');
+        const ref = new ReferenceType('someKlass', 'someKlass', runtimeFlag, () => table);
+        table.addSymbol('someKlass', null, new ClassType('SomeKlass'), SymbolTypeFlag.runtime);
+        expect(ref.toString()).to.eq('SomeKlass');
+    });
+
+    describe('circular references', () => {
+        it('catches circular references', () => {
+            const table = new SymbolTable('test');
+            const ref = new ReferenceType('someVar', 'someVar', runtimeFlag, () => table);
+            table.addSymbol('someVar', null, ref, SymbolTypeFlag.runtime);
+            expectTypeToBe(ref, DynamicType);
+        });
+
+
+        it('catches circular references of many levels', () => {
+            const table = new SymbolTable('test');
+            const ref1 = new ReferenceType('someVar1', 'someVar1', runtimeFlag, () => table);
+            const ref2 = new ReferenceType('someVar2', 'someVar2', runtimeFlag, () => table);
+            const ref3 = new ReferenceType('someVar3', 'someVar3', runtimeFlag, () => table);
+            table.addSymbol('someVar0', null, ref1, SymbolTypeFlag.runtime);
+            table.addSymbol('someVar1', null, ref2, SymbolTypeFlag.runtime);
+            table.addSymbol('someVar2', null, ref3, SymbolTypeFlag.runtime);
+            table.addSymbol('someVar3', null, ref1, SymbolTypeFlag.runtime);
+            expectTypeToBe(table.getSymbol('someVar0', SymbolTypeFlag.runtime)[0].type, DynamicType);
+        });
+
+        it('catches circular references in a binary expression', () => {
+            const table = new SymbolTable('test');
+            const ref = new ReferenceType('notHere', 'notHere', runtimeFlag, () => table);
+            const binRef = new BinaryOperatorReferenceType(ref, createToken(TokenKind.Plus), StringType.instance, (l, o, r) => {
+                return util.binaryOperatorResultType(l, o, r);
+            });
+            const binRef2 = new BinaryOperatorReferenceType(ref, createToken(TokenKind.Plus), binRef, (l, o, r) => {
+                return util.binaryOperatorResultType(l, o, r);
+            });
+            table.addSymbol('notHere', null, binRef2, SymbolTypeFlag.runtime);
+            expectTypeToBe(table.getSymbolType('notHere', { flags: SymbolTypeFlag.runtime }), DynamicType);
+        });
+    });
+
+});
+
+describe('PropertyReferenceType', () => {
+
+    it('can be checked with reflection', () => {
+        const func = new TypedFunctionType(StringType.instance);
+        const propRef = new TypePropertyReferenceType(func, 'returnType');
+        expect(isTypePropertyReferenceType(propRef)).to.be.true;
+    });
+
+    it('can resolve a FunctionType.returnType', () => {
+        const func = new TypedFunctionType(StringType.instance);
+        const propRef = new TypePropertyReferenceType(func, 'returnType');
+        expectTypeToBe(propRef, StringType);
+    });
+
+
+    it('can resolve a property on a ReferenceType', () => {
+        const table = new SymbolTable('test');
+        const ref = new ReferenceType('someFunc', 'someFunc', runtimeFlag, () => table);
+        const propRef = new TypePropertyReferenceType(ref, 'returnType');
+        // `ref` will resolve to DynamicType, and its returnType is DynamicType.Instance
+        expectTypeToBe(propRef, DynamicType);
+        // Set ref to resolve to a function
+        table.addSymbol('someFunc', null, new TypedFunctionType(IntegerType.instance), SymbolTypeFlag.runtime);
+        expectTypeToBe(propRef, IntegerType);
+    });
+
+    it('resolves members of a property on a ReferenceType', () => {
+        const table = new SymbolTable('test');
+        const fnRef = new ReferenceType('someFunc', 'someFunc', runtimeFlag, () => table);
+        const returnRef = new TypePropertyReferenceType(fnRef, 'returnType');
+        const returnPropRef = returnRef.getMemberType('myNum', { flags: SymbolTypeFlag.runtime });
+        // `ref` will resolve to DynamicType, and its returnType is DynamicType.Instance
+        expectTypeToBe(returnPropRef, DynamicType);
+
+        // Set fnRef to resolve to a function that returns a complex type
+        const klassType = new ClassType('Klass');
+        klassType.addMember('myNum', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        table.addSymbol('someFunc', null, new TypedFunctionType(klassType), SymbolTypeFlag.runtime);
+
+        // returnPropRef = someFunc().myNum
+        expectTypeToBe(fnRef, TypedFunctionType);
+        expectTypeToBe(returnRef, ClassType);
+        expectTypeToBe(returnPropRef, IntegerType);
+    });
+
+
+    describe('toString', () => {
+
+        it('returns the full name, if resolvable or not', () => {
+            let nsA = new NamespaceType('Alpha');
+            let nsAB = new NamespaceType('Alpha.Beta');
+            let nsABC = new NamespaceType('Alpha.Beta.Charlie');
+            nsA.addMember('Beta', null, nsAB, SymbolTypeFlag.typetime);
+            nsAB.addMember('Charlie', null, nsABC, SymbolTypeFlag.typetime);
+
+            let myRef = new ReferenceType('MyKlass', 'Alpha.Beta.Charlie.MyKlass', SymbolTypeFlag.typetime, () => nsABC.memberTable);
+            expect(myRef.isResolvable()).to.be.false;
+
+            expect(myRef.toString()).to.eq('Alpha.Beta.Charlie.MyKlass');
+            let myKlass = new ClassType('Alpha.Beta.Charlie.MyKlass');
+            nsABC.addMember('MyKlass', null, myKlass, SymbolTypeFlag.typetime);
+            expect(myRef.isResolvable()).to.be.true;
+            expect(myRef.toString()).to.eq('Alpha.Beta.Charlie.MyKlass');
+        });
+
+    });
+
+});
+
+describe('ArrayDefaultTypeReferenceType', () => {
+
+    it('should resolve the default type of an array, which is defined in the future', () => {
+        const table = new SymbolTable('test');
+        const futureArray = new ReferenceType('futureArray', 'futureArray', runtimeFlag, () => table);
+
+        const myArrayDefaultType = new ArrayDefaultTypeReferenceType(futureArray);
+        expect(myArrayDefaultType.isResolvable()).to.be.false;
+        expect((myArrayDefaultType as any).kind).to.equal(DynamicType.instance.kind);
+
+        //Define the symbol
+        table.addSymbol('futureArray', {}, new ArrayType(IntegerType.instance), runtimeFlag);
+        //myArrayDefaultType is now treated as integer
+        expect(myArrayDefaultType.isResolvable()).to.be.true;
+        expect((myArrayDefaultType as any).kind).to.equal(IntegerType.instance.kind);
+    });
+});
diff --git a/src/types/ReferenceType.ts b/src/types/ReferenceType.ts
new file mode 100644
index 000000000..3edf15ec0
--- /dev/null
+++ b/src/types/ReferenceType.ts
@@ -0,0 +1,761 @@
+import type { GetTypeOptions, TypeChainEntry, TypeCircularReferenceInfo, TypeCompatibilityData } from '../interfaces';
+import type { GetSymbolTypeOptions, SymbolTable, SymbolTableProvider, SymbolTypeGetterProvider } from '../SymbolTable';
+import type { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { isAnyReferenceType, isArrayDefaultTypeReferenceType, isBinaryOperatorReferenceType, isComponentType, isDynamicType, isParamTypeFromValueReferenceType, isReferenceType, isTypePropertyReferenceType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { DynamicType } from './DynamicType';
+import { BscTypeKind } from './BscTypeKind';
+import type { Token } from '../lexer/Token';
+import { util } from '../util';
+
+export type AnyReferenceType = ReferenceType | TypePropertyReferenceType | BinaryOperatorReferenceType | ArrayDefaultTypeReferenceType;
+
+export function referenceTypeFactory(memberKey: string, fullName, flags: SymbolTypeFlag, tableProvider: SymbolTypeGetterProvider) {
+    return new ReferenceType(memberKey, fullName, flags, tableProvider);
+}
+
+export class ReferenceType extends BscType {
+
+
+    /**
+     * ReferenceTypes are used when the actual type may be resolved later from a Symbol table
+     * @param memberKey which key do we use to look up this type in the given table?
+     * @param fullName the full/display name for this type
+     * @param flags is this type available at typetime, runtime, etc.
+     * @param tableProvider function that returns a SymbolTable that we use for the lookup.
+     */
+    constructor(public memberKey: string, public fullName, public flags: SymbolTypeFlag, public tableProvider: SymbolTypeGetterProvider) {
+        super(memberKey);
+        // eslint-disable-next-line no-constructor-return
+        return new Proxy(this, {
+            get: (target, propName, receiver) => {
+
+                if (propName === '__reflection') {
+                    // Cheeky way to get `isReferenceType` reflection to work
+                    return this.__reflection;
+                }
+                if (propName === '__identifier') {
+                    // Cheeky way to get `isReferenceType` reflection to work
+                    return this.__identifier;
+                }
+                if (propName === 'fullName') {
+                    return this.fullName;
+                }
+                if (propName === 'isResolvable') {
+                    return () => {
+                        let resultSoFar = this.resolve();
+                        while (resultSoFar && isReferenceType(resultSoFar)) {
+                            resultSoFar = (resultSoFar as any).getTarget?.();
+                        }
+                        return !!resultSoFar;
+                    };
+                }
+                if (propName === 'getCircularReferenceInfo') {
+                    return (stopAtTypes: ReferenceType[] = []) => {
+                        return this.getCircularReferenceInfo(stopAtTypes);
+                    };
+                }
+                if (propName === 'getTarget') {
+                    return () => {
+                        return this.resolve();
+                    };
+                }
+                if (propName === 'tableProvider') {
+                    return this.tableProvider;
+                }
+                if (propName === 'isEqual') {
+                    //Need to be able to check equality without resolution, because resolution need to check equality
+                    //To see if you need to make a UnionType
+                    return (targetType: BscType, data?: TypeCompatibilityData) => {
+                        if (!targetType) {
+                            return false;
+                        }
+                        const resolvedType = this.resolve();
+                        let equal = false;
+                        if (resolvedType && !isReferenceType(resolvedType)) {
+                            equal = resolvedType.isEqual(targetType, data);
+                        } else if (isReferenceType(targetType)) {
+                            equal = this.fullName.toLowerCase() === targetType.fullName.toLowerCase() &&
+                                (this.tableProvider === targetType.tableProvider ||
+                                    this.tableProvider().name === targetType.tableProvider().name);
+                        } else {
+                            equal = targetType.isEqual(this, data);
+                        }
+                        return equal;
+                    };
+                }
+                if (propName === 'isTypeCompatible') {
+                    //Need to be able to check equality without resolution, because resolution need to check equality
+                    //To see if you need to make a UnionType
+                    return (targetType: BscType, data?: TypeCompatibilityData) => {
+                        if (!targetType) {
+                            return false;
+                        }
+                        if (isDynamicType(targetType)) {
+                            return true;
+                        }
+                        const resolvedType = this.resolve();
+                        if (resolvedType && !isReferenceType(resolvedType)) {
+                            return resolvedType.isTypeCompatible(targetType, data);
+                        } else if (isReferenceType(targetType)) {
+                            return this.fullName.toLowerCase() === targetType.fullName.toLowerCase() &&
+                                this.tableProvider === targetType.tableProvider;
+                        }
+                        return targetType.isTypeCompatible(this, data);
+                    };
+                }
+
+                //There may be some need to specifically get members on ReferenceType in the future
+                // eg: if (Reflect.has(target, name)) {
+                //   return Reflect.get(target, propName, receiver);
+
+                let innerType = this.resolve();
+
+                if (!innerType) {
+                    // No real BscType found - we may need to handle some specific cases
+
+                    if (propName === 'getMemberType') {
+                        // We're looking for a member of a reference type
+                        // Since we don't know what type this is, yet, return ReferenceType
+                        return (memberName: string, options: GetTypeOptions) => {
+                            const resolvedType = this.resolve();
+                            if (resolvedType) {
+                                return resolvedType.getMemberType(memberName, options);
+                            }
+                            const refLookUp = `${memberName.toLowerCase()}-${options?.flags}`;
+                            let memberTypeReference = this.memberTypeReferences.get(refLookUp);
+                            if (memberTypeReference) {
+                                return memberTypeReference;
+
+                            }
+                            memberTypeReference = new ReferenceType(memberName, this.makeMemberFullName(memberName), options.flags, this.futureMemberTableProvider);
+                            this.memberTypeReferences.set(refLookUp, memberTypeReference);
+                            return memberTypeReference;
+                        };
+                    } else if (propName === 'getCallFuncType') {
+                        // We're looking for a callfunc member of a reference type
+                        // Since we don't know what type this is, yet, return ReferenceType
+                        return (memberName: string, options: GetTypeOptions) => {
+                            const resolvedType = this.resolve();
+                            if (isComponentType(resolvedType)) {
+                                return resolvedType.getCallFuncType(memberName, options);
+                            }
+                            const refLookUp = `${memberName.toLowerCase()}-${options.flags}-callfunc`;
+                            let callFuncMemberTypeReference = this.callFuncMemberTypeReferences.get(refLookUp);
+                            if (callFuncMemberTypeReference) {
+                                return callFuncMemberTypeReference;
+
+                            }
+                            callFuncMemberTypeReference = new ReferenceType(memberName, this.makeMemberFullName(memberName), options.flags, this.futureCallFuncMemberTableProvider);
+                            this.callFuncMemberTypeReferences.set(refLookUp, callFuncMemberTypeReference);
+                            return callFuncMemberTypeReference;
+                        };
+                    } else if (propName === 'toString') {
+                        // This type was never found
+                        // For diagnostics, we should return the expected name of of the type
+                        return () => this.fullName;
+                    } else if (propName === 'toTypeString') {
+                        // For transpilation, we should 'dynamic'
+                        return () => 'dynamic';
+                    } else if (propName === 'returnType') {
+                        let propRefType = this.propertyTypeReference.get(propName);
+                        if (!propRefType) {
+                            propRefType = new TypePropertyReferenceType(this, propName);
+                            this.propertyTypeReference.set(propName, propRefType);
+                        }
+                        return propRefType;
+                    } else if (propName === 'memberTable') {
+                        return this.memberTable;
+                    } else if (propName === 'getMemberTable') {
+                        return () => {
+                            return this.memberTable;
+                        };
+                    } else if (propName === 'callFuncTable') {
+                        return (this as any).callFuncMemberTable;
+                    } else if (propName === 'getCallFuncTable') {
+                        return () => {
+                            return (this as any).callFuncMemberTable;
+                        };
+                    } else if (propName === 'isTypeCompatible') {
+                        return (targetType: BscType) => {
+                            return isDynamicType(targetType);
+                        };
+                    } else if (propName === 'isEqual') {
+                        return (targetType: BscType) => {
+                            if (isReferenceType(targetType)) {
+                                return this.fullName.toLowerCase() === targetType.toString().toLowerCase() &&
+                                    this.tableProvider() === targetType.tableProvider();
+                            }
+                            return false;
+                        };
+                    } else if (propName === 'addBuiltInInterfaces') {
+                        // this is an unknown type. There is no use in adding built in interfaces
+                        // return no-op function
+                        return () => { };
+                    } else if (propName === 'hasAddedBuiltInInterfaces') {
+                        // this is an unknown type. There is no use in adding built in interfaces
+                        return true;
+                    } else if (propName === 'isBuiltIn') {
+                        return false;
+                    }
+                }
+
+                if (!innerType) {
+                    innerType = DynamicType.instance;
+                }
+                const result = Reflect.get(innerType, propName, innerType);
+                return result;
+            },
+            set: (target, name, value, receiver) => {
+                //There may be some need to specifically set members on ReferenceType in the future
+                // eg: if (Reflect.has(target, name)) {
+                //   return Reflect.set(target, name, value, receiver);
+
+                let innerType = this.resolve();
+
+                // Look for circular references
+                if (!innerType || this.referenceChain.has(innerType)) {
+                    if (name === 'hasAddedBuiltInInterfaces') {
+                        // ignore this
+                        return true;
+                    }
+                    console.log(`Proxy set error`, name, value, innerType);
+                    const error = new Error(`Reference Type Proxy set error: ${{ memberKey: memberKey, name: name, value: value }}`);
+                    console.log(error.stack);
+                    return false;
+                }
+                const result = Reflect.set(innerType, name, value, innerType);
+                this.referenceChain.clear();
+                return result;
+            }
+        });
+    }
+
+    public readonly kind = BscTypeKind.ReferenceType;
+
+    getTarget() {
+        return this.resolve();
+    }
+
+    /**
+     * Resolves the type based on the original name and the table provider
+     */
+    private resolve(): BscType {
+        const symbolTable = this.tableProvider();
+        if (!symbolTable) {
+            return;
+        }
+        // Look for circular references
+        let resolvedType = symbolTable.getSymbolType(this.memberKey, { flags: this.flags, onlyCacheResolvedTypes: true });
+        if (!resolvedType) {
+            // could not find this member
+            return;
+        }
+
+        if (isAnyReferenceType(resolvedType)) {
+            // If this is a referenceType, keep digging down until we have a non reference Type.
+            while (resolvedType && isAnyReferenceType(resolvedType)) {
+                if (this.referenceChain.has(resolvedType)) {
+                    // this is a circular reference
+                    this.circRefCount++;
+                }
+                if (this.circRefCount > 1) {
+                    //It is possible that we could properly resolve the case that one reference points to itself
+                    //see test: '[Scope][symbolTable lookups with enhanced typing][finds correct class field type with default value enums are used]
+                    return;
+                }
+                this.referenceChain.add(resolvedType);
+                resolvedType = (resolvedType as any)?.getTarget?.();
+            }
+            this.tableProvider().setCachedType(this.memberKey, { type: resolvedType }, { flags: this.flags });
+        }
+
+        if (resolvedType && !isAnyReferenceType(resolvedType)) {
+            this.circRefCount = 0;
+            this.referenceChain.clear();
+        }
+        return resolvedType;
+    }
+
+    get __reflection() {
+        return { name: 'ReferenceType' };
+    }
+
+    makeMemberFullName(memberName: string) {
+        return this.fullName + '.' + memberName;
+    }
+
+    getCircularReferenceInfo(stopAtTypes: ReferenceType[] = []): TypeCircularReferenceInfo {
+        this.resolve();
+        const isCircRef = this.circRefCount > 1;
+
+        const referenceChainNames: string[] = [];
+        stopAtTypes.push(this);
+        if (isCircRef) {
+            referenceChainNames.push(this.fullName);
+            for (const chainItem of this.referenceChain) {
+                if (!isReferenceType(chainItem) || chainItem === this) {
+                    continue;
+                }
+                if (stopAtTypes.map(t => t.fullName).includes(chainItem.fullName)) {
+                    break;
+                }
+                const chainItemCircInfo = chainItem.getCircularReferenceInfo(stopAtTypes);
+                referenceChainNames.push(...chainItemCircInfo.referenceChainNames);
+            }
+        }
+
+        return { isCircularReference: isCircRef, referenceChainNames: referenceChainNames };
+    }
+
+    private circRefCount = 0;
+
+    private referenceChain = new Set<BscType>();
+
+    private propertyTypeReference = new Map<string, TypePropertyReferenceType>();
+
+    private memberTypeReferences = new Map<string, ReferenceType>();
+    private callFuncMemberTypeReferences = new Map<string, ReferenceType>();
+
+    private futureMemberTableProvider = () => {
+        return {
+            name: `FutureMemberTableProvider: '${this.__identifier}'`,
+            getSymbolType: (innerName: string, innerOptions: GetTypeOptions) => {
+                const resolvedType = this.resolve();
+                if (resolvedType) {
+                    return resolvedType.getMemberType(innerName, innerOptions);
+                }
+            },
+            setCachedType: (innerName: string, innerResolvedTypeCacheEntry: TypeChainEntry, options: GetSymbolTypeOptions) => {
+                const resolvedType = this.resolve();
+                if (resolvedType) {
+                    resolvedType.memberTable.setCachedType(innerName, innerResolvedTypeCacheEntry, options);
+                }
+            },
+            addSibling: (symbolTable: SymbolTable) => {
+                const resolvedType = this.resolve();
+                if (resolvedType) {
+                    resolvedType.memberTable?.addSibling?.(symbolTable);
+                }
+            }
+        };
+    };
+
+    private futureCallFuncMemberTableProvider = () => {
+        return {
+            name: `FutureCallFuncMemberTableProvider: '${this.__identifier}'`,
+            getSymbolType: (innerName: string, innerOptions: GetTypeOptions) => {
+                const resolvedType = this.resolve();
+                if (isComponentType(resolvedType)) {
+                    return resolvedType.getCallFuncType(innerName, innerOptions);
+                }
+            },
+            setCachedType: (innerName: string, innerResolvedTypeCacheEntry: TypeChainEntry, options: GetSymbolTypeOptions) => {
+                const resolvedType = this.resolve();
+                if (isComponentType(resolvedType)) {
+                    resolvedType.getCallFuncTable().setCachedType(innerName, innerResolvedTypeCacheEntry, options);
+                }
+            },
+            addSibling: (symbolTable: SymbolTable) => {
+                const resolvedType = this.resolve();
+                if (isComponentType(resolvedType)) {
+                    resolvedType.getCallFuncTable()?.addSibling?.(symbolTable);
+                }
+            }
+        };
+    };
+}
+
+/**
+ * Use this class for when you need to reference a property of a BscType, and that property is also a BscType,
+ * Especially when the instance with the property may not have been instantiated/discovered yet
+ *
+ * For Example, FunctionType.returnType --- if the FunctionExpression has not been walked yet, it will be a ReferenceType
+ * if we just access .returnType on a ReferenceType that doesn't have access to an actual FunctionType yet, .returnType will be undefined
+ * So when we use this class, it maintains that reference to a potential ReferenceType, and this class will change from
+ * returning undefined to the ACTUAL .returnType when the ReferenceType can be resolved.
+ *
+ * This is really cool. It's like programming with time-travel.
+ */
+export class TypePropertyReferenceType extends BscType {
+    constructor(public outerType: BscType, public propertyName: string) {
+        super(propertyName);
+        // eslint-disable-next-line no-constructor-return
+        return new Proxy(this, {
+            get: (target, propName, receiver) => {
+
+                if (propName === '__reflection') {
+                    // Cheeky way to get `isTypePropertyReferenceType` reflection to work
+                    return { name: 'TypePropertyReferenceType' };
+                }
+
+                if (propName === 'outerType') {
+                    return outerType;
+                }
+
+                if (propName === 'getTarget') {
+                    return () => {
+                        return this.getTarget();
+                    };
+                }
+
+                if (propName === 'isResolvable') {
+                    return () => {
+                        return !!(isAnyReferenceType(this.outerType) ? (this.outerType as any).getTarget() : this.outerType?.isResolvable());
+                    };
+                }
+
+                if (isAnyReferenceType(this.outerType) && !this.outerType.isResolvable()) {
+                    if (propName === 'getMemberType') {
+                        //If we're calling `getMemberType()`, we need it to proxy to using the actual symbol table
+                        //So if that symbol is ever populated, the correct type is passed through
+                        return (memberName: string, options: GetSymbolTypeOptions) => {
+                            const fullMemberName = this.outerType.toString() + '.' + memberName;
+                            return new ReferenceType(memberName, fullMemberName, options.flags, () => {
+                                return {
+                                    name: `TypePropertyReferenceType : '${fullMemberName}'`,
+                                    getSymbolType: (innerName: string, innerOptions: GetTypeOptions) => {
+                                        return this.outerType?.[this.propertyName]?.getMemberType(innerName, innerOptions);
+                                    },
+                                    setCachedType: (innerName: string, innerTypeCacheEntry: TypeChainEntry, innerOptions: GetTypeOptions) => {
+                                        return this.outerType?.[this.propertyName]?.memberTable.setCachedType(innerName, innerTypeCacheEntry, innerOptions);
+                                    },
+                                    addSibling: (symbolTable: SymbolTable) => {
+                                        return this.outerType?.[this.propertyName]?.memberTable?.addSibling?.(symbolTable);
+                                    }
+                                };
+                            });
+                        };
+                    }
+                    if (propName === 'isResolvable') {
+                        return () => false;
+                    }
+                }
+                let inner = this.getTarget();
+
+                if (!inner) {
+                    inner = DynamicType.instance;
+                }
+
+                if (inner) {
+                    const result = Reflect.get(inner, propName, inner);
+                    return result;
+                }
+            },
+            set: (target, name, value, receiver) => {
+                //There may be some need to specifically set members on ReferenceType in the future
+                // eg: if (Reflect.has(target, name)) {
+                //   return Reflect.set(target, name, value, receiver);
+
+                let inner = this.outerType[this.propertyName];
+
+                if (inner) {
+                    const result = Reflect.set(inner, name, value, inner);
+                    return result;
+                }
+            }
+        });
+    }
+
+    getTarget(): BscType {
+        let actualOuterType = this.outerType;
+        if (isAnyReferenceType(this.outerType)) {
+            if ((this.outerType as ReferenceType).isResolvable()) {
+                actualOuterType = (this.outerType as ReferenceType)?.getTarget();
+            }
+        }
+        return actualOuterType?.[this.propertyName];
+    }
+
+    tableProvider: SymbolTableProvider;
+}
+
+/**
+ * Use this class for when there is a binary operator and either the left hand side and/or the right hand side
+ * are ReferenceTypes
+ */
+export class BinaryOperatorReferenceType extends BscType {
+    cachedType: BscType;
+
+    constructor(public leftType: BscType, public operator: Token, public rightType: BscType, binaryOpResolver: (lType: BscType, operator: Token, rType: BscType) => BscType) {
+        super(operator.text);
+        // eslint-disable-next-line no-constructor-return
+        return new Proxy(this, {
+            get: (target, propName, receiver) => {
+
+                if (propName === '__reflection') {
+                    // Cheeky way to get `BinaryOperatorReferenceType` reflection to work
+                    return { name: 'BinaryOperatorReferenceType' };
+                }
+
+                if (propName === 'leftType') {
+                    return leftType;
+                }
+
+                if (propName === 'rightType') {
+                    return rightType;
+                }
+
+                let resultType: BscType = this.cachedType ?? DynamicType.instance;
+                if (!this.cachedType) {
+                    if ((isAnyReferenceType(this.leftType) && !this.leftType.isResolvable()) ||
+                        (isAnyReferenceType(this.rightType) && !this.rightType.isResolvable())
+                    ) {
+                        if (propName === 'isResolvable') {
+                            return () => false;
+                        }
+                        if (propName === 'getTarget') {
+                            return () => undefined;
+                        }
+                    } else {
+                        resultType = binaryOpResolver(this.leftType, this.operator, this.rightType) ?? DynamicType.instance;
+                        this.cachedType = resultType;
+                    }
+
+                }
+                if (resultType) {
+                    const result = Reflect.get(resultType, propName, resultType);
+                    return result;
+                }
+            }
+        });
+    }
+
+    getTarget: () => BscType;
+
+    tableProvider: SymbolTableProvider;
+}
+
+
+/**
+ * Use this class for when there is a presumable array type that is a referenceType
+ */
+export class ArrayDefaultTypeReferenceType extends BscType {
+    constructor(public objType: BscType) {
+        super('ArrayDefaultType');
+        // eslint-disable-next-line no-constructor-return
+        return new Proxy(this, {
+            get: (target, propName, receiver) => {
+
+                if (propName === '__reflection') {
+                    // Cheeky way to get `ArrayDefaultTypeReferenceType` reflection to work
+                    return { name: 'ArrayDefaultTypeReferenceType' };
+                }
+
+                if (propName === 'objType') {
+                    return objType;
+                }
+
+                if (propName === 'getTarget') {
+                    return () => {
+                        if (isReferenceType(this.objType)) {
+                            (this.objType as any).getTarget();
+                        }
+                        return this.objType;
+                    };
+                }
+
+                let resultType: BscType = DynamicType.instance;
+                if ((isAnyReferenceType(this.objType) && !this.objType.isResolvable())
+                ) {
+                    if (propName === 'isResolvable') {
+                        return () => false;
+                    }
+                    if (propName === 'getTarget') {
+                        return () => undefined;
+                    }
+                } else {
+                    resultType = util.getIteratorDefaultType(this.objType);
+                }
+
+                if (resultType) {
+                    const result = Reflect.get(resultType, propName, resultType);
+                    return result;
+                }
+            }
+        });
+    }
+
+    getTarget: () => BscType;
+
+    tableProvider: SymbolTableProvider;
+}
+
+/**
+ * Used for when a Param's initial value is unresolved
+ * Generally, this will be resolved later *except* for Enum
+ * Enum Types will have an initial value of an EnumMemberType, but the param
+ * should be an EnumType
+ */
+export class ParamTypeFromValueReferenceType extends BscType {
+    cachedType: BscType;
+
+    constructor(public objType: BscType) {
+        super('ParamInitialValueType');
+        // eslint-disable-next-line no-constructor-return
+        return new Proxy(this, {
+            get: (target, propName, receiver) => {
+                if (propName === '__reflection') {
+                    // Cheeky way to get reflection to work
+                    return { name: 'ParamTypeFromValueReferenceType' };
+                }
+
+                if (propName === 'objType') {
+                    return objType;
+                }
+
+                if (propName === 'getTarget') {
+                    return () => {
+                        if (this.cachedType) {
+                            return this.cachedType;
+                        }
+                        if (isReferenceType(this.objType)) {
+                            (this.objType as any).getTarget();
+                        }
+                        return this.objType;
+                    };
+                }
+
+                let resultType: BscType = this.cachedType ?? DynamicType.instance;
+                if (!this.cachedType) {
+                    if ((isAnyReferenceType(this.objType) && !this.objType.isResolvable())
+                    ) {
+                        if (propName === 'isResolvable') {
+                            return () => false;
+                        }
+                        if (propName === 'getTarget') {
+                            return () => undefined;
+                        }
+                    } else {
+                        resultType = util.getDefaultTypeFromValueType(this.objType);
+                        //if the default-type lookup just hands back another wrapper of the same
+                        //objType (e.g. an unresolvable IntersectionType keeps re-wrapping), the
+                        //proxy chain would loop forever via Reflect.get. Bail to DynamicType.
+                        if (isParamTypeFromValueReferenceType(resultType) && (resultType as ParamTypeFromValueReferenceType).objType === this.objType) {
+                            resultType = DynamicType.instance;
+                        }
+                        this.cachedType = resultType;
+                    }
+
+                }
+                if (resultType) {
+                    const result = Reflect.get(resultType, propName, resultType);
+                    return result;
+                }
+            }
+        });
+    }
+}
+
+/**
+ * Used when an IntersectionType has at least one member that may have default dynamic members.
+ * If the inner type is not resolvable, this type will resolve to the given type instead.
+ * @example
+ * ```brighterscript
+ *   interface HasAge
+ *       age as integer
+ *   end interface
+ *
+ *   type foo = HasAge and roAssociativeArray
+ *
+ *   sub useFoo(f as foo)
+ *       print f.age ' f.age is an integer
+ *       print f.doesExist("key") ' will result in a boolean, from roAssociativeArray
+ *       print f.someKey ' no idea - so this is dynamic, and will not cause a validation error
+ *   end sub
+ * ```
+ */
+export class ReferenceTypeWithDefault extends BscType {
+    constructor(public baseType: BscType, public defaultType: BscType) {
+        super('ReferenceTypeWithDefault');
+        // eslint-disable-next-line no-constructor-return
+        return new Proxy(this, {
+            get: (target, propName, receiver) => {
+
+                if (propName === '__reflection') {
+                    // Cheeky way to get `isReferenceTypeWithDefault` reflection to work
+                    return { name: 'ReferenceTypeWithDefault' };
+                }
+
+                if (propName === 'isResolvable') {
+                    return () => {
+                        return true;
+                    };
+                }
+                let innerType = this.getTarget();
+
+                if (!innerType) {
+                    innerType = this.defaultType;
+                }
+
+                if (innerType) {
+                    const result = Reflect.get(innerType, propName, innerType);
+                    return result;
+                }
+            }
+        });
+    }
+
+    getTarget(): BscType {
+        if (isAnyReferenceType(this.baseType)) {
+            if (this.baseType.isResolvable()) {
+                return (this.baseType as any)?.getTarget();
+            }
+        }
+        return this.baseType;
+    }
+
+    tableProvider: SymbolTableProvider;
+}
+
+
+/**
+ * Gives an array of all the symbol names that need to be resolved to make the given reference type be resolved
+ */
+export function getAllRequiredSymbolNames(refType: BscType, namespaceLower?: string): Array<{ name: string; namespacedName?: string }> {
+    if (refType.isResolvable()) {
+        return [];
+    }
+    if (isReferenceType(refType)) {
+        return [{ name: refType.fullName, namespacedName: namespaceLower ? `${namespaceLower}.${refType.fullName}` : null }];
+    }
+    if (isTypePropertyReferenceType(refType)) {
+        const outer = refType.outerType;
+        if (isAnyReferenceType(outer)) {
+            return getAllRequiredSymbolNames(outer);
+        } else {
+            return [];
+        }
+
+    }
+    if (isArrayDefaultTypeReferenceType(refType)) {
+        const objType = refType.objType;
+        if (isAnyReferenceType(objType)) {
+            return getAllRequiredSymbolNames(objType);
+        } else {
+            return [];
+        }
+    }
+    if (isBinaryOperatorReferenceType(refType)) {
+        const left = refType.leftType;
+        const right = refType.rightType;
+        const result = [];
+        if (isAnyReferenceType(left)) {
+            result.push(...getAllRequiredSymbolNames(left, namespaceLower));
+        }
+        if (isAnyReferenceType(right)) {
+            result.push(...getAllRequiredSymbolNames(right, namespaceLower));
+
+        }
+        return result;
+    }
+    if (isParamTypeFromValueReferenceType(refType)) {
+        const objType = refType.objType;
+        if (isAnyReferenceType(objType)) {
+            return getAllRequiredSymbolNames(objType);
+        } else {
+            return [];
+        }
+    }
+    return [];
+}
diff --git a/src/types/StringType.spec.ts b/src/types/StringType.spec.ts
index e5e656212..44a1962c5 100644
--- a/src/types/StringType.spec.ts
+++ b/src/types/StringType.spec.ts
@@ -5,7 +5,7 @@ import { StringType } from './StringType';
 
 describe('StringType', () => {
     it('is equivalent to string types', () => {
-        expect(new StringType().isAssignableTo(new StringType())).to.be.true;
-        expect(new StringType().isAssignableTo(new DynamicType())).to.be.true;
+        expect(new StringType().isTypeCompatible(new StringType())).to.be.true;
+        expect(new StringType().isTypeCompatible(new DynamicType())).to.be.true;
     });
 });
diff --git a/src/types/StringType.ts b/src/types/StringType.ts
index 230261090..8617807e9 100644
--- a/src/types/StringType.ts
+++ b/src/types/StringType.ts
@@ -1,31 +1,42 @@
-import type { BscType } from './BscType';
-import { DynamicType } from './DynamicType';
+import { isDynamicType, isObjectType, isStringTypeLike } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isEnumTypeCompatible, isNativeInterfaceCompatible, isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
 
-export class StringType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
+export class StringType extends BscType {
 
-    public isAssignableTo(targetType: BscType) {
+    public readonly kind = BscTypeKind.StringType;
+
+    public isBuiltIn = true;
+    /**
+     * A static instance that can be used to reduce memory and constructor costs, since there's nothing unique about this
+     */
+    public static instance = new StringType();
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         return (
-            targetType instanceof StringType ||
-            targetType instanceof DynamicType
+            isStringTypeLike(targetType) ||
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data) ||
+            isEnumTypeCompatible(this, targetType, data) ||
+            isNativeInterfaceCompatible(this, targetType, 'rostring', data)
         );
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
-    }
-
     public toString() {
-        return this.typeText ?? 'string';
+        return 'string';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new StringType(this.typeText);
+    public isEqual(targetType: BscType): boolean {
+        return isStringTypeLike(targetType);
     }
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('string', StringType.instance);
diff --git a/src/types/TypeStatementType.ts b/src/types/TypeStatementType.ts
new file mode 100644
index 000000000..7816f1105
--- /dev/null
+++ b/src/types/TypeStatementType.ts
@@ -0,0 +1,67 @@
+import { BscType } from './BscType';
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
+import { BscTypeKind } from './BscTypeKind';
+import { isCallableType } from '../astUtils/reflection';
+
+export class TypeStatementType extends BscType {
+
+    public kind: BscTypeKind = BscTypeKind.TypeStatementType;
+
+    constructor(public name: string, public wrappedType: BscType) {
+        super();
+    }
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        data = data || {};
+        if (!data.expectedType) {
+            data.expectedType = this;
+        }
+
+        return this.wrappedType.isTypeCompatible(targetType, data);
+    }
+
+    public toString() {
+        return this.name;
+    }
+
+    public toTypeString(): string {
+        return this.wrappedType.toTypeString();
+    }
+
+    public isEqual(targetType: BscType) {
+        return this.wrappedType.isEqual(targetType);
+    }
+
+    getMemberType(memberName: string, options: GetTypeOptions) {
+        return this.wrappedType.getMemberType(memberName, options);
+    }
+
+    getMemberTable() {
+        return this.wrappedType.getMemberTable();
+    }
+
+    addBuiltInInterfaces() {
+        if (!this.hasAddedBuiltInInterfaces) {
+            this.wrappedType.addBuiltInInterfaces();
+            this.hasAddedBuiltInInterfaces = true;
+        }
+    }
+
+    getCallFuncType(name: string, options: GetTypeOptions): BscType {
+        return this.wrappedType.getCallFuncType(name, options);
+    }
+
+
+    getCallFuncTable() {
+        return this.wrappedType.getCallFuncTable();
+    }
+
+    get returnType() {
+        if (isCallableType(this.wrappedType)) {
+            return this.wrappedType.returnType;
+        }
+        return undefined;
+    }
+
+}
+
diff --git a/src/types/TypedFunctionType.spec.ts b/src/types/TypedFunctionType.spec.ts
new file mode 100644
index 000000000..6db58e20a
--- /dev/null
+++ b/src/types/TypedFunctionType.spec.ts
@@ -0,0 +1,158 @@
+import { expect } from '../chai-config.spec';
+
+import { DynamicType } from './DynamicType';
+import { TypedFunctionType } from './TypedFunctionType';
+import { IntegerType } from './IntegerType';
+import { StringType } from './StringType';
+import { VoidType } from './VoidType';
+import { FloatType } from './FloatType';
+
+describe('TypedFunctionType', () => {
+    it('is equivalent to dynamic type', () => {
+        expect(new TypedFunctionType(new VoidType()).isTypeCompatible(new DynamicType())).to.be.true;
+    });
+
+    it('validates using param and return types', () => {
+        expect(new TypedFunctionType(new VoidType()).isTypeCompatible(new TypedFunctionType(new VoidType()))).to.be.true;
+
+        //different parameter count
+        expect(
+            new TypedFunctionType(new VoidType()).addParameter('a', new IntegerType(), false).isTypeCompatible(
+                new TypedFunctionType(new VoidType())
+            )
+        ).to.be.false;
+
+        //different parameter types
+        expect(
+            new TypedFunctionType(new VoidType()).addParameter('a', new IntegerType(), false).isTypeCompatible(
+                new TypedFunctionType(new VoidType()).addParameter('a', new StringType(), false)
+            )
+        ).to.be.false;
+
+        //different return type
+        expect(
+            new TypedFunctionType(new VoidType()).isTypeCompatible(
+                new TypedFunctionType(new IntegerType())
+            )
+        ).to.be.false;
+    });
+
+
+    it('checks equality', () => {
+        expect(new TypedFunctionType(new VoidType()).isEqual(new TypedFunctionType(new VoidType()))).to.be.true;
+
+        let func1 = new TypedFunctionType(StringType.instance);
+        func1.addParameter('a', StringType.instance, false);
+        func1.addParameter('b', IntegerType.instance, false);
+
+        let func2 = new TypedFunctionType(StringType.instance);
+        func2.addParameter('alpha', StringType.instance, false);
+        func2.addParameter('beta', IntegerType.instance, false);
+        expect(func1.isEqual(func2)).to.be.true;
+
+        // different return type
+        let func3 = new TypedFunctionType(DynamicType.instance);
+        func3.addParameter('alpha', StringType.instance, false);
+        func3.addParameter('beta', IntegerType.instance, false);
+        expect(func1.isEqual(func3)).to.be.false;
+
+        // different parameter type
+        let func4 = new TypedFunctionType(StringType.instance);
+        func4.addParameter('alpha', StringType.instance, false);
+        func4.addParameter('beta', FloatType.instance, false);
+        expect(func1.isEqual(func4)).to.be.false;
+
+        // different optional param
+        let func5 = new TypedFunctionType(StringType.instance);
+        func5.addParameter('alpha', StringType.instance, false);
+        func5.addParameter('beta', IntegerType.instance, true);
+        expect(func1.isEqual(func5)).to.be.false;
+
+        // additional optional param
+        let func6 = new TypedFunctionType(StringType.instance);
+        func6.addParameter('alpha', StringType.instance, false);
+        func6.addParameter('beta', IntegerType.instance, false);
+        func6.addParameter('charlie', IntegerType.instance, true);
+        expect(func1.isEqual(func6)).to.be.false;
+
+        // other is variadic
+        let func7 = new TypedFunctionType(StringType.instance);
+        func7.addParameter('alpha', StringType.instance, false);
+        func7.addParameter('beta', IntegerType.instance, false);
+        func7.isVariadic = true;
+        expect(func1.isEqual(func7)).to.be.false;
+
+        // both Variadic
+        let variFunc1 = new TypedFunctionType(DynamicType.instance);
+        variFunc1.isVariadic = true;
+        // both Variadic
+        let variFunc2 = new TypedFunctionType(DynamicType.instance);
+        variFunc2.isVariadic = true;
+        expect(variFunc1.isEqual(variFunc2)).to.be.true;
+    });
+
+    it('checks compatibility', () => {
+        expect(new TypedFunctionType(new VoidType()).isTypeCompatible(new TypedFunctionType(new VoidType()))).to.be.true;
+
+        let func1 = new TypedFunctionType(FloatType.instance);
+        func1.addParameter('a', StringType.instance, false);
+        func1.addParameter('b', IntegerType.instance, false);
+
+        let func2 = new TypedFunctionType(FloatType.instance);
+        func2.addParameter('alpha', StringType.instance, false);
+        func2.addParameter('beta', IntegerType.instance, false);
+        expect(func1.isTypeCompatible(func2)).to.be.true;
+
+        // different return type, but return type is compatible with target type
+        let func3 = new TypedFunctionType(IntegerType.instance);
+        func3.addParameter('alpha', StringType.instance, false);
+        func3.addParameter('beta', IntegerType.instance, false);
+        expect(func1.isTypeCompatible(func3)).to.be.true;
+
+        // different return type, but return type is NOT compatible with target type
+        func3 = new TypedFunctionType(StringType.instance);
+        func3.addParameter('alpha', StringType.instance, false);
+        func3.addParameter('beta', IntegerType.instance, false);
+        expect(func1.isTypeCompatible(func3)).to.be.false;
+
+        // different parameter type
+        let func4 = new TypedFunctionType(FloatType.instance);
+        func4.addParameter('alpha', StringType.instance, false);
+        func4.addParameter('beta', StringType.instance, false);
+        expect(func1.isTypeCompatible(func4)).to.be.false;
+
+        // different parameter type but types are compatible
+        func4 = new TypedFunctionType(FloatType.instance);
+        func4.addParameter('alpha', StringType.instance, false);
+        func4.addParameter('beta', FloatType.instance, false);
+        expect(func1.isTypeCompatible(func4)).to.be.true;
+
+        // different optional param
+        let func5 = new TypedFunctionType(FloatType.instance);
+        func5.addParameter('alpha', StringType.instance, false);
+        func5.addParameter('beta', IntegerType.instance, true);
+        expect(func1.isTypeCompatible(func5)).to.be.false;
+
+        // additional optional param
+        let func6 = new TypedFunctionType(FloatType.instance);
+        func6.addParameter('alpha', StringType.instance, false);
+        func6.addParameter('beta', IntegerType.instance, false);
+        func6.addParameter('charlie', IntegerType.instance, true);
+        expect(func1.isTypeCompatible(func6)).to.be.true;
+
+        // other is variadic
+        let func7 = new TypedFunctionType(StringType.instance);
+        func7.addParameter('alpha', StringType.instance, false);
+        func7.addParameter('beta', IntegerType.instance, false);
+        func7.isVariadic = true;
+        expect(func1.isTypeCompatible(func7)).to.be.false;
+
+        // both Variadic
+        let variFunc1 = new TypedFunctionType(DynamicType.instance);
+        variFunc1.isVariadic = true;
+        // both Variadic
+        let variFunc2 = new TypedFunctionType(DynamicType.instance);
+        variFunc2.isVariadic = true;
+        expect(variFunc1.isTypeCompatible(variFunc2)).to.be.true;
+    });
+});
diff --git a/src/types/TypedFunctionType.ts b/src/types/TypedFunctionType.ts
new file mode 100644
index 000000000..1e82a8beb
--- /dev/null
+++ b/src/types/TypedFunctionType.ts
@@ -0,0 +1,174 @@
+import { isDynamicType, isObjectType, isTypedFunctionType, isTypeStatementType } from '../astUtils/reflection';
+import { BaseFunctionType } from './BaseFunctionType';
+import type { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { TypeCompatibilityData } from '../interfaces';
+
+export class TypedFunctionType extends BaseFunctionType {
+    constructor(
+        public returnType: BscType
+    ) {
+        super();
+    }
+
+    public readonly kind = BscTypeKind.TypedFunctionType;
+
+    /**
+     * The name of the function for this type. Can be null
+     */
+    public name: string;
+
+    /**
+     * Determines if this is a sub or not
+     */
+    public isSub = false;
+
+    /**
+     * Does this function accept more args than just those in this.params
+     */
+    public isVariadic = false;
+
+    public params = [] as Array<{ name: string; type: BscType; isOptional: boolean }>;
+
+    public setName(name: string) {
+        this.name = name;
+        return this;
+    }
+
+    public setSub(isSub: boolean) {
+        this.isSub = isSub;
+        return this;
+    }
+
+    public addParameter(name: string, type: BscType, isOptional: boolean) {
+        this.params.push({
+            name: name,
+            type: type,
+            isOptional: isOptional === true ? true : false
+        });
+        return this;
+    }
+
+    public isTypeCompatible(targetType: BscType, data: TypeCompatibilityData = {}) {
+        data = data || {};
+        if (!data.actualType) {
+            data.actualType = targetType;
+        }
+        while (isTypeStatementType(targetType)) {
+            targetType = targetType.wrappedType;
+        }
+        if (
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data)
+        ) {
+            return true;
+        }
+        if (isTypedFunctionType(targetType)) {
+            if (this === targetType) {
+                return true;
+            }
+            return this.checkParamsAndReturnValue(targetType, true, (t1, t2, d) => t1.isTypeCompatible(t2, d), data);
+        }
+        return false;
+    }
+
+    public toString() {
+        let paramTexts = [];
+        for (let param of this.params) {
+            paramTexts.push(`${param.name}${param.isOptional ? '?' : ''} as ${param.type.toString()}`);
+        }
+        let variadicText = '';
+        if (this.isVariadic) {
+            if (paramTexts.length > 0) {
+                variadicText += ', ';
+            }
+            variadicText += '...';
+        }
+        return `${this.isSub ? 'sub' : 'function'} ${this.name ?? ''}(${paramTexts.join(', ')}${variadicText}) as ${this.returnType.toString()}`;
+    }
+
+    public toTypeString(): string {
+        return 'Function';
+    }
+
+    isEqual(targetType: BscType, data: TypeCompatibilityData = {}) {
+        if (isTypedFunctionType(targetType)) {
+            const checkNames = data?.allowNameEquality ?? true;
+            if (checkNames && this.toString().toLowerCase() === targetType.toString().toLowerCase()) {
+                // this function has the same param names and types and return type as the target
+                return true;
+            }
+            return this.checkParamsAndReturnValue(targetType, false, (t1, t2, predData = {}) => {
+                return t1.isEqual(t2, { ...predData, allowNameEquality: checkNames });
+            }, data);
+        }
+        return false;
+    }
+
+    private checkParamsAndReturnValue(targetType: TypedFunctionType, allowOptionalParamDifferences: boolean, predicate: (type1: BscType, type2: BscType, data: TypeCompatibilityData) => boolean, data?: TypeCompatibilityData) {
+        //compare all parameters
+        let len = Math.max(this.params.length, targetType.params.length);
+        for (let i = 0; i < len; i++) {
+            let myParam = this.params[i];
+            let targetParam = targetType.params[i];
+            const paramTypeData: TypeCompatibilityData = {};
+            if (allowOptionalParamDifferences && !myParam && targetParam.isOptional) {
+                // target func has MORE (optional) params... that's ok
+                break;
+            }
+
+            if (!myParam || !targetParam || !predicate(myParam.type, targetParam.type, paramTypeData)) {
+                data = data ?? {};
+                data.parameterMismatches = data.parameterMismatches ?? [];
+                paramTypeData.expectedType = paramTypeData.expectedType ?? myParam?.type;
+                paramTypeData.actualType = paramTypeData.actualType ?? targetParam?.type;
+                if (!targetParam || !myParam) {
+                    data.expectedParamCount = this.params.length;
+                    data.actualParamCount = targetType.params.length;
+                }
+                data.parameterMismatches.push({ index: i, data: paramTypeData });
+                data.expectedType = data.expectedType ?? this;
+                data.actualType = data.actualType ?? targetType;
+                return false;
+            }
+            if ((!allowOptionalParamDifferences && myParam.isOptional !== targetParam.isOptional) ||
+                (!myParam.isOptional && targetParam.isOptional)) {
+                data = data ?? {};
+                data.parameterMismatches = data.parameterMismatches ?? [];
+                data.parameterMismatches.push({ index: i, expectedOptional: myParam.isOptional, actualOptional: targetParam.isOptional, data: paramTypeData });
+                data.expectedType = this;
+                data.actualType = targetType;
+                return false;
+            }
+        }
+        //compare return type
+        const returnTypeData: TypeCompatibilityData = {};
+        if (!this.returnType || !targetType.returnType || !predicate(this.returnType, targetType.returnType, data)) {
+            data = data ?? {};
+            returnTypeData.expectedType = returnTypeData.expectedType ?? this.returnType;
+            returnTypeData.actualType = returnTypeData.actualType ?? targetType.returnType;
+            data.returnTypeMismatch = returnTypeData;
+            data.expectedType = this;
+            data.actualType = targetType;
+            return false;
+        }
+        //compare Variadic
+        if (this.isVariadic !== targetType.isVariadic) {
+            data = data ?? {};
+            data.expectedVariadic = this.isVariadic;
+            data.actualVariadic = targetType.isVariadic;
+            data.expectedType = data.expectedType ?? this;
+            data.actualType = data.actualType ?? targetType;
+            return false;
+        }
+        //made it here, all params and return type pass predicate
+        return true;
+    }
+}
+
+BuiltInInterfaceAdder.typedFunctionFactory = (returnType: BscType) => {
+    return new TypedFunctionType(returnType);
+};
diff --git a/src/types/UninitializedType.ts b/src/types/UninitializedType.ts
index 8b49654d1..885086e42 100644
--- a/src/types/UninitializedType.ts
+++ b/src/types/UninitializedType.ts
@@ -1,16 +1,20 @@
-import type { BscType } from './BscType';
-import { DynamicType } from './DynamicType';
+import { isUninitializedType } from '../astUtils/reflection';
+import type { TypeCompatibilityData } from '../interfaces';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
 
-export class UninitializedType implements BscType {
+export class UninitializedType extends BscType {
     public isAssignableTo(targetType: BscType) {
-        return (
-            targetType instanceof UninitializedType ||
-            targetType instanceof DynamicType
-        );
+        return false;
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
+    public readonly kind = BscTypeKind.UninitializedType;
+
+    public isBuiltIn = true;
+    public static instance = new UninitializedType();
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        return false;
     }
 
     public toString() {
@@ -18,10 +22,15 @@ export class UninitializedType implements BscType {
     }
 
     public toTypeString(): string {
-        return this.toString();
+        throw new Error('Uninitialized type cannot be used in code');
     }
 
-    public clone() {
-        return new UninitializedType();
+    public isEqual(targetType: BscType): boolean {
+        return isUninitializedType(targetType);
     }
 }
+
+
+export function uninitializedTypeFactory() {
+    return UninitializedType.instance;
+}
diff --git a/src/types/UnionType.spec.ts b/src/types/UnionType.spec.ts
new file mode 100644
index 000000000..29896a1fc
--- /dev/null
+++ b/src/types/UnionType.spec.ts
@@ -0,0 +1,240 @@
+import { expect } from 'chai';
+import { StringType } from './StringType';
+import { IntegerType } from './IntegerType';
+import { UnionType } from './UnionType';
+import { FloatType } from './FloatType';
+import { InterfaceType } from './InterfaceType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { BooleanType } from './BooleanType';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { isReferenceType, isTypePropertyReferenceType, isUnionType } from '../astUtils/reflection';
+import { TypedFunctionType } from './TypedFunctionType';
+import { SymbolTable } from '../SymbolTable';
+import { ReferenceType } from './ReferenceType';
+import { DoubleType } from './DoubleType';
+import { LongIntegerType } from './LongIntegerType';
+import { ObjectType } from './ObjectType';
+
+
+describe('UnionType', () => {
+    it('can be assigned to by anything that can be assigned to an included type', () => {
+        const parentIFace = new InterfaceType('IfaceParent');
+        parentIFace.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        const iFace = new InterfaceType('IfaceChild', parentIFace);
+        iFace.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+
+        const otheriFaceWithSameMembers = new InterfaceType('OtherIface');
+        otheriFaceWithSameMembers.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        otheriFaceWithSameMembers.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        otheriFaceWithSameMembers.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+        const myUnion = new UnionType([FloatType.instance, iFace, StringType.instance]);
+
+        expect(myUnion.isTypeCompatible(FloatType.instance)).to.be.true;
+        expect(myUnion.isTypeCompatible(StringType.instance)).to.be.true;
+        expect(myUnion.isTypeCompatible(otheriFaceWithSameMembers)).to.be.true;
+        expect(otheriFaceWithSameMembers.isTypeCompatible(myUnion)).to.be.false;
+    });
+
+    it('can assign to a more general Union', () => {
+        const myUnion = new UnionType([StringType.instance, FloatType.instance]);
+        const otherUnion = new UnionType([FloatType.instance, StringType.instance, BooleanType.instance]);
+
+        expect(myUnion.isTypeCompatible(otherUnion)).to.be.false;
+        expect(otherUnion.isTypeCompatible(myUnion)).to.be.true;
+    });
+
+    it('can assign to a more general Union with interfaces', () => {
+        const parentIFace = new InterfaceType('IfaceParent');
+        parentIFace.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        const iFace = new InterfaceType('IfaceChild', parentIFace);
+        iFace.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        iFace.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+        const myUnion = new UnionType([FloatType.instance, iFace, StringType.instance, BooleanType.instance]);
+
+        const otheriFaceWithSameMembers = new InterfaceType('OtherIface');
+        otheriFaceWithSameMembers.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        otheriFaceWithSameMembers.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        otheriFaceWithSameMembers.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+        const otherUnion = new UnionType([FloatType.instance, otheriFaceWithSameMembers, StringType.instance]);
+
+        expect(myUnion.isTypeCompatible(otherUnion)).to.be.true;
+        expect(otherUnion.isTypeCompatible(myUnion)).to.be.false;
+    });
+
+    it('will get a string representation in order given', () => {
+        const iFace1 = new InterfaceType('SomeIface');
+        iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+        iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        iFace1.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+        const myUnion = new UnionType([FloatType.instance, StringType.instance, BooleanType.instance, iFace1]);
+
+        expect(myUnion.toString()).to.eq('float or string or boolean or SomeIface');
+    });
+
+    describe('getMemberType', () => {
+        it('will find the union of inner types', () => {
+            const iFace1 = new InterfaceType('iFace1');
+            iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+            const iFace2 = new InterfaceType('iFace2');
+            iFace2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('height', null, StringType.instance, SymbolTypeFlag.runtime);
+
+            const myUnion = new UnionType([iFace1, iFace2]);
+
+            const options = { flags: SymbolTypeFlag.runtime };
+            const ageType = myUnion.getMemberType('age', options);
+            expectTypeToBe(ageType, IntegerType);
+            const nameType = myUnion.getMemberType('name', options);
+            expectTypeToBe(nameType, StringType);
+            const heightType = myUnion.getMemberType('height', options);
+            expectTypeToBe(heightType, UnionType);
+            const heightTypes = (heightType as UnionType).types;
+            expect(heightTypes).to.include(FloatType.instance);
+            expect(heightTypes).to.include(StringType.instance);
+        });
+
+
+        it('will return reference types if any inner type does not include the member', () => {
+            const iFace1 = new InterfaceType('iFace1');
+            iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+            const iFace2 = new InterfaceType('iFace2');
+            iFace2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+
+            const myUnion = new UnionType([iFace1, iFace2]);
+            const options = { flags: SymbolTypeFlag.runtime };
+            const heightType1 = myUnion.getMemberType('height', options);
+            expectTypeToBe(heightType1, UnionType);
+            const heightTypes1 = (heightType1 as UnionType).types;
+            expect(heightTypes1.length).to.eq(2);
+            expectTypeToBe(heightTypes1[0], FloatType);
+            // height does not exist in iFace2
+            expect(isReferenceType(heightTypes1[1])).to.be.true;
+            expect(heightTypes1[1].isResolvable()).to.be.false;
+
+            iFace2.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+            const heightType2 = myUnion.getMemberType('height', options);
+            expectTypeToBe(heightType2, FloatType);
+        });
+    });
+
+    describe('getMemberTable', () => {
+        it('get an intersection of all member types', () => {
+            const iFace1 = new InterfaceType('iFace1');
+            iFace1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('height', null, FloatType.instance, SymbolTypeFlag.runtime);
+            iFace1.addMember('weight', null, FloatType.instance, SymbolTypeFlag.runtime);
+
+            const iFace2 = new InterfaceType('iFace2');
+            iFace2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('height', null, StringType.instance, SymbolTypeFlag.runtime);
+            iFace2.addMember('address', null, StringType.instance, SymbolTypeFlag.runtime);
+
+            const myUnion = new UnionType([iFace1, iFace2]);
+
+            const unionMemberTable = myUnion.getMemberTable();
+            const options = { flags: SymbolTypeFlag.runtime };
+
+            expectTypeToBe(unionMemberTable.getSymbolType('age', options), IntegerType);
+            expectTypeToBe(unionMemberTable.getSymbolType('name', options), StringType);
+            const heightType1 = unionMemberTable.getSymbolType('height', options);
+            expectTypeToBe(heightType1, UnionType);
+            const heightTypes1 = (heightType1 as UnionType).types;
+            expect(heightTypes1.length).to.eq(2);
+            expectTypeToBe(heightTypes1[0], FloatType);
+            expect(unionMemberTable.getSymbolType('weight', options)).to.be.undefined;
+            expect(unionMemberTable.getSymbolType('address', options)).to.be.undefined;
+
+        });
+
+    });
+
+    describe('unions of functions', () => {
+        it('gets union of return types', () => {
+            const func1 = new TypedFunctionType(StringType.instance);
+            const func2 = new TypedFunctionType(IntegerType.instance);
+            const funcUnion = new UnionType([func1, func2]);
+            const returnType = funcUnion.returnType as UnionType;
+            expectTypeToBe(returnType, UnionType);
+            expect(returnType.types).includes(StringType.instance);
+            expect(returnType.types).includes(IntegerType.instance);
+        });
+
+        it('handles reference types that resolve to functions', () => {
+            const table1 = new SymbolTable('test1');
+            const table2 = new SymbolTable('test2');
+            const func1Ref = new ReferenceType('func', 'iface1.func', SymbolTypeFlag.runtime, () => table1);
+            const func2Ref = new ReferenceType('func', 'iface2.func', SymbolTypeFlag.runtime, () => table2);
+
+            const funcUnion = new UnionType([func1Ref, func2Ref]);
+            let returnType1 = funcUnion.returnType as UnionType;
+            expect(isUnionType(returnType1)).to.be.true;
+            expect(isTypePropertyReferenceType(returnType1.types[0])).to.be.true;
+            expect(isTypePropertyReferenceType(returnType1.types[1])).to.be.true;
+            const func1 = new TypedFunctionType(StringType.instance);
+            const func2 = new TypedFunctionType(IntegerType.instance);
+            table1.addSymbol('func', {}, func1, SymbolTypeFlag.runtime);
+            table2.addSymbol('func', {}, func2, SymbolTypeFlag.runtime);
+
+            let returnType = funcUnion.returnType;
+            expectTypeToBe(returnType, UnionType);
+            expect((returnType as UnionType).types).includes(StringType.instance);
+            expect((returnType as UnionType).types).includes(IntegerType.instance);
+        });
+    });
+
+    describe('toTypeString', () => {
+        it('should give single type when unions of same type', () => {
+            let ut = new UnionType([FloatType.instance, FloatType.instance]);
+            expect(ut.toTypeString()).to.eq('float');
+            ut = new UnionType([IntegerType.instance, IntegerType.instance, IntegerType.instance]);
+            expect(ut.toTypeString()).to.eq('integer');
+            ut = new UnionType([LongIntegerType.instance, LongIntegerType.instance]);
+            expect(ut.toTypeString()).to.eq('longinteger');
+            ut = new UnionType([DoubleType.instance, DoubleType.instance]);
+            expect(ut.toTypeString()).to.eq('double');
+        });
+
+        it('should give dynamic if types are not the same', () => {
+            let ut = new UnionType([FloatType.instance, IntegerType.instance]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+            ut = new UnionType([FloatType.instance, IntegerType.instance, DoubleType.instance]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+            ut = new UnionType([LongIntegerType.instance, IntegerType.instance]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+            ut = new UnionType([DoubleType.instance, LongIntegerType.instance]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+        });
+
+        it('should reduce object types to object', () => {
+            let ut = new UnionType([ObjectType.instance, ObjectType.instance]);
+            expect(ut.toTypeString()).to.eq('object');
+            ut = new UnionType([ObjectType.instance, ObjectType.instance, ObjectType.instance, ObjectType.instance]);
+            expect(ut.toTypeString()).to.eq('object');
+        });
+
+        it('should reduce to dynamic if non-reducible', () => {
+            let ut = new UnionType([FloatType.instance, StringType.instance]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+            ut = new UnionType([FloatType.instance, IntegerType.instance, ObjectType.instance]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+            ut = new UnionType([LongIntegerType.instance, new InterfaceType('test')]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+            ut = new UnionType([ObjectType.instance, ObjectType.instance, StringType.instance, ObjectType.instance]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+            ut = new UnionType([ObjectType.instance, new InterfaceType('test')]);
+            expect(ut.toTypeString()).to.eq('dynamic');
+        });
+    });
+});
diff --git a/src/types/UnionType.ts b/src/types/UnionType.ts
new file mode 100644
index 000000000..45a764128
--- /dev/null
+++ b/src/types/UnionType.ts
@@ -0,0 +1,221 @@
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
+import { isDynamicType, isObjectType, isTypedFunctionType, isTypeStatementType, isUnionType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { ReferenceType } from './ReferenceType';
+import { addAssociatedTypesTableAsSiblingToMemberTable, findTypeUnion, findTypeUnionDeepCheck, getAllTypesFromCompoundType, getUniqueType, isEnumTypeCompatible, joinTypesString } from './helpers';
+import { BscTypeKind } from './BscTypeKind';
+import type { TypeCacheEntry } from '../SymbolTable';
+import { SymbolTable } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import { util } from '../util';
+
+export function unionTypeFactory(types: BscType[]) {
+    return new UnionType(types);
+}
+
+export class UnionType extends BscType {
+    constructor(
+        public types: BscType[]
+    ) {
+        super(joinTypesString(types, 'or', BscTypeKind.UnionType));
+        this.callFuncAssociatedTypesTable = new SymbolTable(`Union: CallFuncAssociatedTypes`);
+    }
+
+    public readonly kind = BscTypeKind.UnionType;
+
+    public readonly callFuncAssociatedTypesTable: SymbolTable;
+
+    public addType(type: BscType) {
+        this.types.push(type);
+    }
+
+    isResolvable(): boolean {
+        for (const type of this.types) {
+            if (!type.isResolvable()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private getMemberTypeFromInnerTypes(name: string, options: GetTypeOptions) {
+        return this.types.map((innerType) => innerType?.getMemberType(name, options));
+    }
+
+    private getCallFuncFromInnerTypes(name: string, options: GetTypeOptions) {
+        return this.types.map((innerType) => innerType?.getCallFuncType(name, options));
+    }
+
+    getMemberType(name: string, options: GetTypeOptions) {
+        const innerTypesMemberTypes = this.getMemberTypeFromInnerTypes(name, options);
+        if (!innerTypesMemberTypes || innerTypesMemberTypes.includes(undefined)) {
+            // We don't have any members of any inner types that match
+            // so instead, create reference type that will
+            return new ReferenceType(name, name, options.flags, () => {
+                return {
+                    name: `UnionType MemberTable: '${this.__identifier}'`,
+                    getSymbolType: (innerName: string, innerOptions: GetTypeOptions) => {
+                        const referenceTypeInnerMemberTypes = this.getMemberTypeFromInnerTypes(name, options);
+                        if (!referenceTypeInnerMemberTypes || referenceTypeInnerMemberTypes.includes(undefined)) {
+                            return undefined;
+                        }
+                        return getUniqueType(findTypeUnion(referenceTypeInnerMemberTypes), unionTypeFactory);
+                    },
+                    setCachedType: (innerName: string, innerCacheEntry: TypeCacheEntry, innerOptions: GetTypeOptions) => {
+                        // TODO: is this even cachable? This is a NO-OP for now, and it shouldn't hurt anything
+                    },
+                    addSibling: (symbolTable: SymbolTable) => {
+                        // TODO: I don't know what this means in this context?
+                    }
+                };
+            });
+        }
+        return getUniqueType(findTypeUnion(innerTypesMemberTypes), unionTypeFactory);
+    }
+
+    getCallFuncType(name: string, options: GetTypeOptions) {
+        const innerTypesMemberTypes = this.getCallFuncFromInnerTypes(name, options);
+        if (!innerTypesMemberTypes || innerTypesMemberTypes.includes(undefined)) {
+            // We don't have any members of any inner types that match
+            // so instead, create reference type that will
+            return new ReferenceType(name, name, options.flags, () => {
+                return {
+                    name: `UnionType CallFunc MemberTable: '${this.__identifier}'`,
+                    getSymbolType: (innerName: string, innerOptions: GetTypeOptions) => {
+                        const referenceTypeInnerMemberTypes = this.getCallFuncFromInnerTypes(name, options);
+                        if (!referenceTypeInnerMemberTypes || referenceTypeInnerMemberTypes.includes(undefined)) {
+                            return undefined;
+                        }
+                        return getUniqueType(findTypeUnionDeepCheck(referenceTypeInnerMemberTypes), unionTypeFactory);
+                    },
+                    setCachedType: (innerName: string, innerCacheEntry: TypeCacheEntry, innerOptions: GetTypeOptions) => {
+                        // TODO: is this even cachable? This is a NO-OP for now, and it shouldn't hurt anything
+                    },
+                    addSibling: (symbolTable: SymbolTable) => {
+                        // TODO: I don't know what this means in this context?
+                    }
+                };
+            });
+        }
+        const resultCallFuncType = getUniqueType(findTypeUnionDeepCheck(innerTypesMemberTypes), unionTypeFactory, false);
+
+
+        if (isTypedFunctionType(resultCallFuncType)) {
+            const typesToCheck = [...resultCallFuncType.params.map(p => p.type), resultCallFuncType.returnType];
+
+            for (const type of typesToCheck) {
+                addAssociatedTypesTableAsSiblingToMemberTable(type, this.callFuncAssociatedTypesTable, SymbolTypeFlag.runtime);
+            }
+        }
+        return resultCallFuncType;
+    }
+
+    get returnType() {
+        return util.getReturnTypeOfUnionOfFunctions(this);
+    }
+
+
+    isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData): boolean {
+        while (isTypeStatementType(targetType)) {
+            targetType = targetType.wrappedType;
+        }
+        if (isDynamicType(targetType) || isObjectType(targetType) || this === targetType) {
+            return true;
+        }
+        if (isEnumTypeCompatible(this, targetType, data)) {
+            return true;
+        }
+        if (isUnionType(targetType)) {
+            // check if this set of inner types is a SUPERSET of targetTypes's inner types
+            for (const targetInnerType of targetType.types) {
+                if (!this.isTypeCompatible(targetInnerType, data)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        for (const innerType of this.types) {
+            const foundCompatibleInnerType = innerType.isTypeCompatible(targetType, data);
+            if (foundCompatibleInnerType) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+    toString(): string {
+        return joinTypesString(this.types, 'or', BscTypeKind.UnionType);
+    }
+
+    /**
+     * Used for transpilation
+     */
+    toTypeString(): string {
+        const uniqueTypeStrings = new Set<string>(getAllTypesFromCompoundType(this).map(t => t.toTypeString()));
+
+        if (uniqueTypeStrings.size === 1) {
+            return uniqueTypeStrings.values().next().value;
+        }
+        return 'dynamic';
+    }
+
+    checkAllMemberTypes(predicate: (BscType) => boolean) {
+        return this.types.reduce((acc, type) => {
+            return acc && predicate(type);
+        }, true);
+    }
+
+    isEqual(targetType: BscType): boolean {
+        if (!isUnionType(targetType)) {
+            return false;
+        }
+        if (this === targetType) {
+            return true;
+        }
+
+        if (this.types.length !== targetType.types.length) {
+            return false;
+        }
+        for (const type of this.types) {
+            let foundMatch = false;
+            for (const targetTypeInner of targetType.types) {
+                if (type.isEqual(targetTypeInner)) {
+                    foundMatch = true;
+                    break;
+                }
+            }
+            if (!foundMatch) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    getMemberTable(): SymbolTable {
+        const unionTable = new SymbolTable(this.__identifier + ' UnionTable');
+        const firstType = this.types[0];
+        if (!firstType) {
+            return unionTable;
+        }
+        firstType.addBuiltInInterfaces();
+        for (const symbol of firstType.getMemberTable().getAllSymbols(SymbolTypeFlag.runtime)) {
+            const foundType = this.getMemberTypeFromInnerTypes(symbol.name, { flags: SymbolTypeFlag.runtime });
+            const allResolvableTypes = foundType.reduce((acc, curType) => {
+                return acc && curType?.isResolvable();
+            }, true);
+
+            if (!allResolvableTypes) {
+                continue;
+            }
+            const uniqueType = getUniqueType(findTypeUnion(foundType), unionTypeFactory);
+            unionTable.addSymbol(symbol.name, {}, uniqueType, SymbolTypeFlag.runtime);
+        }
+        return unionTable;
+    }
+}
+
+
+BuiltInInterfaceAdder.unionTypeFactory = (types: BscType[]) => {
+    return new UnionType(types);
+};
diff --git a/src/types/VoidType.spec.ts b/src/types/VoidType.spec.ts
index b333183eb..9eabfd692 100644
--- a/src/types/VoidType.spec.ts
+++ b/src/types/VoidType.spec.ts
@@ -5,7 +5,7 @@ import { VoidType } from './VoidType';
 
 describe('VoidType', () => {
     it('is equivalent to dynamic types', () => {
-        expect(new VoidType().isAssignableTo(new VoidType())).to.be.true;
-        expect(new VoidType().isAssignableTo(new DynamicType())).to.be.true;
+        expect(new VoidType().isTypeCompatible(new VoidType())).to.be.true;
+        expect(new VoidType().isTypeCompatible(new DynamicType())).to.be.true;
     });
 });
diff --git a/src/types/VoidType.ts b/src/types/VoidType.ts
index 6104913e0..9870291fe 100644
--- a/src/types/VoidType.ts
+++ b/src/types/VoidType.ts
@@ -1,31 +1,43 @@
-import type { BscType } from './BscType';
+import { isDynamicType, isObjectType, isVoidType } from '../astUtils/reflection';
+import { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isUnionTypeCompatible } from './helpers';
+import { BuiltInInterfaceAdder } from './BuiltInInterfaceAdder';
+import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
 import { DynamicType } from './DynamicType';
 
-export class VoidType implements BscType {
-    constructor(
-        public typeText?: string
-    ) { }
+export class VoidType extends BscType {
 
-    public isAssignableTo(targetType: BscType) {
+    public readonly kind = BscTypeKind.VoidType;
+
+    public static instance = new VoidType();
+
+    public isBuiltIn = true;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
         return (
-            targetType instanceof VoidType ||
-            targetType instanceof DynamicType
+            isVoidType(targetType) ||
+            isDynamicType(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data)
         );
     }
 
-    public isConvertibleTo(targetType: BscType) {
-        return this.isAssignableTo(targetType);
-    }
-
     public toString() {
-        return this.typeText ?? 'void';
+        return 'void';
     }
 
     public toTypeString(): string {
         return this.toString();
     }
 
-    public clone() {
-        return new VoidType(this.typeText);
+    public isEqual(targetType: BscType) {
+        return isVoidType(targetType);
+    }
+
+    getMemberType(memberName: string, options: GetTypeOptions) {
+        return DynamicType.instance;
     }
 }
+
+BuiltInInterfaceAdder.primitiveTypeInstanceCache.set('void', VoidType.instance);
diff --git a/src/types/helper.spec.ts b/src/types/helper.spec.ts
new file mode 100644
index 000000000..69c4d40e8
--- /dev/null
+++ b/src/types/helper.spec.ts
@@ -0,0 +1,208 @@
+import { expect, assert } from 'chai';
+import { isUnionType } from '../astUtils/reflection';
+import { expectTypeToBe } from '../testHelpers.spec';
+import { ClassType } from './ClassType';
+import { DynamicType } from './DynamicType';
+import { FloatType } from './FloatType';
+import { IntegerType } from './IntegerType';
+import { StringType } from './StringType';
+import { UnionType, unionTypeFactory } from './UnionType';
+import { findTypeIntersection, findTypeUnion, getUniqueType, getUniqueTypesFromArray, reduceTypesToMostGeneric } from './helpers';
+import { InterfaceType } from './InterfaceType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import { DoubleType } from './DoubleType';
+import { BooleanType } from './BooleanType';
+import { EnumType, EnumMemberType } from './EnumType';
+import { ReferenceType, TypePropertyReferenceType } from './ReferenceType';
+import { SymbolTable } from '../SymbolTable';
+
+
+describe('findTypeIntersection', () => {
+
+    it('should return the intersection if the arrays have one element', () => {
+        const intersection = findTypeIntersection([IntegerType.instance], [IntegerType.instance]);
+        expect(intersection.length).to.eq(1);
+        expect(intersection).to.include(IntegerType.instance);
+    });
+
+    it('should return empty array if no common types', () => {
+        let intersection = findTypeIntersection([IntegerType.instance], [StringType.instance]);
+        expect(intersection.length).to.eq(0);
+        intersection = findTypeIntersection([IntegerType.instance, DoubleType.instance], [FloatType.instance, StringType.instance]);
+        expect(intersection.length).to.eq(0);
+    });
+
+    it('should return minimum intersection', () => {
+        let intersection = findTypeIntersection([DoubleType.instance, IntegerType.instance, BooleanType.instance], [BooleanType.instance, FloatType.instance, IntegerType.instance, StringType.instance]);
+        expect(intersection.length).to.eq(2);
+        expect(intersection).to.include(IntegerType.instance);
+        expect(intersection).to.include(BooleanType.instance);
+    });
+});
+
+
+describe('findTypeUnion', () => {
+
+    it('should return the intersection if the arrays have one element', () => {
+        const union = findTypeUnion([IntegerType.instance], [IntegerType.instance]);
+        expect(union.length).to.eq(1);
+        expect(union).to.include(IntegerType.instance);
+    });
+
+    it('should not have duplicates', () => {
+        let union = findTypeUnion([IntegerType.instance, StringType.instance], [StringType.instance, IntegerType.instance, FloatType.instance]);
+        expect(union.length).to.eq(3);
+    });
+
+    it('should return array of all types', () => {
+        let union = findTypeUnion([IntegerType.instance], [StringType.instance]);
+        expect(union.length).to.eq(2);
+        union = findTypeUnion([IntegerType.instance, DoubleType.instance], [FloatType.instance, StringType.instance]);
+        expect(union.length).to.eq(4);
+    });
+});
+
+
+describe('getUniqueTypesFromArray', () => {
+
+    it('should return the single type from arrays have one element', () => {
+        let intersection = getUniqueTypesFromArray([IntegerType.instance]);
+        expect(intersection.length).to.eq(1);
+        expect(intersection).to.include(IntegerType.instance);
+        getUniqueTypesFromArray([IntegerType.instance, IntegerType.instance, IntegerType.instance, IntegerType.instance]);
+        expect(intersection.length).to.eq(1);
+        expect(intersection).to.include(IntegerType.instance);
+    });
+
+    it('should return an array with no duplicates', () => {
+        let intersection = getUniqueTypesFromArray([IntegerType.instance, StringType.instance, IntegerType.instance, StringType.instance, IntegerType.instance, StringType.instance]);
+        expect(intersection.length).to.eq(2);
+        expect(intersection).to.include(IntegerType.instance);
+        expect(intersection).to.include(StringType.instance);
+    });
+
+    it('should not worry about inheritance ', () => {
+        let klass = new ClassType('Klass');
+        let subklass = new ClassType('Subklass', klass);
+        let intersection = getUniqueTypesFromArray([klass, subklass, subklass, klass, klass]);
+        expect(intersection.length).to.eq(2);
+        expect(intersection).to.include(klass);
+        expect(intersection).to.include(subklass);
+    });
+
+    it('should not reduce TypePropertyReferenceTypes', () => {
+        const table = new SymbolTable('test');
+        const refType1 = new ReferenceType('func1', 'func1', SymbolTypeFlag.runtime, () => table);
+        const retRefType1 = new TypePropertyReferenceType(refType1, 'returnType');
+        const refType2 = new ReferenceType('func2', 'func2', SymbolTypeFlag.runtime, () => table);
+        const retRefType2 = new TypePropertyReferenceType(refType2, 'returnType');
+        const uniqueTypes = getUniqueTypesFromArray([retRefType1, retRefType2]);
+        expect(uniqueTypes.length).to.eq(2);
+    });
+});
+
+
+describe('getUniqueType', () => {
+
+    it('should return a single type if only one is given', () => {
+        expectTypeToBe(getUniqueType([IntegerType.instance], unionTypeFactory), IntegerType);
+    });
+
+    it('should return a single type if all types are the same', () => {
+        expectTypeToBe(getUniqueType([IntegerType.instance, IntegerType.instance, IntegerType.instance], unionTypeFactory), IntegerType);
+    });
+
+    it('should return dynamic if dynamic is included', () => {
+        expectTypeToBe(getUniqueType([IntegerType.instance, DynamicType.instance, StringType.instance], unionTypeFactory), DynamicType);
+    });
+
+    it('should return the most general type of all types inputed', () => {
+        const superKlassType = new ClassType('Super');
+        const subKlassType = new ClassType('Sub', superKlassType);
+        expect(getUniqueType([subKlassType, superKlassType], unionTypeFactory).toString()).to.eq('Super');
+        expect(getUniqueType([subKlassType, subKlassType], unionTypeFactory).toString()).to.eq('Sub');
+        expect(getUniqueType([superKlassType, subKlassType], unionTypeFactory).toString()).to.eq('Super');
+        expect(getUniqueType([subKlassType, superKlassType, subKlassType], unionTypeFactory).toString()).to.eq('Super');
+    });
+
+    it('should return a union type of unique types', () => {
+        const resultType = getUniqueType([IntegerType.instance, StringType.instance, IntegerType.instance, FloatType.instance], unionTypeFactory);
+        expectTypeToBe(resultType, UnionType);
+        if (isUnionType(resultType)) {
+            expect(resultType.types.length).to.eq(3);
+            expect(resultType.types).to.include(IntegerType.instance);
+            expect(resultType.types).to.include(StringType.instance);
+            expect(resultType.types).to.include(FloatType.instance);
+
+        } else {
+            assert.fail('Should be UnionType');
+        }
+    });
+
+    it('should return a a union type of two compatible interfaces', () => {
+        const iface1 = new InterfaceType('iface1');
+        iface1.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        iface1.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+
+        const iface2 = new InterfaceType('iface2');
+        iface2.addMember('name', null, StringType.instance, SymbolTypeFlag.runtime);
+        iface2.addMember('age', null, IntegerType.instance, SymbolTypeFlag.runtime);
+
+        expect(iface1.isTypeCompatible(iface2)).to.be.true;
+        expect(iface2.isTypeCompatible(iface1)).to.be.true;
+        expect(iface1.isEqual(iface2)).to.be.false;
+
+        const resultType = getUniqueType([iface1, iface2], unionTypeFactory);
+        expectTypeToBe(resultType, UnionType);
+        if (isUnionType(resultType)) {
+            expect(resultType.types.length).to.eq(2);
+            expect(resultType.types).to.include(iface1);
+            expect(resultType.types).to.include(iface2);
+
+        } else {
+            assert.fail('Should be UnionType');
+        }
+    });
+});
+
+describe('isEnumTypeCompatible', () => {
+    it('should be true when an enum that is an int is passed to a number type', () => {
+        const myEnum = new EnumType('test', IntegerType.instance);
+        const myEnumMember = new EnumMemberType('test', 'val1', IntegerType.instance);
+
+        expect(IntegerType.instance.isTypeCompatible(myEnum)).to.be.true;
+        expect(FloatType.instance.isTypeCompatible(myEnum)).to.be.true;
+        expect(DoubleType.instance.isTypeCompatible(myEnum)).to.be.true;
+
+        expect(IntegerType.instance.isTypeCompatible(myEnumMember)).to.be.true;
+        expect(FloatType.instance.isTypeCompatible(myEnumMember)).to.be.true;
+        expect(DoubleType.instance.isTypeCompatible(myEnumMember)).to.be.true;
+
+        expect(StringType.instance.isTypeCompatible(myEnum)).to.be.false;
+        expect(StringType.instance.isTypeCompatible(myEnumMember)).to.be.false;
+    });
+
+
+});
+
+describe('reduceTypesToMostGeneric', () => {
+
+    it('should not reduce TypePropertyReferenceTypes', () => {
+        const table = new SymbolTable('test');
+        const refType1 = new ReferenceType('func1', 'func1', SymbolTypeFlag.runtime, () => table);
+        const retRefType1 = new TypePropertyReferenceType(refType1, 'returnType');
+        const refType2 = new ReferenceType('func2', 'func2', SymbolTypeFlag.runtime, () => table);
+        const retRefType2 = new TypePropertyReferenceType(refType2, 'returnType');
+        const genericTypes = reduceTypesToMostGeneric([retRefType1, retRefType2]);
+        expect(genericTypes.length).to.eq(2);
+    });
+
+    it('should handle unions of unions', () => {
+        const union1 = new UnionType([IntegerType.instance, StringType.instance]);
+        const union2 = new UnionType([StringType.instance, FloatType.instance]);
+        const genericTypes = reduceTypesToMostGeneric([union1, union2]);
+        expect(genericTypes.length).to.eq(2);
+        expect(genericTypes).to.include(union1);
+        expect(genericTypes).to.include(union2);
+    });
+});
diff --git a/src/types/helpers.ts b/src/types/helpers.ts
new file mode 100644
index 000000000..3d98a6f64
--- /dev/null
+++ b/src/types/helpers.ts
@@ -0,0 +1,345 @@
+import type { TypeCompatibilityData } from '../interfaces';
+import { isAnyReferenceType, isArrayDefaultTypeReferenceType, isAssociativeArrayTypeLike, isCompoundType, isDynamicType, isEnumMemberType, isEnumType, isInheritableType, isInterfaceType, isIntersectionType, isObjectType, isReferenceType, isTypePropertyReferenceType, isTypeStatementType, isUnionType, isUnionTypeOf, isVoidType } from '../astUtils/reflection';
+import type { BscType } from './BscType';
+import type { UnionType } from './UnionType';
+import type { SymbolTable } from '../SymbolTable';
+import type { SymbolTypeFlag } from '../SymbolTypeFlag';
+import type { IntersectionType } from './IntersectionType';
+import type { BscTypeKind } from './BscTypeKind';
+
+export function findTypeIntersection(typesArr1: BscType[], typesArr2: BscType[]) {
+    if (!typesArr1 || !typesArr2) {
+        return undefined;
+    }
+    return typesArr1?.filter((currentType) => {
+        if (!currentType) {
+            return false;
+        }
+        const indexOfCurrentTypeInArr2 = typesArr2.findIndex((checkType) => {
+            return currentType.isEqual(checkType);
+        });
+        return indexOfCurrentTypeInArr2 >= 0;
+    });
+}
+
+export function findTypeUnion(...typesArr: BscType[][]) {
+    return getUniqueTypesFromArray([].concat(...typesArr));
+}
+
+/**
+ * Same as findTypeUnion, but does not allow short cutting by just checking names
+ * Useful for checking types between callfuncs, as the parameter types may have the same name, but mean different things
+ */
+export function findTypeUnionDeepCheck(...typesArr: BscType[][]) {
+    return getUniqueTypesFromArray([].concat(...typesArr), false);
+}
+
+export function getUniqueTypesFromArray(types: BscType[], allowNameEquality = true) {
+    if (!types) {
+        return undefined;
+    }
+    return types?.filter((currentType, currentIndex) => {
+        if (!currentType) {
+            return false;
+        }
+        while (isTypeStatementType(currentType)) {
+            currentType = currentType.wrappedType;
+        }
+        if ((isTypePropertyReferenceType(currentType) || isArrayDefaultTypeReferenceType(currentType)) && !currentType.isResolvable()) {
+            return true;
+        }
+        const latestIndex = types.findIndex((checkType) => {
+            while (isTypeStatementType(checkType)) {
+                checkType = checkType.wrappedType;
+            }
+            return currentType.isEqual(checkType, { allowNameEquality: allowNameEquality });
+        });
+        // the index that was found is the index we're checking --- there are no equal types after this
+        return latestIndex === currentIndex;
+    });
+}
+
+/**
+ * Reduces a list of types based on equality or inheritance
+ * If all types are the same - just that type is returned
+ * If one of the types is Dynamic, then Dynamic.instance is returned
+ * If any types inherit another type, the more general type is returned
+ * @param types array of types
+ * @returns an array of the most general types
+ */
+export function reduceTypesToMostGeneric(types: BscType[], allowNameEquality = true): BscType[] {
+    if (!types || types?.length === 0) {
+        return undefined;
+    }
+
+    if (types.length === 1) {
+        // only one type
+        return [types[0]];
+    }
+
+    types = types.map(t => {
+        if (isReferenceType(t) && t.isResolvable()) {
+            return (t as any).getTarget() ?? t;
+        }
+        return t;
+    });
+
+    // Get a list of unique types, based on the `isEqual()` method
+    const uniqueTypes = getUniqueTypesFromArray(types, allowNameEquality).map(t => {
+        // map to object with `shouldIgnore` flag
+        return { type: t, shouldIgnore: false };
+    });
+
+    if (uniqueTypes.length === 1) {
+        // only one type after filtering
+        return [uniqueTypes[0].type];
+    }
+    const existingDynamicType = uniqueTypes.find(t => !isAnyReferenceType(t.type) && isDynamicType(t.type));
+    if (existingDynamicType) {
+        // If it includes dynamic, then the result is dynamic
+        return [existingDynamicType.type];
+    }
+    const generalizedTypes = [];
+    //check assignability:
+    for (let i = 0; i < uniqueTypes.length; i++) {
+        const currentType = uniqueTypes[i].type;
+        if (i === uniqueTypes.length - 1) {
+            if (!uniqueTypes[i].shouldIgnore) {
+                //this type was not convertible to anything else... it is as general as possible
+                generalizedTypes.push(currentType);
+            }
+            break;
+        }
+        for (let j = i + 1; j < uniqueTypes.length; j++) {
+            if (uniqueTypes[j].shouldIgnore) {
+                continue;
+            }
+            const checkType = uniqueTypes[j].type;
+
+            if (currentType.isResolvable() && currentType.isEqual(uniqueTypes[j].type, { allowNameEquality: allowNameEquality })) {
+                uniqueTypes[j].shouldIgnore = true;
+            } else if (isInheritableType(currentType) && isInheritableType(checkType)) {
+                if (currentType.isTypeDescendent(checkType)) {
+                    //the type we're checking is less general than the current type... it can be ignored
+                    uniqueTypes[j].shouldIgnore = true;
+                }
+                if (checkType.isTypeDescendent(currentType)) {
+                    // the currentType is a descendent to some other type - it won't be in the final set
+                    break;
+                }
+            }
+            if (j === uniqueTypes.length - 1) {
+                //this type was not convertible to anything else... it is as general as possible
+                generalizedTypes.push(currentType);
+            }
+        }
+    }
+    return generalizedTypes;
+}
+
+
+/**
+ * Reduces a list of types based on equality or inheritance
+ * If all types are the same - just that type is returned
+ * If one of the types is Dynamic, then Dynamic.instance is returned
+ * If any types inherit another type, the more Specific type is returned, eg. the one with the most members
+ * @param types array of types
+ * @returns an array of the most specific types
+ */
+export function reduceTypesForIntersectionType(types: BscType[], allowNameEquality = true): BscType[] {
+    if (!types || types?.length === 0) {
+        return undefined;
+    }
+
+    if (types.length === 1) {
+        // only one type
+        return [types[0]];
+    }
+
+    types = types.map(t => {
+        if (isReferenceType(t)) {
+            if (t.isResolvable()) {
+                return (t as any).getTarget() ?? t;
+
+            }
+            return undefined;
+        }
+        return t;
+    }).filter(t => t);
+
+    // Get a list of unique types, based on the `isEqual()` method
+    const uniqueTypes = getUniqueTypesFromArray(types, allowNameEquality).map(t => {
+        // map to object with `shouldIgnore` flag
+        return { type: t, shouldIgnore: false };
+    });
+
+    if (uniqueTypes.length === 1) {
+        // only one type after filtering
+        return [uniqueTypes[0].type];
+    }
+    const existingDynamicType = uniqueTypes.find(t => !isAnyReferenceType(t.type) && isDynamicType(t.type));
+    if (existingDynamicType) {
+        // If it includes dynamic, then the result is dynamic
+        return [existingDynamicType.type];
+    }
+    const specificTypes = [];
+    //check assignability:
+    for (let i = 0; i < uniqueTypes.length; i++) {
+        const currentType = uniqueTypes[i].type;
+        if (i === uniqueTypes.length - 1) {
+            if (!uniqueTypes[i].shouldIgnore) {
+                //this type was not convertible to anything else... it is as general as possible
+                specificTypes.push(currentType);
+            }
+            break;
+        }
+        for (let j = i + 1; j < uniqueTypes.length; j++) {
+            if (uniqueTypes[j].shouldIgnore) {
+                continue;
+            }
+            const checkType = uniqueTypes[j].type;
+
+            if (currentType.isResolvable() && currentType.isEqual(uniqueTypes[j].type, { allowNameEquality: allowNameEquality })) {
+                uniqueTypes[j].shouldIgnore = true;
+            } else if (isInheritableType(currentType) && isInheritableType(checkType)) {
+                if (checkType.isTypeDescendent(currentType)) {
+                    //the type we're checking is more general than the current type... it can be ignored
+                    uniqueTypes[j].shouldIgnore = true;
+                }
+                if (currentType.isTypeDescendent(checkType)) {
+                    // the currentType is an ancestor to some other type - it won't be in the final set
+                    break;
+                }
+            }
+            if (j === uniqueTypes.length - 1) {
+                //this type was not convertible to anything else... it is as general as possible
+                specificTypes.push(currentType);
+            }
+        }
+    }
+    return specificTypes;
+}
+
+
+/**
+ * Gets a Unique type from a list of types
+ * @param types array of types
+ * @returns either the singular most general type, if there is one, otherwise a UnionType of the most general types
+ */
+export function getUniqueType(types: BscType[], unionTypeFactory: (types: BscType[]) => BscType, allowNameEquality = true): BscType {
+    if (!types || types.length === 0) {
+        return undefined;
+    }
+    const dynType = types.find((x) => !isAnyReferenceType(x) && (isDynamicType(x) || isVoidType(x)));
+    if (dynType) {
+        return dynType;
+    }
+    types = types?.map(type => {
+        if (!isAnyReferenceType(type) && isUnionType(type)) {
+            return type.types;
+        }
+        return type;
+    }).flat();
+    const generalizedTypes = reduceTypesToMostGeneric(types, allowNameEquality);
+    if (!generalizedTypes || generalizedTypes.length === 0) {
+        return undefined;
+    }
+    if (generalizedTypes?.length === 1) {
+        // only one type
+        return generalizedTypes[0];
+    }
+    return unionTypeFactory(generalizedTypes);
+}
+
+
+export function isUnionTypeCompatible(thisType: BscType, maybeUnionType: BscType, data?: TypeCompatibilityData): boolean {
+    if (isUnionType(maybeUnionType)) {
+        for (const innerType of maybeUnionType.types) {
+            if (!thisType.isTypeCompatible(innerType, data)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    return false;
+}
+
+
+export function isEnumTypeCompatible(thisType: BscType, maybeEnumType: BscType, data?: TypeCompatibilityData): boolean {
+    if (isEnumMemberType(maybeEnumType) || isEnumType(maybeEnumType)) {
+        return thisType.isTypeCompatible(maybeEnumType.underlyingType, data);
+    }
+    return false;
+}
+
+export function isNativeInterfaceCompatible(thisType: BscType, otherType: BscType, allowedType: string, data?: TypeCompatibilityData): boolean {
+    if (isInterfaceType(otherType)) {
+        // TODO: it is not great to do type checking based on interface name
+        const lowerOtherName = otherType.name.toLowerCase();
+        return allowedType === lowerOtherName;
+    }
+    return false;
+}
+
+export function isNativeInterfaceCompatibleNumber(thisType: BscType, otherType: BscType, data?: TypeCompatibilityData): boolean {
+    if (isInterfaceType(otherType)) {
+        // TODO: it is not great to do type checking based on interface name
+        const lowerOtherName = otherType.name.toLowerCase();
+        return lowerOtherName === 'roint' ||
+            lowerOtherName === 'rofloat' ||
+            lowerOtherName === 'rodouble' ||
+            lowerOtherName === 'rolonginteger';
+    }
+    return false;
+}
+
+export function getAllTypesFromCompoundType(complex: UnionType | IntersectionType): BscType[] {
+    const results = [];
+
+    for (const type of complex.types) {
+        if (isCompoundType(type)) {
+            results.push(...getAllTypesFromCompoundType(type));
+        } else {
+            results.push(type);
+        }
+    }
+    return results;
+}
+
+export function addAssociatedTypesTableAsSiblingToMemberTable(type: BscType, associatedTypesTable: SymbolTable, bitFlags: SymbolTypeFlag) {
+    if (isReferenceType(type) &&
+        !type.isResolvable()) {
+        // This param or return type is a reference - make sure the associated types are included
+        type.tableProvider().addSibling(associatedTypesTable);
+
+        // add this as a sister table to member tables too!
+        const memberTable: SymbolTable = type.getMemberTable();
+        if (memberTable.getAllSymbols) {
+            for (const memberSymbol of memberTable.getAllSymbols(bitFlags)) {
+                addAssociatedTypesTableAsSiblingToMemberTable(memberSymbol?.type, associatedTypesTable, bitFlags);
+            }
+        }
+    }
+}
+/**
+ * A map of all types created in the program during its lifetime. This applies across all programs, validate runs, etc. Mostly useful for a single run to track types created.
+ */
+export const TypesCreated: Record<string, number> = {};
+
+export function joinTypesString(types: BscType[], separator: string, thisTypeKind: BscTypeKind): string {
+    return [...new Set(types.map(t => {
+        const typeString = t.toString();
+        if ((isUnionType(t) || isIntersectionType(t)) && t.kind !== thisTypeKind) {
+            return `(${typeString})`;
+        }
+        return t.toString();
+    }))].join(` ${separator} `);
+}
+
+
+export function isTypeWithPotentialDefaultDynamicMember(type: BscType): boolean {
+    return (isInheritableType(type) && type.changeUnknownMemberToDynamic) ||
+        isAssociativeArrayTypeLike(type) ||
+        isObjectType(type) ||
+        isUnionTypeOf(type, isTypeWithPotentialDefaultDynamicMember);
+}
diff --git a/src/types/index.ts b/src/types/index.ts
new file mode 100644
index 000000000..d0bf57a9e
--- /dev/null
+++ b/src/types/index.ts
@@ -0,0 +1,22 @@
+export * from './ArrayType';
+export * from './BooleanType';
+export * from './BscType';
+export * from './ClassType';
+export * from './DoubleType';
+export * from './DynamicType';
+export * from './EnumType';
+export * from './FloatType';
+export * from './TypedFunctionType';
+export * from './helpers';
+export * from './InheritableType';
+export * from './IntegerType';
+export * from './InterfaceType';
+export * from './InvalidType';
+export * from './LongIntegerType';
+export * from './NamespaceType';
+export * from './ObjectType';
+export * from './ReferenceType';
+export * from './StringType';
+export * from './UninitializedType';
+export * from './UnionType';
+export * from './VoidType';
diff --git a/src/types/roFunctionType.spec.ts b/src/types/roFunctionType.spec.ts
new file mode 100644
index 000000000..e502de9a4
--- /dev/null
+++ b/src/types/roFunctionType.spec.ts
@@ -0,0 +1,20 @@
+import { expect } from '../chai-config.spec';
+
+import { DynamicType } from './DynamicType';
+import { FunctionType } from './FunctionType';
+import { IntegerType } from './IntegerType';
+import { ObjectType } from './ObjectType';
+import { roFunctionType } from './roFunctionType';
+import { TypedFunctionType } from './TypedFunctionType';
+
+describe('roFunctionType', () => {
+    it('is equivalent to other function types', () => {
+        const roFunc = new roFunctionType();
+
+        expect(roFunc.isTypeCompatible(new ObjectType())).to.be.true;
+        expect(roFunc.isTypeCompatible(new DynamicType())).to.be.true;
+        expect(roFunc.isTypeCompatible(new FunctionType())).to.be.true;
+        expect(roFunc.isTypeCompatible(new roFunctionType())).to.be.true;
+        expect(roFunc.isTypeCompatible(new TypedFunctionType(IntegerType.instance))).to.be.true;
+    });
+});
diff --git a/src/types/roFunctionType.ts b/src/types/roFunctionType.ts
new file mode 100644
index 000000000..1dc81c28d
--- /dev/null
+++ b/src/types/roFunctionType.ts
@@ -0,0 +1,39 @@
+import { isCallableType, isDynamicType, isFunctionTypeLike, isObjectType } from '../astUtils/reflection';
+import type { TypeCompatibilityData } from '../interfaces';
+import { BaseFunctionType } from './BaseFunctionType';
+import type { BscType } from './BscType';
+import { BscTypeKind } from './BscTypeKind';
+import { isUnionTypeCompatible } from './helpers';
+
+export class roFunctionType extends BaseFunctionType {
+    public readonly kind = BscTypeKind.RoFunctionType;
+
+    public isTypeCompatible(targetType: BscType, data?: TypeCompatibilityData) {
+        if (
+            isDynamicType(targetType) ||
+            isCallableType(targetType) ||
+            isFunctionTypeLike(targetType) ||
+            isObjectType(targetType) ||
+            isUnionTypeCompatible(this, targetType, data)
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    public toString() {
+        return 'roFunction';
+    }
+
+    public toTypeString(): string {
+        return 'dynamic';
+    }
+
+
+    isEqual(targetType: BscType) {
+        if (isFunctionTypeLike(targetType)) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/util.spec.ts b/src/util.spec.ts
index 9b97a7065..9ddf55cb3 100644
--- a/src/util.spec.ts
+++ b/src/util.spec.ts
@@ -1,14 +1,24 @@
 import { expect } from './chai-config.spec';
 import * as path from 'path';
-import util, { standardizePath as s } from './util';
+import { util, standardizePath as s } from './util';
 import { Position, Range } from 'vscode-languageserver';
 import type { BsConfig } from './BsConfig';
 import * as fsExtra from 'fs-extra';
 import { createSandbox } from 'sinon';
 import { DiagnosticMessages } from './DiagnosticMessages';
-import { tempDir, rootDir } from './testHelpers.spec';
-import { Program } from './Program';
-import type { BsDiagnostic } from '.';
+import { tempDir, rootDir, expectTypeToBe } from './testHelpers.spec';
+import { TypeChainEntry } from './interfaces';
+import { NamespaceType } from './types/NamespaceType';
+import { ClassType } from './types/ClassType';
+import { ReferenceType } from './types/ReferenceType';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import { BooleanType, DoubleType, DynamicType, FloatType, IntegerType, InterfaceType, InvalidType, LongIntegerType, ObjectType, StringType, TypedFunctionType, UnionType, VoidType } from './types';
+import { TokenKind } from './lexer/TokenKind';
+import { createToken } from './astUtils/creators';
+import { createDottedIdentifier, createVariableExpression } from './astUtils/creators';
+import { Parser } from './parser/Parser';
+import type { FunctionStatement } from './parser/Statement';
+import { ComponentType } from './types/ComponentType';
 
 const sinon = createSandbox();
 
@@ -40,34 +50,29 @@ describe('util', () => {
         });
     });
 
-    describe('diagnosticIsSuppressed', () => {
-        it('does not crash when diagnostic is missing location information', () => {
-            const program = new Program({});
-            const file = program.setFile('source/main.brs', '');
-            const diagnostic: BsDiagnostic = {
-                file: file,
-                message: 'crash',
-                //important part of the test. range must be missing
-                range: undefined as any
-            };
-
-            file.commentFlags.push({
-                affectedRange: util.createRange(1, 2, 3, 4),
-                codes: [1, 2, 3],
-                file: file,
-                range: util.createRange(1, 2, 3, 4)
-            });
-            file.diagnostics.push(diagnostic);
+    describe('getAllDottedGetPartsAsString', () => {
+        it('returns undefined when no value found', () => {
+            expect(
+                util.getAllDottedGetPartsAsString(undefined)
+            ).to.eql(undefined);
+        });
 
-            util.diagnosticIsSuppressed(diagnostic);
+        it('returns var name', () => {
+            expect(
+                util.getAllDottedGetPartsAsString(createVariableExpression('alpha'))
+            ).to.eql('alpha');
+        });
 
-            //test passes if there's no crash
+        it('returns dotted get name', () => {
+            expect(
+                util.getAllDottedGetPartsAsString(createDottedIdentifier(['alpha', 'beta']))
+            ).to.eql('alpha.beta');
         });
     });
 
-    describe('getRokuPkgPath', () => {
+    describe('sanitizePkgPath', () => {
         it('replaces more than one windows slash in a path', () => {
-            expect(util.getRokuPkgPath('source\\folder1\\folder2\\file.brs')).to.eql('pkg:/source/folder1/folder2/file.brs');
+            expect(util.sanitizePkgPath('source\\folder1\\folder2\\file.brs')).to.eql('pkg:/source/folder1/folder2/file.brs');
         });
     });
 
@@ -135,20 +140,18 @@ describe('util', () => {
                 ]
             };
             util.resolvePathsRelativeTo(config, 'plugins', s`${rootDir}/config`);
-            expect(config?.plugins?.map(p => (p ? util.pathSepNormalize(p, '/') : undefined))).to.deep.equal([
+            expect(config?.plugins?.map(p => (p ? pathSepNormalize(p, '/') : undefined))).to.deep.equal([
                 `${rootDir}/config/plugins.js`,
                 `${rootDir}/config/scripts/plugins.js`,
                 `${rootDir}/scripts/plugins.js`,
                 'bsplugin'
-            ].map(p => util.pathSepNormalize(p, '/')));
+            ].map(p => pathSepNormalize(p, '/')));
         });
 
         it('resolves path relatively to config file', () => {
             const mockConfig: BsConfig = {
-                outFile: 'out/app.zip',
                 rootDir: 'rootDir',
-                cwd: 'cwd',
-                stagingDir: 'stagingDir'
+                cwd: 'cwd'
             };
             fsExtra.outputFileSync(s`${rootDir}/child.json`, JSON.stringify(mockConfig));
             let config = util.loadConfigFile(s`${rootDir}/child.json`);
@@ -157,9 +160,7 @@ describe('util', () => {
                     s`${rootDir}/child.json`
                 ],
                 'cwd': s`${rootDir}/cwd`,
-                'outFile': s`${rootDir}/out/app.zip`,
-                'rootDir': s`${rootDir}/rootDir`,
-                'stagingDir': s`${rootDir}/stagingDir`
+                'rootDir': s`${rootDir}/rootDir`
             });
         });
 
@@ -174,10 +175,10 @@ describe('util', () => {
                 ]
             };
             util.resolvePathsRelativeTo(config, 'plugins', s`${process.cwd()}/config`);
-            expect(config?.plugins?.map(p => (p ? util.pathSepNormalize(p, '/') : undefined))).to.deep.equal([
+            expect(config?.plugins?.map(p => (p ? pathSepNormalize(p, '/') : undefined))).to.deep.equal([
                 s`${process.cwd()}/config/plugins.js`,
                 'bsplugin'
-            ].map(p => util.pathSepNormalize(p, '/')));
+            ].map(p => pathSepNormalize(p, '/')));
         });
     });
 
@@ -231,8 +232,8 @@ describe('util', () => {
 
     describe('pathSepNormalize', () => {
         it('works for both types of separators', () => {
-            expect(util.pathSepNormalize('c:/some\\path', '\\')).to.equal('c:\\some\\path');
-            expect(util.pathSepNormalize('c:/some\\path', '/')).to.equal('c:/some/path');
+            expect(pathSepNormalize('c:/some\\path', '\\')).to.equal('c:\\some\\path');
+            expect(pathSepNormalize('c:/some\\path', '/')).to.equal('c:/some/path');
         });
         it('does not throw when given `undefined`', () => {
             expect(undefined).to.be.undefined;
@@ -249,6 +250,37 @@ describe('util', () => {
     });
 
     describe('findClosestConfigFile', () => {
+
+        /**
+         * Walks up the chain to find the closest bsconfig.json file
+         */
+        async function findClosestConfigFile(currentPath: string): Promise<string | undefined> {
+            //make the path absolute
+            currentPath = path.resolve(
+                path.normalize(
+                    currentPath
+                )
+            );
+
+            let previousPath: string | undefined;
+            //using ../ on the root of the drive results in the same file path, so that's how we know we reached the top
+            while (previousPath !== currentPath) {
+                previousPath = currentPath;
+
+                let bsPath = path.join(currentPath, 'bsconfig.json');
+                let brsPath = path.join(currentPath, 'brsconfig.json');
+                if (await util.pathExists(bsPath)) {
+                    return bsPath;
+                } else if (await util.pathExists(brsPath)) {
+                    return brsPath;
+                } else {
+                    //walk upwards one directory
+                    currentPath = path.resolve(path.join(currentPath, '../'));
+                }
+            }
+            //got to the root path, no config file exists
+        }
+
         it('finds config up the chain', async () => {
             const brsFilePath = s`${rootDir}/src/app.brs`;
             const currentDirBsConfigPath = s`${rootDir}/src/bsconfig.json`;
@@ -261,13 +293,13 @@ describe('util', () => {
             fsExtra.outputFileSync(parentDirBsConfigPath, '');
             fsExtra.outputFileSync(parentDirBrsConfigPath, '');
 
-            expect(await util.findClosestConfigFile(brsFilePath)).to.equal(currentDirBsConfigPath);
+            expect(await findClosestConfigFile(brsFilePath)).to.equal(currentDirBsConfigPath);
             fsExtra.removeSync(currentDirBsConfigPath);
-            expect(await util.findClosestConfigFile(brsFilePath)).to.equal(currentDirBrsConfigPath);
+            expect(await findClosestConfigFile(brsFilePath)).to.equal(currentDirBrsConfigPath);
             fsExtra.removeSync(currentDirBrsConfigPath);
-            expect(await util.findClosestConfigFile(brsFilePath)).to.equal(parentDirBsConfigPath);
+            expect(await findClosestConfigFile(brsFilePath)).to.equal(parentDirBsConfigPath);
             fsExtra.removeSync(parentDirBsConfigPath);
-            expect(await util.findClosestConfigFile(brsFilePath)).to.equal(parentDirBrsConfigPath);
+            expect(await findClosestConfigFile(brsFilePath)).to.equal(parentDirBrsConfigPath);
         });
 
     });
@@ -332,6 +364,36 @@ describe('util', () => {
                 });
             }).not.to.throw;
         });
+
+        it('remaps stagingDir to outDir', () => {
+            expect(util.normalizeAndResolveConfig({
+                stagingDir: './staging'
+            })).to.include({
+                outDir: './staging'
+            });
+        });
+
+        it('remaps stagingFolderPath to outDir', () => {
+            expect(util.normalizeAndResolveConfig({
+                stagingFolderPath: './staging'
+            })).to.include({
+                outDir: './staging'
+            });
+        });
+
+        it('uses provided outDir', () => {
+            expect(util.normalizeAndResolveConfig({
+                outDir: './staging'
+            })).to.include({
+                outDir: './staging'
+            });
+        });
+
+        it('uses default outDir', () => {
+            expect(util.normalizeAndResolveConfig({})).to.include({
+                outDir: './out'
+            });
+        });
     });
 
     describe('normalizeConfig', () => {
@@ -356,21 +418,21 @@ describe('util', () => {
         });
 
         it('loads project from disc', () => {
-            fsExtra.outputFileSync(s`${tempDir}/rootDir/bsconfig.json`, `{ "outFile": "customOutDir/pkg.zip" }`);
+            fsExtra.outputFileSync(s`${tempDir}/rootDir/bsconfig.json`, `{ "outDir": "customOutDir" }`);
             let config = util.normalizeAndResolveConfig({
                 project: s`${tempDir}/rootDir/bsconfig.json`
             });
             expect(
-                config.outFile
+                config.outDir
             ).to.equal(
-                s`${tempDir}/rootDir/customOutDir/pkg.zip`
+                s`${tempDir}/rootDir/customOutDir`
             );
         });
 
         it('loads project from disc and extends it', () => {
             //the extends file
             fsExtra.outputFileSync(s`${tempDir}/rootDir/bsconfig.base.json`, `{
-                "outFile": "customOutDir/pkg1.zip",
+                "outDir": "customOutDir",
                 "rootDir": "core"
             }`);
 
@@ -382,7 +444,7 @@ describe('util', () => {
 
             let config = util.normalizeAndResolveConfig({ project: s`${tempDir}/rootDir/bsconfig.json` });
 
-            expect(config.outFile).to.equal(s`${tempDir}/rootDir/customOutDir/pkg1.zip`);
+            expect(config.outDir).to.equal(s`${tempDir}/rootDir/customOutDir`);
             expect(config.rootDir).to.equal(s`${tempDir}/rootDir/core`);
             expect(config.watch).to.equal(true);
         });
@@ -437,20 +499,85 @@ describe('util', () => {
                 expect(util.normalizeConfig(<any>{ bslibDestinationDir: input }).bslibDestinationDir).to.equal('source/opt');
             });
         });
+
+        it('used default noEmit value', () => {
+            let config = util.normalizeConfig({} as any);
+            expect(config.noEmit).to.be.false;
+        });
+
+        it('used noEmit value over copyToStaging', () => {
+            let config = util.normalizeConfig({ noEmit: true, copyToStaging: false } as any);
+            expect(config.noEmit).to.be.true;
+            config = util.normalizeConfig({ noEmit: false, copyToStaging: false } as any);
+            expect(config.noEmit).to.be.false;
+        });
+
+        it('used copyToStaging when noEmit is not present', () => {
+            let config = util.normalizeConfig({ copyToStaging: true } as any);
+            expect(config.noEmit).to.be.false;
+            config = util.normalizeConfig({ copyToStaging: false } as any);
+            expect(config.noEmit).to.be.true;
+        });
+
+        it('defaults outDir to ./out', () => {
+            let config = util.normalizeConfig({} as any);
+            expect(config.outDir).to.equal('./out');
+        });
+
+        it('uses stagingDir when outDir is not provided', () => {
+            let config = util.normalizeConfig({ stagingDir: 'staging' } as any);
+            expect(config.outDir).to.equal('staging');
+        });
+
+        it('uses stagingFolderPath when outDir is not provided', () => {
+            let config = util.normalizeConfig({ stagingFolderPath: 'stagingPath' } as any);
+            expect(config.outDir).to.equal('stagingPath');
+        });
+
+        it('uses outDir when stagingDir is provided', () => {
+            let config = util.normalizeConfig({ outDir: 'outTest', stagingDir: 'staging' } as any);
+            expect(config.outDir).to.equal('outTest');
+        });
+
+        it('uses outDir when stagingFolderPath is provided', () => {
+            let config = util.normalizeConfig({ outDir: 'outTest', stagingFolderPath: 'stagingPath' } as any);
+            expect(config.outDir).to.equal('outTest');
+        });
+
+        it('uses outDir when stagingFolderPath and stagingDir are provided', () => {
+            let config = util.normalizeConfig({ outDir: 'outTest', stagingDir: 'staging', stagingFolderPath: 'stagingPath' } as any);
+            expect(config.outDir).to.equal('outTest');
+        });
     });
 
     describe('areArraysEqual', () => {
+        /**
+         * Determine if two arrays containing primitive values are equal.
+         * This considers order and compares by equality.
+         */
+        function areArraysEqual(arr1: any[], arr2: any[]) {
+            if (arr1.length !== arr2.length) {
+                return false;
+            }
+            for (let i = 0; i < arr1.length; i++) {
+                if (arr1[i] !== arr2[i]) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         it('finds equal arrays', () => {
-            expect(util.areArraysEqual([1, 2], [1, 2])).to.be.true;
-            expect(util.areArraysEqual(['cat', 'dog'], ['cat', 'dog'])).to.be.true;
+            expect(areArraysEqual([1, 2], [1, 2])).to.be.true;
+            expect(areArraysEqual(['cat', 'dog'], ['cat', 'dog'])).to.be.true;
         });
         it('detects non-equal arrays', () => {
-            expect(util.areArraysEqual([1, 2], [1])).to.be.false;
-            expect(util.areArraysEqual([1, 2], [2])).to.be.false;
-            expect(util.areArraysEqual([2], [1])).to.be.false;
-            expect(util.areArraysEqual([2], [0])).to.be.false;
-            expect(util.areArraysEqual(['cat', 'dog'], ['cat', 'dog', 'mouse'])).to.be.false;
-            expect(util.areArraysEqual(['cat', 'dog'], ['dog', 'cat'])).to.be.false;
+            expect(areArraysEqual([1, 2], [1])).to.be.false;
+            expect(areArraysEqual([1, 2], [2])).to.be.false;
+            expect(areArraysEqual([2], [1])).to.be.false;
+            expect(areArraysEqual([2], [0])).to.be.false;
+            expect(areArraysEqual(['cat', 'dog'], ['cat', 'dog', 'mouse'])).to.be.false;
+            expect(areArraysEqual(['cat', 'dog'], ['dog', 'cat'])).to.be.false;
         });
     });
 
@@ -534,12 +661,6 @@ describe('util', () => {
         });
     });
 
-    describe('padLeft', () => {
-        it('stops at an upper limit to prevent terrible memory explosions', () => {
-            expect(util.padLeft('', Number.MAX_VALUE, ' ')).to.be.lengthOf(1000);
-        });
-    });
-
     describe('getTextForRange', () => {
         const testArray = ['The quick', 'brown fox', 'jumps over', 'the lazy dog'];
         const testString = testArray.join('\n');
@@ -690,25 +811,26 @@ describe('util', () => {
         });
     });
 
-    describe('copyBslibToStaging', () => {
-        it('copies from local bslib dependency', async () => {
-            await util.copyBslibToStaging(tempDir);
-            expect(fsExtra.pathExistsSync(`${tempDir}/source/bslib.brs`)).to.be.true;
-            expect(
-                /^function bslib_toString\(/mg.exec(
-                    fsExtra.readFileSync(`${tempDir}/source/bslib.brs`).toString()
-                )
-            ).not.to.be.null;
+    describe('range creation', () => {
+        it('createRangeFromPositions', () => {
+            const pos11 = { line: 1, character: 1 };
+            const pos99 = { line: 9, character: 9 };
+
+            expect(util.createRangeFromPositions(pos11, pos99)).to.eql(util.createRange(1, 1, 9, 9));
+            expect(util.createRangeFromPositions(null, pos99)).to.eql(util.createRange(9, 9, 9, 9));
+            expect(util.createRangeFromPositions(pos11, null)).to.eql(util.createRange(1, 1, 1, 1));
         });
 
-        it('copies from local bslib dependency to optionally specified destination directory', async () => {
-            await util.copyBslibToStaging(tempDir, 'source/opt');
-            expect(fsExtra.pathExistsSync(`${tempDir}/source/opt/bslib.brs`)).to.be.true;
-            expect(
-                /^function bslib_toString\(/mg.exec(
-                    fsExtra.readFileSync(`${tempDir}/source/opt/bslib.brs`).toString()
-                )
-            ).not.to.be.null;
+
+        it('createBoundingRange', () => {
+            const range1 = util.createRange(1, 1, 2, 2);
+            const range2 = util.createRange(2, 2, 3, 3);
+            const range3 = util.createRange(100, 100, 100, 100);
+
+            expect(util.createBoundingRange(range1)).to.eql(util.createRange(1, 1, 2, 2));
+            expect(util.createBoundingRange(range1, range2)).to.eql(util.createRange(1, 1, 3, 3));
+            expect(util.createBoundingRange(range2, range1)).to.eql(util.createRange(1, 1, 3, 3));
+            expect(util.createBoundingRange(range2, range3, range1)).to.eql(util.createRange(1, 1, 100, 100));
         });
     });
 
@@ -910,6 +1032,18 @@ describe('util', () => {
         });
     });
 
+    it('isRangeInRange', () => {
+        expect(util.isRangeInRange(
+            util.createRange(0, 1, 1, 3),
+            util.createRange(0, 0, 2, 0)
+        )).to.be.true;
+
+        expect(util.isRangeInRange(
+            util.createRange(0, 0, 2, 0),
+            util.createRange(0, 1, 1, 3)
+        )).to.be.false;
+    });
+
     it('sortByRange', () => {
         const front = {
             range: util.createRange(1, 1, 1, 2)
@@ -928,9 +1062,34 @@ describe('util', () => {
     });
 
     describe('splitWithLocation', () => {
+        /**
+         * Split the given text and return ranges for each chunk.
+         * Only works for single-line strings
+         */
+        function splitGetRange(separator: string, text: string, range: Range) {
+            const chunks = text.split(separator);
+            const result = [] as Array<{ text: string; range: Range }>;
+            let offset = 0;
+            for (let chunk of chunks) {
+                //only keep nonzero chunks
+                if (chunk.length > 0) {
+                    result.push({
+                        text: chunk,
+                        range: util.createRange(
+                            range.start.line,
+                            range.start.character + offset,
+                            range.end.line,
+                            range.start.character + offset + chunk.length
+                        )
+                    });
+                }
+                offset += chunk.length + separator.length;
+            }
+            return result;
+        }
         it('works with no split items', () => {
             expect(
-                util.splitGetRange('.', 'hello', util.createRange(2, 10, 2, 15))
+                splitGetRange('.', 'hello', util.createRange(2, 10, 2, 15))
             ).to.eql([{
                 text: 'hello',
                 range: util.createRange(2, 10, 2, 15)
@@ -939,7 +1098,7 @@ describe('util', () => {
 
         it('handles empty chunks', () => {
             expect(
-                util.splitGetRange('l', 'hello', util.createRange(2, 10, 2, 15))
+                splitGetRange('l', 'hello', util.createRange(2, 10, 2, 15))
             ).to.eql([{
                 text: 'he',
                 range: util.createRange(2, 10, 2, 12)
@@ -951,7 +1110,7 @@ describe('util', () => {
 
         it('handles multiple non-empty chunks', () => {
             expect(
-                util.splitGetRange('.', 'abc.d.efgh.i', util.createRange(2, 10, 2, 2))
+                splitGetRange('.', 'abc.d.efgh.i', util.createRange(2, 10, 2, 2))
             ).to.eql([{
                 text: 'abc',
                 range: util.createRange(2, 10, 2, 13)
@@ -973,8 +1132,7 @@ describe('util', () => {
             expect(
                 util.toDiagnostic({
                     ...DiagnosticMessages.cannotFindName('someVar'),
-                    file: undefined as any,
-                    range: util.createRange(1, 2, 3, 4),
+                    location: { uri: null, range: util.createRange(1, 2, 3, 4) },
                     relatedInformation: [{
                         message: 'Alpha',
                         location: undefined as any
@@ -982,7 +1140,7 @@ describe('util', () => {
                 }, 'u/r/i').relatedInformation
             ).to.eql([{
                 message: 'Alpha',
-                location: util.createLocation(
+                location: util.createLocationFromRange(
                     'u/r/i', util.createRange(1, 2, 3, 4)
                 )
             }]);
@@ -992,11 +1150,10 @@ describe('util', () => {
             expect(
                 util.toDiagnostic({
                     ...DiagnosticMessages.cannotFindName('someVar'),
-                    file: undefined as any,
-                    range: util.createRange(1, 2, 3, 4),
+                    location: { uri: null, range: util.createRange(1, 2, 3, 4) },
                     relatedInformation: [{
                         message: 'Alpha',
-                        location: util.createLocation(
+                        location: util.createLocationFromRange(
                             'uri', util.createRange(2, 3, 4, 5)
                         )
                     }, {
@@ -1006,13 +1163,400 @@ describe('util', () => {
                 }, undefined as any).relatedInformation
             ).to.eql([{
                 message: 'Alpha',
-                location: util.createLocation(
+                location: util.createLocationFromRange(
                     'uri', util.createRange(2, 3, 4, 5)
                 )
             }]);
         });
     });
 
+    describe('processTypeChain', () => {
+        it('should  find the correct details in a list of type resolutions', () => {
+            const nodes = [
+                createVariableExpression('Alpha', util.createLocation(1, 1, 2, 2)),
+                createVariableExpression('Beta', util.createLocation(2, 2, 3, 3)),
+                createVariableExpression('CharlieProp', util.createLocation(3, 3, 4, 4))
+            ];
+
+            const chain = [
+                new TypeChainEntry({ name: 'AlphaNamespace', type: new NamespaceType('Alpha'), data: { flags: SymbolTypeFlag.runtime }, astNode: nodes[0] }),
+                new TypeChainEntry({ name: 'BetaProp', type: new ClassType('Beta'), data: { flags: SymbolTypeFlag.runtime }, astNode: nodes[1] }),
+                new TypeChainEntry({ name: 'CharlieProp', type: new ReferenceType('Charlie', 'Alpha.Beta.CharlieProp', SymbolTypeFlag.runtime, () => null), data: { flags: SymbolTypeFlag.runtime }, astNode: nodes[2] })
+            ];
+
+            const result = util.processTypeChain(chain);
+            expect(result.itemName).to.eql('CharlieProp');
+            expect(result.fullChainName).to.eql('AlphaNamespace.BetaProp.CharlieProp');
+            expect(result.itemParentTypeName).to.eql('Beta');
+            expect(result.fullNameOfItem).to.eql('Beta.CharlieProp');
+            expect(result.location.range).to.eql(util.createRange(3, 3, 4, 4));
+        });
+
+        it('respects the separatorToken', () => {
+            const nodes = [
+                createVariableExpression('Custom', util.createLocation(1, 1, 2, 2)),
+                createVariableExpression('someCallFunc', util.createLocation(2, 2, 3, 3))
+            ];
+            const chain = [
+                new TypeChainEntry({ name: 'roSGNodeCustom', type: new ComponentType('Custom'), data: { flags: SymbolTypeFlag.runtime }, astNode: nodes[0] }),
+                new TypeChainEntry({ name: 'someCallFunc', type: new TypedFunctionType(VoidType.instance), data: { flags: SymbolTypeFlag.runtime }, astNode: nodes[1], separatorToken: createToken(TokenKind.Callfunc) })
+            ];
+
+            const result = util.processTypeChain(chain);
+            expect(result.fullChainName).to.eql('roSGNodeCustom@.someCallFunc');
+        });
+    });
+
+    describe('binaryOperatorResultType', () => {
+        it('returns the correct type for math operations', () => {
+            // String + String is string
+            expectTypeToBe(util.binaryOperatorResultType(StringType.instance, createToken(TokenKind.Plus), StringType.instance), StringType);
+            // string plus anything else is an error - return dynamic
+            expect(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Plus), StringType.instance)).to.be.undefined;
+
+            const boxedInt = new InterfaceType('roInt');
+            boxedInt.isBuiltIn = true;
+            const boxedFloat = new InterfaceType('roFloat');
+            boxedFloat.isBuiltIn = true;
+
+            // Plus
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Plus), IntegerType.instance), DoubleType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Plus), FloatType.instance), FloatType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Plus), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Plus), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Plus), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Plus), boxedFloat), FloatType);
+
+            // Subtract
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Minus), IntegerType.instance), DoubleType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Minus), FloatType.instance), FloatType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Minus), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Minus), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Plus), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Plus), boxedFloat), FloatType);
+
+            // Multiply
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Star), IntegerType.instance), DoubleType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Star), FloatType.instance), FloatType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Star), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Star), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Star), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Star), boxedFloat), FloatType);
+
+            // Mod
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Mod), IntegerType.instance), DoubleType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Mod), FloatType.instance), FloatType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Mod), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Mod), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Mod), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Mod), boxedFloat), FloatType);
+
+            // Divide
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Forwardslash), IntegerType.instance), DoubleType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Forwardslash), FloatType.instance), FloatType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Forwardslash), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Forwardslash), IntegerType.instance), FloatType); // int/int -> float
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Plus), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Plus), boxedFloat), FloatType);
+
+
+            // Exponent
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Caret), IntegerType.instance), DoubleType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Caret), FloatType.instance), FloatType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Caret), LongIntegerType.instance), DoubleType);// long^int -> Double, int^long -> Double
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Caret), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Caret), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Caret), boxedFloat), FloatType);
+        });
+
+        it('returns the correct type for Bitshift operations', () => {
+            const boxedInt = new InterfaceType('roInt');
+            boxedInt.isBuiltIn = true;
+            const boxedFloat = new InterfaceType('roFloat');
+            boxedFloat.isBuiltIn = true;
+
+            // <<
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.LeftShift), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.LeftShift), FloatType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.LeftShift), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.LeftShift), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.LeftShift), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.LeftShift), boxedFloat), IntegerType);
+
+            // >>
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.RightShift), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.RightShift), FloatType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.RightShift), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.RightShift), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.RightShift), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.RightShift), boxedFloat), IntegerType);
+        });
+
+        it('returns the correct type for Comparison operations', () => {
+            const boxedInt = new InterfaceType('roInt');
+            boxedInt.isBuiltIn = true;
+            const boxedFloat = new InterfaceType('roFloat');
+            boxedFloat.isBuiltIn = true;
+
+            // =
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Equal), IntegerType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Equal), FloatType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Equal), LongIntegerType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Equal), IntegerType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(InvalidType.instance, createToken(TokenKind.Equal), IntegerType.instance), BooleanType); // = accepts invalid
+            expect(util.binaryOperatorResultType(StringType.instance, createToken(TokenKind.Equal), IntegerType.instance)).to.be.undefined; // only one string is not accepted
+            expectTypeToBe(util.binaryOperatorResultType(StringType.instance, createToken(TokenKind.Equal), StringType.instance), BooleanType); // both strings is accepted
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Equal), IntegerType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.Equal), boxedFloat), BooleanType);
+            // <>
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.LessGreater), InvalidType.instance), BooleanType); // <> accepts invalid
+            expectTypeToBe(util.binaryOperatorResultType(boxedInt, createToken(TokenKind.LessGreater), InvalidType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(boxedFloat, createToken(TokenKind.LessGreater), InvalidType.instance), BooleanType);
+            // > - does not accept invalid
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Greater), IntegerType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Greater), FloatType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Greater), LongIntegerType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Greater), IntegerType.instance), BooleanType);
+            expect(util.binaryOperatorResultType(InvalidType.instance, createToken(TokenKind.Greater), IntegerType.instance)).to.be.undefined; // invalid not accepted
+            // etc. - all should be boolean
+        });
+
+        it('returns the correct type for Logical/bitwise operations', () => {
+            // and
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.And), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.And), FloatType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.And), BooleanType.instance), BooleanType);
+            expectTypeToBe(util.binaryOperatorResultType(BooleanType.instance, createToken(TokenKind.And), IntegerType.instance), BooleanType);
+            expect(util.binaryOperatorResultType(InvalidType.instance, createToken(TokenKind.And), IntegerType.instance)).to.be.undefined; // invalid not accepted
+            expect(util.binaryOperatorResultType(StringType.instance, createToken(TokenKind.And), IntegerType.instance)).to.be.undefined; // strings are not accepted
+            // or
+            expectTypeToBe(util.binaryOperatorResultType(DoubleType.instance, createToken(TokenKind.Or), IntegerType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Or), FloatType.instance), IntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Or), LongIntegerType.instance), LongIntegerType);
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Or), IntegerType.instance), IntegerType);
+            expect(util.binaryOperatorResultType(InvalidType.instance, createToken(TokenKind.Or), IntegerType.instance)).to.be.undefined;
+        });
+
+        it('assumes a dynamic type is a valid type', () => {
+            expectTypeToBe(util.binaryOperatorResultType(StringType.instance, createToken(TokenKind.Plus), DynamicType.instance), StringType);
+            expectTypeToBe(util.binaryOperatorResultType(DynamicType.instance, createToken(TokenKind.Plus), StringType.instance), StringType);
+            expectTypeToBe(util.binaryOperatorResultType(FloatType.instance, createToken(TokenKind.ForwardslashEqual), DynamicType.instance), FloatType);
+
+            // "and" / "or" are logic operators with booleans
+            expectTypeToBe(util.binaryOperatorResultType(DynamicType.instance, createToken(TokenKind.And), BooleanType.instance), BooleanType);
+
+            // "and" / "or" are bitwise operators with number
+            expectTypeToBe(util.binaryOperatorResultType(IntegerType.instance, createToken(TokenKind.Or), DynamicType.instance), IntegerType);
+        });
+
+        it('handles union types ', () => {
+            const floatIntUnion = new UnionType([IntegerType.instance, FloatType.instance]);
+            expectTypeToBe(util.binaryOperatorResultType(floatIntUnion, createToken(TokenKind.Plus), DoubleType.instance), DoubleType);
+        });
+
+        it('handles 2 union types', () => {
+            const floatIntUnion = new UnionType([IntegerType.instance, FloatType.instance]);
+            expectTypeToBe(util.binaryOperatorResultType(floatIntUnion, createToken(TokenKind.Plus), floatIntUnion), FloatType);
+        });
+
+        it('handles union types with diverse member types', () => {
+            const myUnion = new UnionType([FloatType.instance, StringType.instance, BooleanType.instance]);
+            expectTypeToBe(util.binaryOperatorResultType(myUnion, createToken(TokenKind.Plus), myUnion), DynamicType);
+        });
+
+        it('handles union types with self-referencing unions', () => {
+            const myUnion = new UnionType([FloatType.instance, StringType.instance, DynamicType.instance]);
+            myUnion.addType(myUnion);
+            expectTypeToBe(util.binaryOperatorResultType(myUnion, createToken(TokenKind.Plus), myUnion), DynamicType);
+        });
+
+        it('handles object Types', () => {
+            expectTypeToBe(util.binaryOperatorResultType(new ObjectType(), createToken(TokenKind.Plus), IntegerType.instance), IntegerType);
+        });
+
+        it('handles object Types', () => {
+            expectTypeToBe(util.binaryOperatorResultType(new ObjectType(), createToken(TokenKind.Plus), IntegerType.instance), IntegerType);
+        });
+    });
+
+    describe('unaryOperatorResultType', () => {
+        it('returns the correct type for minus operation', () => {
+            let minus = createToken(TokenKind.Minus);
+            expectTypeToBe(util.unaryOperatorResultType(minus, IntegerType.instance), IntegerType);
+            expectTypeToBe(util.unaryOperatorResultType(minus, FloatType.instance), FloatType);
+            expect(util.unaryOperatorResultType(minus, BooleanType.instance)).to.be.undefined;
+            expectTypeToBe(util.unaryOperatorResultType(minus, DoubleType.instance), DoubleType);
+            expect(util.unaryOperatorResultType(minus, StringType.instance)).to.be.undefined;
+            expectTypeToBe(util.unaryOperatorResultType(minus, DynamicType.instance), DynamicType);
+            expect(util.unaryOperatorResultType(minus, VoidType.instance)).to.be.undefined;
+
+            const boxedFloat = new InterfaceType('roFloat');
+            boxedFloat.isBuiltIn = true;
+            expectTypeToBe(util.unaryOperatorResultType(minus, boxedFloat), FloatType);
+        });
+
+        it('returns the correct type for not operation', () => {
+            let notToken = createToken(TokenKind.Not);
+            const boxedFloat = new InterfaceType('roFloat');
+            boxedFloat.isBuiltIn = true;
+            expectTypeToBe(util.unaryOperatorResultType(notToken, IntegerType.instance), IntegerType);
+            expectTypeToBe(util.unaryOperatorResultType(notToken, FloatType.instance), IntegerType);
+            expectTypeToBe(util.unaryOperatorResultType(notToken, BooleanType.instance), BooleanType);
+            expectTypeToBe(util.unaryOperatorResultType(notToken, DoubleType.instance), IntegerType);
+            expect(util.unaryOperatorResultType(notToken, StringType.instance)).to.be.undefined;
+            expectTypeToBe(util.unaryOperatorResultType(notToken, LongIntegerType.instance), LongIntegerType);
+            expect(util.unaryOperatorResultType(notToken, VoidType.instance)).to.be.undefined;
+            expectTypeToBe(util.unaryOperatorResultType(notToken, boxedFloat), IntegerType);
+        });
+
+        it('handles object Types', () => {
+            expectTypeToBe(util.unaryOperatorResultType(createToken(TokenKind.Minus), new ObjectType()), ObjectType);
+        });
+    });
+
+    describe('getTokenDocumentation', () => {
+        it('should return a string of the comment', () => {
+            const { ast } = Parser.parse(`
+                ' This is a comment.
+                ' it has two lines
+                function getOne() as integer
+                    return 1
+                end function
+            `);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const docs = util.getNodeDocumentation(func);
+            expect(docs).to.eql('This is a comment.\nit has two lines');
+        });
+
+        it('should pay attention to @param, @return, etc. (jsdoc tags)', () => {
+            const { ast } = Parser.parse(`
+                ' Add 1 to a number
+                '
+                ' @public
+                ' @param {integer} the number to add to
+                ' @return {integer} the result
+                function addOne(num as integer) as integer
+                    return num + 1
+                end function
+            `);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const docs = util.getNodeDocumentation(func);
+            expect(docs).to.eql('Add 1 to a number\n\n\n_@public_\n\n_@param_ {integer} the number to add to\n\n_@return_ {integer} the result');
+        });
+
+
+        it('only includes comments directly above token', () => {
+            const { ast } = Parser.parse(`
+                const abc = "ABC" ' comment at end of line
+
+                ' plus one
+                function addOne(num as integer) as integer
+                    return num + 1
+                end function
+            `);
+            const func = (ast.statements[1] as FunctionStatement).func;
+            const docs = util.getNodeDocumentation(func);
+            expect(docs).to.eql('plus one');
+        });
+
+        it('allows jsdoc style comment blocks', () => {
+            const { ast } = Parser.parse(`
+                ' /**
+                '  plus one
+                ' */
+                function addOne(num as integer) as integer
+                    return num + 1
+                end function
+            `);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const docs = util.getNodeDocumentation(func);
+            expect(docs).to.eql('plus one');
+        });
+
+        it('allows jsdoc style comment blocks with leading *', () => {
+            const { ast } = Parser.parse(`
+                ' /**
+                '  * plus one
+                '  */
+                function addOne(num as integer) as integer
+                    return num + 1
+                end function
+            `);
+            const func = (ast.statements[0] as FunctionStatement).func;
+            const docs = util.getNodeDocumentation(func);
+            expect(docs).to.eql('plus one');
+        });
+    });
+
+    describe('truncate', () => {
+        const items = ['one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen', 'eighteen', 'nineteen', 'twenty'];
+
+        it('returns whole string when under the limit', () => {
+            expect(
+                util.truncate({
+                    leadingText: 'We have numbers: ',
+                    items: items,
+                    partBuilder: (item) => item,
+                    maxLength: 1000
+                })
+            ).to.eql(
+                'We have numbers: ' + items.join(', ')
+            );
+        });
+
+        it('truncates to max length', () => {
+            expect(
+                util.truncate({
+                    leadingText: 'We have numbers: ',
+                    items: items,
+                    partBuilder: (item) => item,
+                    maxLength: 50
+                })
+            ).to.eql(
+                'We have numbers: one, two, three, ...and 17 more'
+            );
+        });
+
+        it('shows at least 2 items, even if going over the length', () => {
+            expect(
+                util.truncate({
+                    leadingText: 'We have numbers: ',
+                    items: items,
+                    partBuilder: (item) => item,
+                    maxLength: 30
+                })
+            ).to.eql(
+                'We have numbers: one, two, ...and 18 more'
+            );
+        });
+
+        it('Accounts for extra wrapping around items', () => {
+            expect(
+                util.truncate({
+                    leadingText: 'We have numbers: ',
+                    items: items,
+                    partBuilder: (item) => `--${item}--`,
+                    maxLength: 60
+                })
+            ).to.eql(
+                'We have numbers: --one--, --two--, --three--, ...and 17 more'
+            );
+        });
+
+        it('includes trailing text', () => {
+            expect(
+                util.truncate({
+                    leadingText: 'We have numbers: ',
+                    trailingText: '!',
+                    items: items,
+                    partBuilder: (item) => item,
+                    maxLength: 50
+                })
+            ).to.eql(
+                'We have numbers: one, two, three, ...and 17 more!'
+            );
+        });
+    });
     describe('promiseRaceMatch', () => {
         async function resolveAfter<T = any>(value: T, timeout: number) {
             await util.sleep(timeout);
@@ -1228,6 +1772,98 @@ describe('util', () => {
                 test('/one//two///three//', '/one/two/three/');
                 test('\\\\one\\\\two\\\\three\\\\', '/one/two/three/');
             });
+
+        });
+
+        describe('virtual:/ paths', () => {
+            it('preserves virtual:/ prefix on windows', () => {
+                isWindows = true;
+                test('virtual:/ButtonPrimary.brs', 'virtual:/buttonprimary.brs');
+                test('virtual:\\ButtonPrimary.brs', 'virtual:/buttonprimary.brs');
+            });
+
+            it('preserves virtual:/ prefix on unix', () => {
+                isWindows = false;
+                test('virtual:/ButtonPrimary.brs', 'virtual:/buttonprimary.brs');
+                test('virtual:\\ButtonPrimary.brs', 'virtual:/buttonprimary.brs');
+            });
+
+            it('normalizes consecutive slashes in virtual paths', () => {
+                isWindows = true;
+                test('virtual://one//two.brs', 'virtual:/one/two.brs');
+                isWindows = false;
+                test('virtual://one//two.brs', 'virtual:/one/two.brs');
+            });
+
+            it('lowercases virtual path content', () => {
+                test('virtual:/UPPER/CasePath.brs', 'virtual:/upper/casepath.brs');
+            });
+        });
+    });
+
+    describe('isClassUsedAsFunction', () => {
+        it('does not crash when class type has no name', () => {
+            util.isClassUsedAsFunction(new ClassType(undefined), undefined, { flags: SymbolTypeFlag.runtime });
+        });
+    });
+
+    describe('hasLeadingComments', () => {
+        it('does not crash on undefined trivia', () => {
+            expect(util.hasLeadingComments(undefined)).to.be.false;
+        });
+
+        it('returns false when there are no leading comments', () => {
+            const token = createToken(TokenKind.Identifier);
+            token.leadingTrivia = [];
+            expect(util.hasLeadingComments(token)).to.be.false;
+        });
+
+        it('returns true when there are leading comments', () => {
+            const token = createToken(TokenKind.Identifier);
+            token.leadingTrivia = [createToken(TokenKind.Comment, `'comment`)];
+            expect(util.hasLeadingComments(token)).to.be.true;
+        });
+
+        it('does not crash on unexpected trivia item types', () => {
+            const token = createToken(TokenKind.Identifier);
+            token.leadingTrivia = [undefined, null, 1, true, 'string', {}, createToken(TokenKind.Comment, `'comment`)] as any[];
+            expect(util.hasLeadingComments(token)).to.be.true;
+        });
+    });
+
+    describe('getLeadingComments', () => {
+        it('does not crash on undefined trivia', () => {
+            expect(util.getLeadingComments(undefined)).to.eql([]);
+        });
+
+        it('returns [] when there are no leading comments', () => {
+            const token = createToken(TokenKind.Identifier);
+            token.leadingTrivia = [];
+            expect(util.getLeadingComments(token)).to.eql([]);
+        });
+
+        it('returns true when there are leading comments', () => {
+            const token = createToken(TokenKind.Identifier);
+            token.leadingTrivia = [createToken(TokenKind.Comment, `'comment 1`)];
+            expect(util.getLeadingComments(token)).eql([createToken(TokenKind.Comment, `'comment 1`)]);
+        });
+
+        it('does not crash on unexpected trivia item types', () => {
+            const token = createToken(TokenKind.Identifier);
+            token.leadingTrivia = [undefined, null, 1, true, 'string', {}, createToken(TokenKind.Comment, `'comment 2`)] as any[];
+            expect(util.getLeadingComments(token)).eql([createToken(TokenKind.Comment, `'comment 2`)]);
         });
     });
 });
+
+
+/**
+ * Given a path to a file/directory, replace all path separators with the current system's version.
+ */
+function pathSepNormalize(filePath: string, separator?: string) {
+    if (!filePath) {
+        return filePath;
+    }
+    separator = separator ? separator : path.sep;
+    return filePath.replace(/[\\/]+/g, separator);
+}
diff --git a/src/util.ts b/src/util.ts
index 80b65f73c..e9baae08c 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -4,39 +4,55 @@ import type { ParseError } from 'jsonc-parser';
 import { parse as parseJsonc, printParseErrorCode } from 'jsonc-parser';
 import * as path from 'path';
 import { rokuDeploy, DefaultFiles } from 'roku-deploy';
-import type { Diagnostic, Position, Range, Location, DiagnosticRelatedInformation } from 'vscode-languageserver';
+import type { Diagnostic, Position, DiagnosticRelatedInformation } from 'vscode-languageserver';
+import { Range, Location } from 'vscode-languageserver';
 import { URI } from 'vscode-uri';
-import * as xml2js from 'xml2js';
 import type { BsConfig, FinalizedBsConfig } from './BsConfig';
 import { DiagnosticMessages } from './DiagnosticMessages';
-import type { CallableContainer, BsDiagnostic, FileReference, CallableContainerMap, Plugin, ExpressionInfo, TranspileResult, MaybePromise, DisposableLike, PluginFactory } from './interfaces';
+import type { CallableContainer, BsDiagnostic, FileReference, CallableContainerMap, Plugin, ExpressionInfo, TranspileResult, MaybePromise, DisposableLike, ExtraSymbolData, GetTypeOptions, TypeChainProcessResult, PluginFactory, TypeCircularReferenceInfo } from './interfaces';
+import { TypeChainEntry } from './interfaces';
 import { BooleanType } from './types/BooleanType';
 import { DoubleType } from './types/DoubleType';
 import { DynamicType } from './types/DynamicType';
 import { FloatType } from './types/FloatType';
-import { FunctionType } from './types/FunctionType';
 import { IntegerType } from './types/IntegerType';
-import { InvalidType } from './types/InvalidType';
 import { LongIntegerType } from './types/LongIntegerType';
 import { ObjectType } from './types/ObjectType';
 import { StringType } from './types/StringType';
 import { VoidType } from './types/VoidType';
 import { ParseMode } from './parser/Parser';
-import type { DottedGetExpression, VariableExpression } from './parser/Expression';
+import type { CallExpression, CallfuncExpression, DottedGetExpression, FunctionParameterExpression, IndexedGetExpression, LiteralExpression, TypeExpression, VariableExpression } from './parser/Expression';
 import { LogLevel, createLogger } from './logging';
-import type { Identifier, Locatable, Token } from './lexer/Token';
+import { isToken, type Identifier, type Token } from './lexer/Token';
 import { TokenKind } from './lexer/TokenKind';
-import { isAssignmentStatement, isBrsFile, isCallExpression, isCallfuncExpression, isDottedGetExpression, isExpression, isFunctionParameterExpression, isIndexedGetExpression, isNamespacedVariableNameExpression, isNewExpression, isVariableExpression, isXmlAttributeGetExpression, isXmlFile } from './astUtils/reflection';
+import { isAnyReferenceType, isBinaryExpression, isBooleanTypeLike, isBrsFile, isCallExpression, isCallableType, isCallfuncExpression, isClassType, isCompoundType, isComponentType, isDottedGetExpression, isDoubleTypeLike, isDynamicType, isEnumMemberType, isExpression, isFloatTypeLike, isIndexedGetExpression, isIntegerTypeLike, isIntersectionType, isInvalidTypeLike, isLiteralString, isLongIntegerTypeLike, isNamespaceStatement, isNamespaceType, isNewExpression, isNumberTypeLike, isObjectType, isParamTypeFromValueReferenceType, isPrimitiveType, isReferenceType, isStatement, isStringTypeLike, isTypeExpression, isTypedArrayExpression, isTypedFunctionType, isUninitializedType, isUnionType, isVariableExpression, isVoidType, isXmlAttributeGetExpression, isXmlFile, isArrayType, isAssociativeArrayTypeLike, isBuiltInType, isTypedFunctionTypeLike } from './astUtils/reflection';
 import { WalkMode } from './astUtils/visitors';
-import { CustomType } from './types/CustomType';
 import { SourceNode, SourceMapConsumer } from 'source-map';
 import type { RawSourceMap, SourceMapGenerator } from 'source-map';
-import type { SGAttribute } from './parser/SGTypes';
 import * as requireRelative from 'require-relative';
 import type { BrsFile } from './files/BrsFile';
 import type { XmlFile } from './files/XmlFile';
 import type { AstNode, Expression, Statement } from './parser/AstNode';
-import { components, events, interfaces } from './roku-types';
+import { AstNodeKind } from './parser/AstNode';
+import type { UnresolvedSymbol } from './AstValidationSegmenter';
+import type { GetSymbolTypeOptions, SymbolTable } from './SymbolTable';
+import { SymbolTypeFlag } from './SymbolTypeFlag';
+import { createIdentifier, createToken } from './astUtils/creators';
+import { MAX_RELATED_INFOS_COUNT } from './diagnosticUtils';
+import type { BscType } from './types/BscType';
+import { UnionType, unionTypeFactory } from './types/UnionType';
+import { ArrayType } from './types/ArrayType';
+import { BinaryOperatorReferenceType, TypePropertyReferenceType, ParamTypeFromValueReferenceType } from './types/ReferenceType';
+import { AssociativeArrayType } from './types/AssociativeArrayType';
+import { ComponentType } from './types/ComponentType';
+import { FunctionType } from './types/FunctionType';
+import type { AssignmentStatement, NamespaceStatement } from './parser/Statement';
+import type { BscFile } from './files/BscFile';
+import type { NamespaceType } from './types/NamespaceType';
+import { getUniqueType } from './types/helpers';
+import { InvalidType } from './types/InvalidType';
+import { TypedFunctionType } from './types';
+import { IntersectionType } from './types/IntersectionType';
 
 export class Util {
     public clearConsole() {
@@ -115,38 +131,10 @@ export class Util {
      * Given a pkg path of any kind, transform it to a roku-specific pkg path (i.e. "pkg:/some/path.brs")
      */
     public sanitizePkgPath(pkgPath: string) {
-        pkgPath = pkgPath.replace(/\\/g, '/');
-        //if there's no protocol, assume it's supposed to start with `pkg:/`
-        if (!this.startsWithProtocol(pkgPath)) {
-            pkgPath = 'pkg:/' + pkgPath;
-        }
-        return pkgPath;
-    }
-
-    /**
-     * Determine if the given path starts with a protocol
-     */
-    public startsWithProtocol(path: string) {
-        return !!/^[-a-z]+:\//i.exec(path);
-    }
-
-    /**
-     * Given a pkg path of any kind, transform it to a roku-specific pkg path (i.e. "pkg:/some/path.brs")
-     */
-    public getRokuPkgPath(pkgPath: string) {
-        pkgPath = pkgPath.replace(/\\/g, '/');
-        return 'pkg:/' + pkgPath;
-    }
-
-    /**
-     * Given a path to a file/directory, replace all path separators with the current system's version.
-     */
-    public pathSepNormalize(filePath: string, separator?: string) {
-        if (!filePath) {
-            return filePath;
-        }
-        separator = separator ? separator : path.sep;
-        return filePath.replace(/[\\/]+/g, separator);
+        //convert all slashes to forwardslash
+        pkgPath = pkgPath.replace(/[\/\\]+/g, '/');
+        //ensure every path has the leading pkg:/
+        return 'pkg:/' + pkgPath.replace(/^pkg:\//i, '');
     }
 
     /**
@@ -223,11 +211,11 @@ export class Util {
             if (parseErrors.length > 0) {
                 let err = parseErrors[0];
                 let diagnostic = {
-                    ...DiagnosticMessages.bsConfigJsonHasSyntaxErrors(printParseErrorCode(parseErrors[0].error)),
-                    file: {
-                        srcPath: configFilePath
-                    },
-                    range: this.getRangeFromOffsetLength(projectFileContents, err.offset, err.length)
+                    ...DiagnosticMessages.syntaxError(`Syntax errors in bsconfig.json: ${printParseErrorCode(parseErrors[0].error)}`),
+                    location: {
+                        uri: this.pathToUri(configFilePath),
+                        range: this.getRangeFromOffsetLength(projectFileContents, err.offset, err.length)
+                    }
                 } as BsDiagnostic;
                 throw diagnostic; //eslint-disable-line @typescript-eslint/no-throw-literal
             }
@@ -254,18 +242,15 @@ export class Util {
             }
 
             //make any paths in the config absolute (relative to the CURRENT config file)
-            if (result.outFile) {
-                result.outFile = path.resolve(projectFileCwd, result.outFile);
-            }
             if (result.rootDir) {
                 result.rootDir = path.resolve(projectFileCwd, result.rootDir);
             }
+            if (result.outDir) {
+                result.outDir = path.resolve(projectFileCwd, result.outDir);
+            }
             if (result.cwd) {
                 result.cwd = path.resolve(projectFileCwd, result.cwd);
             }
-            if (result.stagingDir) {
-                result.stagingDir = path.resolve(projectFileCwd, result.stagingDir);
-            }
             if (result.sourceRoot && result.resolveSourceRoot) {
                 result.sourceRoot = path.resolve(projectFileCwd, result.sourceRoot);
             }
@@ -294,45 +279,15 @@ export class Util {
         collection[key] = [...result];
     }
 
-    /**
-     * Do work within the scope of a changed current working directory
-     * @param targetCwd the cwd where the work should be performed
-     * @param callback a function to call when the cwd has been changed to `targetCwd`
-     */
-    public cwdWork<T>(targetCwd: string | null | undefined, callback: () => T): T {
-        let originalCwd = process.cwd();
-        if (targetCwd) {
-            process.chdir(targetCwd);
-        }
-
-        let result: T;
-        let err;
-
-        try {
-            result = callback();
-        } catch (e) {
-            err = e;
-        }
-
-        if (targetCwd) {
-            process.chdir(originalCwd);
-        }
-
-        if (err) {
-            throw err;
-        } else {
-            //justification: `result` is set as long as `err` is not set and vice versa
-            return result!;
-        }
-    }
-
     /**
      * Given a BsConfig object, start with defaults,
      * merge with bsconfig.json and the provided options.
      * @param config a bsconfig object to use as the baseline for the resulting config
      */
     public normalizeAndResolveConfig(config: BsConfig | undefined): FinalizedBsConfig {
-        let result = this.normalizeConfig({});
+        let result = this.normalizeConfig({
+            ...config
+        });
 
         if (config?.noProject) {
             return result;
@@ -362,8 +317,6 @@ export class Util {
         config = config ?? {} as BsConfig;
 
         const cwd = config.cwd ?? process.cwd();
-        const rootFolderName = path.basename(cwd);
-        const retainStagingDir = (config.retainStagingDir ?? config.retainStagingFolder) === true ? true : false;
 
         let logLevel: LogLevel = LogLevel.log;
 
@@ -377,24 +330,40 @@ export class Util {
             bslibDestinationDir = bslibDestinationDir.replace(/^(\/*)(.*?)(\/*)$/, '$2');
         }
 
+        let noEmit: boolean;
+        if ('noEmit' in config) {
+            noEmit = config.noEmit;
+        } else if ('copyToStaging' in config) {
+            noEmit = !(config as any).copyToStaging; //invert the old value
+        } else {
+            noEmit = false; //default case
+        }
+
+        let outDir: string;
+        if ('outDir' in config) {
+            outDir = config.outDir ?? './out';
+        } else if ('stagingFolderPath' in config) {
+            outDir = (config as any).stagingFolderPath as string;
+        } else if ('stagingDir' in config) {
+            outDir = (config as any).stagingDir as string;
+        } else {
+            outDir = './out'; //default case
+        }
+
         const configWithDefaults: Omit<FinalizedBsConfig, 'rootDir'> = {
             cwd: cwd,
-            deploy: config.deploy === true ? true : false,
             //use default files array from rokuDeploy
             files: config.files ?? [...DefaultFiles],
-            createPackage: config.createPackage === false ? false : true,
-            outFile: config.outFile ?? `./out/${rootFolderName}.zip`,
+            outDir: outDir,
             sourceMap: config.sourceMap === true,
             relativeSourceMaps: config.relativeSourceMaps === true,
-            username: config.username ?? 'rokudev',
             watch: config.watch === true ? true : false,
             emitFullPaths: config.emitFullPaths === true ? true : false,
-            retainStagingDir: retainStagingDir,
-            retainStagingFolder: retainStagingDir,
-            copyToStaging: config.copyToStaging === false ? false : true,
+            noEmit: noEmit,
             ignoreErrorCodes: config.ignoreErrorCodes ?? [],
             diagnosticSeverityOverrides: config.diagnosticSeverityOverrides ?? {},
             diagnosticFilters: config.diagnosticFilters ?? [],
+            diagnosticFiltersV0Compatibility: config.diagnosticFiltersV0Compatibility === true ? true : false,
             plugins: config.plugins ?? [],
             pruneEmptyCodeFiles: config.pruneEmptyCodeFiles === true ? true : false,
             autoImportComponentScript: config.autoImportComponentScript === true ? true : false,
@@ -406,6 +375,7 @@ export class Util {
             removeParameterTypes: config.removeParameterTypes === true ? true : false,
             logLevel: logLevel,
             bslibDestinationDir: bslibDestinationDir,
+            legacyCallfuncHandling: config.legacyCallfuncHandling === true ? true : false,
             validate: config.validate === false ? false : true
         };
 
@@ -455,13 +425,6 @@ export class Util {
         return result;
     }
 
-    /**
-     * Split a file by newline characters (LF or CRLF)
-     */
-    public getLines(text: string) {
-        return text.split(/\r?\n/);
-    }
-
     /**
      * Given an absolute path to a source file, and a target path,
      * compute the pkg path for the target relative to the source file's location
@@ -568,6 +531,17 @@ export class Util {
         return path.join(...resultParts);
     }
 
+    public getImportPackagePath(srcPath: string, pkgTargetPath: string) {
+        const srcExt = this.getExtension(srcPath);
+        const lowerSrcExt = srcExt.toLowerCase();
+        const lowerTargetExt = this.getExtension(pkgTargetPath).toLowerCase();
+        if (lowerSrcExt === '.bs' && lowerTargetExt === '.brs') {
+            // if source is .bs, use that as the import extenstion
+            return pkgTargetPath.substring(0, pkgTargetPath.length - lowerTargetExt.length) + srcExt;
+        }
+        return pkgTargetPath;
+    }
+
     /**
      * Walks left in a DottedGetExpression and returns a VariableExpression if found, or undefined if not found
      */
@@ -650,51 +624,128 @@ export class Util {
     }
 
     public comparePositionToRange(position: Position | undefined, range: Range | undefined) {
-        //stop if the either range is misisng
+        //stop if the either range is missng
         if (!position || !range) {
             return 0;
         }
 
-        if (position.line < range.start.line || (position.line === range.start.line && position.character < range.start.character)) {
+        if (this.comparePosition(position, range.start) < 0) {
+            return -1;
+        }
+        if (this.comparePosition(position, range.end) > 0) {
+            return 1;
+        }
+        return 0;
+    }
+
+    public comparePosition(a: Position | undefined, b: Position) {
+        //stop if the either position is missing
+        if (!a || !b) {
+            return 0;
+        }
+
+        if (a.line < b.line || (a.line === b.line && a.character < b.character)) {
             return -1;
         }
-        if (position.line > range.end.line || (position.line === range.end.line && position.character > range.end.character)) {
+        if (a.line > b.line || (a.line === b.line && a.character > b.character)) {
             return 1;
         }
         return 0;
     }
 
     /**
-     * Parse an xml file and get back a javascript object containing its results
+     * Is the inner range completely enclosed in the outer range
      */
-    public parseXml(text: string) {
-        return new Promise<any>((resolve, reject) => {
-            xml2js.parseString(text, (err, data) => {
-                if (err) {
-                    reject(err);
-                } else {
-                    resolve(data);
-                }
-            });
-        });
+    public isRangeInRange(inner: Range, outer: Range) {
+        return this.comparePosition(inner.start, outer.start) === 1 &&
+            this.comparePosition(inner.end, outer.end) === -1;
     }
 
-    public propertyCount(object: Record<string, unknown>) {
-        let count = 0;
-        for (let key in object) {
-            if (object.hasOwnProperty(key)) {
-                count++;
+    /**
+     * Combine all the documentation for a node - uses the AstNode's leadingTrivia property
+     * @param node the node to get the documentation for
+     * @param options extra options
+     * @param options.prettyPrint if true, will format the comment text for markdown
+     * @param options.commentTokens out Array of tokens that match the comment lines
+     */
+    public getNodeDocumentation(node: AstNode, options: { prettyPrint?: boolean; commentTokens?: Token[] } = { prettyPrint: true }) {
+        if (!node) {
+            return '';
+        }
+        options = options ?? { prettyPrint: true };
+        options.commentTokens = options.commentTokens ?? [];
+        const nodeTrivia = node.leadingTrivia ?? [];
+        const leadingTrivia = isStatement(node)
+            ? [...(node.annotations?.map(anno => anno.leadingTrivia ?? []).flat() ?? []), ...nodeTrivia]
+            : nodeTrivia;
+        const tokens = leadingTrivia?.filter(t => t.kind === TokenKind.Newline || t.kind === TokenKind.Comment);
+        const comments = [] as Token[];
+
+        let newLinesInRow = 0;
+        for (let i = tokens.length - 1; i >= 0; i--) {
+            const token = tokens[i];
+            //skip whitespace and newline chars
+            if (token.kind === TokenKind.Comment) {
+                comments.push(token);
+                newLinesInRow = 0;
+            } else if (token.kind === TokenKind.Newline) {
+                //skip these tokens
+                newLinesInRow++;
+
+                if (newLinesInRow > 1) {
+                    // stop processing on empty line.
+                    break;
+                }
+                //any other token means there are no more comments
+            } else {
+                break;
             }
         }
-        return count;
+        const jsDocCommentBlockLine = /(\/\*{2,}|\*{1,}\/)/i;
+        let usesjsDocCommentBlock = false;
+        if (comments.length === 0) {
+            return '';
+        }
+        return comments.reverse()
+            .map(x => ({ line: x.text.replace(/^('|rem)/i, '').trim(), token: x }))
+            .filter(({ line }) => {
+                if (jsDocCommentBlockLine.exec(line)) {
+                    usesjsDocCommentBlock = true;
+                    return false;
+                }
+                return true;
+            }).map(({ line, token }) => {
+                if (usesjsDocCommentBlock) {
+                    if (line.startsWith('*')) {
+                        //remove jsDoc leading '*'
+                        line = line.slice(1).trim();
+                    }
+                }
+                if (options.prettyPrint && line.startsWith('@')) {
+                    // Handle jsdoc/brightscriptdoc tags specially
+                    // make sure they are on their own markdown line, and add italics
+                    const firstSpaceIndex = line.indexOf(' ');
+                    if (firstSpaceIndex === -1) {
+                        return `\n_${line}_`;
+                    }
+                    const firstWord = line.substring(0, firstSpaceIndex);
+                    return `\n_${firstWord}_ ${line.substring(firstSpaceIndex + 1)}`;
+                }
+                if (options.commentTokens) {
+                    options.commentTokens.push(token);
+                }
+                return line;
+            }).join('\n');
     }
 
-    public padLeft(subject: string, totalLength: number, char: string) {
-        totalLength = totalLength > 1000 ? 1000 : totalLength;
-        while (subject.length < totalLength) {
-            subject = char + subject;
-        }
-        return subject;
+    /**
+     * Prefixes a component name so it can be used as type in the symbol table, without polluting available symbols
+     *
+     * @param sgNodeName the Name of the component
+     * @returns the node name, prefixed with `roSGNode`
+     */
+    public getSgNodeTypeName(sgNodeName: string) {
+        return 'roSGNode' + sgNodeName;
     }
 
     /**
@@ -728,21 +779,6 @@ export class Util {
         }
     }
 
-    /**
-     * Determine if two arrays containing primitive values are equal.
-     * This considers order and compares by equality.
-     */
-    public areArraysEqual(arr1: any[], arr2: any[]) {
-        if (arr1.length !== arr2.length) {
-            return false;
-        }
-        for (let i = 0; i < arr1.length; i++) {
-            if (arr1[i] !== arr2[i]) {
-                return false;
-            }
-        }
-        return true;
-    }
     /**
      * Does the string appear to be a uri (i.e. does it start with `file:`)
      */
@@ -783,20 +819,6 @@ export class Util {
         return normalizedPath;
     }
 
-
-    /**
-     * Get the outDir from options, taking into account cwd and absolute outFile paths
-     */
-    public getOutDir(options: FinalizedBsConfig) {
-        options = this.normalizeConfig(options);
-        let cwd = path.normalize(options.cwd ? options.cwd : process.cwd());
-        if (path.isAbsolute(options.outFile)) {
-            return path.dirname(options.outFile);
-        } else {
-            return path.normalize(path.join(cwd, path.dirname(options.outFile)));
-        }
-    }
-
     /**
      * Get paths to all files on disc that match this project's source list
      */
@@ -823,52 +845,6 @@ export class Util {
         }
     }
 
-    /**
-     * Determine whether this diagnostic should be supressed or not, based on brs comment-flags
-     */
-    public diagnosticIsSuppressed(diagnostic: BsDiagnostic) {
-        const diagnosticCode = typeof diagnostic.code === 'string' ? diagnostic.code.toLowerCase() : diagnostic.code;
-        for (let flag of diagnostic.file?.commentFlags ?? []) {
-            //this diagnostic is affected by this flag
-            if (diagnostic.range && this.rangeContains(flag.affectedRange, diagnostic.range.start)) {
-                //if the flag acts upon this diagnostic's code
-                if (flag.codes === null || (diagnosticCode !== undefined && flag.codes.includes(diagnosticCode))) {
-                    return true;
-                }
-            }
-        }
-    }
-
-    /**
-     * Walks up the chain to find the closest bsconfig.json file
-     */
-    public async findClosestConfigFile(currentPath: string): Promise<string | undefined> {
-        //make the path absolute
-        currentPath = path.resolve(
-            path.normalize(
-                currentPath
-            )
-        );
-
-        let previousPath: string | undefined;
-        //using ../ on the root of the drive results in the same file path, so that's how we know we reached the top
-        while (previousPath !== currentPath) {
-            previousPath = currentPath;
-
-            let bsPath = path.join(currentPath, 'bsconfig.json');
-            let brsPath = path.join(currentPath, 'brsconfig.json');
-            if (await this.pathExists(bsPath)) {
-                return bsPath;
-            } else if (await this.pathExists(brsPath)) {
-                return brsPath;
-            } else {
-                //walk upwards one directory
-                currentPath = path.resolve(path.join(currentPath, '../'));
-            }
-        }
-        //got to the root path, no config file exists
-    }
-
     /**
      * Set a timeout for the specified milliseconds, and resolve the promise once the timeout is finished.
      * @param milliseconds the minimum number of milliseconds to sleep for
@@ -884,15 +860,6 @@ export class Util {
         });
     }
 
-    /**
-     * Given an array, map and then flatten
-     * @param array the array to flatMap over
-     * @param callback a function that is called for every array item
-     */
-    public flatMap<T, R>(array: T[], callback: (arg: T) => R[]): R[] {
-        return Array.prototype.concat.apply([], array.map(callback));
-    }
-
     /**
      * Determines if the position is greater than the range. This means
      * the position does not touch the range, and has a position greater than the end
@@ -918,37 +885,33 @@ export class Util {
     }
 
     /**
-     * Get a location object back by extracting location information from other objects that contain location
+     * Get a range back from an object that contains (or is) a range
      */
-    public getRange(startObj: { range: Range }, endObj: { range: Range }): Range {
-        if (!startObj?.range || !endObj?.range) {
+    public extractRange(rangeIsh: RangeLike): Range | undefined {
+        if (!rangeIsh) {
             return undefined;
-        }
-        return util.createRangeFromPositions(startObj.range?.start, endObj.range?.end);
-    }
-
-    /**
-     * If the two items both start on the same line
-     */
-    public sameStartLine(first: { range: Range }, second: { range: Range }) {
-        if (first && second && (first.range !== undefined) && (second.range !== undefined) &&
-            first.range.start.line === second.range.start.line
-        ) {
-            return true;
+        } else if ('location' in rangeIsh) {
+            return rangeIsh.location?.range;
+        } else if ('range' in rangeIsh) {
+            return rangeIsh.range;
+        } else if (Range.is(rangeIsh)) {
+            return rangeIsh;
         } else {
-            return false;
+            return undefined;
         }
     }
 
     /**
      * If the two items have lines that touch
      */
-    public linesTouch(first: { range?: Range | undefined }, second: { range?: Range | undefined }) {
-        if (first && second && (first.range !== undefined) && (second.range !== undefined) && (
-            first.range.start.line === second.range.start.line ||
-            first.range.start.line === second.range.end.line ||
-            first.range.end.line === second.range.start.line ||
-            first.range.end.line === second.range.end.line
+    public linesTouch(first: RangeLike, second: RangeLike) {
+        const firstRange = this.extractRange(first);
+        const secondRange = this.extractRange(second);
+        if (firstRange && secondRange && (
+            firstRange.start.line === secondRange.start.line ||
+            firstRange.start.line === secondRange.end.line ||
+            firstRange.end.line === secondRange.start.line ||
+            firstRange.end.line === secondRange.end.line
         )) {
             return true;
         } else {
@@ -956,19 +919,6 @@ export class Util {
         }
     }
 
-    /**
-     * Given text with (or without) dots separating text, get the rightmost word.
-     * (i.e. given "A.B.C", returns "C". or "B" returns "B because there's no dot)
-     */
-    public getTextAfterFinalDot(name: string) {
-        if (name) {
-            let parts = name.split('.');
-            if (parts.length > 0) {
-                return parts[parts.length - 1];
-            }
-        }
-    }
-
     /**
      * Find a script import that the current position touches, or undefined if not found
      */
@@ -1032,15 +982,41 @@ export class Util {
     /**
      * Helper for creating `Location` objects. Prefer using this function because vscode-languageserver's `Location.create()` is significantly slower at scale
      */
-    public createLocation(uri: string, range: Range): Location {
+    public createLocationFromRange(uri: string, range: Range): Location {
         return {
-            uri: uri,
+            uri: util.pathToUri(uri),
             range: range
         };
     }
 
     /**
-     * Helper for creating `Range` objects. Prefer using this function because vscode-languageserver's `Range.create()` is significantly slower
+     * Helper for creating `Location` objects from a file and range
+     */
+    public createLocationFromFileRange(file: BscFile, range: Range): Location {
+        return this.createLocationFromRange(this.pathToUri(file?.srcPath), range);
+    }
+
+    /**
+     * Helper for creating `Location` objects by passing each range value in directly. Prefer using this function because vscode-languageserver's `Location.create()` is significantly slower at scale
+     */
+    public createLocation(startLine: number, startCharacter: number, endLine: number, endCharacter: number, uri?: string): Location {
+        return {
+            uri: util.pathToUri(uri),
+            range: {
+                start: {
+                    line: startLine,
+                    character: startCharacter
+                },
+                end: {
+                    line: endLine,
+                    character: endCharacter
+                }
+            }
+        };
+    }
+
+    /**
+     * Helper for creating `Range` objects. Prefer using this function because vscode-languageserver's `Range.create()` is significantly slower.
      */
     public createRange(startLine: number, startCharacter: number, endLine: number, endCharacter: number): Range {
         return {
@@ -1058,246 +1034,739 @@ export class Util {
     /**
      * Create a `Range` from two `Position`s
      */
-    public createRangeFromPositions(startPosition: Position, endPosition: Position): Range {
-        return {
-            start: {
-                line: startPosition.line,
-                character: startPosition.character
-            },
-            end: {
-                line: endPosition.line,
-                character: endPosition.character
-            }
-        };
+    public createRangeFromPositions(startPosition: Position, endPosition: Position): Range | undefined {
+        startPosition = startPosition ?? endPosition;
+        endPosition = endPosition ?? startPosition;
+        if (!startPosition && !endPosition) {
+            return undefined;
+        }
+        return this.createRange(startPosition.line, startPosition.character, endPosition.line, endPosition.character);
     }
 
     /**
      * Clone a range
      */
-    public cloneRange(range: Range) {
-        if (range) {
-            return this.createRange(range.start.line, range.start.character, range.end.line, range.end.character);
+    public cloneLocation(location: Location) {
+        if (location) {
+            return {
+                uri: location.uri,
+                range: {
+                    start: {
+                        line: location.range.start.line,
+                        character: location.range.start.character
+                    },
+                    end: {
+                        line: location.range.end.line,
+                        character: location.range.end.character
+                    }
+                }
+            };
         } else {
-            return range;
+            return location;
         }
     }
 
     /**
      * Clone every token
      */
-    public cloneToken<T extends Token>(token: T) {
+    public cloneToken<T extends Token>(token: T): T {
         if (token) {
             const result = {
                 kind: token.kind,
-                range: this.cloneRange(token.range),
+                location: this.cloneLocation(token.location),
                 text: token.text,
                 isReserved: token.isReserved,
-                leadingWhitespace: token.leadingWhitespace
-            } as T;
+                leadingWhitespace: token.leadingWhitespace,
+                leadingTrivia: token.leadingTrivia.map(x => this.cloneToken(x))
+            } as Token;
             //handle those tokens that have charCode
             if ('charCode' in token) {
                 (result as any).charCode = (token as any).charCode;
             }
-            return result;
+            return result as T;
         } else {
             return token;
         }
     }
 
     /**
-     * Given a list of ranges, create a range that starts with the first non-null lefthand range, and ends with the first non-null
-     * righthand range. Returns undefined if none of the items have a range.
+     *  Gets the bounding range of a bunch of ranges or objects that have ranges
+     *  TODO: this does a full iteration of the args. If the args were guaranteed to be in range order, we could optimize this
      */
-    public createBoundingRange(...locatables: Array<{ range?: Range } | null | undefined>): Range | undefined {
-        let leftmostRange: Range | undefined;
-        let rightmostRange: Range | undefined;
+    public createBoundingLocation(...locatables: Array<{ location?: Location } | Location | { range?: Range } | Range | undefined>): Location | undefined {
+        let uri: string | undefined;
+        let startPosition: Position | undefined;
+        let endPosition: Position | undefined;
 
-        for (let i = 0; i < locatables.length; i++) {
-            //set the leftmost non-null-range item
-            const left = locatables[i];
-            //the range might be a getter, so access it exactly once
-            const leftRange = left?.range;
-            if (!leftmostRange && leftRange) {
-                leftmostRange = leftRange;
+        for (let locatable of locatables) {
+            let range: Range;
+            if (!locatable) {
+                continue;
+            } else if ('location' in locatable) {
+                range = locatable.location?.range;
+                if (!uri) {
+                    uri = locatable.location?.uri;
+                }
+            } else if (Location.is(locatable)) {
+                range = locatable.range;
+                if (!uri) {
+                    uri = locatable.uri;
+                }
+            } else if ('range' in locatable) {
+                range = locatable.range;
+            } else {
+                range = locatable as Range;
             }
 
-            //set the rightmost non-null-range item
-            const right = locatables[locatables.length - 1 - i];
-            //the range might be a getter, so access it exactly once
-            const rightRange = right?.range;
-            if (!rightmostRange && rightRange) {
-                rightmostRange = rightRange;
+            //skip undefined locations or locations without a range
+            if (!range) {
+                continue;
             }
 
-            //if we have both sides, quit
-            if (leftmostRange && rightmostRange) {
-                break;
+            if (!startPosition) {
+                startPosition = range.start;
+            } else if (this.comparePosition(range.start, startPosition) < 0) {
+                startPosition = range.start;
+            }
+            if (!endPosition) {
+                endPosition = range.end;
+            } else if (this.comparePosition(range.end, endPosition) > 0) {
+                endPosition = range.end;
             }
         }
-        if (leftmostRange) {
-            //if we don't have a rightmost range, use the leftmost range for both the start and end
-            return this.createRangeFromPositions(
-                leftmostRange.start,
-                rightmostRange ? rightmostRange.end : leftmostRange.end);
+        if (startPosition && endPosition) {
+            return util.createLocation(startPosition.line, startPosition.character, endPosition.line, endPosition.character, uri);
         } else {
             return undefined;
         }
     }
 
     /**
-     * Create a `Position` object. Prefer this over `Position.create` for performance reasons
+     *  Gets the bounding range of a bunch of ranges or objects that have ranges
+     *  TODO: this does a full iteration of the args. If the args were guaranteed to be in range order, we could optimize this
      */
-    public createPosition(line: number, character: number) {
-        return {
-            line: line,
-            character: character
-        };
+    public createBoundingRange(...locatables: Array<RangeLike>): Range | undefined {
+        return this.createBoundingLocation(...locatables)?.range;
     }
 
     /**
-     * Convert a list of tokens into a string, including their leading whitespace
+     * Gets the bounding range of an object that contains a bunch of tokens
+     * @param tokens Object with tokens in it
+     * @returns Range containing all the tokens
      */
-    public tokensToString(tokens: Token[]) {
-        let result = '';
-        //skip iterating the final token
-        for (let token of tokens) {
-            result += token.leadingWhitespace + token.text;
+    public createBoundingLocationFromTokens(tokens: Record<string, { location?: Location }>): Location | undefined {
+        let uri: string;
+        let startPosition: Position | undefined;
+        let endPosition: Position | undefined;
+        for (let key in tokens) {
+            let token = tokens?.[key];
+            let locatableRange = token?.location?.range;
+            if (!locatableRange) {
+                continue;
+            }
+
+            if (!startPosition) {
+                startPosition = locatableRange.start;
+            } else if (this.comparePosition(locatableRange.start, startPosition) < 0) {
+                startPosition = locatableRange.start;
+            }
+            if (!endPosition) {
+                endPosition = locatableRange.end;
+            } else if (this.comparePosition(locatableRange.end, endPosition) > 0) {
+                endPosition = locatableRange.end;
+            }
+            if (!uri) {
+                uri = token.location.uri;
+            }
         }
-        return result;
+        if (startPosition && endPosition) {
+            return this.createLocation(startPosition.line, startPosition.character, endPosition.line, endPosition.character, uri);
+        } else {
+            return undefined;
+        }
+    }
+
+    /**
+     * Create a `Position` object. Prefer this over `Position.create` for performance reasons.
+     */
+    public createPosition(line: number, character: number) {
+        return {
+            line: line,
+            character: character
+        };
     }
 
     /**
      * Convert a token into a BscType
      */
-    public tokenToBscType(token: Token, allowCustomType = true) {
+    public tokenToBscType(token: Token) {
         // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (token.kind) {
             case TokenKind.Boolean:
-                return new BooleanType(token.text);
+                return BooleanType.instance;
             case TokenKind.True:
             case TokenKind.False:
-                return new BooleanType();
+                return BooleanType.instance;
             case TokenKind.Double:
-                return new DoubleType(token.text);
+                return DoubleType.instance;
             case TokenKind.DoubleLiteral:
-                return new DoubleType();
+                return DoubleType.instance;
             case TokenKind.Dynamic:
-                return new DynamicType(token.text);
+                return DynamicType.instance;
             case TokenKind.Float:
-                return new FloatType(token.text);
+                return FloatType.instance;
             case TokenKind.FloatLiteral:
-                return new FloatType();
+                return FloatType.instance;
             case TokenKind.Function:
-                //TODO should there be a more generic function type without a signature that's assignable to all other function types?
-                return new FunctionType(new DynamicType(token.text));
+                return FunctionType.instance;
             case TokenKind.Integer:
-                return new IntegerType(token.text);
+                return IntegerType.instance;
             case TokenKind.IntegerLiteral:
-                return new IntegerType();
+                return IntegerType.instance;
             case TokenKind.Invalid:
-                return new InvalidType(token.text);
+                return InvalidType.instance;
             case TokenKind.LongInteger:
-                return new LongIntegerType(token.text);
+                return LongIntegerType.instance;
             case TokenKind.LongIntegerLiteral:
-                return new LongIntegerType();
+                return LongIntegerType.instance;
             case TokenKind.Object:
-                return new ObjectType(token.text);
+                return ObjectType.instance;
             case TokenKind.String:
-                return new StringType(token.text);
+                return StringType.instance;
             case TokenKind.StringLiteral:
             case TokenKind.TemplateStringExpressionBegin:
             case TokenKind.TemplateStringExpressionEnd:
             case TokenKind.TemplateStringQuasi:
-                return new StringType();
+                return StringType.instance;
             case TokenKind.Void:
-                return new VoidType(token.text);
+                return VoidType.instance;
             case TokenKind.Identifier:
                 switch (token.text.toLowerCase()) {
                     case 'boolean':
-                        return new BooleanType(token.text);
+                        return BooleanType.instance;
                     case 'double':
-                        return new DoubleType(token.text);
+                        return DoubleType.instance;
+                    case 'dynamic':
+                        return DynamicType.instance;
                     case 'float':
-                        return new FloatType(token.text);
+                        return FloatType.instance;
                     case 'function':
-                        return new FunctionType(new DynamicType(token.text));
+                        return FunctionType.instance;
                     case 'integer':
-                        return new IntegerType(token.text);
+                        return IntegerType.instance;
                     case 'invalid':
-                        return new InvalidType(token.text);
+                        return InvalidType.instance;
                     case 'longinteger':
-                        return new LongIntegerType(token.text);
+                        return LongIntegerType.instance;
                     case 'object':
-                        return new ObjectType(token.text);
+                        return ObjectType.instance;
                     case 'string':
-                        return new StringType(token.text);
+                        return StringType.instance;
                     case 'void':
-                        return new VoidType(token.text);
-                }
-                if (allowCustomType) {
-                    return new CustomType(token.text);
+                        return VoidType.instance;
                 }
         }
     }
 
     /**
-     * Get the extension for the given file path. Basically the part after the final dot, except for
-     * `d.bs` which is treated as single extension
+     * Deciphers the correct types for fields based on docs
+     * https://developer.roku.com/en-ca/docs/references/scenegraph/xml-elements/interface.md
+     * @param typeDescriptor the type descriptor from the docs
+     * @returns {BscType} the known type, or dynamic
      */
-    public getExtension(filePath: string) {
-        filePath = filePath.toLowerCase();
-        if (filePath.endsWith('.d.bs')) {
-            return '.d.bs';
-        } else {
-            const idx = filePath.lastIndexOf('.');
-            if (idx > -1) {
-                return filePath.substring(idx);
-            }
+    public getNodeFieldType(typeDescriptor: string, lookupTable?: SymbolTable): BscType {
+        let typeDescriptorLower = typeDescriptor.toLowerCase().trim().replace(/\*/g, '');
+
+        if (typeDescriptorLower.startsWith('as ')) {
+            typeDescriptorLower = typeDescriptorLower.substring(3).trim();
+        }
+        const nodeFilter = (new RegExp(/^\[?(.* node)/, 'i')).exec(typeDescriptorLower);
+        if (nodeFilter?.[1]) {
+            typeDescriptorLower = nodeFilter[1].trim();
+        }
+        const parensFilter = (new RegExp(/(.*)\(.*\)/, 'gi')).exec(typeDescriptorLower);
+        if (parensFilter?.[1]) {
+            typeDescriptorLower = parensFilter[1].trim();
         }
-    }
 
-    /**
-     * Load and return the list of plugins
-     */
-    public loadPlugins(cwd: string, pathOrModules: string[], onError?: (pathOrModule: string, err: Error) => void): Plugin[] {
-        const logger = createLogger();
-        return pathOrModules.reduce<Plugin[]>((acc, pathOrModule) => {
-            if (typeof pathOrModule === 'string') {
-                try {
-                    const loaded = requireRelative(pathOrModule, cwd);
-                    const theExport: Plugin | PluginFactory = loaded.default ? loaded.default : loaded;
+        const bscType = this.tokenToBscType(createToken(TokenKind.Identifier, typeDescriptorLower));
+        if (bscType) {
+            return bscType;
+        }
 
-                    let plugin: Plugin | undefined;
+        function getRect2dType() {
+            const rect2dType = new AssociativeArrayType();
+            rect2dType.addMember('height', {}, FloatType.instance, SymbolTypeFlag.runtime);
+            rect2dType.addMember('width', {}, FloatType.instance, SymbolTypeFlag.runtime);
+            rect2dType.addMember('x', {}, FloatType.instance, SymbolTypeFlag.runtime);
+            rect2dType.addMember('y', {}, FloatType.instance, SymbolTypeFlag.runtime);
+            return rect2dType;
+        }
 
-                    // legacy plugins returned a plugin object. If we find that, then add a warning
-                    if (typeof theExport === 'object') {
-                        logger.warn(`Plugin "${pathOrModule}" was loaded as a singleton. Please contact the plugin author to update to the factory pattern.\n`);
-                        plugin = theExport;
+        function getColorType() {
+            return unionTypeFactory([IntegerType.instance, StringType.instance]);
+        }
 
-                        // the official plugin format is a factory function that returns a new instance of a plugin.
-                    } else if (typeof theExport === 'function') {
-                        plugin = theExport({
-                            version: this.getBrighterScriptVersion()
-                        });
-                    } else {
-                        //this should never happen; somehow an invalid plugin has made it into here
-                        throw new Error(`TILT: Encountered an invalid plugin: ${String(plugin)}`);
-                    }
+        //check for uniontypes
+        const multipleTypes = typeDescriptorLower.split(' or ').map(s => s.trim());
+        if (multipleTypes.length > 1) {
+            const individualTypes = multipleTypes.map(t => this.getNodeFieldType(t, lookupTable));
+            return unionTypeFactory(individualTypes);
+        }
 
-                    if (!plugin.name) {
-                        plugin.name = pathOrModule;
-                    }
-                    acc.push(plugin);
-                } catch (err: any) {
-                    if (onError) {
-                        onError(pathOrModule, err);
-                    } else {
-                        throw err;
-                    }
-                }
+        const typeIsArray = typeDescriptorLower.startsWith('array of ') || typeDescriptorLower.startsWith('roarray of ');
+
+        if (typeIsArray) {
+            const ofSearch = ' of ';
+            const arrayPrefixLength = typeDescriptorLower.indexOf(ofSearch) + ofSearch.length;
+            let arrayOfTypeName = typeDescriptorLower.substring(arrayPrefixLength); //cut off beginnin, eg. 'array of' or 'roarray of'
+            if (arrayOfTypeName.endsWith('s')) {
+                // remove "s" in "floats", etc.
+                arrayOfTypeName = arrayOfTypeName.substring(0, arrayOfTypeName.length - 1);
             }
-            return acc;
-        }, []);
+            if (arrayOfTypeName.endsWith('\'')) {
+                // remove "'" in "float's", etc.
+                arrayOfTypeName = arrayOfTypeName.substring(0, arrayOfTypeName.length - 1);
+            }
+            if (arrayOfTypeName === 'rectangle') {
+                arrayOfTypeName = 'rect2d';
+            }
+            let arrayType = this.getNodeFieldType(arrayOfTypeName, lookupTable);
+            return new ArrayType(arrayType);
+        } else if (typeDescriptorLower.startsWith('option ')) {
+            const actualTypeName = typeDescriptorLower.substring('option '.length); //cut off beginning 'option '
+            return this.getNodeFieldType(actualTypeName, lookupTable);
+        } else if (typeDescriptorLower.startsWith('value ')) {
+            const actualTypeName = typeDescriptorLower.substring('value '.length); //cut off beginning 'value '
+            return this.getNodeFieldType(actualTypeName, lookupTable);
+        } else if (typeDescriptorLower === 'n/a') {
+            return DynamicType.instance;
+        } else if (typeDescriptorLower === 'uri') {
+            return StringType.instance;
+        } else if (typeDescriptorLower === 'color') {
+            return getColorType();
+        } else if (typeDescriptorLower === 'vector2d' || typeDescriptorLower === 'floatarray') {
+            return new ArrayType(FloatType.instance);
+        } else if (typeDescriptorLower === 'vector2darray') {
+            return new ArrayType(new ArrayType(FloatType.instance));
+        } else if (typeDescriptorLower === 'intarray') {
+            return new ArrayType(IntegerType.instance);
+        } else if (typeDescriptorLower === 'colorarray') {
+            return new ArrayType(getColorType());
+        } else if (typeDescriptorLower === 'boolarray') {
+            return new ArrayType(BooleanType.instance);
+        } else if (typeDescriptorLower === 'stringarray' || typeDescriptorLower === 'strarray') {
+            return new ArrayType(StringType.instance);
+        } else if (typeDescriptorLower === 'int') {
+            return IntegerType.instance;
+        } else if (typeDescriptorLower === 'time') {
+            return DoubleType.instance;
+        } else if (typeDescriptorLower === 'str') {
+            return StringType.instance;
+        } else if (typeDescriptorLower === 'bool') {
+            return BooleanType.instance;
+        } else if (typeDescriptorLower === 'array' || typeDescriptorLower === 'roarray') {
+            return new ArrayType();
+        } else if (typeDescriptorLower === 'assocarray' ||
+            typeDescriptorLower === 'associative array' ||
+            typeDescriptorLower === 'associativearray' ||
+            typeDescriptorLower === 'roassociativearray' ||
+            typeDescriptorLower.startsWith('associative array of') ||
+            typeDescriptorLower.startsWith('associativearray of') ||
+            typeDescriptorLower.startsWith('roassociativearray of')
+        ) {
+            return new AssociativeArrayType();
+        } else if (typeDescriptorLower === 'node') {
+            return ComponentType.instance;
+        } else if (typeDescriptorLower === 'nodearray') {
+            return new ArrayType(ComponentType.instance);
+        } else if (typeDescriptorLower === 'rect2d') {
+            return getRect2dType();
+        } else if (typeDescriptorLower === 'rect2darray') {
+            return new ArrayType(getRect2dType());
+        } else if (typeDescriptorLower === 'font') {
+            return this.getNodeFieldType('roSGNodeFont', lookupTable);
+        } else if (typeDescriptorLower === 'contentnode') {
+            return this.getNodeFieldType('roSGNodeContentNode', lookupTable);
+        } else if (typeDescriptorLower.endsWith(' node')) {
+            return this.getNodeFieldType('roSgNode' + typeDescriptorLower.substring(0, typeDescriptorLower.length - 5), lookupTable);
+        } else if (lookupTable) {
+            //try doing a lookup
+            return lookupTable.getSymbolType(typeDescriptorLower, {
+                flags: SymbolTypeFlag.typetime,
+                fullName: typeDescriptor,
+                tableProvider: () => lookupTable
+            });
+        }
+
+        return DynamicType.instance;
+    }
+
+    /**
+     * Return the type of the result of a binary operator
+     * Note: compound assignments (eg. +=) internally use a binary expression, so that's why TokenKind.PlusEqual, etc. are here too
+     */
+    public binaryOperatorResultType(leftType: BscType, operator: Token, rightType: BscType): BscType {
+        if ((isAnyReferenceType(leftType) && !leftType.isResolvable()) ||
+            (isAnyReferenceType(rightType) && !rightType.isResolvable())) {
+            return new BinaryOperatorReferenceType(leftType, operator, rightType, (lhs, op, rhs) => {
+                return this.binaryOperatorResultType(lhs, op, rhs);
+            });
+        }
+
+        // Try to find a common value of union type
+        leftType = getUniqueType([leftType], unionTypeFactory);
+        rightType = getUniqueType([rightType], unionTypeFactory);
+
+        if (isUnionType(leftType)) {
+            leftType = this.getHighestPriorityType(leftType.types);
+        }
+        if (isUnionType(rightType)) {
+            rightType = this.getHighestPriorityType(rightType.types);
+        }
+
+        if (isVoidType(leftType) || isVoidType(rightType) || isUninitializedType(leftType) || isUninitializedType(rightType)) {
+            return undefined;
+        }
+
+        if (isEnumMemberType(leftType)) {
+            leftType = leftType.underlyingType;
+        }
+        if (isEnumMemberType(rightType)) {
+            rightType = rightType.underlyingType;
+        }
+
+        // treat object type like dynamic
+        if (isObjectType(leftType)) {
+            leftType = DynamicType.instance;
+        }
+        if (isObjectType(rightType)) {
+            rightType = DynamicType.instance;
+        }
+
+        let hasDouble = isDoubleTypeLike(leftType) || isDoubleTypeLike(rightType);
+        let hasFloat = isFloatTypeLike(leftType) || isFloatTypeLike(rightType);
+        let hasLongInteger = isLongIntegerTypeLike(leftType) || isLongIntegerTypeLike(rightType);
+        let hasInvalid = isInvalidTypeLike(leftType) || isInvalidTypeLike(rightType);
+        let hasDynamic = isDynamicType(leftType) || isDynamicType(rightType);
+        let bothDynamic = isDynamicType(leftType) && isDynamicType(rightType);
+        let bothNumbers = isNumberTypeLike(leftType) && isNumberTypeLike(rightType);
+        let hasNumber = isNumberTypeLike(leftType) || isNumberTypeLike(rightType);
+        let bothStrings = isStringTypeLike(leftType) && isStringTypeLike(rightType);
+        let hasString = isStringTypeLike(leftType) || isStringTypeLike(rightType);
+        let hasBoolean = isBooleanTypeLike(leftType) || isBooleanTypeLike(rightType);
+        let eitherBooleanOrNum = (isNumberTypeLike(leftType) || isBooleanTypeLike(leftType)) && (isNumberTypeLike(rightType) || isBooleanTypeLike(rightType));
+
+        let leftIsPrimitive = isPrimitiveType(leftType);
+        let rightIsPrimitive = isPrimitiveType(rightType);
+        let hasPrimitive = leftIsPrimitive || rightIsPrimitive;
+
+        let nonDynamicType: BscType;
+        if (hasPrimitive) {
+            nonDynamicType = leftIsPrimitive ? leftType : rightType;
+        }
+
+        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+        switch (operator.kind) {
+            // Math operators
+            case TokenKind.Plus:
+            case TokenKind.PlusEqual:
+                if (bothStrings) {
+                    // "string" + "string" is the only binary expression allowed with strings
+                    return StringType.instance;
+                } else if (hasString && hasDynamic) {
+                    // assume dynamicValue is a string
+                    return StringType.instance;
+                }
+            // eslint-disable-next-line no-fallthrough
+            case TokenKind.Minus:
+            case TokenKind.MinusEqual:
+            case TokenKind.Star:
+            case TokenKind.StarEqual:
+            case TokenKind.Mod:
+                if (bothNumbers) {
+                    if (hasDouble) {
+                        return DoubleType.instance;
+                    } else if (hasFloat) {
+                        return FloatType.instance;
+
+                    } else if (hasLongInteger) {
+                        return LongIntegerType.instance;
+                    }
+                    return IntegerType.instance;
+                } else if (hasNumber && hasDynamic) {
+                    // assume dynamic is a number
+                    return nonDynamicType;
+                }
+                break;
+            case TokenKind.Forwardslash:
+            case TokenKind.ForwardslashEqual:
+                if (bothNumbers) {
+                    if (hasDouble) {
+                        return DoubleType.instance;
+                    } else if (hasFloat) {
+                        return FloatType.instance;
+
+                    } else if (hasLongInteger) {
+                        return LongIntegerType.instance;
+                    }
+                    return FloatType.instance;
+                } else if (hasNumber && hasDynamic) {
+                    // assume dynamic is a number
+                    return nonDynamicType;
+                }
+                break;
+            case TokenKind.Backslash:
+            case TokenKind.BackslashEqual:
+                if (bothNumbers) {
+                    if (hasLongInteger) {
+                        return LongIntegerType.instance;
+                    }
+                    return IntegerType.instance;
+                } else if (hasNumber && hasDynamic) {
+                    // assume dynamic is a number
+                    return IntegerType.instance;
+                }
+                break;
+            case TokenKind.Caret:
+                if (bothNumbers) {
+                    if (hasDouble || hasLongInteger) {
+                        return DoubleType.instance;
+                    } else if (hasFloat) {
+                        return FloatType.instance;
+                    }
+                    return IntegerType.instance;
+                } else if (hasNumber && hasDynamic) {
+                    // assume dynamic is a number
+                    return IntegerType.instance;
+                }
+                break;
+            // Bitshift operators
+            case TokenKind.LeftShift:
+            case TokenKind.LeftShiftEqual:
+            case TokenKind.RightShift:
+            case TokenKind.RightShiftEqual:
+                if (bothNumbers) {
+                    if (hasLongInteger) {
+                        return LongIntegerType.instance;
+                    }
+                    // Bitshifts are allowed with non-integer numerics
+                    // but will always truncate to ints
+                    return IntegerType.instance;
+                } else if (hasNumber && hasDynamic) {
+                    // assume dynamic is a number
+                    return IntegerType.instance;
+                }
+                break;
+            // Comparison operators
+            // All comparison operators result in boolean
+            case TokenKind.Equal:
+            case TokenKind.LessGreater:
+                // = and <> can accept invalid / dynamic
+                if (hasDynamic || hasInvalid || bothStrings || eitherBooleanOrNum) {
+                    return BooleanType.instance;
+                }
+                break;
+            case TokenKind.Greater:
+            case TokenKind.Less:
+            case TokenKind.GreaterEqual:
+            case TokenKind.LessEqual:
+                if (bothStrings || bothNumbers) {
+                    return BooleanType.instance;
+                } else if ((hasNumber || hasString) && hasDynamic) {
+                    // assume dynamic is a valid type
+                    return BooleanType.instance;
+                }
+                break;
+            // Logical or bitwise operators
+            case TokenKind.Or:
+            case TokenKind.And:
+                if (bothNumbers) {
+                    // "and"/"or" represent bitwise operators
+                    if (hasLongInteger && !hasDouble && !hasFloat) {
+                        // 2 long ints or long int and int
+                        return LongIntegerType.instance;
+                    }
+                    return IntegerType.instance;
+                } else if (eitherBooleanOrNum) {
+                    // "and"/"or" represent logical operators
+                    return BooleanType.instance;
+                } else if (hasNumber && hasDynamic) {
+                    // assume dynamic is a valid type
+                    return IntegerType.instance;
+                } else if (hasBoolean && hasDynamic) {
+                    // assume dynamic is a valid type
+                    return BooleanType.instance;
+                }
+                break;
+        }
+        if (bothDynamic) {
+            return DynamicType.instance;
+        }
+        return undefined;
+    }
+
+    public getHighestPriorityType(types: BscType[], depth = 0): BscType {
+        let result: BscType;
+        if (depth > 4) {
+            // shortcut for very complicated types, or self-referencing union types
+            return DynamicType.instance;
+        }
+        for (let type of types) {
+            if (isUnionType(type)) {
+                type = getUniqueType([type], unionTypeFactory);
+                if (isUnionType(type)) {
+                    type = this.getHighestPriorityType(type.types, depth + 1);
+                }
+            }
+            if (!result) {
+                result = type;
+            } else {
+                if (type.binaryOpPriorityLevel < result.binaryOpPriorityLevel) {
+                    result = type;
+                } else if (type.binaryOpPriorityLevel === result.binaryOpPriorityLevel && !result.isEqual(type)) {
+                    // equal priority types, but not equal types, like Boolean and String... just be dynamic at this point
+                    result = DynamicType.instance;
+                }
+            }
+            if (isUninitializedType(type)) {
+                return type;
+            }
+            if (isVoidType(type)) {
+                return type;
+            }
+            if (isInvalidTypeLike(type)) {
+                return type;
+            }
+            if (isObjectType(type) && !isDynamicType(type)) {
+                result = type;
+            }
+            if (isDynamicType(type)) {
+                result = type;
+            }
+        }
+        return result ?? DynamicType.instance;
+    }
+
+    /**
+     * Return the type of the result of a unary operator
+     */
+    public unaryOperatorResultType(operator: Token, exprType: BscType): BscType {
+
+        if (isUnionType(exprType)) {
+            exprType = this.getHighestPriorityType(exprType.types);
+        }
+
+        if (isVoidType(exprType) || isInvalidTypeLike(exprType) || isUninitializedType(exprType)) {
+            return undefined;
+        }
+
+
+        if (isDynamicType(exprType) || isObjectType(exprType)) {
+            return exprType;
+        }
+
+        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+        switch (operator.kind) {
+            // Math operators
+            case TokenKind.Plus: // (`num = +num` is valid syntax)
+            case TokenKind.Minus:
+                if (isNumberTypeLike(exprType)) {
+                    // a negative number will be the same type, eg, double->double, int->int, etc.
+                    return this.getUnboxedType(exprType);
+                }
+                break;
+            case TokenKind.Not:
+                if (isBooleanTypeLike(exprType)) {
+                    return BooleanType.instance;
+                } else if (isNumberTypeLike(exprType)) {
+                    //numbers can be "notted"
+                    // by default they go to ints, except longints, which stay that way
+                    if (isLongIntegerTypeLike(exprType)) {
+                        return LongIntegerType.instance;
+                    }
+                    return IntegerType.instance;
+                }
+                break;
+        }
+        return undefined;
+    }
+
+    public getUnboxedType(boxedType: BscType): BscType {
+        if (isIntegerTypeLike(boxedType)) {
+            return IntegerType.instance;
+        } else if (isLongIntegerTypeLike(boxedType)) {
+            return LongIntegerType.instance;
+        } else if (isFloatTypeLike(boxedType)) {
+            return FloatType.instance;
+        } else if (isDoubleTypeLike(boxedType)) {
+            return DoubleType.instance;
+        } else if (isBooleanTypeLike(boxedType)) {
+            return BooleanType.instance;
+        } else if (isStringTypeLike(boxedType)) {
+            return StringType.instance;
+        } else if (isInvalidTypeLike(boxedType)) {
+            return InvalidType.instance;
+        }
+        return boxedType;
+    }
+
+    /**
+     * Get the extension for the given file path. Basically the part after the final dot, except for
+     * `d.bs` which is treated as single extension
+     * @returns the file extension (i.e. ".d.bs", ".bs", ".brs", ".xml", ".jpg", etc...)
+     */
+    public getExtension(filePath: string) {
+        filePath = filePath.toLowerCase();
+        if (filePath.endsWith('.d.bs')) {
+            return '.d.bs';
+        } else {
+            return path.extname(filePath).toLowerCase();
+        }
+    }
+
+    /**
+     * Load and return the list of plugins
+     */
+    public loadPlugins(cwd: string, pathOrModules: string[], onError?: (pathOrModule: string, err: Error) => void): Plugin[] {
+        const logger = createLogger();
+        return pathOrModules.reduce<Plugin[]>((acc, pathOrModule) => {
+            if (typeof pathOrModule === 'string') {
+                try {
+                    const loaded = requireRelative(pathOrModule, cwd);
+                    const theExport: Plugin | PluginFactory = loaded.default ? loaded.default : loaded;
+
+                    let plugin: Plugin | undefined;
+
+                    // legacy plugins returned a plugin object. If we find that, then add a warning
+                    if (typeof theExport === 'object') {
+                        logger.warn(`Plugin "${pathOrModule}" was loaded as a singleton. Please contact the plugin author to update to the factory pattern.\n`);
+                        plugin = theExport;
+
+                        // the official plugin format is a factory function that returns a new instance of a plugin.
+                    } else if (typeof theExport === 'function') {
+                        plugin = theExport({
+                            version: this.getBrighterScriptVersion()
+                        });
+                    } else {
+                        //this should never happen; somehow an invalid plugin has made it into here
+                        throw new Error(`TILT: Encountered an invalid plugin: ${String(plugin)}`);
+                    }
+
+                    if (!plugin.name) {
+                        plugin.name = pathOrModule;
+                    }
+                    acc.push(plugin);
+                } catch (err: any) {
+                    if (onError) {
+                        onError(pathOrModule, err);
+                    } else {
+                        throw err;
+                    }
+                }
+            }
+            return acc;
+        }, []);
     }
 
     /**
@@ -1315,7 +1784,7 @@ export class Util {
             }
             if (isVariableExpression(expression)) {
                 variableExpressions.push(expression);
-                uniqueVarNames.add(expression.name.text);
+                uniqueVarNames.add(expression.tokens.name.text);
             }
         }
 
@@ -1343,6 +1812,10 @@ export class Util {
     }
 
 
+    public concatAnnotationLeadingTrivia(stmt: Statement): Token[] {
+        return [...(stmt.annotations?.map(anno => anno.leadingTrivia ?? []).flat() ?? []), ...stmt.leadingTrivia];
+    }
+
     /**
      * Create a SourceNode that maps every line to itself. Useful for creating maps for files
      * that haven't changed at all, but we still need the map
@@ -1361,23 +1834,6 @@ export class Util {
         return new SourceNode(null, null, source, chunks);
     }
 
-    /**
-     * Creates a new SGAttribute object, but keeps the existing Range references (since those shouldn't ever get changed directly)
-     */
-    public cloneSGAttribute(attr: SGAttribute, value: string) {
-        return {
-            key: {
-                text: attr.key.text,
-                range: attr.range
-            },
-            value: {
-                text: value,
-                range: attr.value.range
-            },
-            range: attr.range
-        } as SGAttribute;
-    }
-
     private isWindows = process.platform === 'win32';
     private standardizePathCache = new Map<string, string>();
 
@@ -1395,6 +1851,14 @@ export class Util {
             return thePath;
         }
 
+        //handle `virtual:/` paths specially - just normalize slashes, don't use path.normalize which would mangle the `virtual:` prefix
+        if (/^virtual:[\/\\]/i.test(thePath)) {
+            // Strip the `virtual:` prefix, normalize slashes, then re-add the prefix
+            thePath = 'virtual:/' + thePath.slice(8).replace(/^[\/\\]+/, '').replace(/[\/\\]+/g, '/').toLowerCase();
+            this.standardizePathCache.set(originalPath, thePath);
+            return thePath;
+        }
+
         //windows path.normalize will convert all slashes to backslashes and remove duplicates
         if (this.isWindows) {
             thePath = path.win32.normalize(thePath);
@@ -1420,50 +1884,37 @@ export class Util {
         return thePath;
     }
 
-    /**
-     * Copy the version of bslib from local node_modules to the staging folder
-     */
-    public async copyBslibToStaging(stagingDir: string, bslibDestinationDir = 'source') {
-        //copy bslib to the output directory
-        await fsExtra.ensureDir(standardizePath(`${stagingDir}/${bslibDestinationDir}`));
-        // eslint-disable-next-line
-        const bslib = require('@rokucommunity/bslib');
-        let source = bslib.source as string;
-
-        //apply the `bslib_` prefix to the functions
-        let match: RegExpExecArray | null;
-        const positions = [] as number[];
-        const regexp = /^(\s*(?:function|sub)\s+)([a-z0-9_]+)/mg;
-        // eslint-disable-next-line no-cond-assign
-        while (match = regexp.exec(source)) {
-            positions.push(match.index + match[1].length);
-        }
-
-        for (let i = positions.length - 1; i >= 0; i--) {
-            const position = positions[i];
-            source = source.slice(0, position) + 'bslib_' + source.slice(position);
-        }
-        await fsExtra.writeFile(`${stagingDir}/${bslibDestinationDir}/bslib.brs`, source);
-    }
-
     /**
      * Given a Diagnostic or BsDiagnostic, return a deep clone of the diagnostic.
      * @param diagnostic the diagnostic to clone
      * @param relatedInformationFallbackLocation a default location to use for all `relatedInformation` entries that are missing a location
      */
     public toDiagnostic(diagnostic: Diagnostic | BsDiagnostic, relatedInformationFallbackLocation: string): Diagnostic {
-        return {
+        let relatedInformation = diagnostic.relatedInformation ?? [];
+        if (relatedInformation.length > MAX_RELATED_INFOS_COUNT) {
+            const relatedInfoLength = relatedInformation.length;
+            relatedInformation = relatedInformation.slice(0, MAX_RELATED_INFOS_COUNT);
+            relatedInformation.push({
+                message: `...and ${relatedInfoLength - MAX_RELATED_INFOS_COUNT} more`,
+                location: util.createLocationFromRange('   ', util.createRange(0, 0, 0, 0))
+            });
+        }
+
+        const range = (diagnostic as BsDiagnostic).location?.range ??
+            (diagnostic as Diagnostic).range;
+
+        let result = {
             severity: diagnostic.severity,
-            range: diagnostic.range,
+            range: range,
             message: diagnostic.message,
-            relatedInformation: diagnostic.relatedInformation?.map(x => {
+            relatedInformation: relatedInformation.map(x => {
 
                 //clone related information just in case a plugin added circular ref info here
                 const clone = { ...x };
                 if (!clone.location) {
                     // use the fallback location if available
                     if (relatedInformationFallbackLocation) {
-                        clone.location = util.createLocation(relatedInformationFallbackLocation, diagnostic.range);
+                        clone.location = util.createLocationFromRange(relatedInformationFallbackLocation, range);
                     } else {
                         //remove this related information so it doesn't bring crash the language server
                         return undefined;
@@ -1472,30 +1923,29 @@ export class Util {
                 return clone;
                 //filter out null relatedInformation items
             }).filter((x): x is DiagnosticRelatedInformation => Boolean(x)),
-            code: diagnostic.code,
+            code: diagnostic.code ? diagnostic.code : (diagnostic as BsDiagnostic).legacyCode,
             source: diagnostic.source ?? 'brs'
-        };
-    }
-
-    /**
-     * Get the first locatable item found at the specified position
-     * @param locatables an array of items that have a `range` property
-     * @param position the position that the locatable must contain
-     */
-    public getFirstLocatableAt(locatables: Locatable[], position: Position) {
-        for (let token of locatables) {
-            if (util.rangeContains(token.range, position)) {
-                return token;
-            }
+        } as Diagnostic;
+        if (diagnostic?.tags?.length > 0) {
+            result.tags = diagnostic.tags;
         }
+        return result;
     }
 
     /**
      * Sort an array of objects that have a Range
      */
-    public sortByRange<T extends Locatable>(locatables: T[]) {
+    public sortByRange<T extends { range: Range | undefined }>(locatables: T[]) {
         //sort the tokens by range
         return locatables?.sort((a, b) => {
+            //handle undefined tokens to prevent crashes
+            if (!a?.range) {
+                return 1;
+            }
+            if (!b?.range) {
+                return -1;
+            }
+
             //start line
             if (a.range.start.line < b.range.start.line) {
                 return -1;
@@ -1527,32 +1977,6 @@ export class Util {
         });
     }
 
-    /**
-     * Split the given text and return ranges for each chunk.
-     * Only works for single-line strings
-     */
-    public splitGetRange(separator: string, text: string, range: Range) {
-        const chunks = text.split(separator);
-        const result = [] as Array<{ text: string; range: Range }>;
-        let offset = 0;
-        for (let chunk of chunks) {
-            //only keep nonzero chunks
-            if (chunk.length > 0) {
-                result.push({
-                    text: chunk,
-                    range: this.createRange(
-                        range.start.line,
-                        range.start.character + offset,
-                        range.end.line,
-                        range.start.character + offset + chunk.length
-                    )
-                });
-            }
-            offset += chunk.length + separator.length;
-        }
-        return result;
-    }
-
     /**
      * Wrap the given code in a markdown code fence (with the language)
      */
@@ -1565,88 +1989,94 @@ export class Util {
      * @param node any ast expression
      * @returns an array of the parts of the dotted get. If not fully a dotted get, then returns undefined
      */
-    public getAllDottedGetParts(node: Expression | Statement): Identifier[] | undefined {
+    public getAllDottedGetParts(node: AstNode): Identifier[] | undefined {
+        //this is a hot function and has been optimized. Don't rewrite unless necessary
         const parts: Identifier[] = [];
-        let nextPart: AstNode | undefined = node;
-        while (nextPart) {
-            if (isAssignmentStatement(node)) {
-                return [node.name];
-            } else if (isDottedGetExpression(nextPart)) {
-                parts.push(nextPart?.name);
-                nextPart = nextPart.obj;
-            } else if (isNamespacedVariableNameExpression(nextPart)) {
-                nextPart = nextPart.expression;
-            } else if (isVariableExpression(nextPart)) {
-                parts.push(nextPart?.name);
-                break;
-            } else if (isFunctionParameterExpression(nextPart)) {
-                return [nextPart.name];
-            } else {
-                //we found a non-DottedGet expression, so return because this whole operation is invalid.
-                return undefined;
+        let nextPart = node;
+        loop: while (nextPart) {
+            switch (nextPart?.kind) {
+                case AstNodeKind.AssignmentStatement:
+                    return [(node as AssignmentStatement).tokens.name];
+                case AstNodeKind.DottedGetExpression:
+                    parts.push((nextPart as DottedGetExpression)?.tokens.name);
+                    nextPart = (nextPart as DottedGetExpression).obj;
+                    continue;
+                case AstNodeKind.CallExpression:
+                    nextPart = (nextPart as CallExpression).callee;
+                    continue;
+                case AstNodeKind.CallfuncExpression:
+                    parts.push((nextPart as CallfuncExpression)?.tokens.methodName);
+                    nextPart = (nextPart as CallfuncExpression).callee;
+                    continue;
+                case AstNodeKind.TypeExpression:
+                    nextPart = (nextPart as TypeExpression).expression;
+                    continue;
+                case AstNodeKind.VariableExpression:
+                    parts.push((nextPart as VariableExpression)?.tokens.name);
+                    break loop;
+                case AstNodeKind.LiteralExpression:
+                    parts.push((nextPart as LiteralExpression)?.tokens.value as Identifier);
+                    break loop;
+                case AstNodeKind.IndexedGetExpression:
+                    nextPart = (nextPart as unknown as IndexedGetExpression).obj;
+                    continue;
+                case AstNodeKind.FunctionParameterExpression:
+                    return [(nextPart as FunctionParameterExpression).tokens.name];
+                case AstNodeKind.GroupingExpression:
+                    parts.push(createIdentifier('()', nextPart.location));
+                    break loop;
+                default:
+                    //we found a non-DottedGet expression, so return because this whole operation is invalid.
+                    return undefined;
             }
         }
         return parts.reverse();
     }
 
     /**
-     * Break an expression into each part.
+     * Given an expression, return all the DottedGet name parts as a string.
+     * Mostly used to convert namespaced item full names to a strings
      */
-    public splitExpression(expression: Expression) {
-        const parts: Expression[] = [expression];
-        let nextPart = expression;
-        while (nextPart) {
-            if (isDottedGetExpression(nextPart) || isIndexedGetExpression(nextPart) || isXmlAttributeGetExpression(nextPart)) {
-                nextPart = nextPart.obj;
+    public getAllDottedGetPartsAsString(node: Expression | Statement, parseMode = ParseMode.BrighterScript, lastSep = '.'): string {
+        //this is a hot function and has been optimized. Don't rewrite unless necessary
+        /* eslint-disable no-var */
+        var sep = parseMode === ParseMode.BrighterScript ? '.' : '_';
 
-            } else if (isCallExpression(nextPart) || isCallfuncExpression(nextPart)) {
-                nextPart = nextPart.callee;
-
-            } else if (isNamespacedVariableNameExpression(nextPart)) {
-                nextPart = nextPart.expression;
-            } else {
-                break;
+        const parts = this.getAllDottedGetParts(node) ?? [];
+        var result = parts[0]?.text;
+        for (var i = 1; i < parts.length; i++) {
+            //some parts can be undefined (e.g. an unfinished `widget@.` callfunc with no method name)
+            const part = parts[i];
+            if (!part) {
+                continue;
             }
-            parts.unshift(nextPart);
+            result += (i === parts.length - 1 && parseMode === ParseMode.BrighterScript ? lastSep : sep) + part.text;
         }
-        return parts;
+        return result;
+        /* eslint-enable no-var */
     }
 
     /**
-     * Break an expression into each part, and return any VariableExpression or DottedGet expresisons from left-to-right.
+     * Break an expression into each part.
      */
-    public getDottedGetPath(expression: Expression): [VariableExpression, ...DottedGetExpression[]] {
-        let parts: Expression[] = [];
+    public splitExpression(expression: Expression) {
+        const parts: Expression[] = [expression];
         let nextPart = expression;
         while (nextPart) {
-            if (isDottedGetExpression(nextPart)) {
-                parts.unshift(nextPart);
-                nextPart = nextPart.obj;
-
-            } else if (isIndexedGetExpression(nextPart) || isXmlAttributeGetExpression(nextPart)) {
+            if (isDottedGetExpression(nextPart) || isIndexedGetExpression(nextPart) || isXmlAttributeGetExpression(nextPart)) {
                 nextPart = nextPart.obj;
-                parts = [];
 
             } else if (isCallExpression(nextPart) || isCallfuncExpression(nextPart)) {
                 nextPart = nextPart.callee;
-                parts = [];
-
-            } else if (isNewExpression(nextPart)) {
-                nextPart = nextPart.call.callee;
-                parts = [];
 
-            } else if (isNamespacedVariableNameExpression(nextPart)) {
+            } else if (isTypeExpression(nextPart)) {
                 nextPart = nextPart.expression;
-
-            } else if (isVariableExpression(nextPart)) {
-                parts.unshift(nextPart);
-                break;
             } else {
-                parts = [];
                 break;
             }
+            parts.unshift(nextPart);
         }
-        return parts as any;
+        return parts;
     }
 
     /**
@@ -1670,8 +2100,8 @@ export class Util {
 
     public validateTooDeepFile(file: (BrsFile | XmlFile)) {
         //find any files nested too deep
-        let pkgPath = file.pkgPath ?? (file.pkgPath as any).toString();
-        let rootFolder = pkgPath.replace(/^pkg:/, '').split(/[\\\/]/)[0].toLowerCase();
+        let destPath = file?.destPath?.toString();
+        let rootFolder = destPath?.replace(/^pkg:/, '').split(/[\\\/]/)[0].toLowerCase();
 
         if (isBrsFile(file) && rootFolder !== 'source') {
             return;
@@ -1681,13 +2111,12 @@ export class Util {
             return;
         }
 
-        let fileDepth = this.getParentDirectoryCount(pkgPath);
+        let fileDepth = this.getParentDirectoryCount(destPath);
         if (fileDepth >= 8) {
-            file.addDiagnostics([{
+            file.program?.diagnostics.register({
                 ...DiagnosticMessages.detectedTooDeepFileSource(fileDepth),
-                file: file,
-                range: this.createRange(0, 0, 0, Number.MAX_VALUE)
-            }]);
+                location: util.createLocationFromFileRange(file, this.createRange(0, 0, 0, Number.MAX_VALUE))
+            });
         }
     }
 
@@ -1775,6 +2204,131 @@ export class Util {
         return new SourceNode(line, column, source, chunks as any, name);
     }
 
+    /**
+     * Find the index of the last item in the array that matches.
+     */
+    public findLastIndex<T>(array: T[], matcher: (T) => boolean) {
+        for (let i = array.length - 1; i >= 0; i--) {
+            if (matcher(array[i])) {
+                return i;
+            }
+        }
+    }
+
+    public processTypeChain(typeChain: TypeChainEntry[]): TypeChainProcessResult {
+        let fullChainName = '';
+        let fullErrorName = '';
+        let itemName = '';
+        let previousTypeName = '';
+        let parentTypeName = '';
+        let itemTypeKind = '';
+        let parentTypeKind = '';
+        let astNode: AstNode;
+        let errorLocation: Location;
+        let containsDynamic = false;
+        let continueResolvingAllItems = true;
+        let crossedCallFunc = false;
+        for (let i = 0; i < typeChain.length; i++) {
+            const chainItem = typeChain[i];
+            const dotSep = chainItem.separatorToken?.text ?? '.';
+            if (i > 0) {
+                fullChainName += dotSep;
+            }
+            fullChainName += chainItem.name;
+            if (continueResolvingAllItems) {
+                parentTypeName = previousTypeName;
+                parentTypeKind = itemTypeKind;
+                fullErrorName = previousTypeName ? `${previousTypeName}${dotSep}${chainItem.name}` : chainItem.name;
+                itemTypeKind = (chainItem.type as any)?.kind;
+
+                let typeString = chainItem.type?.toString();
+                let typeToFindStringFor = chainItem.type;
+                while (typeToFindStringFor) {
+                    if (isCompoundType(chainItem.type)) {
+                        typeString = `(${typeToFindStringFor.toString()})`;
+                        break;
+                    } else if (isCallableType(typeToFindStringFor)) {
+                        if (isTypedFunctionType(typeToFindStringFor) && i < typeChain.length - 1) {
+                            typeToFindStringFor = typeToFindStringFor.returnType;
+                        } else {
+                            typeString = 'function';
+                            break;
+                        }
+                        parentTypeName = previousTypeName;
+                    } else if (isNamespaceType(typeToFindStringFor) && parentTypeName) {
+                        const chainItemTypeName = typeToFindStringFor.toString();
+                        typeString = parentTypeName + '.' + chainItemTypeName;
+                        if (chainItemTypeName.toLowerCase().startsWith(parentTypeName.toLowerCase())) {
+                            // the following namespace already knows...
+                            typeString = chainItemTypeName;
+                        }
+                        break;
+                    } else {
+                        typeString = typeToFindStringFor?.toString();
+                        break;
+                    }
+                }
+
+                previousTypeName = typeString ?? '';
+                itemName = chainItem.name;
+                astNode = chainItem.astNode;
+                containsDynamic = containsDynamic || (isDynamicType(chainItem.type) && !isAnyReferenceType(chainItem.type));
+                crossedCallFunc = crossedCallFunc || chainItem.data?.isFromCallFunc;
+                if (!chainItem.isResolved) {
+                    errorLocation = chainItem.location;
+                    continueResolvingAllItems = false;
+                }
+            }
+        }
+        return {
+            itemName: itemName,
+            itemTypeKind: itemTypeKind,
+            itemParentTypeName: parentTypeName,
+            itemParentTypeKind: parentTypeKind,
+            fullNameOfItem: fullErrorName,
+            fullChainName: fullChainName,
+            location: errorLocation,
+            containsDynamic: containsDynamic,
+            astNode: astNode,
+            crossedCallFunc: crossedCallFunc
+        };
+    }
+
+    public getCircularReferenceDiagnosticDetail(circularReferenceInfo: TypeCircularReferenceInfo, defaultName = ''): string[] {
+        if (!circularReferenceInfo || !circularReferenceInfo.referenceChainNames) {
+            if (defaultName) {
+                return [defaultName];
+            }
+            return [];
+        }
+
+        if (circularReferenceInfo.referenceChainNames[0] === circularReferenceInfo.referenceChainNames[circularReferenceInfo.referenceChainNames.length - 1]) {
+            // last element is same as first it will read okay
+            return circularReferenceInfo.referenceChainNames;
+        }
+        return [...circularReferenceInfo.referenceChainNames, circularReferenceInfo.referenceChainNames[0]];
+    }
+
+
+    public isInTypeExpression(expression: AstNode): boolean {
+        //TODO: this is much faster than node.findAncestor(), but may need to be updated for "complicated" type expressions
+        if (isTypeExpression(expression) ||
+            isTypeExpression(expression?.parent) ||
+            isTypedArrayExpression(expression) ||
+            isTypedArrayExpression(expression?.parent)) {
+            return true;
+        }
+        if (isBinaryExpression(expression?.parent)) {
+            let currentExpr: AstNode = expression.parent;
+            while (isBinaryExpression(currentExpr) && (currentExpr.tokens.operator.kind === TokenKind.Or || currentExpr.tokens.operator.kind === TokenKind.And)) {
+                currentExpr = currentExpr.parent;
+            }
+            return isTypeExpression(currentExpr) || isTypedArrayExpression(currentExpr);
+        }
+        return false;
+    }
+
+
     /**
      * Parse the `sourceMappingURL` comment from file contents and resolve it to a RawSourceMap.
      * Handles inline base64 data URIs, absolute paths, relative paths (resolved against srcPath's
@@ -1822,13 +2376,514 @@ export class Util {
         });
     }
 
+    /**
+     * Chain a prebuild input sourcemap (loaded from a co-located `.map` file or a
+     * `sourceMappingURL` comment in the file contents) onto an existing serialized output
+     * sourcemap. Returns the chained sourcemap as a JSON string. If no input map is found,
+     * the original output map JSON is returned unchanged.
+     */
+    public async chainInputSourceMap(outputMapJson: string, file: { fileContents?: string; srcPath: string }): Promise<string> {
+        const inputMap = await this.resolveInputSourceMap(file.fileContents ?? '', file.srcPath);
+        if (!inputMap) {
+            return outputMapJson;
+        }
+        const { SourceMapConsumer: Consumer, SourceMapGenerator: Generator } = await import('source-map');
+        const outputMap = JSON.parse(outputMapJson) as RawSourceMap;
+        return Consumer.with(outputMap, null, async (outputConsumer) => {
+            const generator = Generator.fromSourceMap(outputConsumer);
+            await Consumer.with(inputMap, null, (inputConsumer) => {
+                generator.applySourceMap(inputConsumer, file.srcPath);
+            });
+            return generator.toString();
+        });
+    }
+
     public isBuiltInType(typeName: string) {
         const typeNameLower = typeName.toLowerCase();
         if (typeNameLower.startsWith('rosgnode')) {
             // NOTE: this is unsafe and only used to avoid validation errors in backported v1 type syntax
             return true;
         }
-        return components[typeNameLower] || interfaces[typeNameLower] || events[typeNameLower];
+        return false;
+    }
+
+    public isGenericNodeType(type: BscType) {
+        if (isComponentType(type)) {
+            const lowerName = type.toString().toLowerCase();
+            if (lowerName === 'rosgnode' || lowerName === 'rosgnodenode') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    public hasAnyRequiredSymbolChanged(requiredSymbols: UnresolvedSymbol[], changedSymbols: Map<SymbolTypeFlag, Set<string>>) {
+        if (!requiredSymbols || !changedSymbols) {
+            return false;
+        }
+        const runTimeChanges = changedSymbols.get(SymbolTypeFlag.runtime);
+        const typeTimeChanges = changedSymbols.get(SymbolTypeFlag.typetime);
+
+        for (const symbol of requiredSymbols) {
+            if (this.setContainsUnresolvedSymbol(runTimeChanges, symbol) || this.setContainsUnresolvedSymbol(typeTimeChanges, symbol)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public setContainsUnresolvedSymbol(symbolLowerNameSet: Set<string>, symbol: UnresolvedSymbol) {
+        if (!symbolLowerNameSet || symbolLowerNameSet.size === 0) {
+            return false;
+        }
+
+        for (const possibleNameLower of symbol.lookups) {
+            if (symbolLowerNameSet.has(possibleNameLower)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public getCustomTypesInSymbolTree(setToFill: Set<BscType>, type: BscType, filter?: (t: BscType) => boolean) {
+        const subSymbolTypes = isCompoundType(type)
+            ? type.types
+            : type.getMemberTable()?.getAllSymbols(SymbolTypeFlag.runtime).map(sym => sym.type) ?? [];
+        for (const subSymbolType of subSymbolTypes) {
+            if (!subSymbolType?.isBuiltIn && !setToFill.has(subSymbolType)) {
+                if (filter && !filter(subSymbolType)) {
+                    continue;
+                }
+                // if this is a custom type, and we haven't added it to the types to check to see if can add it to the additional types
+                // add the type, and investigate any members
+                setToFill.add(subSymbolType);
+                this.getCustomTypesInSymbolTree(setToFill, subSymbolType, filter);
+            }
+
+        }
+    }
+
+    public truncate<T>(options: {
+        leadingText: string;
+        items: T[];
+        trailingText?: string;
+        maxLength: number;
+        itemSeparator?: string;
+        partBuilder?: (item: T) => string;
+    }): string {
+        let leadingText = options.leadingText;
+        let items = options?.items ?? [];
+        let trailingText = options?.trailingText ?? '';
+        let maxLength = options?.maxLength ?? 160;
+        let itemSeparator = options?.itemSeparator ?? ', ';
+        let partBuilder = options?.partBuilder ?? ((x) => x.toString());
+
+        let parts = [];
+        let length = leadingText.length + (trailingText?.length ?? 0);
+
+        //calculate the max number of items we could fit in the given space
+        for (let i = 0; i < items.length; i++) {
+            let part = partBuilder(items[i]);
+            if (i > 0) {
+                part = itemSeparator + part;
+            }
+            parts.push(part);
+            length += part.length;
+            //exit the loop if we've maxed out our length
+            if (length >= maxLength) {
+                break;
+            }
+        }
+        let message: string;
+        //we have enough space to include all the parts
+        if (parts.length >= items.length) {
+            message = leadingText + parts.join('') + trailingText;
+
+            //we require truncation
+        } else {
+            //account for truncation message length including max possible "more" items digits, trailing text length, and the separator between last item and trailing text
+            length = leadingText.length + `...and ${items.length} more`.length + itemSeparator.length + (trailingText?.length ?? 0);
+            message = leadingText;
+            for (let i = 0; i < parts.length; i++) {
+                //always include at least 2 items. if this part would overflow the max, then skip it and finalize the message
+                if (i > 1 && length + parts[i].length > maxLength) {
+                    message += itemSeparator + `...and ${items.length - i} more` + trailingText;
+                    return message;
+                } else {
+                    message += parts[i];
+                    length += parts[i].length;
+                }
+            }
+        }
+        return message;
+    }
+
+    public getAstNodeFriendlyName(node: AstNode) {
+        return node?.kind.replace(/Statement|Expression/g, '');
+    }
+
+
+    public hasLeadingComments(input: Token | AstNode) {
+        const leadingTrivia = isToken(input) ? input?.leadingTrivia : input?.leadingTrivia ?? [];
+        return !!leadingTrivia.find(t => t?.kind === TokenKind.Comment);
+    }
+
+    public getLeadingComments(input: Token | AstNode) {
+        const leadingTrivia = isToken(input) ? input?.leadingTrivia : input?.leadingTrivia ?? [];
+        return leadingTrivia.filter(t => t?.kind === TokenKind.Comment);
+    }
+
+    public isLeadingCommentOnSameLine(line: RangeLike, input: Token | AstNode) {
+        const leadingCommentRange = this.getLeadingComments(input)?.[0];
+        if (leadingCommentRange) {
+            return this.linesTouch(line, leadingCommentRange?.location);
+        }
+        return false;
+    }
+
+    public isClassUsedAsFunction(potentialClassType: BscType, expression: Expression, options: GetTypeOptions) {
+        // eslint-disable-next-line no-bitwise
+        if ((options?.flags ?? 0) & SymbolTypeFlag.runtime &&
+            isClassType(potentialClassType) &&
+            !options.isExistenceTest &&
+            potentialClassType.name?.toLowerCase() === this.getAllDottedGetPartsAsString(expression)?.toLowerCase() &&
+            !expression?.findAncestor(isNewExpression)) {
+            return true;
+        }
+        return false;
+    }
+
+    public getSpecialCaseCallExpressionReturnType(callExpr: CallExpression, options: GetSymbolTypeOptions) {
+        if (isVariableExpression(callExpr.callee) && callExpr.callee.tokens.name.text.toLowerCase() === 'createobject') {
+            const componentName = isLiteralString(callExpr.args[0]) ? callExpr.args[0].tokens.value?.text?.replace(/"/g, '') : '';
+            const nodeType = componentName.toLowerCase() === 'rosgnode' && isLiteralString(callExpr.args[1]) ? callExpr.args[1].tokens.value?.text?.replace(/"/g, '') : '';
+            if (componentName?.toLowerCase().startsWith('ro')) {
+                let fullName = componentName + nodeType;
+
+                if (nodeType.includes(':')) {
+                    // This node has a colon in its name, most likely from a component Library
+                    // This componentType is most likely unknown, so return `roSGNode`
+                    fullName = 'roSGNode';
+                }
+
+                const data = {};
+                const symbolTable = callExpr.getSymbolTable();
+                const foundType = symbolTable.getSymbolType(fullName, {
+                    flags: SymbolTypeFlag.typetime,
+                    data: data,
+                    tableProvider: () => callExpr?.getSymbolTable(),
+                    fullName: fullName
+                });
+                if (foundType) {
+                    return foundType;
+                }
+            }
+        } else if (isDottedGetExpression(callExpr.callee) &&
+            callExpr.callee.tokens?.name?.text?.toLowerCase() === 'callfunc' &&
+            isLiteralString(callExpr.args?.[0])) {
+            return this.getCallFuncType(callExpr, callExpr.args?.[0]?.tokens.value, options);
+        } else if (isDottedGetExpression(callExpr.callee) &&
+            callExpr.callee.tokens?.name?.text?.toLowerCase() === 'createchild' &&
+            isComponentType(callExpr.callee.obj?.getType({ flags: SymbolTypeFlag.runtime })) &&
+            isLiteralString(callExpr.args?.[0])) {
+            const fullName = `roSGNode${callExpr.args?.[0].tokens?.value?.text?.replace(/"/g, '')}`;
+            const data = {};
+            const symbolTable = callExpr.getSymbolTable();
+            return symbolTable.getSymbolType(fullName, {
+                flags: SymbolTypeFlag.typetime,
+                data: data,
+                tableProvider: () => callExpr?.getSymbolTable(),
+                fullName: fullName
+            });
+        }
+    }
+
+    public getCallFuncType(callExpr: CallExpression | CallfuncExpression, methodNameToken: Token | Identifier, options: GetSymbolTypeOptions) {
+        let result: BscType;
+        let methodName = methodNameToken?.text?.replace(/"/g, ''); // remove quotes if it was the first arg of .callFunc()
+
+        //bail early when there's no method name (e.g. an unfinished `widget@.` callfunc).
+        //downstream getCallFuncType / ReferenceType paths assume a non-empty member name and
+        //will eventually try `name.toLowerCase()` on undefined and crash.
+        if (!methodName) {
+            return undefined;
+        }
+
+        // a little hacky here with checking options.ignoreCall because callFuncExpression has the method name
+        // It's nicer for CallExpression, because it's a call on any expression.
+        let calleeType: BscType;
+        if (isCallfuncExpression(callExpr)) {
+            calleeType = callExpr.callee.getType({ ...options, flags: SymbolTypeFlag.runtime, ignoreCall: false });
+        } else if (isCallExpression(callExpr) && isDottedGetExpression(callExpr.callee)) {
+            calleeType = callExpr.callee.obj.getType({ ...options, flags: SymbolTypeFlag.runtime, ignoreCall: false });
+        }
+        const funcType = calleeType?.getCallFuncType?.(methodName, options);
+        if (funcType) {
+            options.typeChain?.push(new TypeChainEntry({
+                name: methodName,
+                type: funcType,
+                data: options.data,
+                location: methodNameToken.location,
+                separatorToken: createToken(TokenKind.Callfunc),
+                astNode: callExpr
+            }));
+            if (options.ignoreCall) {
+                result = funcType;
+            } else if (isCallableType(funcType) && (!isReferenceType(funcType.returnType) || funcType.returnType.isResolvable())) {
+                result = funcType.returnType;
+            } else if (!isReferenceType(funcType) && (funcType as any)?.returnType?.isResolvable()) {
+                result = (funcType as any).returnType;
+            } else if (this.isUnionOfFunctions(funcType)) {
+                result = this.getReturnTypeOfUnionOfFunctions(funcType);
+            } else {
+                result = new TypePropertyReferenceType(funcType, 'returnType');
+            }
+        }
+        if (isVoidType(result)) {
+            // CallFunc will always return invalid, even if function called is `as void`
+            result = DynamicType.instance;
+        }
+        if (options.data && !options.ignoreCall) {
+            options.data.isFromCallFunc = true;
+        }
+        return result;
+    }
+
+    public isUnionOfFunctions(type: BscType, allowReferenceTypes = false): type is UnionType {
+        if (isUnionType(type)) {
+            const callablesInUnion = type.types.filter(t => isCallableType(t) || (allowReferenceTypes && isReferenceType(t)));
+            return callablesInUnion.length === type.types.length && callablesInUnion.length > 0;
+        }
+        return false;
+    }
+
+    public isIntersectionOfFunctions(type: BscType, allowReferenceTypes = false): type is IntersectionType {
+        if (isIntersectionType(type)) {
+            const callablesInUnion = type.types.filter(t => isCallableType(t) || (allowReferenceTypes && isReferenceType(t)));
+            return callablesInUnion.length === type.types.length && callablesInUnion.length > 0;
+        }
+        return false;
+    }
+
+    public getFunctionTypeFromUnion(type: BscType): BscType {
+        if (this.isUnionOfFunctions(type)) {
+            const typedFuncsInUnion = type.types.filter(isTypedFunctionType);
+            if (typedFuncsInUnion.length < type.types.length) {
+                // has non-typedFuncs in union
+                return FunctionType.instance;
+            }
+            const exampleFunc = typedFuncsInUnion[0];
+            const cumulativeFunction = new TypedFunctionType(getUniqueType(typedFuncsInUnion.map(f => f.returnType), (types) => new UnionType(types)))
+                .setName(exampleFunc.name)
+                .setSub(exampleFunc.isSub);
+            for (const param of exampleFunc.params) {
+                cumulativeFunction.addParameter(param.name, param.type, param.isOptional);
+            }
+            return cumulativeFunction;
+        }
+        return undefined;
+    }
+
+    public getFunctionTypeFromIntersection(type: BscType): BscType {
+        if (this.isIntersectionOfFunctions(type)) {
+            const typedFuncsInUnion = type.types.filter(isTypedFunctionType);
+            if (typedFuncsInUnion.length < type.types.length) {
+                // has non-typedFuncs in union
+                return FunctionType.instance;
+            }
+            const exampleFunc = typedFuncsInUnion[0];
+            const cumulativeFunction = new TypedFunctionType(getUniqueType(typedFuncsInUnion.map(f => f.returnType), (types) => new IntersectionType(types)))
+                .setName(exampleFunc.name)
+                .setSub(exampleFunc.isSub);
+            for (const param of exampleFunc.params) {
+                cumulativeFunction.addParameter(param.name, param.type, param.isOptional);
+            }
+            return cumulativeFunction;
+        }
+        return undefined;
+    }
+
+    public getReturnTypeOfUnionOfFunctions(type: UnionType): BscType {
+        if (this.isUnionOfFunctions(type, true)) {
+            const typedFuncsInUnion = type.types.filter(t => isTypedFunctionTypeLike(t) || isReferenceType(t)) as TypedFunctionType[];
+            if (typedFuncsInUnion.length < type.types.length) {
+                // is non-typedFuncs in union
+                return DynamicType.instance;
+            }
+            const funcReturns = typedFuncsInUnion.map(f => f.returnType);
+            return getUniqueType(funcReturns, (types) => new UnionType(types));
+        }
+        return InvalidType.instance;
+    }
+
+    public getReturnTypeOfIntersectionOfFunctions(type: IntersectionType): BscType {
+        if (this.isIntersectionOfFunctions(type, true)) {
+            const typedFuncsInUnion = type.types.filter(t => isTypedFunctionType(t) || isReferenceType(t)) as TypedFunctionType[];
+            if (typedFuncsInUnion.length < type.types.length) {
+                // is non-typedFuncs in union
+                return DynamicType.instance;
+            }
+            const funcReturns = typedFuncsInUnion.map(f => f.returnType);
+            return new IntersectionType(funcReturns);//getUniqueType(funcReturns, (types) => new UnionType(types));
+        }
+        return InvalidType.instance;
+    }
+
+    public symbolComesFromSameNode(symbolName: string, definingNode: AstNode, symbolTable: SymbolTable) {
+        let nsData: ExtraSymbolData = {};
+        let foundType = symbolTable?.getSymbolType(symbolName, { flags: SymbolTypeFlag.runtime, data: nsData });
+        if (foundType && definingNode === nsData?.definingNode) {
+            return true;
+        }
+        return false;
+    }
+
+    public isCalleeMemberOfNamespace(symbolName: string, nodeWhereUsed: AstNode, namespace?: NamespaceStatement) {
+        namespace = namespace ?? nodeWhereUsed.findAncestor<NamespaceStatement>(isNamespaceStatement);
+
+        if (!this.isVariableMemberOfNamespace(symbolName, nodeWhereUsed, namespace)) {
+            return false;
+        }
+        const exprType = nodeWhereUsed.getType({ flags: SymbolTypeFlag.runtime });
+
+        if (isCallableType(exprType) || isClassType(exprType)) {
+            return true;
+        }
+        return false;
+    }
+
+    public isVariableMemberOfNamespace(symbolName: string, nodeWhereUsed: AstNode, namespace?: NamespaceStatement) {
+        namespace = namespace ?? nodeWhereUsed.findAncestor<NamespaceStatement>(isNamespaceStatement);
+        if (!isNamespaceStatement(namespace)) {
+            return false;
+        }
+        const namespaceParts = namespace.getNameParts();
+        let namespaceType: NamespaceType;
+        let symbolTable: SymbolTable = namespace.getSymbolTable();
+        for (const part of namespaceParts) {
+            namespaceType = symbolTable.getSymbolType(part.text, { flags: SymbolTypeFlag.runtime }) as NamespaceType;
+            if (namespaceType) {
+                symbolTable = namespaceType.getMemberTable();
+            } else {
+                return false;
+            }
+        }
+
+        let varData: ExtraSymbolData = {};
+        nodeWhereUsed.getType({ flags: SymbolTypeFlag.runtime, data: varData });
+        const isFromSameNodeInMemberTable = this.symbolComesFromSameNode(symbolName, varData?.definingNode, namespaceType?.getMemberTable());
+        return isFromSameNodeInMemberTable;
+    }
+
+    public isVariableShadowingSomething(symbolName: string, nodeWhereUsed: AstNode) {
+        let varData: ExtraSymbolData = {};
+        let exprType = nodeWhereUsed.getType({ flags: SymbolTypeFlag.runtime, data: varData });
+        if (isReferenceType(exprType)) {
+            exprType = (exprType as any).getTarget();
+        }
+        const namespace = nodeWhereUsed?.findAncestor<NamespaceStatement>(isNamespaceStatement);
+
+        if (isNamespaceStatement(namespace)) {
+            let namespaceHasSymbol = namespace.getSymbolTable().hasSymbol(symbolName, SymbolTypeFlag.runtime);
+            // check if the namespace has a symbol with the same name, but different definiton
+            if (namespaceHasSymbol && !this.symbolComesFromSameNode(symbolName, varData.definingNode, namespace.getSymbolTable())) {
+                return true;
+            }
+        }
+        const bodyTable = nodeWhereUsed.getRoot().getSymbolTable();
+        const hasSymbolAtFileLevel = bodyTable.hasSymbol(symbolName, SymbolTypeFlag.runtime);
+        if (hasSymbolAtFileLevel && !this.symbolComesFromSameNode(symbolName, varData.definingNode, bodyTable)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public chooseTypeFromCodeOrDocComment(codeType: BscType, docType: BscType, options: GetTypeOptions) {
+        let returnType: BscType;
+        if (options.preferDocType && docType) {
+            returnType = docType;
+            if (options.data) {
+                options.data.isFromDocComment = true;
+            }
+        } else {
+            returnType = codeType;
+            if (!returnType && docType) {
+                returnType = docType;
+                if (options.data) {
+                    options.data.isFromDocComment = true;
+                }
+            }
+        }
+        return returnType;
+    }
+
+    /**
+     * Gets the type for a default value (eg. as a function param, class member or typed array)
+     */
+    public getDefaultTypeFromValueType(valueType: (BscType | BscType[])) {
+        if (!valueType) {
+            return undefined;
+        }
+        let resultType: BscType = DynamicType.instance;
+        if (Array.isArray(valueType)) {
+            // passed an array opf types, potential from ArrayType.innerTypes
+            if (valueType.length > 0) {
+                //at least one, use it
+                resultType = valueType[0];
+                if (valueType?.length > 1) {
+                    // more than 1, find union
+                    resultType = getUniqueType(valueType, unionTypeFactory);
+                }
+            }
+        } else {
+            resultType = valueType;
+        }
+        if (!resultType.isResolvable()) {
+            if (isUnionType(resultType)) {
+                resultType = DynamicType.instance;
+            } else if (isParamTypeFromValueReferenceType(resultType)) {
+                //already wrapped — wrapping again would build a recursive proxy chain whose
+                //get handlers loop forever via Reflect.get
+            } else {
+                resultType = new ParamTypeFromValueReferenceType(resultType);
+            }
+
+        } else if (isEnumMemberType(resultType)) {
+            // the type was an enum member... Try to get the parent enum type
+            resultType = resultType.parentEnumType ?? resultType;
+        } else if (isUnionType(resultType)) {
+            // it was a union -- I wonder if they're resolvable now?
+            const moddedTypes = resultType.types.map(t => {
+                if (isEnumMemberType(t)) {
+                    // the type was an enum member... Try to get the parent enum type
+                    return t.parentEnumType ?? resultType;
+                }
+                return t;
+            });
+            resultType = getUniqueType(moddedTypes, unionTypeFactory);
+        }
+        return resultType;
+    }
+
+    /**
+     * Get the default type for an iterator of the given type
+     * Used for `for each` loops
+     */
+    public getIteratorDefaultType(iteratorType: BscType): BscType {
+        if (isArrayType(iteratorType)) {
+            return iteratorType.defaultType;
+        } else if (isAssociativeArrayTypeLike(iteratorType)) {
+            return StringType.instance;
+        } else if (isBuiltInType(iteratorType, 'roByteArray')) {
+            return IntegerType.instance;
+        } else if (isUnionType(iteratorType)) {
+            const iteratorDefaultTypes = iteratorType.types.map(t => this.getIteratorDefaultType(t));
+            return getUniqueType(iteratorDefaultTypes, unionTypeFactory);
+        }
+        return DynamicType.instance;
     }
 
     /**
@@ -1858,5 +2913,10 @@ export function standardizePath(stringParts, ...expressions: any[]) {
     );
 }
 
+/**
+ * An item that can be coerced into a `Range`
+ */
+export type RangeLike = { location?: Location } | Location | { range?: Range } | Range | undefined;
+
 export let util = new Util();
 export default util;
diff --git a/src/validators/ClassValidator.ts b/src/validators/ClassValidator.ts
index be1f2e3e6..ed12a52d6 100644
--- a/src/validators/ClassValidator.ts
+++ b/src/validators/ClassValidator.ts
@@ -4,15 +4,15 @@ import type { CallExpression } from '../parser/Expression';
 import { ParseMode } from '../parser/Parser';
 import type { ClassStatement, MethodStatement, NamespaceStatement } from '../parser/Statement';
 import { CancellationTokenSource } from 'vscode-languageserver';
-import { URI } from 'vscode-uri';
-import util from '../util';
-import { isCallExpression, isFieldStatement, isMethodStatement, isCustomType, isNamespaceStatement } from '../astUtils/reflection';
-import type { BscFile, BsDiagnostic } from '../interfaces';
+import { isCallExpression, isFieldStatement, isMethodStatement, isNamespaceStatement } from '../astUtils/reflection';
+import type { BsDiagnostic } from '../interfaces';
 import { createVisitor, WalkMode } from '../astUtils/visitors';
 import type { BrsFile } from '../files/BrsFile';
 import { TokenKind } from '../lexer/TokenKind';
 import { DynamicType } from '../types/DynamicType';
 import type { BscType } from '../types/BscType';
+import { SymbolTypeFlag } from '../SymbolTypeFlag';
+import type { BscFile } from '../files/BscFile';
 
 export class BsClassValidator {
     private scope: Scope;
@@ -29,91 +29,14 @@ export class BsClassValidator {
 
     public validate() {
         this.findClasses();
-        this.findNamespaceNonNamespaceCollisions();
         this.linkClassesWithParents();
         this.detectCircularReferences();
         this.validateMemberCollisions();
         this.verifyChildConstructor();
-        this.verifyNewExpressions();
-        this.validateFieldTypes();
 
         this.cleanUp();
     }
 
-    /**
-     * Given a class name optionally prefixed with a namespace name, find the class that matches
-     */
-    private getClassByName(className: string, namespaceName?: string) {
-        let fullName = util.getFullyQualifiedClassName(className, namespaceName);
-        let cls = this.classes.get(fullName.toLowerCase());
-        //if we couldn't find the class by its full namespaced name, look for a global class with that name
-        if (!cls) {
-            cls = this.classes.get(className.toLowerCase());
-        }
-        return cls;
-    }
-
-
-    /**
-     * Find all "new" statements in the program,
-     * and make sure we can find a class with that name
-     */
-    private verifyNewExpressions() {
-        this.scope.enumerateBrsFiles((file) => {
-            let newExpressions = file.parser.references.newExpressions;
-            for (let newExpression of newExpressions) {
-                let className = newExpression.className.getName(ParseMode.BrighterScript);
-                const namespaceName = newExpression.findAncestor<NamespaceStatement>(isNamespaceStatement)?.getName(ParseMode.BrighterScript);
-                let newableClass = this.getClassByName(
-                    className,
-                    namespaceName
-                );
-
-                if (!newableClass) {
-                    //try and find functions with this name.
-                    let fullName = util.getFullyQualifiedClassName(className, namespaceName);
-                    let callable = this.scope.getCallableByName(fullName);
-                    //if we found a callable with this name, the user used a "new" keyword in front of a function. add error
-                    if (callable) {
-                        this.diagnostics.push({
-                            ...DiagnosticMessages.expressionIsNotConstructable(callable.isSub ? 'sub' : 'function'),
-                            file: file,
-                            range: newExpression.className.range
-                        });
-
-                    } else {
-                        //could not find a class with this name (handled by ScopeValidator)
-                    }
-                }
-            }
-        });
-    }
-
-    private findNamespaceNonNamespaceCollisions() {
-        for (const [className, classStatement] of this.classes) {
-            //catch namespace class collision with global class
-            let nonNamespaceClassName = util.getTextAfterFinalDot(className)?.toLowerCase();
-            let nonNamespaceClass = this.classes.get(nonNamespaceClassName!);
-            const namespace = classStatement.findAncestor<NamespaceStatement>(isNamespaceStatement);
-            if (namespace && nonNamespaceClass) {
-                this.diagnostics.push({
-                    ...DiagnosticMessages.namespacedClassCannotShareNamewithNonNamespacedClass(
-                        nonNamespaceClass.name.text
-                    ),
-                    file: classStatement.file,
-                    range: classStatement.name.range,
-                    relatedInformation: [{
-                        location: util.createLocation(
-                            URI.file(nonNamespaceClass.file.srcPath).toString(),
-                            nonNamespaceClass.name.range
-                        ),
-                        message: 'Original class declared here'
-                    }]
-                });
-            }
-        }
-    }
-
     private verifyChildConstructor() {
         for (const [, classStatement] of this.classes) {
             const newMethod = classStatement.memberMap.new as MethodStatement;
@@ -129,12 +52,11 @@ export class BsClassValidator {
                 let superCall: CallExpression | undefined;
                 newMethod.func.body.walk(createVisitor({
                     VariableExpression: (expression, parent) => {
-                        const expressionNameLower = expression?.name?.text.toLowerCase();
+                        const expressionNameLower = expression?.tokens.name?.text.toLowerCase();
                         if (expressionNameLower === 'm') {
                             this.diagnostics.push({
                                 ...DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall(),
-                                file: classStatement.file,
-                                range: expression.range
+                                location: expression.location
                             });
                         }
                         if (isCallExpression(parent) && expressionNameLower === 'super') {
@@ -152,8 +74,7 @@ export class BsClassValidator {
                 if (!superCall && !(classStatement.file as BrsFile).isTypedef) {
                     this.diagnostics.push({
                         ...DiagnosticMessages.classConstructorMissingSuperCall(),
-                        file: classStatement.file,
-                        range: newMethod.range
+                        location: newMethod.location
                     });
                 }
             }
@@ -173,9 +94,8 @@ export class BsClassValidator {
                 if (lowerClassName && names.has(lowerClassName)) {
                     this.diagnostics.push({
                         ...DiagnosticMessages.circularReferenceDetected(
-                            Array.from(names.values()).concat(className), this.scope.name),
-                        file: cls.file,
-                        range: cls.name.range
+                            Array.from(names.values()).concat(className)),
+                        location: cls.tokens.name.location
                     });
                     break;
                 }
@@ -198,7 +118,7 @@ export class BsClassValidator {
             for (let statement of classStatement.body) {
                 if (isMethodStatement(statement) || isFieldStatement(statement)) {
                     let member = statement;
-                    let memberName = member.name;
+                    let memberName = member.tokens.name;
 
                     if (!memberName) {
                         continue;
@@ -210,8 +130,7 @@ export class BsClassValidator {
                     if (methods[lowerMemberName] || fields[lowerMemberName]) {
                         this.diagnostics.push({
                             ...DiagnosticMessages.duplicateIdentifier(memberName.text),
-                            file: classStatement.file,
-                            range: memberName.range
+                            location: memberName.location
                         });
                     }
 
@@ -222,27 +141,35 @@ export class BsClassValidator {
 
                         //mismatched member type (field/method in child, opposite in ancestor)
                         if (memberType !== ancestorMemberKind) {
+                            const childFieldType = member.getType({ flags: SymbolTypeFlag.typetime });
+                            let ancestorMemberType: BscType = DynamicType.instance;
+                            if (isFieldStatement(ancestorAndMember.member)) {
+                                ancestorMemberType = ancestorAndMember.member.getType({ flags: SymbolTypeFlag.typetime });
+                            } else if (isMethodStatement(ancestorAndMember.member)) {
+                                ancestorMemberType = ancestorAndMember.member.func.getType({ flags: SymbolTypeFlag.typetime });
+                            }
                             this.diagnostics.push({
-                                ...DiagnosticMessages.classChildMemberDifferentMemberTypeThanAncestor(
-                                    memberType,
-                                    ancestorMemberKind,
-                                    ancestorAndMember.classStatement.getName(ParseMode.BrighterScript)
+                                ...DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty(
+                                    classStatement.getName(ParseMode.BrighterScript) ?? '',
+                                    ancestorAndMember.classStatement.getName(ParseMode.BrighterScript),
+                                    memberName.text,
+                                    childFieldType.toString(),
+                                    ancestorMemberType.toString()
                                 ),
-                                file: classStatement.file,
-                                range: member.range
+                                location: member.location
                             });
                         }
 
                         //child field has same name as parent
                         if (isFieldStatement(member)) {
-                            let ancestorMemberType: BscType = new DynamicType();
+                            let ancestorMemberType: BscType = DynamicType.instance;
                             if (isFieldStatement(ancestorAndMember.member)) {
-                                ancestorMemberType = ancestorAndMember.member.getType() ?? new DynamicType();
+                                ancestorMemberType = ancestorAndMember.member.getType({ flags: SymbolTypeFlag.typetime });
                             } else if (isMethodStatement(ancestorAndMember.member)) {
-                                ancestorMemberType = ancestorAndMember.member.func.getFunctionType();
+                                ancestorMemberType = ancestorAndMember.member.func.getType({ flags: SymbolTypeFlag.typetime });
                             }
-                            const childFieldType = member.getType();
-                            if (childFieldType && !childFieldType.isAssignableTo(ancestorMemberType)) {
+                            const childFieldType = member.getType({ flags: SymbolTypeFlag.typetime });
+                            if (childFieldType && !ancestorMemberType.isTypeCompatible(childFieldType)) {
                                 //flag incompatible child field type to ancestor field type
                                 this.diagnostics.push({
                                     ...DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty(
@@ -252,8 +179,7 @@ export class BsClassValidator {
                                         childFieldType.toString(),
                                         ancestorMemberType.toString()
                                     ),
-                                    file: classStatement.file,
-                                    range: member.range
+                                    location: member.location
                                 });
                             }
                         }
@@ -263,16 +189,15 @@ export class BsClassValidator {
                             //is a method
                             isMethodStatement(member) &&
                             //does not have an override keyword
-                            !member.override &&
+                            !member.tokens.override &&
                             //is not the constructur function
-                            member.name.text.toLowerCase() !== 'new'
+                            member.tokens.name.text.toLowerCase() !== 'new'
                         ) {
                             this.diagnostics.push({
                                 ...DiagnosticMessages.missingOverrideKeyword(
                                     ancestorAndMember.classStatement.getName(ParseMode.BrighterScript)
                                 ),
-                                file: classStatement.file,
-                                range: member.range
+                                location: member.location
                             });
                         }
 
@@ -284,14 +209,13 @@ export class BsClassValidator {
                         ) {
                             this.diagnostics.push({
                                 ...DiagnosticMessages.mismatchedOverriddenMemberVisibility(
-                                    classStatement.name.text,
-                                    ancestorAndMember.member.name?.text,
+                                    classStatement.tokens.name.text,
+                                    ancestorAndMember.member.tokens.name?.text,
                                     member.accessModifier?.text ?? 'public',
                                     ancestorAndMember.member.accessModifier?.text || 'public',
                                     ancestorAndMember.classStatement.getName(ParseMode.BrighterScript)
                                 ),
-                                file: classStatement.file,
-                                range: member.range
+                                location: member.location
                             });
                         }
                     }
@@ -307,38 +231,6 @@ export class BsClassValidator {
         }
     }
 
-
-    /**
-     * Check the types for fields, and validate they are valid types
-     */
-    private validateFieldTypes() {
-        for (const [, classStatement] of this.classes) {
-            for (let statement of classStatement.body) {
-                if (isFieldStatement(statement)) {
-                    let fieldType = statement.getType();
-
-                    if (isCustomType(fieldType)) {
-                        const fieldTypeName = fieldType.name;
-                        const lowerFieldTypeName = fieldTypeName?.toLowerCase();
-                        if (lowerFieldTypeName) {
-                            const namespace = classStatement.findAncestor<NamespaceStatement>(isNamespaceStatement);
-                            const currentNamespaceName = namespace?.getName(ParseMode.BrighterScript);
-                            //check if this custom type is in our class map
-                            const isBuiltInType = util.isBuiltInType(lowerFieldTypeName);
-                            if (!isBuiltInType && !this.getClassByName(lowerFieldTypeName, currentNamespaceName) && !this.scope.hasInterface(lowerFieldTypeName) && !this.scope.hasEnum(lowerFieldTypeName) && !this.scope.hasTypeStatementType(lowerFieldTypeName)) {
-                                this.diagnostics.push({
-                                    ...DiagnosticMessages.cannotFindType(fieldTypeName),
-                                    range: statement.type?.range ?? statement.range,
-                                    file: classStatement.file
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * Get the closest member with the specified name (case-insensitive)
      */
@@ -368,7 +260,9 @@ export class BsClassValidator {
     private findClasses() {
         this.classes = new Map();
         this.scope.enumerateBrsFiles((file) => {
-            for (let x of file.parser.references.classStatements ?? []) {
+
+            // eslint-disable-next-line @typescript-eslint/dot-notation
+            for (let x of file['_cachedLookups'].classStatements ?? []) {
                 let classStatement = x as AugmentedClassStatement;
                 let name = classStatement.getName(ParseMode.BrighterScript);
                 //skip this class if it doesn't have a name
@@ -383,21 +277,6 @@ export class BsClassValidator {
                 if (!alreadyDefinedClass) {
                     this.classes.set(lowerName, classStatement);
                     classStatement.file = file;
-
-                    //add a diagnostic about this class already existing
-                } else {
-                    this.diagnostics.push({
-                        ...DiagnosticMessages.duplicateClassDeclaration(this.scope.name, name),
-                        file: file,
-                        range: classStatement.name.range,
-                        relatedInformation: [{
-                            location: util.createLocation(
-                                URI.file(alreadyDefinedClass.file.srcPath).toString(),
-                                alreadyDefinedClass.range
-                            ),
-                            message: ''
-                        }]
-                    });
                 }
             }
         });
@@ -406,7 +285,7 @@ export class BsClassValidator {
     private linkClassesWithParents() {
         //link all classes with their parents
         for (const [, classStatement] of this.classes) {
-            let parentClassName = classStatement.parentClassName?.getName(ParseMode.BrighterScript);
+            let parentClassName = classStatement.parentClassName?.getName();
             if (parentClassName) {
                 let relativeName: string;
                 let absoluteName: string;