diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 83338327d88..a30d3e16ba7 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,4 +1,4 @@
 {
-  ".": "0.30.0",
-  "acvm-repo": "0.46.0"
+  ".": "0.31.0",
+  "acvm-repo": "0.47.0"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index db4ec8f4567..30678c05fb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,97 @@
 # Changelog
 
+## [0.31.0](https://github.com/noir-lang/noir/compare/v0.30.0...v0.31.0) (2024-06-17)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove `dep::` prefix ([#4946](https://github.com/noir-lang/noir/issues/4946))
+* remove `distinct` keyword ([#5219](https://github.com/noir-lang/noir/issues/5219))
+* remove `param_witnesses` and `return_witnesses` from ABI ([#5154](https://github.com/noir-lang/noir/issues/5154))
+* add session id to foreign call RPC requests ([#5205](https://github.com/noir-lang/noir/issues/5205))
+* restrict noir word size to u32 ([#5180](https://github.com/noir-lang/noir/issues/5180))
+* separate proving from `noir_js` ([#5072](https://github.com/noir-lang/noir/issues/5072))
+* switch `bb` over to read ACIR from nargo artifacts (https://github.com/AztecProtocol/aztec-packages/pull/6283)
+* specify databus arrays for BB (https://github.com/AztecProtocol/aztec-packages/pull/6239)
+* **stdlib:** eddsa function using turbofish ([#5050](https://github.com/noir-lang/noir/issues/5050))
+
+### Features
+
+* `pxe.addNullifiedNote(...)` (https://github.com/AztecProtocol/aztec-packages/pull/6948) ([7de19f5](https://github.com/noir-lang/noir/commit/7de19f5856591203271836f07154abae13f5102b))
+* Activate return_data in ACIR opcodes ([#5080](https://github.com/noir-lang/noir/issues/5080)) ([c9fda3c](https://github.com/noir-lang/noir/commit/c9fda3c7fd4575bfe7d457e8d4230e071f0129a0))
+* Add `as_witness` builtin function in order to constrain a witness to be equal to a variable  ([#4641](https://github.com/noir-lang/noir/issues/4641)) ([faf5bd8](https://github.com/noir-lang/noir/commit/faf5bd8ed80fb89b4bb6a2536b9bfa9649579da7))
+* Add `set` and `set_unchecked` methods to `Vec` and `BoundedVec` ([#5241](https://github.com/noir-lang/noir/issues/5241)) ([1849389](https://github.com/noir-lang/noir/commit/1849389362e22e8236177f84b735dadf840cd637))
+* Add BoundedVec::map ([#5250](https://github.com/noir-lang/noir/issues/5250)) ([da1549c](https://github.com/noir-lang/noir/commit/da1549cfb296261b273a3a64908382e7b71512ad))
+* Add intrinsic to get if running inside an unconstrained context ([#5098](https://github.com/noir-lang/noir/issues/5098)) ([281ebf2](https://github.com/noir-lang/noir/commit/281ebf26e4cd16daf361938de505697f8d5fbd5e))
+* Add native rust implementation of schnorr signature verification ([#5053](https://github.com/noir-lang/noir/issues/5053)) ([fab1c35](https://github.com/noir-lang/noir/commit/fab1c3567d731ea7902635a7a020a8d14f94fd27))
+* Add session id to foreign call RPC requests ([#5205](https://github.com/noir-lang/noir/issues/5205)) ([14adafc](https://github.com/noir-lang/noir/commit/14adafc965fa9c833e096ec037e086aae67703ad))
+* Consider block parameters in variable liveness ([#5097](https://github.com/noir-lang/noir/issues/5097)) ([e4eb5f5](https://github.com/noir-lang/noir/commit/e4eb5f539f377fd3c2e1a874707ffce62a5bc10a))
+* **experimental:** Implement macro calls & splicing into `Expr` values ([#5203](https://github.com/noir-lang/noir/issues/5203)) ([d9b4712](https://github.com/noir-lang/noir/commit/d9b4712bf1a62548dd7ed17b181882ae537d70dd))
+* Implement println in the comptime interpreter ([#5197](https://github.com/noir-lang/noir/issues/5197)) ([7f08343](https://github.com/noir-lang/noir/commit/7f08343dfcafddfcec1b238746a69273ae4f4e2b))
+* Implement turbofish operator ([#3542](https://github.com/noir-lang/noir/issues/3542)) ([226724e](https://github.com/noir-lang/noir/commit/226724e3b54c2e0d9ba005661c76b40a87d9295a))
+* Make ACVM generic across fields ([#5114](https://github.com/noir-lang/noir/issues/5114)) ([70f374c](https://github.com/noir-lang/noir/commit/70f374c06642962d8f2b95b80f8c938fcf7761d7))
+* Move abi demonomorphizer to noir_codegen and use noir_codegen in protocol types (https://github.com/AztecProtocol/aztec-packages/pull/6302) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Move to_radix to a blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6294) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* **nargo:** Hidden option to show contract artifact paths written by `nargo compile` (https://github.com/AztecProtocol/aztec-packages/pull/6131) ([ff67e14](https://github.com/noir-lang/noir/commit/ff67e145d086bf6fdf58fb5e57927033e52e03d3))
+* Place return value witnesses directly after function arguments ([#5142](https://github.com/noir-lang/noir/issues/5142)) ([1252b5f](https://github.com/noir-lang/noir/commit/1252b5fcc7ed56bb55e95745b83be6e556805397))
+* Private Kernel Recursion (https://github.com/AztecProtocol/aztec-packages/pull/6278) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Proper padding in ts AES and constrained AES in body and header computations (https://github.com/AztecProtocol/aztec-packages/pull/6269) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Remove `dep::` prefix ([#4946](https://github.com/noir-lang/noir/issues/4946)) ([d6d0ae2](https://github.com/noir-lang/noir/commit/d6d0ae26d2fef083dc240539b834d934c84b0326))
+* Remove conditional compilation of `bn254_blackbox_solver` ([#5058](https://github.com/noir-lang/noir/issues/5058)) ([9420d7c](https://github.com/noir-lang/noir/commit/9420d7c2ba6bbbf5ecb9a066837c505310955b6c))
+* Remove external blackbox solver from acir simulator (https://github.com/AztecProtocol/aztec-packages/pull/6586) ([a40a9a5](https://github.com/noir-lang/noir/commit/a40a9a55571deed386688fb84260bdf2794d4d38))
+* Replace stdlib poseidon implementation with optimized version ([#5122](https://github.com/noir-lang/noir/issues/5122)) ([11e98f3](https://github.com/noir-lang/noir/commit/11e98f348d1d43a9b28d83ec3308027b7afc0da6))
+* Restrict noir word size to u32 ([#5180](https://github.com/noir-lang/noir/issues/5180)) ([bdb2bc6](https://github.com/noir-lang/noir/commit/bdb2bc608ea8fd52d46545a38b68dd2558b28110))
+* Separate proving from `noir_js` ([#5072](https://github.com/noir-lang/noir/issues/5072)) ([c93c738](https://github.com/noir-lang/noir/commit/c93c7380c705fcec5c77bfc436c2f5ea085edd77))
+* Separate runtimes of SSA functions before inlining ([#5121](https://github.com/noir-lang/noir/issues/5121)) ([69eca9b](https://github.com/noir-lang/noir/commit/69eca9b8671fa54192bef814dd584fdb5387a5f7))
+* Specify databus arrays for BB (https://github.com/AztecProtocol/aztec-packages/pull/6239) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Standardize pedersen functions to return `EmbeddedCurvePoint` ([#5190](https://github.com/noir-lang/noir/issues/5190)) ([3b85b36](https://github.com/noir-lang/noir/commit/3b85b3637f81f3894a7faa07fd299f9d64747214))
+* **stdlib:** Eddsa function using turbofish ([#5050](https://github.com/noir-lang/noir/issues/5050)) ([7936262](https://github.com/noir-lang/noir/commit/79362629ed8cf42b6601e9a551ed8f9fe03e0112))
+* Support casting in globals ([#5164](https://github.com/noir-lang/noir/issues/5164)) ([6d3e732](https://github.com/noir-lang/noir/commit/6d3e732e06033b53506656acdd3d7759bd27f106))
+* Switch `bb` over to read ACIR from nargo artifacts (https://github.com/AztecProtocol/aztec-packages/pull/6283) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/6280) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/6332) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/6573) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/6986) ([7de19f5](https://github.com/noir-lang/noir/commit/7de19f5856591203271836f07154abae13f5102b))
+* ToRadix BB + avm transpiler support (https://github.com/AztecProtocol/aztec-packages/pull/6330) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+
+
+### Bug Fixes
+
+* Add support for nested arrays returned by oracles ([#5132](https://github.com/noir-lang/noir/issues/5132)) ([f846879](https://github.com/noir-lang/noir/commit/f846879dd038328bd0a1d39a72b448ef52a1002b))
+* Apply self type from generic trait constraint before instantiating identifiers ([#5087](https://github.com/noir-lang/noir/issues/5087)) ([2b4755c](https://github.com/noir-lang/noir/commit/2b4755c2b57460d5eb839ee835f8c9acd5773a7c))
+* Auto dereference trait methods in the elaborator ([#5124](https://github.com/noir-lang/noir/issues/5124)) ([56c1a85](https://github.com/noir-lang/noir/commit/56c1a85056ed338644595f1aa58cc94563786b9e))
+* Check for public args in aztec functions (https://github.com/AztecProtocol/aztec-packages/pull/6355) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Disable `if` optimization ([#5240](https://github.com/noir-lang/noir/issues/5240)) ([a2816db](https://github.com/noir-lang/noir/commit/a2816dbf7f9d31967fc95205a43fdfdf181029b0))
+* **elaborator:** Fix duplicate methods error ([#5225](https://github.com/noir-lang/noir/issues/5225)) ([87a1d8e](https://github.com/noir-lang/noir/commit/87a1d8ebaadb5f0f1ed637b96816f971f946af87))
+* **elaborator:** Fix regression introduced by lazy-global changes ([#5223](https://github.com/noir-lang/noir/issues/5223)) ([fde432a](https://github.com/noir-lang/noir/commit/fde432aacc436b6c57f0d937d7c86836bac0b465))
+* **elaborator:** Invert unconstrained check ([#5176](https://github.com/noir-lang/noir/issues/5176)) ([967c0fa](https://github.com/noir-lang/noir/commit/967c0fa76da9384afe918a8b23eef60f12f29292))
+* **elaborator:** Lazily elaborate globals ([#5191](https://github.com/noir-lang/noir/issues/5191)) ([9c99a97](https://github.com/noir-lang/noir/commit/9c99a97ca8f42bee23cf97ebd724fdc51e647c60))
+* Error for allocate instructions in acir-gen ([#5200](https://github.com/noir-lang/noir/issues/5200)) ([58c7532](https://github.com/noir-lang/noir/commit/58c7532da8dd86ee02b20d7e7809f5437f667845))
+* **experimental elaborator:** Avoid calling `add_generics` twice on trait methods ([#5108](https://github.com/noir-lang/noir/issues/5108)) ([7d8c0a3](https://github.com/noir-lang/noir/commit/7d8c0a3a1ae143b574b2fa62cae7c0a493005c70))
+* **experimental elaborator:** Clear generics after elaborating type aliases ([#5136](https://github.com/noir-lang/noir/issues/5136)) ([b0a7d0b](https://github.com/noir-lang/noir/commit/b0a7d0b12328d3ed9faed87b78792b77786018e0))
+* **experimental elaborator:** Fix `impl Trait` when `--use-elaborator` is selected ([#5138](https://github.com/noir-lang/noir/issues/5138)) ([7ea5962](https://github.com/noir-lang/noir/commit/7ea5962e77b7183374a4e14da3a237ccd63f00a0))
+* **experimental elaborator:** Fix definition kind of globals and tuple patterns with `--use-elaborator` flag ([#5139](https://github.com/noir-lang/noir/issues/5139)) ([a140dec](https://github.com/noir-lang/noir/commit/a140dec4580459c5856d44337de3ea08aa7fb44a))
+* **experimental elaborator:** Fix duplicate `resolve_type` on self type and don't leak a trait impl's generics ([#5102](https://github.com/noir-lang/noir/issues/5102)) ([db561e2](https://github.com/noir-lang/noir/commit/db561e229cfcb35f23205cbb7e41fcf5ece68ee5))
+* **experimental elaborator:** Fix frontend tests when `--use-elaborator` flag is specified ([#5145](https://github.com/noir-lang/noir/issues/5145)) ([d6122eb](https://github.com/noir-lang/noir/commit/d6122eb9e88aa2b1bb6c990e452fa9678ae49704))
+* **experimental elaborator:** Fix global values used in the elaborator ([#5135](https://github.com/noir-lang/noir/issues/5135)) ([e73cdbb](https://github.com/noir-lang/noir/commit/e73cdbb93b0714331fef754f862d89c08c28a9e5))
+* **experimental elaborator:** Fix globals which use function calls ([#5172](https://github.com/noir-lang/noir/issues/5172)) ([ab0b1a8](https://github.com/noir-lang/noir/commit/ab0b1a85cc91f8ed748ee393ece54f5c3b43d7ef))
+* **experimental elaborator:** Fix panic in the elaborator ([#5082](https://github.com/noir-lang/noir/issues/5082)) ([ffcb410](https://github.com/noir-lang/noir/commit/ffcb410978a362c73783fbfe5bbdc9691499609e))
+* **experimental elaborator:** Only call `add_generics` once ([#5091](https://github.com/noir-lang/noir/issues/5091)) ([f5d2946](https://github.com/noir-lang/noir/commit/f5d294645e82fc85d8dc28ee2a846ba11af85ce5))
+* Fix panic in `get_global_let_statement` ([#5177](https://github.com/noir-lang/noir/issues/5177)) ([b769b01](https://github.com/noir-lang/noir/commit/b769b01fd06a6a2c66c72f9aa4e1d346b0fca123))
+* **frontend:** Call trait method with mut self from generic definition ([#5041](https://github.com/noir-lang/noir/issues/5041)) ([89846cf](https://github.com/noir-lang/noir/commit/89846cfbc4961c5258d91b5973f027be80885a20))
+* **frontend:** Correctly monomorphize turbofish functions ([#5049](https://github.com/noir-lang/noir/issues/5049)) ([fd772e7](https://github.com/noir-lang/noir/commit/fd772e7a764004373f5a41a54eb6847f4decda77))
+* **frontend:** Resolve object types from method calls a single time ([#5131](https://github.com/noir-lang/noir/issues/5131)) ([3afe023](https://github.com/noir-lang/noir/commit/3afe023543e301aafaf2b79f0ccd6d7936dd53a9))
+* Temporarily revert to_radix blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6304) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Use plain integer addresses for opcodes in DAP disassembly view ([#4941](https://github.com/noir-lang/noir/issues/4941)) ([d43ba1b](https://github.com/noir-lang/noir/commit/d43ba1bddbf6ebd56a7bee0e1db38d155fec95d5))
+* Use predicate for curve operations ([#5076](https://github.com/noir-lang/noir/issues/5076)) ([145b909](https://github.com/noir-lang/noir/commit/145b90945486907cb6db75d3f3f93a58d19b2a32))
+* Wrapping in signed division ([#5134](https://github.com/noir-lang/noir/issues/5134)) ([29baeb4](https://github.com/noir-lang/noir/commit/29baeb41e15918935c437e0a2759c6b936f125a4))
+
+
+### Miscellaneous Chores
+
+* Remove `distinct` keyword ([#5219](https://github.com/noir-lang/noir/issues/5219)) ([1d62c59](https://github.com/noir-lang/noir/commit/1d62c59a8f02f7d277c5bf9ed637348a3b2f399c))
+* Remove `param_witnesses` and `return_witnesses` from ABI ([#5154](https://github.com/noir-lang/noir/issues/5154)) ([21562ae](https://github.com/noir-lang/noir/commit/21562aeea162d246573967115e7c519715f6d3d8))
+
 ## [0.30.0](https://github.com/noir-lang/noir/compare/v0.29.0...v0.30.0) (2024-05-20)
 
 
diff --git a/Cargo.lock b/Cargo.lock
index 50b65919f1e..c064a8aabf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,7 +4,7 @@ version = 3
 
 [[package]]
 name = "acir"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "acir_field",
  "base64 0.21.2",
@@ -26,7 +26,7 @@ dependencies = [
 
 [[package]]
 name = "acir_field"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "ark-bls12-381",
  "ark-bn254",
@@ -40,7 +40,7 @@ dependencies = [
 
 [[package]]
 name = "acvm"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "acir",
  "acvm_blackbox_solver",
@@ -55,7 +55,7 @@ dependencies = [
 
 [[package]]
 name = "acvm_blackbox_solver"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "acir",
  "blake2",
@@ -93,7 +93,7 @@ dependencies = [
 
 [[package]]
 name = "acvm_js"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "acvm",
  "bn254_blackbox_solver",
@@ -443,7 +443,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "aztec_macros"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "convert_case 0.6.0",
@@ -571,7 +571,7 @@ dependencies = [
 
 [[package]]
 name = "bn254_blackbox_solver"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "acir",
  "acvm_blackbox_solver",
@@ -589,7 +589,7 @@ dependencies = [
 
 [[package]]
 name = "brillig"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "acir_field",
  "serde",
@@ -597,7 +597,7 @@ dependencies = [
 
 [[package]]
 name = "brillig_vm"
-version = "0.46.0"
+version = "0.47.0"
 dependencies = [
  "acir",
  "acvm_blackbox_solver",
@@ -1537,7 +1537,7 @@ dependencies = [
 
 [[package]]
 name = "fm"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "codespan-reporting",
  "iter-extended",
@@ -2103,7 +2103,7 @@ dependencies = [
 
 [[package]]
 name = "iter-extended"
-version = "0.30.0"
+version = "0.31.0"
 
 [[package]]
 name = "itertools"
@@ -2498,10 +2498,9 @@ dependencies = [
 
 [[package]]
 name = "nargo"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
- "codespan-reporting",
  "fm",
  "iter-extended",
  "jsonrpc",
@@ -2524,7 +2523,7 @@ dependencies = [
 
 [[package]]
 name = "nargo_cli"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "assert_cmd",
@@ -2546,8 +2545,10 @@ dependencies = [
  "nargo_fmt",
  "nargo_toml",
  "noir_debugger",
+ "noir_fuzzer",
  "noir_lsp",
  "noirc_abi",
+ "noirc_artifacts",
  "noirc_driver",
  "noirc_errors",
  "noirc_frontend",
@@ -2557,6 +2558,7 @@ dependencies = [
  "pprof 0.13.0",
  "predicates 2.1.5",
  "prettytable-rs",
+ "proptest",
  "rayon",
  "serde",
  "serde_json",
@@ -2576,7 +2578,7 @@ dependencies = [
 
 [[package]]
 name = "nargo_fmt"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "bytecount",
  "noirc_frontend",
@@ -2588,7 +2590,7 @@ dependencies = [
 
 [[package]]
 name = "nargo_toml"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "dirs",
  "fm",
@@ -2667,7 +2669,7 @@ dependencies = [
 
 [[package]]
 name = "noir_debugger"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "assert_cmd",
@@ -2677,6 +2679,7 @@ dependencies = [
  "easy-repl",
  "fm",
  "nargo",
+ "noirc_artifacts",
  "noirc_driver",
  "noirc_errors",
  "noirc_frontend",
@@ -2688,6 +2691,18 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "noir_fuzzer"
+version = "0.31.0"
+dependencies = [
+ "acvm",
+ "nargo",
+ "noirc_abi",
+ "noirc_artifacts",
+ "proptest",
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "noir_grumpkin"
 version = "0.1.0"
@@ -2702,7 +2717,7 @@ dependencies = [
 
 [[package]]
 name = "noir_lsp"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "async-lsp",
@@ -2713,6 +2728,7 @@ dependencies = [
  "nargo",
  "nargo_fmt",
  "nargo_toml",
+ "noirc_artifacts",
  "noirc_driver",
  "noirc_errors",
  "noirc_frontend",
@@ -2751,7 +2767,7 @@ dependencies = [
 
 [[package]]
 name = "noir_wasm"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "build-data",
@@ -2761,6 +2777,7 @@ dependencies = [
  "gloo-utils",
  "js-sys",
  "nargo",
+ "noirc_artifacts",
  "noirc_driver",
  "noirc_errors",
  "noirc_evaluator",
@@ -2774,7 +2791,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_abi"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "iter-extended",
@@ -2792,7 +2809,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_abi_wasm"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "build-data",
@@ -2809,11 +2826,26 @@ dependencies = [
 
 [[package]]
 name = "noirc_arena"
-version = "0.30.0"
+version = "0.31.0"
+
+[[package]]
+name = "noirc_artifacts"
+version = "0.31.0"
+dependencies = [
+ "acvm",
+ "codespan-reporting",
+ "fm",
+ "noirc_abi",
+ "noirc_driver",
+ "noirc_errors",
+ "noirc_printable_type",
+ "serde",
+ "tempfile",
+]
 
 [[package]]
 name = "noirc_driver"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "aztec_macros",
@@ -2833,7 +2865,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_errors"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "base64 0.21.2",
@@ -2851,9 +2883,10 @@ dependencies = [
 
 [[package]]
 name = "noirc_evaluator"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
+ "bn254_blackbox_solver",
  "chrono",
  "fxhash",
  "im",
@@ -2868,7 +2901,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_frontend"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "base64 0.21.2",
@@ -2900,7 +2933,7 @@ dependencies = [
 
 [[package]]
 name = "noirc_printable_type"
-version = "0.30.0"
+version = "0.31.0"
 dependencies = [
  "acvm",
  "iter-extended",
diff --git a/Cargo.toml b/Cargo.toml
index be4cd81ab58..8b9ba3425cc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,10 +15,12 @@ members = [
     # Crates related to tooling built on top of the Noir compiler
     "tooling/lsp",
     "tooling/debugger",
+    "tooling/fuzzer",
     "tooling/nargo",
     "tooling/nargo_fmt",
     "tooling/nargo_cli",
     "tooling/nargo_toml",
+    "tooling/noirc_artifacts",
     "tooling/noirc_abi",
     "tooling/noirc_abi_wasm",
     "tooling/acvm_cli",
@@ -40,7 +42,7 @@ resolver = "2"
 
 [workspace.package]
 # x-release-please-start-version
-version = "0.30.0"
+version = "0.31.0"
 # x-release-please-end
 authors = ["The Noir Team <team@noir-lang.org>"]
 edition = "2021"
@@ -51,13 +53,13 @@ repository = "https://github.com/noir-lang/noir/"
 [workspace.dependencies]
 
 # ACVM workspace dependencies
-acir_field = { version = "0.46.0", path = "acvm-repo/acir_field", default-features = false }
-acir = { version = "0.46.0", path = "acvm-repo/acir", default-features = false }
-acvm = { version = "0.46.0", path = "acvm-repo/acvm" }
-brillig = { version = "0.46.0", path = "acvm-repo/brillig", default-features = false }
-brillig_vm = { version = "0.46.0", path = "acvm-repo/brillig_vm", default-features = false }
-acvm_blackbox_solver = { version = "0.46.0", path = "acvm-repo/blackbox_solver", default-features = false }
-bn254_blackbox_solver = { version = "0.46.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
+acir_field = { version = "0.47.0", path = "acvm-repo/acir_field", default-features = false }
+acir = { version = "0.47.0", path = "acvm-repo/acir", default-features = false }
+acvm = { version = "0.47.0", path = "acvm-repo/acvm" }
+brillig = { version = "0.47.0", path = "acvm-repo/brillig", default-features = false }
+brillig_vm = { version = "0.47.0", path = "acvm-repo/brillig_vm", default-features = false }
+acvm_blackbox_solver = { version = "0.47.0", path = "acvm-repo/blackbox_solver", default-features = false }
+bn254_blackbox_solver = { version = "0.47.0", path = "acvm-repo/bn254_blackbox_solver", default-features = false }
 
 # Noir compiler workspace dependencies
 fm = { path = "compiler/fm" }
@@ -69,12 +71,14 @@ noirc_frontend = { path = "compiler/noirc_frontend" }
 noirc_printable_type = { path = "compiler/noirc_printable_type" }
 
 # Noir tooling workspace dependencies
+noir_fuzzer = { path = "tooling/fuzzer" }
 nargo = { path = "tooling/nargo" }
 nargo_fmt = { path = "tooling/nargo_fmt" }
 nargo_toml = { path = "tooling/nargo_toml" }
 noir_lsp = { path = "tooling/lsp" }
 noir_debugger = { path = "tooling/debugger" }
 noirc_abi = { path = "tooling/noirc_abi" }
+noirc_artifacts = { path = "tooling/noirc_artifacts" }
 bb_abstraction_leaks = { path = "tooling/bb_abstraction_leaks" }
 acvm_cli = { path = "tooling/acvm_cli" }
 
diff --git a/acvm-repo/CHANGELOG.md b/acvm-repo/CHANGELOG.md
index c9bb0d610eb..4db36aadec9 100644
--- a/acvm-repo/CHANGELOG.md
+++ b/acvm-repo/CHANGELOG.md
@@ -5,6 +5,154 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.47.0](https://github.com/noir-lang/noir/compare/v0.46.0...v0.47.0) (2024-06-17)
+
+
+### ⚠ BREAKING CHANGES
+
+* add session id to foreign call RPC requests ([#5205](https://github.com/noir-lang/noir/issues/5205))
+* restrict noir word size to u32 ([#5180](https://github.com/noir-lang/noir/issues/5180))
+* switch `bb` over to read ACIR from nargo artifacts (https://github.com/AztecProtocol/aztec-packages/pull/6283)
+* specify databus arrays for BB (https://github.com/AztecProtocol/aztec-packages/pull/6239)
+* remove `Opcode::Brillig` from ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5995)
+* AES blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6016)
+* Bit shift is restricted to u8 right operand ([#4907](https://github.com/noir-lang/noir/issues/4907))
+* contract interfaces and better function calls (https://github.com/AztecProtocol/aztec-packages/pull/5687)
+* change backend width to 4 (https://github.com/AztecProtocol/aztec-packages/pull/5374)
+* Use fixed size arrays in black box functions where sizes are known (https://github.com/AztecProtocol/aztec-packages/pull/5620)
+* trap with revert data (https://github.com/AztecProtocol/aztec-packages/pull/5732)
+* **acir:** BrilligCall opcode  (https://github.com/AztecProtocol/aztec-packages/pull/5709)
+* remove fixed-length keccak256 (https://github.com/AztecProtocol/aztec-packages/pull/5617)
+* storage_layout and `#[aztec(storage)]` (https://github.com/AztecProtocol/aztec-packages/pull/5387)
+* **acir:** Add predicate to call opcode (https://github.com/AztecProtocol/aztec-packages/pull/5616)
+* contract_abi-exports (https://github.com/AztecProtocol/aztec-packages/pull/5386)
+* Brillig typed memory (https://github.com/AztecProtocol/aztec-packages/pull/5395)
+* **acir:** Program and witness stack structure (https://github.com/AztecProtocol/aztec-packages/pull/5149)
+* automatic NoteInterface and NoteGetterOptions auto select (https://github.com/AztecProtocol/aztec-packages/pull/4508)
+* Acir call opcode (https://github.com/AztecProtocol/aztec-packages/pull/4773)
+* Support contracts with no constructor (https://github.com/AztecProtocol/aztec-packages/pull/5175)
+* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898)
+* move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479)
+* note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500)
+* rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420)
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014)
+* init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200)
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221)
+
+### Features
+
+* `multi_scalar_mul` blackbox func (https://github.com/AztecProtocol/aztec-packages/pull/6097) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a))
+* `variable_base_scalar_mul` blackbox func (https://github.com/AztecProtocol/aztec-packages/pull/6039) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a))
+* Acir call opcode (https://github.com/AztecProtocol/aztec-packages/pull/4773) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* **acir_gen:** Brillig stdlib ([#4848](https://github.com/noir-lang/noir/issues/4848)) ([0c8175c](https://github.com/noir-lang/noir/commit/0c8175cb539efd9427c73ae5af0d48abe688ebab))
+* **acir_gen:** Fold attribute at compile-time and initial non inlined ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5341) ([a0f7474](https://github.com/noir-lang/noir/commit/a0f7474ae6bd74132efdb945d2eb2383f3913cce))
+* **acir:** Add predicate to call opcode (https://github.com/AztecProtocol/aztec-packages/pull/5616) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* **acir:** BrilligCall opcode  (https://github.com/AztecProtocol/aztec-packages/pull/5709) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* **acir:** Program and witness stack structure (https://github.com/AztecProtocol/aztec-packages/pull/5149) ([13eb71b](https://github.com/noir-lang/noir/commit/13eb71b8de44eb6aad9c37943ad06fc73db589f5))
+* Activate return_data in ACIR opcodes ([#5080](https://github.com/noir-lang/noir/issues/5080)) ([c9fda3c](https://github.com/noir-lang/noir/commit/c9fda3c7fd4575bfe7d457e8d4230e071f0129a0))
+* **acvm_js:** Execute program  ([#4694](https://github.com/noir-lang/noir/issues/4694)) ([386f6d0](https://github.com/noir-lang/noir/commit/386f6d0a5822912db878285cb001032a7c0ff622))
+* **acvm:** Execute multiple circuits  (https://github.com/AztecProtocol/aztec-packages/pull/5380) ([a0f7474](https://github.com/noir-lang/noir/commit/a0f7474ae6bd74132efdb945d2eb2383f3913cce))
+* Add bit size to const opcode (https://github.com/AztecProtocol/aztec-packages/pull/4385) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add CMOV instruction to brillig and brillig gen (https://github.com/AztecProtocol/aztec-packages/pull/5308) ([13eb71b](https://github.com/noir-lang/noir/commit/13eb71b8de44eb6aad9c37943ad06fc73db589f5))
+* Add expression width into acir (https://github.com/AztecProtocol/aztec-packages/pull/4014) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Add instrumentation for tracking variables in debugging ([#4122](https://github.com/noir-lang/noir/issues/4122)) ([c58d691](https://github.com/noir-lang/noir/commit/c58d69141b54a918cd1675400c00bfd48720f896))
+* Add native rust implementation of schnorr signature verification ([#5053](https://github.com/noir-lang/noir/issues/5053)) ([fab1c35](https://github.com/noir-lang/noir/commit/fab1c3567d731ea7902635a7a020a8d14f94fd27))
+* Add native rust implementations of pedersen functions ([#4871](https://github.com/noir-lang/noir/issues/4871)) ([fb039f7](https://github.com/noir-lang/noir/commit/fb039f74df23aea39bc0593a5d538d82b4efadf0))
+* Add poseidon2 opcode implementation for acvm/brillig, and Noir ([#4398](https://github.com/noir-lang/noir/issues/4398)) ([10e8292](https://github.com/noir-lang/noir/commit/10e82920798380f50046e52db4a20ca205191ab7))
+* Add return values to aztec fns (https://github.com/AztecProtocol/aztec-packages/pull/5389) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* Add session id to foreign call RPC requests ([#5205](https://github.com/noir-lang/noir/issues/5205)) ([14adafc](https://github.com/noir-lang/noir/commit/14adafc965fa9c833e096ec037e086aae67703ad))
+* Added cast opcode and cast calldata (https://github.com/AztecProtocol/aztec-packages/pull/4423) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* AES blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6016) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a))
+* Allow brillig to read arrays directly from memory (https://github.com/AztecProtocol/aztec-packages/pull/4460) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow nested arrays and vectors in Brillig foreign calls (https://github.com/AztecProtocol/aztec-packages/pull/4478) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Allow variables and stack trace inspection in the debugger ([#4184](https://github.com/noir-lang/noir/issues/4184)) ([bf263fc](https://github.com/noir-lang/noir/commit/bf263fc8d843940f328a90f6366edd2671fb2682))
+* Automatic NoteInterface and NoteGetterOptions auto select (https://github.com/AztecProtocol/aztec-packages/pull/4508) ([13eb71b](https://github.com/noir-lang/noir/commit/13eb71b8de44eb6aad9c37943ad06fc73db589f5))
+* **avm:** Back in avm context with macro - refactor context (https://github.com/AztecProtocol/aztec-packages/pull/4438) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* **avm:** Brillig CONST of size &gt; u128 (https://github.com/AztecProtocol/aztec-packages/pull/5217) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* **avm:** Integrate AVM with initializers (https://github.com/AztecProtocol/aztec-packages/pull/5469) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* **aztec-nr:** Initial work for aztec public vm macro (https://github.com/AztecProtocol/aztec-packages/pull/4400) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Backpropagate constants in ACIR during optimization ([#3926](https://github.com/noir-lang/noir/issues/3926)) ([aad0da0](https://github.com/noir-lang/noir/commit/aad0da024c69663f42e6913e674682d5864b26ae))
+* Bit shift is restricted to u8 right operand ([#4907](https://github.com/noir-lang/noir/issues/4907)) ([c4b0369](https://github.com/noir-lang/noir/commit/c4b03691feca17ef268acab523292f3051f672ea))
+* Brillig heterogeneous memory cells (https://github.com/AztecProtocol/aztec-packages/pull/5608) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda))
+* Brillig IR refactor (https://github.com/AztecProtocol/aztec-packages/pull/5233) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* Brillig pointer codegen and execution (https://github.com/AztecProtocol/aztec-packages/pull/5737) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Brillig typed memory (https://github.com/AztecProtocol/aztec-packages/pull/5395) ([0bc18c4](https://github.com/noir-lang/noir/commit/0bc18c4f78171590dd58bded959f68f53a44cc8c))
+* Change backend width to 4 (https://github.com/AztecProtocol/aztec-packages/pull/5374) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Check initializer msg.sender matches deployer from address preimage (https://github.com/AztecProtocol/aztec-packages/pull/5222) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* Contract interfaces and better function calls (https://github.com/AztecProtocol/aztec-packages/pull/5687) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Contract_abi-exports (https://github.com/AztecProtocol/aztec-packages/pull/5386) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* Dynamic assertion payloads v2 (https://github.com/AztecProtocol/aztec-packages/pull/5949) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a))
+* Evaluation of dynamic assert messages ([#4101](https://github.com/noir-lang/noir/issues/4101)) ([c284e01](https://github.com/noir-lang/noir/commit/c284e01bfe20ceae4414dc123624b5cbb8b66d09))
+* Handle `BrilligCall` opcodes in the debugger ([#4897](https://github.com/noir-lang/noir/issues/4897)) ([b380dc4](https://github.com/noir-lang/noir/commit/b380dc44de5c9f8de278ece3d531ebbc2c9238ba))
+* Impl of missing functionality in new key store (https://github.com/AztecProtocol/aztec-packages/pull/5750) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Increase default expression width to 4 ([#4995](https://github.com/noir-lang/noir/issues/4995)) ([f01d309](https://github.com/noir-lang/noir/commit/f01d3090759a5ff0f1f83c5616d22890c6bd76be))
+* Init storage macro (https://github.com/AztecProtocol/aztec-packages/pull/4200) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Initial Earthly CI (https://github.com/AztecProtocol/aztec-packages/pull/5069) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* Internal as a macro (https://github.com/AztecProtocol/aztec-packages/pull/4898) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e))
+* Make ACVM generic across fields ([#5114](https://github.com/noir-lang/noir/issues/5114)) ([70f374c](https://github.com/noir-lang/noir/commit/70f374c06642962d8f2b95b80f8c938fcf7761d7))
+* Move abi demonomorphizer to noir_codegen and use noir_codegen in protocol types (https://github.com/AztecProtocol/aztec-packages/pull/6302) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Move to_radix to a blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6294) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* **nargo:** Handle call stacks for multiple Acir calls ([#4711](https://github.com/noir-lang/noir/issues/4711)) ([5b23171](https://github.com/noir-lang/noir/commit/5b231714740447d82cde7cdbe65d4a8b46a31df4))
+* **nargo:** Hidden option to show contract artifact paths written by `nargo compile` (https://github.com/AztecProtocol/aztec-packages/pull/6131) ([ff67e14](https://github.com/noir-lang/noir/commit/ff67e145d086bf6fdf58fb5e57927033e52e03d3))
+* New brillig field operations and refactor of binary operations (https://github.com/AztecProtocol/aztec-packages/pull/5208) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* Note type ids (https://github.com/AztecProtocol/aztec-packages/pull/4500) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Parsing non-string assertion payloads in noir js (https://github.com/AztecProtocol/aztec-packages/pull/6079) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a))
+* Private Kernel Recursion (https://github.com/AztecProtocol/aztec-packages/pull/6278) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Proper padding in ts AES and constrained AES in body and header computations (https://github.com/AztecProtocol/aztec-packages/pull/6269) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Remove conditional compilation of `bn254_blackbox_solver` ([#5058](https://github.com/noir-lang/noir/issues/5058)) ([9420d7c](https://github.com/noir-lang/noir/commit/9420d7c2ba6bbbf5ecb9a066837c505310955b6c))
+* Remove external blackbox solver from acir simulator (https://github.com/AztecProtocol/aztec-packages/pull/6586) ([a40a9a5](https://github.com/noir-lang/noir/commit/a40a9a55571deed386688fb84260bdf2794d4d38))
+* Restore hashing args via slice for performance (https://github.com/AztecProtocol/aztec-packages/pull/5539) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* Restrict noir word size to u32 ([#5180](https://github.com/noir-lang/noir/issues/5180)) ([bdb2bc6](https://github.com/noir-lang/noir/commit/bdb2bc608ea8fd52d46545a38b68dd2558b28110))
+* Separate runtimes of SSA functions before inlining ([#5121](https://github.com/noir-lang/noir/issues/5121)) ([69eca9b](https://github.com/noir-lang/noir/commit/69eca9b8671fa54192bef814dd584fdb5387a5f7))
+* Set aztec private functions to be recursive (https://github.com/AztecProtocol/aztec-packages/pull/6192) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a))
+* Signed integer division and modulus in brillig gen (https://github.com/AztecProtocol/aztec-packages/pull/5279) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* **simulator:** Fetch return values at circuit execution (https://github.com/AztecProtocol/aztec-packages/pull/5642) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda))
+* Specify databus arrays for BB (https://github.com/AztecProtocol/aztec-packages/pull/6239) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Storage_layout and `#[aztec(storage)]` (https://github.com/AztecProtocol/aztec-packages/pull/5387) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* Support contracts with no constructor (https://github.com/AztecProtocol/aztec-packages/pull/5175) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* Switch `bb` over to read ACIR from nargo artifacts (https://github.com/AztecProtocol/aztec-packages/pull/6283) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Sync from aztec-packages ([#4483](https://github.com/noir-lang/noir/issues/4483)) ([fe8f277](https://github.com/noir-lang/noir/commit/fe8f2776ccfde29209a2c3fc162311c99e4f59be))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5234) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5286) ([c3c9e19](https://github.com/noir-lang/noir/commit/c3c9e19a20d61272a04b95fd6c7d34cc4cb96e45))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5572) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5619) ([2bd006a](https://github.com/noir-lang/noir/commit/2bd006ae07499e8702b0fa9565855f0a5ef1a589))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5697) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5794) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5814) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5935) ([1b867b1](https://github.com/noir-lang/noir/commit/1b867b121fba5db3087ca845b4934e6732b23fd1))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5955) ([1b867b1](https://github.com/noir-lang/noir/commit/1b867b121fba5db3087ca845b4934e6732b23fd1))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/5999) ([1b867b1](https://github.com/noir-lang/noir/commit/1b867b121fba5db3087ca845b4934e6732b23fd1))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/6280) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/6332) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Sync from noir (https://github.com/AztecProtocol/aztec-packages/pull/6573) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* ToRadix BB + avm transpiler support (https://github.com/AztecProtocol/aztec-packages/pull/6330) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Trap with revert data (https://github.com/AztecProtocol/aztec-packages/pull/5732) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Use fixed size arrays in black box functions where sizes are known (https://github.com/AztecProtocol/aztec-packages/pull/5620) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Variable length returns (https://github.com/AztecProtocol/aztec-packages/pull/5633) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda))
+
+
+### Bug Fixes
+
+* **acvm:** Mark outputs of Opcode::Call solvable ([#4708](https://github.com/noir-lang/noir/issues/4708)) ([8fea405](https://github.com/noir-lang/noir/commit/8fea40576f262bd5bb588923c0660d8967404e56))
+* Add support for nested arrays returned by oracles ([#5132](https://github.com/noir-lang/noir/issues/5132)) ([f846879](https://github.com/noir-lang/noir/commit/f846879dd038328bd0a1d39a72b448ef52a1002b))
+* Avoid huge unrolling in hash_args (https://github.com/AztecProtocol/aztec-packages/pull/5703) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda))
+* Catch panics from EC point creation (e.g. the point is at infinity) ([#4790](https://github.com/noir-lang/noir/issues/4790)) ([645dba1](https://github.com/noir-lang/noir/commit/645dba192f16ef34018828186ffb297422a8dc73))
+* Check for public args in aztec functions (https://github.com/AztecProtocol/aztec-packages/pull/6355) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+* Don't reuse brillig with slice arguments (https://github.com/AztecProtocol/aztec-packages/pull/5800) ([0f9ae0a](https://github.com/noir-lang/noir/commit/0f9ae0ac1d68714b56ba4524aedcc67212494f1b))
+* Issue 4682 and add solver for unconstrained bigintegers ([#4729](https://github.com/noir-lang/noir/issues/4729)) ([e4d33c1](https://github.com/noir-lang/noir/commit/e4d33c126a2795d9aaa6048d4e91b64cb4bbe4f2))
+* Noir test incorrect reporting (https://github.com/AztecProtocol/aztec-packages/pull/4925) ([5f57ebb](https://github.com/noir-lang/noir/commit/5f57ebb7ff4b810802f90699a10f4325ef904f2e))
+* Proper field inversion for bigints ([#4802](https://github.com/noir-lang/noir/issues/4802)) ([b46d0e3](https://github.com/noir-lang/noir/commit/b46d0e39f4252f8bbaa987f88d112e4c233b3d61))
+* Temporarily revert to_radix blackbox (https://github.com/AztecProtocol/aztec-packages/pull/6304) ([436bbda](https://github.com/noir-lang/noir/commit/436bbdaadb2a294b94f93e53d7d3cad3859c7e46))
+
+
+### Miscellaneous Chores
+
+* **acir:** Move `is_recursive` flag to be part of the circuit definition (https://github.com/AztecProtocol/aztec-packages/pull/4221) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+* Move noir out of yarn-project (https://github.com/AztecProtocol/aztec-packages/pull/4479) ([78ef013](https://github.com/noir-lang/noir/commit/78ef0134b82e76a73dadb6c7975def22290e3a1a))
+* Remove `Opcode::Brillig` from ACIR (https://github.com/AztecProtocol/aztec-packages/pull/5995) ([73a635e](https://github.com/noir-lang/noir/commit/73a635e5086cf3407f9846ce39807cd15b4e485a))
+* Remove fixed-length keccak256 (https://github.com/AztecProtocol/aztec-packages/pull/5617) ([305bcdc](https://github.com/noir-lang/noir/commit/305bcdcbd01cb84dbaac900f14cb6cf867f83bda))
+* Rename bigint_neg into bigint_sub (https://github.com/AztecProtocol/aztec-packages/pull/4420) ([158c8ce](https://github.com/noir-lang/noir/commit/158c8cec7f0dc698042e9512001dd2c9d6b40bcc))
+
 ## [0.46.0](https://github.com/noir-lang/noir/compare/v0.45.0...v0.46.0) (2024-05-20)
 
 
diff --git a/acvm-repo/acir/Cargo.toml b/acvm-repo/acir/Cargo.toml
index 101ce7a0f39..7a8f10c98ef 100644
--- a/acvm-repo/acir/Cargo.toml
+++ b/acvm-repo/acir/Cargo.toml
@@ -2,7 +2,7 @@
 name = "acir"
 description = "ACIR is the IR that the VM processes, it is analogous to LLVM IR"
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/acir/src/circuit/black_box_functions.rs b/acvm-repo/acir/src/circuit/black_box_functions.rs
index 419c0266b69..fb7d9eb584c 100644
--- a/acvm-repo/acir/src/circuit/black_box_functions.rs
+++ b/acvm-repo/acir/src/circuit/black_box_functions.rs
@@ -82,43 +82,10 @@ pub enum BlackBoxFunc {
     ///
     /// [grumpkin]: https://hackmd.io/@aztec-network/ByzgNxBfd#2-Grumpkin---A-curve-on-top-of-BN-254-for-SNARK-efficient-group-operations
     SchnorrVerify,
-
-    /// Calculates a Pedersen commitment to the inputs.
-    ///
-    /// Computes a Pedersen commitment of the inputs using generators of the
-    /// embedded curve
-    /// - input: vector of (witness, 254)
-    /// - output: 2 witnesses representing the x,y coordinates of the resulting
-    ///   Grumpkin point
-    /// - domain separator: a constant public value (a field element) that you
-    ///   can use so that the commitment also depends on the domain separator.
-    ///   Noir uses 0 as domain separator.
-    ///
-    /// The backend should handle proper conversion between the inputs being ACIR
-    /// field elements and the scalar field of the embedded curve. In the case of
-    /// Aztec's Barretenberg, the latter is bigger than the ACIR field so it is
-    /// straightforward. The Pedersen generators are managed by the proving
-    /// system.
-    ///
-    /// The commitment is expected to be additively homomorphic
+    /// Will be deprecated
     PedersenCommitment,
-
-    /// Calculates a Pedersen hash to the inputs.
-    ///
-    /// Computes a Pedersen hash of the inputs and their number, using
-    /// generators of the embedded curve
-    /// - input: vector of (witness, 254)
-    /// - output: the x-coordinate of the pedersen commitment of the
-    ///   'prepended input' (see below)
-    /// - domain separator: a constant public value (a field element) that you
-    ///   can use so that the hash also depends on the domain separator. Noir
-    ///   uses 0 as domain separator.
-    ///
-    /// In Barretenberg, PedersenHash is doing the same as PedersenCommitment,
-    /// except that it prepends the inputs with their length. This is expected
-    /// to not be additively homomorphic.
+    /// Will be deprecated
     PedersenHash,
-
     /// Verifies a ECDSA signature over the secp256k1 curve.
     /// - inputs:
     ///     - x coordinate of public key as 32 bytes
@@ -242,8 +209,6 @@ impl BlackBoxFunc {
             BlackBoxFunc::SchnorrVerify => "schnorr_verify",
             BlackBoxFunc::Blake2s => "blake2s",
             BlackBoxFunc::Blake3 => "blake3",
-            BlackBoxFunc::PedersenCommitment => "pedersen_commitment",
-            BlackBoxFunc::PedersenHash => "pedersen_hash",
             BlackBoxFunc::EcdsaSecp256k1 => "ecdsa_secp256k1",
             BlackBoxFunc::MultiScalarMul => "multi_scalar_mul",
             BlackBoxFunc::EmbeddedCurveAdd => "embedded_curve_add",
@@ -262,6 +227,8 @@ impl BlackBoxFunc {
             BlackBoxFunc::BigIntToLeBytes => "bigint_to_le_bytes",
             BlackBoxFunc::Poseidon2Permutation => "poseidon2_permutation",
             BlackBoxFunc::Sha256Compression => "sha256_compression",
+            BlackBoxFunc::PedersenCommitment => "pedersen_commitment",
+            BlackBoxFunc::PedersenHash => "pedersen_hash",
         }
     }
 
@@ -272,8 +239,6 @@ impl BlackBoxFunc {
             "schnorr_verify" => Some(BlackBoxFunc::SchnorrVerify),
             "blake2s" => Some(BlackBoxFunc::Blake2s),
             "blake3" => Some(BlackBoxFunc::Blake3),
-            "pedersen_commitment" => Some(BlackBoxFunc::PedersenCommitment),
-            "pedersen_hash" => Some(BlackBoxFunc::PedersenHash),
             "ecdsa_secp256k1" => Some(BlackBoxFunc::EcdsaSecp256k1),
             "ecdsa_secp256r1" => Some(BlackBoxFunc::EcdsaSecp256r1),
             "multi_scalar_mul" => Some(BlackBoxFunc::MultiScalarMul),
@@ -292,6 +257,8 @@ impl BlackBoxFunc {
             "bigint_to_le_bytes" => Some(BlackBoxFunc::BigIntToLeBytes),
             "poseidon2_permutation" => Some(BlackBoxFunc::Poseidon2Permutation),
             "sha256_compression" => Some(BlackBoxFunc::Sha256Compression),
+            "pedersen_commitment" => Some(BlackBoxFunc::PedersenCommitment),
+            "pedersen_hash" => Some(BlackBoxFunc::PedersenHash),
             _ => None,
         }
     }
diff --git a/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs b/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
index 362e9ba5936..b8be81fcdef 100644
--- a/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
+++ b/acvm-repo/acir/src/circuit/opcodes/black_box_function_call.rs
@@ -54,11 +54,13 @@ pub enum BlackBoxFuncCall {
         message: Vec<FunctionInput>,
         output: Witness,
     },
+    /// Will be deprecated
     PedersenCommitment {
         inputs: Vec<FunctionInput>,
         domain_separator: u32,
         outputs: (Witness, Witness),
     },
+    /// Will be deprecated
     PedersenHash {
         inputs: Vec<FunctionInput>,
         domain_separator: u32,
@@ -189,8 +191,6 @@ impl BlackBoxFuncCall {
             BlackBoxFuncCall::Blake2s { .. } => BlackBoxFunc::Blake2s,
             BlackBoxFuncCall::Blake3 { .. } => BlackBoxFunc::Blake3,
             BlackBoxFuncCall::SchnorrVerify { .. } => BlackBoxFunc::SchnorrVerify,
-            BlackBoxFuncCall::PedersenCommitment { .. } => BlackBoxFunc::PedersenCommitment,
-            BlackBoxFuncCall::PedersenHash { .. } => BlackBoxFunc::PedersenHash,
             BlackBoxFuncCall::EcdsaSecp256k1 { .. } => BlackBoxFunc::EcdsaSecp256k1,
             BlackBoxFuncCall::EcdsaSecp256r1 { .. } => BlackBoxFunc::EcdsaSecp256r1,
             BlackBoxFuncCall::MultiScalarMul { .. } => BlackBoxFunc::MultiScalarMul,
@@ -206,6 +206,8 @@ impl BlackBoxFuncCall {
             BlackBoxFuncCall::BigIntToLeBytes { .. } => BlackBoxFunc::BigIntToLeBytes,
             BlackBoxFuncCall::Poseidon2Permutation { .. } => BlackBoxFunc::Poseidon2Permutation,
             BlackBoxFuncCall::Sha256Compression { .. } => BlackBoxFunc::Sha256Compression,
+            BlackBoxFuncCall::PedersenCommitment { .. } => BlackBoxFunc::PedersenCommitment,
+            BlackBoxFuncCall::PedersenHash { .. } => BlackBoxFunc::PedersenHash,
         }
     }
 
@@ -219,9 +221,9 @@ impl BlackBoxFuncCall {
             | BlackBoxFuncCall::SHA256 { inputs, .. }
             | BlackBoxFuncCall::Blake2s { inputs, .. }
             | BlackBoxFuncCall::Blake3 { inputs, .. }
+            | BlackBoxFuncCall::BigIntFromLeBytes { inputs, .. }
             | BlackBoxFuncCall::PedersenCommitment { inputs, .. }
             | BlackBoxFuncCall::PedersenHash { inputs, .. }
-            | BlackBoxFuncCall::BigIntFromLeBytes { inputs, .. }
             | BlackBoxFuncCall::Poseidon2Permutation { inputs, .. } => inputs.to_vec(),
 
             BlackBoxFuncCall::Keccakf1600 { inputs, .. } => inputs.to_vec(),
@@ -421,6 +423,14 @@ fn get_outputs_string(outputs: &[Witness]) -> String {
 
 impl std::fmt::Display for BlackBoxFuncCall {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BlackBoxFuncCall::PedersenCommitment { .. } => {
+                return write!(f, "BLACKBOX::Deprecated")
+            }
+            BlackBoxFuncCall::PedersenHash { .. } => return write!(f, "BLACKBOX::Deprecated"),
+            _ => (),
+        }
+
         let uppercase_name = self.name().to_uppercase();
         write!(f, "BLACKBOX::{uppercase_name} ")?;
         // INPUTS
@@ -440,13 +450,7 @@ impl std::fmt::Display for BlackBoxFuncCall {
 
         write!(f, "]")?;
 
-        // SPECIFIC PARAMETERS
-        match self {
-            BlackBoxFuncCall::PedersenCommitment { domain_separator, .. } => {
-                write!(f, " domain_separator: {domain_separator}")
-            }
-            _ => write!(f, ""),
-        }
+        write!(f, "")
     }
 }
 
diff --git a/acvm-repo/acir/tests/test_program_serialization.rs b/acvm-repo/acir/tests/test_program_serialization.rs
index dfcb1a8bb86..84a9aa719f2 100644
--- a/acvm-repo/acir/tests/test_program_serialization.rs
+++ b/acvm-repo/acir/tests/test_program_serialization.rs
@@ -100,33 +100,6 @@ fn multi_scalar_mul_circuit() {
     assert_eq!(bytes, expected_serialization)
 }
 
-#[test]
-fn pedersen_circuit() {
-    let pedersen = Opcode::BlackBoxFuncCall(BlackBoxFuncCall::PedersenCommitment {
-        inputs: vec![FunctionInput { witness: Witness(1), num_bits: FieldElement::max_num_bits() }],
-        outputs: (Witness(2), Witness(3)),
-        domain_separator: 0,
-    });
-
-    let circuit: Circuit<FieldElement> = Circuit {
-        current_witness_index: 4,
-        opcodes: vec![pedersen],
-        private_parameters: BTreeSet::from([Witness(1)]),
-        return_values: PublicInputs(BTreeSet::from_iter(vec![Witness(2), Witness(3)])),
-        ..Circuit::default()
-    };
-    let program = Program { functions: vec![circuit], unconstrained_functions: vec![] };
-
-    let bytes = Program::serialize_program(&program);
-
-    let expected_serialization: Vec<u8> = vec![
-        31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 74, 73, 10, 0, 0, 4, 180, 29, 252, 255, 193, 66, 40,
-        76, 77, 179, 34, 20, 36, 136, 237, 83, 245, 101, 107, 79, 65, 94, 253, 214, 217, 255, 239,
-        192, 1, 43, 124, 181, 238, 113, 0, 0, 0,
-    ];
-    assert_eq!(bytes, expected_serialization)
-}
-
 #[test]
 fn schnorr_verify_circuit() {
     let public_key_x =
diff --git a/acvm-repo/acir_field/Cargo.toml b/acvm-repo/acir_field/Cargo.toml
index 801935c90f9..303d7b6471f 100644
--- a/acvm-repo/acir_field/Cargo.toml
+++ b/acvm-repo/acir_field/Cargo.toml
@@ -2,7 +2,7 @@
 name = "acir_field"
 description = "The field implementation being used by ACIR."
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/acvm/Cargo.toml b/acvm-repo/acvm/Cargo.toml
index 59305ec49f0..892575902a4 100644
--- a/acvm-repo/acvm/Cargo.toml
+++ b/acvm-repo/acvm/Cargo.toml
@@ -2,7 +2,7 @@
 name = "acvm"
 description = "The virtual machine that processes ACIR given a backend/proof system."
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/acvm/src/compiler/transformers/csat.rs b/acvm-repo/acvm/src/compiler/transformers/csat.rs
index f2a3cc2c84e..19cc18ca7f3 100644
--- a/acvm-repo/acvm/src/compiler/transformers/csat.rs
+++ b/acvm-repo/acvm/src/compiler/transformers/csat.rs
@@ -432,7 +432,7 @@ fn fits_in_one_identity<F: AcirField>(expr: &Expression<F>, width: usize) -> boo
         return true;
     }
 
-    // We now know that we have a single mul term. We also know that the mul term must match up with two other terms
+    // We now know that we have a single mul term. We also know that the mul term must match up with at least one of the other terms
     // A polynomial whose mul terms are non zero which do not match up with two terms in the fan-in cannot fit into one opcode
     // An example of this is: Axy + Bx + Cy + ...
     // Notice how the bivariate monomial xy has two univariate monomials with their respective coefficients
@@ -461,7 +461,25 @@ fn fits_in_one_identity<F: AcirField>(expr: &Expression<F>, width: usize) -> boo
         }
     }
 
-    found_x & found_y
+    // If the multiplication is a squaring then we must assign the two witnesses to separate wires and so we
+    // can never get a zero contribution to the width.
+    let multiplication_is_squaring = mul_term.1 == mul_term.2;
+
+    let mul_term_width_contribution = if !multiplication_is_squaring && (found_x & found_y) {
+        // Both witnesses involved in the multiplication exist elsewhere in the expression.
+        // They both do not contribute to the width of the expression as this would be double-counting
+        // due to their appearance in the linear terms.
+        0
+    } else if found_x || found_y {
+        // One of the witnesses involved in the multiplication exists elsewhere in the expression.
+        // The multiplication then only contributes 1 new witness to the width.
+        1
+    } else {
+        // Worst case scenario, the multiplication is using completely unique witnesses so has a contribution of 2.
+        2
+    };
+
+    mul_term_width_contribution + expr.linear_combinations.len() <= width
 }
 
 #[cfg(test)]
@@ -573,4 +591,20 @@ mod tests {
         let contains_b = got_optimized_opcode_a.linear_combinations.iter().any(|(_, w)| *w == b);
         assert!(contains_b);
     }
+
+    #[test]
+    fn recognize_expr_with_single_shared_witness_which_fits_in_single_identity() {
+        // Regression test for an expression which Zac found which should have been preserved but
+        // was being split into two expressions.
+        let expr = Expression {
+            mul_terms: vec![(-FieldElement::from(555u128), Witness(8), Witness(10))],
+            linear_combinations: vec![
+                (FieldElement::one(), Witness(10)),
+                (FieldElement::one(), Witness(11)),
+                (-FieldElement::one(), Witness(13)),
+            ],
+            q_c: FieldElement::zero(),
+        };
+        assert!(fits_in_one_identity(&expr, 4));
+    }
 }
diff --git a/acvm-repo/acvm/src/pwg/blackbox/mod.rs b/acvm-repo/acvm/src/pwg/blackbox/mod.rs
index 8bda9221d8a..0c65759ebcd 100644
--- a/acvm-repo/acvm/src/pwg/blackbox/mod.rs
+++ b/acvm-repo/acvm/src/pwg/blackbox/mod.rs
@@ -7,7 +7,7 @@ use acvm_blackbox_solver::{blake2s, blake3, keccak256, keccakf1600, sha256};
 
 use self::{
     aes128::solve_aes128_encryption_opcode, bigint::AcvmBigIntSolver,
-    hash::solve_poseidon2_permutation_opcode, pedersen::pedersen_hash,
+    hash::solve_poseidon2_permutation_opcode,
 };
 
 use super::{insert_value, OpcodeNotSolvable, OpcodeResolutionError};
@@ -27,7 +27,7 @@ use embedded_curve_ops::{embedded_curve_add, multi_scalar_mul};
 // Hash functions should eventually be exposed for external consumers.
 use hash::{solve_generic_256_hash_opcode, solve_sha_256_permutation_opcode};
 use logic::{and, xor};
-use pedersen::pedersen;
+use pedersen::{pedersen, pedersen_hash};
 pub(crate) use range::solve_range_opcode;
 use signature::{
     ecdsa::{secp256k1_prehashed, secp256r1_prehashed},
diff --git a/acvm-repo/acvm_js/Cargo.toml b/acvm-repo/acvm_js/Cargo.toml
index 63f64e97729..e457b6391ab 100644
--- a/acvm-repo/acvm_js/Cargo.toml
+++ b/acvm-repo/acvm_js/Cargo.toml
@@ -2,7 +2,7 @@
 name = "acvm_js"
 description = "Typescript wrapper around the ACVM allowing execution of ACIR code"
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/acvm_js/package.json b/acvm-repo/acvm_js/package.json
index 48c5b2a8644..6085bc0563e 100644
--- a/acvm-repo/acvm_js/package.json
+++ b/acvm-repo/acvm_js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@noir-lang/acvm_js",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "publishConfig": {
     "access": "public"
   },
diff --git a/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts b/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
index cfd5523b79f..aaa82f8f1e5 100644
--- a/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
+++ b/acvm-repo/acvm_js/test/browser/execute_circuit.test.ts
@@ -75,16 +75,6 @@ it('successfully processes complex brillig foreign call opcodes', async () => {
   expect(solved_witness).to.be.deep.eq(expectedWitnessMap);
 });
 
-it('successfully executes a Pedersen opcode', async function () {
-  const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/pedersen');
-
-  const solvedWitness: WitnessMap = await executeCircuit(bytecode, initialWitnessMap, () => {
-    throw Error('unexpected oracle');
-  });
-
-  expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
-});
-
 it('successfully executes a MultiScalarMul opcode', async () => {
   const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/multi_scalar_mul');
 
diff --git a/acvm-repo/acvm_js/test/node/execute_circuit.test.ts b/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
index 1e3517e8814..120ad0fa738 100644
--- a/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
+++ b/acvm-repo/acvm_js/test/node/execute_circuit.test.ts
@@ -76,17 +76,6 @@ it('successfully processes complex brillig foreign call opcodes', async () => {
   expect(solved_witness).to.be.deep.eq(expectedWitnessMap);
 });
 
-it('successfully executes a Pedersen opcode', async function () {
-  this.timeout(10000);
-  const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/pedersen');
-
-  const solvedWitness: WitnessMap = await executeCircuit(bytecode, initialWitnessMap, () => {
-    throw Error('unexpected oracle');
-  });
-
-  expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
-});
-
 it('successfully executes a MultiScalarMul opcode', async () => {
   const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/multi_scalar_mul');
 
@@ -117,25 +106,6 @@ it('successfully executes a MemoryOp opcode', async () => {
   expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
 });
 
-it('successfully executes 500 pedersen circuits', async function () {
-  this.timeout(100000);
-
-  // Pedersen opcodes used to have a large upfront cost due to generator calculation
-  // so we'd need to pass around the blackbox solver in JS to avoid redoing this work.
-  //
-  // This test now shows that we don't need to do this anymore without a performance regression.
-
-  const { bytecode, initialWitnessMap, expectedWitnessMap } = await import('../shared/pedersen');
-
-  for (let i = 0; i < 500; i++) {
-    const solvedWitness = await executeCircuit(bytecode, initialWitnessMap, () => {
-      throw Error('unexpected oracle');
-    });
-
-    expect(solvedWitness).to.be.deep.eq(expectedWitnessMap);
-  }
-});
-
 /**
  * Below are all the same tests as above but using `executeProgram`
  * TODO: also add a couple tests for executing multiple circuits
diff --git a/acvm-repo/acvm_js/test/shared/pedersen.ts b/acvm-repo/acvm_js/test/shared/pedersen.ts
deleted file mode 100644
index 6e3ec403d65..00000000000
--- a/acvm-repo/acvm_js/test/shared/pedersen.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// See `pedersen_circuit` integration test in `acir/tests/test_program_serialization.rs`.
-export const bytecode = Uint8Array.from([
-  31, 139, 8, 0, 0, 0, 0, 0, 0, 255, 93, 74, 73, 10, 0, 0, 4, 180, 29, 252, 255, 193, 66, 40, 76, 77, 179, 34, 20, 36,
-  136, 237, 83, 245, 101, 107, 79, 65, 94, 253, 214, 217, 255, 239, 192, 1, 43, 124, 181, 238, 113, 0, 0, 0,
-]);
-
-export const initialWitnessMap = new Map([[1, '0x0000000000000000000000000000000000000000000000000000000000000001']]);
-
-export const expectedWitnessMap = new Map([
-  [1, '0x0000000000000000000000000000000000000000000000000000000000000001'],
-  [2, '0x083e7911d835097629f0067531fc15cafd79a89beecb39903f69572c636f4a5a'],
-  [3, '0x1a7f5efaad7f315c25a918f30cc8d7333fccab7ad7c90f14de81bcc528f9935d'],
-]);
diff --git a/acvm-repo/blackbox_solver/Cargo.toml b/acvm-repo/blackbox_solver/Cargo.toml
index dd7f84e63e4..06bd3ceabef 100644
--- a/acvm-repo/blackbox_solver/Cargo.toml
+++ b/acvm-repo/blackbox_solver/Cargo.toml
@@ -2,7 +2,7 @@
 name = "acvm_blackbox_solver"
 description = "A solver for the blackbox functions found in ACIR and Brillig"
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/blackbox_solver/src/curve_specific_solver.rs b/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
index 0ee3a252840..f729a5033fb 100644
--- a/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
+++ b/acvm-repo/blackbox_solver/src/curve_specific_solver.rs
@@ -81,6 +81,7 @@ impl<F> BlackBoxFunctionSolver<F> for StubbedBlackBoxSolver {
     ) -> Result<F, BlackBoxResolutionError> {
         Err(Self::fail(BlackBoxFunc::PedersenHash))
     }
+
     fn multi_scalar_mul(
         &self,
         _points: &[F],
diff --git a/acvm-repo/bn254_blackbox_solver/Cargo.toml b/acvm-repo/bn254_blackbox_solver/Cargo.toml
index 37d40de71a9..cc2d15aaa86 100644
--- a/acvm-repo/bn254_blackbox_solver/Cargo.toml
+++ b/acvm-repo/bn254_blackbox_solver/Cargo.toml
@@ -2,7 +2,7 @@
 name = "bn254_blackbox_solver"
 description = "Solvers for black box functions which are specific for the bn254 curve"
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/bn254_blackbox_solver/benches/criterion.rs b/acvm-repo/bn254_blackbox_solver/benches/criterion.rs
index cbcb75a3291..e7917fa1adc 100644
--- a/acvm-repo/bn254_blackbox_solver/benches/criterion.rs
+++ b/acvm-repo/bn254_blackbox_solver/benches/criterion.rs
@@ -13,22 +13,6 @@ fn bench_poseidon2(c: &mut Criterion) {
     c.bench_function("poseidon2", |b| b.iter(|| poseidon2_permutation(black_box(&inputs), 4)));
 }
 
-fn bench_pedersen_commitment(c: &mut Criterion) {
-    let inputs = [FieldElement::one(); 2];
-
-    c.bench_function("pedersen_commitment", |b| {
-        b.iter(|| Bn254BlackBoxSolver.pedersen_commitment(black_box(&inputs), 0))
-    });
-}
-
-fn bench_pedersen_hash(c: &mut Criterion) {
-    let inputs = [FieldElement::one(); 2];
-
-    c.bench_function("pedersen_hash", |b| {
-        b.iter(|| Bn254BlackBoxSolver.pedersen_hash(black_box(&inputs), 0))
-    });
-}
-
 fn bench_schnorr_verify(c: &mut Criterion) {
     let pub_key_x = FieldElement::from_hex(
         "0x04b260954662e97f00cab9adb773a259097f7a274b83b113532bce27fa3fb96a",
@@ -62,7 +46,7 @@ fn bench_schnorr_verify(c: &mut Criterion) {
 criterion_group!(
     name = benches;
     config = Criterion::default().sample_size(40).measurement_time(Duration::from_secs(20)).with_profiler(PProfProfiler::new(100, Output::Flamegraph(None)));
-    targets = bench_poseidon2, bench_pedersen_commitment, bench_pedersen_hash, bench_schnorr_verify
+    targets = bench_poseidon2, bench_schnorr_verify
 );
 
 criterion_main!(benches);
diff --git a/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs b/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs
index f89d582d167..bb51426b33b 100644
--- a/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs
+++ b/acvm-repo/bn254_blackbox_solver/src/generator/generators.rs
@@ -38,7 +38,7 @@ fn default_generators() -> &'static [Affine<GrumpkinParameters>; NUM_DEFAULT_GEN
 /// index-addressable generators.
 ///
 /// [hash_to_curve]: super::hash_to_curve::hash_to_curve
-pub(crate) fn derive_generators(
+pub fn derive_generators(
     domain_separator_bytes: &[u8],
     num_generators: u32,
     starting_index: u32,
diff --git a/acvm-repo/bn254_blackbox_solver/src/lib.rs b/acvm-repo/bn254_blackbox_solver/src/lib.rs
index 08e0fb66a6d..6897116e90e 100644
--- a/acvm-repo/bn254_blackbox_solver/src/lib.rs
+++ b/acvm-repo/bn254_blackbox_solver/src/lib.rs
@@ -12,6 +12,7 @@ mod schnorr;
 
 use ark_ec::AffineRepr;
 pub use embedded_curve_ops::{embedded_curve_add, multi_scalar_mul};
+pub use generator::generators::derive_generators;
 pub use poseidon2::poseidon2_permutation;
 
 // Temporary hack, this ensure that we always use a bn254 field here
@@ -47,11 +48,13 @@ impl BlackBoxFunctionSolver<FieldElement> for Bn254BlackBoxSolver {
     ) -> Result<(FieldElement, FieldElement), BlackBoxResolutionError> {
         let inputs: Vec<grumpkin::Fq> = inputs.iter().map(|input| input.into_repr()).collect();
         let result = pedersen::commitment::commit_native_with_index(&inputs, domain_separator);
-        let res_x =
-            FieldElement::from_repr(*result.x().expect("should not commit to point at infinity"));
-        let res_y =
-            FieldElement::from_repr(*result.y().expect("should not commit to point at infinity"));
-        Ok((res_x, res_y))
+        let result = if let Some((x, y)) = result.xy() {
+            (FieldElement::from_repr(*x), FieldElement::from_repr(*y))
+        } else {
+            (FieldElement::from(0_u128), FieldElement::from(0_u128))
+        };
+
+        Ok(result)
     }
 
     fn pedersen_hash(
diff --git a/acvm-repo/brillig/Cargo.toml b/acvm-repo/brillig/Cargo.toml
index 245767dcecd..7c1965c8f3e 100644
--- a/acvm-repo/brillig/Cargo.toml
+++ b/acvm-repo/brillig/Cargo.toml
@@ -2,7 +2,7 @@
 name = "brillig"
 description = "Brillig is the bytecode ACIR uses for non-determinism."
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/brillig/src/black_box.rs b/acvm-repo/brillig/src/black_box.rs
index 3887092a8c2..60e4af11ea2 100644
--- a/acvm-repo/brillig/src/black_box.rs
+++ b/acvm-repo/brillig/src/black_box.rs
@@ -61,13 +61,13 @@ pub enum BlackBoxOp {
         signature: HeapVector,
         result: MemoryAddress,
     },
-    /// Calculates a Pedersen commitment to the inputs.
+    /// Will be deprecated
     PedersenCommitment {
         inputs: HeapVector,
         domain_separator: MemoryAddress,
         output: HeapArray,
     },
-    /// Calculates a Pedersen hash to the inputs.
+    /// Will be deprecated
     PedersenHash {
         inputs: HeapVector,
         domain_separator: MemoryAddress,
diff --git a/acvm-repo/brillig_vm/Cargo.toml b/acvm-repo/brillig_vm/Cargo.toml
index 4735514c9a7..d048d625083 100644
--- a/acvm-repo/brillig_vm/Cargo.toml
+++ b/acvm-repo/brillig_vm/Cargo.toml
@@ -2,7 +2,7 @@
 name = "brillig_vm"
 description = "The virtual machine that processes Brillig bytecode, used to introduce non-determinism to the ACVM"
 # x-release-please-start-version
-version = "0.46.0"
+version = "0.47.0"
 # x-release-please-end
 authors.workspace = true
 edition.workspace = true
diff --git a/acvm-repo/brillig_vm/src/black_box.rs b/acvm-repo/brillig_vm/src/black_box.rs
index 2053f4e7c86..36d045efabf 100644
--- a/acvm-repo/brillig_vm/src/black_box.rs
+++ b/acvm-repo/brillig_vm/src/black_box.rs
@@ -241,7 +241,7 @@ pub(crate) fn evaluate_black_box<F: AcirField, Solver: BlackBoxFunctionSolver<F>
                 memory.read(*domain_separator).try_into().map_err(|_| {
                     BlackBoxResolutionError::Failed(
                         BlackBoxFunc::PedersenCommitment,
-                        "Invalid signature length".to_string(),
+                        "Invalid separator length".to_string(),
                     )
                 })?;
             let (x, y) = solver.pedersen_commitment(&inputs, domain_separator)?;
@@ -260,7 +260,7 @@ pub(crate) fn evaluate_black_box<F: AcirField, Solver: BlackBoxFunctionSolver<F>
                 memory.read(*domain_separator).try_into().map_err(|_| {
                     BlackBoxResolutionError::Failed(
                         BlackBoxFunc::PedersenCommitment,
-                        "Invalid signature length".to_string(),
+                        "Invalid separator length".to_string(),
                     )
                 })?;
             let hash = solver.pedersen_hash(&inputs, domain_separator)?;
@@ -392,8 +392,6 @@ fn black_box_function_from_op(op: &BlackBoxOp) -> BlackBoxFunc {
         BlackBoxOp::EcdsaSecp256k1 { .. } => BlackBoxFunc::EcdsaSecp256k1,
         BlackBoxOp::EcdsaSecp256r1 { .. } => BlackBoxFunc::EcdsaSecp256r1,
         BlackBoxOp::SchnorrVerify { .. } => BlackBoxFunc::SchnorrVerify,
-        BlackBoxOp::PedersenCommitment { .. } => BlackBoxFunc::PedersenCommitment,
-        BlackBoxOp::PedersenHash { .. } => BlackBoxFunc::PedersenHash,
         BlackBoxOp::MultiScalarMul { .. } => BlackBoxFunc::MultiScalarMul,
         BlackBoxOp::EmbeddedCurveAdd { .. } => BlackBoxFunc::EmbeddedCurveAdd,
         BlackBoxOp::BigIntAdd { .. } => BlackBoxFunc::BigIntAdd,
@@ -405,6 +403,8 @@ fn black_box_function_from_op(op: &BlackBoxOp) -> BlackBoxFunc {
         BlackBoxOp::Poseidon2Permutation { .. } => BlackBoxFunc::Poseidon2Permutation,
         BlackBoxOp::Sha256Compression { .. } => BlackBoxFunc::Sha256Compression,
         BlackBoxOp::ToRadix { .. } => unreachable!("ToRadix is not an ACIR BlackBoxFunc"),
+        BlackBoxOp::PedersenCommitment { .. } => BlackBoxFunc::PedersenCommitment,
+        BlackBoxOp::PedersenHash { .. } => BlackBoxFunc::PedersenHash,
     }
 }
 
diff --git a/acvm-repo/brillig_vm/src/lib.rs b/acvm-repo/brillig_vm/src/lib.rs
index da9a34f1044..78e82980907 100644
--- a/acvm-repo/brillig_vm/src/lib.rs
+++ b/acvm-repo/brillig_vm/src/lib.rs
@@ -484,29 +484,19 @@ impl<'a, F: AcirField, B: BlackBoxFunctionSolver<F>> VM<'a, F, B> {
             match (destination, value_type) {
                 (ValueOrArray::MemoryAddress(value_index), HeapValueType::Simple(bit_size)) => {
                     match output {
-                        ForeignCallParam::Single(value) => {
-                            self.write_value_to_memory(*value_index, value, *bit_size)?;
-                        }
-                        _ => return Err(format!(
-                            "Function result size does not match brillig bytecode. Expected 1 result but got {output:?}")
-                        ),
-                    }
-                }
-                (
-                    ValueOrArray::HeapArray(HeapArray { pointer: pointer_index, size }),
-                    HeapValueType::Array { value_types, size: type_size },
-                ) if size == type_size => {
-                    if HeapValueType::all_simple(value_types) {
-                         match output {
-                            ForeignCallParam::Array(values) => {
-                                if values.len() != *size {
-                                    return Err("Foreign call result array doesn't match expected size".to_string());
-                                }
+                        ForeignCallParam::Array(values) => {
+                            if values.len() != *size {
+                                // foreign call returning flattened values into a nested type, so the sizes do not match
+                               let destination = self.memory.read_ref(*pointer_index);
+                               let return_type = value_type;
+                               let mut flatten_values_idx = 0; //index of values read from flatten_values
+                               self.write_slice_of_values_to_memory(destination, &output.fields(), &mut flatten_values_idx, return_type)?;
+                            } else {
                                 self.write_values_to_memory_slice(*pointer_index, values, value_types)?;
                             }
-                            _ => {
-                                return Err("Function result size does not match brillig bytecode size".to_string());
-                            }
+                        }
+                        _ => {
+                            return Err("Function result size does not match brillig bytecode size".to_string());
                         }
                     } else {
                         unimplemented!("deflattening heap arrays from foreign calls");
diff --git a/aztec_macros/src/transforms/compute_note_hash_and_optionally_a_nullifier.rs b/aztec_macros/src/transforms/compute_note_hash_and_optionally_a_nullifier.rs
index 30c0f63a2d4..40fde39a06f 100644
--- a/aztec_macros/src/transforms/compute_note_hash_and_optionally_a_nullifier.rs
+++ b/aztec_macros/src/transforms/compute_note_hash_and_optionally_a_nullifier.rs
@@ -176,7 +176,7 @@ fn generate_compute_note_hash_and_optionally_a_nullifier_source(
         format!(
             "
         unconstrained fn compute_note_hash_and_optionally_a_nullifier(
-            contract_address: dep::aztec::protocol_types::address::AztecAddress,
+            contract_address: aztec::protocol_types::address::AztecAddress,
             nonce: Field,
             storage_slot: Field,
             note_type_id: Field,
@@ -194,7 +194,7 @@ fn generate_compute_note_hash_and_optionally_a_nullifier_source(
 
         let if_statements: Vec<String> = note_types.iter().map(|note_type| format!(
             "if (note_type_id == {0}::get_note_type_id()) {{
-                dep::aztec::note::utils::compute_note_hash_and_optionally_a_nullifier({0}::deserialize_content, note_header, compute_nullifier, serialized_note)
+                aztec::note::utils::compute_note_hash_and_optionally_a_nullifier({0}::deserialize_content, note_header, compute_nullifier, serialized_note)
             }}"
         , note_type)).collect();
 
@@ -208,14 +208,14 @@ fn generate_compute_note_hash_and_optionally_a_nullifier_source(
         format!(
             "
             unconstrained fn compute_note_hash_and_optionally_a_nullifier(
-                contract_address: dep::aztec::protocol_types::address::AztecAddress,
+                contract_address: aztec::protocol_types::address::AztecAddress,
                 nonce: Field,
                 storage_slot: Field,
                 note_type_id: Field,
                 compute_nullifier: bool,
                 serialized_note: [Field; {}],
             ) -> pub [Field; 4] {{
-                let note_header = dep::aztec::prelude::NoteHeader::new(contract_address, nonce, storage_slot);
+                let note_header = aztec::prelude::NoteHeader::new(contract_address, nonce, storage_slot);
 
                 {}
             }}",
diff --git a/aztec_macros/src/transforms/contract_interface.rs b/aztec_macros/src/transforms/contract_interface.rs
index 8b763dfcc57..f22cfaca075 100644
--- a/aztec_macros/src/transforms/contract_interface.rs
+++ b/aztec_macros/src/transforms/contract_interface.rs
@@ -30,8 +30,8 @@ use crate::utils::{
 //   for i in 0..third_arg.len() {
 //     args_acc = args_acc.append(third_arg[i].serialize().as_slice());
 //   }
-//   let args_hash = dep::aztec::hash::hash_args(args_acc);
-//   assert(args_hash == dep::aztec::oracle::arguments::pack_arguments(args_acc));
+//   let args_hash = aztec::hash::hash_args(args_acc);
+//   assert(args_hash == aztec::oracle::arguments::pack_arguments(args_acc));
 //   PublicCallInterface {
 //     target_contract: self.target_contract,
 //     selector: FunctionSelector::from_signature("SELECTOR_PLACEHOLDER"),
@@ -56,7 +56,10 @@ pub fn stub_function(aztec_visibility: &str, func: &NoirFunction, is_static_call
         .join(", ");
     let fn_return_type: noirc_frontend::ast::UnresolvedType = func.return_type();
 
-    let fn_selector = format!("dep::aztec::protocol_types::abis::function_selector::FunctionSelector::from_signature(\"{}\")", SELECTOR_PLACEHOLDER);
+    let fn_selector = format!(
+        "aztec::protocol_types::abis::function_selector::FunctionSelector::from_signature(\"{}\")",
+        SELECTOR_PLACEHOLDER
+    );
 
     let parameters = func.parameters();
     let is_void = if matches!(fn_return_type.typ, UnresolvedTypeData::Unit) { "Void" } else { "" };
@@ -134,8 +137,8 @@ pub fn stub_function(aztec_visibility: &str, func: &NoirFunction, is_static_call
             format!(
                 "let mut args_acc: [Field] = &[];
                 {}
-                let args_hash = dep::aztec::hash::hash_args(args_acc);
-                assert(args_hash == dep::aztec::oracle::arguments::pack_arguments(args_acc));",
+                let args_hash = aztec::hash::hash_args(args_acc);
+                assert(args_hash == aztec::oracle::arguments::pack_arguments(args_acc));",
                 call_args
             )
         } else {
@@ -231,14 +234,14 @@ pub fn generate_contract_interface(
     let contract_interface = format!(
         "
         struct {0} {{
-            target_contract: dep::aztec::protocol_types::address::AztecAddress
+            target_contract: aztec::protocol_types::address::AztecAddress
         }}
 
         impl {0} {{
             {1}
 
             pub fn at(
-                target_contract: dep::aztec::protocol_types::address::AztecAddress
+                target_contract: aztec::protocol_types::address::AztecAddress
             ) -> Self {{
                 Self {{ target_contract }}
             }}
@@ -252,7 +255,7 @@ pub fn generate_contract_interface(
 
         #[contract_library_method]
         pub fn at(
-            target_contract: dep::aztec::protocol_types::address::AztecAddress
+            target_contract: aztec::protocol_types::address::AztecAddress
         ) -> {0} {{
             {0} {{ target_contract }}
         }}
diff --git a/aztec_macros/src/transforms/note_interface.rs b/aztec_macros/src/transforms/note_interface.rs
index 3ace22a89c3..b6d837d9384 100644
--- a/aztec_macros/src/transforms/note_interface.rs
+++ b/aztec_macros/src/transforms/note_interface.rs
@@ -72,6 +72,7 @@ pub fn generate_note_interface_impl(module: &mut SortedModule) -> Result<(), Azt
                 type_span: note_struct.name.span(),
                 generics: vec![],
                 methods: vec![],
+                where_clause: vec![],
             };
             module.impls.push(default_impl.clone());
             module.impls.last_mut().unwrap()
@@ -271,7 +272,7 @@ fn generate_note_get_header(
 ) -> Result<NoirFunction, AztecMacroError> {
     let function_source = format!(
         "
-        fn get_header(note: {}) -> dep::aztec::note::note_header::NoteHeader {{
+        fn get_header(note: {}) -> aztec::note::note_header::NoteHeader {{
             note.{}
         }}
     ",
@@ -302,7 +303,7 @@ fn generate_note_set_header(
 ) -> Result<NoirFunction, AztecMacroError> {
     let function_source = format!(
         "
-        fn set_header(self: &mut {}, header: dep::aztec::note::note_header::NoteHeader) {{
+        fn set_header(self: &mut {}, header: aztec::note::note_header::NoteHeader) {{
             self.{} = header;
         }}
     ",
@@ -492,7 +493,7 @@ fn generate_note_properties_fn(
 
 // Automatically generate the method to compute the note's content hash as:
 // fn compute_note_content_hash(self: NoteType) -> Field {
-//    dep::aztec::hash::pedersen_hash(self.serialize_content(), dep::aztec::protocol_types::constants::GENERATOR_INDEX__NOTE_CONTENT_HASH)
+//    aztec::hash::pedersen_hash(self.serialize_content(), aztec::protocol_types::constants::GENERATOR_INDEX__NOTE_CONTENT_HASH)
 // }
 //
 fn generate_compute_note_content_hash(
@@ -502,7 +503,7 @@ fn generate_compute_note_content_hash(
     let function_source = format!(
         "
         fn compute_note_content_hash(self: {}) -> Field {{
-            dep::aztec::hash::pedersen_hash(self.serialize_content(), dep::aztec::protocol_types::constants::GENERATOR_INDEX__NOTE_CONTENT_HASH)
+            aztec::hash::pedersen_hash(self.serialize_content(), aztec::protocol_types::constants::GENERATOR_INDEX__NOTE_CONTENT_HASH)
         }}
         ",
         note_type
@@ -561,10 +562,7 @@ fn generate_note_properties_struct_source(
         .iter()
         .filter_map(|(field_name, _)| {
             if field_name != note_header_field_name {
-                Some(format!(
-                    "{}: dep::aztec::note::note_getter_options::PropertySelector",
-                    field_name
-                ))
+                Some(format!("{}: aztec::note::note_getter_options::PropertySelector", field_name))
             } else {
                 None
             }
@@ -592,7 +590,7 @@ fn generate_note_properties_fn_source(
         .filter_map(|(index, (field_name, _))| {
             if field_name != note_header_field_name {
                 Some(format!(
-                    "{}: dep::aztec::note::note_getter_options::PropertySelector {{ index: {}, offset: 0, length: 32 }}",
+                    "{}: aztec::note::note_getter_options::PropertySelector {{ index: {}, offset: 0, length: 32 }}",
                     field_name,
                     index
                 ))
@@ -669,10 +667,7 @@ fn generate_note_deserialize_content_source(
                     )
                 }
             } else {
-                format!(
-                    "{}: dep::aztec::note::note_header::NoteHeader::empty()",
-                    note_header_field_name
-                )
+                format!("{}: aztec::note::note_header::NoteHeader::empty()", note_header_field_name)
             }
         })
         .collect::<Vec<String>>()
diff --git a/aztec_macros/src/transforms/storage.rs b/aztec_macros/src/transforms/storage.rs
index bac87502c7d..c302dd87aa5 100644
--- a/aztec_macros/src/transforms/storage.rs
+++ b/aztec_macros/src/transforms/storage.rs
@@ -91,7 +91,7 @@ pub fn inject_context_in_storage(module: &mut SortedModule) -> Result<(), AztecM
             r#struct.attributes.iter().any(|attr| is_custom_attribute(attr, "aztec(storage)"))
         })
         .unwrap();
-    storage_struct.generics.push(ident("Context"));
+    storage_struct.generics.push(ident("Context").into());
     storage_struct
         .fields
         .iter_mut()
@@ -243,9 +243,11 @@ pub fn generate_storage_implementation(
             span: Some(Span::default()),
         },
         type_span: Span::default(),
-        generics: vec![generic_context_ident],
+        generics: vec![generic_context_ident.into()],
 
         methods: vec![(init, Span::default())],
+
+        where_clause: vec![],
     };
     module.impls.push(storage_impl);
 
diff --git a/aztec_macros/src/utils/ast_utils.rs b/aztec_macros/src/utils/ast_utils.rs
index 4706be2df25..a784aebfaf4 100644
--- a/aztec_macros/src/utils/ast_utils.rs
+++ b/aztec_macros/src/utils/ast_utils.rs
@@ -156,7 +156,7 @@ macro_rules! chained_dep {
     ( $base:expr $(, $tail:expr)* ) => {
         {
             let mut base_path = ident_path($base);
-            base_path.kind = PathKind::Dep;
+            base_path.kind = PathKind::Plain;
             $(
                 base_path.segments.push(ident($tail));
             )*
diff --git a/compiler/integration-tests/circuits/assert_lt/src/main.nr b/compiler/integration-tests/circuits/assert_lt/src/main.nr
index b8e255ca492..47e229d6c8b 100644
--- a/compiler/integration-tests/circuits/assert_lt/src/main.nr
+++ b/compiler/integration-tests/circuits/assert_lt/src/main.nr
@@ -1,10 +1,7 @@
-use dep::std;
-
 fn main(x: u64, y: pub u64) -> pub u64 {
     // We include a println statement to show that noirJS will ignore this and continue execution
     std::println("foo");
 
-
     assert(x < y);
     x + y
 }
diff --git a/compiler/integration-tests/circuits/recursion/src/main.nr b/compiler/integration-tests/circuits/recursion/src/main.nr
index 173207766fb..94cae14daa7 100644
--- a/compiler/integration-tests/circuits/recursion/src/main.nr
+++ b/compiler/integration-tests/circuits/recursion/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(
     verification_key: [Field; 114],
     proof: [Field; 93],
diff --git a/compiler/noirc_driver/src/abi_gen.rs b/compiler/noirc_driver/src/abi_gen.rs
index e959c61732a..9db4aae57b5 100644
--- a/compiler/noirc_driver/src/abi_gen.rs
+++ b/compiler/noirc_driver/src/abi_gen.rs
@@ -30,6 +30,91 @@ pub(super) fn gen_abi(
     Abi { parameters, return_type, error_types }
 }
 
+fn build_abi_error_type(context: &Context, typ: &Type) -> AbiErrorType {
+    match typ {
+        Type::FmtString(len, item_types) => {
+            let length = len.evaluate_to_u32().expect("Cannot evaluate fmt length");
+            let Type::Tuple(item_types) = item_types.as_ref() else {
+                unreachable!("FmtString items must be a tuple")
+            };
+            let item_types =
+                item_types.iter().map(|typ| abi_type_from_hir_type(context, typ)).collect();
+            AbiErrorType::FmtString { length, item_types }
+        }
+        _ => AbiErrorType::Custom(abi_type_from_hir_type(context, typ)),
+    }
+}
+
+pub(super) fn abi_type_from_hir_type(context: &Context, typ: &Type) -> AbiType {
+    match typ {
+        Type::FieldElement => AbiType::Field,
+        Type::Array(size, typ) => {
+            let length = size
+                .evaluate_to_u32()
+                .expect("Cannot have variable sized arrays as a parameter to main");
+            let typ = typ.as_ref();
+            AbiType::Array { length, typ: Box::new(abi_type_from_hir_type(context, typ)) }
+        }
+        Type::Integer(sign, bit_width) => {
+            let sign = match sign {
+                Signedness::Unsigned => Sign::Unsigned,
+                Signedness::Signed => Sign::Signed,
+            };
+
+            AbiType::Integer { sign, width: (*bit_width).into() }
+        }
+        Type::TypeVariable(binding, TypeVariableKind::IntegerOrField)
+        | Type::TypeVariable(binding, TypeVariableKind::Integer) => match &*binding.borrow() {
+            TypeBinding::Bound(typ) => abi_type_from_hir_type(context, typ),
+            TypeBinding::Unbound(_) => {
+                abi_type_from_hir_type(context, &Type::default_int_or_field_type())
+            }
+        },
+        Type::Bool => AbiType::Boolean,
+        Type::String(size) => {
+            let size = size
+                .evaluate_to_u32()
+                .expect("Cannot have variable sized strings as a parameter to main");
+            AbiType::String { length: size }
+        }
+
+        Type::Struct(def, args) => {
+            let struct_type = def.borrow();
+            let fields = struct_type.get_fields(args);
+            let fields =
+                vecmap(fields, |(name, typ)| (name, abi_type_from_hir_type(context, &typ)));
+            // For the ABI, we always want to resolve the struct paths from the root crate
+            let path = context.fully_qualified_struct_path(context.root_crate_id(), struct_type.id);
+            AbiType::Struct { fields, path }
+        }
+        Type::Alias(def, args) => abi_type_from_hir_type(context, &def.borrow().get_type(args)),
+        Type::Tuple(fields) => {
+            let fields = vecmap(fields, |typ| abi_type_from_hir_type(context, typ));
+            AbiType::Tuple { fields }
+        }
+        Type::Error
+        | Type::Unit
+        | Type::Constant(_)
+        | Type::TraitAsType(..)
+        | Type::TypeVariable(_, _)
+        | Type::NamedGeneric(..)
+        | Type::Forall(..)
+        | Type::Expr
+        | Type::Slice(_)
+        | Type::Function(_, _, _) => unreachable!("{typ} cannot be used in the abi"),
+        Type::FmtString(_, _) => unreachable!("format strings cannot be used in the abi"),
+        Type::MutableReference(_) => unreachable!("&mut cannot be used in the abi"),
+    }
+}
+
+fn to_abi_visibility(value: Visibility) -> AbiVisibility {
+    match value {
+        Visibility::Public => AbiVisibility::Public,
+        Visibility::Private => AbiVisibility::Private,
+        Visibility::DataBus => AbiVisibility::DataBus,
+    }
+}
+
 pub(super) fn compute_function_abi(
     context: &Context,
     func_id: &FuncId,
diff --git a/compiler/noirc_driver/src/lib.rs b/compiler/noirc_driver/src/lib.rs
index f8043a60f8c..b2bff41d701 100644
--- a/compiler/noirc_driver/src/lib.rs
+++ b/compiler/noirc_driver/src/lib.rs
@@ -99,9 +99,9 @@ pub struct CompileOptions {
     #[arg(long, hide = true)]
     pub force_brillig: bool,
 
-    /// Enable the experimental elaborator pass
+    /// Use the deprecated name resolution & type checking passes instead of the elaborator
     #[arg(long, hide = true)]
-    pub use_elaborator: bool,
+    pub use_legacy: bool,
 
     /// Outputs the paths to any modified artifacts
     #[arg(long, hide = true)]
@@ -257,13 +257,13 @@ pub fn check_crate(
     crate_id: CrateId,
     deny_warnings: bool,
     disable_macros: bool,
-    use_elaborator: bool,
+    use_legacy: bool,
 ) -> CompilationResult<()> {
     let macros: &[&dyn MacroProcessor] =
         if disable_macros { &[] } else { &[&aztec_macros::AztecMacro as &dyn MacroProcessor] };
 
     let mut errors = vec![];
-    let diagnostics = CrateDefMap::collect_defs(crate_id, context, use_elaborator, macros);
+    let diagnostics = CrateDefMap::collect_defs(crate_id, context, use_legacy, macros);
     errors.extend(diagnostics.into_iter().map(|(error, file_id)| {
         let diagnostic = CustomDiagnostic::from(&error);
         diagnostic.in_file(file_id)
@@ -300,7 +300,7 @@ pub fn compile_main(
         crate_id,
         options.deny_warnings,
         options.disable_macros,
-        options.use_elaborator,
+        options.use_legacy,
     )?;
 
     let main = context.get_main_function(&crate_id).ok_or_else(|| {
@@ -341,7 +341,7 @@ pub fn compile_contract(
         crate_id,
         options.deny_warnings,
         options.disable_macros,
-        options.use_elaborator,
+        options.use_legacy,
     )?;
 
     // TODO: We probably want to error if contracts is empty
@@ -544,14 +544,15 @@ pub fn compile_no_check(
         return Ok(cached_program.expect("cache must exist for hashes to match"));
     }
     let return_visibility = program.return_visibility;
+    let ssa_evaluator_options = noirc_evaluator::ssa::SsaEvaluatorOptions {
+        enable_ssa_logging: options.show_ssa,
+        enable_brillig_logging: options.show_brillig,
+        force_brillig_output: options.force_brillig,
+        print_codegen_timings: options.benchmark_codegen,
+    };
 
-    let SsaProgramArtifact { program, debug, warnings, names, error_types, .. } = create_program(
-        program,
-        options.show_ssa,
-        options.show_brillig,
-        options.force_brillig,
-        options.benchmark_codegen,
-    )?;
+    let SsaProgramArtifact { program, debug, warnings, names, error_types, .. } =
+        create_program(program, &ssa_evaluator_options)?;
 
     let abi = abi_gen::gen_abi(context, &main_function, return_visibility, error_types);
     let file_map = filter_relevant_files(&debug, &context.file_manager);
diff --git a/compiler/noirc_driver/tests/stdlib_warnings.rs b/compiler/noirc_driver/tests/stdlib_warnings.rs
index 327c8daad06..9b2aeaecd94 100644
--- a/compiler/noirc_driver/tests/stdlib_warnings.rs
+++ b/compiler/noirc_driver/tests/stdlib_warnings.rs
@@ -3,6 +3,7 @@ use std::path::Path;
 use noirc_driver::{file_manager_with_stdlib, prepare_crate, ErrorsAndWarnings};
 use noirc_frontend::hir::{def_map::parse_file, Context};
 
+#[ignore = "Temporarily ignoring the test until the stdlib is updated to use explicit numeric generics"]
 #[test]
 fn stdlib_does_not_produce_constant_warnings() -> Result<(), ErrorsAndWarnings> {
     // We use a minimal source file so that if stdlib produces warnings then we can expect these warnings to _always_
@@ -27,7 +28,7 @@ fn stdlib_does_not_produce_constant_warnings() -> Result<(), ErrorsAndWarnings>
     let ((), warnings) =
         noirc_driver::check_crate(&mut context, root_crate_id, false, false, false)?;
 
-    assert_eq!(warnings, Vec::new(), "stdlib is producing warnings");
+    assert_eq!(warnings, Vec::new(), "stdlib is producing {} warnings", warnings.len());
 
     Ok(())
 }
diff --git a/compiler/noirc_evaluator/Cargo.toml b/compiler/noirc_evaluator/Cargo.toml
index aa30eef9156..72a52b43741 100644
--- a/compiler/noirc_evaluator/Cargo.toml
+++ b/compiler/noirc_evaluator/Cargo.toml
@@ -12,6 +12,7 @@ license.workspace = true
 noirc_frontend.workspace = true
 noirc_errors.workspace = true
 acvm.workspace = true
+bn254_blackbox_solver.workspace = true
 fxhash.workspace = true
 iter-extended.workspace = true
 thiserror.workspace = true
diff --git a/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs b/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
index 1fa4f41b29c..2e1706592e2 100644
--- a/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
+++ b/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs
@@ -22,6 +22,7 @@ use acvm::{acir::AcirField, FieldElement};
 use fxhash::{FxHashMap as HashMap, FxHashSet as HashSet};
 use iter_extended::vecmap;
 use num_bigint::BigUint;
+use std::rc::Rc;
 
 use super::brillig_black_box::convert_black_box_call;
 use super::brillig_block_variables::BlockVariables;
@@ -1629,7 +1630,7 @@ impl<'block> BrilligBlock<'block> {
                     new_variable
                 }
             }
-            Value::Array { array, .. } => {
+            Value::Array { array, typ } => {
                 if let Some(variable) = self.variables.get_constant(value_id, dfg) {
                     variable
                 } else {
@@ -1664,23 +1665,7 @@ impl<'block> BrilligBlock<'block> {
 
                     // Write the items
 
-                    // Allocate a register for the iterator
-                    let iterator_register =
-                        self.brillig_context.make_usize_constant_instruction(0_usize.into());
-
-                    for element_id in array.iter() {
-                        let element_variable = self.convert_ssa_value(*element_id, dfg);
-                        // Store the item in memory
-                        self.store_variable_in_array(pointer, iterator_register, element_variable);
-                        // Increment the iterator
-                        self.brillig_context.codegen_usize_op_in_place(
-                            iterator_register.address,
-                            BrilligBinaryOp::Add,
-                            1,
-                        );
-                    }
-
-                    self.brillig_context.deallocate_single_addr(iterator_register);
+                    self.initialize_constant_array(array, typ, dfg, pointer);
 
                     new_variable
                 }
@@ -1705,6 +1690,125 @@ impl<'block> BrilligBlock<'block> {
         }
     }
 
+    fn initialize_constant_array(
+        &mut self,
+        data: &im::Vector<ValueId>,
+        typ: &Type,
+        dfg: &DataFlowGraph,
+        pointer: MemoryAddress,
+    ) {
+        if data.is_empty() {
+            return;
+        }
+        let item_types = typ.clone().element_types();
+
+        // Find out if we are repeating the same item over and over
+        let first_item = data.iter().take(item_types.len()).copied().collect();
+        let mut is_repeating = true;
+
+        for item_index in (item_types.len()..data.len()).step_by(item_types.len()) {
+            let item: Vec<_> = (0..item_types.len()).map(|i| data[item_index + i]).collect();
+            if first_item != item {
+                is_repeating = false;
+                break;
+            }
+        }
+
+        // If all the items are single address, and all have the same initial value, we can initialize the array in a runtime loop.
+        // Since the cost in instructions for a runtime loop is in the order of magnitude of 10, we only do this if the item_count is bigger than that.
+        let item_count = data.len() / item_types.len();
+
+        if item_count > 10
+            && is_repeating
+            && item_types.iter().all(|typ| matches!(typ, Type::Numeric(_)))
+        {
+            self.initialize_constant_array_runtime(
+                item_types, first_item, item_count, pointer, dfg,
+            );
+        } else {
+            self.initialize_constant_array_comptime(data, dfg, pointer);
+        }
+    }
+
+    fn initialize_constant_array_runtime(
+        &mut self,
+        item_types: Rc<Vec<Type>>,
+        item_to_repeat: Vec<ValueId>,
+        item_count: usize,
+        pointer: MemoryAddress,
+        dfg: &DataFlowGraph,
+    ) {
+        let mut subitem_to_repeat_variables = Vec::with_capacity(item_types.len());
+        for subitem_id in item_to_repeat.into_iter() {
+            subitem_to_repeat_variables.push(self.convert_ssa_value(subitem_id, dfg));
+        }
+
+        let data_length_variable = self
+            .brillig_context
+            .make_usize_constant_instruction((item_count * item_types.len()).into());
+
+        // If this is an array with complex subitems, we need a custom step in the loop to write all the subitems while iterating.
+        if item_types.len() > 1 {
+            let step_variable =
+                self.brillig_context.make_usize_constant_instruction(item_types.len().into());
+
+            let subitem_pointer =
+                SingleAddrVariable::new_usize(self.brillig_context.allocate_register());
+
+            let initializer_fn = |ctx: &mut BrilligContext<_>, iterator: SingleAddrVariable| {
+                ctx.mov_instruction(subitem_pointer.address, iterator.address);
+                for subitem in subitem_to_repeat_variables.into_iter() {
+                    Self::store_variable_in_array_with_ctx(ctx, pointer, subitem_pointer, subitem);
+                    ctx.codegen_usize_op_in_place(subitem_pointer.address, BrilligBinaryOp::Add, 1);
+                }
+            };
+
+            self.brillig_context.codegen_loop_with_bound_and_step(
+                data_length_variable.address,
+                step_variable.address,
+                initializer_fn,
+            );
+
+            self.brillig_context.deallocate_single_addr(step_variable);
+            self.brillig_context.deallocate_single_addr(subitem_pointer);
+        } else {
+            let subitem = subitem_to_repeat_variables.into_iter().next().unwrap();
+
+            let initializer_fn = |ctx: &mut _, iterator_register| {
+                Self::store_variable_in_array_with_ctx(ctx, pointer, iterator_register, subitem);
+            };
+
+            self.brillig_context.codegen_loop(data_length_variable.address, initializer_fn);
+        }
+
+        self.brillig_context.deallocate_single_addr(data_length_variable);
+    }
+
+    fn initialize_constant_array_comptime(
+        &mut self,
+        data: &im::Vector<crate::ssa::ir::map::Id<Value>>,
+        dfg: &DataFlowGraph,
+        pointer: MemoryAddress,
+    ) {
+        // Allocate a register for the iterator
+        let iterator_register =
+            self.brillig_context.make_usize_constant_instruction(0_usize.into());
+
+        for element_id in data.iter() {
+            let element_variable = self.convert_ssa_value(*element_id, dfg);
+            // Store the item in memory
+            self.store_variable_in_array(pointer, iterator_register, element_variable);
+            // Increment the iterator
+            self.brillig_context.codegen_usize_op_in_place(
+                iterator_register.address,
+                BrilligBinaryOp::Add,
+                1,
+            );
+        }
+
+        self.brillig_context.deallocate_single_addr(iterator_register);
+    }
+
     /// Converts an SSA `ValueId` into a `MemoryAddress`. Initializes if necessary.
     fn convert_ssa_single_addr_value(
         &mut self,
diff --git a/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_control_flow.rs b/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_control_flow.rs
index fee3a450119..1dafa742457 100644
--- a/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_control_flow.rs
+++ b/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_control_flow.rs
@@ -34,12 +34,14 @@ impl BrilligContext {
         self.stop_instruction();
     }
 
-    /// This codegen will issue a loop that will iterate iteration_count times
+    /// This codegen will issue a loop do for (let iterator_register = 0; i < loop_bound; i += step)
     /// The body of the loop should be issued by the caller in the on_iteration closure.
-    pub(crate) fn codegen_loop<F>(&mut self, iteration_count: MemoryAddress, on_iteration: F)
-    where
-        F: FnOnce(&mut BrilligContext, SingleAddrVariable),
-    {
+    pub(crate) fn codegen_loop_with_bound_and_step(
+        &mut self,
+        loop_bound: MemoryAddress,
+        step: MemoryAddress,
+        on_iteration: impl FnOnce(&mut BrilligContext<F>, SingleAddrVariable),
+    ) {
         let iterator_register = self.make_usize_constant_instruction(0_u128.into());
 
         let (loop_section, loop_label) = self.reserve_next_section_label();
@@ -47,13 +49,13 @@ impl BrilligContext {
 
         // Loop body
 
-        // Check if iterator < iteration_count
+        // Check if iterator < loop_bound
         let iterator_less_than_iterations =
             SingleAddrVariable { address: self.allocate_register(), bit_size: 1 };
 
         self.memory_op_instruction(
             iterator_register.address,
-            iteration_count,
+            loop_bound,
             iterator_less_than_iterations.address,
             BrilligBinaryOp::LessThan,
         );
@@ -67,8 +69,13 @@ impl BrilligContext {
         // Call the on iteration function
         on_iteration(self, iterator_register);
 
-        // Increment the iterator register
-        self.codegen_usize_op_in_place(iterator_register.address, BrilligBinaryOp::Add, 1);
+        // Add step to the iterator register
+        self.memory_op_instruction(
+            iterator_register.address,
+            step,
+            iterator_register.address,
+            BrilligBinaryOp::Add,
+        );
 
         self.jump_instruction(loop_label);
 
@@ -80,6 +87,18 @@ impl BrilligContext {
         self.deallocate_single_addr(iterator_register);
     }
 
+    /// This codegen will issue a loop that will iterate iteration_count times
+    /// The body of the loop should be issued by the caller in the on_iteration closure.
+    pub(crate) fn codegen_loop(
+        &mut self,
+        iteration_count: MemoryAddress,
+        on_iteration: impl FnOnce(&mut BrilligContext<F>, SingleAddrVariable),
+    ) {
+        let step = self.make_usize_constant_instruction(1_u128.into());
+        self.codegen_loop_with_bound_and_step(iteration_count, step.address, on_iteration);
+        self.deallocate_single_addr(step);
+    }
+
     /// This codegen will issue an if-then branch that will check if the condition is true
     /// and if so, perform the instructions given in `f(self, true)` and otherwise perform the
     /// instructions given in `f(self, false)`. A boolean is passed instead of two separate
diff --git a/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs b/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
index def91f82bfd..13909924771 100644
--- a/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
+++ b/compiler/noirc_evaluator/src/brillig/brillig_ir/debug_show.rs
@@ -59,8 +59,8 @@ impl DebugToString for BrilligBinaryOp {
             BrilligBinaryOp::UnsignedDiv => "/".into(),
             BrilligBinaryOp::LessThan => "<".into(),
             BrilligBinaryOp::LessThanEquals => "<=".into(),
-            BrilligBinaryOp::And => "&&".into(),
-            BrilligBinaryOp::Or => "||".into(),
+            BrilligBinaryOp::And => "&".into(),
+            BrilligBinaryOp::Or => "|".into(),
             BrilligBinaryOp::Xor => "^".into(),
             BrilligBinaryOp::Shl => "<<".into(),
             BrilligBinaryOp::Shr => ">>".into(),
diff --git a/compiler/noirc_evaluator/src/ssa.rs b/compiler/noirc_evaluator/src/ssa.rs
index 80a63f223e7..37e0ca54a96 100644
--- a/compiler/noirc_evaluator/src/ssa.rs
+++ b/compiler/noirc_evaluator/src/ssa.rs
@@ -48,47 +48,51 @@ pub mod ssa_gen;
 /// and Brillig functions for unconstrained execution.
 pub(crate) fn optimize_into_acir(
     program: Program,
-    print_passes: bool,
-    print_brillig_trace: bool,
-    force_brillig_output: bool,
-    print_timings: bool,
+    options: &SsaEvaluatorOptions,
 ) -> Result<Artifacts, RuntimeError> {
     let ssa_gen_span = span!(Level::TRACE, "ssa_generation");
     let ssa_gen_span_guard = ssa_gen_span.enter();
-    let ssa = SsaBuilder::new(program, print_passes, force_brillig_output, print_timings)?
-        .run_pass(Ssa::defunctionalize, "After Defunctionalization:")
-        .run_pass(Ssa::remove_paired_rc, "After Removing Paired rc_inc & rc_decs:")
-        .run_pass(Ssa::separate_runtime, "After Runtime Separation:")
-        .run_pass(Ssa::resolve_is_unconstrained, "After Resolving IsUnconstrained:")
-        .run_pass(Ssa::inline_functions, "After Inlining:")
-        // Run mem2reg with the CFG separated into blocks
-        .run_pass(Ssa::mem2reg, "After Mem2Reg:")
-        .run_pass(Ssa::as_slice_optimization, "After `as_slice` optimization")
-        .try_run_pass(Ssa::evaluate_assert_constant, "After Assert Constant:")?
-        .try_run_pass(Ssa::unroll_loops_iteratively, "After Unrolling:")?
-        .run_pass(Ssa::simplify_cfg, "After Simplifying:")
-        .run_pass(Ssa::flatten_cfg, "After Flattening:")
-        .run_pass(Ssa::remove_bit_shifts, "After Removing Bit Shifts:")
-        // Run mem2reg once more with the flattened CFG to catch any remaining loads/stores
-        .run_pass(Ssa::mem2reg, "After Mem2Reg:")
-        // Run the inlining pass again to handle functions with `InlineType::NoPredicates`.
-        // Before flattening is run, we treat functions marked with the `InlineType::NoPredicates` as an entry point.
-        // This pass must come immediately following `mem2reg` as the succeeding passes
-        // may create an SSA which inlining fails to handle.
-        .run_pass(Ssa::inline_functions_with_no_predicates, "After Inlining:")
-        .run_pass(Ssa::remove_if_else, "After Remove IfElse:")
-        .run_pass(Ssa::fold_constants, "After Constant Folding:")
-        .run_pass(Ssa::remove_enable_side_effects, "After EnableSideEffects removal:")
-        .run_pass(Ssa::fold_constants_using_constraints, "After Constraint Folding:")
-        .run_pass(Ssa::dead_instruction_elimination, "After Dead Instruction Elimination:")
-        .run_pass(Ssa::array_set_optimization, "After Array Set Optimizations:")
-        .finish();
-
-    let brillig = time("SSA to Brillig", print_timings, || ssa.to_brillig(print_brillig_trace));
+    let ssa = SsaBuilder::new(
+        program,
+        options.enable_ssa_logging,
+        options.force_brillig_output,
+        options.print_codegen_timings,
+    )?
+    .run_pass(Ssa::defunctionalize, "After Defunctionalization:")
+    .run_pass(Ssa::remove_paired_rc, "After Removing Paired rc_inc & rc_decs:")
+    .run_pass(Ssa::separate_runtime, "After Runtime Separation:")
+    .run_pass(Ssa::resolve_is_unconstrained, "After Resolving IsUnconstrained:")
+    .run_pass(Ssa::inline_functions, "After Inlining:")
+    // Run mem2reg with the CFG separated into blocks
+    .run_pass(Ssa::mem2reg, "After Mem2Reg:")
+    .run_pass(Ssa::as_slice_optimization, "After `as_slice` optimization")
+    .try_run_pass(Ssa::evaluate_assert_constant, "After Assert Constant:")?
+    .try_run_pass(Ssa::unroll_loops_iteratively, "After Unrolling:")?
+    .run_pass(Ssa::simplify_cfg, "After Simplifying:")
+    .run_pass(Ssa::flatten_cfg, "After Flattening:")
+    .run_pass(Ssa::remove_bit_shifts, "After Removing Bit Shifts:")
+    // Run mem2reg once more with the flattened CFG to catch any remaining loads/stores
+    .run_pass(Ssa::mem2reg, "After Mem2Reg:")
+    // Run the inlining pass again to handle functions with `InlineType::NoPredicates`.
+    // Before flattening is run, we treat functions marked with the `InlineType::NoPredicates` as an entry point.
+    // This pass must come immediately following `mem2reg` as the succeeding passes
+    // may create an SSA which inlining fails to handle.
+    .run_pass(Ssa::inline_functions_with_no_predicates, "After Inlining:")
+    .run_pass(Ssa::remove_if_else, "After Remove IfElse:")
+    .run_pass(Ssa::fold_constants, "After Constant Folding:")
+    .run_pass(Ssa::remove_enable_side_effects, "After EnableSideEffects removal:")
+    .run_pass(Ssa::fold_constants_using_constraints, "After Constraint Folding:")
+    .run_pass(Ssa::dead_instruction_elimination, "After Dead Instruction Elimination:")
+    .run_pass(Ssa::array_set_optimization, "After Array Set Optimizations:")
+    .finish();
+
+    let brillig = time("SSA to Brillig", options.print_codegen_timings, || {
+        ssa.to_brillig(options.enable_brillig_logging)
+    });
 
     drop(ssa_gen_span_guard);
 
-    time("SSA to ACIR", print_timings, || ssa.into_acir(&brillig))
+    time("SSA to ACIR", options.print_codegen_timings, || ssa.into_acir(&brillig))
 }
 
 // Helper to time SSA passes
@@ -144,17 +148,26 @@ impl SsaProgramArtifact {
     }
 }
 
+pub struct SsaEvaluatorOptions {
+    /// Emit debug information for the intermediate SSA IR
+    pub enable_ssa_logging: bool,
+
+    pub enable_brillig_logging: bool,
+
+    /// Force Brillig output (for step debugging)
+    pub force_brillig_output: bool,
+
+    /// Pretty print benchmark times of each code generation pass
+    pub print_codegen_timings: bool,
+}
+
 /// Compiles the [`Program`] into [`ACIR``][acvm::acir::circuit::Program].
 ///
-/// The output ACIR is is backend-agnostic and so must go through a transformation pass before usage in proof generation.
-#[allow(clippy::type_complexity)]
+/// The output ACIR is backend-agnostic and so must go through a transformation pass before usage in proof generation.
 #[tracing::instrument(level = "trace", skip_all)]
 pub fn create_program(
     program: Program,
-    enable_ssa_logging: bool,
-    enable_brillig_logging: bool,
-    force_brillig_output: bool,
-    print_codegen_timings: bool,
+    options: &SsaEvaluatorOptions,
 ) -> Result<SsaProgramArtifact, RuntimeError> {
     let debug_variables = program.debug_variables.clone();
     let debug_types = program.debug_types.clone();
@@ -163,13 +176,7 @@ pub fn create_program(
     let func_sigs = program.function_signatures.clone();
 
     let recursive = program.recursive;
-    let (generated_acirs, generated_brillig, error_types) = optimize_into_acir(
-        program,
-        enable_ssa_logging,
-        enable_brillig_logging,
-        force_brillig_output,
-        print_codegen_timings,
-    )?;
+    let (generated_acirs, generated_brillig, error_types) = optimize_into_acir(program, options)?;
     assert_eq!(
         generated_acirs.len(),
         func_sigs.len(),
diff --git a/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs b/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
index ac7f2c09687..a3f3d0dbf61 100644
--- a/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
+++ b/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
@@ -1561,7 +1561,27 @@ impl AcirContext {
         brillig_function_index: u32,
         brillig_stdlib_func: Option<BrilligStdlibFunc>,
     ) -> Result<Vec<AcirValue>, RuntimeError> {
-        let brillig_inputs: Vec<BrilligInputs<FieldElement>> =
+        let predicate = self.var_to_expression(predicate)?;
+        if predicate.is_zero() {
+            // If the predicate has a constant value of zero, the brillig call will never be executed.
+            // We can then immediately zero out all of its outputs as this is the value which would be written
+            // if we waited until runtime to resolve this call.
+            let outputs_var = vecmap(outputs, |output| match output {
+                AcirType::NumericType(_) => {
+                    let var = self.add_constant(F::zero());
+                    AcirValue::Var(var, output.clone())
+                }
+                AcirType::Array(element_types, size) => {
+                    self.zeroed_array_output(&element_types, size)
+                }
+            });
+
+            return Ok(outputs_var);
+        }
+        // Remove "always true" predicates.
+        let predicate = if predicate == Expression::one() { None } else { Some(predicate) };
+
+        let brillig_inputs: Vec<BrilligInputs<F>> =
             try_vecmap(inputs, |i| -> Result<_, InternalError> {
                 match i {
                     AcirValue::Var(var, _) => {
@@ -1608,10 +1628,9 @@ impl AcirContext {
                 acir_value
             }
         });
-        let predicate = self.var_to_expression(predicate)?;
 
         self.acir_ir.brillig_call(
-            Some(predicate),
+            predicate,
             generated_brillig,
             brillig_inputs,
             brillig_outputs,
@@ -1682,6 +1701,27 @@ impl AcirContext {
         Ok(())
     }
 
+    /// Recursively create zeroed-out acir values for returned arrays. This is necessary because a brillig returned array can have nested arrays as elements.
+    fn zeroed_array_output(&mut self, element_types: &[AcirType], size: usize) -> AcirValue {
+        let mut array_values = im::Vector::new();
+        for _ in 0..size {
+            for element_type in element_types {
+                match element_type {
+                    AcirType::Array(nested_element_types, nested_size) => {
+                        let nested_acir_value =
+                            self.zeroed_array_output(nested_element_types, *nested_size);
+                        array_values.push_back(nested_acir_value);
+                    }
+                    AcirType::NumericType(_) => {
+                        let var = self.add_constant(F::zero());
+                        array_values.push_back(AcirValue::Var(var, element_type.clone()));
+                    }
+                }
+            }
+        }
+        AcirValue::Array(array_values)
+    }
+
     /// Recursively create acir values for returned arrays. This is necessary because a brillig returned array can have nested arrays as elements.
     /// A singular array of witnesses is collected for a top level array, by deflattening the assigned witnesses at each level.
     fn brillig_array_output(
diff --git a/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs b/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
index 9a09e7c06ee..e8e1cf4ac51 100644
--- a/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
+++ b/compiler/noirc_evaluator/src/ssa/acir_gen/acir_ir/generated_acir.rs
@@ -443,7 +443,7 @@ impl GeneratedAcir {
         let inputs = vec![BrilligInputs::Single(expr)];
         let outputs = vec![BrilligOutputs::Simple(inverted_witness)];
         self.brillig_call(
-            Some(Expression::one()),
+            None,
             &inverse_code,
             inputs,
             outputs,
@@ -717,6 +717,7 @@ fn black_box_expected_output_size(name: BlackBoxFunc) -> Option<usize> {
         BlackBoxFunc::Poseidon2Permutation => None,
 
         BlackBoxFunc::Sha256Compression => Some(8),
+
         // Pedersen commitment returns a point
         BlackBoxFunc::PedersenCommitment => Some(2),
 
diff --git a/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs b/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs
index 68ece87c7c7..a063a7ff268 100644
--- a/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs
+++ b/compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs
@@ -16,11 +16,12 @@ pub(crate) struct FunctionInserter<'f> {
     pub(crate) function: &'f mut Function,
 
     values: HashMap<ValueId, ValueId>,
+    const_arrays: HashMap<im::Vector<ValueId>, ValueId>,
 }
 
 impl<'f> FunctionInserter<'f> {
     pub(crate) fn new(function: &'f mut Function) -> FunctionInserter<'f> {
-        Self { function, values: HashMap::default() }
+        Self { function, values: HashMap::default(), const_arrays: HashMap::default() }
     }
 
     /// Resolves a ValueId to its new, updated value.
@@ -34,10 +35,17 @@ impl<'f> FunctionInserter<'f> {
                 super::value::Value::Array { array, typ } => {
                     let array = array.clone();
                     let typ = typ.clone();
-                    let new_array = array.iter().map(|id| self.resolve(*id)).collect();
-                    let new_id = self.function.dfg.make_array(new_array, typ);
-                    self.values.insert(value, new_id);
-                    new_id
+                    let new_array: im::Vector<ValueId> =
+                        array.iter().map(|id| self.resolve(*id)).collect();
+                    if self.const_arrays.get(&new_array) == Some(&value) {
+                        value
+                    } else {
+                        let new_array_clone = new_array.clone();
+                        let new_id = self.function.dfg.make_array(new_array, typ);
+                        self.values.insert(value, new_id);
+                        self.const_arrays.insert(new_array_clone, new_id);
+                        new_id
+                    }
                 }
                 _ => value,
             },
diff --git a/compiler/noirc_evaluator/src/ssa/ir/instruction.rs b/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
index e21deb9ef79..8f881b86e47 100644
--- a/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
+++ b/compiler/noirc_evaluator/src/ssa/ir/instruction.rs
@@ -67,6 +67,7 @@ pub(crate) enum Intrinsic {
     AsField,
     AsWitness,
     IsUnconstrained,
+    DerivePedersenGenerators,
 }
 
 impl std::fmt::Display for Intrinsic {
@@ -92,6 +93,7 @@ impl std::fmt::Display for Intrinsic {
             Intrinsic::AsField => write!(f, "as_field"),
             Intrinsic::AsWitness => write!(f, "as_witness"),
             Intrinsic::IsUnconstrained => write!(f, "is_unconstrained"),
+            Intrinsic::DerivePedersenGenerators => write!(f, "derive_pedersen_generators"),
         }
     }
 }
@@ -120,7 +122,8 @@ impl Intrinsic {
             | Intrinsic::StrAsBytes
             | Intrinsic::FromField
             | Intrinsic::AsField
-            | Intrinsic::IsUnconstrained => false,
+            | Intrinsic::IsUnconstrained
+            | Intrinsic::DerivePedersenGenerators => false,
 
             // Some black box functions have side-effects
             Intrinsic::BlackBox(func) => matches!(
@@ -155,6 +158,7 @@ impl Intrinsic {
             "as_field" => Some(Intrinsic::AsField),
             "as_witness" => Some(Intrinsic::AsWitness),
             "is_unconstrained" => Some(Intrinsic::IsUnconstrained),
+            "derive_pedersen_generators" => Some(Intrinsic::DerivePedersenGenerators),
             other => BlackBoxFunc::lookup(other).map(Intrinsic::BlackBox),
         }
     }
diff --git a/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs b/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
index 74e5653c7ba..e4635c0f974 100644
--- a/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
+++ b/compiler/noirc_evaluator/src/ssa/ir/instruction/call.rs
@@ -2,6 +2,7 @@ use fxhash::FxHashMap as HashMap;
 use std::{collections::VecDeque, rc::Rc};
 
 use acvm::{acir::AcirField, acir::BlackBoxFunc, BlackBoxResolutionError, FieldElement};
+use bn254_blackbox_solver::derive_generators;
 use iter_extended::vecmap;
 use num_bigint::BigUint;
 
@@ -295,6 +296,13 @@ pub(super) fn simplify_call(
         }
         Intrinsic::AsWitness => SimplifyResult::None,
         Intrinsic::IsUnconstrained => SimplifyResult::None,
+        Intrinsic::DerivePedersenGenerators => {
+            if let Some(Type::Array(_, len)) = ctrl_typevars.unwrap().first() {
+                simplify_derive_generators(dfg, arguments, *len as u32)
+            } else {
+                unreachable!("Derive Pedersen Generators must return an array");
+            }
+        }
     }
 }
 
@@ -438,7 +446,9 @@ fn simplify_black_box_func(
         BlackBoxFunc::SHA256 => simplify_hash(dfg, arguments, acvm::blackbox_solver::sha256),
         BlackBoxFunc::Blake2s => simplify_hash(dfg, arguments, acvm::blackbox_solver::blake2s),
         BlackBoxFunc::Blake3 => simplify_hash(dfg, arguments, acvm::blackbox_solver::blake3),
-        BlackBoxFunc::Keccakf1600 => SimplifyResult::None, //TODO(Guillaume)
+        BlackBoxFunc::PedersenCommitment
+        | BlackBoxFunc::PedersenHash
+        | BlackBoxFunc::Keccakf1600 => SimplifyResult::None, //TODO(Guillaume)
         BlackBoxFunc::Keccak256 => {
             match (dfg.get_array_constant(arguments[0]), dfg.get_numeric_constant(arguments[1])) {
                 (Some((input, _)), Some(num_bytes)) if array_is_constant(dfg, &input) => {
@@ -468,8 +478,6 @@ fn simplify_black_box_func(
 
         BlackBoxFunc::MultiScalarMul
         | BlackBoxFunc::SchnorrVerify
-        | BlackBoxFunc::PedersenCommitment
-        | BlackBoxFunc::PedersenHash
         | BlackBoxFunc::EmbeddedCurveAdd => {
             // Currently unsolvable here as we rely on an implementation in the backend.
             SimplifyResult::None
@@ -626,3 +634,47 @@ fn simplify_signature(
         _ => SimplifyResult::None,
     }
 }
+
+fn simplify_derive_generators(
+    dfg: &mut DataFlowGraph,
+    arguments: &[ValueId],
+    num_generators: u32,
+) -> SimplifyResult {
+    if arguments.len() == 2 {
+        let domain_separator_string = dfg.get_array_constant(arguments[0]);
+        let starting_index = dfg.get_numeric_constant(arguments[1]);
+        if let (Some(domain_separator_string), Some(starting_index)) =
+            (domain_separator_string, starting_index)
+        {
+            let domain_separator_bytes = domain_separator_string
+                .0
+                .iter()
+                .map(|&x| dfg.get_numeric_constant(x).unwrap().to_u128() as u8)
+                .collect::<Vec<u8>>();
+            let generators = derive_generators(
+                &domain_separator_bytes,
+                num_generators,
+                starting_index.try_to_u32().expect("argument is declared as u32"),
+            );
+            let is_infinite = dfg.make_constant(FieldElement::zero(), Type::bool());
+            let mut results = Vec::new();
+            for gen in generators {
+                let x_big: BigUint = gen.x.into();
+                let x = FieldElement::from_be_bytes_reduce(&x_big.to_bytes_be());
+                let y_big: BigUint = gen.y.into();
+                let y = FieldElement::from_be_bytes_reduce(&y_big.to_bytes_be());
+                results.push(dfg.make_constant(x, Type::field()));
+                results.push(dfg.make_constant(y, Type::field()));
+                results.push(is_infinite);
+            }
+            let len = results.len();
+            let result =
+                dfg.make_array(results.into(), Type::Array(vec![Type::field()].into(), len));
+            SimplifyResult::SimplifiedTo(result)
+        } else {
+            SimplifyResult::None
+        }
+    } else {
+        unreachable!("Unexpected number of arguments to derive_generators");
+    }
+}
diff --git a/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs b/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
index e07f947db8d..1930e38983a 100644
--- a/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
+++ b/compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
@@ -1404,28 +1404,28 @@ mod test {
     fn should_not_merge_incorrectly_to_false() {
         // Regression test for #1792
         // Tests that it does not simplify a true constraint an always-false constraint
-        // fn main f1 {
-        //   b0():
-        //     v4 = call pedersen([Field 0], u32 0)
-        //     v5 = array_get v4, index Field 0
-        //     v6 = cast v5 as u32
-        //     v8 = mod v6, u32 2
-        //     v9 = cast v8 as u1
-        //     v10 = allocate
-        //     store Field 0 at v10
-        //     jmpif v9 then: b1, else: b2
-        //   b1():
-        //     v14 = add v5, Field 1
-        //     store v14 at v10
-        //     jmp b3()
-        //   b3():
-        //     v12 = eq v9, u1 1
-        //     constrain v12
-        //     return
-        //   b2():
-        //     store Field 0 at v10
-        //     jmp b3()
-        // }
+        // acir(inline) fn main f1 {
+        //     b0(v0: [u8; 2]):
+        //       v4 = call keccak256(v0, u8 2)
+        //       v5 = array_get v4, index u8 0
+        //       v6 = cast v5 as u32
+        //       v8 = truncate v6 to 1 bits, max_bit_size: 32
+        //       v9 = cast v8 as u1
+        //       v10 = allocate
+        //       store u8 0 at v10
+        //       jmpif v9 then: b2, else: b3
+        //     b2():
+        //       v12 = cast v5 as Field
+        //       v13 = add v12, Field 1
+        //       store v13 at v10
+        //       jmp b4()
+        //     b4():
+        //       constrain v9 == u1 1
+        //       return
+        //     b3():
+        //       store u8 0 at v10
+        //       jmp b4()
+        //   }
         let main_id = Id::test_new(1);
         let mut builder = FunctionBuilder::new("main".into(), main_id);
 
@@ -1434,20 +1434,18 @@ mod test {
         let b2 = builder.insert_block();
         let b3 = builder.insert_block();
 
-        let element_type = Rc::new(vec![Type::field()]);
-        let array_type = Type::Array(element_type.clone(), 1);
-
-        let zero = builder.field_constant(0_u128);
-        let zero_array = builder.array_constant(im::Vector::unit(zero), array_type);
-        let i_zero = builder.numeric_constant(0_u128, Type::unsigned(32));
-        let pedersen = builder
-            .import_intrinsic_id(Intrinsic::BlackBox(acvm::acir::BlackBoxFunc::PedersenCommitment));
-        let v4 = builder.insert_call(
-            pedersen,
-            vec![zero_array, i_zero],
-            vec![Type::Array(element_type, 2)],
-        )[0];
-        let v5 = builder.insert_array_get(v4, zero, Type::field());
+        let element_type = Rc::new(vec![Type::unsigned(8)]);
+        let array_type = Type::Array(element_type.clone(), 2);
+        let array = builder.add_parameter(array_type);
+
+        let zero = builder.numeric_constant(0_u128, Type::unsigned(8));
+        let two = builder.numeric_constant(2_u128, Type::unsigned(8));
+
+        let keccak =
+            builder.import_intrinsic_id(Intrinsic::BlackBox(acvm::acir::BlackBoxFunc::Keccak256));
+        let v4 =
+            builder.insert_call(keccak, vec![array, two], vec![Type::Array(element_type, 32)])[0];
+        let v5 = builder.insert_array_get(v4, zero, Type::unsigned(8));
         let v6 = builder.insert_cast(v5, Type::unsigned(32));
         let i_two = builder.numeric_constant(2_u128, Type::unsigned(32));
         let v8 = builder.insert_binary(v6, BinaryOp::Mod, i_two);
@@ -1460,7 +1458,9 @@ mod test {
 
         builder.switch_to_block(b1);
         let one = builder.field_constant(1_u128);
-        let v14 = builder.insert_binary(v5, BinaryOp::Add, one);
+        let v5b = builder.insert_cast(v5, Type::field());
+        let v13: Id<Value> = builder.insert_binary(v5b, BinaryOp::Add, one);
+        let v14 = builder.insert_cast(v13, Type::unsigned(8));
         builder.insert_store(v10, v14);
         builder.terminate_with_jmp(b3, vec![]);
 
@@ -1474,8 +1474,9 @@ mod test {
         builder.insert_constrain(v12, v_true, None);
         builder.terminate_with_return(vec![]);
 
-        let ssa = builder.finish().flatten_cfg();
-        let main = ssa.main();
+        let ssa = builder.finish();
+        let flattened_ssa = ssa.flatten_cfg();
+        let main = flattened_ssa.main();
 
         // Now assert that there is not an always-false constraint after flattening:
         let mut constrain_count = 0;
diff --git a/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs b/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs
index 6db76996747..c9a6b7bf9c3 100644
--- a/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs
+++ b/compiler/noirc_evaluator/src/ssa/opt/remove_enable_side_effects.rs
@@ -159,7 +159,8 @@ impl Context {
                     | Intrinsic::AsField
                     | Intrinsic::AsSlice
                     | Intrinsic::AsWitness
-                    | Intrinsic::IsUnconstrained => false,
+                    | Intrinsic::IsUnconstrained
+                    | Intrinsic::DerivePedersenGenerators => false,
                 },
 
                 // We must assume that functions contain a side effect as we cannot inspect more deeply.
diff --git a/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs b/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs
index 6ca7eb74e9d..fd7a1a06fc8 100644
--- a/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs
+++ b/compiler/noirc_evaluator/src/ssa/opt/remove_if_else.rs
@@ -233,6 +233,7 @@ fn slice_capacity_change(
         | Intrinsic::FromField
         | Intrinsic::AsField
         | Intrinsic::AsWitness
-        | Intrinsic::IsUnconstrained => SizeChange::None,
+        | Intrinsic::IsUnconstrained
+        | Intrinsic::DerivePedersenGenerators => SizeChange::None,
     }
 }
diff --git a/compiler/noirc_frontend/src/ast/expression.rs b/compiler/noirc_frontend/src/ast/expression.rs
index 50836add8de..238e1c1afc7 100644
--- a/compiler/noirc_frontend/src/ast/expression.rs
+++ b/compiler/noirc_frontend/src/ast/expression.rs
@@ -5,9 +5,11 @@ use crate::ast::{
     Ident, ItemVisibility, Path, Pattern, Recoverable, Statement, StatementKind,
     UnresolvedTraitConstraint, UnresolvedType, UnresolvedTypeData, Visibility,
 };
+use crate::hir::def_collector::errors::DefCollectorErrorKind;
 use crate::macros_api::StructId;
 use crate::node_interner::ExprId;
-use crate::token::{Attributes, Token};
+use crate::token::{Attributes, Token, Tokens};
+use crate::{Kind, Type};
 use acvm::{acir::AcirField, FieldElement};
 use iter_extended::vecmap;
 use noirc_errors::{Span, Spanned};
@@ -33,7 +35,8 @@ pub enum ExpressionKind {
     Tuple(Vec<Expression>),
     Lambda(Box<Lambda>),
     Parenthesized(Box<Expression>),
-    Quote(BlockExpression),
+    Quote(Tokens),
+    Unquote(Box<Expression>),
     Comptime(BlockExpression, Span),
 
     // This variant is only emitted when inlining the result of comptime
@@ -45,7 +48,72 @@ pub enum ExpressionKind {
 
 /// A Vec of unresolved names for type variables.
 /// For `fn foo<A, B>(...)` this corresponds to vec!["A", "B"].
-pub type UnresolvedGenerics = Vec<Ident>;
+pub type UnresolvedGenerics = Vec<UnresolvedGeneric>;
+
+#[derive(Debug, PartialEq, Eq, Clone, Hash)]
+pub enum UnresolvedGeneric {
+    Variable(Ident),
+    Numeric { ident: Ident, typ: UnresolvedType },
+}
+
+impl UnresolvedGeneric {
+    pub fn span(&self) -> Span {
+        match self {
+            UnresolvedGeneric::Variable(ident) => ident.0.span(),
+            UnresolvedGeneric::Numeric { ident, typ } => {
+                ident.0.span().merge(typ.span.unwrap_or_default())
+            }
+        }
+    }
+
+    pub fn kind(&self) -> Result<Kind, DefCollectorErrorKind> {
+        match self {
+            UnresolvedGeneric::Variable(_) => Ok(Kind::Normal),
+            UnresolvedGeneric::Numeric { typ, .. } => {
+                let typ = self.resolve_numeric_kind_type(typ)?;
+                Ok(Kind::Numeric(Box::new(typ)))
+            }
+        }
+    }
+
+    fn resolve_numeric_kind_type(
+        &self,
+        typ: &UnresolvedType,
+    ) -> Result<Type, DefCollectorErrorKind> {
+        use crate::ast::UnresolvedTypeData::{FieldElement, Integer};
+
+        match typ.typ {
+            FieldElement => Ok(Type::FieldElement),
+            Integer(sign, bits) => Ok(Type::Integer(sign, bits)),
+            // Only fields and integers are supported for numeric kinds
+            _ => Err(DefCollectorErrorKind::UnsupportedNumericGenericType {
+                ident: self.ident().clone(),
+                typ: typ.typ.clone(),
+            }),
+        }
+    }
+
+    pub(crate) fn ident(&self) -> &Ident {
+        match self {
+            UnresolvedGeneric::Variable(ident) | UnresolvedGeneric::Numeric { ident, .. } => ident,
+        }
+    }
+}
+
+impl Display for UnresolvedGeneric {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            UnresolvedGeneric::Variable(ident) => write!(f, "{ident}"),
+            UnresolvedGeneric::Numeric { ident, typ } => write!(f, "let {ident}: {typ}"),
+        }
+    }
+}
+
+impl From<Ident> for UnresolvedGeneric {
+    fn from(value: Ident) -> Self {
+        UnresolvedGeneric::Variable(value)
+    }
+}
 
 impl ExpressionKind {
     pub fn into_path(self) -> Option<Path> {
@@ -535,10 +603,14 @@ impl Display for ExpressionKind {
             }
             Lambda(lambda) => lambda.fmt(f),
             Parenthesized(sub_expr) => write!(f, "({sub_expr})"),
-            Quote(block) => write!(f, "quote {block}"),
             Comptime(block, _) => write!(f, "comptime {block}"),
             Error => write!(f, "Error"),
             Resolved(_) => write!(f, "?Resolved"),
+            Unquote(expr) => write!(f, "$({expr})"),
+            Quote(tokens) => {
+                let tokens = vecmap(&tokens.0, ToString::to_string);
+                write!(f, "quote {{ {} }}", tokens.join(" "))
+            }
         }
     }
 }
diff --git a/compiler/noirc_frontend/src/ast/mod.rs b/compiler/noirc_frontend/src/ast/mod.rs
index bd2b45d9c48..86a21ba43e7 100644
--- a/compiler/noirc_frontend/src/ast/mod.rs
+++ b/compiler/noirc_frontend/src/ast/mod.rs
@@ -22,6 +22,7 @@ pub use traits::*;
 pub use type_alias::*;
 
 use crate::{
+    node_interner::QuotedTypeId,
     parser::{ParserError, ParserErrorReason},
     token::IntType,
     BinaryTypeOperator,
@@ -117,7 +118,11 @@ pub enum UnresolvedTypeData {
     ),
 
     // The type of quoted code for metaprogramming
-    Code,
+    Quoted(crate::QuotedType),
+
+    /// An already resolved type. These can only be parsed if they were present in the token stream
+    /// as a result of being spliced into a macro's token stream input.
+    Resolved(QuotedTypeId),
 
     Unspecified, // This is for when the user declares a variable without specifying it's type
     Error,
@@ -138,7 +143,7 @@ pub(crate) type UnaryRhsMemberAccess =
     (Ident, Option<(Option<Vec<UnresolvedType>>, Vec<Expression>)>);
 
 /// The precursor to TypeExpression, this is the type that the parser allows
-/// to be used in the length position of an array type. Only constants, variables,
+/// to be used in the length position of an array type. Only constant integers, variables,
 /// and numeric binary operators are allowed here.
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
 pub enum UnresolvedTypeExpression {
@@ -208,11 +213,12 @@ impl std::fmt::Display for UnresolvedTypeData {
                 }
             }
             MutableReference(element) => write!(f, "&mut {element}"),
-            Code => write!(f, "Code"),
+            Quoted(quoted) => write!(f, "{}", quoted),
             Unit => write!(f, "()"),
             Error => write!(f, "error"),
             Unspecified => write!(f, "unspecified"),
             Parenthesized(typ) => write!(f, "({typ})"),
+            Resolved(_) => write!(f, "(resolved type)"),
         }
     }
 }
@@ -251,6 +257,10 @@ impl UnresolvedType {
     pub fn unspecified() -> UnresolvedType {
         UnresolvedType { typ: UnresolvedTypeData::Unspecified, span: None }
     }
+
+    pub(crate) fn is_type_expression(&self) -> bool {
+        matches!(&self.typ, UnresolvedTypeData::Expression(_))
+    }
 }
 
 impl UnresolvedTypeData {
diff --git a/compiler/noirc_frontend/src/ast/structure.rs b/compiler/noirc_frontend/src/ast/structure.rs
index bda6b8c0b11..bb2d89841b9 100644
--- a/compiler/noirc_frontend/src/ast/structure.rs
+++ b/compiler/noirc_frontend/src/ast/structure.rs
@@ -20,7 +20,7 @@ impl NoirStruct {
     pub fn new(
         name: Ident,
         attributes: Vec<SecondaryAttribute>,
-        generics: Vec<Ident>,
+        generics: UnresolvedGenerics,
         fields: Vec<(Ident, UnresolvedType)>,
         span: Span,
     ) -> NoirStruct {
diff --git a/compiler/noirc_frontend/src/ast/traits.rs b/compiler/noirc_frontend/src/ast/traits.rs
index 772675723b5..b1b14e3f657 100644
--- a/compiler/noirc_frontend/src/ast/traits.rs
+++ b/compiler/noirc_frontend/src/ast/traits.rs
@@ -14,7 +14,7 @@ use crate::node_interner::TraitId;
 #[derive(Clone, Debug)]
 pub struct NoirTrait {
     pub name: Ident,
-    pub generics: Vec<Ident>,
+    pub generics: UnresolvedGenerics,
     pub where_clause: Vec<UnresolvedTraitConstraint>,
     pub span: Span,
     pub items: Vec<TraitItem>,
@@ -26,7 +26,7 @@ pub struct NoirTrait {
 pub enum TraitItem {
     Function {
         name: Ident,
-        generics: Vec<Ident>,
+        generics: UnresolvedGenerics,
         parameters: Vec<(Ident, UnresolvedType)>,
         return_type: FunctionReturnType,
         where_clause: Vec<UnresolvedTraitConstraint>,
@@ -49,6 +49,7 @@ pub struct TypeImpl {
     pub object_type: UnresolvedType,
     pub type_span: Span,
     pub generics: UnresolvedGenerics,
+    pub where_clause: Vec<UnresolvedTraitConstraint>,
     pub methods: Vec<(NoirFunction, Span)>,
 }
 
diff --git a/compiler/noirc_frontend/src/debug/mod.rs b/compiler/noirc_frontend/src/debug/mod.rs
index c222e08e77a..53c267d9309 100644
--- a/compiler/noirc_frontend/src/debug/mod.rs
+++ b/compiler/noirc_frontend/src/debug/mod.rs
@@ -470,7 +470,7 @@ impl DebugInstrumenter {
             .join(",\n");
         let (program, errors) = parse_program(&format!(
             r#"
-            use dep::__debug::{{
+            use __debug::{{
                 __debug_var_assign,
                 __debug_var_drop,
                 __debug_fn_enter,
diff --git a/compiler/noirc_frontend/src/elaborator/expressions.rs b/compiler/noirc_frontend/src/elaborator/expressions.rs
index a922f552c4b..ff5d0e24605 100644
--- a/compiler/noirc_frontend/src/elaborator/expressions.rs
+++ b/compiler/noirc_frontend/src/elaborator/expressions.rs
@@ -28,7 +28,8 @@ use crate::{
         MethodCallExpression, PrefixExpression,
     },
     node_interner::{DefinitionKind, ExprId, FuncId},
-    Shared, StructType, Type,
+    token::Tokens,
+    Kind, QuotedType, Shared, StructType, Type,
 };
 
 use super::Elaborator;
@@ -51,7 +52,20 @@ impl<'context> Elaborator<'context> {
             ExpressionKind::If(if_) => self.elaborate_if(*if_),
             ExpressionKind::Variable(variable, generics) => {
                 let generics = generics.map(|option_inner| {
-                    option_inner.into_iter().map(|generic| self.resolve_type(generic)).collect()
+                    option_inner
+                        .into_iter()
+                        .map(|generic| {
+                            // All type expressions should resolve to a `Type::Constant`
+                            if generic.is_type_expression() {
+                                self.resolve_type_inner(
+                                    generic,
+                                    &Kind::Numeric(Box::new(Type::default_int_type())),
+                                )
+                            } else {
+                                self.resolve_type(generic)
+                            }
+                        })
+                        .collect()
                 });
                 return self.elaborate_variable(variable, generics);
             }
@@ -64,6 +78,10 @@ impl<'context> Elaborator<'context> {
             }
             ExpressionKind::Resolved(id) => return (id, self.interner.id_type(id)),
             ExpressionKind::Error => (HirExpression::Error, Type::Error),
+            ExpressionKind::Unquote(_) => {
+                self.push_err(ResolverError::UnquoteUsedOutsideQuote { span: expr.span });
+                (HirExpression::Error, Type::Error)
+            }
         };
         let id = self.interner.push_expr(hir_expr);
         self.interner.push_expr_location(id, expr.span, self.file);
@@ -627,13 +645,15 @@ impl<'context> Elaborator<'context> {
         (expr, Type::Function(arg_types, Box::new(body_type), Box::new(env_type)))
     }
 
-    fn elaborate_quote(&mut self, block: BlockExpression) -> (HirExpression, Type) {
-        (HirExpression::Quote(block), Type::Code)
+    fn elaborate_quote(&mut self, mut tokens: Tokens) -> (HirExpression, Type) {
+        tokens = self.find_unquoted_exprs_tokens(tokens);
+        (HirExpression::Quote(tokens), Type::Quoted(QuotedType::Quoted))
     }
 
     fn elaborate_comptime_block(&mut self, block: BlockExpression, span: Span) -> (ExprId, Type) {
         let (block, _typ) = self.elaborate_block_expression(block);
-        let mut interpreter = Interpreter::new(self.interner, &mut self.comptime_scopes);
+        let mut interpreter =
+            Interpreter::new(self.interner, &mut self.comptime_scopes, self.crate_id);
         let value = interpreter.evaluate_block(block);
         self.inline_comptime_value(value, span)
     }
@@ -661,4 +681,74 @@ impl<'context> Elaborator<'context> {
             Err(error) => make_error(self, error),
         }
     }
+
+    fn try_get_comptime_function(
+        &mut self,
+        func: ExprId,
+        location: Location,
+    ) -> Result<FuncId, ResolverError> {
+        match self.interner.expression(&func) {
+            HirExpression::Ident(ident, _generics) => {
+                let definition = self.interner.definition(ident.id);
+                if let DefinitionKind::Function(function) = definition.kind {
+                    let meta = self.interner.function_modifiers(&function);
+                    if meta.is_comptime {
+                        Ok(function)
+                    } else {
+                        Err(ResolverError::MacroIsNotComptime { span: location.span })
+                    }
+                } else {
+                    Err(ResolverError::InvalidSyntaxInMacroCall { span: location.span })
+                }
+            }
+            _ => Err(ResolverError::InvalidSyntaxInMacroCall { span: location.span }),
+        }
+    }
+
+    /// Call a macro function and inlines its code at the call site.
+    /// This will also perform a type check to ensure that the return type is an `Expr` value.
+    fn call_macro(
+        &mut self,
+        func: ExprId,
+        arguments: Vec<ExprId>,
+        location: Location,
+        return_type: Type,
+    ) -> Option<(HirExpression, Type)> {
+        self.unify(&return_type, &Type::Quoted(QuotedType::Quoted), || {
+            TypeCheckError::MacroReturningNonExpr { typ: return_type.clone(), span: location.span }
+        });
+
+        let function = match self.try_get_comptime_function(func, location) {
+            Ok(function) => function,
+            Err(error) => {
+                self.push_err(error);
+                return None;
+            }
+        };
+
+        let mut interpreter =
+            Interpreter::new(self.interner, &mut self.comptime_scopes, self.crate_id);
+
+        let mut comptime_args = Vec::new();
+        let mut errors = Vec::new();
+
+        for argument in arguments {
+            match interpreter.evaluate(argument) {
+                Ok(arg) => {
+                    let location = interpreter.interner.expr_location(&argument);
+                    comptime_args.push((arg, location));
+                }
+                Err(error) => errors.push((error.into(), self.file)),
+            }
+        }
+
+        if !errors.is_empty() {
+            self.errors.append(&mut errors);
+            return None;
+        }
+
+        let result = interpreter.call_function(function, comptime_args, location);
+        let (expr_id, typ) = self.inline_comptime_value(result, location.span);
+        Some((self.interner.expression(&expr_id), typ))
+    }
 }
diff --git a/compiler/noirc_frontend/src/elaborator/lints.rs b/compiler/noirc_frontend/src/elaborator/lints.rs
index 4859ac5f97c..af6f4cdb42f 100644
--- a/compiler/noirc_frontend/src/elaborator/lints.rs
+++ b/compiler/noirc_frontend/src/elaborator/lints.rs
@@ -130,15 +130,6 @@ pub(super) fn recursive_non_entrypoint_function(
     }
 }
 
-/// Test functions cannot have arguments in order to be executable.
-pub(super) fn test_function_with_args(func: &NoirFunction) -> Option<ResolverError> {
-    if func.attributes().is_test_function() && !func.parameters().is_empty() {
-        Some(ResolverError::TestFunctionHasParameters { span: func.name_ident().span() })
-    } else {
-        None
-    }
-}
-
 /// Check that we are not passing a mutable reference from a constrained runtime to an unconstrained runtime.
 pub(super) fn unconstrained_function_args(
     function_args: &[(Type, ExprId, Span)],
@@ -146,7 +137,7 @@ pub(super) fn unconstrained_function_args(
     function_args
         .iter()
         .filter_map(|(typ, _, span)| {
-            if type_contains_mutable_reference(typ) {
+            if !typ.is_valid_for_unconstrained_boundary() {
                 Some(TypeCheckError::ConstrainedReferenceToUnconstrained { span: *span })
             } else {
                 None
@@ -162,17 +153,13 @@ pub(super) fn unconstrained_function_return(
 ) -> Option<TypeCheckError> {
     if return_type.contains_slice() {
         Some(TypeCheckError::UnconstrainedSliceReturnToConstrained { span })
-    } else if type_contains_mutable_reference(return_type) {
+    } else if !return_type.is_valid_for_unconstrained_boundary() {
         Some(TypeCheckError::UnconstrainedReferenceToConstrained { span })
     } else {
         None
     }
 }
 
-fn type_contains_mutable_reference(typ: &Type) -> bool {
-    matches!(&typ.follow_bindings(), Type::MutableReference(_))
-}
-
 /// Only entrypoint functions require a `pub` visibility modifier applied to their return types.
 ///
 /// Application of `pub` to other functions is not meaningful and is a mistake.
diff --git a/compiler/noirc_frontend/src/elaborator/mod.rs b/compiler/noirc_frontend/src/elaborator/mod.rs
index 37ad74b78b0..6fa5835851a 100644
--- a/compiler/noirc_frontend/src/elaborator/mod.rs
+++ b/compiler/noirc_frontend/src/elaborator/mod.rs
@@ -6,7 +6,7 @@ use std::{
 use crate::{
     ast::{FunctionKind, UnresolvedTraitConstraint},
     hir::{
-        comptime::{self, Interpreter},
+        comptime::{self, Interpreter, Value},
         def_collector::{
             dc_crate::{
                 filter_literal_globals, CompilationError, ImplMap, UnresolvedGlobal,
@@ -22,6 +22,7 @@ use crate::{
         expr::HirIdent,
         function::{FunctionBody, Parameters},
         traits::TraitConstraint,
+        types::{Generics, Kind, ResolvedGeneric},
     },
     macros_api::{
         BlockExpression, Ident, NodeInterner, NoirFunction, NoirStruct, Pattern,
@@ -33,7 +34,7 @@ use crate::{
     Shared, Type, TypeVariable,
 };
 use crate::{
-    ast::{TraitBound, UnresolvedGenerics},
+    ast::{TraitBound, UnresolvedGeneric, UnresolvedGenerics},
     graph::CrateId,
     hir::{
         def_collector::{dc_crate::CollectedItems, errors::DefCollectorErrorKind},
@@ -44,7 +45,6 @@ use crate::{
     hir_def::function::{FuncMeta, HirFunction},
     macros_api::{Param, Path, UnresolvedType, UnresolvedTypeData},
     node_interner::TraitImplId,
-    Generics,
 };
 use crate::{
     hir::{
@@ -89,22 +89,13 @@ pub struct Elaborator<'context> {
 
     file: FileId,
 
-    in_unconstrained_fn: bool,
     nested_loops: usize,
 
-    /// True if the current module is a contract.
-    /// This is usually determined by self.path_resolver.module_id(), but it can
-    /// be overridden for impls. Impls are an odd case since the methods within resolve
-    /// as if they're in the parent module, but should be placed in a child module.
-    /// Since they should be within a child module, in_contract is manually set to false
-    /// for these so we can still resolve them in the parent module without them being in a contract.
-    in_contract: bool,
-
     /// Contains a mapping of the current struct or functions's generics to
     /// unique type variables if we're resolving a struct. Empty otherwise.
     /// This is a Vec rather than a map to preserve the order a functions generics
     /// were declared in.
-    generics: Vec<(Rc<String>, TypeVariable, Span)>,
+    generics: Vec<ResolvedGeneric>,
 
     /// When resolving lambda expressions, we need to keep track of the variables
     /// that are captured. We do this in order to create the hidden environment
@@ -180,9 +171,7 @@ impl<'context> Elaborator<'context> {
             interner: &mut context.def_interner,
             def_maps: &mut context.def_maps,
             file: FileId::dummy(),
-            in_unconstrained_fn: false,
             nested_loops: 0,
-            in_contract: false,
             generics: Vec::new(),
             lambda_stack: Vec::new(),
             self_type: None,
@@ -204,10 +193,22 @@ impl<'context> Elaborator<'context> {
     pub fn elaborate(
         context: &'context mut Context,
         crate_id: CrateId,
-        mut items: CollectedItems,
+        items: CollectedItems,
     ) -> Vec<(CompilationError, FileId)> {
         let mut this = Self::new(context, crate_id);
 
+        // Filter out comptime items to execute their functions first if needed.
+        // This step is why comptime items can only refer to other comptime items
+        // in the same crate, but can refer to any item in dependencies. Trying to
+        // run these at the same time as other items would lead to them seeing empty
+        // function bodies from functions that have yet to be elaborated.
+        let (comptime_items, runtime_items) = Self::filter_comptime_items(items);
+        this.elaborate_items(comptime_items);
+        this.elaborate_items(runtime_items);
+        this.errors
+    }
+
+    fn elaborate_items(&mut self, mut items: CollectedItems) {
         // We must first resolve and intern the globals before we can resolve any stmts inside each function.
         // Each function uses its own resolver with a newly created ScopeForest, and must be resolved again to be within a function's scope
         //
@@ -215,27 +216,36 @@ impl<'context> Elaborator<'context> {
         // the values of integer globals as numeric generics.
         let (literal_globals, non_literal_globals) = filter_literal_globals(items.globals);
         for global in non_literal_globals {
-            this.unresolved_globals.insert(global.global_id, global);
+            self.unresolved_globals.insert(global.global_id, global);
         }
 
         for global in literal_globals {
-            this.elaborate_global(global);
+            self.elaborate_global(global);
         }
 
         for (alias_id, alias) in items.type_aliases {
-            this.define_type_alias(alias_id, alias);
+            self.define_type_alias(alias_id, alias);
         }
 
-        this.define_function_metas(&mut items.functions, &mut items.impls, &mut items.trait_impls);
-        this.collect_traits(items.traits);
-
         // Must resolve structs before we resolve globals.
-        this.collect_struct_definitions(items.types);
+        self.collect_struct_definitions(items.types);
+
+        self.define_function_metas(&mut items.functions, &mut items.impls, &mut items.trait_impls);
+
+        self.collect_traits(items.traits);
+
+        // Before we resolve any function symbols we must go through our impls and
+        // re-collect the methods within into their proper module. This cannot be
+        // done during def collection since we need to be able to resolve the type of
+        // the impl since that determines the module we should collect into.
+        for ((_self_type, module), impls) in &mut items.impls {
+            self.collect_impls(*module, impls);
+        }
 
         // Bind trait impls to their trait. Collect trait functions, that have a
         // default implementation, which hasn't been overridden.
         for trait_impl in &mut items.trait_impls {
-            this.collect_trait_impl(trait_impl);
+            self.collect_trait_impl(trait_impl);
         }
 
         // Before we resolve any function symbols we must go through our impls and
@@ -250,26 +260,24 @@ impl<'context> Elaborator<'context> {
         }
 
         // We must wait to resolve non-literal globals until after we resolve structs since struct
-        // globals will need to reference the struct type they're initialized to to ensure they are valid.
-        while let Some((_, global)) = this.unresolved_globals.pop_first() {
-            this.elaborate_global(global);
+        // globals will need to reference the struct type they're initialized to ensure they are valid.
+        while let Some((_, global)) = self.unresolved_globals.pop_first() {
+            self.elaborate_global(global);
         }
 
         for functions in items.functions {
-            this.elaborate_functions(functions);
+            self.elaborate_functions(functions);
         }
 
         for impls in items.impls.into_values() {
-            this.elaborate_impls(impls);
+            self.elaborate_impls(impls);
         }
 
         for trait_impl in items.trait_impls {
-            this.elaborate_trait_impl(trait_impl);
+            self.elaborate_trait_impl(trait_impl);
         }
 
-        let cycle_errors = this.interner.check_for_dependency_cycles();
-        this.errors.extend(cycle_errors);
-        this.errors
+        self.errors.extend(self.interner.check_for_dependency_cycles());
     }
 
     /// Runs `f` and if it modifies `self.generics`, `self.generics` is truncated
@@ -310,11 +318,6 @@ impl<'context> Elaborator<'context> {
 
         let old_function = std::mem::replace(&mut self.current_function, Some(id));
 
-        // Without this, impl methods can accidentally be placed in contracts. See #3254
-        if self.self_type.is_some() {
-            self.in_contract = false;
-        }
-
         self.scopes.start_function();
         let old_item = std::mem::replace(&mut self.current_item, Some(DependencyId::Function(id)));
 
@@ -322,18 +325,26 @@ impl<'context> Elaborator<'context> {
 
         self.trait_bounds = func_meta.trait_constraints.clone();
 
-        if self.interner.function_modifiers(&id).is_unconstrained {
-            self.in_unconstrained_fn = true;
+        // Introduce all numeric generics into scope
+        for generic in &func_meta.all_generics {
+            if let Kind::Numeric(typ) = &generic.kind {
+                let definition = DefinitionKind::GenericType(generic.type_var.clone());
+                let ident = Ident::new(generic.name.to_string(), generic.span);
+                let hir_ident =
+                    self.add_variable_decl_inner(ident, false, false, false, definition);
+                self.interner.push_definition_type(hir_ident.id, *typ.clone());
+            }
         }
 
         // The DefinitionIds for each parameter were already created in define_function_meta
         // so we need to reintroduce the same IDs into scope here.
         for parameter in &func_meta.parameter_idents {
             let name = self.interner.definition_name(parameter.id).to_owned();
-            self.add_existing_variable_to_scope(name, parameter.clone());
+            self.add_existing_variable_to_scope(name, parameter.clone(), true);
         }
 
         self.generics = func_meta.all_generics.clone();
+
         self.declare_numeric_generics(&func_meta.parameters, func_meta.return_type());
         self.add_trait_constraints_to_scope(&func_meta);
 
@@ -404,7 +415,7 @@ impl<'context> Elaborator<'context> {
         meta.function_body = FunctionBody::Resolved;
 
         self.trait_bounds.clear();
-        self.in_unconstrained_fn = false;
+        self.type_variables.clear();
         self.interner.update_fn(id, hir_func);
         self.current_function = old_function;
         self.current_item = old_item;
@@ -428,7 +439,7 @@ impl<'context> Elaborator<'context> {
         generics.push(new_generic.clone());
 
         let name = format!("impl {trait_path}");
-        let generic_type = Type::NamedGeneric(new_generic, Rc::new(name));
+        let generic_type = Type::NamedGeneric(new_generic, Rc::new(name), Kind::Normal);
         let trait_bound = TraitBound { trait_path, trait_id: None, trait_generics };
 
         if let Some(new_constraint) = self.resolve_trait_bound(&trait_bound, generic_type.clone()) {
@@ -445,25 +456,56 @@ impl<'context> Elaborator<'context> {
             // Map the generic to a fresh type variable
             let id = self.interner.next_type_variable_id();
             let typevar = TypeVariable::unbound(id);
-            let span = generic.0.span();
+            let ident = generic.ident();
+            let span = ident.0.span();
+
+            // Resolve the generic's kind
+            let kind = self.resolve_generic_kind(generic);
 
             // Check for name collisions of this generic
-            let name = Rc::new(generic.0.contents.clone());
+            let name = Rc::new(ident.0.contents.clone());
 
-            if let Some((_, _, first_span)) = self.find_generic(&name) {
+            let resolved_generic =
+                ResolvedGeneric { name: name.clone(), type_var: typevar.clone(), kind, span };
+
+            if let Some(generic) = self.find_generic(&name) {
                 self.push_err(ResolverError::DuplicateDefinition {
-                    name: generic.0.contents.clone(),
-                    first_span: *first_span,
+                    name: ident.0.contents.clone(),
+                    first_span: generic.span,
                     second_span: span,
                 });
             } else {
-                self.generics.push((name, typevar.clone(), span));
+                self.generics.push(resolved_generic.clone());
             }
 
-            typevar
+            resolved_generic
         })
     }
 
+    /// Return the kind of an unresolved generic.
+    /// If a numeric generic has been specified, resolve the annotated type to make
+    /// sure only primitive numeric types are being used.
+    pub(super) fn resolve_generic_kind(&mut self, generic: &UnresolvedGeneric) -> Kind {
+        if let UnresolvedGeneric::Numeric { ident, typ } = generic {
+            let typ = typ.clone();
+            let typ = if typ.is_type_expression() {
+                self.resolve_type_inner(typ, &Kind::Numeric(Box::new(Type::default_int_type())))
+            } else {
+                self.resolve_type(typ.clone())
+            };
+            if !matches!(typ, Type::FieldElement | Type::Integer(_, _)) {
+                let unsupported_typ_err = ResolverError::UnsupportedNumericGenericType {
+                    ident: ident.clone(),
+                    typ: typ.clone(),
+                };
+                self.push_err(unsupported_typ_err);
+            }
+            Kind::Numeric(Box::new(typ))
+        } else {
+            Kind::Normal
+        }
+    }
+
     fn push_err(&mut self, error: impl Into<CompilationError>) {
         self.errors.push((error.into(), self.file));
     }
@@ -512,12 +554,20 @@ impl<'context> Elaborator<'context> {
     }
 
     fn resolve_trait_bound(&mut self, bound: &TraitBound, typ: Type) -> Option<TraitConstraint> {
-        let trait_generics = vecmap(&bound.trait_generics, |typ| self.resolve_type(typ.clone()));
+        let the_trait = self.lookup_trait_or_error(bound.trait_path.clone())?;
+
+        let resolved_generics = &the_trait.generics.clone();
+        assert_eq!(resolved_generics.len(), bound.trait_generics.len());
+        let generics_with_types = resolved_generics.iter().zip(&bound.trait_generics);
+        let trait_generics = vecmap(generics_with_types, |(generic, typ)| {
+            self.resolve_type_inner(typ.clone(), &generic.kind)
+        });
 
-        let span = bound.trait_path.span();
         let the_trait = self.lookup_trait_or_error(bound.trait_path.clone())?;
         let trait_id = the_trait.id;
 
+        let span = bound.trait_path.span();
+
         let expected_generics = the_trait.generics.len();
         let actual_generics = trait_generics.len();
 
@@ -546,10 +596,13 @@ impl<'context> Elaborator<'context> {
     ) {
         self.current_function = Some(func_id);
 
-        // Without this, impl methods can accidentally be placed in contracts. See #3254
-        if self.self_type.is_some() {
-            self.in_contract = false;
-        }
+        let in_contract = if self.self_type.is_some() {
+            // Without this, impl methods can accidentally be placed in contracts.
+            // See: https://github.com/noir-lang/noir/issues/3254
+            false
+        } else {
+            self.in_contract()
+        };
 
         self.scopes.start_function();
         self.current_item = Some(DependencyId::Function(func_id));
@@ -558,18 +611,18 @@ impl<'context> Elaborator<'context> {
         let id = self.interner.function_definition_id(func_id);
         let name_ident = HirIdent::non_trait_method(id, location);
 
-        let is_entry_point = self.is_entry_point_function(func);
+        let is_entry_point = self.is_entry_point_function(func, in_contract);
 
         self.run_lint(|_| lints::inlining_attributes(func).map(Into::into));
         self.run_lint(|_| lints::missing_pub(func, is_entry_point).map(Into::into));
         self.run_lint(|elaborator| {
-            lints::unnecessary_pub_return(func, elaborator.pub_allowed(func)).map(Into::into)
+            lints::unnecessary_pub_return(func, elaborator.pub_allowed(func, in_contract))
+                .map(Into::into)
         });
         self.run_lint(|_| lints::oracle_not_marked_unconstrained(func).map(Into::into));
         self.run_lint(|elaborator| {
             lints::low_level_function_outside_stdlib(func, elaborator.crate_id).map(Into::into)
         });
-        self.run_lint(|_| lints::test_function_with_args(func).map(Into::into));
         self.run_lint(|_| {
             lints::recursive_non_entrypoint_function(func, is_entry_point).map(Into::into)
         });
@@ -580,12 +633,12 @@ impl<'context> Elaborator<'context> {
         let has_no_predicates_attribute = func.attributes().is_no_predicates();
         let should_fold = func.attributes().is_foldable();
         let has_inline_attribute = has_no_predicates_attribute || should_fold;
-        let is_pub_allowed = self.pub_allowed(func);
+        let is_pub_allowed = self.pub_allowed(func, in_contract);
         self.add_generics(&func.def.generics);
 
         let mut trait_constraints = self.resolve_trait_constraints(&func.def.where_clause);
 
-        let mut generics = vecmap(&self.generics, |(_, typevar, _)| typevar.clone());
+        let mut generics = vecmap(&self.generics, |generic| generic.type_var.clone());
         let mut parameters = Vec::new();
         let mut parameter_types = Vec::new();
         let mut parameter_idents = Vec::new();
@@ -601,7 +654,7 @@ impl<'context> Elaborator<'context> {
                 UnresolvedTypeData::TraitAsType(path, args) => {
                     self.desugar_impl_trait_arg(path, args, &mut generics, &mut trait_constraints)
                 }
-                _ => self.resolve_type_inner(typ),
+                _ => self.resolve_type_inner(typ, &Kind::Normal),
             };
 
             self.check_if_type_is_valid_for_program_input(
@@ -610,6 +663,7 @@ impl<'context> Elaborator<'context> {
                 has_inline_attribute,
                 type_span,
             );
+
             let pattern = self.elaborate_pattern_and_store_ids(
                 pattern,
                 typ.clone(),
@@ -634,8 +688,8 @@ impl<'context> Elaborator<'context> {
 
         let direct_generics = func.def.generics.iter();
         let direct_generics = direct_generics
-            .filter_map(|generic| self.find_generic(&generic.0.contents))
-            .map(|(name, typevar, _span)| (name.clone(), typevar.clone()))
+            .filter_map(|generic| self.find_generic(&generic.ident().0.contents))
+            .map(|ResolvedGeneric { name, type_var, .. }| (name.clone(), type_var.clone()))
             .collect();
 
         let statements = std::mem::take(&mut func.def.body.statements);
@@ -658,6 +712,7 @@ impl<'context> Elaborator<'context> {
             is_entry_point,
             is_trait_function,
             has_inline_attribute,
+            source_crate: self.crate_id,
             function_body: FunctionBody::Unresolved(func.kind, body, func.def.span),
         };
 
@@ -686,18 +741,30 @@ impl<'context> Elaborator<'context> {
 
     /// True if the `pub` keyword is allowed on parameters in this function
     /// `pub` on function parameters is only allowed for entry point functions
-    fn pub_allowed(&self, func: &NoirFunction) -> bool {
-        self.is_entry_point_function(func) || func.attributes().is_foldable()
+    fn pub_allowed(&self, func: &NoirFunction, in_contract: bool) -> bool {
+        self.is_entry_point_function(func, in_contract) || func.attributes().is_foldable()
+    }
+
+    /// Returns `true` if the current module is a contract.
+    ///
+    /// This is usually determined by `self.module_id()`, but it can
+    /// be overridden for impls. Impls are an odd case since the methods within resolve
+    /// as if they're in the parent module, but should be placed in a child module.
+    /// Since they should be within a child module, they should be elaborated as if
+    /// `in_contract` is `false` so we can still resolve them in the parent module without them being in a contract.
+    fn in_contract(&self) -> bool {
+        self.module_id().module(self.def_maps).is_contract
     }
 
-    fn is_entry_point_function(&self, func: &NoirFunction) -> bool {
-        if self.in_contract {
+    fn is_entry_point_function(&self, func: &NoirFunction, in_contract: bool) -> bool {
+        if in_contract {
             func.attributes().is_contract_entry_point()
         } else {
             func.name() == MAIN_FUNCTION
         }
     }
 
+    // TODO(https://github.com/noir-lang/noir/issues/5156): Remove implicit numeric generics
     fn declare_numeric_generics(&mut self, params: &Parameters, return_type: &Type) {
         if self.generics.is_empty() {
             return;
@@ -710,12 +777,27 @@ impl<'context> Elaborator<'context> {
             // We can fail to find the generic in self.generics if it is an implicit one created
             // by the compiler. This can happen when, e.g. eliding array lengths using the slice
             // syntax [T].
-            if let Some((name, _, span)) =
-                self.generics.iter().find(|(name, _, _)| name.as_ref() == &name_to_find)
+            if let Some(ResolvedGeneric { name, span, kind, .. }) =
+                self.generics.iter_mut().find(|generic| generic.name.as_ref() == &name_to_find)
             {
+                let scope = self.scopes.get_mut_scope();
+                let value = scope.find(&name_to_find);
+                if value.is_some() {
+                    // With the addition of explicit numeric generics we do not want to introduce numeric generics in this manner
+                    // However, this is going to be a big breaking change so for now we simply issue a warning while users have time
+                    // to transition to the new syntax
+                    // e.g. this code would break with a duplicate definition error:
+                    // ```
+                    // fn foo<let N: u8>(arr: [Field; N]) { }
+                    // ```
+                    continue;
+                }
+                *kind = Kind::Numeric(Box::new(Type::default_int_type()));
                 let ident = Ident::new(name.to_string(), *span);
                 let definition = DefinitionKind::GenericType(type_variable);
-                self.add_variable_decl_inner(ident, false, false, false, definition);
+                self.add_variable_decl_inner(ident.clone(), false, false, false, definition);
+
+                self.push_err(ResolverError::UseExplicitNumericGeneric { ident });
             }
         }
     }
@@ -741,7 +823,7 @@ impl<'context> Elaborator<'context> {
         }
     }
 
-    fn elaborate_impls(&mut self, impls: Vec<(Vec<Ident>, Span, UnresolvedFunctions)>) {
+    fn elaborate_impls(&mut self, impls: Vec<(UnresolvedGenerics, Span, UnresolvedFunctions)>) {
         for (_, _, functions) in impls {
             self.file = functions.file_id;
             self.recover_generics(|this| this.elaborate_functions(functions));
@@ -771,7 +853,7 @@ impl<'context> Elaborator<'context> {
     fn collect_impls(
         &mut self,
         module: LocalModuleId,
-        impls: &mut [(Vec<Ident>, Span, UnresolvedFunctions)],
+        impls: &mut [(UnresolvedGenerics, Span, UnresolvedFunctions)],
     ) {
         self.local_module = module;
 
@@ -788,7 +870,6 @@ impl<'context> Elaborator<'context> {
         self.local_module = trait_impl.module_id;
         self.file = trait_impl.file_id;
         self.current_trait_impl = trait_impl.impl_id;
-        trait_impl.trait_id = self.resolve_trait_by_path(trait_impl.trait_path.clone());
 
         let self_type = trait_impl.methods.self_type.clone();
         let self_type =
@@ -832,7 +913,7 @@ impl<'context> Elaborator<'context> {
                 methods,
             });
 
-            let generics = vecmap(&self.generics, |(_, type_variable, _)| type_variable.clone());
+            let generics = vecmap(&self.generics, |generic| generic.type_var.clone());
 
             if let Err((prev_span, prev_file)) = self.interner.add_trait_implementation(
                 self_type.clone(),
@@ -856,6 +937,7 @@ impl<'context> Elaborator<'context> {
         }
 
         self.generics.clear();
+
         self.current_trait_impl = None;
         self.self_type = None;
     }
@@ -1064,15 +1146,41 @@ impl<'context> Elaborator<'context> {
 
         // Resolve each field in each struct.
         // Each struct should already be present in the NodeInterner after def collection.
-        for (type_id, typ) in structs {
+        for (type_id, mut typ) in structs {
             self.file = typ.file_id;
             self.local_module = typ.module_id;
-            let (generics, fields) = self.resolve_struct_fields(typ.struct_def, type_id);
 
+            let attributes = std::mem::take(&mut typ.struct_def.attributes);
+            let span = typ.struct_def.span;
+
+            let fields = self.resolve_struct_fields(typ.struct_def, type_id);
             self.interner.update_struct(type_id, |struct_def| {
                 struct_def.set_fields(fields);
-                struct_def.generics = generics;
+
+                // TODO(https://github.com/noir-lang/noir/issues/5156): Remove this with implicit numeric generics
+                // This is only necessary for resolving named types when implicit numeric generics are used.
+                let mut found_names = Vec::new();
+                struct_def.find_numeric_generics_in_fields(&mut found_names);
+                for generic in struct_def.generics.iter_mut() {
+                    for found_generic in found_names.iter() {
+                        if found_generic == generic.name.as_str() {
+                            if matches!(generic.kind, Kind::Normal) {
+                                let ident = Ident::new(generic.name.to_string(), generic.span);
+                                self.errors.push((
+                                    CompilationError::ResolverError(
+                                        ResolverError::UseExplicitNumericGeneric { ident },
+                                    ),
+                                    self.file,
+                                ));
+                                generic.kind = Kind::Numeric(Box::new(Type::default_int_type()));
+                            }
+                            break;
+                        }
+                    }
+                }
             });
+
+            self.run_comptime_attributes_on_struct(attributes, type_id, span);
         }
 
         // Check whether the struct fields have nested slices
@@ -1095,33 +1203,72 @@ impl<'context> Elaborator<'context> {
         }
     }
 
+    fn run_comptime_attributes_on_struct(
+        &mut self,
+        attributes: Vec<SecondaryAttribute>,
+        struct_id: StructId,
+        span: Span,
+    ) {
+        for attribute in attributes {
+            if let SecondaryAttribute::Custom(name) = attribute {
+                match self.lookup_global(Path::from_single(name, span)) {
+                    Ok(id) => {
+                        let definition = self.interner.definition(id);
+                        if let DefinitionKind::Function(function) = &definition.kind {
+                            let function = *function;
+                            let mut interpreter = Interpreter::new(
+                                self.interner,
+                                &mut self.comptime_scopes,
+                                self.crate_id,
+                            );
+
+                            let location = Location::new(span, self.file);
+                            let arguments = vec![(Value::TypeDefinition(struct_id), location)];
+                            let result = interpreter.call_function(function, arguments, location);
+                            if let Err(error) = result {
+                                self.errors.push(error.into_compilation_error_pair());
+                            }
+                        } else {
+                            self.push_err(ResolverError::NonFunctionInAnnotation { span });
+                        }
+                    }
+                    Err(_) => self.push_err(ResolverError::UnknownAnnotation { span }),
+                }
+            }
+        }
+    }
+
     pub fn resolve_struct_fields(
         &mut self,
         unresolved: NoirStruct,
         struct_id: StructId,
-    ) -> (Generics, Vec<(Ident, Type)>) {
+    ) -> Vec<(Ident, Type)> {
         self.recover_generics(|this| {
-            let generics = this.add_generics(&unresolved.generics);
-
             this.current_item = Some(DependencyId::Struct(struct_id));
 
             this.resolving_ids.insert(struct_id);
+
+            let struct_def = this.interner.get_struct(struct_id);
+            this.add_existing_generics(&unresolved.generics, &struct_def.borrow().generics);
+
             let fields = vecmap(unresolved.fields, |(ident, typ)| (ident, this.resolve_type(typ)));
+
             this.resolving_ids.remove(&struct_id);
 
-            (generics, fields)
+            fields
         })
     }
 
     fn elaborate_global(&mut self, global: UnresolvedGlobal) {
-        self.local_module = global.module_id;
-        self.file = global.file_id;
+        let old_module = std::mem::replace(&mut self.local_module, global.module_id);
+        let old_file = std::mem::replace(&mut self.file, global.file_id);
+        let old_item = self.current_item.take();
 
         let global_id = global.global_id;
         self.current_item = Some(DependencyId::Global(global_id));
         let let_stmt = global.stmt_def;
 
-        if !self.in_contract
+        if !self.in_contract()
             && let_stmt.attributes.iter().any(|attr| matches!(attr, SecondaryAttribute::Abi(_)))
         {
             let span = let_stmt.pattern.span();
@@ -1147,6 +1294,9 @@ impl<'context> Elaborator<'context> {
         // Otherwise we may prematurely default to a Field inside the next function if this
         // global was unused there, even if it is consistently used as a u8 everywhere else.
         self.type_variables.clear();
+        self.local_module = old_module;
+        self.file = old_file;
+        self.current_item = old_item;
     }
 
     fn elaborate_comptime_global(&mut self, global_id: GlobalId) {
@@ -1159,7 +1309,8 @@ impl<'context> Elaborator<'context> {
         let definition_id = global.definition_id;
         let location = global.location;
 
-        let mut interpreter = Interpreter::new(self.interner, &mut self.comptime_scopes);
+        let mut interpreter =
+            Interpreter::new(self.interner, &mut self.comptime_scopes, self.crate_id);
 
         if let Err(error) = interpreter.evaluate_let(let_statement) {
             self.errors.push(error.into_compilation_error_pair());
@@ -1199,12 +1350,30 @@ impl<'context> Elaborator<'context> {
             self.file = trait_impl.file_id;
             self.local_module = trait_impl.module_id;
 
+            trait_impl.trait_id = self.resolve_trait_by_path(trait_impl.trait_path.clone());
             let unresolved_type = &trait_impl.object_type;
+
             self.add_generics(&trait_impl.generics);
             trait_impl.resolved_generics = self.generics.clone();
 
-            let trait_generics =
-                vecmap(&trait_impl.trait_generics, |generic| self.resolve_type(generic.clone()));
+            // Fetch trait constraints here
+            let trait_generics = if let Some(trait_id) = trait_impl.trait_id {
+                let trait_def = self.interner.get_trait(trait_id);
+                let resolved_generics = trait_def.generics.clone();
+                assert_eq!(resolved_generics.len(), trait_impl.trait_generics.len());
+                trait_impl
+                    .trait_generics
+                    .iter()
+                    .enumerate()
+                    .map(|(i, generic)| {
+                        self.resolve_type_inner(generic.clone(), &resolved_generics[i].kind)
+                    })
+                    .collect()
+            } else {
+                // We still resolve as to continue type checking
+                vecmap(&trait_impl.trait_generics, |generic| self.resolve_type(generic.clone()))
+            };
+
             trait_impl.resolved_trait_generics = trait_generics;
 
             let self_type = self.resolve_type(unresolved_type.clone());
@@ -1233,4 +1402,52 @@ impl<'context> Elaborator<'context> {
             });
         }
     }
+
+    /// Filters out comptime items from non-comptime items.
+    /// Returns a pair of (comptime items, non-comptime items)
+    fn filter_comptime_items(mut items: CollectedItems) -> (CollectedItems, CollectedItems) {
+        let mut function_sets = Vec::with_capacity(items.functions.len());
+        let mut comptime_function_sets = Vec::new();
+
+        for function_set in items.functions {
+            let mut functions = Vec::with_capacity(function_set.functions.len());
+            let mut comptime_functions = Vec::new();
+
+            for function in function_set.functions {
+                if function.2.def.is_comptime {
+                    comptime_functions.push(function);
+                } else {
+                    functions.push(function);
+                }
+            }
+
+            let file_id = function_set.file_id;
+            let self_type = function_set.self_type;
+            let trait_id = function_set.trait_id;
+
+            if !comptime_functions.is_empty() {
+                comptime_function_sets.push(UnresolvedFunctions {
+                    functions: comptime_functions,
+                    file_id,
+                    trait_id,
+                    self_type: self_type.clone(),
+                });
+            }
+
+            function_sets.push(UnresolvedFunctions { functions, file_id, trait_id, self_type });
+        }
+
+        let comptime = CollectedItems {
+            functions: comptime_function_sets,
+            types: BTreeMap::new(),
+            type_aliases: BTreeMap::new(),
+            traits: BTreeMap::new(),
+            trait_impls: Vec::new(),
+            globals: Vec::new(),
+            impls: std::collections::HashMap::new(),
+        };
+
+        items.functions = function_sets;
+        (comptime, items)
+    }
 }
diff --git a/compiler/noirc_frontend/src/elaborator/patterns.rs b/compiler/noirc_frontend/src/elaborator/patterns.rs
index e337726b579..4f04f5c523c 100644
--- a/compiler/noirc_frontend/src/elaborator/patterns.rs
+++ b/compiler/noirc_frontend/src/elaborator/patterns.rs
@@ -11,11 +11,10 @@ use crate::{
     },
     hir_def::{
         expr::{HirIdent, ImplKind},
-        function::FunctionBody,
         stmt::HirPattern,
     },
     macros_api::{HirExpression, Ident, Path, Pattern},
-    node_interner::{DefinitionId, DefinitionKind, DependencyId, ExprId, GlobalId, TraitImplKind},
+    node_interner::{DefinitionId, DefinitionKind, ExprId, GlobalId, TraitImplKind},
     Shared, StructType, Type, TypeBindings,
 };
 
@@ -302,9 +301,14 @@ impl<'context> Elaborator<'context> {
         ident
     }
 
-    pub fn add_existing_variable_to_scope(&mut self, name: String, ident: HirIdent) {
+    pub fn add_existing_variable_to_scope(
+        &mut self,
+        name: String,
+        ident: HirIdent,
+        warn_if_unused: bool,
+    ) {
         let second_span = ident.location.span;
-        let resolver_meta = ResolverMeta { num_times_used: 0, ident, warn_if_unused: true };
+        let resolver_meta = ResolverMeta { num_times_used: 0, ident, warn_if_unused };
 
         let old_value = self.scopes.get_mut_scope().add_key_value(name.clone(), resolver_meta);
 
@@ -390,6 +394,7 @@ impl<'context> Elaborator<'context> {
     ) -> (ExprId, Type) {
         let span = variable.span;
         let expr = self.resolve_variable(variable);
+
         let id = self.interner.push_expr(HirExpression::Ident(expr.clone(), generics.clone()));
         self.interner.push_expr_location(id, span, self.file);
         let typ = self.type_check_variable(expr, id, generics);
@@ -415,16 +420,6 @@ impl<'context> Elaborator<'context> {
                 match self.interner.definition(hir_ident.id).kind {
                     DefinitionKind::Function(id) => {
                         if let Some(current_item) = self.current_item {
-                            // Lazily evaluate functions found within globals if necessary.
-                            // Otherwise if we later attempt to evaluate the global it will
-                            // see an empty function body.
-                            if matches!(current_item, DependencyId::Global(_)) {
-                                let meta = self.interner.function_meta(&id);
-
-                                if matches!(&meta.function_body, FunctionBody::Unresolved(..)) {
-                                    self.elaborate_function(id);
-                                }
-                            }
                             self.interner.add_function_dependency(current_item, id);
                         }
                     }
@@ -475,8 +470,8 @@ impl<'context> Elaborator<'context> {
 
             for (param, arg) in the_trait.generics.iter().zip(&constraint.trait_generics) {
                 // Avoid binding t = t
-                if !arg.occurs(param.id()) {
-                    bindings.insert(param.id(), (param.clone(), arg.clone()));
+                if !arg.occurs(param.type_var.id()) {
+                    bindings.insert(param.type_var.id(), (param.type_var.clone(), arg.clone()));
                 }
             }
 
diff --git a/compiler/noirc_frontend/src/elaborator/statements.rs b/compiler/noirc_frontend/src/elaborator/statements.rs
index dd3e2778726..0d67c9ed3e3 100644
--- a/compiler/noirc_frontend/src/elaborator/statements.rs
+++ b/compiler/noirc_frontend/src/elaborator/statements.rs
@@ -206,7 +206,10 @@ impl<'context> Elaborator<'context> {
     }
 
     fn elaborate_jump(&mut self, is_break: bool, span: noirc_errors::Span) -> (HirStatement, Type) {
-        if !self.in_unconstrained_fn {
+        let in_constrained_function = self
+            .current_function
+            .map_or(true, |func_id| !self.interner.function_modifiers(&func_id).is_unconstrained);
+        if in_constrained_function {
             self.push_err(ResolverError::JumpInConstrainedFn { is_break, span });
         }
         if self.nested_loops == 0 {
@@ -432,7 +435,8 @@ impl<'context> Elaborator<'context> {
     fn elaborate_comptime_statement(&mut self, statement: Statement) -> (HirStatement, Type) {
         let span = statement.span;
         let (hir_statement, _typ) = self.elaborate_statement(statement);
-        let mut interpreter = Interpreter::new(self.interner, &mut self.comptime_scopes);
+        let mut interpreter =
+            Interpreter::new(self.interner, &mut self.comptime_scopes, self.crate_id);
         let value = interpreter.evaluate_statement(hir_statement);
         let (expr, typ) = self.inline_comptime_value(value, span);
         (HirStatement::Expression(expr), typ)
diff --git a/compiler/noirc_frontend/src/elaborator/traits.rs b/compiler/noirc_frontend/src/elaborator/traits.rs
index 3e04dbc784a..77ac8e476f8 100644
--- a/compiler/noirc_frontend/src/elaborator/traits.rs
+++ b/compiler/noirc_frontend/src/elaborator/traits.rs
@@ -1,10 +1,12 @@
-use std::collections::BTreeMap;
+use std::{collections::BTreeMap, rc::Rc};
 
 use iter_extended::vecmap;
 use noirc_errors::Location;
 
 use crate::{
-    ast::{FunctionKind, TraitItem, UnresolvedGenerics, UnresolvedTraitConstraint},
+    ast::{
+        FunctionKind, TraitItem, UnresolvedGeneric, UnresolvedGenerics, UnresolvedTraitConstraint,
+    },
     hir::def_collector::dc_crate::UnresolvedTrait,
     hir_def::traits::{TraitConstant, TraitFunction, TraitType},
     macros_api::{
@@ -13,7 +15,7 @@ use crate::{
     },
     node_interner::{FuncId, TraitId},
     token::Attributes,
-    Type, TypeVariableKind,
+    Kind, ResolvedGeneric, Type, TypeVariableKind,
 };
 
 use super::Elaborator;
@@ -22,7 +24,11 @@ impl<'context> Elaborator<'context> {
     pub fn collect_traits(&mut self, traits: BTreeMap<TraitId, UnresolvedTrait>) {
         for (trait_id, unresolved_trait) in traits {
             self.recover_generics(|this| {
-                this.add_generics(&unresolved_trait.trait_def.generics);
+                let resolved_generics = this.interner.get_trait(trait_id).generics.clone();
+                this.add_existing_generics(
+                    &unresolved_trait.trait_def.generics,
+                    &resolved_generics,
+                );
 
                 // Resolve order
                 // 1. Trait Types ( Trait constants can have a trait type, therefore types before constants)
@@ -34,7 +40,6 @@ impl<'context> Elaborator<'context> {
 
                 this.interner.update_trait(trait_id, |trait_def| {
                     trait_def.set_methods(methods);
-                    trait_def.generics = vecmap(&this.generics, |(_, generic, _)| generic.clone());
                 });
             });
 
@@ -87,10 +92,20 @@ impl<'context> Elaborator<'context> {
                         Type::TypeVariable(self_typevar.clone(), TypeVariableKind::Normal);
                     let name_span = the_trait.name.span();
 
-                    this.add_existing_generic("Self", name_span, self_typevar);
+                    this.add_existing_generic(
+                        &UnresolvedGeneric::Variable(Ident::from("Self")),
+                        name_span,
+                        &ResolvedGeneric {
+                            name: Rc::new("Self".to_owned()),
+                            type_var: self_typevar,
+                            span: name_span,
+                            kind: Kind::Normal,
+                        },
+                    );
                     this.self_type = Some(self_type.clone());
 
                     let func_id = unresolved_trait.method_ids[&name.0.contents];
+
                     this.resolve_trait_function(
                         name,
                         generics,
@@ -105,7 +120,7 @@ impl<'context> Elaborator<'context> {
                     let arguments = vecmap(&func_meta.parameters.0, |(_, typ, _)| typ.clone());
                     let return_type = func_meta.return_type().clone();
 
-                    let generics = vecmap(&this.generics, |(_, type_var, _)| type_var.clone());
+                    let generics = vecmap(&this.generics, |generic| generic.type_var.clone());
 
                     let default_impl_list: Vec<_> = unresolved_trait
                         .fns_with_default_impl
@@ -147,6 +162,7 @@ impl<'context> Elaborator<'context> {
         func_id: FuncId,
     ) {
         let old_generic_count = self.generics.len();
+
         self.scopes.start_function();
 
         let kind = FunctionKind::Normal;
diff --git a/compiler/noirc_frontend/src/elaborator/types.rs b/compiler/noirc_frontend/src/elaborator/types.rs
index 3baa7054fc5..63cab40f9d3 100644
--- a/compiler/noirc_frontend/src/elaborator/types.rs
+++ b/compiler/noirc_frontend/src/elaborator/types.rs
@@ -5,13 +5,16 @@ use iter_extended::vecmap;
 use noirc_errors::{Location, Span};
 
 use crate::{
-    ast::{BinaryOpKind, IntegerBitSize, UnresolvedGenerics, UnresolvedTypeExpression},
+    ast::{
+        BinaryOpKind, IntegerBitSize, UnresolvedGeneric, UnresolvedGenerics,
+        UnresolvedTypeExpression,
+    },
     hir::{
         comptime::{Interpreter, Value},
         def_map::ModuleDefId,
         resolution::{
             errors::ResolverError,
-            resolver::{verify_mutable_reference, SELF_TYPE_NAME},
+            resolver::{verify_mutable_reference, SELF_TYPE_NAME, WILDCARD_TYPE},
         },
         type_check::{Source, TypeCheckError},
     },
@@ -28,61 +31,90 @@ use crate::{
         UnaryOp, UnresolvedType, UnresolvedTypeData,
     },
     node_interner::{DefinitionKind, ExprId, GlobalId, TraitId, TraitImplKind, TraitMethodId},
-    Generics, Type, TypeBinding, TypeVariable, TypeVariableKind,
+    Generics, Kind, ResolvedGeneric, Type, TypeBinding, TypeVariable, TypeVariableKind,
 };
 
 use super::{lints, Elaborator};
 
 impl<'context> Elaborator<'context> {
-    /// Translates an UnresolvedType to a Type
+    /// Translates an UnresolvedType to a Type with a `TypeKind::Normal`
     pub(super) fn resolve_type(&mut self, typ: UnresolvedType) -> Type {
         let span = typ.span;
-        let resolved_type = self.resolve_type_inner(typ);
+        let resolved_type = self.resolve_type_inner(typ, &Kind::Normal);
         if resolved_type.is_nested_slice() {
-            self.push_err(ResolverError::NestedSlices { span: span.unwrap() });
+            self.push_err(ResolverError::NestedSlices {
+                span: span.expect("Type should have span"),
+            });
         }
         resolved_type
     }
 
     /// Translates an UnresolvedType into a Type and appends any
     /// freshly created TypeVariables created to new_variables.
-    pub fn resolve_type_inner(&mut self, typ: UnresolvedType) -> Type {
+    pub fn resolve_type_inner(&mut self, typ: UnresolvedType, kind: &Kind) -> Type {
         use crate::ast::UnresolvedTypeData::*;
 
+        let span = typ.span;
+
         let resolved_type = match typ.typ {
             FieldElement => Type::FieldElement,
             Array(size, elem) => {
-                let elem = Box::new(self.resolve_type_inner(*elem));
-                let size = self.convert_expression_type(size);
+                let elem = Box::new(self.resolve_type_inner(*elem, kind));
+                let mut size = self.convert_expression_type(size);
+                // TODO(https://github.com/noir-lang/noir/issues/5156): Remove this once we only have explicit numeric generics
+                if let Type::NamedGeneric(type_var, name, _) = size {
+                    size = Type::NamedGeneric(
+                        type_var,
+                        name,
+                        Kind::Numeric(Box::new(Type::default_int_type())),
+                    );
+                }
                 Type::Array(Box::new(size), elem)
             }
             Slice(elem) => {
-                let elem = Box::new(self.resolve_type_inner(*elem));
+                let elem = Box::new(self.resolve_type_inner(*elem, kind));
                 Type::Slice(elem)
             }
             Expression(expr) => self.convert_expression_type(expr),
             Integer(sign, bits) => Type::Integer(sign, bits),
             Bool => Type::Bool,
             String(size) => {
-                let resolved_size = self.convert_expression_type(size);
+                let mut resolved_size = self.convert_expression_type(size);
+                // TODO(https://github.com/noir-lang/noir/issues/5156): Remove this once we only have explicit numeric generics
+                if let Type::NamedGeneric(type_var, name, _) = resolved_size {
+                    resolved_size = Type::NamedGeneric(
+                        type_var,
+                        name,
+                        Kind::Numeric(Box::new(Type::default_int_type())),
+                    );
+                }
                 Type::String(Box::new(resolved_size))
             }
             FormatString(size, fields) => {
-                let resolved_size = self.convert_expression_type(size);
-                let fields = self.resolve_type_inner(*fields);
+                let mut resolved_size = self.convert_expression_type(size);
+                if let Type::NamedGeneric(type_var, name, _) = resolved_size {
+                    resolved_size = Type::NamedGeneric(
+                        type_var,
+                        name,
+                        Kind::Numeric(Box::new(Type::default_int_type())),
+                    );
+                }
+                let fields = self.resolve_type_inner(*fields, kind);
                 Type::FmtString(Box::new(resolved_size), Box::new(fields))
             }
-            Code => Type::Code,
+            Quoted(quoted) => Type::Quoted(quoted),
             Unit => Type::Unit,
             Unspecified => Type::Error,
             Error => Type::Error,
             Named(path, args, _) => self.resolve_named_type(path, args),
             TraitAsType(path, args) => self.resolve_trait_as_type(path, args),
 
-            Tuple(fields) => Type::Tuple(vecmap(fields, |field| self.resolve_type_inner(field))),
+            Tuple(fields) => {
+                Type::Tuple(vecmap(fields, |field| self.resolve_type_inner(field, kind)))
+            }
             Function(args, ret, env) => {
-                let args = vecmap(args, |arg| self.resolve_type_inner(arg));
-                let ret = Box::new(self.resolve_type_inner(*ret));
+                let args = vecmap(args, |arg| self.resolve_type_inner(arg, kind));
+                let ret = Box::new(self.resolve_type_inner(*ret, kind));
 
                 // expect() here is valid, because the only places we don't have a span are omitted types
                 // e.g. a function without return type implicitly has a spanless UnresolvedType::Unit return type
@@ -90,10 +122,10 @@ impl<'context> Elaborator<'context> {
                 let env_span =
                     env.span.expect("Unexpected missing span for closure environment type");
 
-                let env = Box::new(self.resolve_type_inner(*env));
+                let env = Box::new(self.resolve_type_inner(*env, kind));
 
                 match *env {
-                    Type::Unit | Type::Tuple(_) | Type::NamedGeneric(_, _) => {
+                    Type::Unit | Type::Tuple(_) | Type::NamedGeneric(_, _, _) => {
                         Type::Function(args, ret, env)
                     }
                     _ => {
@@ -106,9 +138,10 @@ impl<'context> Elaborator<'context> {
                 }
             }
             MutableReference(element) => {
-                Type::MutableReference(Box::new(self.resolve_type_inner(*element)))
+                Type::MutableReference(Box::new(self.resolve_type_inner(*element, kind)))
             }
-            Parenthesized(typ) => self.resolve_type_inner(*typ),
+            Parenthesized(typ) => self.resolve_type_inner(*typ, kind),
+            Resolved(id) => self.interner.get_quoted_type(id).clone(),
         };
 
         if let Type::Struct(_, _) = resolved_type {
@@ -120,11 +153,36 @@ impl<'context> Elaborator<'context> {
                 );
             }
         }
+
+        // Check that any types with a type kind match the expected type kind supplied to this function
+        // TODO(https://github.com/noir-lang/noir/issues/5156): make this named generic check more general with `*resolved_kind != kind`
+        // as implicit numeric generics still existing makes this check more challenging to enforce
+        // An example of a more general check that we should switch to:
+        // if resolved_type.kind() != kind.clone() {
+        //     let expected_typ_err = CompilationError::TypeError(TypeCheckError::TypeKindMismatch {
+        //         expected_kind: kind.to_string(),
+        //         expr_kind: resolved_type.kind().to_string(),
+        //         expr_span: span.expect("Type should have span"),
+        //     });
+        //     self.errors.push((expected_typ_err, self.file));
+        //     return Type::Error;
+        // }
+        if let Type::NamedGeneric(_, name, resolved_kind) = &resolved_type {
+            if matches!(resolved_kind, Kind::Numeric { .. }) && matches!(kind, Kind::Normal) {
+                let expected_typ_err = ResolverError::NumericGenericUsedForType {
+                    name: name.to_string(),
+                    span: span.expect("Type should have span"),
+                };
+                self.push_err(expected_typ_err);
+                return Type::Error;
+            }
+        }
+
         resolved_type
     }
 
-    pub fn find_generic(&self, target_name: &str) -> Option<&(Rc<String>, TypeVariable, Span)> {
-        self.generics.iter().find(|(name, _, _)| name.as_ref() == target_name)
+    pub fn find_generic(&self, target_name: &str) -> Option<&ResolvedGeneric> {
+        self.generics.iter().find(|generic| generic.name.as_ref() == target_name)
     }
 
     fn resolve_named_type(&mut self, path: Path, args: Vec<UnresolvedType>) -> Type {
@@ -146,11 +204,12 @@ impl<'context> Elaborator<'context> {
                     }
                     return self_type;
                 }
+            } else if name == WILDCARD_TYPE {
+                return self.interner.next_type_variable();
             }
         }
 
         let span = path.span();
-        let mut args = vecmap(args, |arg| self.resolve_type_inner(arg));
 
         if let Some(type_alias) = self.lookup_type_alias(path.clone()) {
             let type_alias = type_alias.borrow();
@@ -158,6 +217,10 @@ impl<'context> Elaborator<'context> {
             let type_alias_string = type_alias.to_string();
             let id = type_alias.id;
 
+            let mut args = vecmap(type_alias.generics.iter().zip(args), |(generic, arg)| {
+                self.resolve_type_inner(arg, &generic.kind)
+            });
+
             self.verify_generics_count(expected_generic_count, &mut args, span, || {
                 type_alias_string
             });
@@ -190,7 +253,7 @@ impl<'context> Elaborator<'context> {
                 }
 
                 let expected_generic_count = struct_type.borrow().generics.len();
-                if !self.in_contract
+                if !self.in_contract()
                     && self
                         .interner
                         .struct_attributes(&struct_type.borrow().id)
@@ -201,6 +264,12 @@ impl<'context> Elaborator<'context> {
                         span: struct_type.borrow().name.span(),
                     });
                 }
+
+                let mut args =
+                    vecmap(struct_type.borrow().generics.iter().zip(args), |(generic, arg)| {
+                        self.resolve_type_inner(arg, &generic.kind)
+                    });
+
                 self.verify_generics_count(expected_generic_count, &mut args, span, || {
                     struct_type.borrow().to_string()
                 });
@@ -217,10 +286,19 @@ impl<'context> Elaborator<'context> {
     }
 
     fn resolve_trait_as_type(&mut self, path: Path, args: Vec<UnresolvedType>) -> Type {
-        let args = vecmap(args, |arg| self.resolve_type_inner(arg));
-
-        if let Some(t) = self.lookup_trait_or_error(path) {
-            Type::TraitAsType(t.id, Rc::new(t.name.to_string()), args)
+        // Fetch information needed from the trait as the closure for resolving all the `args`
+        // requires exclusive access to `self`
+        let trait_as_type_info = self
+            .lookup_trait_or_error(path)
+            .map(|t| (t.id, Rc::new(t.name.to_string()), t.generics.clone()));
+
+        if let Some((id, name, resolved_generics)) = trait_as_type_info {
+            assert_eq!(resolved_generics.len(), args.len());
+            let generics_with_types = resolved_generics.iter().zip(args);
+            let args = vecmap(generics_with_types, |(generic, typ)| {
+                self.resolve_type_inner(typ, &generic.kind)
+            });
+            Type::TraitAsType(id, Rc::new(name.to_string()), args)
         } else {
             Type::Error
         }
@@ -249,8 +327,9 @@ impl<'context> Elaborator<'context> {
     pub fn lookup_generic_or_global_type(&mut self, path: &Path) -> Option<Type> {
         if path.segments.len() == 1 {
             let name = &path.last_segment().0.contents;
-            if let Some((name, var, _)) = self.find_generic(name) {
-                return Some(Type::NamedGeneric(var.clone(), name.clone()));
+            if let Some(generic) = self.find_generic(name) {
+                let generic = generic.clone();
+                return Some(Type::NamedGeneric(generic.type_var, generic.name, generic.kind));
             }
         }
 
@@ -316,9 +395,12 @@ impl<'context> Elaborator<'context> {
 
                 let constraint = TraitConstraint {
                     typ: self.self_type.clone()?,
-                    trait_generics: Type::from_generics(&the_trait.generics),
+                    trait_generics: Type::from_generics(&vecmap(&the_trait.generics, |generic| {
+                        generic.type_var.clone()
+                    })),
                     trait_id,
                 };
+
                 return Some((method, constraint, false));
             }
         }
@@ -347,7 +429,9 @@ impl<'context> Elaborator<'context> {
                     the_trait.self_type_typevar.clone(),
                     TypeVariableKind::Normal,
                 ),
-                trait_generics: Type::from_generics(&the_trait.generics),
+                trait_generics: Type::from_generics(&vecmap(&the_trait.generics, |generic| {
+                    generic.type_var.clone()
+                })),
                 trait_id,
             };
             return Some((method, constraint, false));
@@ -369,7 +453,7 @@ impl<'context> Elaborator<'context> {
         }
 
         for constraint in self.trait_bounds.clone() {
-            if let Type::NamedGeneric(_, name) = &constraint.typ {
+            if let Type::NamedGeneric(_, name, _) = &constraint.typ {
                 // if `path` is `T::method_name`, we're looking for constraint of the form `T: SomeTrait`
                 if path.segments[0].0.contents != name.as_str() {
                     continue;
@@ -1075,7 +1159,7 @@ impl<'context> Elaborator<'context> {
                 });
                 None
             }
-            Type::NamedGeneric(_, _) => {
+            Type::NamedGeneric(_, _, _) => {
                 let func_meta = self.interner.function_meta(
                     &self.current_function.expect("unexpected method outside a function"),
                 );
@@ -1351,26 +1435,34 @@ impl<'context> Elaborator<'context> {
         }
     }
 
-    pub fn add_existing_generics(&mut self, names: &UnresolvedGenerics, generics: &Generics) {
-        assert_eq!(names.len(), generics.len());
+    pub fn add_existing_generics(
+        &mut self,
+        unresolved_generics: &UnresolvedGenerics,
+        generics: &Generics,
+    ) {
+        assert_eq!(unresolved_generics.len(), generics.len());
 
-        for (name, typevar) in names.iter().zip(generics) {
-            self.add_existing_generic(&name.0.contents, name.0.span(), typevar.clone());
+        for (unresolved_generic, generic) in unresolved_generics.iter().zip(generics) {
+            self.add_existing_generic(unresolved_generic, unresolved_generic.span(), generic);
         }
     }
 
-    pub fn add_existing_generic(&mut self, name: &str, span: Span, typevar: TypeVariable) {
-        // Check for name collisions of this generic
-        let rc_name = Rc::new(name.to_owned());
+    pub fn add_existing_generic(
+        &mut self,
+        unresolved_generic: &UnresolvedGeneric,
+        span: Span,
+        resolved_generic: &ResolvedGeneric,
+    ) {
+        let name = &unresolved_generic.ident().0.contents;
 
-        if let Some((_, _, first_span)) = self.find_generic(&rc_name) {
+        if let Some(generic) = self.find_generic(name) {
             self.push_err(ResolverError::DuplicateDefinition {
-                name: name.to_owned(),
-                first_span: *first_span,
+                name: name.clone(),
+                first_span: generic.span,
                 second_span: span,
             });
         } else {
-            self.generics.push((rc_name, typevar, span));
+            self.generics.push(resolved_generic.clone());
         }
     }
 
@@ -1395,8 +1487,8 @@ impl<'context> Elaborator<'context> {
             | Type::Error
             | Type::TypeVariable(_, _)
             | Type::Constant(_)
-            | Type::NamedGeneric(_, _)
-            | Type::Code
+            | Type::NamedGeneric(_, _, _)
+            | Type::Quoted(_)
             | Type::Forall(_, _) => (),
 
             Type::TraitAsType(_, _, args) => {
@@ -1406,7 +1498,7 @@ impl<'context> Elaborator<'context> {
             }
 
             Type::Array(length, element_type) => {
-                if let Type::NamedGeneric(type_variable, name) = length.as_ref() {
+                if let Type::NamedGeneric(type_variable, name, _) = length.as_ref() {
                     found.insert(name.to_string(), type_variable.clone());
                 }
                 Self::find_numeric_generics_in_type(element_type, found);
@@ -1431,7 +1523,7 @@ impl<'context> Elaborator<'context> {
 
             Type::Struct(struct_type, generics) => {
                 for (i, generic) in generics.iter().enumerate() {
-                    if let Type::NamedGeneric(type_variable, name) = generic {
+                    if let Type::NamedGeneric(type_variable, name, _) = generic {
                         if struct_type.borrow().generic_is_numeric(i) {
                             found.insert(name.to_string(), type_variable.clone());
                         }
@@ -1442,7 +1534,7 @@ impl<'context> Elaborator<'context> {
             }
             Type::Alias(alias, generics) => {
                 for (i, generic) in generics.iter().enumerate() {
-                    if let Type::NamedGeneric(type_variable, name) = generic {
+                    if let Type::NamedGeneric(type_variable, name, _) = generic {
                         if alias.borrow().generic_is_numeric(i) {
                             found.insert(name.to_string(), type_variable.clone());
                         }
@@ -1453,12 +1545,12 @@ impl<'context> Elaborator<'context> {
             }
             Type::MutableReference(element) => Self::find_numeric_generics_in_type(element, found),
             Type::String(length) => {
-                if let Type::NamedGeneric(type_variable, name) = length.as_ref() {
+                if let Type::NamedGeneric(type_variable, name, _) = length.as_ref() {
                     found.insert(name.to_string(), type_variable.clone());
                 }
             }
             Type::FmtString(length, fields) => {
-                if let Type::NamedGeneric(type_variable, name) = length.as_ref() {
+                if let Type::NamedGeneric(type_variable, name, _) = length.as_ref() {
                     found.insert(name.to_string(), type_variable.clone());
                 }
                 Self::find_numeric_generics_in_type(fields, found);
diff --git a/compiler/noirc_frontend/src/elaborator/unquote.rs b/compiler/noirc_frontend/src/elaborator/unquote.rs
new file mode 100644
index 00000000000..ed12ba21398
--- /dev/null
+++ b/compiler/noirc_frontend/src/elaborator/unquote.rs
@@ -0,0 +1,41 @@
+use crate::{
+    macros_api::Path,
+    token::{SpannedToken, Token, Tokens},
+};
+
+use super::Elaborator;
+
+impl<'a> Elaborator<'a> {
+    /// Go through the given tokens looking for a '$' token followed by a variable to unquote.
+    /// Each time these two tokens are found, they are replaced by a new UnquoteMarker token
+    /// containing the ExprId of the resolved variable to unquote.
+    pub fn find_unquoted_exprs_tokens(&mut self, tokens: Tokens) -> Tokens {
+        let token_count = tokens.0.len();
+        let mut new_tokens = Vec::with_capacity(token_count);
+        let mut tokens = tokens.0.into_iter();
+
+        while let Some(token) = tokens.next() {
+            let is_unquote = matches!(token.token(), Token::DollarSign);
+            new_tokens.push(token);
+
+            if is_unquote {
+                if let Some(next) = tokens.next() {
+                    let span = next.to_span();
+
+                    match next.into_token() {
+                        Token::Ident(name) => {
+                            // Don't want the leading `$` anymore
+                            new_tokens.pop();
+                            let path = Path::from_single(name, span);
+                            let (expr_id, _) = self.elaborate_variable(path, None);
+                            new_tokens.push(SpannedToken::new(Token::UnquoteMarker(expr_id), span));
+                        }
+                        other_next => new_tokens.push(SpannedToken::new(other_next, span)),
+                    }
+                }
+            }
+        }
+
+        Tokens(new_tokens)
+    }
+}
diff --git a/compiler/noirc_frontend/src/hir/comptime/errors.rs b/compiler/noirc_frontend/src/hir/comptime/errors.rs
index 05962420f8a..697bee733a3 100644
--- a/compiler/noirc_frontend/src/hir/comptime/errors.rs
+++ b/compiler/noirc_frontend/src/hir/comptime/errors.rs
@@ -1,5 +1,11 @@
-use crate::{hir::def_collector::dc_crate::CompilationError, Type};
+use std::rc::Rc;
+
+use crate::{
+    hir::def_collector::dc_crate::CompilationError, parser::ParserError, token::Tokens, Type,
+};
 use acvm::{acir::AcirField, FieldElement};
+use fm::FileId;
+use iter_extended::vecmap;
 use noirc_errors::{CustomDiagnostic, Location};
 
 use super::value::Value;
@@ -35,6 +41,8 @@ pub enum InterpreterError {
     NonStructInConstructor { typ: Type, location: Location },
     CannotInlineMacro { value: Value, location: Location },
     UnquoteFoundDuringEvaluation { location: Location },
+    FailedToParseMacro { error: ParserError, tokens: Rc<Tokens>, rule: &'static str, file: FileId },
+    NonComptimeFnCallInSameCrate { function: String, location: Location },
 
     Unimplemented { item: String, location: Location },
 
@@ -94,9 +102,13 @@ impl InterpreterError {
             | InterpreterError::NonStructInConstructor { location, .. }
             | InterpreterError::CannotInlineMacro { location, .. }
             | InterpreterError::UnquoteFoundDuringEvaluation { location, .. }
+            | InterpreterError::NonComptimeFnCallInSameCrate { location, .. }
             | InterpreterError::Unimplemented { location, .. }
             | InterpreterError::BreakNotInLoop { location, .. }
             | InterpreterError::ContinueNotInLoop { location, .. } => *location,
+            InterpreterError::FailedToParseMacro { error, file, .. } => {
+                Location::new(error.span(), *file)
+            }
             InterpreterError::Break | InterpreterError::Continue => {
                 panic!("Tried to get the location of Break/Continue error!")
             }
@@ -258,6 +270,37 @@ impl<'a> From<&'a InterpreterError> for CustomDiagnostic {
                 let secondary = "This is a bug".into();
                 CustomDiagnostic::simple_error(msg, secondary, location.span)
             }
+            InterpreterError::FailedToParseMacro { error, tokens, rule, file: _ } => {
+                let message = format!("Failed to parse macro's token stream into {rule}");
+                let tokens = vecmap(&tokens.0, ToString::to_string).join(" ");
+
+                // 10 is an aribtrary number of tokens here chosen to fit roughly onto one line
+                let token_stream = if tokens.len() > 10 {
+                    format!("The resulting token stream was: {tokens}")
+                } else {
+                    format!(
+                        "The resulting token stream was: (stream starts on next line)\n  {tokens}"
+                    )
+                };
+
+                let push_the_problem_on_the_library_author = "To avoid this error in the future, try adding input validation to your macro. Erroring out early with an `assert` can be a good way to provide a user-friendly error message".into();
+
+                let mut diagnostic = CustomDiagnostic::from(error);
+                // Swap the parser's primary note to become the secondary note so that it is
+                // more clear this error originates from failing to parse a macro.
+                let secondary = std::mem::take(&mut diagnostic.message);
+                diagnostic.add_secondary(secondary, error.span());
+                diagnostic.message = message;
+                diagnostic.add_note(token_stream);
+                diagnostic.add_note(push_the_problem_on_the_library_author);
+                diagnostic
+            }
+            InterpreterError::NonComptimeFnCallInSameCrate { function, location } => {
+                let msg = format!("`{function}` cannot be called in a `comptime` context here");
+                let secondary =
+                    "This function must be `comptime` or in a separate crate to be called".into();
+                CustomDiagnostic::simple_error(msg, secondary, location.span)
+            }
             InterpreterError::Unimplemented { item, location } => {
                 let msg = format!("{item} is currently unimplemented");
                 CustomDiagnostic::simple_error(msg, String::new(), location.span)
diff --git a/compiler/noirc_frontend/src/hir/comptime/interpreter.rs b/compiler/noirc_frontend/src/hir/comptime/interpreter.rs
index 186eaa58c14..176d82dab84 100644
--- a/compiler/noirc_frontend/src/hir/comptime/interpreter.rs
+++ b/compiler/noirc_frontend/src/hir/comptime/interpreter.rs
@@ -7,6 +7,8 @@ use noirc_errors::Location;
 use rustc_hash::FxHashMap as HashMap;
 
 use crate::ast::{BinaryOpKind, FunctionKind, IntegerBitSize, Signedness};
+use crate::graph::CrateId;
+use crate::token::Tokens;
 use crate::{
     hir_def::{
         expr::{
@@ -28,6 +30,9 @@ use crate::{
 use super::errors::{IResult, InterpreterError};
 use super::value::Value;
 
+mod builtin;
+mod unquote;
+
 #[allow(unused)]
 pub struct Interpreter<'interner> {
     /// To expand macros the Interpreter may mutate hir nodes within the NodeInterner
@@ -38,6 +43,8 @@ pub struct Interpreter<'interner> {
     /// up all currently visible definitions.
     scopes: &'interner mut Vec<HashMap<DefinitionId, Value>>,
 
+    crate_id: CrateId,
+
     in_loop: bool,
 }
 
@@ -46,8 +53,9 @@ impl<'a> Interpreter<'a> {
     pub(crate) fn new(
         interner: &'a mut NodeInterner,
         scopes: &'a mut Vec<HashMap<DefinitionId, Value>>,
+        crate_id: CrateId,
     ) -> Self {
-        Self { interner, scopes, in_loop: false }
+        Self { interner, scopes, crate_id, in_loop: false }
     }
 
     pub(crate) fn call_function(
@@ -56,8 +64,6 @@ impl<'a> Interpreter<'a> {
         arguments: Vec<(Value, Location)>,
         location: Location,
     ) -> IResult<Value> {
-        let previous_state = self.enter_function();
-
         let meta = self.interner.function_meta(&function);
         if meta.parameters.len() != arguments.len() {
             return Err(InterpreterError::ArgumentCountMismatch {
@@ -67,11 +73,21 @@ impl<'a> Interpreter<'a> {
             });
         }
 
+        let is_comptime = self.interner.function_modifiers(&function).is_comptime;
+        if !is_comptime && meta.source_crate == self.crate_id {
+            // Calling non-comptime functions from within the current crate is restricted
+            // as non-comptime items will have not been elaborated yet.
+            let function = self.interner.function_name(&function).to_owned();
+            return Err(InterpreterError::NonComptimeFnCallInSameCrate { function, location });
+        }
+
         if meta.kind != FunctionKind::Normal {
             return self.call_builtin(function, arguments, location);
         }
 
         let parameters = meta.parameters.0.clone();
+        let previous_state = self.enter_function();
+
         for ((parameter, typ, _), (argument, arg_location)) in parameters.iter().zip(arguments) {
             self.define_pattern(parameter, typ, argument, arg_location)?;
         }
@@ -94,16 +110,16 @@ impl<'a> Interpreter<'a> {
             .expect("all builtin functions must contain a function  attribute which contains the opcode which it links to");
 
         if let Some(builtin) = func_attrs.builtin() {
-            let item = format!("Evaluation for builtin functions like {builtin}");
-            Err(InterpreterError::Unimplemented { item, location })
+            let builtin = builtin.clone();
+            builtin::call_builtin(self.interner, &builtin, arguments, location)
         } else if let Some(foreign) = func_attrs.foreign() {
-            let item = format!("Evaluation for foreign functions like {foreign}");
+            let item = format!("Comptime evaluation for foreign functions like {foreign}");
             Err(InterpreterError::Unimplemented { item, location })
         } else if let Some(oracle) = func_attrs.oracle() {
             if oracle == "print" {
                 self.print_oracle(arguments)
             } else {
-                let item = format!("Evaluation for oracle functions like {oracle}");
+                let item = format!("Comptime evaluation for oracle functions like {oracle}");
                 Err(InterpreterError::Unimplemented { item, location })
             }
         } else {
@@ -334,9 +350,9 @@ impl<'a> Interpreter<'a> {
             HirExpression::If(if_) => self.evaluate_if(if_, id),
             HirExpression::Tuple(tuple) => self.evaluate_tuple(tuple),
             HirExpression::Lambda(lambda) => self.evaluate_lambda(lambda, id),
-            HirExpression::Quote(block) => Ok(Value::Code(Rc::new(block))),
+            HirExpression::Quote(tokens) => self.evaluate_quote(tokens, id),
             HirExpression::Comptime(block) => self.evaluate_block(block),
-            HirExpression::Unquote(block) => {
+            HirExpression::Unquote(tokens) => {
                 // An Unquote expression being found is indicative of a macro being
                 // expanded within another comptime fn which we don't currently support.
                 let location = self.interner.expr_location(&id);
@@ -608,10 +624,13 @@ impl<'a> Interpreter<'a> {
         let rhs = self.evaluate(infix.rhs)?;
 
         // TODO: Need to account for operator overloading
-        assert!(
-            self.interner.get_selected_impl_for_expression(id).is_none(),
-            "Operator overloading is unimplemented in the interpreter"
-        );
+        // See https://github.com/noir-lang/noir/issues/4925
+        if self.interner.get_selected_impl_for_expression(id).is_some() {
+            return Err(InterpreterError::Unimplemented {
+                item: "Operator overloading in the interpreter".to_string(),
+                location: infix.operator.location,
+            });
+        }
 
         use InterpreterError::InvalidValuesForBinary;
         match infix.operator.kind {
@@ -927,6 +946,18 @@ impl<'a> Interpreter<'a> {
     fn evaluate_access(&mut self, access: HirMemberAccess, id: ExprId) -> IResult<Value> {
         let (fields, struct_type) = match self.evaluate(access.lhs)? {
             Value::Struct(fields, typ) => (fields, typ),
+            Value::Tuple(fields) => {
+                let (fields, field_types): (HashMap<Rc<String>, Value>, Vec<Type>) = fields
+                    .into_iter()
+                    .enumerate()
+                    .map(|(i, field)| {
+                        let field_type = field.get_type().into_owned();
+                        let key_val_pair = (Rc::new(i.to_string()), field);
+                        (key_val_pair, field_type)
+                    })
+                    .unzip();
+                (fields, Type::Tuple(field_types))
+            }
             value => {
                 let location = self.interner.expr_location(&id);
                 return Err(InterpreterError::NonTupleOrStructInMemberAccess { value, location });
@@ -1127,6 +1158,12 @@ impl<'a> Interpreter<'a> {
         Ok(Value::Closure(lambda, environment, typ))
     }
 
+    fn evaluate_quote(&mut self, mut tokens: Tokens, expr_id: ExprId) -> IResult<Value> {
+        let location = self.interner.expr_location(&expr_id);
+        tokens = self.substitute_unquoted_values_into_tokens(tokens, location)?;
+        Ok(Value::Code(Rc::new(tokens)))
+    }
+
     pub fn evaluate_statement(&mut self, statement: StmtId) -> IResult<Value> {
         match self.interner.statement(&statement) {
             HirStatement::Let(let_) => self.evaluate_let(let_),
diff --git a/compiler/noirc_frontend/src/hir/comptime/interpreter/builtin.rs b/compiler/noirc_frontend/src/hir/comptime/interpreter/builtin.rs
new file mode 100644
index 00000000000..558717533bd
--- /dev/null
+++ b/compiler/noirc_frontend/src/hir/comptime/interpreter/builtin.rs
@@ -0,0 +1,158 @@
+use std::rc::Rc;
+
+use noirc_errors::Location;
+
+use crate::{
+    hir::comptime::{errors::IResult, InterpreterError, Value},
+    macros_api::NodeInterner,
+    token::{SpannedToken, Token, Tokens},
+    QuotedType, Type,
+};
+
+pub(super) fn call_builtin(
+    interner: &mut NodeInterner,
+    name: &str,
+    arguments: Vec<(Value, Location)>,
+    location: Location,
+) -> IResult<Value> {
+    match name {
+        "array_len" => array_len(&arguments),
+        "as_slice" => as_slice(arguments),
+        "slice_push_back" => slice_push_back(arguments),
+        "type_def_as_type" => type_def_as_type(interner, arguments),
+        "type_def_generics" => type_def_generics(interner, arguments),
+        "type_def_fields" => type_def_fields(interner, arguments),
+        _ => {
+            let item = format!("Comptime evaluation for builtin function {name}");
+            Err(InterpreterError::Unimplemented { item, location })
+        }
+    }
+}
+
+fn array_len(arguments: &[(Value, Location)]) -> IResult<Value> {
+    assert_eq!(arguments.len(), 1, "ICE: `array_len` should only receive a single argument");
+    match &arguments[0].0 {
+        Value::Array(values, _) | Value::Slice(values, _) => Ok(Value::U32(values.len() as u32)),
+        // Type checking should prevent this branch being taken.
+        _ => unreachable!("ICE: Cannot query length of types other than arrays or slices"),
+    }
+}
+
+fn as_slice(mut arguments: Vec<(Value, Location)>) -> IResult<Value> {
+    assert_eq!(arguments.len(), 1, "ICE: `as_slice` should only receive a single argument");
+    let (array, _) = arguments.pop().unwrap();
+    match array {
+        Value::Array(values, Type::Array(_, typ)) => Ok(Value::Slice(values, Type::Slice(typ))),
+        // Type checking should prevent this branch being taken.
+        _ => unreachable!("ICE: Cannot convert types other than arrays into slices"),
+    }
+}
+
+fn slice_push_back(mut arguments: Vec<(Value, Location)>) -> IResult<Value> {
+    assert_eq!(arguments.len(), 2, "ICE: `slice_push_back` should only receive two arguments");
+    let (element, _) = arguments.pop().unwrap();
+    let (slice, _) = arguments.pop().unwrap();
+    match slice {
+        Value::Slice(mut values, typ) => {
+            values.push_back(element);
+            Ok(Value::Slice(values, typ))
+        }
+        // Type checking should prevent this branch being taken.
+        _ => unreachable!("ICE: `slice_push_back` expects a slice as its first argument"),
+    }
+}
+
+/// fn as_type(self) -> Quoted
+fn type_def_as_type(
+    interner: &NodeInterner,
+    mut arguments: Vec<(Value, Location)>,
+) -> IResult<Value> {
+    assert_eq!(arguments.len(), 1, "ICE: `generics` should only receive a single argument");
+    let (type_def, span) = match arguments.pop() {
+        Some((Value::TypeDefinition(id), location)) => (id, location.span),
+        other => {
+            unreachable!("ICE: `as_type` expected a `TypeDefinition` argument, found {other:?}")
+        }
+    };
+
+    let struct_def = interner.get_struct(type_def);
+    let struct_def = struct_def.borrow();
+    let make_token = |name| SpannedToken::new(Token::Str(name), span);
+
+    let mut tokens = vec![make_token(struct_def.name.to_string())];
+
+    for (i, generic) in struct_def.generics.iter().enumerate() {
+        if i != 0 {
+            tokens.push(SpannedToken::new(Token::Comma, span));
+        }
+        tokens.push(make_token(generic.type_var.borrow().to_string()));
+    }
+
+    Ok(Value::Code(Rc::new(Tokens(tokens))))
+}
+
+/// fn generics(self) -> [Quoted]
+fn type_def_generics(
+    interner: &NodeInterner,
+    mut arguments: Vec<(Value, Location)>,
+) -> IResult<Value> {
+    assert_eq!(arguments.len(), 1, "ICE: `generics` should only receive a single argument");
+    let (type_def, span) = match arguments.pop() {
+        Some((Value::TypeDefinition(id), location)) => (id, location.span),
+        other => {
+            unreachable!("ICE: `as_type` expected a `TypeDefinition` argument, found {other:?}")
+        }
+    };
+
+    let struct_def = interner.get_struct(type_def);
+
+    let generics = struct_def
+        .borrow()
+        .generics
+        .iter()
+        .map(|generic| {
+            let name = SpannedToken::new(Token::Str(generic.type_var.borrow().to_string()), span);
+            Value::Code(Rc::new(Tokens(vec![name])))
+        })
+        .collect();
+
+    let typ = Type::Slice(Box::new(Type::Quoted(QuotedType::Quoted)));
+    Ok(Value::Slice(generics, typ))
+}
+
+/// fn fields(self) -> [(Quoted, Quoted)]
+/// Returns (name, type) pairs of each field of this TypeDefinition
+fn type_def_fields(
+    interner: &mut NodeInterner,
+    mut arguments: Vec<(Value, Location)>,
+) -> IResult<Value> {
+    assert_eq!(arguments.len(), 1, "ICE: `generics` should only receive a single argument");
+    let (type_def, span) = match arguments.pop() {
+        Some((Value::TypeDefinition(id), location)) => (id, location.span),
+        other => {
+            unreachable!("ICE: `as_type` expected a `TypeDefinition` argument, found {other:?}")
+        }
+    };
+
+    let struct_def = interner.get_struct(type_def);
+    let struct_def = struct_def.borrow();
+
+    let make_token = |name| SpannedToken::new(Token::Str(name), span);
+    let make_quoted = |tokens| Value::Code(Rc::new(Tokens(tokens)));
+
+    let mut fields = im::Vector::new();
+
+    for (name, typ) in struct_def.get_fields_as_written() {
+        let name = make_quoted(vec![make_token(name)]);
+        let id = interner.push_quoted_type(typ);
+        let typ = SpannedToken::new(Token::QuotedType(id), span);
+        let typ = Value::Code(Rc::new(Tokens(vec![typ])));
+        fields.push_back(Value::Tuple(vec![name, typ]));
+    }
+
+    let typ = Type::Slice(Box::new(Type::Tuple(vec![
+        Type::Quoted(QuotedType::Quoted),
+        Type::Quoted(QuotedType::Quoted),
+    ])));
+    Ok(Value::Slice(fields, typ))
+}
diff --git a/compiler/noirc_frontend/src/hir/comptime/interpreter/unquote.rs b/compiler/noirc_frontend/src/hir/comptime/interpreter/unquote.rs
new file mode 100644
index 00000000000..a1ceb27afb2
--- /dev/null
+++ b/compiler/noirc_frontend/src/hir/comptime/interpreter/unquote.rs
@@ -0,0 +1,42 @@
+use noirc_errors::Location;
+
+use crate::{
+    hir::comptime::{errors::IResult, value::unwrap_rc, Value},
+    token::{SpannedToken, Token, Tokens},
+};
+
+use super::Interpreter;
+
+impl<'a> Interpreter<'a> {
+    /// Evaluates any expressions within UnquoteMarkers in the given token list
+    /// and replaces the expression held by the marker with the evaluated value
+    /// in expression form.
+    pub(super) fn substitute_unquoted_values_into_tokens(
+        &mut self,
+        tokens: Tokens,
+        location: Location,
+    ) -> IResult<Tokens> {
+        let mut new_tokens = Vec::with_capacity(tokens.0.len());
+
+        for token in tokens.0 {
+            let span = token.to_span();
+            match token.token() {
+                Token::UnquoteMarker(id) => {
+                    match self.evaluate(*id)? {
+                        // If the value is already quoted we don't want to change the token stream by
+                        // turning it into a Quoted block (which would add `quote`, `{`, and `}` tokens).
+                        Value::Code(stream) => new_tokens.extend(unwrap_rc(stream).0),
+                        value => {
+                            let new_id = value.into_hir_expression(self.interner, location)?;
+                            let new_token = Token::UnquoteMarker(new_id);
+                            new_tokens.push(SpannedToken::new(new_token, span));
+                        }
+                    }
+                }
+                _ => new_tokens.push(token),
+            }
+        }
+
+        Ok(Tokens(new_tokens))
+    }
+}
diff --git a/compiler/noirc_frontend/src/hir/comptime/scan.rs b/compiler/noirc_frontend/src/hir/comptime/scan.rs
index 9e3b03ef525..41526caa60d 100644
--- a/compiler/noirc_frontend/src/hir/comptime/scan.rs
+++ b/compiler/noirc_frontend/src/hir/comptime/scan.rs
@@ -102,7 +102,7 @@ impl<'interner> Interpreter<'interner> {
             // missed it somehow. In the future we may allow users to manually write unquote
             // expressions in their code but for now this is unreachable.
             HirExpression::Unquote(block) => {
-                unreachable!("Found unquote block while scanning: {block}")
+                unreachable!("Found unquote block while scanning: {block:?}")
             }
         }
     }
diff --git a/compiler/noirc_frontend/src/hir/comptime/tests.rs b/compiler/noirc_frontend/src/hir/comptime/tests.rs
index 43f6e21905b..54d8f1f1fad 100644
--- a/compiler/noirc_frontend/src/hir/comptime/tests.rs
+++ b/compiler/noirc_frontend/src/hir/comptime/tests.rs
@@ -7,12 +7,13 @@ use noirc_errors::Location;
 use super::errors::InterpreterError;
 use super::interpreter::Interpreter;
 use super::value::Value;
+use crate::graph::CrateId;
 use crate::hir::type_check::test::type_check_src_code;
 
 fn interpret_helper(src: &str, func_namespace: Vec<String>) -> Result<Value, InterpreterError> {
     let (mut interner, main_id) = type_check_src_code(src, func_namespace);
     let mut scopes = vec![HashMap::default()];
-    let mut interpreter = Interpreter::new(&mut interner, &mut scopes);
+    let mut interpreter = Interpreter::new(&mut interner, &mut scopes, CrateId::Root(0));
 
     let no_location = Location::dummy();
     interpreter.call_function(main_id, Vec::new(), no_location)
@@ -30,14 +31,14 @@ fn interpret_expect_error(src: &str, func_namespace: Vec<String>) -> Interpreter
 
 #[test]
 fn interpreter_works() {
-    let program = "fn main() -> pub Field { 3 }";
+    let program = "comptime fn main() -> pub Field { 3 }";
     let result = interpret(program, vec!["main".into()]);
     assert_eq!(result, Value::Field(3u128.into()));
 }
 
 #[test]
 fn mutation_works() {
-    let program = "fn main() -> pub i8 {
+    let program = "comptime fn main() -> pub i8 {
         let mut x = 3;
         x = 4;
         x
@@ -48,7 +49,7 @@ fn mutation_works() {
 
 #[test]
 fn mutating_references() {
-    let program = "fn main() -> pub i32 {
+    let program = "comptime fn main() -> pub i32 {
         let x = &mut 3;
         *x = 4;
         *x
@@ -59,7 +60,7 @@ fn mutating_references() {
 
 #[test]
 fn mutating_mutable_references() {
-    let program = "fn main() -> pub i64 {
+    let program = "comptime fn main() -> pub i64 {
         let mut x = &mut 3;
         *x = 4;
         *x
@@ -70,7 +71,7 @@ fn mutating_mutable_references() {
 
 #[test]
 fn mutating_arrays() {
-    let program = "fn main() -> pub u8 {
+    let program = "comptime fn main() -> pub u8 {
         let mut a1 = [1, 2, 3, 4];
         a1[1] = 22;
         a1[1]
@@ -81,7 +82,7 @@ fn mutating_arrays() {
 
 #[test]
 fn mutate_in_new_scope() {
-    let program = "fn main() -> pub u8 {
+    let program = "comptime fn main() -> pub u8 {
         let mut x = 0;
         x += 1;
         {
@@ -95,7 +96,7 @@ fn mutate_in_new_scope() {
 
 #[test]
 fn for_loop() {
-    let program = "fn main() -> pub u8 {
+    let program = "comptime fn main() -> pub u8 {
         let mut x = 0;
         for i in 0 .. 6 {
             x += i;
@@ -108,7 +109,7 @@ fn for_loop() {
 
 #[test]
 fn for_loop_u16() {
-    let program = "fn main() -> pub u16 {
+    let program = "comptime fn main() -> pub u16 {
         let mut x = 0;
         for i in 0 .. 6 {
             x += i;
@@ -121,7 +122,7 @@ fn for_loop_u16() {
 
 #[test]
 fn for_loop_with_break() {
-    let program = "unconstrained fn main() -> pub u32 {
+    let program = "unconstrained comptime fn main() -> pub u32 {
         let mut x = 0;
         for i in 0 .. 6 {
             if i == 4 {
@@ -137,7 +138,7 @@ fn for_loop_with_break() {
 
 #[test]
 fn for_loop_with_continue() {
-    let program = "unconstrained fn main() -> pub u64 {
+    let program = "unconstrained comptime fn main() -> pub u64 {
         let mut x = 0;
         for i in 0 .. 6 {
             if i == 4 {
@@ -153,7 +154,7 @@ fn for_loop_with_continue() {
 
 #[test]
 fn assert() {
-    let program = "fn main() {
+    let program = "comptime fn main() {
         assert(1 == 1);
     }";
     let result = interpret(program, vec!["main".into()]);
@@ -162,7 +163,7 @@ fn assert() {
 
 #[test]
 fn assert_fail() {
-    let program = "fn main() {
+    let program = "comptime fn main() {
         assert(1 == 2);
     }";
     let result = interpret_expect_error(program, vec!["main".into()]);
@@ -171,7 +172,7 @@ fn assert_fail() {
 
 #[test]
 fn lambda() {
-    let program = "fn main() -> pub u8 {
+    let program = "comptime fn main() -> pub u8 {
         let f = |x: u8| x + 1;
         f(1)
     }";
@@ -182,11 +183,11 @@ fn lambda() {
 #[test]
 fn non_deterministic_recursion() {
     let program = "
-    fn main() -> pub u64 {
+    comptime fn main() -> pub u64 {
         fib(10)
     }
 
-    fn fib(x: u64) -> u64 {
+    comptime fn fib(x: u64) -> u64 {
         if x <= 1 {
             x
         } else {
diff --git a/compiler/noirc_frontend/src/hir/comptime/value.rs b/compiler/noirc_frontend/src/hir/comptime/value.rs
index 11bbbc7484d..d51d69f9226 100644
--- a/compiler/noirc_frontend/src/hir/comptime/value.rs
+++ b/compiler/noirc_frontend/src/hir/comptime/value.rs
@@ -1,20 +1,22 @@
 use std::{borrow::Cow, fmt::Display, rc::Rc};
 
 use acvm::{AcirField, FieldElement};
+use chumsky::Parser;
 use im::Vector;
 use iter_extended::{try_vecmap, vecmap};
 use noirc_errors::Location;
 
 use crate::{
-    ast::{
-        ArrayLiteral, BlockExpression, ConstructorExpression, Ident, IntegerBitSize, Signedness,
-    },
+    ast::{ArrayLiteral, ConstructorExpression, Ident, IntegerBitSize, Signedness},
     hir_def::expr::{HirArrayLiteral, HirConstructorExpression, HirIdent, HirLambda, ImplKind},
     macros_api::{
         Expression, ExpressionKind, HirExpression, HirLiteral, Literal, NodeInterner, Path,
+        StructId,
     },
     node_interner::{ExprId, FuncId},
-    Shared, Type,
+    parser,
+    token::{SpannedToken, Token, Tokens},
+    QuotedType, Shared, Type,
 };
 use rustc_hash::FxHashMap as HashMap;
 
@@ -41,7 +43,8 @@ pub enum Value {
     Pointer(Shared<Value>),
     Array(Vector<Value>, Type),
     Slice(Vector<Value>, Type),
-    Code(Rc<BlockExpression>),
+    Code(Rc<Tokens>),
+    TypeDefinition(StructId),
 }
 
 impl Value {
@@ -70,7 +73,8 @@ impl Value {
             Value::Struct(_, typ) => return Cow::Borrowed(typ),
             Value::Array(_, typ) => return Cow::Borrowed(typ),
             Value::Slice(_, typ) => return Cow::Borrowed(typ),
-            Value::Code(_) => Type::Code,
+            Value::Code(_) => Type::Quoted(QuotedType::Quoted),
+            Value::TypeDefinition(_) => Type::Quoted(QuotedType::TypeDefinition),
             Value::Pointer(element) => {
                 let element = element.borrow().get_type().into_owned();
                 Type::MutableReference(Box::new(element))
@@ -171,8 +175,23 @@ impl Value {
                     try_vecmap(elements, |element| element.into_expression(interner, location))?;
                 ExpressionKind::Literal(Literal::Slice(ArrayLiteral::Standard(elements)))
             }
-            Value::Code(block) => ExpressionKind::Block(unwrap_rc(block)),
-            Value::Pointer(_) => {
+            Value::Code(tokens) => {
+                // Wrap the tokens in '{' and '}' so that we can parse statements as well.
+                let mut tokens_to_parse = tokens.as_ref().clone();
+                tokens_to_parse.0.insert(0, SpannedToken::new(Token::LeftBrace, location.span));
+                tokens_to_parse.0.push(SpannedToken::new(Token::RightBrace, location.span));
+
+                return match parser::expression().parse(tokens_to_parse) {
+                    Ok(expr) => Ok(expr),
+                    Err(mut errors) => {
+                        let error = errors.swap_remove(0);
+                        let file = location.file;
+                        let rule = "an expression";
+                        Err(InterpreterError::FailedToParseMacro { error, file, tokens, rule })
+                    }
+                };
+            }
+            Value::Pointer(_) | Value::TypeDefinition(_) => {
                 return Err(InterpreterError::CannotInlineMacro { value: self, location })
             }
         };
@@ -273,7 +292,7 @@ impl Value {
                 HirExpression::Literal(HirLiteral::Slice(HirArrayLiteral::Standard(elements)))
             }
             Value::Code(block) => HirExpression::Unquote(unwrap_rc(block)),
-            Value::Pointer(_) => {
+            Value::Pointer(_) | Value::TypeDefinition(_) => {
                 return Err(InterpreterError::CannotInlineMacro { value: self, location })
             }
         };
@@ -303,7 +322,7 @@ impl Value {
 }
 
 /// Unwraps an Rc value without cloning the inner value if the reference count is 1. Clones otherwise.
-fn unwrap_rc<T: Clone>(rc: Rc<T>) -> T {
+pub(crate) fn unwrap_rc<T: Clone>(rc: Rc<T>) -> T {
     Rc::try_unwrap(rc).unwrap_or_else(|rc| (*rc).clone())
 }
 
@@ -348,7 +367,14 @@ impl Display for Value {
                 let values = vecmap(values, ToString::to_string);
                 write!(f, "&[{}]", values.join(", "))
             }
-            Value::Code(_) => todo!(),
+            Value::Code(tokens) => {
+                write!(f, "quote {{")?;
+                for token in tokens.0.iter() {
+                    write!(f, " {token}")?;
+                }
+                write!(f, " }}")
+            }
+            Value::TypeDefinition(_) => write!(f, "(type definition)"),
         }
     }
 }
diff --git a/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs b/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
index 9b47a104a40..3f764b76ba9 100644
--- a/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
+++ b/compiler/noirc_frontend/src/hir/def_collector/dc_crate.rs
@@ -5,7 +5,7 @@ use crate::graph::CrateId;
 use crate::hir::comptime::{Interpreter, InterpreterError};
 use crate::hir::def_map::{CrateDefMap, LocalModuleId, ModuleId};
 use crate::hir::resolution::errors::ResolverError;
-use crate::{Type, TypeVariable};
+use crate::{ResolvedGeneric, Type};
 
 use crate::hir::resolution::import::{resolve_import, ImportDirective, PathResolution};
 use crate::hir::resolution::{
@@ -33,7 +33,6 @@ use iter_extended::vecmap;
 use noirc_errors::{CustomDiagnostic, Span};
 use std::collections::{BTreeMap, HashMap};
 
-use std::rc::Rc;
 use std::vec;
 
 #[derive(Default)]
@@ -125,7 +124,7 @@ pub struct UnresolvedTraitImpl {
     pub trait_id: Option<TraitId>,
     pub impl_id: Option<TraitImplId>,
     pub resolved_object_type: Option<Type>,
-    pub resolved_generics: Vec<(Rc<String>, TypeVariable, Span)>,
+    pub resolved_generics: Vec<ResolvedGeneric>,
 
     // The resolved generic on the trait itself. E.g. it is the `<C, D>` in
     // `impl<A, B> Foo<C, D> for Bar<E, F> { ... }`
@@ -256,7 +255,7 @@ impl DefCollector {
         context: &mut Context,
         ast: SortedModule,
         root_file_id: FileId,
-        use_elaborator: bool,
+        use_legacy: bool,
         macro_processors: &[&dyn MacroProcessor],
     ) -> Vec<(CompilationError, FileId)> {
         let mut errors: Vec<(CompilationError, FileId)> = vec![];
@@ -273,7 +272,7 @@ impl DefCollector {
             errors.extend(CrateDefMap::collect_defs(
                 dep.crate_id,
                 context,
-                use_elaborator,
+                use_legacy,
                 macro_processors,
             ));
 
@@ -351,7 +350,7 @@ impl DefCollector {
             }
         }
 
-        if use_elaborator {
+        if !use_legacy {
             let mut more_errors = Elaborator::elaborate(context, crate_id, def_collector.items);
             errors.append(&mut more_errors);
             return errors;
@@ -379,6 +378,7 @@ impl DefCollector {
             def_collector.items.traits,
             crate_id,
         ));
+
         // Must resolve structs before we resolve globals.
         resolved_module.errors.extend(resolve_structs(
             context,
@@ -447,7 +447,7 @@ impl DefCollector {
         resolved_module.type_check(context);
 
         if !cycles_present {
-            resolved_module.evaluate_comptime(&mut context.def_interner);
+            resolved_module.evaluate_comptime(&mut context.def_interner, crate_id);
         }
 
         resolved_module.errors
@@ -468,7 +468,7 @@ fn inject_prelude(
 
         let path = Path {
             segments: segments.clone(),
-            kind: crate::ast::PathKind::Dep,
+            kind: crate::ast::PathKind::Plain,
             span: Span::default(),
         };
 
@@ -489,7 +489,7 @@ fn inject_prelude(
                     0,
                     ImportDirective {
                         module_id: crate_root,
-                        path: Path { segments, kind: PathKind::Dep, span: Span::default() },
+                        path: Path { segments, kind: PathKind::Plain, span: Span::default() },
                         alias: None,
                         is_prelude: true,
                     },
@@ -546,10 +546,10 @@ impl ResolvedModule {
     }
 
     /// Evaluate all `comptime` expressions in this module
-    fn evaluate_comptime(&mut self, interner: &mut NodeInterner) {
+    fn evaluate_comptime(&mut self, interner: &mut NodeInterner, crate_id: CrateId) {
         if self.count_errors() == 0 {
             let mut scopes = vec![HashMap::default()];
-            let mut interpreter = Interpreter::new(interner, &mut scopes);
+            let mut interpreter = Interpreter::new(interner, &mut scopes, crate_id);
 
             for (_file, global) in &self.globals {
                 if let Err(error) = interpreter.scan_global(*global) {
diff --git a/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs b/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
index 5c196324b7d..3d8a861b009 100644
--- a/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
+++ b/compiler/noirc_frontend/src/hir/def_collector/dc_mod.rs
@@ -149,8 +149,9 @@ impl<'a> ModCollector<'a> {
                 self_type: None,
             };
 
-            for (method, _) in r#impl.methods {
+            for (mut method, _) in r#impl.methods {
                 let func_id = context.def_interner.push_empty_fn();
+                method.def.where_clause.extend(r#impl.where_clause.clone());
                 let location = Location::new(method.span(), self.file_id);
                 context.def_interner.push_function(func_id, &method.def, module_id, location);
                 unresolved_functions.push_fn(self.module_id, func_id, method);
@@ -308,11 +309,21 @@ impl<'a> ModCollector<'a> {
                 struct_def: struct_definition,
             };
 
+            let resolved_generics = context.resolve_generics(
+                &unresolved.struct_def.generics,
+                &mut definition_errors,
+                self.file_id,
+            );
+
             // Create the corresponding module for the struct namespace
             let id = match self.push_child_module(&name, self.file_id, false, false) {
-                Ok(local_id) => {
-                    context.def_interner.new_struct(&unresolved, krate, local_id, self.file_id)
-                }
+                Ok(local_id) => context.def_interner.new_struct(
+                    &unresolved,
+                    resolved_generics,
+                    krate,
+                    local_id,
+                    self.file_id,
+                ),
                 Err(error) => {
                     definition_errors.push((error.into(), self.file_id));
                     continue;
@@ -356,7 +367,14 @@ impl<'a> ModCollector<'a> {
                 type_alias_def: type_alias,
             };
 
-            let type_alias_id = context.def_interner.push_type_alias(&unresolved);
+            let resolved_generics = context.resolve_generics(
+                &unresolved.type_alias_def.generics,
+                &mut errors,
+                self.file_id,
+            );
+
+            let type_alias_id =
+                context.def_interner.push_type_alias(&unresolved, resolved_generics);
 
             // Add the type alias to scope so its path can be looked up later
             let result = self.def_collector.def_map.modules[self.module_id.0]
@@ -516,6 +534,9 @@ impl<'a> ModCollector<'a> {
                 }
             }
 
+            let resolved_generics =
+                context.resolve_generics(&trait_definition.generics, &mut errors, self.file_id);
+
             // And store the TraitId -> TraitType mapping somewhere it is reachable
             let unresolved = UnresolvedTrait {
                 file_id: self.file_id,
@@ -525,7 +546,8 @@ impl<'a> ModCollector<'a> {
                 method_ids,
                 fns_with_default_impl: unresolved_functions,
             };
-            context.def_interner.push_empty_trait(trait_id, &unresolved);
+            context.def_interner.push_empty_trait(trait_id, &unresolved, resolved_generics);
+
             self.def_collector.items.traits.insert(trait_id, unresolved);
         }
         errors
diff --git a/compiler/noirc_frontend/src/hir/def_collector/errors.rs b/compiler/noirc_frontend/src/hir/def_collector/errors.rs
index edeb463e10d..af2264c3843 100644
--- a/compiler/noirc_frontend/src/hir/def_collector/errors.rs
+++ b/compiler/noirc_frontend/src/hir/def_collector/errors.rs
@@ -1,4 +1,4 @@
-use crate::ast::{Ident, Path};
+use crate::ast::{Ident, Path, UnresolvedTypeData};
 use crate::hir::resolution::import::PathResolutionError;
 
 use noirc_errors::CustomDiagnostic as Diagnostic;
@@ -66,6 +66,8 @@ pub enum DefCollectorErrorKind {
     TraitImplOrphaned { span: Span },
     #[error("macro error : {0:?}")]
     MacroError(MacroError),
+    #[error("The only supported types of numeric generics are integers, fields, and booleans")]
+    UnsupportedNumericGenericType { ident: Ident, typ: UnresolvedTypeData },
 }
 
 /// An error struct that macro processors can return.
@@ -228,6 +230,15 @@ impl<'a> From<&'a DefCollectorErrorKind> for Diagnostic {
             DefCollectorErrorKind::MacroError(macro_error) => {
                 Diagnostic::simple_error(macro_error.primary_message.clone(), macro_error.secondary_message.clone().unwrap_or_default(), macro_error.span.unwrap_or_default())
             },
+            DefCollectorErrorKind::UnsupportedNumericGenericType { ident, typ } => {
+                let name = &ident.0.contents;
+
+                Diagnostic::simple_error(
+                    format!("{name} has a type of {typ}. The only supported types of numeric generics are integers and fields"),
+                    "Unsupported numeric generic type".to_string(),
+                    ident.0.span(),
+                )
+            }
         }
     }
 }
diff --git a/compiler/noirc_frontend/src/hir/def_map/mod.rs b/compiler/noirc_frontend/src/hir/def_map/mod.rs
index 19e06387d43..59205f74d89 100644
--- a/compiler/noirc_frontend/src/hir/def_map/mod.rs
+++ b/compiler/noirc_frontend/src/hir/def_map/mod.rs
@@ -73,7 +73,7 @@ impl CrateDefMap {
     pub fn collect_defs(
         crate_id: CrateId,
         context: &mut Context,
-        use_elaborator: bool,
+        use_legacy: bool,
         macro_processors: &[&dyn MacroProcessor],
     ) -> Vec<(CompilationError, FileId)> {
         // Check if this Crate has already been compiled
@@ -122,7 +122,7 @@ impl CrateDefMap {
             context,
             ast,
             root_file_id,
-            use_elaborator,
+            use_legacy,
             macro_processors,
         ));
 
diff --git a/compiler/noirc_frontend/src/hir/mod.rs b/compiler/noirc_frontend/src/hir/mod.rs
index 55dc22d6c5d..71fdc6b30d2 100644
--- a/compiler/noirc_frontend/src/hir/mod.rs
+++ b/compiler/noirc_frontend/src/hir/mod.rs
@@ -5,17 +5,21 @@ pub mod resolution;
 pub mod scope;
 pub mod type_check;
 
+use crate::ast::UnresolvedGenerics;
 use crate::debug::DebugInstrumenter;
 use crate::graph::{CrateGraph, CrateId};
 use crate::hir_def::function::FuncMeta;
 use crate::node_interner::{FuncId, NodeInterner, StructId};
 use crate::parser::ParserError;
-use crate::ParsedModule;
+use crate::{Generics, Kind, ParsedModule, ResolvedGeneric, Type, TypeVariable};
+use def_collector::dc_crate::CompilationError;
 use def_map::{Contract, CrateDefMap};
-use fm::FileManager;
+use fm::{FileId, FileManager};
+use iter_extended::vecmap;
 use noirc_errors::Location;
 use std::borrow::Cow;
 use std::collections::{BTreeMap, HashMap};
+use std::rc::Rc;
 
 use self::def_map::TestFunction;
 
@@ -80,7 +84,7 @@ impl Context<'_, '_> {
         }
     }
 
-    pub fn parsed_file_results(&self, file_id: fm::FileId) -> (ParsedModule, Vec<ParserError>) {
+    pub fn parsed_file_results(&self, file_id: FileId) -> (ParsedModule, Vec<ParserError>) {
         self.parsed_files.get(&file_id).expect("noir file wasn't parsed").clone()
     }
 
@@ -256,4 +260,34 @@ impl Context<'_, '_> {
     pub fn module(&self, module_id: def_map::ModuleId) -> &def_map::ModuleData {
         module_id.module(&self.def_maps)
     }
+
+    /// Generics need to be resolved before elaboration to distinguish
+    /// between normal and numeric generics.
+    /// This method is expected to be used during definition collection.
+    /// Each result is returned in a list rather than returned as a single result as to allow
+    /// definition collection to provide an error for each ill-formed numeric generic.
+    pub(crate) fn resolve_generics(
+        &mut self,
+        generics: &UnresolvedGenerics,
+        errors: &mut Vec<(CompilationError, FileId)>,
+        file_id: FileId,
+    ) -> Generics {
+        vecmap(generics, |generic| {
+            // Map the generic to a fresh type variable
+            let id = self.def_interner.next_type_variable_id();
+            let type_var = TypeVariable::unbound(id);
+            let ident = generic.ident();
+            let span = ident.0.span();
+
+            // Check for name collisions of this generic
+            let name = Rc::new(ident.0.contents.clone());
+
+            let kind = generic.kind().unwrap_or_else(|err| {
+                errors.push((err.into(), file_id));
+                Kind::Numeric(Box::new(Type::Error))
+            });
+
+            ResolvedGeneric { name, type_var, kind, span }
+        })
+    }
 }
diff --git a/compiler/noirc_frontend/src/hir/resolution/errors.rs b/compiler/noirc_frontend/src/hir/resolution/errors.rs
index 06f6dda7142..c1e9ad89bc3 100644
--- a/compiler/noirc_frontend/src/hir/resolution/errors.rs
+++ b/compiler/noirc_frontend/src/hir/resolution/errors.rs
@@ -98,8 +98,24 @@ pub enum ResolverError {
     NoPredicatesAttributeOnUnconstrained { ident: Ident },
     #[error("#[fold] attribute is only allowed on constrained functions")]
     FoldAttributeOnUnconstrained { ident: Ident },
+    #[error("The only supported types of numeric generics are integers, fields, and booleans")]
+    UnsupportedNumericGenericType { ident: Ident, typ: Type },
+    #[error("Numeric generics should be explicit")]
+    UseExplicitNumericGeneric { ident: Ident },
+    #[error("expected type, found numeric generic parameter")]
+    NumericGenericUsedForType { name: String, span: Span },
     #[error("Invalid array length construction")]
     ArrayLengthInterpreter { error: InterpreterError },
+    #[error("The unquote operator '$' can only be used within a quote expression")]
+    UnquoteUsedOutsideQuote { span: Span },
+    #[error("Invalid syntax in macro call")]
+    InvalidSyntaxInMacroCall { span: Span },
+    #[error("Macros must be comptime functions")]
+    MacroIsNotComptime { span: Span },
+    #[error("Annotation name must refer to a comptime function")]
+    NonFunctionInAnnotation { span: Span },
+    #[error("Unknown annotation")]
+    UnknownAnnotation { span: Span },
 }
 
 impl ResolverError {
@@ -390,7 +406,67 @@ impl<'a> From<&'a ResolverError> for Diagnostic {
                 diag.add_note("The `#[fold]` attribute specifies whether a constrained function should be treated as a separate circuit rather than inlined into the program entry point".to_owned());
                 diag
             }
+            ResolverError::UnsupportedNumericGenericType { ident , typ } => {
+                let name = &ident.0.contents;
+
+                Diagnostic::simple_error(
+                    format!("{name} has a type of {typ}. The only supported types of numeric generics are integers, fields, and booleans."),
+                    "Unsupported numeric generic type".to_string(),
+                    ident.0.span(),
+                )
+            }
+            ResolverError::UseExplicitNumericGeneric { ident } => {
+                let name = &ident.0.contents;
+
+                Diagnostic::simple_warning(
+                    String::from("Noir now supports explicit numeric generics. Support for implicit numeric generics will be removed in the following release."), 
+                format!("Numeric generic `{name}` should now be specified with `let {name}: <annotated type>`"), 
+                ident.0.span(),
+                )
+            }
+            ResolverError::NumericGenericUsedForType { name, span } => {
+                Diagnostic::simple_error(
+                    format!("expected type, found numeric generic parameter {name}"),
+                    String::from("not a type"),
+                    *span,
+                )
+            }
             ResolverError::ArrayLengthInterpreter { error } => Diagnostic::from(error),
+            ResolverError::UnquoteUsedOutsideQuote { span } => {
+                Diagnostic::simple_error(
+                    "The unquote operator '$' can only be used within a quote expression".into(),
+                    "".into(),
+                    *span,
+                )
+            },
+            ResolverError::InvalidSyntaxInMacroCall { span } => {
+                Diagnostic::simple_error(
+                    "Invalid syntax in macro call".into(),
+                    "Macro calls must call a comptime function directly, they cannot use higher-order functions".into(),
+                    *span,
+                )
+            },
+            ResolverError::MacroIsNotComptime { span } => {
+                Diagnostic::simple_error(
+                    "This macro call is to a non-comptime function".into(),
+                    "Macro calls must be to comptime functions".into(),
+                    *span,
+                )
+            },
+            ResolverError::NonFunctionInAnnotation { span } => {
+                Diagnostic::simple_error(
+                    "Unknown annotation".into(),
+                    "The name of an annotation must refer to a comptime function".into(),
+                    *span,
+                )
+            },
+            ResolverError::UnknownAnnotation { span } => {
+                Diagnostic::simple_warning(
+                    "Unknown annotation".into(),
+                    "No matching comptime function found in scope".into(),
+                    *span,
+                )
+            },
         }
     }
 }
diff --git a/compiler/noirc_frontend/src/hir/resolution/functions.rs b/compiler/noirc_frontend/src/hir/resolution/functions.rs
index e63de9b9173..fe46796ed24 100644
--- a/compiler/noirc_frontend/src/hir/resolution/functions.rs
+++ b/compiler/noirc_frontend/src/hir/resolution/functions.rs
@@ -1,8 +1,7 @@
-use std::{collections::BTreeMap, rc::Rc};
+use std::collections::BTreeMap;
 
 use fm::FileId;
 use iter_extended::vecmap;
-use noirc_errors::Span;
 
 use crate::{
     graph::CrateId,
@@ -11,10 +10,10 @@ use crate::{
         def_map::{CrateDefMap, ModuleId},
     },
     node_interner::{FuncId, NodeInterner, TraitImplId},
-    Type, TypeVariable,
+    ResolvedGeneric, Type,
 };
 
-use super::{path_resolver::StandardPathResolver, resolver::Resolver};
+use super::{path_resolver::StandardPathResolver, Resolver};
 
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn resolve_function_set(
@@ -24,7 +23,7 @@ pub(crate) fn resolve_function_set(
     mut unresolved_functions: UnresolvedFunctions,
     self_type: Option<Type>,
     trait_impl_id: Option<TraitImplId>,
-    impl_generics: Vec<(Rc<String>, TypeVariable, Span)>,
+    impl_generics: Vec<ResolvedGeneric>,
     errors: &mut Vec<(CompilationError, FileId)>,
 ) -> Vec<(FileId, FuncId)> {
     let file_id = unresolved_functions.file_id;
diff --git a/compiler/noirc_frontend/src/hir/resolution/import.rs b/compiler/noirc_frontend/src/hir/resolution/import.rs
index 9a0be775c30..ada46e7d7c0 100644
--- a/compiler/noirc_frontend/src/hir/resolution/import.rs
+++ b/compiler/noirc_frontend/src/hir/resolution/import.rs
@@ -144,8 +144,33 @@ fn resolve_path_to_ns(
             resolve_external_dep(def_map, import_directive, def_maps, importing_crate)
         }
         crate::ast::PathKind::Plain => {
-            // Plain paths are only used to import children modules. It's possible to allow import of external deps, but maybe this distinction is better?
-            // In Rust they can also point to external Dependencies, if no children can be found with the specified name
+            // There is a possibility that the import path is empty
+            // In that case, early return
+            if import_path.is_empty() {
+                return resolve_name_in_module(
+                    crate_id,
+                    importing_crate,
+                    import_path,
+                    import_directive.module_id,
+                    def_maps,
+                    allow_contracts,
+                );
+            }
+
+            let current_mod_id = ModuleId { krate: crate_id, local_id: import_directive.module_id };
+            let current_mod = &def_map.modules[current_mod_id.local_id.0];
+            let first_segment = import_path.first().expect("ice: could not fetch first segment");
+            if current_mod.find_name(first_segment).is_none() {
+                // Resolve externally when first segment is unresolved
+                return resolve_external_dep(
+                    def_map,
+                    import_directive,
+                    def_maps,
+                    allow_contracts,
+                    importing_crate,
+                );
+            }
+
             resolve_name_in_module(
                 crate_id,
                 importing_crate,
@@ -154,6 +179,14 @@ fn resolve_path_to_ns(
                 def_maps,
             )
         }
+
+        crate::ast::PathKind::Dep => resolve_external_dep(
+            def_map,
+            import_directive,
+            def_maps,
+            allow_contracts,
+            importing_crate,
+        ),
     }
 }
 
@@ -271,7 +304,9 @@ fn resolve_external_dep(
         .ok_or_else(|| PathResolutionError::Unresolved(crate_name.to_owned()))?;
 
     // Create an import directive for the dependency crate
-    let path_without_crate_name = &path[1..]; // XXX: This will panic if the path is of the form `use dep::std` Ideal algorithm will not distinguish between crate and module
+    // XXX: This will panic if the path is of the form `use std`. Ideal algorithm will not distinguish between crate and module
+    // See `singleton_import.nr` test case for a check that such cases are handled elsewhere.
+    let path_without_crate_name = &path[1..];
 
     let path = Path {
         segments: path_without_crate_name.to_vec(),
diff --git a/compiler/noirc_frontend/src/hir/resolution/resolver.rs b/compiler/noirc_frontend/src/hir/resolution/resolver.rs
index 01f58ba4c27..6d547aaf0b7 100644
--- a/compiler/noirc_frontend/src/hir/resolution/resolver.rs
+++ b/compiler/noirc_frontend/src/hir/resolution/resolver.rs
@@ -23,7 +23,7 @@ use crate::hir_def::expr::{
 use crate::hir_def::function::FunctionBody;
 use crate::hir_def::traits::{Trait, TraitConstraint};
 use crate::macros_api::SecondaryAttribute;
-use crate::token::{Attributes, FunctionAttribute};
+use crate::token::Attributes;
 use regex::Regex;
 use std::collections::{BTreeMap, BTreeSet, HashSet};
 use std::rc::Rc;
@@ -32,8 +32,9 @@ use crate::ast::{
     ArrayLiteral, BinaryOpKind, BlockExpression, Expression, ExpressionKind, ForRange,
     FunctionDefinition, FunctionKind, FunctionReturnType, Ident, ItemVisibility, LValue,
     LetStatement, Literal, NoirFunction, NoirStruct, NoirTypeAlias, Param, Path, PathKind, Pattern,
-    Statement, StatementKind, TraitBound, UnaryOp, UnresolvedGenerics, UnresolvedTraitConstraint,
-    UnresolvedType, UnresolvedTypeData, UnresolvedTypeExpression, Visibility, ERROR_IDENT,
+    Statement, StatementKind, TraitBound, UnaryOp, UnresolvedGeneric, UnresolvedGenerics,
+    UnresolvedTraitConstraint, UnresolvedType, UnresolvedTypeData, UnresolvedTypeExpression,
+    Visibility, ERROR_IDENT,
 };
 use crate::graph::CrateId;
 use crate::hir::def_map::{ModuleDefId, TryFromModuleDefId, MAIN_FUNCTION};
@@ -47,7 +48,10 @@ use crate::node_interner::{
     DefinitionId, DefinitionKind, DependencyId, ExprId, FuncId, GlobalId, NodeInterner, StmtId,
     StructId, TraitId, TraitImplId, TraitMethodId, TypeAliasId,
 };
-use crate::{Generics, Shared, StructType, Type, TypeAlias, TypeVariable, TypeVariableKind};
+use crate::{
+    GenericTypeVars, Generics, Kind, ResolvedGeneric, Shared, StructType, Type, TypeAlias,
+    TypeVariable, TypeVariableKind,
+};
 use fm::FileId;
 use iter_extended::vecmap;
 use noirc_errors::{Location, Span, Spanned};
@@ -64,6 +68,7 @@ use super::errors::{PubPosition, ResolverError};
 use super::import::PathResolution;
 
 pub const SELF_TYPE_NAME: &str = "Self";
+pub const WILDCARD_TYPE: &str = "_";
 
 type Scope = GenericScope<String, ResolverMeta>;
 type ScopeTree = GenericScopeTree<String, ResolverMeta>;
@@ -130,7 +135,7 @@ pub struct Resolver<'a> {
     /// unique type variables if we're resolving a struct. Empty otherwise.
     /// This is a Vec rather than a map to preserve the order a functions generics
     /// were declared in.
-    generics: Vec<(Rc<String>, TypeVariable, Span)>,
+    generics: Vec<ResolvedGeneric>,
 
     /// When resolving lambda expressions, we need to keep track of the variables
     /// that are captured. We do this in order to create the hidden environment
@@ -222,7 +227,8 @@ impl<'a> Resolver<'a> {
                 let mut new_generic_ident: Ident =
                     format!("T{}_impl_{}", func_id, path.as_string()).into();
                 let mut new_generic_path = Path::from_ident(new_generic_ident.clone());
-                while impl_trait_generics.contains(&new_generic_ident)
+                let new_generic = UnresolvedGeneric::from(new_generic_ident.clone());
+                while impl_trait_generics.contains(&new_generic)
                     || self.lookup_generic_or_global_type(&new_generic_path).is_some()
                 {
                     new_generic_ident =
@@ -230,7 +236,7 @@ impl<'a> Resolver<'a> {
                     new_generic_path = Path::from_ident(new_generic_ident.clone());
                     counter += 1;
                 }
-                impl_trait_generics.insert(new_generic_ident.clone());
+                impl_trait_generics.insert(UnresolvedGeneric::from(new_generic_ident.clone()));
 
                 let is_synthesized = true;
                 let new_generic_type_data =
@@ -248,7 +254,7 @@ impl<'a> Resolver<'a> {
                 };
 
                 parameter.typ.typ = new_generic_type_data;
-                func.def.generics.push(new_generic_ident);
+                func.def.generics.push(new_generic_ident.into());
                 func.def.where_clause.push(new_trait_constraint);
             }
         }
@@ -569,7 +575,7 @@ impl<'a> Resolver<'a> {
                 let fields = self.resolve_type_inner(*fields);
                 Type::FmtString(Box::new(resolved_size), Box::new(fields))
             }
-            Code => Type::Code,
+            Quoted(quoted) => Type::Quoted(quoted),
             Unit => Type::Unit,
             Unspecified => Type::Error,
             Error => Type::Error,
@@ -590,7 +596,7 @@ impl<'a> Resolver<'a> {
                 let env = Box::new(self.resolve_type_inner(*env));
 
                 match *env {
-                    Type::Unit | Type::Tuple(_) | Type::NamedGeneric(_, _) => {
+                    Type::Unit | Type::Tuple(_) | Type::NamedGeneric(_, _, _) => {
                         Type::Function(args, ret, env)
                     }
                     _ => {
@@ -606,6 +612,7 @@ impl<'a> Resolver<'a> {
                 Type::MutableReference(Box::new(self.resolve_type_inner(*element)))
             }
             Parenthesized(typ) => self.resolve_type_inner(*typ),
+            Resolved(id) => self.interner.get_quoted_type(id).clone(),
         };
 
         if let Type::Struct(_, _) = resolved_type {
@@ -620,8 +627,8 @@ impl<'a> Resolver<'a> {
         resolved_type
     }
 
-    fn find_generic(&self, target_name: &str) -> Option<&(Rc<String>, TypeVariable, Span)> {
-        self.generics.iter().find(|(name, _, _)| name.as_ref() == target_name)
+    fn find_generic(&self, target_name: &str) -> Option<&ResolvedGeneric> {
+        self.generics.iter().find(|generic| generic.name.as_ref() == target_name)
     }
 
     fn resolve_named_type(&mut self, path: Path, args: Vec<UnresolvedType>) -> Type {
@@ -746,9 +753,15 @@ impl<'a> Resolver<'a> {
     fn lookup_generic_or_global_type(&mut self, path: &Path) -> Option<Type> {
         if path.segments.len() == 1 {
             let name = &path.last_segment().0.contents;
-            if let Some((name, var, _)) = self.find_generic(name) {
-                return Some(Type::NamedGeneric(var.clone(), name.clone()));
-            }
+            if let Some(generic) = self.find_generic(name) {
+                // We always insert a `TypeKind::Normal` as we do not support explicit numeric generics
+                // in the resolver
+                return Some(Type::NamedGeneric(
+                    generic.type_var.clone(),
+                    generic.name.clone(),
+                    Kind::Normal,
+                ));
+            };
         }
 
         // If we cannot find a local generic of the same name, try to look up a global
@@ -847,14 +860,14 @@ impl<'a> Resolver<'a> {
     /// Return the current generics.
     /// Needed to keep referring to the same type variables across many
     /// methods in a single impl.
-    pub fn get_generics(&self) -> &[(Rc<String>, TypeVariable, Span)] {
+    pub fn get_generics(&self) -> &[ResolvedGeneric] {
         &self.generics
     }
 
     /// Set the current generics that are in scope.
     /// Unlike add_generics, this function will not create any new type variables,
     /// opting to reuse the existing ones it is directly given.
-    pub fn set_generics(&mut self, generics: Vec<(Rc<String>, TypeVariable, Span)>) {
+    pub fn set_generics(&mut self, generics: Vec<ResolvedGeneric>) {
         self.generics = generics;
     }
 
@@ -874,48 +887,79 @@ impl<'a> Resolver<'a> {
             // Map the generic to a fresh type variable
             let id = self.interner.next_type_variable_id();
             let typevar = TypeVariable::unbound(id);
-            let span = generic.0.span();
+            let ident = generic.ident();
+            let span = ident.0.span();
 
             // Check for name collisions of this generic
-            let name = Rc::new(generic.0.contents.clone());
+            let name = Rc::new(ident.0.contents.clone());
 
-            if let Some((_, _, first_span)) = self.find_generic(&name) {
+            let resolved_generic = ResolvedGeneric {
+                name: name.clone(),
+                type_var: typevar,
+                // We only support numeric generics in the elaborator
+                kind: Kind::Normal,
+                span,
+            };
+            if let Some(generic) = self.find_generic(&name) {
                 self.errors.push(ResolverError::DuplicateDefinition {
-                    name: generic.0.contents.clone(),
-                    first_span: *first_span,
+                    name: ident.0.contents.clone(),
+                    first_span: generic.span,
                     second_span: span,
                 });
             } else {
-                self.generics.push((name, typevar.clone(), span));
+                self.generics.push(resolved_generic.clone());
             }
 
-            typevar
+            resolved_generic
         })
     }
 
     /// Add the given existing generics to scope.
     /// This is useful for adding the same generics to many items. E.g. apply impl generics
     /// to each function in the impl or trait generics to each item in the trait.
-    pub fn add_existing_generics(&mut self, names: &UnresolvedGenerics, generics: &Generics) {
-        assert_eq!(names.len(), generics.len());
+    pub fn add_existing_generics(
+        &mut self,
+        unresolved_generics: &UnresolvedGenerics,
+        generics: &GenericTypeVars,
+    ) {
+        assert_eq!(unresolved_generics.len(), generics.len());
 
-        for (name, typevar) in names.iter().zip(generics) {
-            self.add_existing_generic(&name.0.contents, name.0.span(), typevar.clone());
+        for (unresolved_generic, typevar) in unresolved_generics.iter().zip(generics) {
+            self.add_existing_generic(
+                unresolved_generic,
+                unresolved_generic.span(),
+                typevar.clone(),
+            );
         }
     }
 
-    pub fn add_existing_generic(&mut self, name: &str, span: Span, typevar: TypeVariable) {
+    pub fn add_existing_generic(
+        &mut self,
+        unresolved_generic: &UnresolvedGeneric,
+        span: Span,
+        typevar: TypeVariable,
+    ) {
+        let name = &unresolved_generic.ident().0.contents;
+
         // Check for name collisions of this generic
-        let rc_name = Rc::new(name.to_owned());
+        let rc_name = Rc::new(name.clone());
 
-        if let Some((_, _, first_span)) = self.find_generic(&rc_name) {
+        if let Some(generic) = self.find_generic(&rc_name) {
             self.errors.push(ResolverError::DuplicateDefinition {
-                name: name.to_owned(),
-                first_span: *first_span,
+                name: name.clone(),
+                first_span: generic.span,
                 second_span: span,
             });
         } else {
-            self.generics.push((rc_name, typevar, span));
+            let resolved_generic = ResolvedGeneric {
+                name: rc_name,
+                type_var: typevar.clone(),
+                kind: unresolved_generic
+                    .kind()
+                    .expect("ICE: Deprecated code should only support normal kinds"),
+                span,
+            };
+            self.generics.push(resolved_generic);
         }
     }
 
@@ -991,7 +1035,7 @@ impl<'a> Resolver<'a> {
         // indicate we should code generate in the same way. Thus, we unify the attributes into one flag here.
         let has_inline_attribute = has_no_predicates_attribute || should_fold;
 
-        let generics = vecmap(&self.generics, |(_, typevar, _)| typevar.clone());
+        let generics = vecmap(&self.generics, |generic| generic.type_var.clone());
         let mut parameters = vec![];
         let mut parameter_types = vec![];
 
@@ -1042,14 +1086,6 @@ impl<'a> Resolver<'a> {
             });
         }
 
-        if matches!(attributes.function, Some(FunctionAttribute::Test { .. }))
-            && !parameters.is_empty()
-        {
-            self.push_err(ResolverError::TestFunctionHasParameters {
-                span: func.name_ident().span(),
-            });
-        }
-
         let mut typ = Type::Function(parameter_types, return_type, Box::new(Type::Unit));
 
         if !generics.is_empty() {
@@ -1060,8 +1096,8 @@ impl<'a> Resolver<'a> {
 
         let direct_generics = func.def.generics.iter();
         let direct_generics = direct_generics
-            .filter_map(|generic| self.find_generic(&generic.0.contents))
-            .map(|(name, typevar, _span)| (name.clone(), typevar.clone()))
+            .filter_map(|generic| self.find_generic(&generic.ident().0.contents))
+            .map(|ResolvedGeneric { name, type_var, .. }| (name.clone(), type_var.clone()))
             .collect();
 
         FuncMeta {
@@ -1078,6 +1114,7 @@ impl<'a> Resolver<'a> {
             trait_constraints: self.resolve_trait_constraints(&func.def.where_clause),
             is_entry_point: self.is_entry_point_function(func),
             has_inline_attribute,
+            source_crate: self.path_resolver.module_id().krate,
 
             // These fields are only used by the elaborator
             all_generics: Vec::new(),
@@ -1114,6 +1151,7 @@ impl<'a> Resolver<'a> {
         !func.def.is_unconstrained
     }
 
+    // TODO(https://github.com/noir-lang/noir/issues/5156): Remove this method in favor of explicit numeric generics
     fn declare_numeric_generics(&mut self, params: &[Type], return_type: &Type) {
         if self.generics.is_empty() {
             return;
@@ -1126,12 +1164,12 @@ impl<'a> Resolver<'a> {
             // We can fail to find the generic in self.generics if it is an implicit one created
             // by the compiler. This can happen when, e.g. eliding array lengths using the slice
             // syntax [T].
-            if let Some((name, _, span)) =
-                self.generics.iter().find(|(name, _, _)| name.as_ref() == &name_to_find)
+            if let Some(ResolvedGeneric { name, span, .. }) =
+                self.generics.iter().find(|generic| generic.name.as_ref() == &name_to_find)
             {
                 let ident = Ident::new(name.to_string(), *span);
                 let definition = DefinitionKind::GenericType(type_variable);
-                self.add_variable_decl_inner(ident, false, false, false, definition);
+                self.add_variable_decl_inner(ident.clone(), false, false, false, definition);
             }
         }
     }
@@ -1157,8 +1195,8 @@ impl<'a> Resolver<'a> {
             | Type::Error
             | Type::TypeVariable(_, _)
             | Type::Constant(_)
-            | Type::NamedGeneric(_, _)
-            | Type::Code
+            | Type::NamedGeneric(_, _, _)
+            | Type::Quoted(_)
             | Type::Forall(_, _) => (),
 
             Type::TraitAsType(_, _, args) => {
@@ -1168,7 +1206,7 @@ impl<'a> Resolver<'a> {
             }
 
             Type::Array(length, element_type) => {
-                if let Type::NamedGeneric(type_variable, name) = length.as_ref() {
+                if let Type::NamedGeneric(type_variable, name, _) = length.as_ref() {
                     found.insert(name.to_string(), type_variable.clone());
                 }
                 Self::find_numeric_generics_in_type(element_type, found);
@@ -1193,7 +1231,7 @@ impl<'a> Resolver<'a> {
 
             Type::Struct(struct_type, generics) => {
                 for (i, generic) in generics.iter().enumerate() {
-                    if let Type::NamedGeneric(type_variable, name) = generic {
+                    if let Type::NamedGeneric(type_variable, name, _) = generic {
                         if struct_type.borrow().generic_is_numeric(i) {
                             found.insert(name.to_string(), type_variable.clone());
                         }
@@ -1204,7 +1242,7 @@ impl<'a> Resolver<'a> {
             }
             Type::Alias(alias, generics) => {
                 for (i, generic) in generics.iter().enumerate() {
-                    if let Type::NamedGeneric(type_variable, name) = generic {
+                    if let Type::NamedGeneric(type_variable, name, _) = generic {
                         if alias.borrow().generic_is_numeric(i) {
                             found.insert(name.to_string(), type_variable.clone());
                         }
@@ -1215,12 +1253,12 @@ impl<'a> Resolver<'a> {
             }
             Type::MutableReference(element) => Self::find_numeric_generics_in_type(element, found),
             Type::String(length) => {
-                if let Type::NamedGeneric(type_variable, name) = length.as_ref() {
+                if let Type::NamedGeneric(type_variable, name, _) = length.as_ref() {
                     found.insert(name.to_string(), type_variable.clone());
                 }
             }
             Type::FmtString(length, fields) => {
-                if let Type::NamedGeneric(type_variable, name) = length.as_ref() {
+                if let Type::NamedGeneric(type_variable, name, _) = length.as_ref() {
                     found.insert(name.to_string(), type_variable.clone());
                 }
                 Self::find_numeric_generics_in_type(fields, found);
@@ -1648,6 +1686,10 @@ impl<'a> Resolver<'a> {
             ExpressionKind::Resolved(_) => unreachable!(
                 "ExpressionKind::Resolved should only be emitted by the comptime interpreter"
             ),
+            ExpressionKind::Unquote(_) => {
+                self.push_err(ResolverError::UnquoteUsedOutsideQuote { span: expr.span });
+                HirExpression::Literal(HirLiteral::Unit)
+            }
         };
 
         // If these lines are ever changed, make sure to change the early return
@@ -1877,7 +1919,9 @@ impl<'a> Resolver<'a> {
 
                 let constraint = TraitConstraint {
                     typ: self.self_type.clone()?,
-                    trait_generics: Type::from_generics(&the_trait.generics),
+                    trait_generics: Type::from_generics(&vecmap(&the_trait.generics, |generic| {
+                        generic.type_var.clone()
+                    })),
                     trait_id,
                 };
                 return Some((method, constraint, false));
@@ -1905,7 +1949,9 @@ impl<'a> Resolver<'a> {
                     the_trait.self_type_typevar.clone(),
                     TypeVariableKind::Normal,
                 ),
-                trait_generics: Type::from_generics(&the_trait.generics),
+                trait_generics: Type::from_generics(&vecmap(&the_trait.generics, |generic| {
+                    generic.type_var.clone()
+                })),
                 trait_id,
             };
             return Some((method, constraint, false));
diff --git a/compiler/noirc_frontend/src/hir/resolution/traits.rs b/compiler/noirc_frontend/src/hir/resolution/traits.rs
index 3d355fd4447..69accb1c290 100644
--- a/compiler/noirc_frontend/src/hir/resolution/traits.rs
+++ b/compiler/noirc_frontend/src/hir/resolution/traits.rs
@@ -4,7 +4,7 @@ use fm::FileId;
 use iter_extended::vecmap;
 use noirc_errors::Location;
 
-use crate::ast::{ItemVisibility, Path, TraitItem};
+use crate::ast::{Ident, ItemVisibility, Path, TraitItem, UnresolvedGeneric};
 use crate::{
     graph::CrateId,
     hir::{
@@ -17,7 +17,7 @@ use crate::{
     },
     hir_def::traits::{TraitConstant, TraitFunction, TraitImpl, TraitType},
     node_interner::{FuncId, NodeInterner, TraitId},
-    Generics, Shared, Type, TypeVariable, TypeVariableKind,
+    GenericTypeVars, Shared, Type, TypeVariableKind,
 };
 
 use super::{
@@ -36,14 +36,18 @@ pub(crate) fn resolve_traits(
     crate_id: CrateId,
 ) -> Vec<(CompilationError, FileId)> {
     for (trait_id, unresolved_trait) in &traits {
-        context.def_interner.push_empty_trait(*trait_id, unresolved_trait);
+        context.def_interner.push_empty_trait(*trait_id, unresolved_trait, vec![]);
     }
     let mut all_errors = Vec::new();
 
     for (trait_id, unresolved_trait) in traits {
-        let generics = vecmap(&unresolved_trait.trait_def.generics, |_| {
-            TypeVariable::unbound(context.def_interner.next_type_variable_id())
-        });
+        let file_id = context.def_maps[&crate_id].file_id(unresolved_trait.module_id);
+        let generics = context.resolve_generics(
+            &unresolved_trait.trait_def.generics,
+            &mut all_errors,
+            file_id,
+        );
+        let generic_type_vars = generics.iter().map(|generic| generic.type_var.clone()).collect();
 
         // Resolve order
         // 1. Trait Types ( Trait constants can have a trait type, therefore types before constants)
@@ -51,8 +55,13 @@ pub(crate) fn resolve_traits(
         // 2. Trait Constants ( Trait's methods can use trait types & constants, therefore they should be after)
         let _ = resolve_trait_constants(context, crate_id, &unresolved_trait);
         // 3. Trait Methods
-        let (methods, errors) =
-            resolve_trait_methods(context, trait_id, crate_id, &unresolved_trait, &generics);
+        let (methods, errors) = resolve_trait_methods(
+            context,
+            trait_id,
+            crate_id,
+            &unresolved_trait,
+            &generic_type_vars,
+        );
 
         all_errors.extend(errors);
 
@@ -93,7 +102,7 @@ fn resolve_trait_methods(
     trait_id: TraitId,
     crate_id: CrateId,
     unresolved_trait: &UnresolvedTrait,
-    trait_generics: &Generics,
+    trait_generics: &GenericTypeVars,
 ) -> (Vec<TraitFunction>, Vec<(CompilationError, FileId)>) {
     let interner = &mut context.def_interner;
     let def_maps = &mut context.def_maps;
@@ -126,7 +135,11 @@ fn resolve_trait_methods(
             resolver.add_generics(generics);
 
             resolver.add_existing_generics(&unresolved_trait.trait_def.generics, trait_generics);
-            resolver.add_existing_generic("Self", name_span, self_typevar);
+            resolver.add_existing_generic(
+                &UnresolvedGeneric::Variable(Ident::from("Self")),
+                name_span,
+                self_typevar,
+            );
             resolver.set_self_type(Some(self_type.clone()));
 
             let func_id = unresolved_trait.method_ids[&name.0.contents];
@@ -143,7 +156,7 @@ fn resolve_trait_methods(
             let arguments = vecmap(parameters, |param| resolver.resolve_type(param.1.clone()));
             let return_type = resolver.resolve_type(return_type.get_type().into_owned());
 
-            let generics = vecmap(resolver.get_generics(), |(_, type_var, _)| type_var.clone());
+            let generics = vecmap(resolver.get_generics(), |generic| generic.type_var.clone());
 
             let default_impl_list: Vec<_> = unresolved_trait
                 .fns_with_default_impl
@@ -463,7 +476,7 @@ pub(crate) fn resolve_trait_impls(
                 methods: vecmap(&impl_methods, |(_, func_id)| *func_id),
             });
 
-            let impl_generics = vecmap(impl_generics, |(_, type_variable, _)| type_variable);
+            let impl_generics = vecmap(impl_generics, |generic| generic.type_var);
 
             if let Err((prev_span, prev_file)) = interner.add_trait_implementation(
                 self_type.clone(),
diff --git a/compiler/noirc_frontend/src/hir/type_check/errors.rs b/compiler/noirc_frontend/src/hir/type_check/errors.rs
index 0d8a9f3e717..f18e8a9e843 100644
--- a/compiler/noirc_frontend/src/hir/type_check/errors.rs
+++ b/compiler/noirc_frontend/src/hir/type_check/errors.rs
@@ -40,6 +40,8 @@ pub enum TypeCheckError {
     TypeMismatch { expected_typ: String, expr_typ: String, expr_span: Span },
     #[error("Expected type {expected} is not the same as {actual}")]
     TypeMismatchWithSource { expected: Type, actual: Type, span: Span, source: Source },
+    #[error("Expected type {expected_kind:?} is not the same as {expr_kind:?}")]
+    TypeKindMismatch { expected_kind: String, expr_kind: String, expr_span: Span },
     #[error("Expected {expected:?} found {found:?}")]
     ArityMisMatch { expected: usize, found: usize, span: Span },
     #[error("Return type in a function cannot be public")]
@@ -143,6 +145,8 @@ pub enum TypeCheckError {
     },
     #[error("Strings do not support indexed assignment")]
     StringIndexAssign { span: Span },
+    #[error("Macro calls may only return `Quoted` values")]
+    MacroReturningNonExpr { typ: Type, span: Span },
 }
 
 impl TypeCheckError {
@@ -176,6 +180,13 @@ impl<'a> From<&'a TypeCheckError> for Diagnostic {
                     *expr_span,
                 )
             }
+            TypeCheckError::TypeKindMismatch { expected_kind, expr_kind, expr_span } => {
+                Diagnostic::simple_error(
+                    format!("Expected kind {expected_kind}, found kind {expr_kind}"),
+                    String::new(),
+                    *expr_span,
+                )
+            }
             TypeCheckError::TraitMethodParameterTypeMismatch { method_name, expected_typ, actual_typ, parameter_index, parameter_span } => {
                 Diagnostic::simple_error(
                     format!("Parameter #{parameter_index} of method `{method_name}` must be of type {expected_typ}, not {actual_typ}"),
@@ -335,6 +346,11 @@ impl<'a> From<&'a TypeCheckError> for Diagnostic {
                 let msg = format!("Expected {expected_count} generic{expected_plural} from this function, but {actual_count} {actual_plural} provided");
                 Diagnostic::simple_error(msg, "".into(), *span)
             },
+            TypeCheckError::MacroReturningNonExpr { typ, span } => Diagnostic::simple_error(
+                format!("Expected macro call to return a `Quoted` but found a(n) `{typ}`"),
+                "Macro calls must return quoted values, otherwise there is no code to insert".into(),
+                *span,
+                ),
         }
     }
 }
diff --git a/compiler/noirc_frontend/src/hir/type_check/expr.rs b/compiler/noirc_frontend/src/hir/type_check/expr.rs
index 50af9dbf34e..77861a6d8f8 100644
--- a/compiler/noirc_frontend/src/hir/type_check/expr.rs
+++ b/compiler/noirc_frontend/src/hir/type_check/expr.rs
@@ -307,13 +307,13 @@ impl<'interner> TypeChecker<'interner> {
 
                 Type::Function(params, Box::new(lambda.return_type), Box::new(env_type))
             }
-            HirExpression::Quote(_) => Type::Code,
+            HirExpression::Quote(_) => Type::Quoted(crate::QuotedType::Quoted),
             HirExpression::Comptime(block) => self.check_block(block),
 
             // Unquote should be inserted & removed by the comptime interpreter.
             // Even if we allowed it here, we wouldn't know what type to give to the result.
             HirExpression::Unquote(block) => {
-                unreachable!("Unquote remaining during type checking {block}")
+                unreachable!("Unquote remaining during type checking {block:?}")
             }
         };
 
@@ -340,7 +340,7 @@ impl<'interner> TypeChecker<'interner> {
         // Check that we are not passing a mutable reference from a constrained runtime to an unconstrained runtime
         if is_current_func_constrained && is_unconstrained_call {
             for (typ, _, _) in args.iter() {
-                if matches!(&typ.follow_bindings(), Type::MutableReference(_)) {
+                if !typ.is_valid_for_unconstrained_boundary() {
                     self.errors.push(TypeCheckError::ConstrainedReferenceToUnconstrained { span });
                 }
             }
@@ -404,8 +404,8 @@ impl<'interner> TypeChecker<'interner> {
 
             for (param, arg) in the_trait.generics.iter().zip(&constraint.trait_generics) {
                 // Avoid binding t = t
-                if !arg.occurs(param.id()) {
-                    bindings.insert(param.id(), (param.clone(), arg.clone()));
+                if !arg.occurs(param.type_var.id()) {
+                    bindings.insert(param.type_var.id(), (param.type_var.clone(), arg.clone()));
                 }
             }
 
@@ -1025,7 +1025,7 @@ impl<'interner> TypeChecker<'interner> {
                 });
                 None
             }
-            Type::NamedGeneric(_, _) => {
+            Type::NamedGeneric(_, _, _) => {
                 let func_meta = self.interner.function_meta(
                     &self.current_function.expect("unexpected method outside a function"),
                 );
diff --git a/compiler/noirc_frontend/src/hir/type_check/mod.rs b/compiler/noirc_frontend/src/hir/type_check/mod.rs
index 98e1cd9c72a..1d3c7fcda9b 100644
--- a/compiler/noirc_frontend/src/hir/type_check/mod.rs
+++ b/compiler/noirc_frontend/src/hir/type_check/mod.rs
@@ -22,7 +22,7 @@ use crate::{
         traits::TraitConstraint,
     },
     node_interner::{ExprId, FuncId, GlobalId, NodeInterner},
-    Type, TypeBindings,
+    Kind, Type, TypeBindings,
 };
 
 pub use self::errors::Source;
@@ -263,7 +263,7 @@ pub(crate) fn check_trait_impl_method_matches_declaration(
 
     // Substitute each generic on the trait with the corresponding generic on the impl
     for (generic, arg) in trait_info.generics.iter().zip(&impl_.trait_generics) {
-        bindings.insert(generic.id(), (generic.clone(), arg.clone()));
+        bindings.insert(generic.type_var.id(), (generic.type_var.clone(), arg.clone()));
     }
 
     // If this is None, the trait does not have the corresponding function.
@@ -284,7 +284,7 @@ pub(crate) fn check_trait_impl_method_matches_declaration(
         for ((_, trait_fn_generic), (name, impl_fn_generic)) in
             trait_fn_meta.direct_generics.iter().zip(&meta.direct_generics)
         {
-            let arg = Type::NamedGeneric(impl_fn_generic.clone(), name.clone());
+            let arg = Type::NamedGeneric(impl_fn_generic.clone(), name.clone(), Kind::Normal);
             bindings.insert(trait_fn_generic.id(), (trait_fn_generic.clone(), arg));
         }
 
@@ -561,6 +561,7 @@ pub mod test {
             all_generics: Vec::new(),
             parameter_idents: Vec::new(),
             function_body: FunctionBody::Resolved,
+            source_crate: CrateId::dummy_id(),
         };
         interner.push_fn_meta(func_meta, func_id);
 
@@ -716,13 +717,15 @@ pub mod test {
         let mut interner = NodeInterner::default();
         interner.populate_dummy_operator_traits();
 
-        assert_eq!(
-            errors.len(),
-            0,
-            "expected 0 parser errors, but got {}, errors: {:?}",
-            errors.len(),
-            errors
-        );
+        if !errors.iter().all(|error| error.is_warning()) {
+            assert_eq!(
+                errors.len(),
+                0,
+                "expected 0 parser errors, but got {}, errors: {:?}",
+                errors.len(),
+                errors
+            );
+        }
 
         let func_ids = btree_map(&func_namespace, |name| {
             (name.to_string(), interner.push_test_function_definition(name.into()))
diff --git a/compiler/noirc_frontend/src/hir_def/expr.rs b/compiler/noirc_frontend/src/hir_def/expr.rs
index 163ea10ee02..8de4f118774 100644
--- a/compiler/noirc_frontend/src/hir_def/expr.rs
+++ b/compiler/noirc_frontend/src/hir_def/expr.rs
@@ -4,6 +4,7 @@ use noirc_errors::Location;
 
 use crate::ast::{BinaryOp, BinaryOpKind, Ident, UnaryOp};
 use crate::node_interner::{DefinitionId, ExprId, FuncId, NodeInterner, StmtId, TraitMethodId};
+use crate::token::Tokens;
 use crate::Shared;
 
 use super::stmt::HirPattern;
@@ -33,8 +34,8 @@ pub enum HirExpression {
     If(HirIfExpression),
     Tuple(Vec<ExprId>),
     Lambda(HirLambda),
-    Quote(crate::ast::BlockExpression),
-    Unquote(crate::ast::BlockExpression),
+    Quote(Tokens),
+    Unquote(Tokens),
     Comptime(HirBlockExpression),
     Error,
 }
diff --git a/compiler/noirc_frontend/src/hir_def/function.rs b/compiler/noirc_frontend/src/hir_def/function.rs
index 53eabe21081..a4a9f855c62 100644
--- a/compiler/noirc_frontend/src/hir_def/function.rs
+++ b/compiler/noirc_frontend/src/hir_def/function.rs
@@ -7,9 +7,10 @@ use super::expr::{HirBlockExpression, HirExpression, HirIdent};
 use super::stmt::HirPattern;
 use super::traits::TraitConstraint;
 use crate::ast::{FunctionKind, FunctionReturnType, Visibility};
+use crate::graph::CrateId;
 use crate::macros_api::BlockExpression;
 use crate::node_interner::{ExprId, NodeInterner, TraitImplId};
-use crate::{Type, TypeVariable};
+use crate::{ResolvedGeneric, Type, TypeVariable};
 
 /// A Hir function is a block expression
 /// with a list of statements
@@ -118,7 +119,7 @@ pub struct FuncMeta {
     /// from outer scopes, such as those introduced by an impl.
     /// This is stored when the FuncMeta is first created to later be used to set the current
     /// generics when the function's body is later resolved.
-    pub all_generics: Vec<(Rc<String>, TypeVariable, Span)>,
+    pub all_generics: Vec<ResolvedGeneric>,
 
     pub location: Location,
 
@@ -145,6 +146,9 @@ pub struct FuncMeta {
     pub has_inline_attribute: bool,
 
     pub function_body: FunctionBody,
+
+    /// The crate this function was defined in
+    pub source_crate: CrateId,
 }
 
 #[derive(Debug, Clone)]
diff --git a/compiler/noirc_frontend/src/hir_def/types.rs b/compiler/noirc_frontend/src/hir_def/types.rs
index 1357ea09f94..0a7797c2bfb 100644
--- a/compiler/noirc_frontend/src/hir_def/types.rs
+++ b/compiler/noirc_frontend/src/hir_def/types.rs
@@ -82,7 +82,7 @@ pub enum Type {
 
     /// NamedGenerics are the 'T' or 'U' in a user-defined generic function
     /// like `fn foo<T, U>(...) {}`. Unlike TypeVariables, they cannot be bound over.
-    NamedGeneric(TypeVariable, Rc<String>),
+    NamedGeneric(TypeVariable, Rc<String>, Kind),
 
     /// A functions with arguments, a return type and environment.
     /// the environment should be `Unit` by default,
@@ -98,14 +98,14 @@ pub enum Type {
     /// but it makes handling them both easier. The TypeVariableId should
     /// never be bound over during type checking, but during monomorphization it
     /// will be and thus needs the full TypeVariable link.
-    Forall(Generics, Box<Type>),
+    Forall(GenericTypeVars, Box<Type>),
 
     /// A type-level integer. Included to let an Array's size type variable
     /// bind to an integer without special checks to bind it to a non-type.
     Constant(u32),
 
     /// The type of quoted code in macros. This is always a comptime-only type
-    Code,
+    Quoted(QuotedType),
 
     /// The result of some type error. Remembering type errors as their own type variant lets
     /// us avoid issuing repeat type errors for the same item. For example, a lambda with
@@ -142,12 +142,12 @@ impl Type {
             | Type::Unit
             | Type::TypeVariable(_, _)
             | Type::TraitAsType(..)
-            | Type::NamedGeneric(_, _)
+            | Type::NamedGeneric(_, _, _)
             | Type::Function(_, _, _)
             | Type::MutableReference(_)
             | Type::Forall(_, _)
             | Type::Constant(_)
-            | Type::Code
+            | Type::Quoted(_)
             | Type::Slice(_)
             | Type::Error => unreachable!("This type cannot exist as a parameter to main"),
         }
@@ -187,6 +187,36 @@ impl Type {
     }
 }
 
+/// A Kind is the type of a Type. These are used since only certain kinds of types are allowed in
+/// certain positions.
+///
+/// For example, the type of a struct field or a function parameter is expected to be
+/// a type of kind * (represented here as `Normal`). Types used in positions where a number
+/// is expected (such as in an array length position) are expected to be of kind `Kind::Numeric`.
+#[derive(PartialEq, Eq, Clone, Hash, Debug)]
+pub enum Kind {
+    Normal,
+    Numeric(Box<Type>),
+}
+
+impl std::fmt::Display for Kind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Kind::Normal => write!(f, "normal"),
+            Kind::Numeric(typ) => write!(f, "numeric {}", typ),
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Copy, Clone, Hash)]
+pub enum QuotedType {
+    Expr,
+    Quoted,
+    TopLevelItem,
+    Type,
+    TypeDefinition,
+}
+
 /// A list of TypeVariableIds to bind to a type. Storing the
 /// TypeVariable in addition to the matching TypeVariableId allows
 /// the binding to later be undone if needed.
@@ -213,7 +243,22 @@ pub struct StructType {
 }
 
 /// Corresponds to generic lists such as `<T, U>` in the source program.
-pub type Generics = Vec<TypeVariable>;
+/// Used mainly for resolved types which no longer need information such
+/// as names or kinds.
+pub type GenericTypeVars = Vec<TypeVariable>;
+
+/// Corresponds to generic lists such as `<T, U>` with additional
+/// information gathered during name resolution that is necessary
+/// correctly resolving types.
+pub type Generics = Vec<ResolvedGeneric>;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct ResolvedGeneric {
+    pub name: Rc<String>,
+    pub type_var: TypeVariable,
+    pub kind: Kind,
+    pub span: Span,
+}
 
 impl std::hash::Hash for StructType {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
@@ -262,7 +307,7 @@ impl StructType {
                     .generics
                     .iter()
                     .zip(generic_args)
-                    .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
+                    .map(|(old, new)| (old.type_var.id(), (old.type_var.clone(), new.clone())))
                     .collect();
 
                 (typ.substitute(&substitutions), i)
@@ -278,7 +323,7 @@ impl StructType {
             .generics
             .iter()
             .zip(generic_args)
-            .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
+            .map(|(old, new)| (old.type_var.id(), (old.type_var.clone(), new.clone())))
             .collect();
 
         vecmap(&self.fields, |(name, typ)| {
@@ -287,15 +332,33 @@ impl StructType {
         })
     }
 
+    /// Returns the name and raw types of each field of this type.
+    /// This will not substitute any generic arguments so a generic field like `x`
+    /// in `struct Foo<T> { x: T }` will return a `("x", T)` pair.
+    ///
+    /// This method is almost never what is wanted for type checking or monomorphization,
+    /// prefer to use `get_fields` whenever possible.
+    pub fn get_fields_as_written(&self) -> Vec<(String, Type)> {
+        vecmap(&self.fields, |(name, typ)| (name.0.contents.clone(), typ.clone()))
+    }
+
     pub fn field_names(&self) -> BTreeSet<Ident> {
         self.fields.iter().map(|(name, _)| name.clone()).collect()
     }
 
+    /// Search the fields of a struct for any types with a `TypeKind::Numeric`
+    pub fn find_numeric_generics_in_fields(&self, found_names: &mut Vec<String>) {
+        for (_, field) in self.fields.iter() {
+            field.find_numeric_type_vars(found_names);
+        }
+    }
+
     /// True if the given index is the same index as a generic type of this struct
     /// which is expected to be a numeric generic.
     /// This is needed because we infer type kinds in Noir and don't have extensive kind checking.
+    /// TODO(https://github.com/noir-lang/noir/issues/5156): This is outdated and we should remove this implicit searching for numeric generics
     pub fn generic_is_numeric(&self, index_of_generic: usize) -> bool {
-        let target_id = self.generics[index_of_generic].0;
+        let target_id = self.generics[index_of_generic].type_var.id();
         self.fields.iter().any(|(_, field)| field.contains_numeric_typevar(target_id))
     }
 
@@ -364,7 +427,7 @@ impl TypeAlias {
             .generics
             .iter()
             .zip(generic_args)
-            .map(|(old, new)| (old.id(), (old.clone(), new.clone())))
+            .map(|(old, new)| (old.type_var.id(), (old.type_var.clone(), new.clone())))
             .collect();
 
         self.typ.substitute(&substitutions)
@@ -374,7 +437,7 @@ impl TypeAlias {
     /// which is expected to be a numeric generic.
     /// This is needed because we infer type kinds in Noir and don't have extensive kind checking.
     pub fn generic_is_numeric(&self, index_of_generic: usize) -> bool {
-        let target_id = self.generics[index_of_generic].0;
+        let target_id = self.generics[index_of_generic].type_var.id();
         self.typ.contains_numeric_typevar(target_id)
     }
 }
@@ -484,7 +547,7 @@ impl TypeVariable {
             TypeBinding::Unbound(id) => *id,
         };
 
-        assert!(!typ.occurs(id));
+        assert!(!typ.occurs(id), "{self:?} occurs within {typ:?}");
         *self.1.borrow_mut() = TypeBinding::Bound(typ);
     }
 
@@ -622,7 +685,7 @@ impl Type {
     fn contains_numeric_typevar(&self, target_id: TypeVariableId) -> bool {
         // True if the given type is a NamedGeneric with the target_id
         let named_generic_id_matches_target = |typ: &Type| {
-            if let Type::NamedGeneric(type_variable, _) = typ {
+            if let Type::NamedGeneric(type_variable, _, _) = typ {
                 match &*type_variable.borrow() {
                     TypeBinding::Bound(_) => {
                         unreachable!("Named generics should not be bound until monomorphization")
@@ -642,9 +705,9 @@ impl Type {
             | Type::Error
             | Type::TypeVariable(_, _)
             | Type::Constant(_)
-            | Type::NamedGeneric(_, _)
+            | Type::NamedGeneric(_, _, _)
             | Type::Forall(_, _)
-            | Type::Code => false,
+            | Type::Quoted(_) => false,
 
             Type::TraitAsType(_, _, args) => {
                 args.iter().any(|generic| generic.contains_numeric_typevar(target_id))
@@ -686,6 +749,85 @@ impl Type {
         }
     }
 
+    /// TODO(https://github.com/noir-lang/noir/issues/5156): Remove with explicit numeric generics
+    pub fn find_numeric_type_vars(&self, found_names: &mut Vec<String>) {
+        // Return whether the named generic has a TypeKind::Numeric and save its name
+        let named_generic_is_numeric = |typ: &Type, found_names: &mut Vec<String>| {
+            if let Type::NamedGeneric(_, name, Kind::Numeric { .. }) = typ {
+                found_names.push(name.to_string());
+                true
+            } else {
+                false
+            }
+        };
+
+        match self {
+            Type::FieldElement
+            | Type::Integer(_, _)
+            | Type::Bool
+            | Type::Unit
+            | Type::Error
+            | Type::Constant(_)
+            | Type::Forall(_, _)
+            | Type::Quoted(_) => {}
+
+            Type::TypeVariable(type_var, _) => {
+                if let TypeBinding::Bound(typ) = &*type_var.borrow() {
+                    named_generic_is_numeric(typ, found_names);
+                }
+            }
+
+            Type::NamedGeneric(_, _, _) => {
+                named_generic_is_numeric(self, found_names);
+            }
+
+            Type::TraitAsType(_, _, args) => {
+                for arg in args.iter() {
+                    arg.find_numeric_type_vars(found_names);
+                }
+            }
+            Type::Array(length, elem) => {
+                elem.find_numeric_type_vars(found_names);
+                named_generic_is_numeric(length, found_names);
+            }
+            Type::Slice(elem) => elem.find_numeric_type_vars(found_names),
+            Type::Tuple(fields) => {
+                for field in fields.iter() {
+                    field.find_numeric_type_vars(found_names);
+                }
+            }
+            Type::Function(parameters, return_type, env) => {
+                for parameter in parameters.iter() {
+                    parameter.find_numeric_type_vars(found_names);
+                }
+                return_type.find_numeric_type_vars(found_names);
+                env.find_numeric_type_vars(found_names);
+            }
+            Type::Struct(_, generics) => {
+                for generic in generics.iter() {
+                    if !named_generic_is_numeric(generic, found_names) {
+                        generic.find_numeric_type_vars(found_names);
+                    }
+                }
+            }
+            Type::Alias(_, generics) => {
+                for generic in generics.iter() {
+                    if !named_generic_is_numeric(generic, found_names) {
+                        generic.find_numeric_type_vars(found_names);
+                    }
+                }
+            }
+            Type::MutableReference(element) => element.find_numeric_type_vars(found_names),
+            Type::String(length) => {
+                named_generic_is_numeric(length, found_names);
+            }
+            Type::FmtString(length, elements) => {
+                elements.find_numeric_type_vars(found_names);
+                named_generic_is_numeric(length, found_names);
+            }
+        }
+    }
+
     /// True if this type can be used as a parameter to `main` or a contract function.
     /// This is only false for unsized types like slices or slices that do not make sense
     /// as a program input such as named generics or mutable references.
@@ -706,11 +848,11 @@ impl Type {
 
             Type::FmtString(_, _)
             | Type::TypeVariable(_, _)
-            | Type::NamedGeneric(_, _)
+            | Type::NamedGeneric(_, _, _)
             | Type::Function(_, _, _)
             | Type::MutableReference(_)
             | Type::Forall(_, _)
-            | Type::Code
+            | Type::Quoted(_)
             | Type::Slice(_)
             | Type::TraitAsType(..) => false,
 
@@ -748,7 +890,7 @@ impl Type {
             | Type::Unit
             | Type::Constant(_)
             | Type::TypeVariable(_, _)
-            | Type::NamedGeneric(_, _)
+            | Type::NamedGeneric(_, _, _)
             | Type::Error => true,
 
             Type::FmtString(_, _)
@@ -759,7 +901,7 @@ impl Type {
             | Type::MutableReference(_)
             | Type::Forall(_, _)
             // TODO: probably can allow code as it is all compile time
-            | Type::Code
+            | Type::Quoted(_)
             | Type::TraitAsType(..) => false,
 
             Type::Alias(alias, generics) => {
@@ -780,12 +922,55 @@ impl Type {
         }
     }
 
+    /// Returns true if a value of this type can safely pass between constrained and
+    /// unconstrained functions (and vice-versa).
+    pub(crate) fn is_valid_for_unconstrained_boundary(&self) -> bool {
+        match self {
+            Type::FieldElement
+            | Type::Integer(_, _)
+            | Type::Bool
+            | Type::Unit
+            | Type::Constant(_)
+            | Type::Slice(_)
+            | Type::TypeVariable(_, _)
+            | Type::NamedGeneric(_, _, _)
+            | Type::Function(_, _, _)
+            | Type::FmtString(_, _)
+            | Type::Error => true,
+
+            // Quoted objects only exist at compile-time where the only execution
+            // environment is the interpreter. In this environment, they are valid.
+            Type::Quoted(_) => true,
+
+            Type::MutableReference(_) | Type::Forall(_, _) | Type::TraitAsType(..) => false,
+
+            Type::Alias(alias, generics) => {
+                let alias = alias.borrow();
+                alias.get_type(generics).is_valid_for_unconstrained_boundary()
+            }
+
+            Type::Array(length, element) => {
+                length.is_valid_for_unconstrained_boundary()
+                    && element.is_valid_for_unconstrained_boundary()
+            }
+            Type::String(length) => length.is_valid_for_unconstrained_boundary(),
+            Type::Tuple(elements) => {
+                elements.iter().all(|elem| elem.is_valid_for_unconstrained_boundary())
+            }
+            Type::Struct(definition, generics) => definition
+                .borrow()
+                .get_fields(generics)
+                .into_iter()
+                .all(|(_, field)| field.is_valid_for_unconstrained_boundary()),
+        }
+    }
+
     /// Returns the number of `Forall`-quantified type variables on this type.
     /// Returns 0 if this is not a Type::Forall
     pub fn generic_count(&self) -> usize {
         match self {
             Type::Forall(generics, _) => generics.len(),
-            Type::TypeVariable(type_variable, _) | Type::NamedGeneric(type_variable, _) => {
+            Type::TypeVariable(type_variable, _) | Type::NamedGeneric(type_variable, _, _) => {
                 match &*type_variable.borrow() {
                     TypeBinding::Bound(binding) => binding.generic_count(),
                     TypeBinding::Unbound(_) => 0,
@@ -814,12 +999,42 @@ impl Type {
 
     /// Return the generics and type within this `Type::Forall`.
     /// Panics if `self` is not `Type::Forall`
-    pub fn unwrap_forall(&self) -> (Cow<Generics>, &Type) {
+    pub fn unwrap_forall(&self) -> (Cow<GenericTypeVars>, &Type) {
         match self {
             Type::Forall(generics, typ) => (Cow::Borrowed(generics), typ.as_ref()),
-            other => (Cow::Owned(Generics::new()), other),
+            other => (Cow::Owned(GenericTypeVars::new()), other),
         }
     }
+
+    // TODO(https://github.com/noir-lang/noir/issues/5156): Bring back this method when we remove implicit numeric generics
+    // It has been commented out as to not trigger clippy for an unused method
+    // pub(crate) fn kind(&self) -> Kind {
+    //     match self {
+    //         Type::NamedGeneric(_, _, kind) => kind.clone(),
+    //         Type::Constant(_) => Kind::Numeric(Box::new(Type::Integer(
+    //             Signedness::Unsigned,
+    //             IntegerBitSize::ThirtyTwo,
+    //         ))),
+    //         Type::FieldElement
+    //         | Type::Array(_, _)
+    //         | Type::Slice(_)
+    //         | Type::Integer(_, _)
+    //         | Type::Bool
+    //         | Type::String(_)
+    //         | Type::FmtString(_, _)
+    //         | Type::Unit
+    //         | Type::Tuple(_)
+    //         | Type::Struct(_, _)
+    //         | Type::Alias(_, _)
+    //         | Type::TypeVariable(_, _)
+    //         | Type::TraitAsType(_, _, _)
+    //         | Type::Function(_, _, _)
+    //         | Type::MutableReference(_)
+    //         | Type::Forall(_, _)
+    //         | Type::Quoted(_)
+    //         | Type::Error => Kind::Normal,
+    //     }
+    // }
 }
 
 impl std::fmt::Display for Type {
@@ -899,7 +1114,7 @@ impl std::fmt::Display for Type {
             }
             Type::Unit => write!(f, "()"),
             Type::Error => write!(f, "error"),
-            Type::NamedGeneric(binding, name) => match &*binding.borrow() {
+            Type::NamedGeneric(binding, name, _) => match &*binding.borrow() {
                 TypeBinding::Bound(binding) => binding.fmt(f),
                 TypeBinding::Unbound(_) if name.is_empty() => write!(f, "_"),
                 TypeBinding::Unbound(_) => write!(f, "{name}"),
@@ -922,7 +1137,7 @@ impl std::fmt::Display for Type {
             Type::MutableReference(element) => {
                 write!(f, "&mut {element}")
             }
-            Type::Code => write!(f, "Code"),
+            Type::Quoted(quoted) => write!(f, "{}", quoted),
         }
     }
 }
@@ -954,6 +1169,18 @@ impl std::fmt::Display for TypeBinding {
     }
 }
 
+impl std::fmt::Display for QuotedType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            QuotedType::Expr => write!(f, "Expr"),
+            QuotedType::Quoted => write!(f, "Quoted"),
+            QuotedType::TopLevelItem => write!(f, "TopLevelItem"),
+            QuotedType::Type => write!(f, "Type"),
+            QuotedType::TypeDefinition => write!(f, "TypeDefinition"),
+        }
+    }
+}
+
 pub struct UnificationError;
 
 impl Type {
@@ -1116,8 +1343,7 @@ impl Type {
             TypeBinding::Unbound(id) => *id,
         };
 
-        let this = self.substitute(bindings);
-
+        let this = self.substitute(bindings).follow_bindings();
         if let Some(binding) = this.get_inner_type_variable() {
             match &*binding.borrow() {
                 TypeBinding::Bound(typ) => return typ.try_bind_to(var, bindings),
@@ -1139,7 +1365,7 @@ impl Type {
 
     fn get_inner_type_variable(&self) -> Option<Shared<TypeBinding>> {
         match self {
-            Type::TypeVariable(var, _) | Type::NamedGeneric(var, _) => Some(var.1.clone()),
+            Type::TypeVariable(var, _) | Type::NamedGeneric(var, _, _) => Some(var.1.clone()),
             _ => None,
         }
     }
@@ -1250,7 +1476,7 @@ impl Type {
                 }
             }
 
-            (NamedGeneric(binding, _), other) | (other, NamedGeneric(binding, _))
+            (NamedGeneric(binding, _, _), other) | (other, NamedGeneric(binding, _, _))
                 if !binding.borrow().is_unbound() =>
             {
                 if let TypeBinding::Bound(link) = &*binding.borrow() {
@@ -1260,7 +1486,7 @@ impl Type {
                 }
             }
 
-            (NamedGeneric(binding_a, name_a), NamedGeneric(binding_b, name_b)) => {
+            (NamedGeneric(binding_a, name_a, _), NamedGeneric(binding_b, name_b, _)) => {
                 // Bound NamedGenerics are caught by the check above
                 assert!(binding_a.borrow().is_unbound());
                 assert!(binding_b.borrow().is_unbound());
@@ -1516,6 +1742,15 @@ impl Type {
         }
     }
 
+    fn type_variable_id(&self) -> Option<TypeVariableId> {
+        match self {
+            Type::TypeVariable(variable, _) | Type::NamedGeneric(variable, _, _) => {
+                Some(variable.0)
+            }
+            _ => None,
+        }
+    }
+
     /// Substitute any type variables found within this type with the
     /// given bindings if found. If a type variable is not found within
     /// the given TypeBindings, it is unchanged.
@@ -1550,18 +1785,29 @@ impl Type {
             return self.clone();
         }
 
+        let recur_on_binding = |id, replacement: &Type| {
+            // Prevent recuring forever if there's a `T := T` binding
+            if replacement.type_variable_id() == Some(id) {
+                replacement.clone()
+            } else {
+                replacement.substitute_helper(type_bindings, substitute_bound_typevars)
+            }
+        };
+
         let substitute_binding = |binding: &TypeVariable| {
             // Check the id first to allow substituting to
             // type variables that have already been bound over.
             // This is needed for monomorphizing trait impl methods.
             match type_bindings.get(&binding.0) {
-                Some((_, binding)) if substitute_bound_typevars => binding.clone(),
+                Some((_, replacement)) if substitute_bound_typevars => {
+                    recur_on_binding(binding.0, replacement)
+                }
                 _ => match &*binding.borrow() {
                     TypeBinding::Bound(binding) => {
                         binding.substitute_helper(type_bindings, substitute_bound_typevars)
                     }
                     TypeBinding::Unbound(id) => match type_bindings.get(id) {
-                        Some((_, binding)) => binding.clone(),
+                        Some((_, replacement)) => recur_on_binding(binding.0, replacement),
                         None => self.clone(),
                     },
                 },
@@ -1587,7 +1833,7 @@ impl Type {
                 let fields = fields.substitute_helper(type_bindings, substitute_bound_typevars);
                 Type::FmtString(Box::new(size), Box::new(fields))
             }
-            Type::NamedGeneric(binding, _) | Type::TypeVariable(binding, _) => {
+            Type::NamedGeneric(binding, _, _) | Type::TypeVariable(binding, _) => {
                 substitute_binding(binding)
             }
             // Do not substitute_helper fields, it can lead to infinite recursion
@@ -1643,7 +1889,7 @@ impl Type {
             | Type::Bool
             | Type::Constant(_)
             | Type::Error
-            | Type::Code
+            | Type::Quoted(_)
             | Type::Unit => self.clone(),
         }
     }
@@ -1665,7 +1911,7 @@ impl Type {
                 generic_args.iter().any(|arg| arg.occurs(target_id))
             }
             Type::Tuple(fields) => fields.iter().any(|field| field.occurs(target_id)),
-            Type::NamedGeneric(binding, _) | Type::TypeVariable(binding, _) => {
+            Type::NamedGeneric(binding, _, _) | Type::TypeVariable(binding, _) => {
                 match &*binding.borrow() {
                     TypeBinding::Bound(binding) => binding.occurs(target_id),
                     TypeBinding::Unbound(id) => *id == target_id,
@@ -1686,7 +1932,7 @@ impl Type {
             | Type::Bool
             | Type::Constant(_)
             | Type::Error
-            | Type::Code
+            | Type::Quoted(_)
             | Type::Unit => false,
         }
     }
@@ -1720,7 +1966,7 @@ impl Type {
                 def.borrow().get_type(args).follow_bindings()
             }
             Tuple(args) => Tuple(vecmap(args, |arg| arg.follow_bindings())),
-            TypeVariable(var, _) | NamedGeneric(var, _) => {
+            TypeVariable(var, _) | NamedGeneric(var, _, _) => {
                 if let TypeBinding::Bound(typ) = &*var.borrow() {
                     return typ.follow_bindings();
                 }
@@ -1743,11 +1989,13 @@ impl Type {
 
             // Expect that this function should only be called on instantiated types
             Forall(..) => unreachable!(),
-            FieldElement | Integer(_, _) | Bool | Constant(_) | Unit | Code | Error => self.clone(),
+            FieldElement | Integer(_, _) | Bool | Constant(_) | Unit | Quoted(_) | Error => {
+                self.clone()
+            }
         }
     }
 
-    pub fn from_generics(generics: &Generics) -> Vec<Type> {
+    pub fn from_generics(generics: &GenericTypeVars) -> Vec<Type> {
         vecmap(generics, |var| Type::TypeVariable(var.clone(), TypeVariableKind::Normal))
     }
 }
@@ -1878,7 +2126,7 @@ impl From<&Type> for PrintableType {
             Type::MutableReference(typ) => {
                 PrintableType::MutableReference { typ: Box::new(typ.as_ref().into()) }
             }
-            Type::Code => unreachable!(),
+            Type::Quoted(_) => unreachable!(),
         }
     }
 }
@@ -1944,7 +2192,14 @@ impl std::fmt::Debug for Type {
             }
             Type::Unit => write!(f, "()"),
             Type::Error => write!(f, "error"),
-            Type::NamedGeneric(binding, name) => write!(f, "{}{:?}", name, binding),
+            Type::NamedGeneric(binding, name, kind) => match kind {
+                Kind::Normal => {
+                    write!(f, "{} -> {:?}", name, binding)
+                }
+                Kind::Numeric(typ) => {
+                    write!(f, "({} : {}) -> {:?}", name, typ, binding)
+                }
+            },
             Type::Constant(x) => x.fmt(f),
             Type::Forall(typevars, typ) => {
                 let typevars = vecmap(typevars, |var| format!("{:?}", var));
@@ -1963,7 +2218,7 @@ impl std::fmt::Debug for Type {
             Type::MutableReference(element) => {
                 write!(f, "&mut {element:?}")
             }
-            Type::Code => write!(f, "Code"),
+            Type::Quoted(quoted) => write!(f, "{}", quoted),
         }
     }
 }
diff --git a/compiler/noirc_frontend/src/lexer/errors.rs b/compiler/noirc_frontend/src/lexer/errors.rs
index 73c75af4cd7..2452e034c1c 100644
--- a/compiler/noirc_frontend/src/lexer/errors.rs
+++ b/compiler/noirc_frontend/src/lexer/errors.rs
@@ -27,6 +27,10 @@ pub enum LexerErrorKind {
         "'\\{escaped}' is not a valid escape sequence. Use '\\' for a literal backslash character."
     )]
     InvalidEscape { escaped: char, span: Span },
+    #[error("Invalid quote delimiter `{delimiter}`, valid delimiters are `{{`, `[`, and `(`")]
+    InvalidQuoteDelimiter { delimiter: SpannedToken },
+    #[error("Expected `{end_delim}` to close this {start_delim}")]
+    UnclosedQuote { start_delim: SpannedToken, end_delim: Token },
 }
 
 impl From<LexerErrorKind> for ParserError {
@@ -47,6 +51,8 @@ impl LexerErrorKind {
             LexerErrorKind::UnterminatedBlockComment { span } => *span,
             LexerErrorKind::UnterminatedStringLiteral { span } => *span,
             LexerErrorKind::InvalidEscape { span, .. } => *span,
+            LexerErrorKind::InvalidQuoteDelimiter { delimiter } => delimiter.to_span(),
+            LexerErrorKind::UnclosedQuote { start_delim, .. } => start_delim.to_span(),
         }
     }
 
@@ -92,6 +98,12 @@ impl LexerErrorKind {
                 ("Unterminated string literal".to_string(), "Unterminated string literal".to_string(), *span),
             LexerErrorKind::InvalidEscape { escaped, span } =>
                 (format!("'\\{escaped}' is not a valid escape sequence. Use '\\' for a literal backslash character."), "Invalid escape sequence".to_string(), *span),
+            LexerErrorKind::InvalidQuoteDelimiter { delimiter } => {
+                (format!("Invalid quote delimiter `{delimiter}`"), "Valid delimiters are `{`, `[`, and `(`".to_string(), delimiter.to_span())
+            },
+            LexerErrorKind::UnclosedQuote { start_delim, end_delim } => {
+                ("Unclosed `quote` expression".to_string(), format!("Expected a `{end_delim}` to close this `{start_delim}`"), start_delim.to_span())
+            }
         }
     }
 }
diff --git a/compiler/noirc_frontend/src/lexer/lexer.rs b/compiler/noirc_frontend/src/lexer/lexer.rs
index 2d1ebf530e3..d2d417740b3 100644
--- a/compiler/noirc_frontend/src/lexer/lexer.rs
+++ b/compiler/noirc_frontend/src/lexer/lexer.rs
@@ -144,6 +144,7 @@ impl<'a> Lexer<'a> {
             Some('"') => self.eat_string_literal(),
             Some('f') => self.eat_format_string_or_alpha_numeric(),
             Some('r') => self.eat_raw_string_or_alpha_numeric(),
+            Some('q') => self.eat_quote_or_alpha_numeric(),
             Some('#') => self.eat_attribute(),
             Some(ch) if ch.is_ascii_alphanumeric() || ch == '_' => self.eat_alpha_numeric(ch),
             Some(ch) => {
@@ -309,14 +310,25 @@ impl<'a> Lexer<'a> {
     //XXX(low): Can increase performance if we use iterator semantic and utilize some of the methods on String. See below
     // https://doc.rust-lang.org/stable/std/primitive.str.html#method.rsplit
     fn eat_word(&mut self, initial_char: char) -> SpannedTokenResult {
-        let start = self.position;
+        let (start, word, end) = self.lex_word(initial_char);
+        self.lookup_word_token(word, start, end)
+    }
 
+    /// Lex the next word in the input stream. Returns (start position, word, end position)
+    fn lex_word(&mut self, initial_char: char) -> (Position, String, Position) {
+        let start = self.position;
         let word = self.eat_while(Some(initial_char), |ch| {
             ch.is_ascii_alphabetic() || ch.is_numeric() || ch == '_'
         });
+        (start, word, self.position)
+    }
 
-        let end = self.position;
-
+    fn lookup_word_token(
+        &self,
+        word: String,
+        start: Position,
+        end: Position,
+    ) -> SpannedTokenResult {
         // Check if word either an identifier or a keyword
         if let Some(keyword_token) = Keyword::lookup_keyword(&word) {
             return Ok(keyword_token.into_span(start, end));
@@ -508,6 +520,50 @@ impl<'a> Lexer<'a> {
         }
     }
 
+    fn eat_quote_or_alpha_numeric(&mut self) -> SpannedTokenResult {
+        let (start, word, end) = self.lex_word('q');
+        if word != "quote" {
+            return self.lookup_word_token(word, start, end);
+        }
+
+        let delimiter = self.next_token()?;
+        let (start_delim, end_delim) = match delimiter.token() {
+            Token::LeftBrace => (Token::LeftBrace, Token::RightBrace),
+            Token::LeftBracket => (Token::LeftBracket, Token::RightBracket),
+            Token::LeftParen => (Token::LeftParen, Token::RightParen),
+            _ => return Err(LexerErrorKind::InvalidQuoteDelimiter { delimiter }),
+        };
+
+        let mut tokens = Vec::new();
+
+        // Keep track of each nested delimiter we need to close.
+        let mut nested_delimiters = vec![delimiter];
+
+        while !nested_delimiters.is_empty() {
+            let token = self.next_token()?;
+
+            if *token.token() == start_delim {
+                nested_delimiters.push(token.clone());
+            } else if *token.token() == end_delim {
+                nested_delimiters.pop();
+            } else if *token.token() == Token::EOF {
+                let start_delim =
+                    nested_delimiters.pop().expect("If this were empty, we wouldn't be looping");
+                return Err(LexerErrorKind::UnclosedQuote { start_delim, end_delim });
+            }
+
+            tokens.push(token);
+        }
+
+        // Pop the closing delimiter from the token stream
+        if !tokens.is_empty() {
+            tokens.pop();
+        }
+
+        let end = self.position;
+        Ok(Token::Quote(Tokens(tokens)).into_span(start, end))
+    }
+
     fn parse_comment(&mut self, start: u32) -> SpannedTokenResult {
         let doc_style = match self.peek_char() {
             Some('!') => {
@@ -603,6 +659,8 @@ impl<'a> Iterator for Lexer<'a> {
 
 #[cfg(test)]
 mod tests {
+    use iter_extended::vecmap;
+
     use super::*;
     use crate::token::{FunctionAttribute, SecondaryAttribute, TestScope};
 
@@ -1231,4 +1289,45 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_quote() {
+        // cases is a vector of pairs of (test string, expected # of tokens in token stream)
+        let cases = vec![
+            ("quote {}", 0),
+            ("quote { a.b }", 3),
+            ("quote { ) ( }", 2), // invalid syntax is fine in a quote
+            ("quote { { } }", 2), // Nested `{` and `}` shouldn't close the quote as long as they are matched.
+            ("quote { 1 { 2 { 3 { 4 { 5 } 4 4 } 3 3 } 2 2 } 1 1 }", 21),
+            ("quote [ } } ]", 2), // In addition to `{}`, `[]`, and `()` can also be used as delimiters.
+            ("quote [ } foo[] } ]", 5),
+            ("quote ( } () } )", 4),
+        ];
+
+        for (source, expected_stream_length) in cases {
+            let mut tokens = vecmap(Lexer::new(source), |result| result.unwrap().into_token());
+
+            // All examples should be a single TokenStream token followed by an EOF token.
+            assert_eq!(tokens.len(), 2, "Unexpected token count: {tokens:?}");
+
+            tokens.pop();
+            match tokens.pop().unwrap() {
+                Token::Quote(stream) => assert_eq!(stream.0.len(), expected_stream_length),
+                other => panic!("test_quote test failure! Expected a single TokenStream token, got {other} for input `{source}`")
+            }
+        }
+    }
+
+    #[test]
+    fn test_unclosed_quote() {
+        let cases = vec!["quote {", "quote { {  }", "quote [ []", "quote (((((((())))"];
+
+        for source in cases {
+            // `quote` is not itself a keyword so if the token stream fails to
+            // parse we don't expect any valid tokens from the quote construct
+            for token in Lexer::new(source) {
+                assert!(token.is_err(), "Expected Err, found {token:?}");
+            }
+        }
+    }
 }
diff --git a/compiler/noirc_frontend/src/lexer/token.rs b/compiler/noirc_frontend/src/lexer/token.rs
index d8555b4fbf7..f61dab28062 100644
--- a/compiler/noirc_frontend/src/lexer/token.rs
+++ b/compiler/noirc_frontend/src/lexer/token.rs
@@ -2,7 +2,10 @@ use acvm::{acir::AcirField, FieldElement};
 use noirc_errors::{Position, Span, Spanned};
 use std::{fmt, iter::Map, vec::IntoIter};
 
-use crate::lexer::errors::LexerErrorKind;
+use crate::{
+    lexer::errors::LexerErrorKind,
+    node_interner::{ExprId, QuotedTypeId},
+};
 
 /// Represents a token in noir's grammar - a word, number,
 /// or symbol that can be used in noir's syntax. This is the
@@ -23,6 +26,8 @@ pub enum BorrowedToken<'input> {
     Attribute(Attribute),
     LineComment(&'input str, Option<DocStyle>),
     BlockComment(&'input str, Option<DocStyle>),
+    Quote(&'input Tokens),
+    QuotedType(QuotedTypeId),
     /// <
     Less,
     /// <=
@@ -92,6 +97,11 @@ pub enum BorrowedToken<'input> {
 
     Whitespace(&'input str),
 
+    /// This is an implementation detail on how macros are implemented by quoting token streams.
+    /// This token marks where an unquote operation is performed. The ExprId argument is the
+    /// resolved variable which is being unquoted at this position in the token stream.
+    UnquoteMarker(ExprId),
+
     /// An invalid character is one that is not in noir's language or grammar.
     ///
     /// We don't report invalid tokens in the source as errors until parsing to
@@ -115,6 +125,13 @@ pub enum Token {
     Attribute(Attribute),
     LineComment(String, Option<DocStyle>),
     BlockComment(String, Option<DocStyle>),
+    // A `quote { ... }` along with the tokens in its token stream.
+    Quote(Tokens),
+    /// A quoted type resulting from a `Type` object in noir code being
+    /// spliced into a macro's token stream. We preserve the original type
+    /// to avoid having to tokenize it, re-parse it, and re-resolve it which
+    /// may change the underlying type.
+    QuotedType(QuotedTypeId),
     /// <
     Less,
     /// <=
@@ -184,6 +201,11 @@ pub enum Token {
 
     Whitespace(String),
 
+    /// This is an implementation detail on how macros are implemented by quoting token streams.
+    /// This token marks where an unquote operation is performed. The ExprId argument is the
+    /// resolved variable which is being unquoted at this position in the token stream.
+    UnquoteMarker(ExprId),
+
     /// An invalid character is one that is not in noir's language or grammar.
     ///
     /// We don't report invalid tokens in the source as errors until parsing to
@@ -205,6 +227,8 @@ pub fn token_to_borrowed_token(token: &Token) -> BorrowedToken<'_> {
         Token::Attribute(ref a) => BorrowedToken::Attribute(a.clone()),
         Token::LineComment(ref s, _style) => BorrowedToken::LineComment(s, *_style),
         Token::BlockComment(ref s, _style) => BorrowedToken::BlockComment(s, *_style),
+        Token::Quote(stream) => BorrowedToken::Quote(stream),
+        Token::QuotedType(id) => BorrowedToken::QuotedType(*id),
         Token::IntType(ref i) => BorrowedToken::IntType(i.clone()),
         Token::Less => BorrowedToken::Less,
         Token::LessEqual => BorrowedToken::LessEqual,
@@ -241,6 +265,7 @@ pub fn token_to_borrowed_token(token: &Token) -> BorrowedToken<'_> {
         Token::EOF => BorrowedToken::EOF,
         Token::Invalid(c) => BorrowedToken::Invalid(*c),
         Token::Whitespace(ref s) => BorrowedToken::Whitespace(s),
+        Token::UnquoteMarker(id) => BorrowedToken::UnquoteMarker(*id),
     }
 }
 
@@ -250,7 +275,7 @@ pub enum DocStyle {
     Inner,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct SpannedToken(Spanned<Token>);
 
 impl PartialEq<SpannedToken> for Token {
@@ -316,6 +341,15 @@ impl fmt::Display for Token {
             Token::Attribute(ref a) => write!(f, "{a}"),
             Token::LineComment(ref s, _style) => write!(f, "//{s}"),
             Token::BlockComment(ref s, _style) => write!(f, "/*{s}*/"),
+            Token::Quote(ref stream) => {
+                write!(f, "quote {{")?;
+                for token in stream.0.iter() {
+                    write!(f, " {token}")?;
+                }
+                write!(f, "}}")
+            }
+            // Quoted types only have an ID so there is nothing to display
+            Token::QuotedType(_) => write!(f, "(type)"),
             Token::IntType(ref i) => write!(f, "{i}"),
             Token::Less => write!(f, "<"),
             Token::LessEqual => write!(f, "<="),
@@ -352,6 +386,7 @@ impl fmt::Display for Token {
             Token::EOF => write!(f, "end of input"),
             Token::Invalid(c) => write!(f, "{c}"),
             Token::Whitespace(ref s) => write!(f, "{s}"),
+            Token::UnquoteMarker(_) => write!(f, "(UnquoteMarker)"),
         }
     }
 }
@@ -364,6 +399,9 @@ pub enum TokenKind {
     Literal,
     Keyword,
     Attribute,
+    Quote,
+    QuotedType,
+    UnquoteMarker,
 }
 
 impl fmt::Display for TokenKind {
@@ -374,13 +412,16 @@ impl fmt::Display for TokenKind {
             TokenKind::Literal => write!(f, "literal"),
             TokenKind::Keyword => write!(f, "keyword"),
             TokenKind::Attribute => write!(f, "attribute"),
+            TokenKind::Quote => write!(f, "quote"),
+            TokenKind::QuotedType => write!(f, "quoted type"),
+            TokenKind::UnquoteMarker => write!(f, "macro result"),
         }
     }
 }
 
 impl Token {
     pub fn kind(&self) -> TokenKind {
-        match *self {
+        match self {
             Token::Ident(_) => TokenKind::Ident,
             Token::Int(_)
             | Token::Bool(_)
@@ -389,7 +430,10 @@ impl Token {
             | Token::FmtStr(_) => TokenKind::Literal,
             Token::Keyword(_) => TokenKind::Keyword,
             Token::Attribute(_) => TokenKind::Attribute,
-            ref tok => TokenKind::Token(tok.clone()),
+            Token::UnquoteMarker(_) => TokenKind::UnquoteMarker,
+            Token::Quote(_) => TokenKind::Quote,
+            Token::QuotedType(_) => TokenKind::QuotedType,
+            tok => TokenKind::Token(tok.clone()),
         }
     }
 
@@ -852,14 +896,17 @@ pub enum Keyword {
     Mod,
     Mut,
     Pub,
-    Quote,
+    Quoted,
     Return,
     ReturnData,
     String,
     Struct,
     Super,
+    TopLevelItem,
     Trait,
     Type,
+    TypeType,
+    TypeDefinition,
     Unchecked,
     Unconstrained,
     Use,
@@ -896,14 +943,17 @@ impl fmt::Display for Keyword {
             Keyword::Mod => write!(f, "mod"),
             Keyword::Mut => write!(f, "mut"),
             Keyword::Pub => write!(f, "pub"),
-            Keyword::Quote => write!(f, "quote"),
+            Keyword::Quoted => write!(f, "Quoted"),
             Keyword::Return => write!(f, "return"),
             Keyword::ReturnData => write!(f, "return_data"),
             Keyword::String => write!(f, "str"),
             Keyword::Struct => write!(f, "struct"),
             Keyword::Super => write!(f, "super"),
+            Keyword::TopLevelItem => write!(f, "TopLevelItem"),
             Keyword::Trait => write!(f, "trait"),
             Keyword::Type => write!(f, "type"),
+            Keyword::TypeType => write!(f, "Type"),
+            Keyword::TypeDefinition => write!(f, "TypeDefinition"),
             Keyword::Unchecked => write!(f, "unchecked"),
             Keyword::Unconstrained => write!(f, "unconstrained"),
             Keyword::Use => write!(f, "use"),
@@ -943,14 +993,17 @@ impl Keyword {
             "mod" => Keyword::Mod,
             "mut" => Keyword::Mut,
             "pub" => Keyword::Pub,
-            "quote" => Keyword::Quote,
+            "Quoted" => Keyword::Quoted,
             "return" => Keyword::Return,
             "return_data" => Keyword::ReturnData,
             "str" => Keyword::String,
             "struct" => Keyword::Struct,
             "super" => Keyword::Super,
+            "TopLevelItem" => Keyword::TopLevelItem,
             "trait" => Keyword::Trait,
             "type" => Keyword::Type,
+            "Type" => Keyword::TypeType,
+            "TypeDefinition" => Keyword::TypeDefinition,
             "unchecked" => Keyword::Unchecked,
             "unconstrained" => Keyword::Unconstrained,
             "use" => Keyword::Use,
@@ -966,6 +1019,7 @@ impl Keyword {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Tokens(pub Vec<SpannedToken>);
 
 type TokenMapIter = Map<IntoIter<SpannedToken>, fn(SpannedToken) -> (Token, Span)>;
diff --git a/compiler/noirc_frontend/src/monomorphization/errors.rs b/compiler/noirc_frontend/src/monomorphization/errors.rs
index 2db570540d6..df61c138c02 100644
--- a/compiler/noirc_frontend/src/monomorphization/errors.rs
+++ b/compiler/noirc_frontend/src/monomorphization/errors.rs
@@ -6,6 +6,7 @@ use crate::hir::comptime::InterpreterError;
 pub enum MonomorphizationError {
     UnknownArrayLength { location: Location },
     TypeAnnotationsNeeded { location: Location },
+    InternalError { message: &'static str, location: Location },
     InterpreterError(InterpreterError),
 }
 
@@ -13,6 +14,7 @@ impl MonomorphizationError {
     fn location(&self) -> Location {
         match self {
             MonomorphizationError::UnknownArrayLength { location }
+            | MonomorphizationError::InternalError { location, .. }
             | MonomorphizationError::TypeAnnotationsNeeded { location } => *location,
             MonomorphizationError::InterpreterError(error) => error.get_location(),
         }
@@ -36,6 +38,7 @@ impl MonomorphizationError {
             }
             MonomorphizationError::TypeAnnotationsNeeded { .. } => "Type annotations needed",
             MonomorphizationError::InterpreterError(error) => return (&error).into(),
+            MonomorphizationError::InternalError { message, .. } => message,
         };
 
         let location = self.location();
diff --git a/compiler/noirc_frontend/src/monomorphization/mod.rs b/compiler/noirc_frontend/src/monomorphization/mod.rs
index 6dfd575d2b2..400898c3fc6 100644
--- a/compiler/noirc_frontend/src/monomorphization/mod.rs
+++ b/compiler/noirc_frontend/src/monomorphization/mod.rs
@@ -891,7 +891,11 @@ impl<'interner> Monomorphizer<'interner> {
             DefinitionKind::Local(_) => match self.lookup_captured_expr(ident.id) {
                 Some(expr) => expr,
                 None => {
-                    let ident = self.local_ident(&ident)?.unwrap();
+                    let Some(ident) = self.local_ident(&ident)? else {
+                        let location = self.interner.id_location(expr_id);
+                        let message = "ICE: Variable not found during monomorphization";
+                        return Err(MonomorphizationError::InternalError { location, message });
+                    };
                     ast::Expression::Ident(ident)
                 }
             },
@@ -943,7 +947,7 @@ impl<'interner> Monomorphizer<'interner> {
             HirType::TraitAsType(..) => {
                 unreachable!("All TraitAsType should be replaced before calling convert_type");
             }
-            HirType::NamedGeneric(binding, _) => {
+            HirType::NamedGeneric(binding, _, _) => {
                 if let TypeBinding::Bound(binding) = &*binding.borrow() {
                     return Self::convert_type(binding, location);
                 }
@@ -1014,7 +1018,7 @@ impl<'interner> Monomorphizer<'interner> {
             HirType::Forall(_, _) | HirType::Constant(_) | HirType::Error => {
                 unreachable!("Unexpected type {} found", typ)
             }
-            HirType::Code => unreachable!("Tried to translate Code type into runtime code"),
+            HirType::Quoted(_) => unreachable!("Tried to translate Code type into runtime code"),
         })
     }
 
@@ -1273,19 +1277,19 @@ impl<'interner> Monomorphizer<'interner> {
                     }
                     "modulus_le_bits" => {
                         let bits = FieldElement::modulus().to_radix_le(2);
-                        Some(self.modulus_array_literal(bits, IntegerBitSize::One, location))
+                        Some(self.modulus_slice_literal(bits, IntegerBitSize::One, location))
                     }
                     "modulus_be_bits" => {
                         let bits = FieldElement::modulus().to_radix_be(2);
-                        Some(self.modulus_array_literal(bits, IntegerBitSize::One, location))
+                        Some(self.modulus_slice_literal(bits, IntegerBitSize::One, location))
                     }
                     "modulus_be_bytes" => {
                         let bytes = FieldElement::modulus().to_bytes_be();
-                        Some(self.modulus_array_literal(bytes, IntegerBitSize::Eight, location))
+                        Some(self.modulus_slice_literal(bytes, IntegerBitSize::Eight, location))
                     }
                     "modulus_le_bytes" => {
                         let bytes = FieldElement::modulus().to_bytes_le();
-                        Some(self.modulus_array_literal(bytes, IntegerBitSize::Eight, location))
+                        Some(self.modulus_slice_literal(bytes, IntegerBitSize::Eight, location))
                     }
                     _ => None,
                 };
@@ -1294,7 +1298,7 @@ impl<'interner> Monomorphizer<'interner> {
         None
     }
 
-    fn modulus_array_literal(
+    fn modulus_slice_literal(
         &self,
         bytes: Vec<u8>,
         arr_elem_bits: IntegerBitSize,
@@ -1308,10 +1312,9 @@ impl<'interner> Monomorphizer<'interner> {
             Expression::Literal(Literal::Integer((byte as u128).into(), int_type.clone(), location))
         });
 
-        let typ = Type::Array(bytes_as_expr.len() as u32, Box::new(int_type));
-
+        let typ = Type::Slice(Box::new(int_type));
         let arr_literal = ArrayLiteral { typ, contents: bytes_as_expr };
-        Expression::Literal(Literal::Array(arr_literal))
+        Expression::Literal(Literal::Slice(arr_literal))
     }
 
     fn queue_function(
diff --git a/compiler/noirc_frontend/src/node_interner.rs b/compiler/noirc_frontend/src/node_interner.rs
index cd82685c31e..ff256ad847e 100644
--- a/compiler/noirc_frontend/src/node_interner.rs
+++ b/compiler/noirc_frontend/src/node_interner.rs
@@ -17,6 +17,7 @@ use crate::hir::comptime;
 use crate::hir::def_collector::dc_crate::CompilationError;
 use crate::hir::def_collector::dc_crate::{UnresolvedStruct, UnresolvedTrait, UnresolvedTypeAlias};
 use crate::hir::def_map::{LocalModuleId, ModuleId};
+use crate::QuotedType;
 
 use crate::ast::{BinaryOpKind, FunctionDefinition, ItemVisibility};
 use crate::hir::resolution::errors::ResolverError;
@@ -31,9 +32,9 @@ use crate::hir_def::{
     stmt::HirStatement,
 };
 use crate::token::{Attributes, SecondaryAttribute};
-use crate::{
-    Generics, Shared, TypeAlias, TypeBindings, TypeVariable, TypeVariableId, TypeVariableKind,
-};
+use crate::GenericTypeVars;
+use crate::Generics;
+use crate::{Shared, TypeAlias, TypeBindings, TypeVariable, TypeVariableId, TypeVariableKind};
 
 /// An arbitrary number to limit the recursion depth when searching for trait impls.
 /// This is needed to stop recursing for cases such as `impl<T> Foo for T where T: Eq`
@@ -175,6 +176,12 @@ pub struct NodeInterner {
 
     /// Stores the [Location] of a [Type] reference
     pub(crate) type_ref_locations: Vec<(Type, Location)>,
+
+    /// In Noir's metaprogramming, a noir type has the type `Type`. When these are spliced
+    /// into `quoted` expressions, we preserve the original type by assigning it a unique id
+    /// and creating a `Token::QuotedType(id)` from this id. We cannot create a token holding
+    /// the actual type since types do not implement Send or Sync.
+    quoted_types: noirc_arena::Arena<Type>,
 }
 
 /// A dependency in the dependency graph may be a type or a definition.
@@ -302,7 +309,7 @@ impl StmtId {
     }
 }
 
-#[derive(Debug, Eq, PartialEq, Hash, Copy, Clone)]
+#[derive(Debug, Eq, PartialEq, Hash, Copy, Clone, PartialOrd, Ord)]
 pub struct ExprId(Index);
 
 impl ExprId {
@@ -471,6 +478,9 @@ pub struct GlobalInfo {
     pub value: Option<comptime::Value>,
 }
 
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct QuotedTypeId(noirc_arena::Index);
+
 impl Default for NodeInterner {
     fn default() -> Self {
         let mut interner = NodeInterner {
@@ -505,6 +515,7 @@ impl Default for NodeInterner {
             primitive_methods: HashMap::new(),
             type_alias_ref: Vec::new(),
             type_ref_locations: Vec::new(),
+            quoted_types: Default::default(),
         };
 
         // An empty block expression is used often, we add this into the `node` on startup
@@ -546,7 +557,12 @@ impl NodeInterner {
         self.definition_to_type.insert(definition_id, typ);
     }
 
-    pub fn push_empty_trait(&mut self, type_id: TraitId, unresolved_trait: &UnresolvedTrait) {
+    pub fn push_empty_trait(
+        &mut self,
+        type_id: TraitId,
+        unresolved_trait: &UnresolvedTrait,
+        generics: Generics,
+    ) {
         let self_type_typevar_id = self.next_type_variable_id();
 
         let new_trait = Trait {
@@ -554,13 +570,7 @@ impl NodeInterner {
             name: unresolved_trait.trait_def.name.clone(),
             crate_id: unresolved_trait.crate_id,
             location: Location::new(unresolved_trait.trait_def.span, unresolved_trait.file_id),
-            generics: vecmap(&unresolved_trait.trait_def.generics, |_| {
-                // Temporary type variable ids before the trait is resolved to its actual ids.
-                // This lets us record how many arguments the type expects so that other types
-                // can refer to it with generic arguments before the generic parameters themselves
-                // are resolved.
-                TypeVariable::unbound(TypeVariableId(0))
-            }),
+            generics,
             self_type_typevar_id,
             self_type_typevar: TypeVariable::unbound(self_type_typevar_id),
             methods: Vec::new(),
@@ -575,6 +585,7 @@ impl NodeInterner {
     pub fn new_struct(
         &mut self,
         typ: &UnresolvedStruct,
+        generics: Generics,
         krate: CrateId,
         local_id: LocalModuleId,
         file_id: FileId,
@@ -584,13 +595,6 @@ impl NodeInterner {
 
         // Fields will be filled in later
         let no_fields = Vec::new();
-        let generics = vecmap(&typ.struct_def.generics, |_| {
-            // Temporary type variable ids before the struct is resolved to its actual ids.
-            // This lets us record how many arguments the type expects so that other types
-            // can refer to it with generic arguments before the generic parameters themselves
-            // are resolved.
-            TypeVariable::unbound(TypeVariableId(0))
-        });
 
         let location = Location::new(typ.struct_def.span, file_id);
         let new_struct = StructType::new(struct_id, name, location, no_fields, generics);
@@ -599,7 +603,11 @@ impl NodeInterner {
         struct_id
     }
 
-    pub fn push_type_alias(&mut self, typ: &UnresolvedTypeAlias) -> TypeAliasId {
+    pub fn push_type_alias(
+        &mut self,
+        typ: &UnresolvedTypeAlias,
+        generics: Generics,
+    ) -> TypeAliasId {
         let type_id = TypeAliasId(self.type_aliases.len());
 
         self.type_aliases.push(Shared::new(TypeAlias::new(
@@ -607,7 +615,7 @@ impl NodeInterner {
             typ.type_alias_def.name.clone(),
             Location::new(typ.type_alias_def.span, typ.file_id),
             Type::Error,
-            vecmap(&typ.type_alias_def.generics, |_| TypeVariable::unbound(TypeVariableId(0))),
+            generics,
         )));
 
         type_id
@@ -1415,7 +1423,7 @@ impl NodeInterner {
         trait_id: TraitId,
         trait_generics: Vec<Type>,
         impl_id: TraitImplId,
-        impl_generics: Generics,
+        impl_generics: GenericTypeVars,
         trait_impl: Shared<TraitImpl>,
     ) -> Result<(), (Span, FileId)> {
         self.trait_implementations.insert(impl_id, trait_impl.clone());
@@ -1738,6 +1746,14 @@ impl NodeInterner {
 
         cycle
     }
+
+    pub fn push_quoted_type(&mut self, typ: Type) -> QuotedTypeId {
+        QuotedTypeId(self.quoted_types.insert(typ))
+    }
+
+    pub fn get_quoted_type(&self, id: QuotedTypeId) -> &Type {
+        &self.quoted_types[id.0]
+    }
 }
 
 impl Methods {
@@ -1806,7 +1822,7 @@ enum TypeMethodKey {
     Tuple,
     Function,
     Generic,
-    Code,
+    Quoted(QuotedType),
 }
 
 fn get_type_method_key(typ: &Type) -> Option<TypeMethodKey> {
@@ -1825,8 +1841,8 @@ fn get_type_method_key(typ: &Type) -> Option<TypeMethodKey> {
         Type::Unit => Some(Unit),
         Type::Tuple(_) => Some(Tuple),
         Type::Function(_, _, _) => Some(Function),
-        Type::NamedGeneric(_, _) => Some(Generic),
-        Type::Code => Some(Code),
+        Type::NamedGeneric(_, _, _) => Some(Generic),
+        Type::Quoted(quoted) => Some(Quoted(*quoted)),
         Type::MutableReference(element) => get_type_method_key(element),
         Type::Alias(alias, _) => get_type_method_key(&alias.borrow().typ),
 
diff --git a/compiler/noirc_frontend/src/noir_parser.lalrpop b/compiler/noirc_frontend/src/noir_parser.lalrpop
index c6cb788a5a4..5bf48a764d6 100644
--- a/compiler/noirc_frontend/src/noir_parser.lalrpop
+++ b/compiler/noirc_frontend/src/noir_parser.lalrpop
@@ -80,7 +80,6 @@ extern {
         "mod" => BorrowedToken::Keyword(noir_token::Keyword::Mod),
         "mut" => BorrowedToken::Keyword(noir_token::Keyword::Mut),
         "pub" => BorrowedToken::Keyword(noir_token::Keyword::Pub),
-        "quote" => BorrowedToken::Keyword(noir_token::Keyword::Quote),
         "return" => BorrowedToken::Keyword(noir_token::Keyword::Return),
         "return_data" => BorrowedToken::Keyword(noir_token::Keyword::ReturnData),
         "str" => BorrowedToken::Keyword(noir_token::Keyword::String),
@@ -125,7 +124,7 @@ pub(crate) Path: Path = {
     },
 
     <lo:@L> "dep" "::" <segments:PathSegments> <hi:@R> => {
-        let kind = PathKind::Dep;
+        let kind = PathKind::Plain;
         let span = Span::from(lo as u32..hi as u32);
         Path { segments, kind, span }
     },
diff --git a/compiler/noirc_frontend/src/parser/mod.rs b/compiler/noirc_frontend/src/parser/mod.rs
index 9e60383afee..315c8cf5d64 100644
--- a/compiler/noirc_frontend/src/parser/mod.rs
+++ b/compiler/noirc_frontend/src/parser/mod.rs
@@ -22,7 +22,7 @@ use chumsky::primitive::Container;
 pub use errors::ParserError;
 pub use errors::ParserErrorReason;
 use noirc_errors::Span;
-pub use parser::parse_program;
+pub use parser::{expression, parse_program};
 
 #[derive(Debug, Clone)]
 pub(crate) enum TopLevelStatement {
@@ -45,7 +45,7 @@ pub trait NoirParser<T>: Parser<Token, T, Error = ParserError> + Sized + Clone {
 impl<P, T> NoirParser<T> for P where P: Parser<Token, T, Error = ParserError> + Clone {}
 
 // ExprParser just serves as a type alias for NoirParser<Expression> + Clone
-trait ExprParser: NoirParser<Expression> {}
+pub trait ExprParser: NoirParser<Expression> {}
 impl<P> ExprParser for P where P: NoirParser<Expression> {}
 
 fn parenthesized<P, T>(parser: P) -> impl NoirParser<T>
@@ -197,7 +197,7 @@ fn parameter_name_recovery<T: Recoverable + Clone>() -> impl NoirParser<T> {
 }
 
 fn top_level_statement_recovery() -> impl NoirParser<TopLevelStatement> {
-    none_of([Token::Semicolon, Token::RightBrace, Token::EOF])
+    none_of([Token::RightBrace, Token::EOF])
         .repeated()
         .ignore_then(one_of([Token::Semicolon]))
         .map(|_| TopLevelStatement::Error)
diff --git a/compiler/noirc_frontend/src/parser/parser.rs b/compiler/noirc_frontend/src/parser/parser.rs
index cabc788e07d..10418bec8fd 100644
--- a/compiler/noirc_frontend/src/parser/parser.rs
+++ b/compiler/noirc_frontend/src/parser/parser.rs
@@ -23,7 +23,7 @@
 //! prevent other parsers from being tried afterward since there is no longer an error. Thus, they should
 //! be limited to cases like the above `fn` example where it is clear we shouldn't back out of the
 //! current parser to try alternative parsers in a `choice` expression.
-use self::primitives::{keyword, mutable_reference, variable};
+use self::primitives::{keyword, macro_quote_marker, mutable_reference, variable};
 
 use super::{
     foldl_with_span, labels::ParsingRuleLabel, parameter_name_recovery, parameter_recovery,
@@ -223,11 +223,20 @@ fn implementation() -> impl NoirParser<TopLevelStatement> {
     keyword(Keyword::Impl)
         .ignore_then(function::generics())
         .then(parse_type().map_with_span(|typ, span| (typ, span)))
+        .then(where_clause())
         .then_ignore(just(Token::LeftBrace))
         .then(spanned(function::function_definition(true)).repeated())
         .then_ignore(just(Token::RightBrace))
-        .map(|((generics, (object_type, type_span)), methods)| {
-            TopLevelStatement::Impl(TypeImpl { generics, object_type, type_span, methods })
+        .map(|args| {
+            let ((other_args, where_clause), methods) = args;
+            let (generics, (object_type, type_span)) = other_args;
+            TopLevelStatement::Impl(TypeImpl {
+                generics,
+                object_type,
+                type_span,
+                where_clause,
+                methods,
+            })
         })
 }
 
@@ -905,7 +914,7 @@ where
         })
 }
 
-fn expression() -> impl ExprParser {
+pub fn expression() -> impl ExprParser {
     recursive(|expr| {
         expression_with_precedence(
             Precedence::Lowest,
@@ -1270,10 +1279,12 @@ where
         },
         lambdas::lambda(expr_parser.clone()),
         block(statement.clone()).map(ExpressionKind::Block),
-        comptime_expr(statement.clone()),
-        quote(statement),
+        comptime_expr(statement),
+        quote(),
+        unquote(expr_parser.clone()),
         variable(),
         literal(),
+        macro_quote_marker(),
     ))
     .map_with_span(Expression::new)
     .or(parenthesized(expr_parser.clone()).map_with_span(|sub_expr, span| {
@@ -1296,19 +1307,30 @@ where
         .labelled(ParsingRuleLabel::Atom)
 }
 
-fn quote<'a, P>(statement: P) -> impl NoirParser<ExpressionKind> + 'a
-where
-    P: NoirParser<StatementKind> + 'a,
-{
-    keyword(Keyword::Quote).ignore_then(block(statement)).validate(|block, span, emit| {
+fn quote() -> impl NoirParser<ExpressionKind> {
+    token_kind(TokenKind::Quote).validate(|token, span, emit| {
+        let tokens = match token {
+            Token::Quote(tokens) => tokens,
+            _ => unreachable!("token_kind(Quote) should guarantee parsing only a quote token"),
+        };
         emit(ParserError::with_reason(
             ParserErrorReason::ExperimentalFeature("quoted expressions"),
             span,
         ));
-        ExpressionKind::Quote(block)
+        ExpressionKind::Quote(tokens)
     })
 }
 
+/// unquote: '$' variable
+///        | '$' '(' expression ')'
+fn unquote<'a, P>(expr_parser: P) -> impl NoirParser<ExpressionKind> + 'a
+where
+    P: ExprParser + 'a,
+{
+    let unquote = variable().map_with_span(Expression::new).or(parenthesized(expr_parser));
+    just(Token::DollarSign).ignore_then(unquote).map(|expr| ExpressionKind::Unquote(Box::new(expr)))
+}
+
 fn tuple<P>(expr_parser: P) -> impl NoirParser<Expression>
 where
     P: ExprParser,
@@ -1633,7 +1655,7 @@ mod test {
             "use foo::{bar, hello}",
             "use foo::{bar as bar2, hello}",
             "use foo::{bar as bar2, hello::{foo}, nested::{foo, bar}}",
-            "use dep::{std::println, bar::baz}",
+            "use std::{println, bar::baz}",
         ];
 
         let invalid_use_statements = [
@@ -1843,4 +1865,19 @@ mod test {
 
         check_cases_with_errors(&cases[..], block(fresh_statement()));
     }
+
+    #[test]
+    fn test_quote() {
+        let cases = vec![
+            "quote {}",
+            "quote { a.b }",
+            "quote { ) ( }", // invalid syntax is fine in a quote
+            "quote { { } }", // Nested `{` and `}` shouldn't close the quote as long as they are matched.
+            "quote { 1 { 2 { 3 { 4 { 5 } 4 4 } 3 3 } 2 2 } 1 1 }",
+        ];
+        parse_all(quote(), cases);
+
+        let failing = vec!["quote {}}", "quote a", "quote { { { } } } }"];
+        parse_all_failing(quote(), failing);
+    }
 }
diff --git a/compiler/noirc_frontend/src/parser/parser/function.rs b/compiler/noirc_frontend/src/parser/parser/function.rs
index 4db5637f6a7..3e686ee4c85 100644
--- a/compiler/noirc_frontend/src/parser/parser/function.rs
+++ b/compiler/noirc_frontend/src/parser/parser/function.rs
@@ -5,11 +5,14 @@ use super::{
     self_parameter, where_clause, NoirParser,
 };
 use crate::ast::{
-    FunctionDefinition, FunctionReturnType, Ident, ItemVisibility, NoirFunction, Param, Visibility,
+    FunctionDefinition, FunctionReturnType, ItemVisibility, NoirFunction, Param, Visibility,
 };
-use crate::parser::labels::ParsingRuleLabel;
 use crate::parser::spanned;
 use crate::token::{Keyword, Token};
+use crate::{
+    ast::{UnresolvedGeneric, UnresolvedGenerics},
+    parser::labels::ParsingRuleLabel,
+};
 
 use chumsky::prelude::*;
 
@@ -76,16 +79,31 @@ fn function_modifiers() -> impl NoirParser<(bool, ItemVisibility, bool)> {
         })
 }
 
+pub(super) fn numeric_generic() -> impl NoirParser<UnresolvedGeneric> {
+    keyword(Keyword::Let)
+        .ignore_then(ident())
+        .then_ignore(just(Token::Colon))
+        .then(parse_type())
+        .map(|(ident, typ)| UnresolvedGeneric::Numeric { ident, typ })
+}
+
+pub(super) fn generic_type() -> impl NoirParser<UnresolvedGeneric> {
+    ident().map(UnresolvedGeneric::Variable)
+}
+
+pub(super) fn generic() -> impl NoirParser<UnresolvedGeneric> {
+    generic_type().or(numeric_generic())
+}
+
 /// non_empty_ident_list: ident ',' non_empty_ident_list
 ///                     | ident
 ///
 /// generics: '<' non_empty_ident_list '>'
 ///         | %empty
-pub(super) fn generics() -> impl NoirParser<Vec<Ident>> {
-    ident()
+pub(super) fn generics() -> impl NoirParser<UnresolvedGenerics> {
+    generic()
         .separated_by(just(Token::Comma))
         .allow_trailing()
-        .at_least(1)
         .delimited_by(just(Token::Less), just(Token::Greater))
         .or_not()
         .map(|opt| opt.unwrap_or_default())
@@ -193,6 +211,7 @@ mod test {
                 // fn func_name(x: impl Eq) {} with error Expected an end of input but found end of input
                 // "fn func_name(x: impl Eq) {}",
                 "fn func_name<T>(x: impl Eq, y : T) where T: SomeTrait + Eq {}",
+                "fn func_name<let N: u64>(x: [Field; N]) {}",
             ],
         );
 
@@ -209,6 +228,11 @@ mod test {
                 // A leading plus is not allowed.
                 "fn func_name<T>(f: Field, y : T) where T: + SomeTrait {}",
                 "fn func_name<T>(f: Field, y : T) where T: TraitX + <Y> {}",
+                // Test ill-formed numeric generics
+                "fn func_name<let T>(y: T) {}",
+                "fn func_name<let T:>(y: T) {}",
+                "fn func_name<T:>(y: T) {}",
+                "fn func_name<T: u64>(y: T) {}",
             ],
         );
     }
diff --git a/compiler/noirc_frontend/src/parser/parser/path.rs b/compiler/noirc_frontend/src/parser/parser/path.rs
index 47bb11991fa..e40268af410 100644
--- a/compiler/noirc_frontend/src/parser/parser/path.rs
+++ b/compiler/noirc_frontend/src/parser/parser/path.rs
@@ -25,7 +25,7 @@ fn empty_path() -> impl NoirParser<Path> {
     let make_path = |kind| move |_, span| Path { segments: Vec::new(), kind, span };
     let path_kind = |key, kind| keyword(key).map_with_span(make_path(kind));
 
-    choice((path_kind(Keyword::Crate, PathKind::Crate), path_kind(Keyword::Dep, PathKind::Dep)))
+    choice((path_kind(Keyword::Crate, PathKind::Crate), path_kind(Keyword::Dep, PathKind::Plain)))
 }
 
 pub(super) fn maybe_empty_path() -> impl NoirParser<Path> {
@@ -43,7 +43,8 @@ mod test {
             ("std", vec!["std"]),
             ("std::hash", vec!["std", "hash"]),
             ("std::hash::collections", vec!["std", "hash", "collections"]),
-            ("dep::foo::bar", vec!["foo", "bar"]),
+            ("foo::bar", vec!["foo", "bar"]),
+            ("foo::bar", vec!["foo", "bar"]),
             ("crate::std::hash", vec!["std", "hash"]),
         ];
 
@@ -61,7 +62,7 @@ mod test {
     fn parse_path_kinds() {
         let cases = vec![
             ("std", PathKind::Plain),
-            ("dep::hash::collections", PathKind::Dep),
+            ("hash::collections", PathKind::Plain),
             ("crate::std::hash", PathKind::Crate),
         ];
 
@@ -72,7 +73,7 @@ mod test {
 
         parse_all_failing(
             path(),
-            vec!["dep", "crate", "crate::std::crate", "foo::bar::crate", "foo::dep"],
+            vec!["crate", "crate::std::crate", "foo::bar::crate", "foo::dep"],
         );
     }
 }
diff --git a/compiler/noirc_frontend/src/parser/parser/primitives.rs b/compiler/noirc_frontend/src/parser/parser/primitives.rs
index 9da19c0a185..88f9e591aba 100644
--- a/compiler/noirc_frontend/src/parser/parser/primitives.rs
+++ b/compiler/noirc_frontend/src/parser/parser/primitives.rs
@@ -94,6 +94,13 @@ pub(super) fn variable_no_turbofish() -> impl NoirParser<ExpressionKind> {
     path().map(|path| ExpressionKind::Variable(path, None))
 }
 
+pub(super) fn macro_quote_marker() -> impl NoirParser<ExpressionKind> {
+    token_kind(TokenKind::UnquoteMarker).map(|token| match token {
+        Token::UnquoteMarker(expr_id) => ExpressionKind::Resolved(expr_id),
+        other => unreachable!("Non-unquote-marker parsed as an unquote marker: {other:?}"),
+    })
+}
+
 #[cfg(test)]
 mod test {
     use crate::parser::parser::{
diff --git a/compiler/noirc_frontend/src/parser/parser/types.rs b/compiler/noirc_frontend/src/parser/parser/types.rs
index 82dd3dad681..431b48b8313 100644
--- a/compiler/noirc_frontend/src/parser/parser/types.rs
+++ b/compiler/noirc_frontend/src/parser/parser/types.rs
@@ -1,22 +1,45 @@
+use super::primitives::token_kind;
 use super::{
     expression_with_precedence, keyword, nothing, parenthesized, NoirParser, ParserError,
     ParserErrorReason, Precedence,
 };
-use crate::ast::{UnresolvedType, UnresolvedTypeData};
+use crate::ast::{Recoverable, UnresolvedType, UnresolvedTypeData, UnresolvedTypeExpression};
+use crate::QuotedType;
 
 use crate::parser::labels::ParsingRuleLabel;
-use crate::token::{Keyword, Token};
-use crate::{Recoverable, UnresolvedTypeExpression};
+use crate::token::{Keyword, Token, TokenKind};
 
 use chumsky::prelude::*;
 use noirc_errors::Span;
 
-fn maybe_comp_time() -> impl NoirParser<()> {
-    keyword(Keyword::Comptime).or_not().validate(|opt, span, emit| {
-        if opt.is_some() {
-            emit(ParserError::with_reason(ParserErrorReason::ComptimeDeprecated, span));
-        }
-    })
+pub(super) fn parse_type<'a>() -> impl NoirParser<UnresolvedType> + 'a {
+    recursive(parse_type_inner)
+}
+
+pub(super) fn parse_type_inner<'a>(
+    recursive_type_parser: impl NoirParser<UnresolvedType> + 'a,
+) -> impl NoirParser<UnresolvedType> + 'a {
+    choice((
+        field_type(),
+        int_type(),
+        bool_type(),
+        string_type(),
+        expr_type(),
+        type_definition_type(),
+        top_level_item_type(),
+        type_of_quoted_types(),
+        quoted_type(),
+        resolved_type(),
+        format_string_type(recursive_type_parser.clone()),
+        named_type(recursive_type_parser.clone()),
+        named_trait(recursive_type_parser.clone()),
+        slice_type(recursive_type_parser.clone()),
+        array_type(recursive_type_parser.clone()),
+        parenthesized_type(recursive_type_parser.clone()),
+        tuple_type(recursive_type_parser.clone()),
+        function_type(recursive_type_parser.clone()),
+        mutable_reference_type(recursive_type_parser),
+    ))
 }
 
 pub(super) fn parenthesized_type(
@@ -37,9 +60,50 @@ pub(super) fn field_type() -> impl NoirParser<UnresolvedType> {
 }
 
 pub(super) fn bool_type() -> impl NoirParser<UnresolvedType> {
-    maybe_comp_time()
-        .then_ignore(keyword(Keyword::Bool))
-        .map_with_span(|_, span| UnresolvedTypeData::Bool.with_span(span))
+    keyword(Keyword::Bool).map_with_span(|_, span| UnresolvedTypeData::Bool.with_span(span))
+}
+
+/// This is the type `Expr` - the type of a quoted, untyped expression object used for macros
+pub(super) fn expr_type() -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::Expr)
+        .map_with_span(|_, span| UnresolvedTypeData::Quoted(QuotedType::Expr).with_span(span))
+}
+
+/// This is the type `TypeDefinition` - the type of a quoted type definition
+pub(super) fn type_definition_type() -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::TypeDefinition).map_with_span(|_, span| {
+        UnresolvedTypeData::Quoted(QuotedType::TypeDefinition).with_span(span)
+    })
+}
+
+/// This is the type `TopLevelItem` - the type of a quoted statement in the top level.
+/// E.g. a type definition, trait definition, trait impl, function, etc.
+fn top_level_item_type() -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::TopLevelItem).map_with_span(|_, span| {
+        UnresolvedTypeData::Quoted(QuotedType::TopLevelItem).with_span(span)
+    })
+}
+
+/// This is the type `Type` - the type of a quoted noir type.
+fn type_of_quoted_types() -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::TypeType)
+        .map_with_span(|_, span| UnresolvedTypeData::Quoted(QuotedType::Type).with_span(span))
+}
+
+/// This is the type of a quoted, unparsed token stream.
+fn quoted_type() -> impl NoirParser<UnresolvedType> {
+    keyword(Keyword::Quoted)
+        .map_with_span(|_, span| UnresolvedTypeData::Quoted(QuotedType::Quoted).with_span(span))
+}
+
+/// This is the type of an already resolved type.
+/// The only way this can appear in the token input is if an already resolved `Type` object
+/// was spliced into a macro's token stream via the `$` operator.
+fn resolved_type() -> impl NoirParser<UnresolvedType> {
+    token_kind(TokenKind::QuotedType).map_with_span(|token, span| match token {
+        Token::QuotedType(id) => UnresolvedTypeData::Resolved(id).with_span(span),
+        _ => unreachable!("token_kind(QuotedType) guarantees we parse a quoted type"),
+    })
 }
 
 pub(super) fn string_type() -> impl NoirParser<UnresolvedType> {
diff --git a/compiler/noirc_frontend/src/tests.rs b/compiler/noirc_frontend/src/tests.rs
index 99215c8f173..028ced1fe01 100644
--- a/compiler/noirc_frontend/src/tests.rs
+++ b/compiler/noirc_frontend/src/tests.rs
@@ -14,6 +14,7 @@ use fm::FileId;
 use iter_extended::vecmap;
 use noirc_errors::Location;
 
+use crate::hir::comptime::InterpreterError;
 use crate::hir::def_collector::dc_crate::CompilationError;
 use crate::hir::def_collector::errors::{DefCollectorErrorKind, DuplicateType};
 use crate::hir::def_map::ModuleData;
@@ -49,7 +50,10 @@ pub(crate) fn remove_experimental_warnings(errors: &mut Vec<(CompilationError, F
     });
 }
 
-pub(crate) fn get_program(src: &str) -> (ParsedModule, Context, Vec<(CompilationError, FileId)>) {
+pub(crate) fn get_program(
+    src: &str,
+    use_legacy: bool,
+) -> (ParsedModule, Context, Vec<(CompilationError, FileId)>) {
     let root = std::path::Path::new("/");
     let fm = FileManager::new(root);
 
@@ -81,7 +85,7 @@ pub(crate) fn get_program(src: &str) -> (ParsedModule, Context, Vec<(Compilation
             &mut context,
             program.clone().into_sorted(),
             root_file_id,
-            false,
+            use_legacy,
             &[], // No macro processors
         ));
     }
@@ -89,7 +93,7 @@ pub(crate) fn get_program(src: &str) -> (ParsedModule, Context, Vec<(Compilation
 }
 
 pub(crate) fn get_program_errors(src: &str) -> Vec<(CompilationError, FileId)> {
-    get_program(src).2
+    get_program(src, false).2
 }
 
 #[test]
@@ -832,7 +836,7 @@ fn check_trait_as_type_as_two_fn_parameters() {
 }
 
 fn get_program_captures(src: &str) -> Vec<Vec<String>> {
-    let (program, context, _errors) = get_program(src);
+    let (program, context, _errors) = get_program(src, false);
     let interner = context.def_interner;
     let mut all_captures: Vec<Vec<String>> = Vec::new();
     for func in program.into_sorted().functions {
@@ -1194,7 +1198,7 @@ fn resolve_fmt_strings() {
 }
 
 fn check_rewrite(src: &str, expected: &str) {
-    let (_program, mut context, _errors) = get_program(src);
+    let (_program, mut context, _errors) = get_program(src, false);
     let main_func_id = context.def_interner.find_function("main").unwrap();
     let program = monomorphize(main_func_id, &mut context.def_interner).unwrap();
     assert!(format!("{}", program) == expected);
@@ -1325,14 +1329,20 @@ fn for_loop_over_array() {
             hello(array);
         }
     "#;
-    assert_eq!(get_program_errors(src).len(), 0);
+    let errors = get_program_errors(src);
+    assert_eq!(get_program_errors(src).len(), 1);
+
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::UseExplicitNumericGeneric { .. })
+    ));
 }
 
 // Regression for #4545
 #[test]
 fn type_aliases_in_main() {
     let src = r#"
-        type Outer<N> = [u8; N];
+        type Outer<let N: u32> = [u8; N];
         fn main(_arg: Outer<1>) {}
     "#;
     assert_eq!(get_program_errors(src).len(), 0);
@@ -1444,3 +1454,445 @@ fn specify_method_types_with_turbofish() {
     let errors = get_program_errors(src);
     assert_eq!(errors.len(), 0);
 }
+
+#[test]
+fn struct_numeric_generic_in_function() {
+    let src = r#"
+    struct Foo {
+        inner: u64
+    }
+
+    fn bar<let N: Foo>() { }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::UnsupportedNumericGenericType { .. }),
+    ));
+}
+
+#[test]
+fn struct_numeric_generic_in_struct() {
+    let src = r#"
+    struct Foo {
+        inner: u64
+    }
+
+    struct Bar<let N: Foo> { }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::DefinitionError(
+            DefCollectorErrorKind::UnsupportedNumericGenericType { .. }
+        ),
+    ));
+}
+
+#[test]
+fn bool_numeric_generic() {
+    let src = r#"
+    fn read<let N: bool>() -> Field {
+        if N {
+            0
+        } else {
+            1
+        }
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::UnsupportedNumericGenericType { .. }),
+    ));
+}
+
+#[test]
+fn numeric_generic_binary_operation_type_mismatch() {
+    let src = r#"
+    fn foo<let N: Field>() -> bool {
+        let mut check: bool = true;
+        check = N;
+        check
+    }   
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::TypeError(TypeCheckError::TypeMismatchWithSource { .. }),
+    ));
+}
+
+#[test]
+fn bool_generic_as_loop_bound() {
+    let src = r#"
+    fn read<let N: bool>() {
+        let mut fields = [0; N];
+        for i in 0..N {
+            fields[i] = i + 1;
+        }
+        assert(fields[0] == 1);
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 2);
+
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::UnsupportedNumericGenericType { .. }),
+    ));
+
+    let CompilationError::TypeError(TypeCheckError::TypeMismatch {
+        expected_typ, expr_typ, ..
+    }) = &errors[1].0
+    else {
+        panic!("Got an error other than a type mismatch");
+    };
+
+    assert_eq!(expected_typ, "Field");
+    assert_eq!(expr_typ, "bool");
+}
+
+#[test]
+fn numeric_generic_in_function_signature() {
+    let src = r#"
+    fn foo<let N: u8>(arr: [Field; N]) -> [Field; N] { arr }
+    "#;
+    let errors = get_program_errors(src);
+    assert!(errors.is_empty());
+}
+
+#[test]
+fn numeric_generic_as_struct_field_type() {
+    let src = r#"
+    struct Foo<let N: u64> {
+        a: Field,
+        b: N,
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::NumericGenericUsedForType { .. }),
+    ));
+}
+
+#[test]
+fn normal_generic_as_array_length() {
+    let src = r#"
+    struct Foo<N> {
+        a: Field,
+        b: [Field; N],
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    // TODO(https://github.com/noir-lang/noir/issues/5156): This should be switched to a hard type error rather than
+    // the `UseExplicitNumericGeneric` once implicit numeric generics are removed.
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::UseExplicitNumericGeneric { .. }),
+    ));
+}
+
+#[test]
+fn numeric_generic_as_param_type() {
+    let src = r#"
+    fn foo<let I: Field>(x: I) -> I {
+        let _q: I = 5;
+        x
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 3);
+    // Error from the parameter type
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::NumericGenericUsedForType { .. }),
+    ));
+    // Error from the let statement annotated type
+    assert!(matches!(
+        errors[1].0,
+        CompilationError::ResolverError(ResolverError::NumericGenericUsedForType { .. }),
+    ));
+    // Error from the return type
+    assert!(matches!(
+        errors[2].0,
+        CompilationError::ResolverError(ResolverError::NumericGenericUsedForType { .. }),
+    ));
+}
+
+#[test]
+fn numeric_generic_used_in_nested_type_fail() {
+    let src = r#"
+    struct Foo<let N: u64> {
+        a: Field,
+        b: Bar<N>,
+    }
+    struct Bar<N> {
+        inner: N
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::NumericGenericUsedForType { .. }),
+    ));
+}
+
+#[test]
+fn normal_generic_used_in_nested_array_length_fail() {
+    let src = r#"
+    struct Foo<N> {
+        a: Field,
+        b: Bar<N>,
+    }
+    struct Bar<let N: u32> {
+        inner: [Field; N]
+    }
+    "#;
+    let errors = get_program_errors(src);
+    // TODO(https://github.com/noir-lang/noir/issues/5156): This should be switched to a hard type error once implicit numeric generics are removed.
+    assert_eq!(errors.len(), 0);
+}
+
+#[test]
+fn numeric_generic_used_in_nested_type_pass() {
+    // The order of these structs should not be changed to make sure
+    // that we are accurately resolving all struct generics before struct fields
+    let src = r#"
+    struct NestedNumeric<let N: u32> {
+        a: Field,
+        b: InnerNumeric<N>
+    }
+    struct InnerNumeric<let N: u32> {
+        inner: [u64; N],
+    }    
+    "#;
+    let errors = get_program_errors(src);
+    assert!(errors.is_empty());
+}
+
+#[test]
+fn numeric_generic_used_in_trait() {
+    let src = r#"
+    struct MyType<T> {
+        a: Field,
+        b: Field,
+        c: Field,
+        d: T,
+    }
+    
+    impl<let N: u64, T> Deserialize<N, T> for MyType<T> {
+        fn deserialize(fields: [Field; N], other: T) -> Self {
+            MyType { a: fields[0], b: fields[1], c: fields[2], d: other }
+        }
+    }
+    
+    trait Deserialize<let N: u32, T> {
+        fn deserialize(fields: [Field; N], other: T) -> Self;
+    }
+    "#;
+    let errors = get_program_errors(src);
+    // We want to make sure that `N` in `impl<let N: u64, T> Deserialize<N, T>` does
+    // not trigger `expected type, found numeric generic parameter N` as the trait
+    // does in fact expect a numeric generic.
+    assert!(errors.is_empty());
+}
+
+#[test]
+fn numeric_generic_in_trait_impl_with_extra_impl_generics() {
+    let src = r#"
+    trait Default {
+        fn default() -> Self;
+    }
+
+    struct MyType<T> {
+        a: Field,
+        b: Field,
+        c: Field,
+        d: T,
+    }
+    
+    // Make sure that `T` is placed before `N` as we want to test that the order of the generics is correctly maintained.
+    // `N` is used first in the trait impl generics (`Deserialize<N> for MyType<T>`).
+    // We want to make sure that the compiler correctly accounts for that `N` has a numeric kind
+    // while `T` has a normal kind. 
+    impl<T, let N: u32> Deserialize<N> for MyType<T> where T: Default {
+        fn deserialize(fields: [Field; N]) -> Self {
+            MyType { a: fields[0], b: fields[1], c: fields[2], d: T::default() }
+        }
+    }
+    
+    trait Deserialize<let N: u32> {
+        fn deserialize(fields: [Field; N]) -> Self;
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert!(errors.is_empty());
+}
+
+#[test]
+fn numeric_generic_used_in_where_clause() {
+    let src = r#"
+    trait Deserialize<let N: u32> {
+        fn deserialize(fields: [Field; N]) -> Self;
+    }
+
+    fn read<T, let N: u32>() -> T where T: Deserialize<N> {
+        let mut fields: [Field; N] = [0; N];
+        for i in 0..N {
+            fields[i] = i as Field + 1;
+        }
+        T::deserialize(fields)
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert!(errors.is_empty());
+}
+
+#[test]
+fn numeric_generic_used_in_turbofish() {
+    let src = r#"
+    fn double<let N: u32>() -> u32 {
+        // Used as an expression
+        N * 2
+    }
+
+    fn double_numeric_generics_test() {
+        // Example usage of a numeric generic arguments.
+        assert(double::<9>() == 18);
+        assert(double::<7 + 8>() == 30);
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert!(errors.is_empty());
+}
+
+#[test]
+fn constant_used_with_numeric_generic() {
+    let src = r#"
+    struct ValueNote {
+        value: Field,
+    }
+
+    trait Serialize<let N: u32> {
+        fn serialize(self) -> [Field; N];
+    }
+
+    impl Serialize<1> for ValueNote {
+        fn serialize(self) -> [Field; 1] {
+            [self.value]
+        }
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert!(errors.is_empty());
+}
+
+#[test]
+fn normal_generic_used_when_numeric_expected_in_where_clause() {
+    let src = r#"
+    trait Deserialize<let N: u32> {
+        fn deserialize(fields: [Field; N]) -> Self;
+    }
+
+    fn read<T, N>() -> T where T: Deserialize<N> {
+        T::deserialize([0, 1])
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::TypeError(TypeCheckError::TypeMismatch { .. }),
+    ));
+
+    let src = r#"
+    trait Deserialize<let N: u32> {
+        fn deserialize(fields: [Field; N]) -> Self;
+    }
+
+    fn read<T, N>() -> T where T: Deserialize<N> {
+        let mut fields: [Field; N] = [0; N];
+        for i in 0..N {
+            fields[i] = i as Field + 1;
+        }
+        T::deserialize(fields)
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+    assert!(matches!(
+        errors[0].0,
+        CompilationError::ResolverError(ResolverError::VariableNotDeclared { .. }),
+    ));
+}
+
+// TODO(https://github.com/noir-lang/noir/issues/5156): Remove this test once we ban implicit numeric generics
+#[test]
+fn implicit_numeric_generics_elaborator() {
+    let src = r#"
+    struct BoundedVec<T, MaxLen> {
+        storage: [T; MaxLen],
+        len: u64,
+    }
+    
+    impl<T, MaxLen> BoundedVec<T, MaxLen> {
+
+        // Test that we have an implicit numeric generic for "Len" as well as "MaxLen"
+        pub fn extend_from_bounded_vec<Len>(&mut self, _vec: BoundedVec<T, Len>) { 
+            // We do this to avoid an unused variable warning on `self`
+            let _ = self.len;
+            for _ in 0..Len { }
+        }
+
+        pub fn push(&mut self, elem: T) {
+            assert(self.len < MaxLen, "push out of bounds");
+            self.storage[self.len] = elem;
+            self.len += 1;
+        }
+    }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 4);
+
+    for error in errors.iter() {
+        if let CompilationError::ResolverError(ResolverError::UseExplicitNumericGeneric { ident }) =
+            &errors[0].0
+        {
+            assert!(matches!(ident.0.contents.as_str(), "MaxLen" | "Len"));
+        } else {
+            panic!("Expected ResolverError::UseExplicitNumericGeneric but got {:?}", error);
+        }
+    }
+}
+
+#[test]
+fn quote_code_fragments() {
+    // This test ensures we can quote (and unquote/splice) code fragments
+    // which by themselves are not valid code. They only need to be valid
+    // by the time they are unquoted into the macro's call site.
+    let src = r#"
+        fn main() {
+            comptime {
+                concat!(quote { assert( }, quote { false); });
+            }
+        }
+
+        comptime fn concat(a: Quoted, b: Quoted) -> Quoted {
+            quote { $a $b }
+        }
+    "#;
+    let errors = get_program_errors(src);
+    assert_eq!(errors.len(), 1);
+
+    use InterpreterError::FailingConstraint;
+    assert!(matches!(&errors[0].0, CompilationError::InterpreterError(FailingConstraint { .. })));
+}
diff --git a/compiler/wasm/Cargo.toml b/compiler/wasm/Cargo.toml
index 03e59b3e269..20272dfeecb 100644
--- a/compiler/wasm/Cargo.toml
+++ b/compiler/wasm/Cargo.toml
@@ -20,6 +20,7 @@ noirc_driver.workspace = true
 noirc_frontend = { workspace = true, features = ["bn254"] }
 noirc_errors.workspace = true
 noirc_evaluator.workspace = true
+noirc_artifacts.workspace = true
 wasm-bindgen.workspace = true
 serde.workspace = true
 js-sys.workspace = true
diff --git a/compiler/wasm/package.json b/compiler/wasm/package.json
index 0bb9b803ee0..49956d79882 100644
--- a/compiler/wasm/package.json
+++ b/compiler/wasm/package.json
@@ -3,7 +3,7 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.30.0",
+  "version": "0.31.0",
   "license": "(MIT OR Apache-2.0)",
   "main": "dist/main.js",
   "types": "./dist/types/src/index.d.cts",
diff --git a/compiler/wasm/src/compile.rs b/compiler/wasm/src/compile.rs
index f1495e0b438..59b0e00e49f 100644
--- a/compiler/wasm/src/compile.rs
+++ b/compiler/wasm/src/compile.rs
@@ -2,10 +2,8 @@ use acvm::acir::circuit::ExpressionWidth;
 use fm::FileManager;
 use gloo_utils::format::JsValueSerdeExt;
 use js_sys::{JsString, Object};
-use nargo::{
-    artifacts::{contract::ContractArtifact, program::ProgramArtifact},
-    parse_all,
-};
+use nargo::parse_all;
+use noirc_artifacts::{contract::ContractArtifact, program::ProgramArtifact};
 use noirc_driver::{
     add_dep, file_manager_with_stdlib, prepare_crate, prepare_dependency, CompileOptions,
 };
diff --git a/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr b/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr
index 3f8fa051daf..c38188d0119 100644
--- a/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr
+++ b/compiler/wasm/test/fixtures/deps/lib-a/src/lib.nr
@@ -1,4 +1,4 @@
-use dep::lib_b::assert_non_zero;
+use lib_b::assert_non_zero;
 
 pub fn divide(a: u64, b: u64) -> u64 {
     assert_non_zero(b);
diff --git a/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr b/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr
index 0376cd4cb87..23b6659b3c5 100644
--- a/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr
+++ b/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr
@@ -1,3 +1,3 @@
 pub fn bar(param: Field) -> Field {
-    dep::std::hash::pedersen_hash([param])
+    std::hash::pedersen_hash([param])
 }
diff --git a/compiler/wasm/test/fixtures/noir-contract/src/main.nr b/compiler/wasm/test/fixtures/noir-contract/src/main.nr
index fc1dc8a5a17..6f63850e3a0 100644
--- a/compiler/wasm/test/fixtures/noir-contract/src/main.nr
+++ b/compiler/wasm/test/fixtures/noir-contract/src/main.nr
@@ -1,5 +1,5 @@
 contract TestContract {
-    use dep::test::module::foo;
+    use test::module::foo;
 
     fn constructor(param: Field, pub_param: pub Field) -> pub [Field; 2] {
         [foo::bar(param), param + pub_param]
diff --git a/compiler/wasm/test/fixtures/with-deps/src/main.nr b/compiler/wasm/test/fixtures/with-deps/src/main.nr
index 056bcc180b4..fe9e7f9ca77 100644
--- a/compiler/wasm/test/fixtures/with-deps/src/main.nr
+++ b/compiler/wasm/test/fixtures/with-deps/src/main.nr
@@ -1,4 +1,4 @@
-use dep::lib_a::divide;
+use lib_a::divide;
 fn main(x: u64, y: pub u64) {
     divide(x, y);
 }
diff --git a/docs/docs/how_to/merkle-proof.mdx b/docs/docs/how_to/merkle-proof.mdx
index 16c425bed76..0a128adb2de 100644
--- a/docs/docs/how_to/merkle-proof.mdx
+++ b/docs/docs/how_to/merkle-proof.mdx
@@ -12,7 +12,6 @@ Let's walk through an example of a merkle membership proof in Noir that proves t
 in a merkle tree.
 
 ```rust
-use dep::std;
 
 fn main(message : [Field; 62], index : Field, hashpath : [Field; 40], root : Field) {
     let leaf = std::hash::hash_to_field(message.as_slice());
diff --git a/docs/docs/noir/concepts/data_types/arrays.md b/docs/docs/noir/concepts/data_types/arrays.md
index efce3e95d32..d3b17071a15 100644
--- a/docs/docs/noir/concepts/data_types/arrays.md
+++ b/docs/docs/noir/concepts/data_types/arrays.md
@@ -197,7 +197,7 @@ fn main() {
 
 ### reduce
 
-Same as fold, but uses the first element as starting element.
+Same as fold, but uses the first element as the starting element.
 
 ```rust
 fn reduce(self, f: fn(T, T) -> T) -> T
diff --git a/docs/docs/noir/concepts/data_types/index.md b/docs/docs/noir/concepts/data_types/index.md
index 357813c147a..3eadb2dc8a4 100644
--- a/docs/docs/noir/concepts/data_types/index.md
+++ b/docs/docs/noir/concepts/data_types/index.md
@@ -105,6 +105,14 @@ type Bad2 = Bad1;
 //   ^^^^^^^^^^^ 'Bad2' recursively depends on itself: Bad2 -> Bad1 -> Bad2
 ```
 
+## Wildcard Type
+Noir can usually infer the type of the variable from the context, so specifying the type of a variable is only required when it cannot be inferred. However, specifying a complex type can be tedious, especially when it has multiple generic arguments. Often some of the generic types can be inferred from the context, and Noir only needs a hint to properly infer the other types. We can partially specify a variable's type by using `_` as a marker, indicating where we still want the compiler to infer the type.
+
+```rust
+let a: [_; 4] = foo(b);
+```
+ 
+
 ### BigInt
 
 You can achieve BigInt functionality using the [Noir BigInt](https://github.com/shuklaayush/noir-bigint) library.
diff --git a/docs/docs/noir/concepts/data_types/integers.md b/docs/docs/noir/concepts/data_types/integers.md
index c14fffa7174..a1d59bf3166 100644
--- a/docs/docs/noir/concepts/data_types/integers.md
+++ b/docs/docs/noir/concepts/data_types/integers.md
@@ -149,7 +149,6 @@ fn wrapping_mul<T>(x: T, y: T) -> T;
 Example of how it is used:
 
 ```rust
-use dep::std;
 
 fn main(x: u8, y: u8) -> pub u8 {
     std::wrapping_add(x, y)
diff --git a/docs/docs/noir/concepts/data_types/slices.mdx b/docs/docs/noir/concepts/data_types/slices.mdx
index 4eccc677b80..d619117b799 100644
--- a/docs/docs/noir/concepts/data_types/slices.mdx
+++ b/docs/docs/noir/concepts/data_types/slices.mdx
@@ -12,9 +12,7 @@ import Experimental from '@site/src/components/Notes/_experimental.mdx';
 A slice is a dynamically-sized view into a sequence of elements. They can be resized at runtime, but because they don't own the data, they cannot be returned from a circuit. You can treat slices as arrays without a constrained size.
 
 ```rust
-use dep::std::slice;
-
-fn main() -> pub Field {
+fn main() -> pub u32 {
     let mut slice: [Field] = &[0; 2];
 
     let mut new_slice = slice.push_back(6);
@@ -193,3 +191,108 @@ fn main() {
     assert(array[1] == slice[1]);
 }
 ```
+
+### map
+
+Applies a function to each element of the slice, returning a new slice containing the mapped elements.
+
+```rust
+fn map<U>(self, f: fn(T) -> U) -> [U]
+```
+
+example
+
+```rust
+let a = &[1, 2, 3];
+let b = a.map(|a| a * 2); // b is now &[2, 4, 6]
+```
+
+### fold
+
+Applies a function to each element of the slice, returning the final accumulated value. The first
+parameter is the initial value.
+
+```rust
+fn fold<U>(self, mut accumulator: U, f: fn(U, T) -> U) -> U
+```
+
+This is a left fold, so the given function will be applied to the accumulator and first element of
+the slice, then the second, and so on. For a given call the expected result would be equivalent to:
+
+```rust
+let a1 = &[1];
+let a2 = &[1, 2];
+let a3 = &[1, 2, 3];
+
+let f = |a, b| a - b;
+a1.fold(10, f)  //=> f(10, 1)
+a2.fold(10, f)  //=> f(f(10, 1), 2)
+a3.fold(10, f)  //=> f(f(f(10, 1), 2), 3)
+```
+
+example:
+
+```rust
+
+fn main() {
+    let slice = &[2, 2, 2, 2, 2];
+    let folded = slice.fold(0, |a, b| a + b);
+    assert(folded == 10);
+}
+
+```
+
+### reduce
+
+Same as fold, but uses the first element as the starting element.
+
+```rust
+fn reduce(self, f: fn(T, T) -> T) -> T
+```
+
+example:
+
+```rust
+fn main() {
+    let slice = &[2, 2, 2, 2, 2];
+    let reduced = slice.reduce(|a, b| a + b);
+    assert(reduced == 10);
+}
+```
+
+### all
+
+Returns true if all the elements satisfy the given predicate
+
+```rust
+fn all(self, predicate: fn(T) -> bool) -> bool
+```
+
+example:
+
+```rust
+fn main() {
+    let slice = &[2, 2, 2, 2, 2];
+    let all = slice.all(|a| a == 2);
+    assert(all);
+}
+```
+
+### any
+
+Returns true if any of the elements satisfy the given predicate
+
+```rust
+fn any(self, predicate: fn(T) -> bool) -> bool
+```
+
+example:
+
+```rust
+fn main() {
+    let slice = &[2, 2, 2, 2, 5];
+    let any = slice.any(|a| a == 5);
+    assert(any);
+}
+
+```
diff --git a/docs/docs/noir/concepts/data_types/strings.md b/docs/docs/noir/concepts/data_types/strings.md
index 311dfd64416..a05b686df19 100644
--- a/docs/docs/noir/concepts/data_types/strings.md
+++ b/docs/docs/noir/concepts/data_types/strings.md
@@ -20,7 +20,6 @@ You can use strings in `assert()` functions or print them with
 `println()`. See more about [Logging](../../standard_library/logging).
 
 ```rust
-use dep::std;
 
 fn main(message : pub str<11>, hex_as_string : str<4>) {
     println(message);
diff --git a/docs/docs/noir/concepts/traits.md b/docs/docs/noir/concepts/traits.md
index ef1445a5907..51305b38c16 100644
--- a/docs/docs/noir/concepts/traits.md
+++ b/docs/docs/noir/concepts/traits.md
@@ -147,7 +147,7 @@ fn main() {
 
 ### Generic Trait Implementations With Where Clauses
 
-Where clauses can also be placed on trait implementations themselves to restrict generics in a similar way.
+Where clauses can be placed on trait implementations themselves to restrict generics in a similar way.
 For example, while `impl<T> Foo for T` implements the trait `Foo` for every type, `impl<T> Foo for T where T: Bar`
 will implement `Foo` only for types that also implement `Bar`. This is often used for implementing generic types.
 For example, here is the implementation for array equality:
@@ -169,6 +169,22 @@ impl<T, N> Eq for [T; N] where T: Eq {
 }
 ```
 
+Where clauses can also be placed on struct implementations. 
+For example, here is a method utilizing a generic type that implements the equality trait.
+
+```rust
+struct Foo<T> {
+    a: u32,
+    b: T,
+}
+
+impl<T> Foo<T> where T: Eq {
+    fn eq(self, other: Self) -> bool {
+        (self.a == other.a) & self.b.eq(other.b)
+    }
+}
+```
+
 ## Generic Traits
 
 Traits themselves can also be generic by placing the generic arguments after the trait name. These generics are in
@@ -372,13 +388,13 @@ impls for any trait we need on it.
 
 ```rust
 struct Wrapper {
-    foo: dep::some_library::Foo,
+    foo: some_library::Foo,
 }
 
 impl Default for Wrapper {
     fn default() -> Wrapper {
         Wrapper {
-            foo: dep::some_library::Foo::new(),
+            foo: some_library::Foo::new(),
         }
     }
 }
diff --git a/docs/docs/noir/modules_packages_crates/dependencies.md b/docs/docs/noir/modules_packages_crates/dependencies.md
index 04c1703d929..51aeefd0972 100644
--- a/docs/docs/noir/modules_packages_crates/dependencies.md
+++ b/docs/docs/noir/modules_packages_crates/dependencies.md
@@ -70,15 +70,15 @@ You can import a dependency to a Noir file using the following syntax. For examp
 ecrecover-noir library and local lib_a referenced above:
 
 ```rust
-use dep::ecrecover;
-use dep::lib_a;
+use ecrecover;
+use lib_a;
 ```
 
 You can also import only the specific parts of dependency that you want to use, like so:
 
 ```rust
-use dep::std::hash::sha256;
-use dep::std::scalar_mul::fixed_base_embedded_curve;
+use std::hash::sha256;
+use std::scalar_mul::fixed_base_embedded_curve;
 ```
 
 Lastly, as demonstrated in the
@@ -86,7 +86,7 @@ Lastly, as demonstrated in the
 can import multiple items in the same line by enclosing them in curly braces:
 
 ```rust
-use dep::std::ec::tecurve::affine::{Curve, Point};
+use std::ec::tecurve::affine::{Curve, Point};
 ```
 
 We don't have a way to consume libraries from inside a [workspace](./workspaces) as external dependencies right now.
@@ -100,7 +100,7 @@ Note that when you import a dependency, you also get access to all of the depend
 For example, the [phy_vector](https://github.com/resurgencelabs/phy_vector) library imports an [fraction](https://github.com/resurgencelabs/fraction) library. If you're importing the phy_vector library, then you can access the functions in fractions library like so:
 
 ```rust
-use dep::phy_vector;
+use phy_vector;
 
 fn main(x : Field, y : pub Field) {
   //...
diff --git a/docs/docs/noir/standard_library/containers/hashmap.md b/docs/docs/noir/standard_library/containers/hashmap.md
index 2b9f4895722..651e7f5723b 100644
--- a/docs/docs/noir/standard_library/containers/hashmap.md
+++ b/docs/docs/noir/standard_library/containers/hashmap.md
@@ -21,7 +21,7 @@ Example:
 ```rust
 // Create a mapping from Fields to u32s with a maximum length of 12
 // using a poseidon2 hasher
-use dep::std::hash::poseidon2::Poseidon2Hasher;
+use std::hash::poseidon2::Poseidon2Hasher;
 let mut map: HashMap<Field, u32, 12, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
 
 map.insert(1, 2);
diff --git a/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md b/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md
index d2b42d67b7c..f839b4a228e 100644
--- a/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md
+++ b/docs/docs/noir/standard_library/cryptographic_primitives/ec_primitives.md
@@ -81,7 +81,7 @@ from the private key. This is a matter of using scalar multiplication. In the ca
 for example, this code would do:
 
 ```rust
-use dep::std::ec::tecurve::affine::{Curve, Point};
+use std::ec::tecurve::affine::{Curve, Point};
 
 fn bjj_pub_key(priv_key: Field) -> Point
 {
diff --git a/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx b/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx
index 789d26ce426..1ad42a5ac96 100644
--- a/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx
+++ b/docs/docs/noir/standard_library/cryptographic_primitives/eddsa.mdx
@@ -18,7 +18,7 @@ fn eddsa_poseidon_verify(public_key_x : Field, public_key_y : Field, signature_s
 It is also possible to specify the hash algorithm used for the signature by using the `eddsa_verify` function by passing a type implementing the Hasher trait with the turbofish operator. 
 For instance, if you want to use Poseidon2 instead, you can do the following:
 ```rust
-use dep::std::hash::poseidon2::Poseidon2Hasher;
+use std::hash::poseidon2::Poseidon2Hasher;
 
 eddsa_verify::<Poseidon2Hasher>(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg);
 ```
diff --git a/docs/docs/noir/standard_library/recursion.md b/docs/docs/noir/standard_library/recursion.md
index a93894043dc..abe9f23ebd4 100644
--- a/docs/docs/noir/standard_library/recursion.md
+++ b/docs/docs/noir/standard_library/recursion.md
@@ -42,7 +42,6 @@ This is a black box function. Read [this section](./black_box_fns) to learn more
 ## Example usage
 
 ```rust
-use dep::std;
 
 fn main(
     verification_key : [Field; 114],
diff --git a/docs/docs/tooling/testing.md b/docs/docs/tooling/testing.md
index d3e0c522473..866677da567 100644
--- a/docs/docs/tooling/testing.md
+++ b/docs/docs/tooling/testing.md
@@ -42,7 +42,7 @@ fn test_add() {
 }
 ```
 
-You can be more specific and make it fail with a specific reason by using `should_fail_with = "<the reason for failure>`:
+You can be more specific and make it fail with a specific reason by using `should_fail_with = "<the reason for failure>"`:
 
 ```rust
 fn main(african_swallow_avg_speed : Field) {
@@ -58,5 +58,22 @@ fn test_king_arthur() {
 fn test_bridgekeeper() {
     main(32);
 }
-
 ```
+
+The string given to `should_fail_with` doesn't need to exactly match the failure reason, it just needs to be a substring of it:
+
+```rust
+fn main(african_swallow_avg_speed : Field) {
+    assert(african_swallow_avg_speed == 65, "What is the airspeed velocity of an unladen swallow");
+}
+
+#[test]
+fn test_king_arthur() {
+    main(65);
+}
+
+#[test(should_fail_with = "airspeed velocity")]
+fn test_bridgekeeper() {
+    main(32);
+}
+```
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/explainers/explainer-oracle.md b/docs/versioned_docs/version-v0.31.0/explainers/explainer-oracle.md
new file mode 100644
index 00000000000..b84ca5dd986
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/explainers/explainer-oracle.md
@@ -0,0 +1,57 @@
+---
+title: Oracles
+description: This guide provides an in-depth understanding of how Oracles work in Noir programming. Learn how to use outside calculations in your programs, constrain oracles, and understand their uses and limitations.
+keywords:
+  - Noir Programming
+  - Oracles
+  - JSON-RPC
+  - Foreign Call Handlers
+  - Constrained Functions
+  - Blockchain Programming
+sidebar_position: 1
+---
+
+If you've seen "The Matrix" you may recall "The Oracle" as Gloria Foster smoking cigarettes and baking cookies. While she appears to "know things", she is actually providing a calculation of a pre-determined future. Noir Oracles are similar, in a way. They don't calculate the future (yet), but they allow you to use outside calculations in your programs.
+
+![matrix oracle prediction](@site/static/img/memes/matrix_oracle.jpeg)
+
+A Noir program is usually self-contained. You can pass certain inputs to it, and it will generate a deterministic output for those inputs. But what if you wanted to defer some calculation to an outside process or source?
+
+Oracles are functions that provide this feature.
+
+## Use cases
+
+An example usage for Oracles is proving something on-chain. For example, proving that the ETH-USDC quote was below a certain target at a certain block time. Or even making more complex proofs like proving the ownership of an NFT as an anonymous login method.
+
+Another interesting use case is to defer expensive calculations to be made outside of the Noir program, and then constraining the result; similar to the use of [unconstrained functions](../noir/concepts//unconstrained.md).
+
+In short, anything that can be constrained in a Noir program but needs to be fetched from an external source is a great candidate to be used in oracles.
+
+## Constraining oracles
+
+Just like in The Matrix, Oracles are powerful. But with great power, comes great responsibility. Just because you're using them in a Noir program doesn't mean they're true. Noir has no superpowers. If you want to prove that Portugal won the Euro Cup 2016, you're still relying on potentially untrusted information.
+
+To give a concrete example, Alice wants to login to the [NounsDAO](https://nouns.wtf/) forum with her username "noir_nouner" by proving she owns a noun without revealing her ethereum address. Her Noir program could have a oracle call like this:
+
+```rust
+#[oracle(getNoun)]
+unconstrained fn get_noun(address: Field) -> Field
+```
+
+This oracle could naively resolve with the number of Nouns she possesses. However, it is useless as a trusted source, as the oracle could resolve to anything Alice wants. In order to make this oracle call actually useful, Alice would need to constrain the response from the oracle, by proving her address and the noun count belongs to the state tree of the contract.
+
+In short, **Oracles don't prove anything. Your Noir program does.**
+
+:::danger
+
+If you don't constrain the return of your oracle, you could be clearly opening an attack vector on your Noir program. Make double-triple sure that the return of an oracle call is constrained!
+
+:::
+
+## How to use Oracles
+
+On CLI, Nargo resolves oracles by making JSON RPC calls, which means it would require an RPC node to be running.
+
+In JavaScript, NoirJS accepts and resolves arbitrary call handlers (that is, not limited to JSON) as long as they matches the expected types the developer defines. Refer to [Foreign Call Handler](../reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md) to learn more about NoirJS's call handling.
+
+If you want to build using oracles, follow through to the [oracle guide](../how_to/how-to-oracles.md) for a simple example on how to do that.
diff --git a/docs/versioned_docs/version-v0.31.0/explainers/explainer-recursion.md b/docs/versioned_docs/version-v0.31.0/explainers/explainer-recursion.md
new file mode 100644
index 00000000000..18846176ca7
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/explainers/explainer-recursion.md
@@ -0,0 +1,176 @@
+---
+title: Recursive proofs
+description: Explore the concept of recursive proofs in Zero-Knowledge programming. Understand how recursion works in Noir, a language for writing smart contracts on the EVM blockchain. Learn through practical examples like Alice and Bob's guessing game, Charlie's recursive merkle tree, and Daniel's reusable components. Discover how to use recursive proofs to optimize computational resources and improve efficiency.
+
+keywords:
+  [
+    "Recursive Proofs",
+    "Zero-Knowledge Programming",
+    "Noir",
+    "EVM Blockchain",
+    "Smart Contracts",
+    "Recursion in Noir",
+    "Alice and Bob Guessing Game",
+    "Recursive Merkle Tree",
+    "Reusable Components",
+    "Optimizing Computational Resources",
+    "Improving Efficiency",
+    "Verification Key",
+    "Aggregation",
+    "Recursive zkSNARK schemes",
+    "PLONK",
+    "Proving and Verification Keys"
+  ]
+sidebar_position: 1
+pagination_next: how_to/how-to-recursion
+---
+
+In programming, we tend to think of recursion as something calling itself. A classic example would be the calculation of the factorial of a number:
+
+```js
+function factorial(n) {
+    if (n === 0 || n === 1) {
+        return 1;
+    } else {
+        return n * factorial(n - 1);
+    }
+}
+```
+
+In this case, while `n` is not `1`, this function will keep calling itself until it hits the base case, bubbling up the result on the call stack:
+
+```md
+        Is `n` 1?  <---------
+           /\               /
+          /  \         n = n -1 
+         /    \           /
+       Yes     No --------
+```
+
+In Zero-Knowledge, recursion has some similarities.
+
+It is not a Noir function calling itself, but a proof being used as an input to another circuit. In short, you verify one proof *inside* another proof, returning the proof that both proofs are valid.
+
+This means that, given enough computational resources, you can prove the correctness of any arbitrary number of proofs in a single proof. This could be useful to design state channels (for which a common example would be [Bitcoin's Lightning Network](https://en.wikipedia.org/wiki/Lightning_Network)), to save on gas costs by settling one proof on-chain, or simply to make business logic less dependent on a consensus mechanism.
+
+## Examples
+
+Let us look at some of these examples
+
+### Alice and Bob - Guessing game
+
+Alice and Bob are friends, and they like guessing games. They want to play a guessing game online, but for that, they need a trusted third-party that knows both of their secrets and finishes the game once someone wins.
+
+So, they use zero-knowledge proofs. Alice tries to guess Bob's number, and Bob will generate a ZK proof stating whether she succeeded or failed.
+
+This ZK proof can go on a smart contract, revealing the winner and even giving prizes. However, this means every turn needs to be verified on-chain. This incurs some cost and waiting time that may simply make the game too expensive or time-consuming to be worth it.
+
+As a solution, Alice proposes the following: "what if Bob generates his proof, and instead of sending it on-chain, I verify it *within* my own proof before playing my own turn?".
+
+She can then generate a proof that she verified his proof, and so on.
+
+```md
+      Did you fail?  <--------------------------
+           / \                                  /
+          /   \                             n = n -1 
+         /     \                              /
+       Yes      No                           /
+        |        |                          /
+        |        |                         /
+        |      You win                    /
+        |                                /
+        |                               /
+Generate proof of that                 /
+        +                             /
+    my own guess     ----------------
+```
+
+### Charlie - Recursive merkle tree
+
+Charlie is a concerned citizen, and wants to be sure his vote in an election is accounted for. He votes with a ZK proof, but he has no way of knowing that his ZK proof was included in the total vote count!
+
+If the vote collector puts all of the votes into a [Merkle tree](https://en.wikipedia.org/wiki/Merkle_tree), everyone can prove the verification of two proofs within one proof, as such:
+
+```md
+                    abcd
+           __________|______________
+          |                         |
+         ab                         cd 
+     _____|_____              ______|______
+    |           |            |             |              
+  alice        bob        charlie        daniel 
+```
+
+Doing this recursively allows us to arrive on a final proof `abcd` which if true, verifies the correctness of all the votes.
+
+### Daniel - Reusable components
+
+Daniel has a big circuit and a big headache. A part of his circuit is a setup phase that finishes with some assertions that need to be made. But that section alone takes most of the proving time, and is largely independent of the rest of the circuit.
+
+He might find it more efficient to generate a proof for that setup phase separately, and verify that proof recursively in the actual business logic section of his circuit. This will allow for parallelization of both proofs, which results in a considerable speedup.
+
+## What params do I need
+
+As you can see in the [recursion reference](noir/standard_library/recursion.md), a simple recursive proof requires:
+
+- The proof to verify
+- The Verification Key of the circuit that generated the proof
+- A hash of this verification key, as it's needed for some backends
+- The public inputs for the proof
+
+:::info
+
+Recursive zkSNARK schemes do not necessarily "verify a proof" in the sense that you expect a true or false to be spit out by the verifier. Rather an aggregation object is built over the public inputs.
+
+So, taking the example of Alice and Bob and their guessing game:
+
+- Alice makes her guess. Her proof is *not* recursive: it doesn't verify any proof within it! It's just a standard `assert(x != y)` circuit
+- Bob verifies Alice's proof and makes his own guess. In this circuit, he doesn't exactly *prove* the verification of Alice's proof. Instead, he *aggregates* his proof to Alice's proof. The actual verification is done when the full proof is verified, for example when using `nargo verify` or through the verifier smart contract.
+
+We can imagine recursive proofs a [relay race](https://en.wikipedia.org/wiki/Relay_race). The first runner doesn't have to receive the baton from anyone else, as he/she already starts with it. But when his/her turn is over, the next runner needs to receive it, run a bit more, and pass it along. Even though every runner could theoretically verify the baton mid-run (why not? 🏃🔍), only at the end of the race does the referee verify that the whole race is valid.
+
+:::
+
+## Some architecture
+
+As with everything in computer science, there's no one-size-fits all. But there are some patterns that could help understanding and implementing them. To give three examples:
+
+### Adding some logic to a proof verification
+
+This would be an approach for something like our guessing game, where proofs are sent back and forth and are verified by each opponent. This circuit would be divided in two sections:
+
+- A `recursive verification` section, which would be just the call to `std::verify_proof`, and that would be skipped on the first move (since there's no proof to verify)
+- A `guessing` section, which is basically the logic part where the actual guessing happens
+
+In such a situation, and assuming Alice is first, she would skip the first part and try to guess Bob's number. Bob would then verify her proof on the first section of his run, and try to guess Alice's number on the second part, and so on.
+
+### Aggregating proofs
+
+In some one-way interaction situations, recursion would allow for aggregation of simple proofs that don't need to be immediately verified on-chain or elsewhere.
+
+To give a practical example, a barman wouldn't need to verify a "proof-of-age" on-chain every time he serves alcohol to a customer. Instead, the architecture would comprise two circuits:
+
+- A `main`, non-recursive circuit with some logic
+- A `recursive` circuit meant to verify two proofs in one proof
+
+The customer's proofs would be intermediate, and made on their phones, and the barman could just verify them locally. He would then aggregate them into a final proof sent on-chain (or elsewhere) at the end of the day.
+
+### Recursively verifying different circuits
+
+Nothing prevents you from verifying different circuits in a recursive proof, for example:
+
+- A `circuit1` circuit
+- A `circuit2` circuit
+- A `recursive` circuit
+
+In this example, a regulator could verify that taxes were paid for a specific purchase by aggregating both a `payer` circuit (proving that a purchase was made and taxes were paid), and a `receipt` circuit (proving that the payment was received)
+
+## How fast is it
+
+At the time of writing, verifying recursive proofs is surprisingly fast. This is because most of the time is spent on generating the verification key that will be used to generate the next proof. So you are able to cache the verification key and reuse it later.
+
+Currently, Noir JS packages don't expose the functionality of loading proving and verification keys, but that feature exists in the underlying `bb.js` package.
+
+## How can I try it
+
+Learn more about using recursion in Nargo and NoirJS in the [how-to guide](../how_to/how-to-recursion.md) and see a full example in [noir-examples](https://github.com/noir-lang/noir-examples).
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/_category_.json b/docs/versioned_docs/version-v0.31.0/getting_started/_category_.json
new file mode 100644
index 00000000000..5d694210bbf
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/barretenberg/_category_.json b/docs/versioned_docs/version-v0.31.0/getting_started/barretenberg/_category_.json
new file mode 100644
index 00000000000..27a8e89228d
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/barretenberg/_category_.json
@@ -0,0 +1,6 @@
+{
+    "position": 1,
+    "label": "Install Barretenberg",
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/barretenberg/index.md b/docs/versioned_docs/version-v0.31.0/getting_started/barretenberg/index.md
new file mode 100644
index 00000000000..0102c86770b
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/barretenberg/index.md
@@ -0,0 +1,47 @@
+---
+title: Barretenberg Installation
+description: bb is a command line tool for interacting with Aztec's proving backend Barretenberg. This page is a quick guide on how to install `bb`
+keywords: [
+  Barretenberg
+  bb
+  Installation
+  Terminal Commands
+  Version Check
+  Nightlies
+  Specific Versions
+  Branches
+]
+pagination_next: getting_started/hello_noir/index
+---
+
+`bb` is the CLI tool for generating and verifying proofs for Noir programs using the Barretenberg proving library. It also allows generating solidity verifier contracts for which you can verify contracts which were constructed using `bb`.
+
+## Installing `bb`
+
+Open a terminal on your machine, and write:
+
+##### macOS (Apple Silicon)
+
+```bash
+curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/master/barretenberg/cpp/installation/install | bash
+source ~/.zshrc
+bbup -v 0.41.0
+```
+
+##### macOS (Intel)
+
+```bash
+curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/master/barretenberg/cpp/installation/install | bash
+source ~/.zshrc
+bbup -v 0.41.0
+```
+
+##### Linux (Bash)
+
+```bash
+curl -L https://raw.githubusercontent.com/AztecProtocol/aztec-packages/master/barretenberg/cpp/installation/install | bash
+source ~/.bashrc
+bbup -v 0.41.0
+```
+
+Now we're ready to start working on [our first Noir program!](../hello_noir/index.md)
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/_category_.json b/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/_category_.json
new file mode 100644
index 00000000000..976a2325de0
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 2,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/index.md b/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/index.md
new file mode 100644
index 00000000000..1ade3f09ae3
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/index.md
@@ -0,0 +1,145 @@
+---
+title: Creating a Project
+description:
+  Learn how to create and verify your first Noir program using Nargo, a programming language for
+  zero-knowledge proofs.
+keywords:
+  [
+    Nargo,
+    Noir,
+    zero-knowledge proofs,
+    programming language,
+    create Noir program,
+    verify Noir program,
+    step-by-step guide,
+  ]
+sidebar_position: 1
+
+---
+
+Now that we have installed Nargo, it is time to make our first hello world program!
+
+## Create a Project Directory
+
+Noir code can live anywhere on your computer. Let us create a _projects_ folder in the home
+directory to house our Noir programs.
+
+For Linux, macOS, and Windows PowerShell, create the directory and change directory into it by
+running:
+
+```sh
+mkdir ~/projects
+cd ~/projects
+```
+
+## Create Our First Nargo Project
+
+Now that we are in the projects directory, create a new Nargo project by running:
+
+```sh
+nargo new hello_world
+```
+
+> **Note:** `hello_world` can be any arbitrary project name, we are simply using `hello_world` for
+> demonstration.
+>
+> In production, the common practice is to name the project folder as `circuits` for better
+> identifiability when sitting alongside other folders in the codebase (e.g. `contracts`, `scripts`,
+> `test`).
+
+A `hello_world` folder would be created. Similar to Rust, the folder houses _src/main.nr_ and
+_Nargo.toml_ which contain the source code and environmental options of your Noir program
+respectively.
+
+### Intro to Noir Syntax
+
+Let us take a closer look at _main.nr_. The default _main.nr_ generated should look like this:
+
+```rust
+fn main(x : Field, y : pub Field) {
+    assert(x != y);
+}
+```
+
+The first line of the program specifies the program's inputs:
+
+```rust
+x : Field, y : pub Field
+```
+
+Program inputs in Noir are private by default (e.g. `x`), but can be labeled public using the
+keyword `pub` (e.g. `y`). To learn more about private and public values, check the
+[Data Types](../../noir/concepts/data_types/index.md) section.
+
+The next line of the program specifies its body:
+
+```rust
+assert(x != y);
+```
+
+The Noir syntax `assert` can be interpreted as something similar to constraints in other zk-contract languages.
+
+For more Noir syntax, check the [Language Concepts](../../noir/concepts/comments.md) chapter.
+
+## Build In/Output Files
+
+Change directory into _hello_world_ and build in/output files for your Noir program by running:
+
+```sh
+cd hello_world
+nargo check
+```
+
+A _Prover.toml_ file will be generated in your project directory, to allow specifying input values to the program.
+
+## Execute Our Noir Program
+
+Now that the project is set up, we can execute our Noir program.
+
+Fill in input values for execution in the _Prover.toml_ file. For example:
+
+```toml
+x = "1"
+y = "2"
+```
+
+Execute your Noir program:
+
+```sh
+nargo execute witness-name
+```
+
+The witness corresponding to this execution will then be written to the file `./target/witness-name.gz`.
+
+## Prove Our Noir Program
+
+:::info
+
+Nargo no longer handles communicating with backends in order to generate proofs. In order to prove/verify your Noir programs, you'll need an installation of [bb](../barretenberg/index.md).
+
+:::
+
+Prove the valid execution of your Noir program using `bb`:
+
+```sh
+bb prove -b ./target/hello_world.json -w ./target/witness-name.gz -o ./proof
+```
+
+A new file called `proof` will be generated in your project directory, containing the generated proof for your program.
+
+## Verify Our Noir Program
+
+Once a proof is generated, we can verify correct execution of our Noir program by verifying the proof file.
+
+Verify your proof by running:
+
+```sh
+bb write_vk -b ./target/hello_world.json -o ./target/vk
+bb verify -k ./target/vk -p ./proof
+```
+
+The verification will complete in silence if it is successful. If it fails, it will log the corresponding error instead.
+
+Congratulations, you have now created and verified a proof for your very first Noir program!
+
+In the [next section](./project_breakdown.md), we will go into more detail on each step performed.
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/project_breakdown.md b/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/project_breakdown.md
new file mode 100644
index 00000000000..29688df148f
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/hello_noir/project_breakdown.md
@@ -0,0 +1,159 @@
+---
+title: Project Breakdown
+description:
+  Learn about the anatomy of a Nargo project, including the purpose of the Prover TOML
+  file, and how to prove and verify your program.
+keywords:
+  [Nargo, Nargo project, Prover.toml, proof verification, private asset transfer]
+sidebar_position: 2 
+---
+
+This section breaks down our hello world program from the previous section. We elaborate on the project
+structure and what the `prove` and `verify` commands did.
+
+## Anatomy of a Nargo Project
+
+Upon creating a new project with `nargo new` and building the in/output files with `nargo check`
+commands, you would get a minimal Nargo project of the following structure:
+
+    - src
+    - Prover.toml
+    - Nargo.toml
+
+The source directory _src_ holds the source code for your Noir program. By default only a _main.nr_
+file will be generated within it.
+
+### Prover.toml
+
+_Prover.toml_ is used for specifying the input values for executing and proving the program. You can specify `toml` files with different names by using the `--prover-name` or `-p` flags, see the [Prover](#provertoml) section below. Optionally you may specify expected output values for prove-time checking as well.
+
+### Nargo.toml
+
+_Nargo.toml_ contains the environmental options of your project. It contains a "package" section and a "dependencies" section.
+
+Example Nargo.toml:
+
+```toml
+[package]
+name = "noir_starter"
+type = "bin"
+authors = ["Alice"]
+compiler_version = "0.9.0"
+description = "Getting started with Noir"
+entry = "circuit/main.nr"
+license = "MIT"
+
+[dependencies]
+ecrecover = {tag = "v0.9.0", git = "https://github.com/colinnielsen/ecrecover-noir.git"}
+```
+
+Nargo.toml for a [workspace](../../noir/modules_packages_crates/workspaces.md) will look a bit different. For example:
+
+```toml
+[workspace]
+members = ["crates/a", "crates/b"]
+default-member = "crates/a"
+```
+
+#### Package section
+
+The package section defines a number of fields including:
+
+- `name` (**required**) - the name of the package
+- `type` (**required**) - can be "bin", "lib", or "contract" to specify whether its a binary, library or Aztec contract
+- `authors` (optional) - authors of the project
+- `compiler_version` - specifies the version of the compiler to use. This is enforced by the compiler and follow's [Rust's versioning](https://doc.rust-lang.org/cargo/reference/manifest.html#the-version-field), so a `compiler_version = 0.18.0` will enforce Nargo version 0.18.0, `compiler_version = ^0.18.0` will enforce anything above 0.18.0 but below 0.19.0, etc. For more information, see how [Rust handles these operators](https://docs.rs/semver/latest/semver/enum.Op.html)
+- `description` (optional)
+- `entry` (optional) - a relative filepath to use as the entry point into your package (overrides the default of `src/lib.nr` or `src/main.nr`)
+- `backend` (optional)
+- `license` (optional)
+
+#### Dependencies section
+
+This is where you will specify any dependencies for your project. See the [Dependencies page](../../noir/modules_packages_crates/dependencies.md) for more info.
+
+`./proofs/` and `./contract/` directories will not be immediately visible until you create a proof or
+verifier contract respectively.
+
+### main.nr
+
+The _main.nr_ file contains a `main` method, this method is the entry point into your Noir program.
+
+In our sample program, _main.nr_ looks like this:
+
+```rust
+fn main(x : Field, y : Field) {
+    assert(x != y);
+}
+```
+
+The parameters `x` and `y` can be seen as the API for the program and must be supplied by the prover. Since neither `x` nor `y` is marked as public, the verifier does not supply any inputs, when verifying the proof.
+
+The prover supplies the values for `x` and `y` in the _Prover.toml_ file.
+
+As for the program body, `assert` ensures that the condition to be satisfied (e.g. `x != y`) is constrained by the proof of the execution of said program (i.e. if the condition was not met, the verifier would reject the proof as an invalid proof).
+
+### Prover.toml
+
+The _Prover.toml_ file is a file which the prover uses to supply the inputs to the Noir program (both private and public).
+
+In our hello world program the _Prover.toml_ file looks like this:
+
+```toml
+x = "1"
+y = "2"
+```
+
+When the command `nargo execute` is executed, nargo will execute the Noir program using the inputs specified in `Prover.toml`, aborting if it finds that these do not satisfy the constraints defined by `main`. In this example, `x` and `y` must satisfy the inequality constraint `assert(x != y)`.
+
+If an output name is specified such as `nargo execute foo`, the witness generated by this execution will be written to `./target/foo.gz`. This can then be used to generate a proof of the execution.
+
+#### Arrays of Structs
+
+The following code shows how to pass an array of structs to a Noir program to generate a proof.
+
+```rust
+// main.nr
+struct Foo {
+    bar: Field,
+    baz: Field,
+}
+
+fn main(foos: [Foo; 3]) -> pub Field {
+    foos[2].bar + foos[2].baz
+}
+```
+
+Prover.toml:
+
+```toml
+[[foos]] # foos[0]
+bar = 0
+baz = 0
+
+[[foos]] # foos[1]
+bar = 0
+baz = 0
+
+[[foos]] # foos[2]
+bar = 1
+baz = 2
+```
+
+#### Custom toml files
+
+You can specify a `toml` file with a different name to use for execution by using the `--prover-name` or `-p` flags.
+
+This command looks for proof inputs in the default **Prover.toml** and generates the witness and saves it at `./target/foo.gz`:
+
+```bash
+nargo execute foo
+```
+
+This command looks for proof inputs in the custom **OtherProver.toml** and generates the witness and saves it at `./target/bar.gz`:
+
+```bash
+nargo execute -p OtherProver bar
+```
+
+Now that you understand the concepts, you'll probably want some editor feedback while you are writing more complex code.
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/installation/_category_.json b/docs/versioned_docs/version-v0.31.0/getting_started/installation/_category_.json
new file mode 100644
index 00000000000..0c02fb5d4d7
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/installation/_category_.json
@@ -0,0 +1,6 @@
+{
+    "position": 0,
+    "label": "Install Nargo",
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/installation/index.md b/docs/versioned_docs/version-v0.31.0/getting_started/installation/index.md
new file mode 100644
index 00000000000..4ef86aa5914
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/installation/index.md
@@ -0,0 +1,48 @@
+---
+title: Nargo Installation
+description:
+  nargo is a command line tool for interacting with Noir programs. This page is a quick guide on how to install Nargo through the most common and easy method, noirup
+keywords: [
+   Nargo
+   Noir
+   Rust
+   Cargo
+   Noirup
+   Installation
+   Terminal Commands
+   Version Check
+   Nightlies
+   Specific Versions
+   Branches
+   Noirup Repository
+]
+pagination_next: getting_started/hello_noir/index
+---
+
+`nargo` is the one-stop-shop for almost everything related with Noir. The name comes from our love for Rust and its package manager `cargo`.
+
+With `nargo`, you can start new projects, compile, execute, prove, verify, test, generate solidity contracts, and do pretty much all that is available in Noir.
+
+Similarly to `rustup`, we also maintain an easy installation method that covers most machines: `noirup`.
+
+## Installing Noirup
+
+Open a terminal on your machine, and write:
+
+```bash
+curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
+```
+
+Close the terminal, open another one, and run
+
+```bash
+noirup
+```
+
+Done. That's it. You should have the latest version working. You can check with `nargo --version`.
+
+You can also install nightlies, specific versions
+or branches. Check out the [noirup repository](https://github.com/noir-lang/noirup) for more
+information.
+
+Now we're ready to start working on [our first Noir program!](../hello_noir/index.md)
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/installation/other_install_methods.md b/docs/versioned_docs/version-v0.31.0/getting_started/installation/other_install_methods.md
new file mode 100644
index 00000000000..3634723562b
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/installation/other_install_methods.md
@@ -0,0 +1,102 @@
+---
+title: Alternative Installations
+description: There are different ways to install Nargo, the one-stop shop and command-line tool for developing Noir programs. This guide explains how to specify which version to install when using noirup, and using WSL for windows.
+keywords: [
+    Installation
+    Nargo
+    Noirup
+    Binaries
+    Compiling from Source
+    WSL for Windows
+    macOS
+    Linux
+    Nix
+    Direnv
+    Uninstalling Nargo
+  ]
+sidebar_position: 1
+---
+
+## Encouraged Installation Method: Noirup
+
+Noirup is the endorsed method for installing Nargo, streamlining the process of fetching binaries or compiling from source. It supports a range of options to cater to your specific needs, from nightly builds and specific versions to compiling from various sources.
+
+### Installing Noirup
+
+First, ensure you have `noirup` installed:
+
+```sh
+curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
+```
+
+### Fetching Binaries
+
+With `noirup`, you can easily switch between different Nargo versions, including nightly builds:
+
+- **Nightly Version**: Install the latest nightly build.
+
+  ```sh
+  noirup --version nightly
+  ```
+
+- **Specific Version**: Install a specific version of Nargo.
+  ```sh
+  noirup --version <version>
+  ```
+
+### Compiling from Source
+
+`noirup` also enables compiling Nargo from various sources:
+
+- **From a Specific Branch**: Install from the latest commit on a branch.
+
+  ```sh
+  noirup --branch <branch-name>
+  ```
+
+- **From a Fork**: Install from the main branch of a fork.
+
+  ```sh
+  noirup --repo <username/repo>
+  ```
+
+- **From a Specific Branch in a Fork**: Install from a specific branch in a fork.
+
+  ```sh
+  noirup --repo <username/repo> --branch <branch-name>
+  ```
+
+- **From a Specific Pull Request**: Install from a specific PR.
+
+  ```sh
+  noirup --pr <pr-number>
+  ```
+
+- **From a Specific Commit**: Install from a specific commit.
+
+  ```sh
+  noirup -C <commit-hash>
+  ```
+
+- **From Local Source**: Compile and install from a local directory.
+  ```sh
+  noirup --path ./path/to/local/source
+  ```
+
+## Installation on Windows
+
+The default backend for Noir (Barretenberg) doesn't provide Windows binaries at this time. For that reason, Noir cannot be installed natively. However, it is available by using Windows Subsystem for Linux (WSL).
+
+Step 1: Follow the instructions [here](https://learn.microsoft.com/en-us/windows/wsl/install) to install and run WSL.
+
+step 2: Follow the [Noirup instructions](#encouraged-installation-method-noirup).
+
+## Uninstalling Nargo
+
+If you installed Nargo with `noirup`, you can uninstall Nargo by removing the files in `~/.nargo`, `~/nargo`, and `~/noir_cache`. This ensures that all installed binaries, configurations, and cache related to Nargo are fully removed from your system.
+
+```bash
+rm -r ~/.nargo
+rm -r ~/nargo
+rm -r ~/noir_cache
+```
diff --git a/docs/versioned_docs/version-v0.31.0/getting_started/tooling/noir_codegen.md b/docs/versioned_docs/version-v0.31.0/getting_started/tooling/noir_codegen.md
new file mode 100644
index 00000000000..f7505bef7ab
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/getting_started/tooling/noir_codegen.md
@@ -0,0 +1,114 @@
+---
+title: Noir Codegen for TypeScript
+description: Learn how to use Noir codegen to generate TypeScript bindings 
+keywords: [Nargo, Noir, compile, TypeScript]
+sidebar_position: 3
+---
+
+When using TypeScript, it is extra work to interpret Noir program outputs in a type-safe way. Third party libraries may exist for popular Noir programs, but they are either hard to find or unmaintained.
+
+Now you can generate TypeScript bindings for your Noir programs in two steps: 
+1. Exporting Noir functions using `nargo export`
+2. Using the TypeScript module `noir_codegen` to generate TypeScript binding
+
+**Note:** you can only export functions from a Noir *library* (not binary or contract program types).
+
+## Installation
+
+### Your TypeScript project
+
+If you don't already have a TypeScript project you can add the module with `yarn` (or `npm`), then initialize it:
+
+```bash
+yarn add typescript -D
+npx tsc --init
+```
+
+### Add TypeScript module - `noir_codegen`
+
+The following command will add the module to your project's devDependencies:
+
+```bash
+yarn add @noir-lang/noir_codegen -D
+```
+
+### Nargo library
+Make sure you have Nargo, v0.25.0 or greater, installed. If you don't, follow the [installation guide](../installation/index.md). 
+
+If you're in a new project, make a `circuits` folder and create a new Noir library:
+
+```bash
+mkdir circuits && cd circuits
+nargo new --lib myNoirLib
+```
+
+## Usage
+
+### Export ABI of specified functions
+
+First go to the `.nr` files in your Noir library, and add the `#[export]` macro to each function that you want to use in TypeScript.
+
+```rust
+#[export]
+fn your_function(...
+```
+
+From your Noir library (where `Nargo.toml` is), run the following command:
+
+```bash
+nargo export
+```
+
+You will now have an `export` directory with a .json file per exported function.
+
+You can also specify the directory of Noir programs using `--program-dir`, for example:
+
+```bash
+nargo export --program-dir=./circuits/myNoirLib
+```
+
+### Generate TypeScript bindings from exported functions
+
+To use the `noir-codegen` package we added to the TypeScript project:
+
+```bash
+yarn noir-codegen ./export/your_function.json
+```
+
+This creates an `exports` directory with an `index.ts` file containing all exported functions.
+
+**Note:** adding `--out-dir` allows you to specify an output dir for your TypeScript bindings to go. Eg:
+
+```bash
+yarn noir-codegen ./export/*.json --out-dir ./path/to/output/dir
+```
+
+## Example .nr function to .ts output
+
+Consider a Noir library with this function:
+
+```rust
+#[export]
+fn not_equal(x: Field, y: Field) -> bool {
+    x != y
+}
+```
+
+After the export and codegen steps, you should have an `index.ts` like:
+
+```typescript
+export type Field = string;
+
+
+export const is_equal_circuit: CompiledCircuit = 
+{"abi":{"parameters":[{"name":"x","type":{"kind":"field"},"visibility":"private"},{"name":"y","type":{"kind":"field"},"visibility":"private"}],"return_type":{"abi_type":{"kind":"boolean"},"visibility":"private"}},"bytecode":"H4sIAAAAAAAA/7WUMQ7DIAxFQ0Krrr2JjSGYLVcpKrn/CaqqDQN12WK+hPBgmWd/wEyHbF1SS923uhOs3pfoChI+wKXMAXzIKyNj4PB0TFTYc0w5RUjoqeAeEu1wqK0F54RGkWvW44LPzExnlkbMEs4JNZmN8PxS42uHv82T8a3Jeyn2Ks+VLPcO558HmyLMCDOXAXXtpPt4R/Rt9T36ss6dS9HGPx/eG17nGegKBQAA"};
+
+export async function is_equal(x: Field, y: Field, foreignCallHandler?: ForeignCallHandler): Promise<boolean> {
+  const program = new Noir(is_equal_circuit);
+  const args: InputMap = { x, y };
+  const { returnValue } = await program.execute(args, foreignCallHandler);
+  return returnValue as boolean;
+}
+```
+
+Now the `is_equal()` function and relevant types are readily available for use in TypeScript.
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/_category_.json b/docs/versioned_docs/version-v0.31.0/how_to/_category_.json
new file mode 100644
index 00000000000..23b560f610b
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 1,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/debugger/_category_.json b/docs/versioned_docs/version-v0.31.0/how_to/debugger/_category_.json
new file mode 100644
index 00000000000..cc2cbb1c253
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/debugger/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Debugging",
+    "position": 5,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/debugger/debugging_with_the_repl.md b/docs/versioned_docs/version-v0.31.0/how_to/debugger/debugging_with_the_repl.md
new file mode 100644
index 00000000000..09e5bae68ad
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/debugger/debugging_with_the_repl.md
@@ -0,0 +1,164 @@
+---
+title: Using the REPL Debugger
+description:
+  Step by step guide on how to debug your Noir circuits with the REPL Debugger. 
+keywords:
+  [
+    Nargo,
+    Noir CLI,
+    Noir Debugger,
+    REPL,
+  ]
+sidebar_position: 1
+---
+
+#### Pre-requisites
+
+In order to use the REPL debugger, first you need to install recent enough versions of Nargo and vscode-noir. 
+
+## Debugging a simple circuit
+
+Let's debug a simple circuit:
+
+```rust
+fn main(x : Field, y : pub Field) {
+    assert(x != y);
+}
+```
+
+To start the REPL debugger, using a terminal, go to a Noir circuit's home directory. Then:
+
+`$ nargo debug`
+
+You should be seeing this in your terminal:
+
+```
+[main] Starting debugger
+At ~/noir-examples/recursion/circuits/main/src/main.nr:1:9
+  1 -> fn main(x : Field, y : pub Field) {
+  2        assert(x != y);
+  3    }
+> 
+```
+
+The debugger displays the current Noir code location, and it is now waiting for us to drive it.
+
+Let's first take a look at the available commands. For that we'll use the `help` command.
+
+```
+> help
+Available commands:
+
+  opcodes                          display ACIR opcodes
+  into                             step into to the next opcode
+  next                             step until a new source location is reached
+  out                              step until a new source location is reached
+                                   and the current stack frame is finished
+  break LOCATION:OpcodeLocation    add a breakpoint at an opcode location
+  over                             step until a new source location is reached
+                                   without diving into function calls
+  restart                          restart the debugging session
+  delete LOCATION:OpcodeLocation   delete breakpoint at an opcode location
+  witness                          show witness map
+  witness index:u32                display a single witness from the witness map
+  witness index:u32 value:String   update a witness with the given value
+  memset index:usize value:String  update a memory cell with the given
+                                   value
+  continue                         continue execution until the end of the
+                                   program
+  vars                             show variable values available at this point
+                                   in execution
+  stacktrace                       display the current stack trace
+  memory                           show memory (valid when executing unconstrained code)
+  step                             step to the next ACIR opcode
+
+Other commands:
+
+  help  Show this help message
+  quit  Quit repl
+
+```
+
+Some commands operate only for unconstrained functions, such as `memory` and `memset`. If you try to use them while execution is paused at an ACIR opcode, the debugger will simply inform you that you are not executing unconstrained code:
+
+```
+> memory
+Unconstrained VM memory not available
+> 
+```
+
+Before continuing, we can take a look at the initial witness map:
+
+```
+> witness
+_0 = 1
+_1 = 2
+>
+```
+
+Cool, since `x==1`, `y==2`, and we want to check that `x != y`, our circuit should succeed. At this point we could intervene and use the witness setter command to change one of the witnesses. Let's set `y=3`, then back to 2, so we don't affect the expected result:
+
+```
+> witness
+_0 = 1
+_1 = 2
+> witness 1 3
+_1 = 3
+> witness
+_0 = 1
+_1 = 3
+> witness 1 2
+_1 = 2
+> witness
+_0 = 1
+_1 = 2
+>
+```
+
+Now we can inspect the current state of local variables. For that we use the `vars` command. 
+
+```
+> vars
+>
+```
+
+We currently have no vars in context, since we are at the entry point of the program. Let's use `next` to execute until the next point in the program.
+
+```
+> vars
+> next
+At ~/noir-examples/recursion/circuits/main/src/main.nr:1:20
+  1 -> fn main(x : Field, y : pub Field) {
+  2        assert(x != y);
+  3    }
+> vars
+x:Field = 0x01
+```
+
+As a result of stepping, the variable `x`, whose initial value comes from the witness map, is now in context and returned by `vars`.
+
+```
+> next
+  1    fn main(x : Field, y : pub Field) {
+  2 ->     assert(x != y);
+  3    }
+> vars
+y:Field = 0x02
+x:Field = 0x01
+```
+
+Stepping again we can finally see both variables and their values. And now we can see that the next assertion should succeed.
+
+Let's continue to the end:
+
+```
+> continue
+(Continuing execution...)
+Finished execution
+> q
+[main] Circuit witness successfully solved
+```
+
+Upon quitting the debugger after a solved circuit, the resulting circuit witness gets saved, equivalent to what would happen if we had run the same circuit with `nargo execute`.
+
+We just went through the basics of debugging using Noir REPL debugger. For a comprehensive reference, check out [the reference page](../../reference/debugger/debugger_repl.md).
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/debugger/debugging_with_vs_code.md b/docs/versioned_docs/version-v0.31.0/how_to/debugger/debugging_with_vs_code.md
new file mode 100644
index 00000000000..a5858c1a5eb
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/debugger/debugging_with_vs_code.md
@@ -0,0 +1,68 @@
+---
+title: Using the VS Code Debugger
+description:
+  Step by step guide on how to debug your Noir circuits with the VS Code Debugger configuration and features.
+keywords:
+  [
+    Nargo,
+    Noir CLI,
+    Noir Debugger,
+    VS Code,
+    IDE,
+  ]
+sidebar_position: 0
+---
+
+This guide will show you how to use VS Code with the vscode-noir extension to debug a Noir project. 
+
+#### Pre-requisites
+
+- Nargo
+- vscode-noir
+- A Noir project with a `Nargo.toml`, `Prover.toml` and at least one Noir (`.nr`) containing an entry point function (typically `main`).
+
+## Running the debugger
+
+The easiest way to start debugging is to open the file you want to debug, and press `F5`. This will cause the debugger to launch, using your `Prover.toml` file as input.
+
+You should see something like this:
+
+![Debugger launched](@site/static/img/debugger/1-started.png)
+
+Let's inspect the state of the program. For that, we open VS Code's _Debug pane_. Look for this icon:
+
+![Debug pane icon](@site/static/img/debugger/2-icon.png)
+
+You will now see two categories of variables: Locals and Witness Map.
+
+![Debug pane expanded](@site/static/img/debugger/3-debug-pane.png)
+
+1. **Locals**: variables of your program. At this point in execution this section is empty, but as we step through the code it will get populated by `x`, `result`, `digest`, etc. 
+
+2. **Witness map**: these are initially populated from your project's `Prover.toml` file. In this example, they will be used to populate `x` and `result` at the beginning of the `main` function.
+
+Most of the time you will probably be focusing mostly on locals, as they represent the high level state of your program. 
+
+You might be interested in inspecting the witness map in case you are trying to solve a really low level issue in the compiler or runtime itself, so this concerns mostly advanced or niche users.
+
+Let's step through the program, by using the debugger buttons or their corresponding keyboard shortcuts.
+
+![Debugger buttons](@site/static/img/debugger/4-debugger-buttons.png)
+
+Now we can see in the variables pane that there's values for `digest`, `result` and `x`.
+
+![Inspecting locals](@site/static/img/debugger/5-assert.png)
+
+We can also inspect the values of variables by directly hovering on them on the code.
+
+![Hover locals](@site/static/img/debugger/6-hover.png)
+
+Let's set a break point at the `keccak256` function, so we can continue execution up to the point when it's first invoked without having to go one step at a time. 
+
+We just need to click the to the right of the line number 18. Once the breakpoint appears, we can click the `continue` button or use its corresponding keyboard shortcut (`F5` by default).
+
+![Breakpoint](@site/static/img/debugger/7-break.png)
+
+Now we are debugging the `keccak256` function, notice the _Call Stack pane_ at the lower right. This lets us inspect the current call stack of our process.
+
+That covers most of the current debugger functionalities. Check out [the reference](../../reference/debugger/debugger_vscode.md) for more details on how to configure the debugger.
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/how-to-oracles.md b/docs/versioned_docs/version-v0.31.0/how_to/how-to-oracles.md
new file mode 100644
index 00000000000..2d2ed5c94b9
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/how-to-oracles.md
@@ -0,0 +1,273 @@
+---
+title: How to use Oracles
+description: Learn how to use oracles in your Noir program with examples in both Nargo and NoirJS. This guide also covers writing a JSON RPC server and providing custom foreign call handlers for NoirJS.
+keywords:
+  - Noir Programming
+  - Oracles
+  - Nargo
+  - NoirJS
+  - JSON RPC Server
+  - Foreign Call Handlers
+sidebar_position: 1
+---
+
+This guide shows you how to use oracles in your Noir program. For the sake of clarity, it assumes that:
+
+- You have read the [explainer on Oracles](../explainers/explainer-oracle.md) and are comfortable with the concept.
+- You have a Noir program to add oracles to. You can create one using the [vite-hardhat starter](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat) as a boilerplate.
+- You understand the concept of a JSON-RPC server. Visit the [JSON-RPC website](https://www.jsonrpc.org/) if you need a refresher.
+- You are comfortable with server-side JavaScript (e.g. Node.js, managing packages, etc.).
+
+For reference, you can find the snippets used in this tutorial on the [Aztec DevRel Repository](https://github.com/AztecProtocol/dev-rel/tree/main/code-snippets/how-to-oracles).
+
+## Rundown
+
+This guide has 3 major steps:
+
+1. How to modify our Noir program to make use of oracle calls as unconstrained functions
+2. How to write a JSON RPC Server to resolve these oracle calls with Nargo
+3. How to use them in Nargo and how to provide a custom resolver in NoirJS
+
+## Step 1 - Modify your Noir program
+
+An oracle is defined in a Noir program by defining two methods:
+
+- An unconstrained method - This tells the compiler that it is executing an [unconstrained functions](../noir/concepts//unconstrained.md).
+- A decorated oracle method - This tells the compiler that this method is an RPC call.
+
+An example of an oracle that returns a `Field` would be:
+
+```rust
+#[oracle(getSqrt)]
+unconstrained fn sqrt(number: Field) -> Field { }
+
+unconstrained fn get_sqrt(number: Field) -> Field {
+    sqrt(number)
+}
+```
+
+In this example, we're wrapping our oracle function in a unconstrained method, and decorating it with `oracle(getSqrt)`. We can then call the unconstrained function as we would call any other function:
+
+```rust
+fn main(input: Field) {
+    let sqrt = get_sqrt(input);
+}
+```
+
+In the next section, we will make this `getSqrt` (defined on the `sqrt` decorator) be a method of the RPC server Noir will use.
+
+:::danger
+
+As explained in the [Oracle Explainer](../explainers/explainer-oracle.md), this `main` function is unsafe unless you constrain its return value. For example:
+
+```rust
+fn main(input: Field) {
+    let sqrt = get_sqrt(input);
+    assert(sqrt.pow_32(2) as u64 == input as u64); // <---- constrain the return of an oracle!
+}
+```
+
+:::
+
+:::info
+
+Currently, oracles only work with single params or array params. For example:
+
+```rust
+#[oracle(getSqrt)]
+unconstrained fn sqrt([Field; 2]) -> [Field; 2] { }
+```
+
+:::
+
+## Step 2 - Write an RPC server
+
+Brillig will call *one* RPC server. Most likely you will have to write your own, and you can do it in whatever language you prefer. In this guide, we will do it in Javascript.
+
+Let's use the above example of an oracle that consumes an array with two `Field` and returns their square roots:
+
+```rust
+#[oracle(getSqrt)]
+unconstrained fn sqrt(input: [Field; 2]) -> [Field; 2] { }
+
+unconstrained fn get_sqrt(input: [Field; 2]) -> [Field; 2] {
+    sqrt(input)
+}
+
+fn main(input: [Field; 2]) {
+    let sqrt = get_sqrt(input);
+    assert(sqrt[0].pow_32(2) as u64 == input[0] as u64);
+    assert(sqrt[1].pow_32(2) as u64 == input[1] as u64);
+}
+```
+
+:::info
+
+Why square root?
+
+In general, computing square roots is computationally more expensive than multiplications, which takes a toll when speaking about ZK applications. In this case, instead of calculating the square root in Noir, we are using our oracle to offload that computation to be made in plain. In our circuit we can simply multiply the two values.
+
+:::
+
+Now, we should write the correspondent RPC server, starting with the [default JSON-RPC 2.0 boilerplate](https://www.npmjs.com/package/json-rpc-2.0#example):
+
+```js
+import { JSONRPCServer } from "json-rpc-2.0";
+import express from "express";
+import bodyParser from "body-parser";
+
+const app = express();
+app.use(bodyParser.json());
+
+const server = new JSONRPCServer();
+app.post("/", (req, res) => {
+ const jsonRPCRequest = req.body;
+ server.receive(jsonRPCRequest).then((jsonRPCResponse) => {
+  if (jsonRPCResponse) {
+   res.json(jsonRPCResponse);
+  } else {
+   res.sendStatus(204);
+  }
+ });
+});
+
+app.listen(5555);
+```
+
+Now, we will add our `getSqrt` method, as expected by the `#[oracle(getSqrt)]` decorator in our Noir code. It maps through the params array and returns their square roots:
+
+```js
+server.addMethod("resolve_function_call", async (params) => {
+  if params.function !== "getSqrt" {
+    throw Error("Unexpected foreign call")
+  };
+  const values = params.inputs[0].Array.map((field) => {
+    return `${Math.sqrt(parseInt(field, 16))}`;
+  });
+  return { values: [{ Array: values }] };
+});
+```
+
+If you're using Typescript, the following types may be helpful in understanding the expected return value and making sure they're easy to follow:
+
+```js
+interface SingleForeignCallParam {
+  Single: string,
+}
+
+interface ArrayForeignCallParam {
+  Array: string[],
+}
+
+type ForeignCallParam = SingleForeignCallParam | ArrayForeignCallParam;
+
+interface ForeignCallResult {
+  values: ForeignCallParam[],
+}
+```
+
+::: Multidimensional Arrays
+
+If the Oracle function is returning an array containing other arrays, such as `[['1','2],['3','4']]`, you need to provide the values in json as flattened values. In the previous example, it would be `['1', '2', '3', '4']`. In the noir program, the Oracle signature can use a nested type, the flattened values will be automatically converted to the nested type.
+
+:::
+
+## Step 3 - Usage with Nargo
+
+Using the [`nargo` CLI tool](../getting_started/installation/index.md), you can use oracles in the `nargo test` and `nargo execute`  commands by passing a value to `--oracle-resolver`. For example:
+
+```bash
+nargo test --oracle-resolver http://localhost:5555
+```
+
+This tells `nargo` to use your RPC Server URL whenever it finds an oracle decorator.
+
+## Step 4 - Usage with NoirJS
+
+In a JS environment, an RPC server is not strictly necessary, as you may want to resolve your oracles without needing any JSON call at all. NoirJS simply expects that you pass a callback function when you generate proofs, and that callback function can be anything.
+
+For example, if your Noir program expects the host machine to provide CPU pseudo-randomness, you could simply pass it as the `foreignCallHandler`. You don't strictly need to create an RPC server to serve pseudo-randomness, as you may as well get it directly in your app:
+
+```js
+const foreignCallHandler = (name, inputs) => crypto.randomBytes(16) // etc
+
+await noir.execute(inputs, foreignCallHandler)
+```
+
+As one can see, in NoirJS, the [`foreignCallHandler`](../reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md) function simply means "a callback function that returns a value of type [`ForeignCallOutput`](../reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md). It doesn't have to be an RPC call like in the case for Nargo.
+
+:::tip
+
+Does this mean you don't have to write an RPC server like in [Step #2](#step-2---write-an-rpc-server)?
+
+You don't technically have to, but then how would you run `nargo test`? To use both `Nargo` and `NoirJS` in your development flow, you will have to write a JSON RPC server.
+
+:::
+
+In this case, let's make `foreignCallHandler` call the JSON RPC Server we created in [Step #2](#step-2---write-an-rpc-server), by making it a JSON RPC Client.
+
+For example, using the same `getSqrt` program in [Step #1](#step-1---modify-your-noir-program) (comments in the code):
+
+```js
+import { JSONRPCClient } from "json-rpc-2.0";
+
+// declaring the JSONRPCClient
+const client = new JSONRPCClient((jsonRPCRequest) => {
+// hitting the same JSON RPC Server we coded above
+ return fetch("http://localhost:5555", {
+  method: "POST",
+  headers: {
+   "content-type": "application/json",
+  },
+  body: JSON.stringify(jsonRPCRequest),
+ }).then((response) => {
+  if (response.status === 200) {
+   return response
+    .json()
+    .then((jsonRPCResponse) => client.receive(jsonRPCResponse));
+  } else if (jsonRPCRequest.id !== undefined) {
+   return Promise.reject(new Error(response.statusText));
+  }
+ });
+});
+
+// declaring a function that takes the name of the foreign call (getSqrt) and the inputs
+const foreignCallHandler = async (name, input) => {
+    // notice that the "inputs" parameter contains *all* the inputs
+    // in this case we to make the RPC request with the first parameter "numbers", which would be input[0]
+    const oracleReturn = await client.request(name, [
+      { Array: input[0].map((i) => i.toString("hex")) },
+    ]);
+    return [oracleReturn.values[0].Array];
+};
+
+// the rest of your NoirJS code
+const input = { input: [4, 16] };
+const { witness } = await noir.execute(numbers, foreignCallHandler);
+```
+
+:::tip
+
+If you're in a NoirJS environment running your RPC server together with a frontend app, you'll probably hit a familiar problem in full-stack development: requests being blocked by [CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS) policy. For development only, you can simply install and use the [`cors` npm package](https://www.npmjs.com/package/cors) to get around the problem:
+
+```bash
+yarn add cors
+```
+
+and use it as a middleware:
+
+```js
+import cors from "cors";
+
+const app = express();
+app.use(cors())
+```
+
+:::
+
+## Conclusion
+
+Hopefully by the end of this guide, you should be able to:
+
+- Write your own logic around Oracles and how to write a JSON RPC server to make them work with your Nargo commands.
+- Provide custom foreign call handlers for NoirJS.
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/how-to-recursion.md b/docs/versioned_docs/version-v0.31.0/how_to/how-to-recursion.md
new file mode 100644
index 00000000000..aac84e29fac
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/how-to-recursion.md
@@ -0,0 +1,180 @@
+---
+title: How to use recursion on NoirJS
+description: Learn how to implement recursion with NoirJS, a powerful tool for creating smart contracts on the EVM blockchain. This guide assumes familiarity with NoirJS, solidity verifiers, and the Barretenberg proving backend. Discover how to generate both final and intermediate proofs using `noir_js` and `backend_barretenberg`.
+keywords:
+  [
+    "NoirJS",
+    "EVM blockchain",
+    "smart contracts",
+    "recursion",
+    "solidity verifiers",
+    "Barretenberg backend",
+    "noir_js",
+    "backend_barretenberg",
+    "intermediate proofs",
+    "final proofs",
+    "nargo compile",
+    "json import",
+    "recursive circuit",
+    "recursive app"
+  ]
+sidebar_position: 1
+---
+
+This guide shows you how to use recursive proofs in your NoirJS app. For the sake of clarity, it is assumed that:
+
+- You already have a NoirJS app. If you don't, please visit the [NoirJS tutorial](../tutorials/noirjs_app.md) and the [reference](../reference/NoirJS/noir_js/index.md).
+- You are familiar with what are recursive proofs and you have read the [recursion explainer](../explainers/explainer-recursion.md)
+- You already built a recursive circuit following [the reference](../noir/standard_library/recursion.md), and understand how it works.
+
+It is also assumed that you're not using `noir_wasm` for compilation, and instead you've used [`nargo compile`](../reference/nargo_commands.md) to generate the `json` you're now importing into your project. However, the guide should work just the same if you're using `noir_wasm`.
+
+:::info
+
+As you've read in the [explainer](../explainers/explainer-recursion.md), a recursive proof is an intermediate proof. This means that it doesn't necessarily generate the final step that makes it verifiable in a smart contract. However, it is easy to verify within another circuit.
+
+While "standard" usage of NoirJS packages abstracts final proofs, it currently lacks the necessary interface to abstract away intermediate proofs. This means that these proofs need to be created by using the backend directly.
+
+In short:
+
+- `noir_js` generates *only* final proofs
+- `backend_barretenberg` generates both types of proofs
+
+:::
+
+In a standard recursive app, you're also dealing with at least two circuits. For the purpose of this guide, we will assume the following:
+
+- `main`: a circuit of type `assert(x != y)`, where `main` is marked with a `#[recursive]` attribute. This attribute states that the backend should generate proofs that are friendly for verification within another circuit.
+- `recursive`: a circuit that verifies `main`
+
+For a full example on how recursive proofs work, please refer to the [noir-examples](https://github.com/noir-lang/noir-examples) repository. We will *not* be using it as a reference for this guide.
+
+## Step 1: Setup
+
+In a common NoirJS app, you need to instantiate a backend with something like `const backend = new Backend(circuit)`. Then you feed it to the `noir_js` interface.
+
+For recursion, this doesn't happen, and the only need for `noir_js` is only to `execute` a circuit and get its witness and return value. Everything else is not interfaced, so it needs to happen on the `backend` object.
+
+It is also recommended that you instantiate the backend with as many threads as possible, to allow for maximum concurrency:
+
+```js
+const backend = new Backend(circuit, { threads: 8 })
+```
+
+:::tip
+You can use the [`os.cpus()`](https://nodejs.org/api/os.html#oscpus) object in `nodejs` or [`navigator.hardwareConcurrency`](https://developer.mozilla.org/en-US/docs/Web/API/Navigator/hardwareConcurrency) on the browser to make the most out of those glorious cpu cores
+:::
+
+## Step 2: Generating the witness and the proof for `main`
+
+After instantiating the backend, you should also instantiate `noir_js`. We will use it to execute the circuit and get the witness.
+
+```js
+const noir = new Noir(circuit)
+const { witness } = noir.execute(input)
+```
+
+With this witness, you are now able to generate the intermediate proof for the main circuit:
+
+```js
+const { proof, publicInputs } = await backend.generateProof(witness)
+```
+
+:::warning
+
+Always keep in mind what is actually happening on your development process, otherwise you'll quickly become confused about what circuit we are actually running and why!
+
+In this case, you can imagine that Alice (running the `main` circuit) is proving something to Bob (running the `recursive` circuit), and Bob is verifying her proof within his proof.
+
+With this in mind, it becomes clear that our intermediate proof is the one *meant to be verified within another circuit*, so it must be Alice's. Actually, the only final proof in this theoretical scenario would be the last one, sent on-chain.
+
+:::
+
+## Step 3 - Verification and proof artifacts
+
+Optionally, you are able to verify the intermediate proof:
+
+```js
+const verified = await backend.verifyProof({ proof, publicInputs })
+```
+
+This can be useful to make sure our intermediate proof was correctly generated. But the real goal is to do it within another circuit. For that, we need to generate  recursive proof artifacts that will be passed to the circuit that is verifying the proof we just generated. Instead of passing the proof and verification key as a byte array, we pass them as fields which makes it cheaper to verify in a circuit:
+
+```js
+const { proofAsFields, vkAsFields, vkHash } = await backend.generateRecursiveProofArtifacts( { publicInputs, proof }, publicInputsCount)
+```
+
+This call takes the public inputs and the proof, but also the public inputs count. While this is easily retrievable by simply counting the `publicInputs` length, the backend interface doesn't currently abstract it away.
+
+:::info
+
+The `proofAsFields` has a constant size `[Field; 93]` and verification keys in Barretenberg are always `[Field; 114]`.
+
+:::
+
+:::warning
+
+One common mistake is to forget *who* makes this call.
+
+In a situation where Alice is generating the `main` proof, if she generates the proof artifacts and sends them to Bob, which gladly takes them as true, this would mean Alice could prove anything!
+
+Instead, Bob needs to make sure *he* extracts the proof artifacts, using his own instance of the `main` circuit backend. This way, Alice has to provide a valid proof for the correct `main` circuit.
+
+:::
+
+## Step 4 - Recursive proof generation
+
+With the artifacts, generating a recursive proof is no different from a normal proof. You simply use the `backend` (with the recursive circuit) to generate it:
+
+```js
+const recursiveInputs = {
+    verification_key: vkAsFields, // array of length 114
+    proof: proofAsFields, // array of length 93 + size of public inputs
+    publicInputs: [mainInput.y], // using the example above, where `y` is the only public input
+    key_hash: vkHash,
+}
+
+const { witness, returnValue } = noir.execute(recursiveInputs) // we're executing the recursive circuit now!
+const { proof, publicInputs } = backend.generateProof(witness)
+const verified = backend.verifyProof({ proof, publicInputs })
+```
+
+You can obviously chain this proof into another proof. In fact, if you're using recursive proofs, you're probably interested of using them this way!
+
+:::tip
+
+Managing circuits and "who does what" can be confusing. To make sure your naming is consistent, you can keep them in an object. For example:
+
+```js
+const circuits = {
+  main: mainJSON, 
+  recursive: recursiveJSON
+}
+const backends = {
+  main: new BarretenbergBackend(circuits.main),
+  recursive: new BarretenbergBackend(circuits.recursive)
+}
+const noir_programs = {
+  main: new Noir(circuits.main),
+  recursive: new Noir(circuits.recursive)
+}
+```
+
+This allows you to neatly call exactly the method you want without conflicting names:
+
+```js
+// Alice runs this 👇
+const { witness: mainWitness } = await noir_programs.main.execute(input)
+const proof = await backends.main.generateProof(mainWitness)
+
+// Bob runs this 👇
+const verified = await backends.main.verifyProof(proof)
+const { proofAsFields, vkAsFields, vkHash } = await backends.main.generateRecursiveProofArtifacts(
+    proof,
+    numPublicInputs,
+);
+const { witness: recursiveWitness } = await noir_programs.recursive.execute(recursiveInputs)
+const recursiveProof = await backends.recursive.generateProof(recursiveWitness);
+```
+
+:::
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/how-to-solidity-verifier.md b/docs/versioned_docs/version-v0.31.0/how_to/how-to-solidity-verifier.md
new file mode 100644
index 00000000000..e6ed9abaec6
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/how-to-solidity-verifier.md
@@ -0,0 +1,251 @@
+---
+title: Generate a Solidity Verifier
+description:
+  Learn how to run the verifier as a smart contract on the blockchain. Compile a Solidity verifier
+  contract for your Noir program and deploy it on any EVM blockchain acting as a verifier smart
+  contract. Read more to find out
+keywords:
+  [
+    solidity verifier,
+    smart contract,
+    blockchain,
+    compiler,
+    plonk_vk.sol,
+    EVM blockchain,
+    verifying Noir programs,
+    proving backend,
+    Barretenberg,
+  ]
+sidebar_position: 0
+pagination_next: tutorials/noirjs_app
+---
+
+Noir has the ability to generate a verifier contract in Solidity, which can be deployed in many EVM-compatible blockchains such as Ethereum.
+
+This allows for a powerful feature set, as one can make use of the conciseness and the privacy provided by Noir in an immutable ledger. Applications can range from simple P2P guessing games, to complex private DeFi interactions.
+
+This guide shows you how to generate a Solidity Verifier and deploy it on the [Remix IDE](https://remix.ethereum.org/). It is assumed that:
+
+- You are comfortable with the Solidity programming language and understand how contracts are deployed on the Ethereum network
+- You have Noir installed and you have a Noir program. If you don't, [get started](../getting_started/installation/index.md) with Nargo and the example Hello Noir circuit
+- You are comfortable navigating RemixIDE. If you aren't or you need a refresher, you can find some video tutorials [here](https://www.youtube.com/channel/UCjTUPyFEr2xDGN6Cg8nKDaA) that could help you.
+
+## Rundown
+
+Generating a Solidity Verifier contract is actually a one-command process. However, compiling it and deploying it can have some caveats. Here's the rundown of this guide:
+
+1. How to generate a solidity smart contract
+2. How to compile the smart contract in the RemixIDE
+3. How to deploy it to a testnet
+
+## Step 1 - Generate a contract
+
+This is by far the most straight-forward step. Just run:
+
+```sh
+nargo compile
+```
+
+This will compile your source code into a Noir build artifact to be stored in the `./target` directory, you can then generate the smart contract using the commands:
+
+```sh
+# Here we pass the path to the newly generated Noir artifact.
+bb write_vk -b ./target/<noir_artifact_name>.json
+bb contract
+```
+
+replacing `<noir_artifact_name>` with the name of your Noir project. A new `contract` folder would then be generated in your project directory, containing the Solidity
+file `contract.sol`. It can be deployed to any EVM blockchain acting as a verifier smart contract.
+
+:::info
+
+It is possible to generate verifier contracts of Noir programs for other smart contract platforms as long as the proving backend supplies an implementation.
+
+Barretenberg, the default proving backend for Nargo, supports generation of verifier contracts, for the time being these are only in Solidity.
+:::
+
+## Step 2 - Compiling
+
+We will mostly skip the details of RemixIDE, as the UI can change from version to version. For now, we can just open
+<a href="https://remix.ethereum.org" target="_blank">Remix</a> and create a blank workspace.
+
+![Create Workspace](@site/static/img/how-tos/solidity_verifier_1.png)
+
+We will create a new file to contain the contract Nargo generated, and copy-paste its content.
+
+:::warning
+
+You'll likely see a warning advising you to not trust pasted code. While it is an important warning, it is irrelevant in the context of this guide and can be ignored. We will not be deploying anywhere near a mainnet.
+
+:::
+
+To compile our the verifier, we can navigate to the compilation tab:
+
+![Compilation Tab](@site/static/img/how-tos/solidity_verifier_2.png)
+
+Remix should automatically match a suitable compiler version. However, hitting the "Compile" button will most likely generate a "Stack too deep" error:
+
+![Stack too deep](@site/static/img/how-tos/solidity_verifier_3.png)
+
+This is due to the verify function needing to put many variables on the stack, but enabling the optimizer resolves the issue. To do this, let's open the "Advanced Configurations" tab and enable optimization. The default 200 runs will suffice.
+
+:::info
+
+This time we will see a warning about an unused function parameter. This is expected, as the `verify` function doesn't use the `_proof` parameter inside a solidity block, it is loaded from calldata and used in assembly.
+
+:::
+
+![Compilation success](@site/static/img/how-tos/solidity_verifier_4.png)
+
+## Step 3 - Deploying
+
+At this point we should have a compiled contract read to deploy. If we navigate to the deploy section in Remix, we will see many different environments we can deploy to. The steps to deploy on each environment would be out-of-scope for this guide, so we will just use the default Remix VM.
+
+Looking closely, we will notice that our "Solidity Verifier" is actually three contracts working together:
+
+- An `UltraVerificationKey` library which simply stores the verification key for our circuit.
+- An abstract contract `BaseUltraVerifier` containing most of the verifying logic.
+- A main `UltraVerifier` contract that inherits from the Base and uses the Key contract.
+
+Remix will take care of the dependencies for us so we can simply deploy the UltraVerifier contract by selecting it and hitting "deploy":
+
+![Deploying UltraVerifier](@site/static/img/how-tos/solidity_verifier_5.png)
+
+A contract will show up in the "Deployed Contracts" section, where we can retrieve the Verification Key Hash. This is particularly useful for double-checking the deployer contract is the correct one.
+
+:::note
+
+Why "UltraVerifier"?
+
+To be precise, the Noir compiler (`nargo`) doesn't generate the verifier contract directly. It compiles the Noir code into an intermediate language (ACIR), which is then executed by the backend. So it is the backend that returns the verifier smart contract, not Noir.
+
+In this case, the Barretenberg Backend uses the UltraPlonk proving system, hence the "UltraVerifier" name.
+
+:::
+
+## Step 4 - Verifying
+
+To verify a proof using the Solidity verifier contract, we call the `verify` function in this extended contract:
+
+```solidity
+function verify(bytes calldata _proof, bytes32[] calldata _publicInputs) external view returns (bool)
+```
+
+When using the default example in the [Hello Noir](../getting_started/hello_noir/index.md) guide, the easiest way to confirm that the verifier contract is doing its job is by calling the `verify` function via remix with the required parameters. Note that the public inputs must be passed in separately to the rest of the proof so we must split the proof as returned from `bb`.
+
+First generate a proof with `bb` at the location `./proof` using the steps in [get started](../getting_started/hello_noir/index.md), this proof is in a binary format but we want to convert it into a hex string to pass into Remix, this can be done with the 
+
+```bash
+# This value must be changed to match the number of public inputs (including return values!) in your program.
+NUM_PUBLIC_INPUTS=1
+PUBLIC_INPUT_BYTES=32*NUM_PUBLIC_INPUTS
+HEX_PUBLIC_INPUTS=$(head -c $PUBLIC_INPUT_BYTES ./proof | od -An -v -t x1 | tr -d $' \n')
+HEX_PROOF=$(tail -c +$(($PUBLIC_INPUT_BYTES + 1)) ./proof | od -An -v -t x1 | tr -d $' \n')
+
+echo "Public inputs:"
+echo $HEX_PUBLIC_INPUTS
+
+echo "Proof:"
+echo "0x$HEX_PROOF"
+```
+
+Remix expects that the public inputs will be split into an array of `bytes32` values so `HEX_PUBLIC_INPUTS` needs to be split up into 32 byte chunks which are prefixed with `0x` accordingly.
+
+A programmatic example of how the `verify` function is called can be seen in the example zk voting application [here](https://github.com/noir-lang/noir-examples/blob/33e598c257e2402ea3a6b68dd4c5ad492bce1b0a/foundry-voting/src/zkVote.sol#L35):
+
+```solidity
+function castVote(bytes calldata proof, uint proposalId, uint vote, bytes32 nullifierHash) public returns (bool) {
+  // ...
+  bytes32[] memory publicInputs = new bytes32[](4);
+  publicInputs[0] = merkleRoot;
+  publicInputs[1] = bytes32(proposalId);
+  publicInputs[2] = bytes32(vote);
+  publicInputs[3] = nullifierHash;
+  require(verifier.verify(proof, publicInputs), "Invalid proof");
+```
+
+:::info[Return Values]
+
+A circuit doesn't have the concept of a return value. Return values are just syntactic sugar in Noir.
+
+Under the hood, the return value is passed as an input to the circuit and is checked at the end of the circuit program.
+
+For example, if you have Noir program like this:
+
+```rust
+fn main(
+    // Public inputs
+    pubkey_x: pub Field,
+    pubkey_y: pub Field,
+    // Private inputs
+    priv_key: Field,
+) -> pub Field
+```
+
+the `verify` function will expect the public inputs array (second function parameter) to be of length 3, the two inputs and the return value.
+
+Passing only two inputs will result in an error such as `PUBLIC_INPUT_COUNT_INVALID(3, 2)`.
+
+In this case, the inputs parameter to `verify` would be an array ordered as `[pubkey_x, pubkey_y, return`.
+
+:::
+
+:::tip[Structs]
+
+You can pass structs to the verifier contract. They will be flattened so that the array of inputs is 1-dimensional array.
+
+For example, consider the following program:
+
+```rust
+struct Type1 {
+  val1: Field,
+  val2: Field,
+}
+
+struct Nested {
+  t1: Type1,
+  is_true: bool,
+}
+
+fn main(x: pub Field, nested: pub Nested, y: pub Field) {
+  //...
+}
+```
+
+The order of these inputs would be flattened to: `[x, nested.t1.val1, nested.t1.val2, nested.is_true, y]`
+
+:::
+
+The other function you can call is our entrypoint `verify` function, as defined above.
+
+:::tip
+
+It's worth noticing that the `verify` function is actually a `view` function. A `view` function does not alter the blockchain state, so it doesn't need to be distributed (i.e. it will run only on the executing node), and therefore doesn't cost any gas.
+
+This can be particularly useful in some situations. If Alice generated a proof and wants Bob to verify its correctness, Bob doesn't need to run Nargo, NoirJS, or any Noir specific infrastructure. He can simply make a call to the blockchain with the proof and verify it is correct without paying any gas.
+
+It would be incorrect to say that a Noir proof verification costs any gas at all. However, most of the time the result of `verify` is used to modify state (for example, to update a balance, a game state, etc). In that case the whole network needs to execute it, which does incur gas costs (calldata and execution, but not storage).
+
+:::
+
+## A Note on EVM chains
+
+Noir proof verification requires the ecMul, ecAdd and ecPairing precompiles. Not all EVM chains support EC Pairings, notably some of the ZK-EVMs. This means that you won't be able to use the verifier contract in all of them. You can find an incomplete list of which EVM chains support these precompiles [here](https://www.evmdiff.com/features?feature=precompiles).
+
+For example, chains like `zkSync ERA` and `Polygon zkEVM` do not currently support these precompiles, so proof verification via Solidity verifier contracts won't work. Here's a quick list of EVM chains that have been tested and are known to work:
+
+- Optimism
+- Arbitrum
+- Polygon PoS
+- Scroll
+- Celo
+
+If you test any other chains, please open a PR on this page to update the list. See [this doc](https://github.com/noir-lang/noir-starter/tree/main/with-foundry#testing-on-chain) for more info about testing verifier contracts on different EVM chains.
+
+## What's next
+
+Now that you know how to call a Noir Solidity Verifier on a smart contract using Remix, you should be comfortable with using it with some programmatic frameworks, such as [hardhat](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat) and [foundry](https://github.com/noir-lang/noir-starter/tree/main/with-foundry).
+
+You can find other tools, examples, boilerplates and libraries in the [awesome-noir](https://github.com/noir-lang/awesome-noir) repository.
+
+You should also be ready to write and deploy your first NoirJS app and start generating proofs on websites, phones, and NodeJS environments! Head on to the [NoirJS tutorial](../tutorials/noirjs_app.md) to learn how to do that.
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/merkle-proof.mdx b/docs/versioned_docs/version-v0.31.0/how_to/merkle-proof.mdx
new file mode 100644
index 00000000000..0a128adb2de
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/merkle-proof.mdx
@@ -0,0 +1,48 @@
+---
+title: Prove Merkle Tree Membership
+description:
+  Learn how to use merkle membership proof in Noir to prove that a given leaf is a member of a
+  merkle tree with a specified root, at a given index.
+keywords:
+  [merkle proof, merkle membership proof, Noir, rust, hash function, Pedersen, sha256, merkle tree]
+sidebar_position: 4
+---
+
+Let's walk through an example of a merkle membership proof in Noir that proves that a given leaf is
+in a merkle tree.
+
+```rust
+
+fn main(message : [Field; 62], index : Field, hashpath : [Field; 40], root : Field) {
+    let leaf = std::hash::hash_to_field(message.as_slice());
+    let merkle_root = std::merkle::compute_merkle_root(leaf, index, hashpath);
+    assert(merkle_root == root);
+}
+
+```
+
+The message is hashed using `hash_to_field`. The specific hash function that is being used is chosen
+by the backend. The only requirement is that this hash function can heuristically be used as a
+random oracle. If only collision resistance is needed, then one can call `std::hash::pedersen_hash`
+instead.
+
+```rust
+let leaf = std::hash::hash_to_field(message.as_slice());
+```
+
+The leaf is then passed to a compute_merkle_root function with the root, index and hashpath. The returned root can then be asserted to be the same as the provided root.
+
+```rust
+let merkle_root = std::merkle::compute_merkle_root(leaf, index, hashpath);
+assert (merkle_root == root);
+```
+
+> **Note:** It is possible to re-implement the merkle tree implementation without standard library.
+> However, for most usecases, it is enough. In general, the standard library will always opt to be
+> as conservative as possible, while striking a balance with efficiency.
+
+An example, the merkle membership proof, only requires a hash function that has collision
+resistance, hence a hash function like Pedersen is allowed, which in most cases is more efficient
+than the even more conservative sha256.
+
+[View an example on the starter repo](https://github.com/noir-lang/noir-examples/blob/3ea09545cabfa464124ec2f3ea8e60c608abe6df/stealthdrop/circuits/src/main.nr#L20)
diff --git a/docs/versioned_docs/version-v0.31.0/how_to/using-devcontainers.mdx b/docs/versioned_docs/version-v0.31.0/how_to/using-devcontainers.mdx
new file mode 100644
index 00000000000..727ec6ca667
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/how_to/using-devcontainers.mdx
@@ -0,0 +1,110 @@
+---
+title: Developer Containers and Codespaces
+description: "Learn how to set up a devcontainer in your GitHub repository for a seamless coding experience with Codespaces. Follow our easy 8-step guide to create your own Noir environment without installing Nargo locally."
+keywords: ["Devcontainer", "Codespaces", "GitHub", "Noir Environment", "Docker Image", "Development Environment", "Remote Coding", "GitHub Codespaces", "Noir Programming", "Nargo", "VSCode Extensions", "Noirup"]
+sidebar_position: 1
+---
+
+Adding a developer container configuration file to your Noir project is one of the easiest way to unlock coding in browser.
+
+## What's a devcontainer after all?
+
+A [Developer Container](https://containers.dev/) (devcontainer for short) is a Docker image that comes preloaded with tools, extensions, and other tools you need to quickly get started or continue a project, without having to install Nargo locally. Think of it as a development environment in a box.
+
+There are many advantages to this:
+
+- It's platform and architecture agnostic
+- You don't need to have an IDE installed, or Nargo, or use a terminal at all
+- It's safer for using on a public machine or public network
+
+One of the best ways of using devcontainers is... not using your machine at all, for maximum control, performance, and ease of use.
+Enter Codespaces.
+
+## Codespaces
+
+If a devcontainer is just a Docker image, then what stops you from provisioning a `p3dn.24xlarge` AWS EC2 instance with 92 vCPUs and 768 GiB RAM and using it to prove your 10-gate SNARK proof? 
+
+Nothing! Except perhaps the 30-40$ per hour it will cost you. 
+
+The problem is that provisioning takes time, and I bet you don't want to see the AWS console every time you want to code something real quick.
+
+Fortunately, there's an easy and free way to get a decent remote machine ready and loaded in less than 2 minutes: Codespaces. [Codespaces is a Github feature](https://github.com/features/codespaces) that allows you to code in a remote machine by using devcontainers, and it's pretty cool:
+
+- You can start coding Noir in less than a minute
+- It uses the resources of a remote machine, so you can code on your grandma's phone if needed be
+- It makes it easy to share work with your frens
+- It's fully reusable, you can stop and restart whenever you need to
+
+:::info
+
+Don't take out your wallet just yet. Free GitHub accounts get about [15-60 hours of coding](https://github.com/features/codespaces) for free per month, depending on the size of your provisioned machine.
+
+:::
+
+## Tell me it's _actually_ easy
+
+It is!
+
+Github comes with a default codespace and you can use it to code your own devcontainer. That's exactly what we will be doing in this guide.
+
+<video width="100%" height="auto" controls>
+  <source src={require('@site/static/video/how-tos/devcontainer.mp4').default} type="video/mp4" />
+  Your browser does not support the video tag.
+</video>
+
+8 simple steps:
+
+#### 1. <a href="https://github.com/new" target="_blank">Create a new repository</a> on GitHub.
+
+#### 2. Click "Start coding with Codespaces". This will use the default image.
+
+#### 3. Create a folder called `.devcontainer` in the root of your repository.
+
+#### 4. Create a Dockerfile in that folder, and paste the following code:
+
+```docker
+FROM --platform=linux/amd64 node:lts-bookworm-slim
+SHELL ["/bin/bash", "-c"]
+RUN apt update && apt install -y curl bash git tar gzip libc++-dev
+RUN curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
+ENV PATH="/root/.nargo/bin:$PATH"
+RUN noirup
+ENTRYPOINT ["nargo"]
+```
+#### 5. Create a file called `devcontainer.json` in the same folder, and paste the following code:
+
+```json
+{
+ "name": "Noir on Codespaces",
+ "build": {
+    "context": ".",
+    "dockerfile": "Dockerfile"
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": ["noir-lang.vscode-noir"]
+    }
+  }
+}
+```
+#### 6. Commit and push your changes
+
+This will pull the new image and build it, so it could take a minute or so
+
+#### 8. Done! 
+Just wait for the build to finish, and there's your easy Noir environment.
+
+
+Refer to [noir-starter](https://github.com/noir-lang/noir-starter/) as an example of how devcontainers can be used together with codespaces.
+
+
+
+## How do I use it?
+
+Using the codespace is obviously much easier than setting it up. 
+Just navigate to your repository and click "Code" -> "Open with Codespaces". It should take a few seconds to load, and you're ready to go.
+
+:::info
+
+If you really like the experience, you can add a badge to your readme, links to existing codespaces, and more. 
+Check out the [official docs](https://docs.github.com/en/codespaces/setting-up-your-project-for-codespaces/setting-up-your-repository/facilitating-quick-creation-and-resumption-of-codespaces) for more info.
diff --git a/docs/versioned_docs/version-v0.31.0/index.mdx b/docs/versioned_docs/version-v0.31.0/index.mdx
new file mode 100644
index 00000000000..a6bd306f91d
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/index.mdx
@@ -0,0 +1,67 @@
+---
+title: Noir Lang
+hide_title: true
+description:
+  Learn about the public alpha release of Noir, a domain specific language heavily influenced by Rust that compiles to
+  an intermediate language which can be compiled to an arithmetic circuit or a rank-1 constraint system.
+keywords:
+    [Noir,
+    Domain Specific Language,
+    Rust,
+    Intermediate Language,
+    Arithmetic Circuit,
+    Rank-1 Constraint System,
+    Ethereum Developers,
+    Protocol Developers,
+    Blockchain Developers,
+    Proving System,
+    Smart Contract Language]
+sidebar_position: 0
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+<img src={require("@site/static/img/logo.png").default} style={{display: "block", width: "50%", margin: "2rem auto"}} alt="Noir Logo"  />
+
+Noir is an open-source Domain-Specific Language for safe and seamless construction of privacy-preserving Zero-Knowledge programs, requiring no previous knowledge on the underlying mathematics or cryptography.
+
+ZK programs are programs that can generate short proofs of statements without revealing all inputs to the statements. You can read more about Zero-Knowledge Proofs [here](https://dev.to/spalladino/a-beginners-intro-to-coding-zero-knowledge-proofs-c56).
+
+## What's new about Noir?
+
+Noir works differently from most ZK languages by taking a two-pronged path. First, it compiles the program to an adaptable intermediate language known as ACIR. From there, depending on a given project's needs, ACIR can be further compiled into an arithmetic circuit for integration with the proving backend.
+
+:::info
+
+Noir is backend agnostic, which means it makes no assumptions on which proving backend powers the ZK proof. Being the language that powers [Aztec Contracts](https://docs.aztec.network/developers/contracts/main), it defaults to Aztec's Barretenberg proving backend.
+
+However, the ACIR output can be transformed to be compatible with other PLONK-based backends, or into a [rank-1 constraint system](https://www.rareskills.io/post/rank-1-constraint-system) suitable for backends such as Arkwork's Marlin.
+
+:::
+
+## Who is Noir for?
+
+Noir can be used both in complex cloud-based backends and in user's smartphones, requiring no knowledge on the underlying math or cryptography. From authorization systems that keep a password in the user's device, to complex on-chain verification of recursive proofs, Noir is designed to abstract away complexity without any significant overhead. Here are some examples of situations where Noir can be used:
+
+<Tabs>
+  <TabItem value="Aztec Contracts" label="Aztec Contracts" default>
+    <img src={require("@site/static/img/aztec_logo.png").default} style={{display: "block", width: "50%", margin: "2rem auto"}} alt="Noir Logo"  />
+    
+    Aztec Contracts leverage Noir to allow for the storage and execution of private information. Writing an Aztec Contract is as easy as writing Noir, and Aztec developers can easily interact with the network storage and execution through the [Aztec.nr](https://docs.aztec.network/developers/contracts/main) library.
+  </TabItem>
+  <TabItem value="Solidity Verifiers" label="Solidity Verifiers">
+    <img src={require("@site/static/img/solidity_verifier_ex.png").default} style={{display: "block", margin: "2rem auto"}} alt="Soliditry Verifier Example"  />
+    Noir can auto-generate Solidity verifier contracts that verify Noir proofs. This allows for non-interactive verification of proofs containing private information in an immutable system. This feature powers a multitude of use-case scenarios, from P2P chess tournaments, to [Aztec Layer-2 Blockchain](https://docs.aztec.network/)
+  </TabItem>
+  <TabItem value="Full-Stack Development" label="Full-Stack Development">
+    Aztec Labs developed NoirJS, an easy interface to generate and verify Noir proofs in a Javascript environment. This allows for Noir to be used in webpages, mobile apps, games, and any other environment supporting JS execution in a standalone manner.
+  </TabItem>
+</Tabs>
+
+
+## Libraries
+
+Noir is meant to be easy to extend by simply importing Noir libraries just like in Rust. 
+The [awesome-noir repo](https://github.com/noir-lang/awesome-noir#libraries) is a collection of libraries developed by the Noir community.
+Writing a new library is easy and makes code be composable and easy to reuse. See the section on [dependencies](noir/modules_packages_crates/dependencies.md) for more information.
diff --git a/docs/versioned_docs/version-v0.31.0/migration_notes.md b/docs/versioned_docs/version-v0.31.0/migration_notes.md
new file mode 100644
index 00000000000..6bd740024e5
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/migration_notes.md
@@ -0,0 +1,105 @@
+---
+title: Migration notes
+description: Read about migration notes from previous versions, which could solve problems while updating
+keywords: [Noir, notes, migration, updating, upgrading]
+---
+
+Noir is in full-speed development. Things break fast, wild, and often. This page attempts to leave some notes on errors you might encounter when upgrading and how to resolve them until proper patches are built.
+
+### `backend encountered an error: libc++.so.1`
+
+Depending on your OS, you may encounter the following error when running `nargo prove` for the first time:
+
+```text
+The backend encountered an error: "/home/codespace/.nargo/backends/acvm-backend-barretenberg/backend_binary: error while loading shared libraries: libc++.so.1: cannot open shared object file: No such file or directory\n"
+```
+
+Install the `libc++-dev` library with:
+
+```bash
+sudo apt install libc++-dev
+```
+
+## ≥0.19
+
+### Enforcing `compiler_version`
+
+From this version on, the compiler will check for the `compiler_version` field in `Nargo.toml`, and will error if it doesn't match the current Nargo version in use.
+
+To update, please make sure this field in `Nargo.toml` matches the output of `nargo --version`.
+
+## ≥0.14
+
+The index of the [for loops](noir/concepts/control_flow.md#loops) is now of type `u64` instead of `Field`. An example refactor would be:
+
+```rust
+for i in 0..10 {
+    let i = i as Field;
+}
+```
+
+## ≥v0.11.0 and Nargo backend
+
+From this version onwards, Nargo starts managing backends through the `nargo backend` command. Upgrading to the versions per usual steps might lead to:
+
+### `backend encountered an error`
+
+This is likely due to the existing locally installed version of proving backend (e.g. barretenberg) is incompatible with the version of Nargo in use.
+
+To fix the issue:
+
+1. Uninstall the existing backend
+
+```bash
+nargo backend uninstall acvm-backend-barretenberg
+```
+
+You may replace _acvm-backend-barretenberg_ with the name of your backend listed in `nargo backend ls` or in ~/.nargo/backends.
+
+2. Reinstall a compatible version of the proving backend.
+
+If you are using the default barretenberg backend, simply run:
+
+```
+nargo prove
+```
+
+with your Noir program.
+
+This will trigger the download and installation of the latest version of barretenberg compatible with your Nargo in use.
+
+### `backend encountered an error: illegal instruction`
+
+On certain Intel-based systems, an `illegal instruction` error may arise due to incompatibility of barretenberg with certain CPU instructions.
+
+To fix the issue:
+
+1. Uninstall the existing backend
+
+```bash
+nargo backend uninstall acvm-backend-barretenberg
+```
+
+You may replace _acvm-backend-barretenberg_ with the name of your backend listed in `nargo backend ls` or in ~/.nargo/backends.
+
+2. Reinstall a compatible version of the proving backend.
+
+If you are using the default barretenberg backend, simply run:
+
+```
+nargo backend install acvm-backend-barretenberg https://github.com/noir-lang/barretenberg-js-binary/raw/master/run-bb.tar.gz
+```
+
+This downloads and installs a specific bb.js based version of barretenberg binary from GitHub.
+
+The gzipped file is running [this bash script](https://github.com/noir-lang/barretenberg-js-binary/blob/master/run-bb-js.sh), where we need to gzip it as the Nargo currently expect the backend to be zipped up.
+
+Then run:
+
+```
+DESIRED_BINARY_VERSION=0.8.1 nargo info
+```
+
+This overrides the bb native binary with a bb.js node application instead, which should be compatible with most if not all hardware. This does come with the drawback of being generally slower than native binary.
+
+0.8.1 indicates bb.js version 0.8.1, so if you change that it will update to a different version or the default version in the script if none was supplied.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/_category_.json b/docs/versioned_docs/version-v0.31.0/noir/concepts/_category_.json
new file mode 100644
index 00000000000..7da08f8a8c5
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Concepts",
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/assert.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/assert.md
new file mode 100644
index 00000000000..bcff613a695
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/assert.md
@@ -0,0 +1,45 @@
+---
+title: Assert Function
+description:
+  Learn about the assert function in Noir, which can be used to explicitly constrain the predicate or
+  comparison expression that follows to be true, and what happens if the expression is false at
+  runtime.
+keywords: [Noir programming language, assert statement, predicate expression, comparison expression]
+sidebar_position: 4
+---
+
+Noir includes a special `assert` function which will explicitly constrain the predicate/comparison
+expression that follows to be true. If this expression is false at runtime, the program will fail to
+be proven. Example:
+
+```rust
+fn main(x : Field, y : Field) {
+    assert(x == y);
+}
+```
+
+> Assertions only work for predicate operations, such as `==`. If there's any ambiguity on the operation, the program will fail to compile. For example, it is unclear if `assert(x + y)` would check for `x + y == 0` or simply would return `true`.
+
+You can optionally provide a message to be logged when the assertion fails:
+
+```rust
+assert(x == y, "x and y are not equal");
+```
+
+Aside string literals, the optional message can be a format string or any other type supported as input for Noir's [print](../standard_library/logging.md) functions. This feature lets you incorporate runtime variables into your failed assertion logs:
+
+```rust
+assert(x == y, f"Expected x == y, but got {x} == {y}");
+```
+
+Using a variable as an assertion message directly:
+
+```rust
+struct myStruct {
+  myField: Field
+}
+
+let s = myStruct { myField: y };
+assert(s.myField == x, s);
+```
+
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/comments.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/comments.md
new file mode 100644
index 00000000000..b51a85f5c94
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/comments.md
@@ -0,0 +1,33 @@
+---
+title: Comments
+description:
+  Learn how to write comments in Noir programming language. A comment is a line of code that is
+  ignored by the compiler, but it can be read by programmers. Single-line and multi-line comments
+  are supported in Noir.
+keywords: [Noir programming language, comments, single-line comments, multi-line comments]
+sidebar_position: 10
+---
+
+A comment is a line in your codebase which the compiler ignores, however it can be read by
+programmers.
+
+Here is a single line comment:
+
+```rust
+// This is a comment and is ignored
+```
+
+`//` is used to tell the compiler to ignore the rest of the line.
+
+Noir also supports multi-line block comments. Start a block comment with `/*` and end the block with `*/`.
+
+Noir does not natively support doc comments. You may be able to use [Rust doc comments](https://doc.rust-lang.org/reference/comments.html) in your code to leverage some Rust documentation build tools with Noir code.
+
+```rust
+/*
+  This is a block comment describing a complex function.
+*/
+fn main(x : Field, y : pub Field) {
+    assert(x != y);
+}
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/control_flow.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/control_flow.md
new file mode 100644
index 00000000000..045d3c3a5f5
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/control_flow.md
@@ -0,0 +1,77 @@
+---
+title: Control Flow
+description:
+  Learn how to use loops and if expressions in the Noir programming language. Discover the syntax
+  and examples for for loops and if-else statements.
+keywords: [Noir programming language, loops, for loop, if-else statements, Rust syntax]
+sidebar_position: 2
+---
+
+## If Expressions
+
+Noir supports `if-else` statements. The syntax is most similar to Rust's where it is not required
+for the statement's conditional to be surrounded by parentheses.
+
+```rust
+let a = 0;
+let mut x: u32 = 0;
+
+if a == 0 {
+    if a != 0 {
+        x = 6;
+    } else {
+        x = 2;
+    }
+} else {
+    x = 5;
+    assert(x == 5);
+}
+assert(x == 2);
+```
+
+## Loops
+
+Noir has one kind of loop: the `for` loop. `for` loops allow you to repeat a block of code multiple
+times.
+
+The following block of code between the braces is run 10 times.
+
+```rust
+for i in 0..10 {
+    // do something
+}
+```
+
+The index for loops is of type `u64`.
+
+### Break and Continue
+
+In unconstrained code, `break` and `continue` are also allowed in `for` loops. These are only allowed
+in unconstrained code since normal constrained code requires that Noir knows exactly how many iterations
+a loop may have. `break` and `continue` can be used like so:
+
+```rust
+for i in 0 .. 10 {
+    println("Iteration start")
+
+    if i == 2 {
+        continue;
+    }
+
+    if i == 5 {
+        break;
+    }
+
+    println(i);
+}
+println("Loop end")
+```
+
+When used, `break` will end the current loop early and jump to the statement after the for loop. In the example
+above, the `break` will stop the loop and jump to the `println("Loop end")`.
+
+`continue` will stop the current iteration of the loop, and jump to the start of the next iteration. In the example
+above, `continue` will jump to `println("Iteration start")` when used. Note that the loop continues as normal after this.
+The iteration variable `i` is still increased by one as normal when `continue` is used.
+
+`break` and `continue` cannot currently be used to jump out of more than a single loop at a time.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_bus.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_bus.md
new file mode 100644
index 00000000000..e54fc861257
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_bus.md
@@ -0,0 +1,21 @@
+---
+title: Data Bus
+sidebar_position: 13
+---
+**Disclaimer** this feature is experimental, do not use it!
+
+The data bus is an optimization that the backend can use to make recursion more efficient.
+In order to use it, you must define some inputs of the program entry points (usually the `main()`
+function) with the `call_data` modifier, and the return values with the `return_data` modifier.
+These modifiers are incompatible with `pub` and `mut` modifiers.
+
+## Example
+
+```rust
+fn main(mut x: u32, y: call_data u32, z: call_data [u32;4] ) -> return_data u32 {
+  let a = z[x];
+  a+y
+}
+```
+
+As a result, both call_data and return_data will be treated as private inputs and encapsulated into a read-only array each, for the backend to process.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/_category_.json b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/_category_.json
new file mode 100644
index 00000000000..5d694210bbf
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/arrays.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/arrays.md
new file mode 100644
index 00000000000..95d749053e2
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/arrays.md
@@ -0,0 +1,253 @@
+---
+title: Arrays
+description:
+  Dive into the Array data type in Noir. Grasp its methods, practical examples, and best practices for efficiently using Arrays in your Noir code.
+keywords:
+  [
+    noir,
+    array type,
+    methods,
+    examples,
+    indexing,
+  ]
+sidebar_position: 4
+---
+
+An array is one way of grouping together values into one compound type. Array types can be inferred
+or explicitly specified via the syntax `[<Type>; <Size>]`:
+
+```rust
+fn main(x : Field, y : Field) {
+    let my_arr = [x, y];
+    let your_arr: [Field; 2] = [x, y];
+}
+```
+
+Here, both `my_arr` and `your_arr` are instantiated as an array containing two `Field` elements.
+
+Array elements can be accessed using indexing:
+
+```rust
+fn main() {
+    let a = [1, 2, 3, 4, 5];
+
+    let first = a[0];
+    let second = a[1];
+}
+```
+
+All elements in an array must be of the same type (i.e. homogeneous). That is, an array cannot group
+a `Field` value and a `u8` value together for example.
+
+You can write mutable arrays, like:
+
+```rust
+fn main() {
+    let mut arr = [1, 2, 3, 4, 5];
+    assert(arr[0] == 1);
+
+    arr[0] = 42;
+    assert(arr[0] == 42);
+}
+```
+
+You can instantiate a new array of a fixed size with the same value repeated for each element. The following example instantiates an array of length 32 where each element is of type Field and has the value 0.
+
+```rust
+let array: [Field; 32] = [0; 32];
+```
+
+Like in Rust, arrays in Noir are a fixed size. However, if you wish to convert an array to a [slice](./slices.mdx), you can just call `as_slice` on your array:
+
+```rust
+let array: [Field; 32] = [0; 32];
+let sl = array.as_slice()
+```
+
+You can define multidimensional arrays:
+
+```rust
+let array : [[Field; 2]; 2];
+let element = array[0][0];
+```
+
+However, multidimensional slices are not supported. For example, the following code will error at compile time:
+
+```rust
+let slice : [[Field]] = &[];
+```
+
+## Types
+
+You can create arrays of primitive types or structs. There is not yet support for nested arrays
+(arrays of arrays) or arrays of structs that contain arrays.
+
+## Methods
+
+For convenience, the STD provides some ready-to-use, common methods for arrays.
+Each of these functions are located within the generic impl `impl<T, N> [T; N] {`.
+So anywhere `self` appears, it refers to the variable `self: [T; N]`.
+
+### len
+
+Returns the length of an array
+
+```rust
+fn len(self) -> Field
+```
+
+example
+
+```rust
+fn main() {
+    let array = [42, 42];
+    assert(array.len() == 2);
+}
+```
+
+### sort
+
+Returns a new sorted array. The original array remains untouched. Notice that this function will
+only work for arrays of fields or integers, not for any arbitrary type. This is because the sorting
+logic it uses internally is optimized specifically for these values. If you need a sort function to
+sort any type, you should use the function `sort_via` described below.
+
+```rust
+fn sort(self) -> [T; N]
+```
+
+example
+
+```rust
+fn main() {
+    let arr = [42, 32];
+    let sorted = arr.sort();
+    assert(sorted == [32, 42]);
+}
+```
+
+### sort_via
+
+Sorts the array with a custom comparison function
+
+```rust
+fn sort_via(self, ordering: fn(T, T) -> bool) -> [T; N]
+```
+
+example
+
+```rust
+fn main() {
+    let arr = [42, 32]
+    let sorted_ascending = arr.sort_via(|a, b| a < b);
+    assert(sorted_ascending == [32, 42]); // verifies
+
+    let sorted_descending = arr.sort_via(|a, b| a > b);
+    assert(sorted_descending == [32, 42]); // does not verify
+}
+```
+
+### map
+
+Applies a function to each element of the array, returning a new array containing the mapped elements.
+
+```rust
+fn map<U>(self, f: fn(T) -> U) -> [U; N]
+```
+
+example
+
+```rust
+let a = [1, 2, 3];
+let b = a.map(|a| a * 2); // b is now [2, 4, 6]
+```
+
+### fold
+
+Applies a function to each element of the array, returning the final accumulated value. The first
+parameter is the initial value.
+
+```rust
+fn fold<U>(self, mut accumulator: U, f: fn(U, T) -> U) -> U
+```
+
+This is a left fold, so the given function will be applied to the accumulator and first element of
+the array, then the second, and so on. For a given call the expected result would be equivalent to:
+
+```rust
+let a1 = [1];
+let a2 = [1, 2];
+let a3 = [1, 2, 3];
+
+let f = |a, b| a - b;
+a1.fold(10, f)  //=> f(10, 1)
+a2.fold(10, f)  //=> f(f(10, 1), 2)
+a3.fold(10, f)  //=> f(f(f(10, 1), 2), 3)
+```
+
+example:
+
+```rust
+
+fn main() {
+    let arr = [2, 2, 2, 2, 2];
+    let folded = arr.fold(0, |a, b| a + b);
+    assert(folded == 10);
+}
+
+```
+
+### reduce
+
+Same as fold, but uses the first element as starting element.
+
+```rust
+fn reduce(self, f: fn(T, T) -> T) -> T
+```
+
+example:
+
+```rust
+fn main() {
+    let arr = [2, 2, 2, 2, 2];
+    let reduced = arr.reduce(|a, b| a + b);
+    assert(reduced == 10);
+}
+```
+
+### all
+
+Returns true if all the elements satisfy the given predicate
+
+```rust
+fn all(self, predicate: fn(T) -> bool) -> bool
+```
+
+example:
+
+```rust
+fn main() {
+    let arr = [2, 2, 2, 2, 2];
+    let all = arr.all(|a| a == 2);
+    assert(all);
+}
+```
+
+### any
+
+Returns true if any of the elements satisfy the given predicate
+
+```rust
+fn any(self, predicate: fn(T) -> bool) -> bool
+```
+
+example:
+
+```rust
+fn main() {
+    let arr = [2, 2, 2, 2, 5];
+    let any = arr.any(|a| a == 5);
+    assert(any);
+}
+
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/booleans.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/booleans.md
new file mode 100644
index 00000000000..2507af710e7
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/booleans.md
@@ -0,0 +1,28 @@
+---
+title: Booleans
+description:
+  Delve into the Boolean data type in Noir. Understand its methods, practical examples, and best practices for using Booleans in your Noir programs.
+keywords:
+  [
+    noir,
+    boolean type,
+    methods,
+    examples,
+    logical operations,
+  ]
+sidebar_position: 2
+---
+
+
+The `bool` type in Noir has two possible values: `true` and `false`:
+
+```rust
+fn main() {
+    let t = true;
+    let f: bool = false;
+}
+```
+
+The boolean type is most commonly used in conditionals like `if` expressions and `assert`
+statements. More about conditionals is covered in the [Control Flow](../control_flow.md) and
+[Assert Function](../assert.md) sections.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/fields.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/fields.md
new file mode 100644
index 00000000000..a10a4810788
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/fields.md
@@ -0,0 +1,192 @@
+---
+title: Fields
+description:
+  Dive deep into the Field data type in Noir. Understand its methods, practical examples, and best practices to effectively use Fields in your Noir programs.
+keywords:
+  [
+    noir,
+    field type,
+    methods,
+    examples,
+    best practices,
+  ]
+sidebar_position: 0
+---
+
+The field type corresponds to the native field type of the proving backend.
+
+The size of a Noir field depends on the elliptic curve's finite field for the proving backend
+adopted. For example, a field would be a 254-bit integer when paired with the default backend that
+spans the Grumpkin curve.
+
+Fields support integer arithmetic and are often used as the default numeric type in Noir:
+
+```rust
+fn main(x : Field, y : Field)  {
+    let z = x + y;
+}
+```
+
+`x`, `y` and `z` are all private fields in this example. Using the `let` keyword we defined a new
+private value `z` constrained to be equal to `x + y`.
+
+If proving efficiency is of priority, fields should be used as a default for solving problems.
+Smaller integer types (e.g. `u64`) incur extra range constraints.
+
+## Methods
+
+After declaring a Field, you can use these common methods on it:
+
+### to_le_bits
+
+Transforms the field into an array of bits, Little Endian.
+
+```rust
+fn to_le_bits(_x : Field, _bit_size: u32) -> [u1]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bits = field.to_le_bits(32);
+}
+```
+
+### to_be_bits
+
+Transforms the field into an array of bits, Big Endian.
+
+```rust
+fn to_be_bits(_x : Field, _bit_size: u32) -> [u1]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bits = field.to_be_bits(32);
+}
+```
+
+### to_le_bytes
+
+Transforms into an array of bytes, Little Endian
+
+```rust
+fn to_le_bytes(_x : Field, byte_size: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bytes = field.to_le_bytes(4);
+}
+```
+
+### to_be_bytes
+
+Transforms into an array of bytes, Big Endian
+
+```rust
+fn to_be_bytes(_x : Field, byte_size: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let bytes = field.to_be_bytes(4);
+}
+```
+
+### to_le_radix
+
+Decomposes into a vector over the specified base, Little Endian
+
+```rust
+fn to_le_radix(_x : Field, _radix: u32, _result_len: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let radix = field.to_le_radix(256, 4);
+}
+```
+
+### to_be_radix
+
+Decomposes into a vector over the specified base, Big Endian
+
+```rust
+fn to_be_radix(_x : Field, _radix: u32, _result_len: u32) -> [u8]
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2;
+    let radix = field.to_be_radix(256, 4);
+}
+```
+
+### pow_32
+
+Returns the value to the power of the specified exponent
+
+```rust
+fn pow_32(self, exponent: Field) -> Field
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2
+    let pow = field.pow_32(4);
+    assert(pow == 16);
+}
+```
+
+### assert_max_bit_size
+
+Adds a constraint to specify that the field can be represented with `bit_size` number of bits
+
+```rust
+fn assert_max_bit_size(self, bit_size: u32)
+```
+
+example:
+
+```rust
+fn main() {
+    let field = 2
+    field.assert_max_bit_size(32);
+}
+```
+
+### sgn0
+
+Parity of (prime) Field element, i.e. sgn0(x mod p) = 0 if x ∈ \{0, ..., p-1\} is even, otherwise sgn0(x mod p) = 1.
+
+```rust
+fn sgn0(self) -> u1
+```
+
+
+### lt
+
+Returns true if the field is less than the other field
+
+```rust
+pub fn lt(self, another: Field) -> bool
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/function_types.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/function_types.md
new file mode 100644
index 00000000000..f6121af17e2
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/function_types.md
@@ -0,0 +1,26 @@
+---
+title: Function types
+sidebar_position: 10
+---
+
+Noir supports higher-order functions. The syntax for a function type is as follows:
+
+```rust
+fn(arg1_type, arg2_type, ...) -> return_type
+```
+
+Example:
+
+```rust
+fn assert_returns_100(f: fn() -> Field) { // f takes no args and returns a Field
+    assert(f() == 100);
+}
+
+fn main() {
+    assert_returns_100(|| 100); // ok
+    assert_returns_100(|| 150); // fails
+}
+```
+
+A function type also has an optional capture environment - this is necessary to support closures.
+See [Lambdas](../lambdas.md) for more details.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/index.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/index.md
new file mode 100644
index 00000000000..357813c147a
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/index.md
@@ -0,0 +1,110 @@
+---
+title: Data Types
+description:
+  Get a clear understanding of the two categories of Noir data types - primitive types and compound
+  types. Learn about their characteristics, differences, and how to use them in your Noir
+  programming.
+keywords:
+  [
+    noir,
+    data types,
+    primitive types,
+    compound types,
+    private types,
+    public types,
+  ]
+---
+
+Every value in Noir has a type, which determines which operations are valid for it.
+
+All values in Noir are fundamentally composed of `Field` elements. For a more approachable
+developing experience, abstractions are added on top to introduce different data types in Noir.
+
+Noir has two category of data types: primitive types (e.g. `Field`, integers, `bool`) and compound
+types that group primitive types (e.g. arrays, tuples, structs). Each value can either be private or
+public.
+
+## Private & Public Types
+
+A **private value** is known only to the Prover, while a **public value** is known by both the
+Prover and Verifier. Mark values as `private` when the value should only be known to the prover. All
+primitive types (including individual fields of compound types) in Noir are private by default, and
+can be marked public when certain values are intended to be revealed to the Verifier.
+
+> **Note:** For public values defined in Noir programs paired with smart contract verifiers, once
+> the proofs are verified on-chain the values can be considered known to everyone that has access to
+> that blockchain.
+
+Public data types are treated no differently to private types apart from the fact that their values
+will be revealed in proofs generated. Simply changing the value of a public type will not change the
+circuit (where the same goes for changing values of private types as well).
+
+_Private values_ are also referred to as _witnesses_ sometimes.
+
+> **Note:** The terms private and public when applied to a type (e.g. `pub Field`) have a different
+> meaning than when applied to a function (e.g. `pub fn foo() {}`).
+>
+> The former is a visibility modifier for the Prover to interpret if a value should be made known to
+> the Verifier, while the latter is a visibility modifier for the compiler to interpret if a
+> function should be made accessible to external Noir programs like in other languages.
+
+### pub Modifier
+
+All data types in Noir are private by default. Types are explicitly declared as public using the
+`pub` modifier:
+
+```rust
+fn main(x : Field, y : pub Field) -> pub Field {
+    x + y
+}
+```
+
+In this example, `x` is **private** while `y` and `x + y` (the return value) are **public**. Note
+that visibility is handled **per variable**, so it is perfectly valid to have one input that is
+private and another that is public.
+
+> **Note:** Public types can only be declared through parameters on `main`.
+
+## Type Aliases
+
+A type alias is a new name for an existing type. Type aliases are declared with the keyword `type`:
+
+```rust
+type Id = u8;
+
+fn main() {
+    let id: Id = 1;
+    let zero: u8 = 0;
+    assert(zero + 1 == id);
+}
+```
+
+Type aliases can also be used with [generics](../generics.md):
+
+```rust
+type Id<Size> = Size;
+
+fn main() {
+    let id: Id<u32> = 1;
+    let zero: u32 = 0;
+    assert(zero + 1 == id);
+}
+```
+
+Type aliases can even refer to other aliases. An error will be issued if they form a cycle:
+
+```rust
+// Ok!
+type A = B;
+type B = Field;
+
+type Bad1 = Bad2;
+
+// error: Dependency cycle found
+type Bad2 = Bad1;
+//   ^^^^^^^^^^^ 'Bad2' recursively depends on itself: Bad2 -> Bad1 -> Bad2
+```
+
+### BigInt
+
+You can achieve BigInt functionality using the [Noir BigInt](https://github.com/shuklaayush/noir-bigint) library.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/integers.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/integers.md
new file mode 100644
index 00000000000..a1d59bf3166
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/integers.md
@@ -0,0 +1,156 @@
+---
+title: Integers
+description: Explore the Integer data type in Noir. Learn about its methods, see real-world examples, and grasp how to efficiently use Integers in your Noir code.
+keywords: [noir, integer types, methods, examples, arithmetic]
+sidebar_position: 1
+---
+
+An integer type is a range constrained field type.
+The Noir frontend supports both unsigned and signed integer types.
+The allowed sizes are 1, 8, 16, 32 and 64 bits.
+
+:::info
+
+When an integer is defined in Noir without a specific type, it will default to `Field`.
+
+The one exception is for loop indices which default to `u64` since comparisons on `Field`s are not possible.
+
+:::
+
+## Unsigned Integers
+
+An unsigned integer type is specified first with the letter `u` (indicating its unsigned nature) followed by its bit size (e.g. `8`):
+
+```rust
+fn main() {
+    let x: u8 = 1;
+    let y: u8 = 1;
+    let z = x + y;
+    assert (z == 2);
+}
+```
+
+The bit size determines the maximum value the integer type can store. For example, a `u8` variable can store a value in the range of 0 to 255 (i.e. $\\2^{8}-1\\$).
+
+## Signed Integers
+
+A signed integer type is specified first with the letter `i` (which stands for integer) followed by its bit size (e.g. `8`):
+
+```rust
+fn main() {
+    let x: i8 = -1;
+    let y: i8 = -1;
+    let z = x + y;
+    assert (z == -2);
+}
+```
+
+The bit size determines the maximum and minimum range of value the integer type can store. For example, an `i8` variable can store a value in the range of -128 to 127 (i.e. $\\-2^{7}\\$ to $\\2^{7}-1\\$).
+
+## 128 bits Unsigned Integers
+
+The built-in structure `U128` allows you to use 128-bit unsigned integers almost like a native integer type. However, there are some differences to keep in mind:
+- You cannot cast between a native integer and `U128`
+- There is a higher performance cost when using `U128`, compared to a native type.
+
+Conversion between unsigned integer types and U128 are done through the use of `from_integer` and `to_integer` functions. `from_integer` also accepts the `Field` type as input.
+
+```rust
+fn main() {
+    let x = U128::from_integer(23);
+    let y = U128::from_hex("0x7");
+    let z = x + y;
+    assert(z.to_integer() == 30);
+}
+```
+
+`U128` is implemented with two 64 bits limbs, representing the low and high bits, which explains the performance cost. You should expect `U128` to be twice more costly for addition and four times more costly for multiplication.
+You can construct a U128 from its limbs:
+```rust
+fn main(x: u64, y: u64) {
+    let x = U128::from_u64s_be(x,y);
+    assert(z.hi == x as Field);
+    assert(z.lo == y as Field);
+}
+```
+
+Note that the limbs are stored as Field elements in order to avoid unnecessary conversions.
+Apart from this, most operations will work as usual:
+
+```rust
+fn main(x: U128, y: U128) {
+    // multiplication
+    let c = x * y;
+    // addition and subtraction
+    let c = c - x + y;
+    // division
+    let c = x / y;
+    // bit operation;
+    let c = x & y | y;
+    // bit shift
+    let c = x << y;
+    // comparisons;
+    let c = x < y;
+    let c = x == y;
+}
+```
+
+## Overflows
+
+Computations that exceed the type boundaries will result in overflow errors. This happens with both signed and unsigned integers. For example, attempting to prove:
+
+```rust
+fn main(x: u8, y: u8) {
+    let z = x + y;
+}
+```
+
+With:
+
+```toml
+x = "255"
+y = "1"
+```
+
+Would result in:
+
+```
+$ nargo execute
+error: Assertion failed: 'attempt to add with overflow'
+┌─ ~/src/main.nr:9:13
+│
+│     let z = x + y;
+│             -----
+│
+= Call stack:
+  ...
+```
+
+A similar error would happen with signed integers:
+
+```rust
+fn main() {
+    let x: i8 = -118;
+    let y: i8 = -11;
+    let z = x + y;
+}
+```
+
+### Wrapping methods
+
+Although integer overflow is expected to error, some use-cases rely on wrapping. For these use-cases, the standard library provides `wrapping` variants of certain common operations:
+
+```rust
+fn wrapping_add<T>(x: T, y: T) -> T;
+fn wrapping_sub<T>(x: T, y: T) -> T;
+fn wrapping_mul<T>(x: T, y: T) -> T;
+```
+
+Example of how it is used:
+
+```rust
+
+fn main(x: u8, y: u8) -> pub u8 {
+    std::wrapping_add(x, y)
+}
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/references.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/references.md
new file mode 100644
index 00000000000..a5293d11cfb
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/references.md
@@ -0,0 +1,23 @@
+---
+title: References
+sidebar_position: 9
+---
+
+Noir supports first-class references. References are a bit like pointers: they point to a specific address that can be followed to access the data stored at that address. You can use Rust-like syntax to use pointers in Noir: the `&` operator references the variable, the `*` operator dereferences it.
+
+Example:
+
+```rust
+fn main() {
+    let mut x = 2;
+
+    // you can reference x as &mut and pass it to multiplyBy2
+    multiplyBy2(&mut x);
+}
+
+// you can access &mut here
+fn multiplyBy2(x: &mut Field) {
+    // and dereference it with *
+    *x = *x * 2;
+}
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/slices.mdx b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/slices.mdx
new file mode 100644
index 00000000000..dff08d63ffb
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/slices.mdx
@@ -0,0 +1,193 @@
+---
+title: Slices
+description: Explore the Slice data type in Noir. Understand its methods, see real-world examples, and learn how to effectively use Slices in your Noir programs.
+keywords: [noir, slice type, methods, examples, subarrays]
+sidebar_position: 5
+---
+
+import Experimental from '@site/src/components/Notes/_experimental.mdx';
+
+<Experimental />
+
+A slice is a dynamically-sized view into a sequence of elements. They can be resized at runtime, but because they don't own the data, they cannot be returned from a circuit. You can treat slices as arrays without a constrained size.
+
+```rust
+fn main() -> pub u32 {
+    let mut slice: [Field] = &[0; 2];
+
+    let mut new_slice = slice.push_back(6);
+    new_slice.len()
+}
+```
+
+To write a slice literal, use a preceeding ampersand as in: `&[0; 2]` or
+`&[1, 2, 3]`.
+
+It is important to note that slices are not references to arrays. In Noir,
+`&[..]` is more similar to an immutable, growable vector.
+
+View the corresponding test file [here][test-file].
+
+[test-file]: https://github.com/noir-lang/noir/blob/f387ec1475129732f72ba294877efdf6857135ac/crates/nargo_cli/tests/test_data_ssa_refactor/slices/src/main.nr
+
+## Methods
+
+For convenience, the STD provides some ready-to-use, common methods for slices:
+
+### push_back
+
+Pushes a new element to the end of the slice, returning a new slice with a length one greater than the original unmodified slice.
+
+```rust
+fn push_back<T>(_self: [T], _elem: T) -> [T]
+```
+
+example:
+
+```rust
+fn main() -> pub Field {
+    let mut slice: [Field] = &[0; 2];
+
+    let mut new_slice = slice.push_back(6);
+    new_slice.len()
+}
+```
+
+View the corresponding test file [here][test-file].
+
+### push_front
+
+Returns a new array with the specified element inserted at index 0. The existing elements indexes are incremented by 1.
+
+```rust
+fn push_front(_self: Self, _elem: T) -> Self
+```
+
+Example:
+
+```rust
+let mut new_slice: [Field] = &[];
+new_slice = new_slice.push_front(20);
+assert(new_slice[0] == 20); // returns true
+```
+
+View the corresponding test file [here][test-file].
+
+### pop_front
+
+Returns a tuple of two items, the first element of the array and the rest of the array.
+
+```rust
+fn pop_front(_self: Self) -> (T, Self)
+```
+
+Example:
+
+```rust
+let (first_elem, rest_of_slice) = slice.pop_front();
+```
+
+View the corresponding test file [here][test-file].
+
+### pop_back
+
+Returns a tuple of two items, the beginning of the array with the last element omitted and the last element.
+
+```rust
+fn pop_back(_self: Self) -> (Self, T)
+```
+
+Example:
+
+```rust
+let (popped_slice, last_elem) = slice.pop_back();
+```
+
+View the corresponding test file [here][test-file].
+
+### append
+
+Loops over a slice and adds it to the end of another.
+
+```rust
+fn append(mut self, other: Self) -> Self
+```
+
+Example:
+
+```rust
+let append = &[1, 2].append(&[3, 4, 5]);
+```
+
+### insert
+
+Inserts an element at a specified index and shifts all following elements by 1.
+
+```rust
+fn insert(_self: Self, _index: Field, _elem: T) -> Self
+```
+
+Example:
+
+```rust
+new_slice = rest_of_slice.insert(2, 100);
+assert(new_slice[2] == 100);
+```
+
+View the corresponding test file [here][test-file].
+
+### remove
+
+Remove an element at a specified index, shifting all elements after it to the left, returning the altered slice and the removed element.
+
+```rust
+fn remove(_self: Self, _index: Field) -> (Self, T)
+```
+
+Example:
+
+```rust
+let (remove_slice, removed_elem) = slice.remove(3);
+```
+
+### len
+
+Returns the length of a slice
+
+```rust
+fn len(self) -> Field
+```
+
+Example:
+
+```rust
+fn main() {
+    let slice = &[42, 42];
+    assert(slice.len() == 2);
+}
+```
+
+### as_array
+
+Converts this slice into an array.
+
+Make sure to specify the size of the resulting array.
+Panics if the resulting array length is different than the slice's length.
+
+```rust
+fn as_array<N>(self) -> [T; N]
+```
+
+Example:
+
+```rust
+fn main() {
+    let slice = &[5, 6];
+
+    // Always specify the length of the resulting array!
+    let array: [Field; 2] = slice.as_array();
+
+    assert(array[0] == slice[0]);
+    assert(array[1] == slice[1]);
+}
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/strings.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/strings.md
new file mode 100644
index 00000000000..1fdee42425e
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/strings.md
@@ -0,0 +1,79 @@
+---
+title: Strings
+description:
+  Discover the String data type in Noir. Learn about its methods, see real-world examples, and understand how to effectively manipulate and use Strings in Noir.
+keywords:
+  [
+    noir,
+    string type,
+    methods,
+    examples,
+    concatenation,
+  ]
+sidebar_position: 3
+---
+
+
+The string type is a fixed length value defined with `str<N>`.
+
+You can use strings in `assert()` functions or print them with
+`println()`. See more about [Logging](../../standard_library/logging.md).
+
+```rust
+
+fn main(message : pub str<11>, hex_as_string : str<4>) {
+    println(message);
+    assert(message == "hello world");
+    assert(hex_as_string == "0x41");
+}
+```
+
+You can convert a `str<N>` to a byte array by calling `as_bytes()`
+or a vector by calling `as_bytes_vec()`.
+
+```rust
+fn main() {
+    let message = "hello world";
+    let message_bytes = message.as_bytes();
+    let mut message_vec = message.as_bytes_vec();
+    assert(message_bytes.len() == 11);
+    assert(message_bytes[0] == 104);
+    assert(message_bytes[0] == message_vec.get(0));
+}
+```
+
+## Escape characters
+
+You can use escape characters for your strings:
+
+| Escape Sequence | Description     |
+|-----------------|-----------------|
+| `\r`            | Carriage Return |
+| `\n`            | Newline         |
+| `\t`            | Tab             |
+| `\0`            | Null Character  |
+| `\"`            | Double Quote    |
+| `\\`            | Backslash       |
+
+Example:
+
+```rust
+let s = "Hello \"world" // prints "Hello "world"
+let s = "hey \tyou"; // prints "hey   you"
+```
+
+## Raw strings
+
+A raw string begins with the letter `r` and is optionally delimited by a number of hashes `#`.
+
+Escape characters are *not* processed within raw strings. All contents are interpreted literally.
+
+Example:
+
+```rust
+let s = r"Hello world";
+let s = r#"Simon says "hello world""#;
+
+// Any number of hashes may be used (>= 1) as long as the string also terminates with the same number of hashes
+let s = r#####"One "#, Two "##, Three "###, Four "####, Five will end the string."#####; 
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/structs.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/structs.md
new file mode 100644
index 00000000000..dbf68c99813
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/structs.md
@@ -0,0 +1,70 @@
+---
+title: Structs
+description:
+  Explore the Struct data type in Noir. Learn about its methods, see real-world examples, and grasp how to effectively define and use Structs in your Noir programs.
+keywords:
+  [
+    noir,
+    struct type,
+    methods,
+    examples,
+    data structures,
+  ]
+sidebar_position: 8
+---
+
+A struct also allows for grouping multiple values of different types. Unlike tuples, we can also
+name each field.
+
+> **Note:** The usage of _field_ here refers to each element of the struct and is unrelated to the
+> field type of Noir.
+
+Defining a struct requires giving it a name and listing each field within as `<Key>: <Type>` pairs:
+
+```rust
+struct Animal {
+    hands: Field,
+    legs: Field,
+    eyes: u8,
+}
+```
+
+An instance of a struct can then be created with actual values in `<Key>: <Value>` pairs in any
+order. Struct fields are accessible using their given names:
+
+```rust
+fn main() {
+    let legs = 4;
+
+    let dog = Animal {
+        eyes: 2,
+        hands: 0,
+        legs,
+    };
+
+    let zero = dog.hands;
+}
+```
+
+Structs can also be destructured in a pattern, binding each field to a new variable:
+
+```rust
+fn main() {
+    let Animal { hands, legs: feet, eyes } = get_octopus();
+
+    let ten = hands + feet + eyes as u8;
+}
+
+fn get_octopus() -> Animal {
+    let octopus = Animal {
+        hands: 0,
+        legs: 8,
+        eyes: 2,
+    };
+
+    octopus
+}
+```
+
+The new variables can be bound with names different from the original struct field names, as
+showcased in the `legs --> feet` binding in the example above.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/tuples.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/tuples.md
new file mode 100644
index 00000000000..2ec5c9c4113
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/data_types/tuples.md
@@ -0,0 +1,48 @@
+---
+title: Tuples
+description:
+  Dive into the Tuple data type in Noir. Understand its methods, practical examples, and best practices for efficiently using Tuples in your Noir code.
+keywords:
+  [
+    noir,
+    tuple type,
+    methods,
+    examples,
+    multi-value containers,
+  ]
+sidebar_position: 7
+---
+
+A tuple collects multiple values like an array, but with the added ability to collect values of
+different types:
+
+```rust
+fn main() {
+    let tup: (u8, u64, Field) = (255, 500, 1000);
+}
+```
+
+One way to access tuple elements is via destructuring using pattern matching:
+
+```rust
+fn main() {
+    let tup = (1, 2);
+
+    let (one, two) = tup;
+
+    let three = one + two;
+}
+```
+
+Another way to access tuple elements is via direct member access, using a period (`.`) followed by
+the index of the element we want to access. Index `0` corresponds to the first tuple element, `1` to
+the second and so on:
+
+```rust
+fn main() {
+    let tup = (5, 6, 7, 8);
+
+    let five = tup.0;
+    let eight = tup.3;
+}
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/functions.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/functions.md
new file mode 100644
index 00000000000..f656cdfd97a
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/functions.md
@@ -0,0 +1,226 @@
+---
+title: Functions
+description:
+  Learn how to declare functions and methods in Noir, a programming language with Rust semantics.
+  This guide covers parameter declaration, return types, call expressions, and more.
+keywords: [Noir, Rust, functions, methods, parameter declaration, return types, call expressions]
+sidebar_position: 1
+---
+
+Functions in Noir follow the same semantics of Rust, though Noir does not support early returns.
+
+To declare a function the `fn` keyword is used.
+
+```rust
+fn foo() {}
+```
+
+By default, functions are visible only within the package they are defined. To make them visible outside of that package (for example, as part of a [library](../modules_packages_crates/crates_and_packages.md#libraries)), you should mark them as `pub`:
+
+```rust
+pub fn foo() {}
+```
+
+You can also restrict the visibility of the function to only the crate it was defined in, by specifying `pub(crate)`:
+
+```rust
+pub(crate) fn foo() {}  //foo can only be called within its crate
+```
+
+All parameters in a function must have a type and all types are known at compile time. The parameter
+is pre-pended with a colon and the parameter type. Multiple parameters are separated using a comma.
+
+```rust
+fn foo(x : Field, y : Field){}
+```
+
+The return type of a function can be stated by using the `->` arrow notation. The function below
+states that the foo function must return a `Field`. If the function returns no value, then the arrow
+is omitted.
+
+```rust
+fn foo(x : Field, y : Field) -> Field {
+    x + y
+}
+```
+
+Note that a `return` keyword is unneeded in this case - the last expression in a function's body is
+returned.
+
+## Main function
+
+If you're writing a binary, the `main` function is the starting point of your program. You can pass all types of expressions to it, as long as they have a fixed size at compile time:
+
+```rust
+fn main(x : Field) // this is fine: passing a Field
+fn main(x : [Field; 2]) // this is also fine: passing a Field with known size at compile-time
+fn main(x : (Field, bool)) // 👌: passing a (Field, bool) tuple means size 2
+fn main(x : str<5>) // this is fine, as long as you pass a string of size 5
+
+fn main(x : Vec<Field>) // can't compile, has variable size
+fn main(x : [Field]) // can't compile, has variable size
+fn main(....// i think you got it by now
+```
+
+Keep in mind [tests](../../tooling/testing.md) don't differentiate between `main` and any other function. The following snippet passes tests, but won't compile or prove:
+
+```rust
+fn main(x : [Field]) {
+    assert(x[0] == 1);
+}
+
+#[test]
+fn test_one() {
+    main(&[1, 2]);
+}
+```
+
+```bash
+$ nargo test
+[testing] Running 1 test functions
+[testing] Testing test_one... ok
+[testing] All tests passed
+
+$ nargo check
+The application panicked (crashed).
+Message:  Cannot have variable sized arrays as a parameter to main
+```
+
+## Call Expressions
+
+Calling a function in Noir is executed by using the function name and passing in the necessary
+arguments.
+
+Below we show how to call the `foo` function from the `main` function using a call expression:
+
+```rust
+fn main(x : Field, y : Field) {
+    let z = foo(x);
+}
+
+fn foo(x : Field) -> Field {
+    x + x
+}
+```
+
+## Methods
+
+You can define methods in Noir on any struct type in scope.
+
+```rust
+struct MyStruct {
+    foo: Field,
+    bar: Field,
+}
+
+impl MyStruct {
+    fn new(foo: Field) -> MyStruct {
+        MyStruct {
+            foo,
+            bar: 2,
+        }
+    }
+
+    fn sum(self) -> Field {
+        self.foo + self.bar
+    }
+}
+
+fn main() {
+    let s = MyStruct::new(40);
+    assert(s.sum() == 42);
+}
+```
+
+Methods are just syntactic sugar for functions, so if we wanted to we could also call `sum` as
+follows:
+
+```rust
+assert(MyStruct::sum(s) == 42);
+```
+
+It is also possible to specialize which method is chosen depending on the [generic](./generics.md) type that is used. In this example, the `foo` function returns different values depending on its type:
+
+```rust
+struct Foo<T> {}
+
+impl Foo<u32> {
+    fn foo(self) -> Field { 1 }
+}
+
+impl Foo<u64> {
+    fn foo(self) -> Field { 2 }
+}
+
+fn main() {
+    let f1: Foo<u32> = Foo{};
+    let f2: Foo<u64> = Foo{};
+    assert(f1.foo() + f2.foo() == 3);
+}
+```
+
+Also note that impls with the same method name defined in them cannot overlap. For example, if we already have `foo` defined for `Foo<u32>` and `Foo<u64>` like we do above, we cannot also define `foo` in an `impl<T> Foo<T>` since it would be ambiguous which version of `foo` to choose.
+
+```rust
+// Including this impl in the same project as the above snippet would
+// cause an overlapping impls error
+impl<T> Foo<T> {
+    fn foo(self) -> Field { 3 }
+}
+```
+
+## Lambdas
+
+Lambdas are anonymous functions. They follow the syntax of Rust - `|arg1, arg2, ..., argN| return_expression`.
+
+```rust
+let add_50 = |val| val + 50;
+assert(add_50(100) == 150);
+```
+
+See [Lambdas](./lambdas.md) for more details.
+
+## Attributes
+
+Attributes are metadata that can be applied to a function, using the following syntax: `#[attribute(value)]`.
+
+Supported attributes include:
+
+- **builtin**: the function is implemented by the compiler, for efficiency purposes.
+- **deprecated**: mark the function as _deprecated_. Calling the function will generate a warning: `warning: use of deprecated function`
+- **field**: Used to enable conditional compilation of code depending on the field size. See below for more details
+- **oracle**: mark the function as _oracle_; meaning it is an external unconstrained function, implemented in noir_js. See [Unconstrained](./unconstrained.md) and [NoirJS](../../reference/NoirJS/noir_js/index.md) for more details.
+- **test**: mark the function as unit tests. See [Tests](../../tooling/testing.md) for more details
+
+### Field Attribute
+
+The field attribute defines which field the function is compatible for. The function is conditionally compiled, under the condition that the field attribute matches the Noir native field.
+The field can be defined implicitly, by using the name of the elliptic curve usually associated to it - for instance bn254, bls12_381 - or explicitly by using the field (prime) order, in decimal or hexadecimal form.
+As a result, it is possible to define multiple versions of a function with each version specialized for a different field attribute. This can be useful when a function requires different parameters depending on the underlying elliptic curve.
+
+Example: we define the function `foo()` three times below. Once for the default Noir bn254 curve, once for the field $\mathbb F_{23}$, which will normally never be used by Noir, and once again for the bls12_381 curve.
+
+```rust
+#[field(bn254)]
+fn foo() -> u32 {
+    1
+}
+
+#[field(23)]
+fn foo() -> u32 {
+    2
+}
+
+// This commented code would not compile as foo would be defined twice because it is the same field as bn254
+// #[field(21888242871839275222246405745257275088548364400416034343698204186575808495617)]
+// fn foo() -> u32 {
+//     2
+// }
+
+#[field(bls12_381)]
+fn foo() -> u32 {
+    3
+}
+```
+
+If the field name is not known to Noir, it will discard the function. Field names are case insensitive.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/generics.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/generics.md
new file mode 100644
index 00000000000..0c1c27a2221
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/generics.md
@@ -0,0 +1,106 @@
+---
+title: Generics
+description: Learn how to use Generics in Noir
+keywords: [Noir, Rust, generics, functions, structs]
+sidebar_position: 7
+---
+
+Generics allow you to use the same functions with multiple different concrete data types. You can
+read more about the concept of generics in the Rust documentation
+[here](https://doc.rust-lang.org/book/ch10-01-syntax.html).
+
+Here is a trivial example showing the identity function that supports any type. In Rust, it is
+common to refer to the most general type as `T`. We follow the same convention in Noir.
+
+```rust
+fn id<T>(x: T) -> T  {
+    x
+}
+```
+
+## In Structs
+
+Generics are useful for specifying types in structs. For example, we can specify that a field in a
+struct will be of a certain generic type. In this case `value` is of type `T`.
+
+```rust
+struct RepeatedValue<T> {
+    value: T,
+    count: Field,
+}
+
+impl<T> RepeatedValue<T> {
+    fn print(self) {
+        for _i in 0 .. self.count {
+            println(self.value);
+        }
+    }
+}
+
+fn main() {
+    let repeated = RepeatedValue { value: "Hello!", count: 2 };
+    repeated.print();
+}
+```
+
+The `print` function will print `Hello!` an arbitrary number of times, twice in this case.
+
+If we want to be generic over array lengths (which are type-level integers), we can use numeric
+generics. Using these looks just like using regular generics, but these generics can resolve to
+integers at compile-time, rather than resolving to types. Here's an example of a struct that is
+generic over the size of the array it contains internally:
+
+```rust
+struct BigInt<N> {
+    limbs: [u32; N],
+}
+
+impl<N> BigInt<N> {
+    // `N` is in scope of all methods in the impl
+    fn first(first: BigInt<N>, second: BigInt<N>) -> Self {
+        assert(first.limbs != second.limbs);
+        first
+
+    fn second(first: BigInt<N>, second: Self) -> Self {
+        assert(first.limbs != second.limbs);
+        second
+    }
+}
+```
+
+## Calling functions on generic parameters
+
+Since a generic type `T` can represent any type, how can we call functions on the underlying type?
+In other words, how can we go from "any type `T`" to "any type `T` that has certain methods available?"
+
+This is what [traits](../concepts/traits.md) are for in Noir. Here's an example of a function generic over
+any type `T` that implements the `Eq` trait for equality:
+
+```rust
+fn first_element_is_equal<T, N>(array1: [T; N], array2: [T; N]) -> bool 
+    where T: Eq
+{
+    if (array1.len() == 0) | (array2.len() == 0) {
+        true
+    } else {
+        array1[0] == array2[0]
+    }
+}
+
+fn main() {
+    assert(first_element_is_equal([1, 2, 3], [1, 5, 6]));
+
+    // We can use first_element_is_equal for arrays of any type
+    // as long as we have an Eq impl for the types we pass in
+    let array = [MyStruct::new(), MyStruct::new()];
+    assert(array_eq(array, array, MyStruct::eq));
+}
+
+impl Eq for MyStruct {
+    fn eq(self, other: MyStruct) -> bool {
+        self.foo == other.foo
+    }
+}
+```
+
+You can find more details on traits and trait implementations on the [traits page](../concepts/traits.md).
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/globals.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/globals.md
new file mode 100644
index 00000000000..063a3d89248
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/globals.md
@@ -0,0 +1,72 @@
+---
+title: Global Variables
+description:
+  Learn about global variables in Noir. Discover how
+  to declare, modify, and use them in your programs.
+keywords: [noir programming language, globals, global variables, constants]
+sidebar_position: 8
+---
+
+## Globals
+
+
+Noir supports global variables. The global's type can be inferred by the compiler entirely:
+
+```rust
+global N = 5; // Same as `global N: Field = 5`
+
+global TUPLE = (3, 2);
+
+fn main() {
+    assert(N == 5);
+    assert(N == TUPLE.0 + TUPLE.1);
+}
+```
+
+:::info
+
+Globals can be defined as any expression, so long as they don't depend on themselves - otherwise there would be a dependency cycle! For example:
+
+```rust
+global T = foo(T); // dependency error
+```
+
+:::
+
+
+If they are initialized to a literal integer, globals can be used to specify an array's length:
+
+```rust
+global N: Field = 2;
+
+fn main(y : [Field; N]) {
+    assert(y[0] == y[1])
+}
+```
+
+A global from another module can be imported or referenced externally like any other name:
+
+```rust
+global N = 20;
+
+fn main() {
+    assert(my_submodule::N != N);
+}
+
+mod my_submodule {
+    global N: Field = 10;
+}
+```
+
+When a global is used, Noir replaces the name with its definition on each occurrence.
+This means globals defined using function calls will repeat the call each time they're used:
+
+```rust
+global RESULT = foo();
+
+fn foo() -> [Field; 100] { ... }
+```
+
+This is usually fine since Noir will generally optimize any function call that does not
+refer to a program input into a constant. It should be kept in mind however, if the called
+function performs side-effects like `println`, as these will still occur on each use.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/lambdas.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/lambdas.md
new file mode 100644
index 00000000000..be3c7e0b5ca
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/lambdas.md
@@ -0,0 +1,81 @@
+---
+title: Lambdas
+description: Learn how to use anonymous functions in Noir programming language.
+keywords: [Noir programming language, lambda, closure, function, anonymous function]
+sidebar_position: 9
+---
+
+## Introduction
+
+Lambdas are anonymous functions. The syntax is `|arg1, arg2, ..., argN| return_expression`.
+
+```rust
+let add_50 = |val| val + 50;
+assert(add_50(100) == 150);
+```
+
+A block can be used as the body of a lambda, allowing you to declare local variables inside it:
+
+```rust
+let cool = || {
+  let x = 100;
+  let y = 100;
+  x + y
+}
+
+assert(cool() == 200);
+```
+
+## Closures
+
+Inside the body of a lambda, you can use variables defined in the enclosing function. Such lambdas are called **closures**. In this example `x` is defined inside `main` and is accessed from within the lambda:
+
+```rust
+fn main() {
+  let x = 100;
+  let closure = || x + 150;
+  assert(closure() == 250);
+}
+```
+
+## Passing closures to higher-order functions
+
+It may catch you by surprise that the following code fails to compile:
+
+```rust
+fn foo(f: fn () -> Field) -> Field {
+ f()
+}
+
+fn main() {
+  let (x, y) = (50, 50);
+  assert(foo(|| x + y) == 100); // error :(
+}
+```
+
+The reason is that the closure's capture environment affects its type - we have a closure that captures two Fields and `foo`
+expects a regular function as an argument - those are incompatible.
+:::note
+
+Variables contained within the `||` are the closure's parameters, and the expression that follows it is the closure's body. The capture environment is comprised of any variables used in the closure's body that are not parameters.
+
+E.g. in |x| x + y, y would be a captured variable, but x would not be, since it is a parameter of the closure.
+
+:::
+The syntax for the type of a closure is `fn[env](args) -> ret_type`, where `env` is the capture environment of the closure -
+in this example that's `(Field, Field)`.
+
+The best solution in our case is to make `foo` generic over the environment type of its parameter, so that it can be called
+with closures with any environment, as well as with regular functions:
+
+```rust
+fn foo<Env>(f: fn[Env]() -> Field) -> Field {
+ f()
+}
+
+fn main() {
+  let (x, y) = (50, 50);
+  assert(foo(|| x + y) == 100); // compiles fine
+  assert(foo(|| 60) == 60);     // compiles fine
+}
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/mutability.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/mutability.md
new file mode 100644
index 00000000000..fdeef6a87c5
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/mutability.md
@@ -0,0 +1,121 @@
+---
+title: Mutability
+description:
+  Learn about mutable variables in Noir. Discover how
+  to declare, modify, and use them in your programs.
+keywords: [noir programming language, mutability in noir, mutable variables]
+sidebar_position: 8
+---
+
+Variables in noir can be declared mutable via the `mut` keyword. Mutable variables can be reassigned
+to via an assignment expression.
+
+```rust
+let x = 2;
+x = 3; // error: x must be mutable to be assigned to
+
+let mut y = 3;
+let y = 4; // OK
+```
+
+The `mut` modifier can also apply to patterns:
+
+```rust
+let (a, mut b) = (1, 2);
+a = 11; // error: a must be mutable to be assigned to
+b = 12; // OK
+
+let mut (c, d) = (3, 4);
+c = 13; // OK
+d = 14; // OK
+
+// etc.
+let MyStruct { x: mut y } = MyStruct { x: a };
+// y is now in scope
+```
+
+Note that mutability in noir is local and everything is passed by value, so if a called function
+mutates its parameters then the parent function will keep the old value of the parameters.
+
+```rust
+fn main() -> pub Field {
+    let x = 3;
+    helper(x);
+    x // x is still 3
+}
+
+fn helper(mut x: i32) {
+    x = 4;
+}
+```
+
+## Non-local mutability
+
+Non-local mutability can be achieved through the mutable reference type `&mut T`:
+
+```rust
+fn set_to_zero(x: &mut Field) {
+    *x = 0;
+}
+
+fn main() {
+    let mut y = 42;
+    set_to_zero(&mut y);
+    assert(*y == 0);
+}
+```
+
+When creating a mutable reference, the original variable being referred to (`y` in this
+example) must also be mutable. Since mutable references are a reference type, they must
+be explicitly dereferenced via `*` to retrieve the underlying value. Note that this yields
+a copy of the value, so mutating this copy will not change the original value behind the
+reference:
+
+```rust
+fn main() {
+    let mut x = 1;
+    let x_ref = &mut x;
+
+    let mut y = *x_ref;
+    let y_ref = &mut y;
+
+    x = 2;
+    *x_ref = 3;
+
+    y = 4;
+    *y_ref = 5;
+
+    assert(x == 3);
+    assert(*x_ref == 3);
+    assert(y == 5);
+    assert(*y_ref == 5);
+}
+```
+
+Note that types in Noir are actually deeply immutable so the copy that occurs when
+dereferencing is only a conceptual copy - no additional constraints will occur.
+
+Mutable references can also be stored within structs. Note that there is also
+no lifetime parameter on these unlike rust. This is because the allocated memory
+always lasts the entire program - as if it were an array of one element.
+
+```rust
+struct Foo {
+    x: &mut Field
+}
+
+impl Foo {
+    fn incr(mut self) {
+        *self.x += 1;
+    }
+}
+
+fn main() {
+    let foo = Foo { x: &mut 0 };
+    foo.incr();
+    assert(*foo.x == 1);
+}
+```
+
+In general, you should avoid non-local & shared mutability unless it is needed. Sticking
+to only local mutability will improve readability and potentially improve compiler optimizations as well.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/ops.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/ops.md
new file mode 100644
index 00000000000..c35c36c38a9
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/ops.md
@@ -0,0 +1,98 @@
+---
+title: Logical Operations
+description:
+  Learn about the supported arithmetic and logical operations in the Noir programming language.
+  Discover how to perform operations on private input types, integers, and booleans.
+keywords:
+  [
+    Noir programming language,
+    supported operations,
+    arithmetic operations,
+    logical operations,
+    predicate operators,
+    bitwise operations,
+    short-circuiting,
+    backend,
+  ]
+sidebar_position: 3
+---
+
+# Operations
+
+## Table of Supported Operations
+
+| Operation |                          Description                           |                           Requirements |
+| :-------- | :------------------------------------------------------------: | -------------------------------------: |
+| +         |             Adds two private input types together              |            Types must be private input |
+| -         |           Subtracts two private input types together           |            Types must be private input |
+| \*        |          Multiplies two private input types together           |            Types must be private input |
+| /         |            Divides two private input types together            |            Types must be private input |
+| ^         |              XOR two private input types together              |                  Types must be integer |
+| &         |              AND two private input types together              |                  Types must be integer |
+| \|        |              OR two private input types together               |                  Types must be integer |
+| \<\<        |        Left shift an integer by another integer amount         | Types must be integer, shift must be u8 |
+| >>        |        Right shift an integer by another integer amount        | Types must be integer, shift must be u8 |
+| !         |                     Bitwise not of a value                     |        Type must be integer or boolean |
+| \<         |       returns a bool if one value is less than the other       | Upper bound must have a known bit size |
+| \<=        | returns a bool if one value is less than or equal to the other | Upper bound must have a known bit size |
+| >         |       returns a bool if one value is more than the other       | Upper bound must have a known bit size |
+| >=        | returns a bool if one value is more than or equal to the other | Upper bound must have a known bit size |
+| ==        |       returns a bool if one value is equal to the other        |       Both types must not be constants |
+| !=        |     returns a bool if one value is not equal to the other      |       Both types must not be constants |
+
+### Predicate Operators
+
+`<,<=, !=, == , >, >=` are known as predicate/comparison operations because they compare two values.
+This differs from the operations such as `+` where the operands are used in _computation_.
+
+### Bitwise Operations Example
+
+```rust
+fn main(x : Field) {
+    let y = x as u32;
+    let z = y & y;
+}
+```
+
+`z` is implicitly constrained to be the result of `y & y`. The `&` operand is used to denote bitwise
+`&`.
+
+> `x & x` would not compile as `x` is a `Field` and not an integer type.
+
+### Logical Operators
+
+Noir has no support for the logical operators `||` and `&&`. This is because encoding the
+short-circuiting that these operators require can be inefficient for Noir's backend. Instead you can
+use the bitwise operators `|` and `&` which operate identically for booleans, just without the
+short-circuiting.
+
+```rust
+let my_val = 5;
+
+let mut flag = 1;
+if (my_val > 6) | (my_val == 0) {
+    flag = 0;
+}
+assert(flag == 1);
+
+if (my_val != 10) & (my_val < 50) {
+    flag = 0;
+}
+assert(flag == 0);
+```
+
+### Shorthand operators
+
+Noir shorthand operators for most of the above operators, namely `+=, -=, *=, /=, %=, &=, |=, ^=, <<=`, and `>>=`. These allow for more concise syntax. For example:
+
+```rust
+let mut i = 0;
+i = i + 1;
+```
+
+could be written as:
+
+```rust
+let mut i = 0;
+i += 1;
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/oracles.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/oracles.md
new file mode 100644
index 00000000000..aa380b5f7b8
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/oracles.md
@@ -0,0 +1,31 @@
+---
+title: Oracles
+description: Dive into how Noir supports Oracles via RPC calls, and learn how to declare an Oracle in Noir with our comprehensive guide.
+keywords:
+  - Noir
+  - Oracles
+  - RPC Calls
+  - Unconstrained Functions
+  - Programming
+  - Blockchain
+sidebar_position: 6
+---
+
+:::note
+
+This is an experimental feature that is not fully documented. If you notice any outdated information or potential improvements to this page, pull request contributions are very welcome: https://github.com/noir-lang/noir
+
+:::
+
+Noir has support for Oracles via RPC calls. This means Noir will make an RPC call and use the return value for proof generation.
+
+Since Oracles are not resolved by Noir, they are [`unconstrained` functions](./unconstrained.md)
+
+You can declare an Oracle through the `#[oracle(<name>)]` flag. Example:
+
+```rust
+#[oracle(get_number_sequence)]
+unconstrained fn get_number_sequence(_size: Field) -> [Field] {}
+```
+
+The timeout for when using an external RPC oracle resolver can be set with the `NARGO_FOREIGN_CALL_TIMEOUT` environment variable. This timeout is in units of milliseconds.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/shadowing.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/shadowing.md
new file mode 100644
index 00000000000..5ce6130d201
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/shadowing.md
@@ -0,0 +1,44 @@
+---
+title: Shadowing
+sidebar_position: 12
+---
+
+Noir allows for inheriting variables' values and re-declaring them with the same name similar to Rust, known as shadowing.
+
+For example, the following function is valid in Noir:
+
+```rust
+fn main() {
+    let x = 5;
+
+    {
+        let x = x * 2;
+        assert (x == 10);
+    }
+
+    assert (x == 5);
+}
+```
+
+In this example, a variable x is first defined with the value 5.
+
+The local scope that follows shadows the original x, i.e. creates a local mutable x based on the value of the original x. It is given a value of 2 times the original x.
+
+When we return to the main scope, x once again refers to just the original x, which stays at the value of 5.
+
+## Temporal mutability
+
+One way that shadowing is useful, in addition to ergonomics across scopes, is for temporarily mutating variables.
+
+```rust
+fn main() {
+    let age = 30;
+    // age = age + 5; // Would error as `age` is immutable by default.
+
+    let mut age = age + 5; // Temporarily mutates `age` with a new value.
+
+    let age = age; // Locks `age`'s mutability again.
+
+    assert (age == 35);
+}
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/traits.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/traits.md
new file mode 100644
index 00000000000..df7cb9ebda0
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/traits.md
@@ -0,0 +1,389 @@
+---
+title: Traits
+description:
+  Traits in Noir can be used to abstract out a common interface for functions across
+  several data types.
+keywords: [noir programming language, traits, interfaces, generic, protocol]
+sidebar_position: 14
+---
+
+## Overview
+
+Traits in Noir are a useful abstraction similar to interfaces or protocols in other languages. Each trait defines
+the interface of several methods contained within the trait. Types can then implement this trait by providing
+implementations for these methods. For example in the program:
+
+```rust
+struct Rectangle {
+    width: Field,
+    height: Field,
+}
+
+impl Rectangle {
+    fn area(self) -> Field {
+        self.width * self.height
+    }
+}
+
+fn log_area(r: Rectangle) {
+    println(r.area());
+}
+```
+
+We have a function `log_area` to log the area of a `Rectangle`. Now how should we change the program if we want this
+function to work on `Triangle`s as well?:
+
+```rust
+struct Triangle {
+    width: Field,
+    height: Field,
+}
+
+impl Triangle {
+    fn area(self) -> Field {
+        self.width * self.height / 2
+    }
+}
+```
+
+Making `log_area` generic over all types `T` would be invalid since not all types have an `area` method. Instead, we can
+introduce a new `Area` trait and make `log_area` generic over all types `T` that implement `Area`:
+
+```rust
+trait Area {
+    fn area(self) -> Field;
+}
+
+fn log_area<T>(shape: T) where T: Area {
+    println(shape.area());
+}
+```
+
+We also need to explicitly implement `Area` for `Rectangle` and `Triangle`. We can do that by changing their existing
+impls slightly. Note that the parameter types and return type of each of our `area` methods must match those defined
+by the `Area` trait.
+
+```rust
+impl Area for Rectangle {
+    fn area(self) -> Field {
+        self.width * self.height
+    }
+}
+
+impl Area for Triangle {
+    fn area(self) -> Field {
+        self.width * self.height / 2
+    }
+}
+```
+
+Now we have a working program that is generic over any type of Shape that is used! Others can even use this program
+as a library with their own types - such as `Circle` - as long as they also implement `Area` for these types.
+
+## Where Clauses
+
+As seen in `log_area` above, when we want to create a function or method that is generic over any type that implements
+a trait, we can add a where clause to the generic function.
+
+```rust
+fn log_area<T>(shape: T) where T: Area {
+    println(shape.area());
+}
+```
+
+It is also possible to apply multiple trait constraints on the same variable at once by combining traits with the `+`
+operator. Similarly, we can have multiple trait constraints by separating each with a comma:
+
+```rust
+fn foo<T, U>(elements: [T], thing: U) where
+    T: Default + Add + Eq,
+    U: Bar,
+{
+    let mut sum = T::default();
+
+    for element in elements {
+        sum += element;
+    }
+
+    if sum == T::default() {
+        thing.bar();
+    }
+}
+```
+
+## Generic Implementations
+
+You can add generics to a trait implementation by adding the generic list after the `impl` keyword:
+
+```rust
+trait Second {
+    fn second(self) -> Field;
+}
+
+impl<T> Second for (T, Field) {
+    fn second(self) -> Field {
+        self.1
+    }
+}
+```
+
+You can also implement a trait for every type this way:
+
+```rust
+trait Debug {
+    fn debug(self);
+}
+
+impl<T> Debug for T {
+    fn debug(self) {
+        println(self);
+    }
+}
+
+fn main() {
+    1.debug();
+}
+```
+
+### Generic Trait Implementations With Where Clauses
+
+Where clauses can also be placed on trait implementations themselves to restrict generics in a similar way.
+For example, while `impl<T> Foo for T` implements the trait `Foo` for every type, `impl<T> Foo for T where T: Bar`
+will implement `Foo` only for types that also implement `Bar`. This is often used for implementing generic types.
+For example, here is the implementation for array equality:
+
+```rust
+impl<T, N> Eq for [T; N] where T: Eq {
+    // Test if two arrays have the same elements.
+    // Because both arrays must have length N, we know their lengths already match.
+    fn eq(self, other: Self) -> bool {
+        let mut result = true;
+
+        for i in 0 .. self.len() {
+            // The T: Eq constraint is needed to call == on the array elements here
+            result &= self[i] == other[i];
+        }
+
+        result
+    }
+}
+```
+
+## Generic Traits
+
+Traits themselves can also be generic by placing the generic arguments after the trait name. These generics are in
+scope of every item within the trait.
+
+```rust
+trait Into<T> {
+    // Convert `self` to type `T`
+    fn into(self) -> T;
+}
+```
+
+When implementing generic traits the generic arguments of the trait must be specified. This is also true anytime
+when referencing a generic trait (e.g. in a `where` clause).
+
+```rust
+struct MyStruct {
+    array: [Field; 2],
+}
+
+impl Into<[Field; 2]> for MyStruct {
+    fn into(self) -> [Field; 2] {
+        self.array
+    }
+}
+
+fn as_array<T>(x: T) -> [Field; 2] 
+    where T: Into<[Field; 2]>
+{
+    x.into()
+}
+
+fn main() {
+    let array = [1, 2];
+    let my_struct = MyStruct { array };
+
+    assert_eq(as_array(my_struct), array);
+}
+```
+
+## Trait Methods With No `self`
+
+A trait can contain any number of methods, each of which have access to the `Self` type which represents each type
+that eventually implements the trait. Similarly, the `self` variable is available as well but is not required to be used.
+For example, we can define a trait to create a default value for a type. This trait will need to return the `Self` type
+but doesn't need to take any parameters:
+
+```rust
+trait Default {
+    fn default() -> Self;
+}
+```
+
+Implementing this trait can be done similarly to any other trait:
+
+```rust
+impl Default for Field {
+    fn default() -> Field {
+        0
+    }
+}
+
+struct MyType {}
+
+impl Default for MyType {
+    fn default() -> Field {
+        MyType {}
+    }
+}
+```
+
+However, since there is no `self` parameter, we cannot call it via the method call syntax `object.method()`.
+Instead, we'll need to refer to the function directly. This can be done either by referring to the
+specific impl `MyType::default()` or referring to the trait itself `Default::default()`. In the later
+case, type inference determines the impl that is selected.
+
+```rust
+let my_struct = MyStruct::default();
+
+let x: Field = Default::default();
+let result = x + Default::default();
+```
+
+:::warning
+
+```rust
+let _ = Default::default();
+```
+
+If type inference cannot select which impl to use because of an ambiguous `Self` type, an impl will be
+arbitrarily selected. This occurs most often when the result of a trait function call with no parameters
+is unused. To avoid this, when calling a trait function with no `self` or `Self` parameters or return type,
+always refer to it via the implementation type's namespace - e.g. `MyType::default()`.
+This is set to change to an error in future Noir versions.
+
+:::
+
+## Default Method Implementations
+
+A trait can also have default implementations of its methods by giving a body to the desired functions.
+Note that this body must be valid for all types that may implement the trait. As a result, the only
+valid operations on `self` will be operations valid for any type or other operations on the trait itself.
+
+```rust
+trait Numeric {
+    fn add(self, other: Self) -> Self;
+
+    // Default implementation of double is (self + self)
+    fn double(self) -> Self {
+        self.add(self)
+    }
+}
+```
+
+When implementing a trait with default functions, a type may choose to implement only the required functions:
+
+```rust
+impl Numeric for Field {
+    fn add(self, other: Field) -> Field {
+        self + other
+    }
+}
+```
+
+Or it may implement the optional methods as well:
+
+```rust
+impl Numeric for u32 {
+    fn add(self, other: u32) -> u32 {
+        self + other
+    }
+
+    fn double(self) -> u32 {
+        self * 2
+    }
+}
+```
+
+## Impl Specialization
+
+When implementing traits for a generic type it is possible to implement the trait for only a certain combination
+of generics. This can be either as an optimization or because those specific generics are required to implement the trait.
+
+```rust
+trait Sub {
+    fn sub(self, other: Self) -> Self;
+}
+
+struct NonZero<T> {
+    value: T,
+}
+
+impl Sub for NonZero<Field> {
+    fn sub(self, other: Self) -> Self {
+        let value = self.value - other.value;
+        assert(value != 0);
+        NonZero { value }
+    }
+}
+```
+
+## Overlapping Implementations
+
+Overlapping implementations are disallowed by Noir to ensure Noir's decision on which impl to select is never ambiguous.
+This means if a trait `Foo` is already implemented
+by a type `Bar<T>` for all `T`, then we cannot also have a separate impl for `Bar<Field>` (or any other
+type argument). Similarly, if there is an impl for all `T` such as `impl<T> Debug for T`, we cannot create
+any more impls to `Debug` for other types since it would be ambiguous which impl to choose for any given
+method call.
+
+```rust
+trait Trait {}
+
+// Previous impl defined here
+impl<A, B> Trait for (A, B) {}
+
+// error: Impl for type `(Field, Field)` overlaps with existing impl
+impl Trait for (Field, Field) {}
+```
+
+## Trait Coherence
+
+Another restriction on trait implementations is coherence. This restriction ensures other crates cannot create
+impls that may overlap with other impls, even if several unrelated crates are used as dependencies in the same
+program.
+
+The coherence restriction is: to implement a trait, either the trait itself or the object type must be declared
+in the crate the impl is in.
+
+In practice this often comes up when using types provided by libraries. If a library provides a type `Foo` that does
+not implement a trait in the standard library such as `Default`, you may not `impl Default for Foo` in your own crate.
+While restrictive, this prevents later issues or silent changes in the program if the `Foo` library later added its
+own impl for `Default`. If you are a user of the `Foo` library in this scenario and need a trait not implemented by the
+library your choices are to either submit a patch to the library or use the newtype pattern.
+
+### The Newtype Pattern
+
+The newtype pattern gets around the coherence restriction by creating a new wrapper type around the library type
+that we cannot create `impl`s for. Since the new wrapper type is defined in our current crate, we can create
+impls for any trait we need on it.
+
+```rust
+struct Wrapper {
+    foo: some_library::Foo,
+}
+
+impl Default for Wrapper {
+    fn default() -> Wrapper {
+        Wrapper {
+            foo: some_library::Foo::new(),
+        }
+    }
+}
+```
+
+Since we have an impl for our own type, the behavior of this code will not change even if `some_library` is updated
+to provide its own `impl Default for Foo`. The downside of this pattern is that it requires extra wrapping and
+unwrapping of values when converting to and from the `Wrapper` and `Foo` types.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/concepts/unconstrained.md b/docs/versioned_docs/version-v0.31.0/noir/concepts/unconstrained.md
new file mode 100644
index 00000000000..96f824c5e42
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/concepts/unconstrained.md
@@ -0,0 +1,99 @@
+---
+title: Unconstrained Functions
+description: "Learn about what unconstrained functions in Noir are, how to use them and when you'd want to."
+
+keywords: [Noir programming language, unconstrained, open]
+sidebar_position: 5
+---
+
+Unconstrained functions are functions which do not constrain any of the included computation and allow for non-deterministic computation.
+
+## Why?
+
+Zero-knowledge (ZK) domain-specific languages (DSL) enable developers to generate ZK proofs from their programs by compiling code down to the constraints of an NP complete language (such as R1CS or PLONKish languages). However, the hard bounds of a constraint system can be very limiting to the functionality of a ZK DSL.
+
+Enabling a circuit language to perform unconstrained execution is a powerful tool. Said another way, unconstrained execution lets developers generate witnesses from code that does not generate any constraints. Being able to execute logic outside of a circuit is critical for both circuit performance and constructing proofs on information that is external to a circuit.
+
+Fetching information from somewhere external to a circuit can also be used to enable developers to improve circuit efficiency.
+
+A ZK DSL does not just prove computation, but proves that some computation was handled correctly. Thus, it is necessary that when we switch from performing some operation directly inside of a circuit to inside of an unconstrained environment that the appropriate constraints are still laid down elsewhere in the circuit.
+
+## Example
+
+An in depth example might help drive the point home. This example comes from the excellent [post](https://discord.com/channels/1113924620781883405/1124022445054111926/1128747641853972590) by Tom in the Noir Discord.
+
+Let's look at how we can optimize a function to turn a `u72` into an array of `u8`s.
+
+```rust
+fn main(num: u72) -> pub [u8; 8] {
+    let mut out: [u8; 8] = [0; 8];
+    for i in 0..8 {
+        out[i] = (num >> (56 - (i * 8)) as u72 & 0xff) as u8;
+    }
+
+    out
+}
+```
+
+```
+Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 91
+Backend circuit size: 3619
+```
+
+A lot of the operations in this function are optimized away by the compiler (all the bit-shifts turn into divisions by constants). However we can save a bunch of gates by casting to u8 a bit earlier. This automatically truncates the bit-shifted value to fit in a u8 which allows us to remove the AND against 0xff. This saves us ~480 gates in total.
+
+```rust
+fn main(num: u72) -> pub [u8; 8] {
+    let mut out: [u8; 8] = [0; 8];
+    for i in 0..8 {
+        out[i] = (num >> (56 - (i * 8)) as u8;
+    }
+
+    out
+}
+```
+
+```
+Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 75
+Backend circuit size: 3143
+```
+
+Those are some nice savings already but we can do better. This code is all constrained so we're proving every step of calculating out using num, but we don't actually care about how we calculate this, just that it's correct. This is where brillig comes in.
+
+It turns out that truncating a u72 into a u8 is hard to do inside a snark, each time we do as u8 we lay down 4 ACIR opcodes which get converted into multiple gates. It's actually much easier to calculate num from out than the other way around. All we need to do is multiply each element of out by a constant and add them all together, both relatively easy operations inside a snark.
+
+We can then run u72_to_u8 as unconstrained brillig code in order to calculate out, then use that result in our constrained function and assert that if we were to do the reverse calculation we'd get back num. This looks a little like the below:
+
+```rust
+fn main(num: u72) -> pub [u8; 8] {
+    let out = u72_to_u8(num);
+
+    let mut reconstructed_num: u72 = 0;
+    for i in 0..8 {
+        reconstructed_num += (out[i] as u72 << (56 - (8 * i)));
+    }
+    assert(num == reconstructed_num);
+    out
+}
+
+unconstrained fn u72_to_u8(num: u72) -> [u8; 8] {
+    let mut out: [u8; 8] = [0; 8];
+    for i in 0..8 {
+        out[i] = (num >> (56 - (i * 8))) as u8;
+    }
+    out
+}
+```
+
+```
+Total ACIR opcodes generated for language PLONKCSat { width: 3 }: 78
+Backend circuit size: 2902
+```
+
+This ends up taking off another ~250 gates from our circuit! We've ended up with more ACIR opcodes than before but they're easier for the backend to prove (resulting in fewer gates).
+
+Generally we want to use brillig whenever there's something that's easy to verify but hard to compute within the circuit. For example, if you wanted to calculate a square root of a number it'll be a much better idea to calculate this in brillig and then assert that if you square the result you get back your number.
+
+## Break and Continue
+
+In addition to loops over runtime bounds, `break` and `continue` are also available in unconstrained code. See [break and continue](../concepts/control_flow.md#break-and-continue)
diff --git a/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/_category_.json b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/_category_.json
new file mode 100644
index 00000000000..1debcfe7675
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Modules, Packages and Crates",
+    "position": 2,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/crates_and_packages.md b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/crates_and_packages.md
new file mode 100644
index 00000000000..95ee9f52ab2
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/crates_and_packages.md
@@ -0,0 +1,43 @@
+---
+title: Crates and Packages
+description: Learn how to use Crates and Packages in your Noir project
+keywords: [Nargo, dependencies, package management, crates, package]
+sidebar_position: 0
+---
+
+## Crates
+
+A crate is the smallest amount of code that the Noir compiler considers at a time.
+Crates can contain modules, and the modules may be defined in other files that get compiled with the crate, as we’ll see in the coming sections.
+
+### Crate Types
+
+A Noir crate can come in several forms: binaries, libraries or contracts.
+
+#### Binaries
+
+_Binary crates_ are programs which you can compile to an ACIR circuit which you can then create proofs against. Each must have a function called `main` that defines the ACIR circuit which is to be proved.
+
+#### Libraries
+
+_Library crates_ don't have a `main` function and they don't compile down to ACIR. Instead they define functionality intended to be shared with multiple projects, and eventually included in a binary crate.
+
+#### Contracts
+
+Contract crates are similar to binary crates in that they compile to ACIR which you can create proofs against. They are different in that they do not have a single `main` function, but are a collection of functions to be deployed to the [Aztec network](https://aztec.network). You can learn more about the technical details of Aztec in the [monorepo](https://github.com/AztecProtocol/aztec-packages) or contract [examples](https://github.com/AztecProtocol/aztec-packages/tree/master/noir-projects/noir-contracts/contracts).
+
+### Crate Root
+
+Every crate has a root, which is the source file that the compiler starts, this is also known as the root module. The Noir compiler does not enforce any conditions on the name of the file which is the crate root, however if you are compiling via Nargo the crate root must be called `lib.nr` or `main.nr` for library or binary crates respectively.
+
+## Packages
+
+A Nargo _package_ is a collection of one of more crates that provides a set of functionality. A package must include a Nargo.toml file.
+
+A package _must_ contain either a library or a binary crate, but not both.
+
+### Differences from Cargo Packages
+
+One notable difference between Rust's Cargo and Noir's Nargo is that while Cargo allows a package to contain an unlimited number of binary crates and a single library crate, Nargo currently only allows a package to contain a single crate.
+
+In future this restriction may be lifted to allow a Nargo package to contain both a binary and library crate or multiple binary crates.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/dependencies.md b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/dependencies.md
new file mode 100644
index 00000000000..24e02de08fe
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/dependencies.md
@@ -0,0 +1,124 @@
+---
+title: Dependencies
+description:
+  Learn how to specify and manage dependencies in Nargo, allowing you to upload packages to GitHub
+  and use them easily in your project.
+keywords: [Nargo, dependencies, GitHub, package management, versioning]
+sidebar_position: 1
+---
+
+Nargo allows you to upload packages to GitHub and use them as dependencies.
+
+## Specifying a dependency
+
+Specifying a dependency requires a tag to a specific commit and the git url to the url containing
+the package.
+
+Currently, there are no requirements on the tag contents. If requirements are added, it would follow
+semver 2.0 guidelines.
+
+> Note: Without a `tag` , there would be no versioning and dependencies would change each time you
+> compile your project.
+
+For example, to add the [ecrecover-noir library](https://github.com/colinnielsen/ecrecover-noir) to your project, add it to `Nargo.toml`:
+
+```toml
+# Nargo.toml
+
+[dependencies]
+ecrecover = {tag = "v0.8.0", git = "https://github.com/colinnielsen/ecrecover-noir"}
+```
+
+If the module is in a subdirectory, you can define a subdirectory in your git repository, for example:
+
+```toml
+# Nargo.toml
+
+[dependencies]
+easy_private_token_contract = {tag ="v0.1.0-alpha62", git = "https://github.com/AztecProtocol/aztec-packages", directory = "noir-contracts/contracts/easy_private_token_contract"}
+```
+
+## Specifying a local dependency
+
+You can also specify dependencies that are local to your machine.
+
+For example, this file structure has a library and binary crate
+
+```tree
+├── binary_crate
+│   ├── Nargo.toml
+│   └── src
+│       └── main.nr
+└── lib_a
+    ├── Nargo.toml
+    └── src
+        └── lib.nr
+```
+
+Inside of the binary crate, you can specify:
+
+```toml
+# Nargo.toml
+
+[dependencies]
+lib_a = { path = "../lib_a" }
+```
+
+## Importing dependencies
+
+You can import a dependency to a Noir file using the following syntax. For example, to import the
+ecrecover-noir library and local lib_a referenced above:
+
+```rust
+use ecrecover;
+use lib_a;
+```
+
+You can also import only the specific parts of dependency that you want to use, like so:
+
+```rust
+use std::hash::sha256;
+use std::scalar_mul::fixed_base_embedded_curve;
+```
+
+Lastly, as demonstrated in the
+[elliptic curve example](../standard_library/cryptographic_primitives/ec_primitives.md#examples), you
+can import multiple items in the same line by enclosing them in curly braces:
+
+```rust
+use std::ec::tecurve::affine::{Curve, Point};
+```
+
+We don't have a way to consume libraries from inside a [workspace](./workspaces.md) as external dependencies right now.
+
+Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml.
+
+## Dependencies of Dependencies
+
+Note that when you import a dependency, you also get access to all of the dependencies of that package.
+
+For example, the [phy_vector](https://github.com/resurgencelabs/phy_vector) library imports an [fraction](https://github.com/resurgencelabs/fraction) library. If you're importing the phy_vector library, then you can access the functions in fractions library like so:
+
+```rust
+use phy_vector;
+
+fn main(x : Field, y : pub Field) {
+  //...
+  let f = phy_vector::fraction::toFraction(true, 2, 1);
+  //...
+}
+```
+
+## Available Libraries
+
+Noir does not currently have an official package manager. You can find a list of available Noir libraries in the [awesome-noir repo here](https://github.com/noir-lang/awesome-noir#libraries).
+
+Some libraries that are available today include:
+
+- [Standard Library](https://github.com/noir-lang/noir/tree/master/noir_stdlib) - the Noir Standard Library
+- [Ethereum Storage Proof Verification](https://github.com/aragonzkresearch/noir-trie-proofs) - a library that contains the primitives necessary for RLP decoding (in the form of look-up table construction) and Ethereum state and storage proof verification (or verification of any trie proof involving 32-byte long keys)
+- [BigInt](https://github.com/shuklaayush/noir-bigint) - a library that provides a custom BigUint56 data type, allowing for computations on large unsigned integers
+- [ECrecover](https://github.com/colinnielsen/ecrecover-noir/tree/main) - a library to verify an ECDSA signature and return the source Ethereum address
+- [Sparse Merkle Tree Verifier](https://github.com/vocdoni/smtverifier-noir/tree/main) - a library for verification of sparse Merkle trees
+- [Signed Int](https://github.com/resurgencelabs/signed_int) - a library for accessing a custom Signed Integer data type, allowing access to negative numbers on Noir
+- [Fraction](https://github.com/resurgencelabs/fraction) - a library for accessing fractional number data type in Noir, allowing results that aren't whole numbers
diff --git a/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/modules.md b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/modules.md
new file mode 100644
index 00000000000..ae822a1cff4
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/modules.md
@@ -0,0 +1,105 @@
+---
+title: Modules
+description:
+  Learn how to organize your files using modules in Noir, following the same convention as Rust's
+  module system. Examples included.
+keywords: [Noir, Rust, modules, organizing files, sub-modules]
+sidebar_position: 2
+---
+
+Noir's module system follows the same convention as the _newer_ version of Rust's module system.
+
+## Purpose of Modules
+
+Modules are used to organize files. Without modules all of your code would need to live in a single
+file. In Noir, the compiler does not automatically scan all of your files to detect modules. This
+must be done explicitly by the developer.
+
+## Examples
+
+### Importing a module in the crate root
+
+Filename : `src/main.nr`
+
+```rust
+mod foo;
+
+fn main() {
+    foo::hello_world();
+}
+```
+
+Filename : `src/foo.nr`
+
+```rust
+fn from_foo() {}
+```
+
+In the above snippet, the crate root is the `src/main.nr` file. The compiler sees the module
+declaration `mod foo` which prompts it to look for a foo.nr file.
+
+Visually this module hierarchy looks like the following :
+
+```
+crate
+ ├── main
+ │
+ └── foo
+      └── from_foo
+
+```
+
+### Importing a module throughout the tree
+
+All modules are accessible from the `crate::` namespace.
+
+```
+crate
+ ├── bar
+ ├── foo
+ └── main
+
+```
+
+In the above snippet, if `bar` would like to use functions in `foo`, it can do so by `use crate::foo::function_name`.
+
+### Sub-modules
+
+Filename : `src/main.nr`
+
+```rust
+mod foo;
+
+fn main() {
+    foo::from_foo();
+}
+```
+
+Filename : `src/foo.nr`
+
+```rust
+mod bar;
+fn from_foo() {}
+```
+
+Filename : `src/foo/bar.nr`
+
+```rust
+fn from_bar() {}
+```
+
+In the above snippet, we have added an extra module to the module tree; `bar`. `bar` is a submodule
+of `foo` hence we declare bar in `foo.nr` with `mod bar`. Since `foo` is not the crate root, the
+compiler looks for the file associated with the `bar` module in `src/foo/bar.nr`
+
+Visually the module hierarchy looks as follows:
+
+```
+crate
+ ├── main
+ │
+ └── foo
+      ├── from_foo
+      └── bar
+           └── from_bar
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/workspaces.md b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/workspaces.md
new file mode 100644
index 00000000000..513497f12bf
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/modules_packages_crates/workspaces.md
@@ -0,0 +1,42 @@
+---
+title: Workspaces
+sidebar_position: 3
+---
+
+Workspaces are a feature of nargo that allow you to manage multiple related Noir packages in a single repository. A workspace is essentially a group of related projects that share common build output directories and configurations.
+
+Each Noir project (with it's own Nargo.toml file) can be thought of as a package. Each package is expected to contain exactly one "named circuit", being the "name" defined in Nargo.toml with the program logic defined in `./src/main.nr`.
+
+For a project with the following structure:
+
+```tree
+├── crates
+│   ├── a
+│   │   ├── Nargo.toml
+│   │   └── Prover.toml
+│   │   └── src
+│   │       └── main.nr
+│   └── b
+│       ├── Nargo.toml
+│       └── Prover.toml
+│       └── src
+│           └── main.nr
+│
+└── Nargo.toml
+```
+
+You can define a workspace in Nargo.toml like so:
+
+```toml
+[workspace]
+members = ["crates/a", "crates/b"]
+default-member = "crates/a"
+```
+
+`members` indicates which packages are included in the workspace. As such, all member packages of a workspace will be processed when the `--workspace` flag is used with various commands or if a `default-member` is not specified.
+
+`default-member` indicates which package various commands process by default.
+
+Libraries can be defined in a workspace. Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml.
+
+Inside a workspace, these are consumed as `{ path = "../to_lib" }` dependencies in Nargo.toml.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/_category_.json b/docs/versioned_docs/version-v0.31.0/noir/standard_library/_category_.json
new file mode 100644
index 00000000000..af04c0933fd
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Standard Library",
+    "position": 1,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/bigint.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/bigint.md
new file mode 100644
index 00000000000..2bfdeec6631
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/bigint.md
@@ -0,0 +1,122 @@
+---
+title: Big Integers
+description: How to use big integers from Noir standard library
+keywords:
+  [
+    Big Integer,
+    Noir programming language,
+    Noir libraries,
+  ]
+---
+
+The BigInt module in the standard library exposes some class of integers which do not fit (well) into a Noir native field. It implements modulo arithmetic, modulo a 'big' prime number.
+
+:::note
+
+The module can currently be considered as `Field`s with fixed modulo sizes used by a set of elliptic curves, in addition to just the native curve. [More work](https://github.com/noir-lang/noir/issues/510) is needed to achieve arbitrarily sized big integers.
+
+:::
+
+Currently 6 classes of integers (i.e 'big' prime numbers) are available in the module, namely:
+
+- BN254 Fq: Bn254Fq
+- BN254 Fr: Bn254Fr
+- Secp256k1 Fq: Secpk1Fq
+- Secp256k1 Fr: Secpk1Fr
+- Secp256r1 Fr: Secpr1Fr
+- Secp256r1 Fq: Secpr1Fq
+
+Where XXX Fq and XXX Fr denote respectively the order of the base and scalar field of the (usual) elliptic curve XXX.
+For instance the big integer 'Secpk1Fq' in the standard library refers to integers modulo $2^{256}-2^{32}-977$.
+
+Feel free to explore the source code for the other primes:
+
+```rust title="big_int_definition" showLineNumbers 
+struct BigInt {
+    pointer: u32,
+    modulus: u32,
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/bigint.nr#L14-L19" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/bigint.nr#L14-L19</a></sub></sup>
+
+
+## Example usage
+
+A common use-case is when constructing a big integer from its bytes representation, and performing arithmetic operations on it:
+
+```rust title="big_int_example" showLineNumbers 
+fn big_int_example(x: u8, y: u8) {
+    let a = Secpk1Fq::from_le_bytes(&[x, y, 0, 45, 2]);
+    let b = Secpk1Fq::from_le_bytes(&[y, x, 9]);
+    let c = (a + b) * b / a;
+    let d = c.to_le_bytes();
+    println(d[0]);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/bigint/src/main.nr#L70-L78" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/bigint/src/main.nr#L70-L78</a></sub></sup>
+
+
+## Methods
+
+The available operations for each big integer are:
+
+### from_le_bytes
+
+Construct a big integer from its little-endian bytes representation. Example:
+
+```rust
+ // Construct a big integer from a slice of bytes
+ let a = Secpk1Fq::from_le_bytes(&[x, y, 0, 45, 2]);
+ // Construct a big integer from an array of 32 bytes
+ let a = Secpk1Fq::from_le_bytes_32([1;32]);
+ ```
+
+Sure, here's the formatted version of the remaining methods:
+
+### to_le_bytes
+
+Return the little-endian bytes representation of a big integer. Example:
+
+```rust
+let bytes = a.to_le_bytes();
+```
+
+### add
+
+Add two big integers. Example:
+
+```rust
+let sum = a + b;
+```
+
+### sub
+
+Subtract two big integers. Example:
+
+```rust
+let difference = a - b;
+```
+
+### mul
+
+Multiply two big integers. Example:
+
+```rust
+let product = a * b;
+```
+
+### div
+
+Divide two big integers. Note that division is field division and not euclidean division. Example:
+
+```rust
+let quotient = a / b;
+```
+
+### eq
+
+Compare two big integers. Example:
+
+```rust
+let are_equal = a == b;
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/black_box_fns.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/black_box_fns.md
new file mode 100644
index 00000000000..d5694250f05
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/black_box_fns.md
@@ -0,0 +1,32 @@
+---
+title: Black Box Functions
+description: Black box functions are functions in Noir that rely on backends implementing support for specialized constraints.
+keywords: [noir, black box functions]
+---
+
+Black box functions are functions in Noir that rely on backends implementing support for specialized constraints. This makes certain zk-snark unfriendly computations cheaper than if they were implemented in Noir.
+
+The ACVM spec defines a set of blackbox functions which backends will be expected to implement. This allows backends to use optimized implementations of these constraints if they have them, however they may also fallback to less efficient naive implementations if not.
+
+## Function list
+
+Here is a list of the current black box functions:
+
+- [AES128](./cryptographic_primitives/ciphers.mdx#aes128)
+- [SHA256](./cryptographic_primitives/hashes.mdx#sha256)
+- [Schnorr signature verification](./cryptographic_primitives/schnorr.mdx)
+- [Blake2s](./cryptographic_primitives/hashes.mdx#blake2s)
+- [Blake3](./cryptographic_primitives/hashes.mdx#blake3)
+- [Pedersen Hash](./cryptographic_primitives/hashes.mdx#pedersen_hash)
+- [Pedersen Commitment](./cryptographic_primitives/hashes.mdx#pedersen_commitment)
+- [ECDSA signature verification](./cryptographic_primitives/ecdsa_sig_verification.mdx)
+- [Embedded curve operations (MSM, addition, ...)](./cryptographic_primitives/embedded_curve_ops.mdx)
+- AND
+- XOR
+- RANGE
+- [Keccak256](./cryptographic_primitives/hashes.mdx#keccak256)
+- [Recursive proof verification](./recursion.md)
+
+Most black box functions are included as part of the Noir standard library, however `AND`, `XOR` and `RANGE` are used as part of the Noir language syntax. For instance, using the bitwise operator `&` will invoke the `AND` black box function.
+
+You can view the black box functions defined in the ACVM code [here](https://github.com/noir-lang/noir/blob/master/acvm-repo/acir/src/circuit/black_box_functions.rs).
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/bn254.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/bn254.md
new file mode 100644
index 00000000000..3294f005dbb
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/bn254.md
@@ -0,0 +1,46 @@
+---
+title: Bn254 Field Library
+---
+
+Noir provides a module in standard library with some optimized functions for bn254 Fr in `std::field::bn254`.
+
+## decompose
+
+```rust
+fn decompose(x: Field) -> (Field, Field) {}
+```
+
+Decomposes a single field into two fields, low and high. The low field contains the lower 16 bytes of the input field and the high field contains the upper 16 bytes of the input field. Both field results are range checked to 128 bits.
+
+
+## assert_gt
+
+```rust
+fn assert_gt(a: Field, b: Field) {}
+```
+
+Asserts that a > b. This will generate less constraints than using `assert(gt(a, b))`.
+
+## assert_lt
+
+```rust
+fn assert_lt(a: Field, b: Field) {}
+```
+
+Asserts that a < b. This will generate less constraints than using `assert(lt(a, b))`.
+
+## gt
+
+```rust
+fn gt(a: Field, b: Field) -> bool  {}
+```
+
+Returns true if a > b.
+
+## lt
+
+```rust
+fn lt(a: Field, b: Field) -> bool  {}
+```
+
+Returns true if a < b.
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/boundedvec.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/boundedvec.md
new file mode 100644
index 00000000000..4349eab67c5
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/boundedvec.md
@@ -0,0 +1,419 @@
+---
+title: Bounded Vectors
+keywords: [noir, vector, bounded vector, slice]
+sidebar_position: 1
+---
+
+A `BoundedVec<T, MaxLen>` is a growable storage similar to a `Vec<T>` except that it
+is bounded with a maximum possible length. Unlike `Vec`, `BoundedVec` is not implemented
+via slices and thus is not subject to the same restrictions slices are (notably, nested
+slices - and thus nested vectors as well - are disallowed).
+
+Since a BoundedVec is backed by a normal array under the hood, growing the BoundedVec by
+pushing an additional element is also more efficient - the length only needs to be increased
+by one.
+
+For these reasons `BoundedVec<T, N>` should generally be preferred over `Vec<T>` when there
+is a reasonable maximum bound that can be placed on the vector.
+
+Example:
+
+```rust
+let mut vector: BoundedVec<Field, 10> = BoundedVec::new();
+for i in 0..5 {
+    vector.push(i);
+}
+assert(vector.len() == 5);
+assert(vector.max_len() == 10);
+```
+
+## Methods
+
+### new
+
+```rust
+pub fn new() -> Self
+```
+
+Creates a new, empty vector of length zero.
+
+Since this container is backed by an array internally, it still needs an initial value
+to give each element. To resolve this, each element is zeroed internally. This value
+is guaranteed to be inaccessible unless `get_unchecked` is used.
+
+Example:
+
+```rust
+let empty_vector: BoundedVec<Field, 10> = BoundedVec::new();
+assert(empty_vector.len() == 0);
+```
+
+Note that whenever calling `new` the maximum length of the vector should always be specified
+via a type signature:
+
+```rust title="new_example" showLineNumbers 
+fn foo() -> BoundedVec<Field, 10> {
+    // Ok! MaxLen is specified with a type annotation
+    let v1: BoundedVec<Field, 3> = BoundedVec::new();
+    let v2 = BoundedVec::new();
+
+    // Ok! MaxLen is known from the type of foo's return value
+    v2
+}
+
+fn bad() {
+    let mut v3 = BoundedVec::new();
+
+    // Not Ok! We don't know if v3's MaxLen is at least 1, and the compiler often infers 0 by default.
+    v3.push(5);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L11-L27" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L11-L27</a></sub></sup>
+
+
+This defaulting of `MaxLen` (and numeric generics in general) to zero may change in future noir versions
+but for now make sure to use type annotations when using bounded vectors. Otherwise, you will receive a constraint failure at runtime when the vec is pushed to.
+
+### get
+
+```rust
+pub fn get(self, index: u64) -> T {
+```
+
+Retrieves an element from the vector at the given index, starting from zero.
+
+If the given index is equal to or greater than the length of the vector, this
+will issue a constraint failure.
+
+Example:
+
+```rust
+fn foo<N>(v: BoundedVec<u32, N>) {
+    let first = v.get(0);
+    let last = v.get(v.len() - 1);
+    assert(first != last);
+}
+```
+
+### get_unchecked
+
+```rust
+pub fn get_unchecked(self, index: u64) -> T {
+```
+
+Retrieves an element from the vector at the given index, starting from zero, without
+performing a bounds check.
+
+Since this function does not perform a bounds check on length before accessing the element,
+it is unsafe! Use at your own risk!
+
+Example:
+
+```rust title="get_unchecked_example" showLineNumbers 
+fn sum_of_first_three<N>(v: BoundedVec<u32, N>) -> u32 {
+    // Always ensure the length is larger than the largest
+    // index passed to get_unchecked
+    assert(v.len() > 2);
+    let first = v.get_unchecked(0);
+    let second = v.get_unchecked(1);
+    let third = v.get_unchecked(2);
+    first + second + third
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L54-L64" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L54-L64</a></sub></sup>
+
+
+### set
+
+```rust
+pub fn set(&mut self: Self, index: u64, value: T) {
+```
+
+Writes an element to the vector at the given index, starting from zero.
+
+If the given index is equal to or greater than the length of the vector, this will issue a constraint failure.
+
+Example:
+
+```rust
+fn foo<N>(v: BoundedVec<u32, N>) {
+    let first = v.get(0);
+    assert(first != 42);
+    v.set(0, 42);
+    let new_first = v.get(0);
+    assert(new_first == 42);
+}
+```
+
+### set_unchecked
+
+```rust
+pub fn set_unchecked(&mut self: Self, index: u64, value: T) -> T {
+```
+
+Writes an element to the vector at the given index, starting from zero, without performing a bounds check.
+
+Since this function does not perform a bounds check on length before accessing the element, it is unsafe! Use at your own risk!
+
+Example:
+
+```rust title="set_unchecked_example" showLineNumbers 
+fn set_unchecked_example() {
+    let mut vec: BoundedVec<u32, 5> = BoundedVec::new();
+    vec.extend_from_array([1, 2]);
+
+    // Here we're safely writing within the valid range of `vec`
+    // `vec` now has the value [42, 2]
+    vec.set_unchecked(0, 42);
+
+    // We can then safely read this value back out of `vec`.
+    // Notice that we use the checked version of `get` which would prevent reading unsafe values.
+    assert_eq(vec.get(0), 42);
+
+    // We've now written past the end of `vec`.
+    // As this index is still within the maximum potential length of `v`,
+    // it won't cause a constraint failure. 
+    vec.set_unchecked(2, 42);
+    println(vec);
+
+    // This will write past the end of the maximum potential length of `vec`,
+    // it will then trigger a constraint failure.
+    vec.set_unchecked(5, 42);
+    println(vec);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L67-L91" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L67-L91</a></sub></sup>
+
+
+
+### push
+
+```rust
+pub fn push(&mut self, elem: T) {
+```
+
+Pushes an element to the end of the vector. This increases the length
+of the vector by one.
+
+Panics if the new length of the vector will be greater than the max length.
+
+Example:
+
+```rust title="bounded-vec-push-example" showLineNumbers 
+let mut v: BoundedVec<Field, 2> = BoundedVec::new();
+
+    v.push(1);
+    v.push(2);
+
+    // Panics with failed assertion "push out of bounds"
+    v.push(3);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L95-L103" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L95-L103</a></sub></sup>
+
+
+### pop
+
+```rust
+pub fn pop(&mut self) -> T
+```
+
+Pops the element at the end of the vector. This will decrease the length
+of the vector by one.
+
+Panics if the vector is empty.
+
+Example:
+
+```rust title="bounded-vec-pop-example" showLineNumbers 
+let mut v: BoundedVec<Field, 2> = BoundedVec::new();
+    v.push(1);
+    v.push(2);
+
+    let two = v.pop();
+    let one = v.pop();
+
+    assert(two == 2);
+    assert(one == 1);
+    // error: cannot pop from an empty vector
+    // let _ = v.pop();
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L108-L120" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L108-L120</a></sub></sup>
+
+
+### len
+
+```rust
+pub fn len(self) -> u64 {
+```
+
+Returns the current length of this vector
+
+Example:
+
+```rust title="bounded-vec-len-example" showLineNumbers 
+let mut v: BoundedVec<Field, 4> = BoundedVec::new();
+    assert(v.len() == 0);
+
+    v.push(100);
+    assert(v.len() == 1);
+
+    v.push(200);
+    v.push(300);
+    v.push(400);
+    assert(v.len() == 4);
+
+    let _ = v.pop();
+    let _ = v.pop();
+    assert(v.len() == 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L125-L140" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L125-L140</a></sub></sup>
+
+
+### max_len
+
+```rust
+pub fn max_len(_self: BoundedVec<T, MaxLen>) -> u64 {
+```
+
+Returns the maximum length of this vector. This is always
+equal to the `MaxLen` parameter this vector was initialized with.
+
+Example:
+
+```rust title="bounded-vec-max-len-example" showLineNumbers 
+let mut v: BoundedVec<Field, 5> = BoundedVec::new();
+
+    assert(v.max_len() == 5);
+    v.push(10);
+    assert(v.max_len() == 5);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L145-L151" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L145-L151</a></sub></sup>
+
+
+### storage
+
+```rust
+pub fn storage(self) -> [T; MaxLen] {
+```
+
+Returns the internal array within this vector.
+Since arrays in Noir are immutable, mutating the returned storage array will not mutate
+the storage held internally by this vector.
+
+Note that uninitialized elements may be zeroed out!
+
+Example:
+
+```rust title="bounded-vec-storage-example" showLineNumbers 
+let mut v: BoundedVec<Field, 5> = BoundedVec::new();
+
+    assert(v.storage() == [0, 0, 0, 0, 0]);
+
+    v.push(57);
+    assert(v.storage() == [57, 0, 0, 0, 0]);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L156-L163" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L156-L163</a></sub></sup>
+
+
+### extend_from_array
+
+```rust
+pub fn extend_from_array<Len>(&mut self, array: [T; Len])
+```
+
+Pushes each element from the given array to this vector.
+
+Panics if pushing each element would cause the length of this vector
+to exceed the maximum length.
+
+Example:
+
+```rust title="bounded-vec-extend-from-array-example" showLineNumbers 
+let mut vec: BoundedVec<Field, 3> = BoundedVec::new();
+    vec.extend_from_array([2, 4]);
+
+    assert(vec.len == 2);
+    assert(vec.get(0) == 2);
+    assert(vec.get(1) == 4);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L168-L175" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L168-L175</a></sub></sup>
+
+
+### extend_from_bounded_vec
+
+```rust
+pub fn extend_from_bounded_vec<Len>(&mut self, vec: BoundedVec<T, Len>)
+```
+
+Pushes each element from the other vector to this vector. The length of
+the other vector is left unchanged.
+
+Panics if pushing each element would cause the length of this vector
+to exceed the maximum length.
+
+Example:
+
+```rust title="bounded-vec-extend-from-bounded-vec-example" showLineNumbers 
+let mut v1: BoundedVec<Field, 5> = BoundedVec::new();
+    let mut v2: BoundedVec<Field, 7> = BoundedVec::new();
+
+    v2.extend_from_array([1, 2, 3]);
+    v1.extend_from_bounded_vec(v2);
+
+    assert(v1.storage() == [1, 2, 3, 0, 0]);
+    assert(v2.storage() == [1, 2, 3, 0, 0, 0, 0]);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L180-L189" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L180-L189</a></sub></sup>
+
+
+### from_array
+
+```rust
+pub fn from_array<Len>(array: [T; Len]) -> Self
+```
+
+Creates a new vector, populating it with values derived from an array input. 
+The maximum length of the vector is determined based on the type signature.
+
+Example:
+```rust
+let bounded_vec: BoundedVec<Field, 10> = BoundedVec::from_array([1, 2, 3])
+```
+
+### map
+
+```rust
+pub fn map<U, Env>(self, f: fn[Env](T) -> U) -> BoundedVec<U, MaxLen>
+```
+
+Creates a new vector of equal size by calling a closure on each element in this vector.  
+
+Example:
+
+```rust title="bounded-vec-map-example" showLineNumbers 
+let vec: BoundedVec<u32, 4> = BoundedVec::from_array([1, 2, 3, 4]);
+            let result = vec.map(|value| value * 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/bounded_vec.nr#L214-L217" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/bounded_vec.nr#L214-L217</a></sub></sup>
+
+
+### any
+
+```rust
+pub fn any<Env>(self, predicate: fn[Env](T) -> bool) -> bool
+```
+
+Returns true if the given predicate returns true for any element
+in this vector.
+
+Example:
+
+```rust title="bounded-vec-any-example" showLineNumbers 
+let mut v: BoundedVec<u32, 3> = BoundedVec::new();
+    v.extend_from_array([2, 4, 6]);
+
+    let all_even = !v.any(|elem: u32| elem % 2 != 0);
+    assert(all_even);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/noir_test_success/bounded_vec/src/main.nr#L256-L262" target="_blank" rel="noopener noreferrer">Source code: test_programs/noir_test_success/bounded_vec/src/main.nr#L256-L262</a></sub></sup>
+
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/hashmap.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/hashmap.md
new file mode 100644
index 00000000000..408b6ba9da7
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/hashmap.md
@@ -0,0 +1,570 @@
+---
+title: HashMap
+keywords: [noir, map, hash, hashmap]
+sidebar_position: 1
+---
+
+`HashMap<Key, Value, MaxLen, Hasher>` is used to efficiently store and look up key-value pairs.
+
+`HashMap` is a bounded type which can store anywhere from zero to `MaxLen` total elements.
+Note that due to hash collisions, the actual maximum number of elements stored by any particular
+hashmap is likely lower than `MaxLen`. This is true even with cryptographic hash functions since
+every hash value will be performed modulo `MaxLen`.
+
+When creating `HashMap`s, the `MaxLen` generic should always be specified if it is not already
+known. Otherwise, the compiler may infer a different value for `MaxLen` (such as zero), which
+will likely change the result of the program. This behavior is set to become an error in future
+versions instead.
+
+Example:
+
+```rust
+// Create a mapping from Fields to u32s with a maximum length of 12
+// using a poseidon2 hasher
+use std::hash::poseidon2::Poseidon2Hasher;
+let mut map: HashMap<Field, u32, 12, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
+
+map.insert(1, 2);
+map.insert(3, 4);
+
+let two = map.get(1).unwrap();
+```
+
+## Methods
+
+### default
+
+```rust title="default" showLineNumbers 
+impl<K, V, N, B, H> Default for HashMap<K, V, N, B>
+where
+    B: BuildHasher<H> + Default,
+    H: Hasher + Default
+{
+    fn default() -> Self {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L462-L469" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L462-L469</a></sub></sup>
+
+
+Creates a fresh, empty HashMap.
+
+When using this function, always make sure to specify the maximum size of the hash map.
+
+This is the same `default` from the `Default` implementation given further below. It is
+repeated here for convenience since it is the recommended way to create a hashmap.
+
+Example:
+
+```rust title="default_example" showLineNumbers 
+let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
+    assert(hashmap.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L202-L205" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L202-L205</a></sub></sup>
+
+
+Because `HashMap` has so many generic arguments that are likely to be the same throughout
+your program, it may be helpful to create a type alias:
+
+```rust title="type_alias" showLineNumbers 
+type MyMap = HashMap<u8, u32, 10, BuildHasherDefault<Poseidon2Hasher>>;
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L196-L198" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L196-L198</a></sub></sup>
+
+
+### with_hasher
+
+```rust title="with_hasher" showLineNumbers 
+pub fn with_hasher(_build_hasher: B) -> Self
+    where
+        B: BuildHasher<H> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L82-L86" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L82-L86</a></sub></sup>
+
+
+Creates a hashmap with an existing `BuildHasher`. This can be used to ensure multiple
+hashmaps are created with the same hasher instance.
+
+Example:
+
+```rust title="with_hasher_example" showLineNumbers 
+let my_hasher: BuildHasherDefault<Poseidon2Hasher> = Default::default();
+    let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<Poseidon2Hasher>> = HashMap::with_hasher(my_hasher);
+    assert(hashmap.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L207-L211" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L207-L211</a></sub></sup>
+
+
+### get
+
+```rust title="get" showLineNumbers 
+pub fn get(
+        self,
+        key: K
+    ) -> Option<V>
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L278-L287" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L278-L287</a></sub></sup>
+
+
+Retrieves a value from the hashmap, returning `Option::none()` if it was not found.
+
+Example:
+
+```rust title="get_example" showLineNumbers 
+fn get_example(map: HashMap<Field, Field, 5, BuildHasherDefault<Poseidon2Hasher>>) {
+    let x = map.get(12);
+
+    if x.is_some() {
+        assert(x.unwrap() == 42);
+    }
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L299-L307" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L299-L307</a></sub></sup>
+
+
+### insert
+
+```rust title="insert" showLineNumbers 
+pub fn insert(
+        &mut self,
+        key: K,
+        value: V
+    )
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L313-L323" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L313-L323</a></sub></sup>
+
+
+Inserts a new key-value pair into the map. If the key was already in the map, its
+previous value will be overridden with the newly provided one.
+
+Example:
+
+```rust title="insert_example" showLineNumbers 
+let mut map: HashMap<Field, Field, 5, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
+    map.insert(12, 42);
+    assert(map.len() == 1);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L213-L217" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L213-L217</a></sub></sup>
+
+
+### remove
+
+```rust title="remove" showLineNumbers 
+pub fn remove(
+        &mut self,
+        key: K
+    )
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L356-L365" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L356-L365</a></sub></sup>
+
+
+Removes the given key-value pair from the map. If the key was not already present
+in the map, this does nothing.
+
+Example:
+
+```rust title="remove_example" showLineNumbers 
+map.remove(12);
+    assert(map.is_empty());
+
+    // If a key was not present in the map, remove does nothing
+    map.remove(12);
+    assert(map.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L221-L228" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L221-L228</a></sub></sup>
+
+
+### is_empty
+
+```rust title="is_empty" showLineNumbers 
+pub fn is_empty(self) -> bool {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L115-L117" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L115-L117</a></sub></sup>
+
+
+True if the length of the hash map is empty.
+
+Example:
+
+```rust title="is_empty_example" showLineNumbers 
+assert(map.is_empty());
+
+    map.insert(1, 2);
+    assert(!map.is_empty());
+
+    map.remove(1);
+    assert(map.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L230-L238" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L230-L238</a></sub></sup>
+
+
+### len
+
+```rust title="len" showLineNumbers 
+pub fn len(self) -> u32 {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L264-L266" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L264-L266</a></sub></sup>
+
+
+Returns the current length of this hash map.
+
+Example:
+
+```rust title="len_example" showLineNumbers 
+// This is equivalent to checking map.is_empty()
+    assert(map.len() == 0);
+
+    map.insert(1, 2);
+    map.insert(3, 4);
+    map.insert(5, 6);
+    assert(map.len() == 3);
+
+    // 3 was already present as a key in the hash map, so the length is unchanged
+    map.insert(3, 7);
+    assert(map.len() == 3);
+
+    map.remove(1);
+    assert(map.len() == 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L240-L255" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L240-L255</a></sub></sup>
+
+
+### capacity
+
+```rust title="capacity" showLineNumbers 
+pub fn capacity(_self: Self) -> u32 {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L271-L273" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L271-L273</a></sub></sup>
+
+
+Returns the maximum capacity of this hashmap. This is always equal to the capacity
+specified in the hashmap's type.
+
+Unlike hashmaps in general purpose programming languages, hashmaps in Noir have a
+static capacity that does not increase as the map grows larger. Thus, this capacity
+is also the maximum possible element count that can be inserted into the hashmap.
+Due to hash collisions (modulo the hashmap length), it is likely the actual maximum
+element count will be lower than the full capacity.
+
+Example:
+
+```rust title="capacity_example" showLineNumbers 
+let empty_map: HashMap<Field, Field, 42, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
+    assert(empty_map.len() == 0);
+    assert(empty_map.capacity() == 42);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L257-L261" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L257-L261</a></sub></sup>
+
+
+### clear
+
+```rust title="clear" showLineNumbers 
+pub fn clear(&mut self) {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L93-L95" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L93-L95</a></sub></sup>
+
+
+Clears the hashmap, removing all key-value pairs from it.
+
+Example:
+
+```rust title="clear_example" showLineNumbers 
+assert(!map.is_empty());
+    map.clear();
+    assert(map.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L263-L267" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L263-L267</a></sub></sup>
+
+
+### contains_key
+
+```rust title="contains_key" showLineNumbers 
+pub fn contains_key(
+        self,
+        key: K
+    ) -> bool
+    where
+        K: Hash + Eq,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L101-L110" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L101-L110</a></sub></sup>
+
+
+True if the hashmap contains the given key. Unlike `get`, this will not also return
+the value associated with the key.
+
+Example:
+
+```rust title="contains_key_example" showLineNumbers 
+if map.contains_key(7) {
+        let value = map.get(7);
+        assert(value.is_some());
+    } else {
+        println("No value for key 7!");
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L269-L276" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L269-L276</a></sub></sup>
+
+
+### entries
+
+```rust title="entries" showLineNumbers 
+pub fn entries(self) -> BoundedVec<(K, V), N> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L123-L125" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L123-L125</a></sub></sup>
+
+
+Returns a vector of each key-value pair present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+```rust title="entries_example" showLineNumbers 
+let entries = map.entries();
+
+    // The length of a hashmap may not be compile-time known, so we
+    // need to loop over its capacity instead
+    for i in 0..map.capacity() {
+        if i < entries.len() {
+            let (key, value) = entries.get(i);
+            println(f"{key} -> {value}");
+        }
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L310-L321" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L310-L321</a></sub></sup>
+
+
+### keys
+
+```rust title="keys" showLineNumbers 
+pub fn keys(self) -> BoundedVec<K, N> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L144-L146" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L144-L146</a></sub></sup>
+
+
+Returns a vector of each key present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+```rust title="keys_example" showLineNumbers 
+let keys = map.keys();
+
+    for i in 0..keys.max_len() {
+        if i < keys.len() {
+            let key = keys.get_unchecked(i);
+            let value = map.get(key).unwrap_unchecked();
+            println(f"{key} -> {value}");
+        }
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L323-L333" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L323-L333</a></sub></sup>
+
+
+### values
+
+```rust title="values" showLineNumbers 
+pub fn values(self) -> BoundedVec<V, N> {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L164-L166" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L164-L166</a></sub></sup>
+
+
+Returns a vector of each value present in the hashmap.
+
+The length of the returned vector is always equal to the length of the hashmap.
+
+Example:
+
+```rust title="values_example" showLineNumbers 
+let values = map.values();
+
+    for i in 0..values.max_len() {
+        if i < values.len() {
+            let value = values.get_unchecked(i);
+            println(f"Found value {value}");
+        }
+    }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L335-L344" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L335-L344</a></sub></sup>
+
+
+### iter_mut
+
+```rust title="iter_mut" showLineNumbers 
+pub fn iter_mut(
+        &mut self,
+        f: fn(K, V) -> (K, V)
+    )
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L183-L192" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L183-L192</a></sub></sup>
+
+
+Iterates through each key-value pair of the HashMap, setting each key-value pair to the
+result returned from the given function.
+
+Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated
+through. If this is not desired, use `iter_values_mut` if only values need to be mutated,
+or `entries` if neither keys nor values need to be mutated.
+
+The iteration order is left unspecified. As a result, if two keys are mutated to become
+equal, which of the two values that will be present for the key in the resulting map is also unspecified.
+
+Example:
+
+```rust title="iter_mut_example" showLineNumbers 
+// Add 1 to each key in the map, and double the value associated with that key.
+    map.iter_mut(|k, v| (k + 1, v * 2));
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L348-L351" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L348-L351</a></sub></sup>
+
+
+### iter_keys_mut
+
+```rust title="iter_keys_mut" showLineNumbers 
+pub fn iter_keys_mut(
+        &mut self,
+        f: fn(K) -> K
+    ) 
+    where
+        K: Eq + Hash,
+        B: BuildHasher<H>,
+        H: Hasher {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L208-L217" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L208-L217</a></sub></sup>
+
+
+Iterates through the HashMap, mutating each key to the result returned from
+the given function.
+
+Note that since keys can be mutated, the HashMap needs to be rebuilt as it is iterated
+through. If only iteration is desired and the keys are not intended to be mutated,
+prefer using `entries` instead.
+
+The iteration order is left unspecified. As a result, if two keys are mutated to become
+equal, which of the two values that will be present for the key in the resulting map is also unspecified.
+
+Example:
+
+```rust title="iter_keys_mut_example" showLineNumbers 
+// Double each key, leaving the value associated with that key untouched
+    map.iter_keys_mut(|k| k * 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L353-L356" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L353-L356</a></sub></sup>
+
+
+### iter_values_mut
+
+```rust title="iter_values_mut" showLineNumbers 
+pub fn iter_values_mut(&mut self, f: fn(V) -> V) {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L233-L235" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L233-L235</a></sub></sup>
+
+
+Iterates through the HashMap, applying the given function to each value and mutating the
+value to equal the result. This function is more efficient than `iter_mut` and `iter_keys_mut`
+because the keys are untouched and the underlying hashmap thus does not need to be reordered.
+
+Example:
+
+```rust title="iter_values_mut_example" showLineNumbers 
+// Halve each value
+    map.iter_values_mut(|v| v / 2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L358-L361" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L358-L361</a></sub></sup>
+
+
+### retain
+
+```rust title="retain" showLineNumbers 
+pub fn retain(&mut self, f: fn(K, V) -> bool) {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L247-L249" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L247-L249</a></sub></sup>
+
+
+Retains only the key-value pairs for which the given function returns true.
+Any key-value pairs for which the function returns false will be removed from the map.
+
+Example:
+
+```rust title="retain_example" showLineNumbers 
+map.retain(|k, v| (k != 0) & (v != 0));
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L281-L283" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L281-L283</a></sub></sup>
+
+
+## Trait Implementations
+
+### default
+
+```rust title="default" showLineNumbers 
+impl<K, V, N, B, H> Default for HashMap<K, V, N, B>
+where
+    B: BuildHasher<H> + Default,
+    H: Hasher + Default
+{
+    fn default() -> Self {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L462-L469" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L462-L469</a></sub></sup>
+
+
+Constructs an empty HashMap.
+
+Example:
+
+```rust title="default_example" showLineNumbers 
+let hashmap: HashMap<u8, u32, 10, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
+    assert(hashmap.is_empty());
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L202-L205" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L202-L205</a></sub></sup>
+
+
+### eq
+
+```rust title="eq" showLineNumbers 
+impl<K, V, N, B, H> Eq for HashMap<K, V, N, B>
+where
+    K: Eq + Hash,
+    V: Eq,
+    B: BuildHasher<H>,
+    H: Hasher
+{
+    fn eq(self, other: HashMap<K, V, N, B>) -> bool {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/collections/map.nr#L426-L435" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/collections/map.nr#L426-L435</a></sub></sup>
+
+
+Checks if two HashMaps are equal.
+
+Example:
+
+```rust title="eq_example" showLineNumbers 
+let mut map1: HashMap<Field, u64, 4, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
+    let mut map2: HashMap<Field, u64, 4, BuildHasherDefault<Poseidon2Hasher>> = HashMap::default();
+
+    map1.insert(1, 2);
+    map1.insert(3, 4);
+
+    map2.insert(3, 4);
+    map2.insert(1, 2);
+
+    assert(map1 == map2);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/hashmap/src/main.nr#L285-L296" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/hashmap/src/main.nr#L285-L296</a></sub></sup>
+
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/index.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/index.md
new file mode 100644
index 00000000000..ea84c6d5c21
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/index.md
@@ -0,0 +1,5 @@
+---
+title: Containers
+description: Container types provided by Noir's standard library for storing and retrieving data
+keywords: [containers, data types, vec, hashmap]
+---
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/vec.mdx b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/vec.mdx
new file mode 100644
index 00000000000..475011922f8
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/containers/vec.mdx
@@ -0,0 +1,170 @@
+---
+title: Vectors
+description: Delve into the Vec data type in Noir. Learn about its methods, practical examples, and best practices for using Vectors in your Noir code.
+keywords: [noir, vector type, methods, examples, dynamic arrays]
+sidebar_position: 6
+---
+
+import Experimental from '@site/src/components/Notes/_experimental.mdx';
+
+<Experimental />
+
+A vector is a collection type similar to Rust's `Vec<T>` type. In Noir, it is a convenient way to use slices as mutable arrays.
+
+Example:
+
+```rust
+let mut vector: Vec<Field> = Vec::new();
+for i in 0..5 {
+    vector.push(i);
+}
+assert(vector.len() == 5);
+```
+
+## Methods
+
+### new
+
+Creates a new, empty vector.
+
+```rust
+pub fn new() -> Self
+```
+
+Example:
+
+```rust
+let empty_vector: Vec<Field> = Vec::new();
+assert(empty_vector.len() == 0);
+```
+
+### from_slice
+
+Creates a vector containing each element from a given slice. Mutations to the resulting vector will not affect the original slice.
+
+```rust
+pub fn from_slice(slice: [T]) -> Self
+```
+
+Example:
+
+```rust
+let slice: [Field] = &[1, 2, 3];
+let vector_from_slice = Vec::from_slice(slice);
+assert(vector_from_slice.len() == 3);
+```
+
+### len
+
+Returns the number of elements in the vector.
+
+```rust
+pub fn len(self) -> Field
+```
+
+Example:
+
+```rust
+let empty_vector: Vec<Field> = Vec::new();
+assert(empty_vector.len() == 0);
+```
+
+### get
+
+Retrieves an element from the vector at a given index. Panics if the index points beyond the vector's end.
+
+```rust
+pub fn get(self, index: Field) -> T
+```
+
+Example:
+
+```rust
+let vector: Vec<Field> = Vec::from_slice(&[10, 20, 30]);
+assert(vector.get(1) == 20);
+```
+
+### set
+
+```rust
+pub fn set(&mut self: Self, index: u64, value: T) {
+```
+
+Writes an element to the vector at the given index, starting from zero.
+
+Panics if the index points beyond the vector's end.
+
+Example:
+
+```rust
+let vector: Vec<Field> = Vec::from_slice(&[10, 20, 30]);
+assert(vector.get(1) == 20);
+vector.set(1, 42);
+assert(vector.get(1) == 42);
+```
+
+### push
+
+Adds a new element to the vector's end, returning a new vector with a length one greater than the original unmodified vector.
+
+```rust
+pub fn push(&mut self, elem: T)
+```
+
+Example:
+
+```rust
+let mut vector: Vec<Field> = Vec::new();
+vector.push(10);
+assert(vector.len() == 1);
+```
+
+### pop
+
+Removes an element from the vector's end, returning a new vector with a length one less than the original vector, along with the removed element. Panics if the vector's length is zero.
+
+```rust
+pub fn pop(&mut self) -> T
+```
+
+Example:
+
+```rust
+let mut vector = Vec::from_slice(&[10, 20]);
+let popped_elem = vector.pop();
+assert(popped_elem == 20);
+assert(vector.len() == 1);
+```
+
+### insert
+
+Inserts an element at a specified index, shifting subsequent elements to the right.
+
+```rust
+pub fn insert(&mut self, index: Field, elem: T)
+```
+
+Example:
+
+```rust
+let mut vector = Vec::from_slice(&[10, 30]);
+vector.insert(1, 20);
+assert(vector.get(1) == 20);
+```
+
+### remove
+
+Removes an element at a specified index, shifting subsequent elements to the left, and returns the removed element.
+
+```rust
+pub fn remove(&mut self, index: Field) -> T
+```
+
+Example:
+
+```rust
+let mut vector = Vec::from_slice(&[10, 20, 30]);
+let removed_elem = vector.remove(1);
+assert(removed_elem == 20);
+assert(vector.len() == 2);
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/_category_.json b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/_category_.json
new file mode 100644
index 00000000000..5d694210bbf
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 0,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ciphers.mdx b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ciphers.mdx
new file mode 100644
index 00000000000..e83e26efb97
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ciphers.mdx
@@ -0,0 +1,32 @@
+---
+title: Ciphers
+description:
+  Learn about the implemented ciphers ready to use for any Noir project
+keywords:
+  [ciphers, Noir project, aes128, encrypt]
+sidebar_position: 0
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## aes128
+
+Given a plaintext as an array of bytes, returns the corresponding aes128 ciphertext (CBC mode). Input padding is automatically performed using PKCS#7, so that the output length is `input.len() + (16 - input.len() % 16)`.
+
+```rust title="aes128" showLineNumbers 
+pub fn aes128_encrypt<N>(input: [u8; N], iv: [u8; 16], key: [u8; 16]) -> [u8] {}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/aes128.nr#L2-L4" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/aes128.nr#L2-L4</a></sub></sup>
+
+
+```rust
+fn main() {
+    let input: [u8; 4] = [0, 12, 3, 15] // Random bytes, will be padded to 16 bytes.
+    let iv: [u8; 16] = [0; 16]; // Initialisation vector
+    let key: [u8; 16] = [0; 16] // AES key
+    let ciphertext = std::aes128::aes128_encrypt(inputs.as_bytes(), iv.as_bytes(), key.as_bytes()); // In this case, the output length will be 16 bytes.
+}
+```
+
+
+<BlackBoxInfo />
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ec_primitives.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
new file mode 100644
index 00000000000..f839b4a228e
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ec_primitives.md
@@ -0,0 +1,102 @@
+---
+title: Elliptic Curve Primitives
+keywords: [cryptographic primitives, Noir project]
+sidebar_position: 4
+---
+
+Data structures and methods on them that allow you to carry out computations involving elliptic
+curves over the (mathematical) field corresponding to `Field`. For the field currently at our
+disposal, applications would involve a curve embedded in BN254, e.g. the
+[Baby Jubjub curve](https://eips.ethereum.org/EIPS/eip-2494).
+
+## Data structures
+
+### Elliptic curve configurations
+
+(`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::Curve`), i.e. the specific elliptic
+curve you want to use, which would be specified using any one of the methods
+`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::new` which take the coefficients in the
+defining equation together with a generator point as parameters. You can find more detail in the
+comments in
+[`noir_stdlib/src/ec.nr`](https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ec.nr), but
+the gist of it is that the elliptic curves of interest are usually expressed in one of the standard
+forms implemented here (Twisted Edwards, Montgomery and Short Weierstraß), and in addition to that,
+you could choose to use `affine` coordinates (Cartesian coordinates - the usual (x,y) - possibly
+together with a point at infinity) or `curvegroup` coordinates (some form of projective coordinates
+requiring more coordinates but allowing for more efficient implementations of elliptic curve
+operations). Conversions between all of these forms are provided, and under the hood these
+conversions are done whenever an operation is more efficient in a different representation (or a
+mixed coordinate representation is employed).
+
+### Points
+
+(`std::ec::{tecurve,montcurve,swcurve}::{affine,curvegroup}::Point`), i.e. points lying on the
+elliptic curve. For a curve configuration `c` and a point `p`, it may be checked that `p`
+does indeed lie on `c` by calling `c.contains(p1)`.
+
+## Methods
+
+(given a choice of curve representation, e.g. use `std::ec::tecurve::affine::Curve` and use
+`std::ec::tecurve::affine::Point`)
+
+- The **zero element** is given by `Point::zero()`, and we can verify whether a point `p: Point` is
+  zero by calling `p.is_zero()`.
+- **Equality**: Points `p1: Point` and `p2: Point` may be checked for equality by calling
+  `p1.eq(p2)`.
+- **Addition**: For `c: Curve` and points `p1: Point` and `p2: Point` on the curve, adding these two
+  points is accomplished by calling `c.add(p1,p2)`.
+- **Negation**: For a point `p: Point`, `p.negate()` is its negation.
+- **Subtraction**: For `c` and `p1`, `p2` as above, subtracting `p2` from `p1` is accomplished by
+  calling `c.subtract(p1,p2)`.
+- **Scalar multiplication**: For `c` as above, `p: Point` a point on the curve and `n: Field`,
+  scalar multiplication is given by `c.mul(n,p)`. If instead `n :: [u1; N]`, i.e. `n` is a bit
+  array, the `bit_mul` method may be used instead: `c.bit_mul(n,p)`
+- **Multi-scalar multiplication**: For `c` as above and arrays `n: [Field; N]` and `p: [Point; N]`,
+  multi-scalar multiplication is given by `c.msm(n,p)`.
+- **Coordinate representation conversions**: The `into_group` method converts a point or curve
+  configuration in the affine representation to one in the CurveGroup representation, and
+  `into_affine` goes in the other direction.
+- **Curve representation conversions**: `tecurve` and `montcurve` curves and points are equivalent
+  and may be converted between one another by calling `into_montcurve` or `into_tecurve` on their
+  configurations or points. `swcurve` is more general and a curve c of one of the other two types
+  may be converted to this representation by calling `c.into_swcurve()`, whereas a point `p` lying
+  on the curve given by `c` may be mapped to its corresponding `swcurve` point by calling
+  `c.map_into_swcurve(p)`.
+- **Map-to-curve methods**: The Elligator 2 method of mapping a field element `n: Field` into a
+  `tecurve` or `montcurve` with configuration `c` may be called as `c.elligator2_map(n)`. For all of
+  the curve configurations, the SWU map-to-curve method may be called as `c.swu_map(z,n)`, where
+  `z: Field` depends on `Field` and `c` and must be chosen by the user (the conditions it needs to
+  satisfy are specified in the comments
+  [here](https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ec.nr)).
+
+## Examples
+
+The
+[ec_baby_jubjub test](https://github.com/noir-lang/noir/blob/master/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr)
+illustrates all of the above primitives on various forms of the Baby Jubjub curve. A couple of more
+interesting examples in Noir would be:
+
+Public-key cryptography: Given an elliptic curve and a 'base point' on it, determine the public key
+from the private key. This is a matter of using scalar multiplication. In the case of Baby Jubjub,
+for example, this code would do:
+
+```rust
+use std::ec::tecurve::affine::{Curve, Point};
+
+fn bjj_pub_key(priv_key: Field) -> Point
+{
+
+ let bjj = Curve::new(168700, 168696, G::new(995203441582195749578291179787384436505546430278305826713579947235728471134,5472060717959818805561601436314318772137091100104008585924551046643952123905));
+
+ let base_pt = Point::new(5299619240641551281634865583518297030282874472190772894086521144482721001553, 16950150798460657717958625567821834550301663161624707787222815936182638968203);
+
+ bjj.mul(priv_key,base_pt)
+}
+```
+
+This would come in handy in a Merkle proof.
+
+- EdDSA signature verification: This is a matter of combining these primitives with a suitable hash
+  function. See
+  [feat(stdlib): EdDSA sig verification noir#1136](https://github.com/noir-lang/noir/pull/1136) for
+  the case of Baby Jubjub and the Poseidon hash function.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
new file mode 100644
index 00000000000..4394b48f907
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/ecdsa_sig_verification.mdx
@@ -0,0 +1,98 @@
+---
+title: ECDSA Signature Verification
+description: Learn about the cryptographic primitives regarding ECDSA over the secp256k1 and secp256r1 curves
+keywords: [cryptographic primitives, Noir project, ecdsa, secp256k1, secp256r1, signatures]
+sidebar_position: 3
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+Noir supports ECDSA signatures verification over the secp256k1 and secp256r1 curves.
+
+## ecdsa_secp256k1::verify_signature
+
+Verifier for ECDSA Secp256k1 signatures.
+See ecdsa_secp256k1::verify_signature_slice for a version that accepts slices directly.
+
+```rust title="ecdsa_secp256k1" showLineNumbers 
+pub fn verify_signature<N>(
+    public_key_x: [u8; 32],
+    public_key_y: [u8; 32],
+    signature: [u8; 64],
+    message_hash: [u8; N]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ecdsa_secp256k1.nr#L2-L9" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ecdsa_secp256k1.nr#L2-L9</a></sub></sup>
+
+
+example:
+
+```rust
+fn main(hashed_message : [u8;32], pub_key_x : [u8;32], pub_key_y : [u8;32], signature : [u8;64]) {
+     let valid_signature = std::ecdsa_secp256k1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message);
+     assert(valid_signature);
+}
+```
+
+<BlackBoxInfo />
+
+## ecdsa_secp256k1::verify_signature_slice
+
+Verifier for ECDSA Secp256k1 signatures where the message is a slice.
+
+```rust title="ecdsa_secp256k1_slice" showLineNumbers 
+pub fn verify_signature_slice(
+    public_key_x: [u8; 32],
+    public_key_y: [u8; 32],
+    signature: [u8; 64],
+    message_hash: [u8]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ecdsa_secp256k1.nr#L13-L20" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ecdsa_secp256k1.nr#L13-L20</a></sub></sup>
+
+
+<BlackBoxInfo />
+
+## ecdsa_secp256r1::verify_signature
+
+Verifier for ECDSA Secp256r1 signatures.
+See ecdsa_secp256r1::verify_signature_slice for a version that accepts slices directly.
+
+```rust title="ecdsa_secp256r1" showLineNumbers 
+pub fn verify_signature<N>(
+    public_key_x: [u8; 32],
+    public_key_y: [u8; 32],
+    signature: [u8; 64],
+    message_hash: [u8; N]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ecdsa_secp256r1.nr#L2-L9" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ecdsa_secp256r1.nr#L2-L9</a></sub></sup>
+
+
+example:
+
+```rust
+fn main(hashed_message : [u8;32], pub_key_x : [u8;32], pub_key_y : [u8;32], signature : [u8;64]) {
+     let valid_signature = std::ecdsa_secp256r1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message);
+     assert(valid_signature);
+}
+```
+
+<BlackBoxInfo />
+
+## ecdsa_secp256r1::verify_signature
+
+Verifier for ECDSA Secp256r1 signatures where the message is a slice.
+
+```rust title="ecdsa_secp256r1_slice" showLineNumbers 
+pub fn verify_signature_slice(
+    public_key_x: [u8; 32],
+    public_key_y: [u8; 32],
+    signature: [u8; 64],
+    message_hash: [u8]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ecdsa_secp256r1.nr#L13-L20" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ecdsa_secp256r1.nr#L13-L20</a></sub></sup>
+
+
+<BlackBoxInfo />
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/eddsa.mdx b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
new file mode 100644
index 00000000000..1ad42a5ac96
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/eddsa.mdx
@@ -0,0 +1,37 @@
+---
+title: EdDSA Verification
+description: Learn about the cryptographic primitives regarding EdDSA
+keywords: [cryptographic primitives, Noir project, eddsa, signatures]
+sidebar_position: 5
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## eddsa::eddsa_poseidon_verify
+
+Verifier for EdDSA signatures
+
+```rust
+fn eddsa_poseidon_verify(public_key_x : Field, public_key_y : Field, signature_s: Field, signature_r8_x: Field, signature_r8_y: Field, message: Field) -> bool
+```
+
+It is also possible to specify the hash algorithm used for the signature by using the `eddsa_verify` function by passing a type implementing the Hasher trait with the turbofish operator. 
+For instance, if you want to use Poseidon2 instead, you can do the following:
+```rust
+use std::hash::poseidon2::Poseidon2Hasher;
+
+eddsa_verify::<Poseidon2Hasher>(pub_key_a.x, pub_key_a.y, s_a, r8_a.x, r8_a.y, msg);
+```
+
+<BlackBoxInfo />
+
+## eddsa::eddsa_to_pub
+
+Private to public key conversion.
+
+Returns `(pub_key_x, pub_key_y)`
+
+```rust
+fn eddsa_to_pub(secret : Field) -> (Field, Field)
+```
+
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/embedded_curve_ops.mdx b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/embedded_curve_ops.mdx
new file mode 100644
index 00000000000..14d7dda7f0d
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/embedded_curve_ops.mdx
@@ -0,0 +1,98 @@
+---
+title: Scalar multiplication
+description: See how you can perform scalar multiplication in Noir
+keywords: [cryptographic primitives, Noir project, scalar multiplication]
+sidebar_position: 1
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+The following functions perform operations over the embedded curve whose coordinates are defined by the configured noir field.
+For the BN254 scalar field, this is BabyJubJub or Grumpkin.
+
+:::note
+Suffixes `_low` and `_high` denote low and high limbs of a scalar.
+:::
+
+## embedded_curve_ops::multi_scalar_mul
+
+Performs multi scalar multiplication over the embedded curve.
+The function accepts arbitrary amount of point-scalar pairs on the input, it multiplies the individual pairs over
+the curve and returns a sum of the resulting points.
+
+Points represented as x and y coordinates [x1, y1, x2, y2, ...], scalars as low and high limbs [low1, high1, low2, high2, ...].
+
+```rust title="multi_scalar_mul" showLineNumbers 
+pub fn multi_scalar_mul<N>(
+    points: [EmbeddedCurvePoint; N],
+    scalars: [EmbeddedCurveScalar; N]
+) -> [Field; 3]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/embedded_curve_ops.nr#L62-L67" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/embedded_curve_ops.nr#L62-L67</a></sub></sup>
+
+
+example
+
+```rust
+fn main(point_x: Field, point_y: Field, scalar_low: Field, scalar_high: Field) {
+    let point = std::embedded_curve_ops::multi_scalar_mul([point_x, point_y], [scalar_low, scalar_high]);
+    println(point);
+}
+```
+
+## embedded_curve_ops::fixed_base_scalar_mul
+
+Performs fixed base scalar multiplication over the embedded curve (multiplies input scalar with a generator point).
+The function accepts a single scalar on the input represented as 2 fields.
+
+```rust title="fixed_base_scalar_mul" showLineNumbers 
+pub fn fixed_base_scalar_mul(
+    scalar_low: Field,
+    scalar_high: Field
+) -> [Field; 3]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/embedded_curve_ops.nr#L70-L75" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/embedded_curve_ops.nr#L70-L75</a></sub></sup>
+
+
+example
+
+```rust
+fn main(scalar_low: Field, scalar_high: Field) {
+    let point = std::embedded_curve_ops::fixed_base_scalar_mul(scalar_low, scalar_high);
+    println(point);
+}
+```
+
+## embedded_curve_ops::embedded_curve_add
+
+Adds two points on the embedded curve.
+This function takes two `EmbeddedCurvePoint` structures as parameters, representing points on the curve, and returns a new `EmbeddedCurvePoint` structure that represents their sum.
+
+### Parameters:
+- `point1` (`EmbeddedCurvePoint`): The first point to add.
+- `point2` (`EmbeddedCurvePoint`): The second point to add.
+
+### Returns:
+- `EmbeddedCurvePoint`: The resulting point after the addition of `point1` and `point2`.
+
+```rust title="embedded_curve_add" showLineNumbers 
+fn embedded_curve_add(
+    point1: EmbeddedCurvePoint,
+    point2: EmbeddedCurvePoint
+) -> EmbeddedCurvePoint
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/embedded_curve_ops.nr#L84-L89" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/embedded_curve_ops.nr#L84-L89</a></sub></sup>
+
+
+example
+
+```rust
+fn main() {
+    let point1 = EmbeddedCurvePoint { x: 1, y: 2 };
+    let point2 = EmbeddedCurvePoint { x: 3, y: 4 };
+    let result = std::embedded_curve_ops::embedded_curve_add(point1, point2);
+    println!("Resulting Point: ({}, {})", result.x, result.y);
+}
+```
+
+<BlackBoxInfo />
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/hashes.mdx b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/hashes.mdx
new file mode 100644
index 00000000000..18132b9a4dc
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/hashes.mdx
@@ -0,0 +1,246 @@
+---
+title: Hash methods
+description:
+  Learn about the cryptographic primitives ready to use for any Noir project, including sha256,
+  blake2s, pedersen, mimc_bn254 and mimc
+keywords:
+  [cryptographic primitives, Noir project, sha256, blake2s, pedersen, mimc_bn254, mimc, hash]
+sidebar_position: 0
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## sha256
+
+Given an array of bytes, returns the resulting sha256 hash.
+Specify a message_size to hash only the first `message_size` bytes of the input.
+
+```rust title="sha256" showLineNumbers 
+pub fn sha256<N>(input: [u8; N]) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L11-L13" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L11-L13</a></sub></sup>
+
+
+example:
+```rust title="sha256_var" showLineNumbers 
+let digest = std::hash::sha256_var([x as u8], 1);
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/sha256/src/main.nr#L16-L18" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/sha256/src/main.nr#L16-L18</a></sub></sup>
+
+
+```rust
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::sha256::sha256_var(x, 4);
+}
+```
+
+
+<BlackBoxInfo />
+
+## blake2s
+
+Given an array of bytes, returns an array with the Blake2 hash
+
+```rust title="blake2s" showLineNumbers 
+pub fn blake2s<N>(input: [u8; N]) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L17-L19" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L17-L19</a></sub></sup>
+
+
+example:
+
+```rust
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::hash::blake2s(x);
+}
+```
+
+<BlackBoxInfo />
+
+## blake3
+
+Given an array of bytes, returns an array with the Blake3 hash
+
+```rust title="blake3" showLineNumbers 
+pub fn blake3<N>(input: [u8; N]) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L23-L25" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L23-L25</a></sub></sup>
+
+
+example:
+
+```rust
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::hash::blake3(x);
+}
+```
+
+<BlackBoxInfo />
+
+## pedersen_hash
+
+Given an array of Fields, returns the Pedersen hash.
+
+```rust title="pedersen_hash" showLineNumbers 
+pub fn pedersen_hash<N>(input: [Field; N]) -> Field
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L42-L44" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L42-L44</a></sub></sup>
+
+
+example:
+
+```rust title="pedersen-hash" showLineNumbers 
+fn main(x: Field, y: Field, expected_hash: Field) {
+    let hash = std::hash::pedersen_hash([x, y]);
+    assert_eq(hash, expected_hash);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/pedersen_hash/src/main.nr#L1-L7" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/pedersen_hash/src/main.nr#L1-L7</a></sub></sup>
+
+
+<BlackBoxInfo />
+
+## pedersen_commitment
+
+Given an array of Fields, returns the Pedersen commitment.
+
+```rust title="pedersen_commitment" showLineNumbers 
+pub fn pedersen_commitment<N>(input: [Field; N]) -> EmbeddedCurvePoint {
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L28-L30" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L28-L30</a></sub></sup>
+
+
+example:
+
+```rust title="pedersen-commitment" showLineNumbers 
+fn main(x: Field, y: Field, expected_commitment: std::embedded_curve_ops::EmbeddedCurvePoint) {
+    let commitment = std::hash::pedersen_commitment([x, y]);
+    assert_eq(commitment.x, expected_commitment.x);
+    assert_eq(commitment.y, expected_commitment.y);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/pedersen_commitment/src/main.nr#L1-L8" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/pedersen_commitment/src/main.nr#L1-L8</a></sub></sup>
+
+
+<BlackBoxInfo />
+
+## keccak256
+
+Given an array of bytes (`u8`), returns the resulting keccak hash as an array of
+32 bytes (`[u8; 32]`). Specify a message_size to hash only the first
+`message_size` bytes of the input.
+
+```rust title="keccak256" showLineNumbers 
+pub fn keccak256<N>(input: [u8; N], message_size: u32) -> [u8; 32]
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/hash.nr#L64-L66" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/hash.nr#L64-L66</a></sub></sup>
+
+
+example:
+
+```rust title="keccak256" showLineNumbers 
+fn main(x: Field, result: [u8; 32]) {
+    // We use the `as` keyword here to denote the fact that we want to take just the first byte from the x Field
+    // The padding is taken care of by the program
+    let digest = std::hash::keccak256([x as u8], 1);
+    assert(digest == result);
+
+    //#1399: variable message size
+    let message_size = 4;
+    let hash_a = std::hash::keccak256([1, 2, 3, 4], message_size);
+    let hash_b = std::hash::keccak256([1, 2, 3, 4, 0, 0, 0, 0], message_size);
+
+    assert(hash_a == hash_b);
+
+    let message_size_big = 8;
+    let hash_c = std::hash::keccak256([1, 2, 3, 4, 0, 0, 0, 0], message_size_big);
+
+    assert(hash_a != hash_c);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/keccak256/src/main.nr#L1-L21" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/keccak256/src/main.nr#L1-L21</a></sub></sup>
+
+
+<BlackBoxInfo />
+
+## poseidon
+
+Given an array of Fields, returns a new Field with the Poseidon Hash. Mind that you need to specify
+how many inputs are there to your Poseidon function.
+
+```rust
+// example for hash_1, hash_2 accepts an array of length 2, etc
+fn hash_1(input: [Field; 1]) -> Field
+```
+
+example:
+
+```rust title="poseidon" showLineNumbers 
+use std::hash::poseidon;
+use std::hash::poseidon2;
+
+fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field, x3: [Field; 4], y3: Field) {
+    let hash1 = poseidon::bn254::hash_2(x1);
+    assert(hash1 == y1);
+
+    let hash2 = poseidon::bn254::hash_4(x2);
+    assert(hash2 == y2);
+
+    let hash3 = poseidon2::Poseidon2::hash(x3, x3.len());
+    assert(hash3 == y3);
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/test_programs/execution_success/poseidon_bn254_hash/src/main.nr#L1-L15" target="_blank" rel="noopener noreferrer">Source code: test_programs/execution_success/poseidon_bn254_hash/src/main.nr#L1-L15</a></sub></sup>
+
+
+## poseidon 2
+
+Given an array of Fields, returns a new Field with the Poseidon2 Hash. Contrary to the Poseidon
+function, there is only one hash and you can specify a message_size to hash only the first 
+`message_size` bytes of the input,
+
+```rust
+// example for hashing the first three elements of the input
+Poseidon2::hash(input, 3);
+```
+
+The above example for Poseidon also includes Poseidon2.
+
+## mimc_bn254 and mimc
+
+`mimc_bn254` is `mimc`, but with hardcoded parameters for the BN254 curve. You can use it by
+providing an array of Fields, and it returns a Field with the hash. You can use the `mimc` method if
+you're willing to input your own constants:
+
+```rust
+fn mimc<N>(x: Field, k: Field, constants: [Field; N], exp : Field) -> Field
+```
+
+otherwise, use the `mimc_bn254` method:
+
+```rust
+fn mimc_bn254<N>(array: [Field; N]) -> Field
+```
+
+example:
+
+```rust
+
+fn main() {
+    let x = [163, 117, 178, 149]; // some random bytes
+    let hash = std::hash::mimc::mimc_bn254(x);
+}
+```
+
+## hash_to_field
+
+```rust
+fn hash_to_field(_input : [Field]) -> Field {}
+```
+
+Calculates the `blake2s` hash of the inputs and returns the hash modulo the field modulus to return
+a value which can be represented as a `Field`.
+
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/index.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/index.md
new file mode 100644
index 00000000000..650f30165d5
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/index.md
@@ -0,0 +1,14 @@
+---
+title: Cryptographic Primitives
+description:
+  Learn about the cryptographic primitives ready to use for any Noir project
+keywords:
+  [
+    cryptographic primitives,
+    Noir project,
+  ]
+---
+
+The Noir team is progressively adding new cryptographic primitives to the standard library. Reach out for news or if you would be interested in adding more of these calculations in Noir.
+
+Some methods are available thanks to the Aztec backend, not being performed using Noir. When using other backends, these methods may or may not be supplied.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/schnorr.mdx b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
new file mode 100644
index 00000000000..b59e69c8f07
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/cryptographic_primitives/schnorr.mdx
@@ -0,0 +1,64 @@
+---
+title: Schnorr Signatures
+description: Learn how you can verify Schnorr signatures using Noir
+keywords: [cryptographic primitives, Noir project, schnorr, signatures]
+sidebar_position: 2
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+## schnorr::verify_signature
+
+Verifier for Schnorr signatures over the embedded curve (for BN254 it is Grumpkin).
+See schnorr::verify_signature_slice for a version that works directly on slices.
+
+```rust title="schnorr_verify" showLineNumbers 
+pub fn verify_signature<N>(
+    public_key_x: Field,
+    public_key_y: Field,
+    signature: [u8; 64],
+    message: [u8; N]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/schnorr.nr#L2-L9" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/schnorr.nr#L2-L9</a></sub></sup>
+
+
+where `_signature` can be generated like so using the npm package
+[@noir-lang/barretenberg](https://www.npmjs.com/package/@noir-lang/barretenberg)
+
+```js
+const { BarretenbergWasm } = require('@noir-lang/barretenberg/dest/wasm');
+const { Schnorr } = require('@noir-lang/barretenberg/dest/crypto/schnorr');
+
+...
+
+const barretenberg = await BarretenbergWasm.new();
+const schnorr = new Schnorr(barretenberg);
+const pubKey = schnorr.computePublicKey(privateKey);
+const message = ...
+const signature = Array.from(
+    schnorr.constructSignature(hash, privateKey).toBuffer()
+);
+
+...
+```
+
+<BlackBoxInfo />
+
+## schnorr::verify_signature_slice
+
+Verifier for Schnorr signatures over the embedded curve (for BN254 it is Grumpkin)
+where the message is a slice. 
+
+```rust title="schnorr_verify_slice" showLineNumbers 
+pub fn verify_signature_slice(
+    public_key_x: Field,
+    public_key_y: Field,
+    signature: [u8; 64],
+    message: [u8]
+) -> bool
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/schnorr.nr#L13-L20" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/schnorr.nr#L13-L20</a></sub></sup>
+
+
+<BlackBoxInfo />
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/is_unconstrained.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/is_unconstrained.md
new file mode 100644
index 00000000000..bb157e719dc
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/is_unconstrained.md
@@ -0,0 +1,59 @@
+---
+title: Is Unconstrained Function
+description:
+  The is_unconstrained function returns wether the context at that point of the program is unconstrained or not.
+keywords:
+  [
+    unconstrained
+  ]
+---
+
+It's very common for functions in circuits to take unconstrained hints of an expensive computation and then verify it. This is done by running the hint in an unconstrained context and then verifying the result in a constrained context.
+
+When a function is marked as unconstrained, any subsequent functions that it calls will also be run in an unconstrained context. However, if we are implementing a library function, other users might call it within an unconstrained context or a constrained one. Generally, in an unconstrained context we prefer just computing the result instead of taking a hint of it and verifying it, since that'd mean doing the same computation twice:
+
+```rust 
+
+fn my_expensive_computation(){
+  ...
+}
+
+unconstrained fn my_expensive_computation_hint(){
+  my_expensive_computation()
+}
+
+pub fn external_interface(){
+  my_expensive_computation_hint();
+  // verify my_expensive_computation: If external_interface is called from unconstrained, this is redundant
+  ...
+}
+
+```
+
+In order to improve the performance in an unconstrained context you can use the function at `std::runtime::is_unconstrained() -> bool`:
+
+
+```rust 
+use dep::std::runtime::is_unconstrained;
+
+fn my_expensive_computation(){
+  ...
+}
+
+unconstrained fn my_expensive_computation_hint(){
+  my_expensive_computation()
+}
+
+pub fn external_interface(){
+  if is_unconstrained() {
+    my_expensive_computation();
+  } else {
+    my_expensive_computation_hint();
+    // verify my_expensive_computation
+    ...
+  }
+}
+
+```
+
+The is_unconstrained result is resolved at compile time, so in unconstrained contexts the compiler removes the else branch, and in constrained contexts the compiler removes the if branch, reducing the amount of compute necessary to run external_interface.
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/logging.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/logging.md
new file mode 100644
index 00000000000..db75ef9f86f
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/logging.md
@@ -0,0 +1,78 @@
+---
+title: Logging
+description:
+  Learn how to use the println statement for debugging in Noir with this tutorial. Understand the
+  basics of logging in Noir and how to implement it in your code.
+keywords:
+  [
+    noir logging,
+    println statement,
+    print statement,
+    debugging in noir,
+    noir std library,
+    logging tutorial,
+    basic logging in noir,
+    noir logging implementation,
+    noir debugging techniques,
+    rust,
+  ]
+---
+
+The standard library provides two familiar statements you can use: `println` and `print`. Despite being a limited implementation of rust's `println!` and `print!` macros, these constructs can be useful for debugging.
+
+You can print the output of both statements in your Noir code by using the `nargo execute` command or the `--show-output` flag when using `nargo test` (provided there are print statements in your tests).
+
+It is recommended to use `nargo execute` if you want to debug failing constraints with `println` or `print` statements. This is due to every input in a test being a constant rather than a witness, so we issue an error during compilation while we only print during execution (which comes after compilation). Neither `println`, nor `print` are callable for failed constraints caught at compile time.
+
+Both `print` and `println` are generic functions which can work on integers, fields, strings, and even structs or expressions. Note however, that slices are currently unsupported. For example:
+
+```rust
+struct Person {
+    age: Field,
+    height: Field,
+}
+
+fn main(age: Field, height: Field) {
+    let person = Person {
+        age: age,
+        height: height,
+    };
+    println(person);
+    println(age + height);
+    println("Hello world!");
+}
+```
+
+You can print different types in the same statement (including strings) with a type called `fmtstr`. It can be specified in the same way as a normal string, just prepended with an "f" character:
+
+```rust
+  let fmt_str = f"i: {i}, j: {j}";
+  println(fmt_str);
+
+  let s = myStruct { y: x, x: y };
+  println(s);
+
+  println(f"i: {i}, s: {s}");
+
+  println(x);
+  println([x, y]);
+
+  let foo = fooStruct { my_struct: s, foo: 15 };
+  println(f"s: {s}, foo: {foo}");
+
+  println(15);       // prints 0x0f, implicit Field
+  println(-1 as u8); // prints 255
+  println(-1 as i8); // prints -1
+```
+
+Examples shown above are interchangeable between the two `print` statements:
+
+```rust
+let person = Person { age : age, height : height };
+
+println(person);
+print(person);
+
+println("Hello world!"); // Prints with a newline at the end of the input
+print("Hello world!");   // Prints the input and keeps cursor on the same line
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/merkle_trees.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/merkle_trees.md
new file mode 100644
index 00000000000..6a9ebf72ada
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/merkle_trees.md
@@ -0,0 +1,58 @@
+---
+title: Merkle Trees
+description: Learn about Merkle Trees in Noir with this tutorial. Explore the basics of computing a merkle root using a proof, with examples.
+keywords:
+  [
+    Merkle trees in Noir,
+    Noir programming language,
+    check membership,
+    computing root from leaf,
+    Noir Merkle tree implementation,
+    Merkle tree tutorial,
+    Merkle tree code examples,
+    Noir libraries,
+    pedersen hash.,
+  ]
+---
+
+## compute_merkle_root
+
+Returns the root of the tree from the provided leaf and its hash path, using a [Pedersen hash](./cryptographic_primitives/hashes.mdx#pedersen_hash).
+
+```rust
+fn compute_merkle_root(leaf : Field, index : Field, hash_path: [Field]) -> Field
+```
+
+example:
+
+```rust
+/**
+    // these values are for this example only
+    index = "0"
+    priv_key = "0x000000000000000000000000000000000000000000000000000000616c696365"
+    secret = "0x1929ea3ab8d9106a899386883d9428f8256cfedb3c4f6b66bf4aa4d28a79988f"
+    note_hash_path = [
+    "0x1e61bdae0f027b1b2159e1f9d3f8d00fa668a952dddd822fda80dc745d6f65cc",
+    "0x0e4223f3925f98934393c74975142bd73079ab0621f4ee133cee050a3c194f1a",
+    "0x2fd7bb412155bf8693a3bd2a3e7581a679c95c68a052f835dddca85fa1569a40"
+    ]
+ */
+fn main(index: Field, priv_key: Field, secret: Field, note_hash_path: [Field; 3]) {
+
+    let pubkey = std::scalar_mul::fixed_base_embedded_curve(priv_key);
+    let pubkey_x = pubkey[0];
+    let pubkey_y = pubkey[1];
+    let note_commitment = std::hash::pedersen(&[pubkey_x, pubkey_y, secret]);
+
+    let root = std::merkle::compute_merkle_root(note_commitment[0], index, note_hash_path.as_slice());
+    println(root);
+}
+```
+
+To check merkle tree membership:
+
+1. Include a merkle root as a program input.
+2. Compute the merkle root of a given leaf, index and hash path.
+3. Assert the merkle roots are equal.
+
+For more info about merkle trees, see the Wikipedia [page](https://en.wikipedia.org/wiki/Merkle_tree).
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/options.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/options.md
new file mode 100644
index 00000000000..a1bd4e1de5f
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/options.md
@@ -0,0 +1,101 @@
+---
+title: Option<T> Type
+---
+
+The `Option<T>` type is a way to express that a value might be present (`Some(T))` or absent (`None`). It's a safer way to handle potential absence of values, compared to using nulls in many other languages.
+
+```rust
+struct Option<T> {
+    None,
+    Some(T),
+}
+```
+
+The `Option` type, already imported into your Noir program, can be used directly:
+
+```rust
+fn main() {
+    let none = Option::none();
+    let some = Option::some(3);
+}
+```
+
+See [this test](https://github.com/noir-lang/noir/blob/5cbfb9c4a06c8865c98ff2b594464b037d821a5c/crates/nargo_cli/tests/test_data/option/src/main.nr) for a more comprehensive set of examples of each of the methods described below.
+
+## Methods
+
+### none
+
+Constructs a none value.
+
+### some
+
+Constructs a some wrapper around a given value.
+
+### is_none
+
+Returns true if the Option is None.
+
+### is_some
+
+Returns true of the Option is Some.
+
+### unwrap
+
+Asserts `self.is_some()` and returns the wrapped value.
+
+### unwrap_unchecked
+
+Returns the inner value without asserting `self.is_some()`. This method can be useful within an if condition when we already know that `option.is_some()`. If the option is None, there is no guarantee what value will be returned, only that it will be of type T for an `Option<T>`.
+
+### unwrap_or
+
+Returns the wrapped value if `self.is_some()`. Otherwise, returns the given default value.
+
+### unwrap_or_else
+
+Returns the wrapped value if `self.is_some()`. Otherwise, calls the given function to return a default value.
+
+### expect
+
+Asserts `self.is_some()` with a provided custom message and returns the contained `Some` value. The custom message is expected to be a format string.
+
+### map
+
+If self is `Some(x)`, this returns `Some(f(x))`. Otherwise, this returns `None`.
+
+### map_or
+
+If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns the given default value.
+
+### map_or_else
+
+If self is `Some(x)`, this returns `f(x)`. Otherwise, this returns `default()`.
+
+### and
+
+Returns None if self is None. Otherwise, this returns `other`.
+
+### and_then
+
+If self is None, this returns None. Otherwise, this calls the given function with the Some value contained within self, and returns the result of that call. In some languages this function is called `flat_map` or `bind`.
+
+### or
+
+If self is Some, return self. Otherwise, return `other`.
+
+### or_else
+
+If self is Some, return self. Otherwise, return `default()`.
+
+### xor
+
+If only one of the two Options is Some, return that option. Otherwise, if both options are Some or both are None, None is returned.
+
+### filter
+
+Returns `Some(x)` if self is `Some(x)` and `predicate(x)` is true. Otherwise, this returns `None`.
+
+### flatten
+
+Flattens an `Option<Option<T>>` into a `Option<T>`. This returns `None` if the outer Option is None. Otherwise, this returns the inner Option.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/recursion.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/recursion.md
new file mode 100644
index 00000000000..8cfb37fc52d
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/recursion.md
@@ -0,0 +1,85 @@
+---
+title: Recursive Proofs
+description: Learn about how to write recursive proofs in Noir.
+keywords: [recursion, recursive proofs, verification_key, verify_proof]
+---
+
+import BlackBoxInfo from '@site/src/components/Notes/_blackbox.mdx';
+
+Noir supports recursively verifying proofs, meaning you verify the proof of a Noir program in another Noir program. This enables creating proofs of arbitrary size by doing step-wise verification of smaller components of a large proof.
+
+Read [the explainer on recursion](../../explainers/explainer-recursion.md) to know more about this function and the [guide on how to use it.](../../how_to/how-to-recursion.md)
+
+## The `#[recursive]` Attribute
+
+In Noir, the `#[recursive]` attribute is used to indicate that a circuit is designed for recursive proof generation. When applied, it informs the compiler and the tooling that the circuit should be compiled in a way that makes its proofs suitable for recursive verification. This attribute eliminates the need for manual flagging of recursion at the tooling level, streamlining the proof generation process for recursive circuits.
+
+### Example usage with `#[recursive]`
+
+```rust
+#[recursive]
+fn main(x: Field, y: pub Field) {
+    assert(x == y, "x and y are not equal");
+}
+
+// This marks the circuit as recursion-friendly and indicates that proofs generated from this circuit
+// are intended for recursive verification.
+```
+
+By incorporating this attribute directly in the circuit's definition, tooling like Nargo and NoirJS can automatically execute recursive-specific duties for Noir programs (e.g. recursive-friendly proof artifact generation) without additional flags or configurations.
+
+## Verifying Recursive Proofs
+
+```rust
+#[foreign(recursive_aggregation)]
+pub fn verify_proof(verification_key: [Field], proof: [Field], public_inputs: [Field], key_hash: Field) {}
+```
+
+<BlackBoxInfo />
+
+## Example usage
+
+```rust
+
+fn main(
+    verification_key : [Field; 114],
+    proof : [Field; 93],
+    public_inputs : [Field; 1],
+    key_hash : Field,
+    proof_b : [Field; 93],
+) {
+    std::verify_proof(
+        verification_key.as_slice(),
+        proof.as_slice(),
+        public_inputs.as_slice(),
+        key_hash
+    );
+
+    std::verify_proof(
+        verification_key.as_slice(),
+        proof_b.as_slice(),
+        public_inputs.as_slice(),
+        key_hash
+    );
+}
+```
+
+You can see a full example of recursive proofs in [this example recursion demo repo](https://github.com/noir-lang/noir-examples/tree/master/recursion).
+
+## Parameters
+
+### `verification_key`
+
+The verification key for the zk program that is being verified.
+
+### `proof`
+
+The proof for the zk program that is being verified.
+
+### `public_inputs`
+
+These represent the public inputs of the proof we are verifying.
+
+### `key_hash`
+
+A key hash is used to check the validity of the verification key. The circuit implementing this opcode can use this hash to ensure that the key provided to the circuit matches the key produced by the circuit creator.
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/traits.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/traits.md
new file mode 100644
index 00000000000..a14312d2792
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/traits.md
@@ -0,0 +1,464 @@
+---
+title: Traits
+description: Noir's stdlib provides a few commonly used traits.
+keywords: [traits, trait, interface, protocol, default, add, eq]
+---
+
+## `std::default`
+
+### `std::default::Default`
+
+```rust title="default-trait" showLineNumbers 
+trait Default {
+    fn default() -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/default.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/default.nr#L1-L5</a></sub></sup>
+
+
+Constructs a default value of a type.
+
+Implementations:
+```rust
+impl Default for Field { .. }
+
+impl Default for i8 { .. }
+impl Default for i16 { .. }
+impl Default for i32 { .. }
+impl Default for i64 { .. }
+
+impl Default for u8 { .. }
+impl Default for u16 { .. }
+impl Default for u32 { .. }
+impl Default for u64 { .. }
+
+impl Default for () { .. }
+impl Default for bool { .. }
+
+impl<T, N> Default for [T; N]
+    where T: Default { .. }
+
+impl<T> Default for [T] { .. }
+
+impl<A, B> Default for (A, B)
+    where A: Default, B: Default { .. }
+
+impl<A, B, C> Default for (A, B, C)
+    where A: Default, B: Default, C: Default { .. }
+
+impl<A, B, C, D> Default for (A, B, C, D)
+    where A: Default, B: Default, C: Default, D: Default { .. }
+
+impl<A, B, C, D, E> Default for (A, B, C, D, E)
+    where A: Default, B: Default, C: Default, D: Default, E: Default { .. }
+```
+
+For primitive integer types, the return value of `default` is `0`. Container
+types such as arrays are filled with default values of their element type,
+except slices whose length is unknown and thus defaulted to zero.
+
+
+## `std::convert`
+
+### `std::convert::From`
+
+```rust title="from-trait" showLineNumbers 
+trait From<T> {
+    fn from(input: T) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/convert.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/convert.nr#L1-L5</a></sub></sup>
+
+
+The `From` trait defines how to convert from a given type `T` to the type on which the trait is implemented.
+
+The Noir standard library provides a number of implementations of `From` between primitive types.
+```rust title="from-impls" showLineNumbers 
+// Unsigned integers
+
+impl From<u8> for u32 { fn from(value: u8) -> u32 { value as u32 } }
+
+impl From<u8> for u64 { fn from(value: u8) -> u64 { value as u64 } }
+impl From<u32> for u64 { fn from(value: u32) -> u64 { value as u64 } }
+
+impl From<u8> for Field { fn from(value: u8) -> Field { value as Field } }
+impl From<u32> for Field { fn from(value: u32) -> Field { value as Field } }
+impl From<u64> for Field { fn from(value: u64) -> Field { value as Field } }
+
+// Signed integers
+
+impl From<i8> for i32 { fn from(value: i8) -> i32 { value as i32 } }
+
+impl From<i8> for i64 { fn from(value: i8) -> i64 { value as i64 } }
+impl From<i32> for i64 { fn from(value: i32) -> i64 { value as i64 } }
+
+// Booleans
+impl From<bool> for u8 { fn from(value: bool) -> u8 { value as u8 } }
+impl From<bool> for u32 { fn from(value: bool) -> u32 { value as u32 } }
+impl From<bool> for u64 { fn from(value: bool) -> u64 { value as u64 } }
+impl From<bool> for i8 { fn from(value: bool) -> i8 { value as i8 } }
+impl From<bool> for i32 { fn from(value: bool) -> i32 { value as i32 } }
+impl From<bool> for i64 { fn from(value: bool) -> i64 { value as i64 } }
+impl From<bool> for Field { fn from(value: bool) -> Field { value as Field } }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/convert.nr#L25-L52" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/convert.nr#L25-L52</a></sub></sup>
+
+
+#### When to implement `From`
+
+As a general rule of thumb, `From` may be implemented in the [situations where it would be suitable in Rust](https://doc.rust-lang.org/std/convert/trait.From.html#when-to-implement-from):
+
+- The conversion is *infallible*: Noir does not provide an equivalent to Rust's `TryFrom`, if the conversion can fail then provide a named method instead.
+- The conversion is *lossless*: semantically, it should not lose or discard information. For example, `u32: From<u16>` can losslessly convert any `u16` into a valid `u32` such that the original `u16` can be recovered. On the other hand, `u16: From<u32>` should not be implemented as `2**16` is a `u32` which cannot be losslessly converted into a `u16`.
+- The conversion is *value-preserving*: the conceptual kind and meaning of the resulting value is the same, even though the Noir type and technical representation might be different. While it's possible to infallibly and losslessly convert a `u8` into a `str<2>` hex representation, `4u8` and `"04"` are too different for `str<2>: From<u8>` to be implemented.
+- The conversion is *obvious*: it's the only reasonable conversion between the two types. If there's ambiguity on how to convert between them such that the same input could potentially map to two different values then a named method should be used. For instance rather than implementing `U128: From<[u8; 16]>`, the methods `U128::from_le_bytes` and `U128::from_be_bytes` are used as otherwise the endianness of the array would be ambiguous, resulting in two potential values of `U128` from the same byte array.
+
+One additional recommendation specific to Noir is:
+- The conversion is *efficient*: it's relatively cheap to convert between the two types. Due to being a ZK DSL, it's more important to avoid unnecessary computation compared to Rust. If the implementation of `From` would encourage users to perform unnecessary conversion, resulting in additional proving time, then it may be preferable to expose functionality such that this conversion may be avoided.
+
+### `std::convert::Into`
+
+The `Into` trait is defined as the reciprocal of `From`. It should be easy to convince yourself that if we can convert to type `A` from type `B`, then it's possible to convert type `B` into type `A`.
+
+For this reason, implementing `From` on a type will automatically generate a matching `Into` implementation. One should always prefer implementing `From` over `Into` as implementing `Into` will not generate a matching `From` implementation.
+
+```rust title="into-trait" showLineNumbers 
+trait Into<T> {
+    fn into(self) -> T;
+}
+
+impl<T, U> Into<T> for U where T: From<U> {
+  fn into(self) -> T {
+      T::from(self)
+  }
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/convert.nr#L13-L23" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/convert.nr#L13-L23</a></sub></sup>
+
+
+`Into` is most useful when passing function arguments where the types don't quite match up with what the function expects. In this case, the compiler has enough type information to perform the necessary conversion by just appending `.into()` onto the arguments in question.
+
+
+## `std::cmp`
+
+### `std::cmp::Eq`
+
+```rust title="eq-trait" showLineNumbers 
+trait Eq {
+    fn eq(self, other: Self) -> bool;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/cmp.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/cmp.nr#L1-L5</a></sub></sup>
+
+
+Returns `true` if `self` is equal to `other`. Implementing this trait on a type
+allows the type to be used with `==` and `!=`.
+
+Implementations:
+```rust
+impl Eq for Field { .. }
+
+impl Eq for i8 { .. }
+impl Eq for i16 { .. }
+impl Eq for i32 { .. }
+impl Eq for i64 { .. }
+
+impl Eq for u8 { .. }
+impl Eq for u16 { .. }
+impl Eq for u32 { .. }
+impl Eq for u64 { .. }
+
+impl Eq for () { .. }
+impl Eq for bool { .. }
+
+impl<T, N> Eq for [T; N]
+    where T: Eq { .. }
+
+impl<T> Eq for [T]
+    where T: Eq { .. }
+
+impl<A, B> Eq for (A, B)
+    where A: Eq, B: Eq { .. }
+
+impl<A, B, C> Eq for (A, B, C)
+    where A: Eq, B: Eq, C: Eq { .. }
+
+impl<A, B, C, D> Eq for (A, B, C, D)
+    where A: Eq, B: Eq, C: Eq, D: Eq { .. }
+
+impl<A, B, C, D, E> Eq for (A, B, C, D, E)
+    where A: Eq, B: Eq, C: Eq, D: Eq, E: Eq { .. }
+```
+
+### `std::cmp::Ord`
+
+```rust title="ord-trait" showLineNumbers 
+trait Ord {
+    fn cmp(self, other: Self) -> Ordering;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/cmp.nr#L102-L106" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/cmp.nr#L102-L106</a></sub></sup>
+
+
+`a.cmp(b)` compares two values returning `Ordering::less()` if `a < b`,
+`Ordering::equal()` if `a == b`, or `Ordering::greater()` if `a > b`.
+Implementing this trait on a type allows `<`, `<=`, `>`, and `>=` to be
+used on values of the type.
+
+`std::cmp` also provides `max` and `min` functions for any type which implements the `Ord` trait.
+
+Implementations:
+
+```rust
+impl Ord for u8 { .. }
+impl Ord for u16 { .. }
+impl Ord for u32 { .. }
+impl Ord for u64 { .. }
+
+impl Ord for i8 { .. }
+impl Ord for i16 { .. }
+impl Ord for i32 { .. }
+
+impl Ord for i64 { .. }
+
+impl Ord for () { .. }
+impl Ord for bool { .. }
+
+impl<T, N> Ord for [T; N]
+    where T: Ord { .. }
+
+impl<T> Ord for [T]
+    where T: Ord { .. }
+
+impl<A, B> Ord for (A, B)
+    where A: Ord, B: Ord { .. }
+
+impl<A, B, C> Ord for (A, B, C)
+    where A: Ord, B: Ord, C: Ord { .. }
+
+impl<A, B, C, D> Ord for (A, B, C, D)
+    where A: Ord, B: Ord, C: Ord, D: Ord { .. }
+
+impl<A, B, C, D, E> Ord for (A, B, C, D, E)
+    where A: Ord, B: Ord, C: Ord, D: Ord, E: Ord { .. }
+```
+
+## `std::ops`
+
+### `std::ops::Add`, `std::ops::Sub`, `std::ops::Mul`, and `std::ops::Div`
+
+These traits abstract over addition, subtraction, multiplication, and division respectively.
+Implementing these traits for a given type will also allow that type to be used with the corresponding operator
+for that trait (`+` for Add, etc) in addition to the normal method names.
+
+```rust title="add-trait" showLineNumbers 
+trait Add {
+    fn add(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/arith.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/arith.nr#L1-L5</a></sub></sup>
+
+```rust title="sub-trait" showLineNumbers 
+trait Sub {
+    fn sub(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/arith.nr#L19-L23" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/arith.nr#L19-L23</a></sub></sup>
+
+```rust title="mul-trait" showLineNumbers 
+trait Mul {
+    fn mul(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/arith.nr#L37-L41" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/arith.nr#L37-L41</a></sub></sup>
+
+```rust title="div-trait" showLineNumbers 
+trait Div {
+    fn div(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/arith.nr#L55-L59" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/arith.nr#L55-L59</a></sub></sup>
+
+
+The implementations block below is given for the `Add` trait, but the same types that implement
+`Add` also implement `Sub`, `Mul`, and `Div`.
+
+Implementations:
+```rust
+impl Add for Field { .. }
+
+impl Add for i8 { .. }
+impl Add for i16 { .. }
+impl Add for i32 { .. }
+impl Add for i64 { .. }
+
+impl Add for u8 { .. }
+impl Add for u16 { .. }
+impl Add for u32 { .. }
+impl Add for u64 { .. }
+```
+
+### `std::ops::Rem`
+
+```rust title="rem-trait" showLineNumbers 
+trait Rem{
+    fn rem(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/arith.nr#L73-L77" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/arith.nr#L73-L77</a></sub></sup>
+
+
+`Rem::rem(a, b)` is the remainder function returning the result of what is
+left after dividing `a` and `b`. Implementing `Rem` allows the `%` operator
+to be used with the implementation type.
+
+Unlike other numeric traits, `Rem` is not implemented for `Field`.
+
+Implementations:
+```rust
+impl Rem for u8 { fn rem(self, other: u8) -> u8 { self % other } }
+impl Rem for u16 { fn rem(self, other: u16) -> u16 { self % other } }
+impl Rem for u32 { fn rem(self, other: u32) -> u32 { self % other } }
+impl Rem for u64 { fn rem(self, other: u64) -> u64 { self % other } }
+
+impl Rem for i8 { fn rem(self, other: i8) -> i8 { self % other } }
+impl Rem for i16 { fn rem(self, other: i16) -> i16 { self % other } }
+impl Rem for i32 { fn rem(self, other: i32) -> i32 { self % other } }
+impl Rem for i64 { fn rem(self, other: i64) -> i64 { self % other } }
+```
+
+### `std::ops::Neg`
+
+```rust title="neg-trait" showLineNumbers 
+trait Neg {
+    fn neg(self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/arith.nr#L89-L93" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/arith.nr#L89-L93</a></sub></sup>
+
+
+`Neg::neg` is equivalent to the unary negation operator `-`.
+
+Implementations:
+```rust title="neg-trait-impls" showLineNumbers 
+impl Neg for Field { fn neg(self) -> Field { -self } }
+
+impl Neg for i8 { fn neg(self) -> i8 { -self } }
+impl Neg for i16 { fn neg(self) -> i16 { -self } }
+impl Neg for i32 { fn neg(self) -> i32 { -self } }
+impl Neg for i64 { fn neg(self) -> i64 { -self } }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/arith.nr#L95-L102" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/arith.nr#L95-L102</a></sub></sup>
+
+
+### `std::ops::Not`
+
+```rust title="not-trait" showLineNumbers 
+trait Not {
+    fn not(self: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/bit.nr#L1-L5" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/bit.nr#L1-L5</a></sub></sup>
+
+
+`Not::not` is equivalent to the unary bitwise NOT operator `!`.
+
+Implementations:
+```rust title="not-trait-impls" showLineNumbers 
+impl Not for bool { fn not(self) -> bool { !self } }
+
+impl Not for u64 { fn not(self) -> u64 { !self } }
+impl Not for u32 { fn not(self) -> u32 { !self } }
+impl Not for u16 { fn not(self) -> u16 { !self } }
+impl Not for u8 { fn not(self) -> u8 { !self } }
+impl Not for u1 { fn not(self) -> u1 { !self } }
+
+impl Not for i8 { fn not(self) -> i8 { !self } }
+impl Not for i16 { fn not(self) -> i16 { !self } }
+impl Not for i32 { fn not(self) -> i32 { !self } }
+impl Not for i64 { fn not(self) -> i64 { !self } }
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/bit.nr#L7-L20" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/bit.nr#L7-L20</a></sub></sup>
+
+
+### `std::ops::{ BitOr, BitAnd, BitXor }`
+
+```rust title="bitor-trait" showLineNumbers 
+trait BitOr {
+    fn bitor(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/bit.nr#L22-L26" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/bit.nr#L22-L26</a></sub></sup>
+
+```rust title="bitand-trait" showLineNumbers 
+trait BitAnd {
+    fn bitand(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/bit.nr#L40-L44" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/bit.nr#L40-L44</a></sub></sup>
+
+```rust title="bitxor-trait" showLineNumbers 
+trait BitXor {
+    fn bitxor(self, other: Self) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/bit.nr#L58-L62" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/bit.nr#L58-L62</a></sub></sup>
+
+
+Traits for the bitwise operations `|`, `&`, and `^`.
+
+Implementing `BitOr`, `BitAnd` or `BitXor` for a type allows the `|`, `&`, or `^` operator respectively
+to be used with the type.
+
+The implementations block below is given for the `BitOr` trait, but the same types that implement
+`BitOr` also implement `BitAnd` and `BitXor`.
+
+Implementations:
+```rust
+impl BitOr for bool { fn bitor(self, other: bool) -> bool { self | other } }
+
+impl BitOr for u8 { fn bitor(self, other: u8) -> u8 { self | other } }
+impl BitOr for u16 { fn bitor(self, other: u16) -> u16 { self | other } }
+impl BitOr for u32 { fn bitor(self, other: u32) -> u32 { self | other } }
+impl BitOr for u64 { fn bitor(self, other: u64) -> u64 { self | other } }
+
+impl BitOr for i8 { fn bitor(self, other: i8) -> i8 { self | other } }
+impl BitOr for i16 { fn bitor(self, other: i16) -> i16 { self | other } }
+impl BitOr for i32 { fn bitor(self, other: i32) -> i32 { self | other } }
+impl BitOr for i64 { fn bitor(self, other: i64) -> i64 { self | other } }
+```
+
+### `std::ops::{ Shl, Shr }`
+
+```rust title="shl-trait" showLineNumbers 
+trait Shl {
+    fn shl(self, other: u8) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/bit.nr#L76-L80" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/bit.nr#L76-L80</a></sub></sup>
+
+```rust title="shr-trait" showLineNumbers 
+trait Shr {
+    fn shr(self, other: u8) -> Self;
+}
+```
+> <sup><sub><a href="https://github.com/noir-lang/noir/blob/master/noir_stdlib/src/ops/bit.nr#L93-L97" target="_blank" rel="noopener noreferrer">Source code: noir_stdlib/src/ops/bit.nr#L93-L97</a></sub></sup>
+
+
+Traits for a bit shift left and bit shift right.
+
+Implementing `Shl` for a type allows the left shift operator (`<<`) to be used with the implementation type.
+Similarly, implementing `Shr` allows the right shift operator (`>>`) to be used with the type.
+
+Note that bit shifting is not currently implemented for signed types.
+
+The implementations block below is given for the `Shl` trait, but the same types that implement
+`Shl` also implement `Shr`.
+
+Implementations:
+```rust
+impl Shl for u8 { fn shl(self, other: u8) -> u8 { self << other } }
+impl Shl for u16 { fn shl(self, other: u16) -> u16 { self << other } }
+impl Shl for u32 { fn shl(self, other: u32) -> u32 { self << other } }
+impl Shl for u64 { fn shl(self, other: u64) -> u64 { self << other } }
+```
diff --git a/docs/versioned_docs/version-v0.31.0/noir/standard_library/zeroed.md b/docs/versioned_docs/version-v0.31.0/noir/standard_library/zeroed.md
new file mode 100644
index 00000000000..f450fecdd36
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/noir/standard_library/zeroed.md
@@ -0,0 +1,26 @@
+---
+title: Zeroed Function
+description:
+  The zeroed function returns a zeroed value of any type.
+keywords:
+  [
+    zeroed
+  ]
+---
+
+Implements `fn zeroed<T>() -> T` to return a zeroed value of any type. This function is generally unsafe to use as the zeroed bit pattern is not guaranteed to be valid for all types. It can however, be useful in cases when the value is guaranteed not to be used such as in a BoundedVec library implementing a growable vector, up to a certain length, backed by an array. The array can be initialized with zeroed values which are guaranteed to be inaccessible until the vector is pushed to. Similarly, enumerations in noir can be implemented using this method by providing zeroed values for the unused variants.
+
+You can access the function at `std::unsafe::zeroed`.
+
+This function currently supports the following types:
+
+- Field
+- Bool
+- Uint
+- Array
+- Slice
+- String
+- Tuple
+- Function
+  
+Using it on other types could result in unexpected behavior.
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/.nojekyll b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/.nojekyll
new file mode 100644
index 00000000000..e2ac6616add
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/.nojekyll
@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
new file mode 100644
index 00000000000..d7249d24330
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend.md
@@ -0,0 +1,160 @@
+# BarretenbergBackend
+
+## Extends
+
+- `BarretenbergVerifierBackend`
+
+## Implements
+
+- [`Backend`](../index.md#backend)
+
+## Constructors
+
+### new BarretenbergBackend(acirCircuit, options)
+
+```ts
+new BarretenbergBackend(acirCircuit, options): BarretenbergBackend
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `acirCircuit` | `CompiledCircuit` |
+| `options` | [`BackendOptions`](../type-aliases/BackendOptions.md) |
+
+#### Returns
+
+[`BarretenbergBackend`](BarretenbergBackend.md)
+
+#### Inherited from
+
+BarretenbergVerifierBackend.constructor
+
+## Properties
+
+| Property | Type | Description | Inheritance |
+| :------ | :------ | :------ | :------ |
+| `acirComposer` | `any` | - | BarretenbergVerifierBackend.acirComposer |
+| `acirUncompressedBytecode` | `Uint8Array` | - | BarretenbergVerifierBackend.acirUncompressedBytecode |
+| `api` | `Barretenberg` | - | BarretenbergVerifierBackend.api |
+| `options` | [`BackendOptions`](../type-aliases/BackendOptions.md) | - | BarretenbergVerifierBackend.options |
+
+## Methods
+
+### destroy()
+
+```ts
+destroy(): Promise<void>
+```
+
+#### Returns
+
+`Promise`\<`void`\>
+
+#### Inherited from
+
+BarretenbergVerifierBackend.destroy
+
+***
+
+### generateProof()
+
+```ts
+generateProof(compressedWitness): Promise<ProofData>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `compressedWitness` | `Uint8Array` |
+
+#### Returns
+
+`Promise`\<`ProofData`\>
+
+#### Description
+
+Generates a proof
+
+***
+
+### generateRecursiveProofArtifacts()
+
+```ts
+generateRecursiveProofArtifacts(proofData, numOfPublicInputs): Promise<object>
+```
+
+Generates artifacts that will be passed to a circuit that will verify this proof.
+
+Instead of passing the proof and verification key as a byte array, we pass them
+as fields which makes it cheaper to verify in a circuit.
+
+The proof that is passed here will have been created using a circuit
+that has the #[recursive] attribute on its `main` method.
+
+The number of public inputs denotes how many public inputs are in the inner proof.
+
+#### Parameters
+
+| Parameter | Type | Default value |
+| :------ | :------ | :------ |
+| `proofData` | `ProofData` | `undefined` |
+| `numOfPublicInputs` | `number` | `0` |
+
+#### Returns
+
+`Promise`\<`object`\>
+
+#### Example
+
+```typescript
+const artifacts = await backend.generateRecursiveProofArtifacts(proof, numOfPublicInputs);
+```
+
+***
+
+### getVerificationKey()
+
+```ts
+getVerificationKey(): Promise<Uint8Array>
+```
+
+#### Returns
+
+`Promise`\<`Uint8Array`\>
+
+#### Inherited from
+
+BarretenbergVerifierBackend.getVerificationKey
+
+***
+
+### verifyProof()
+
+```ts
+verifyProof(proofData): Promise<boolean>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `proofData` | `ProofData` |
+
+#### Returns
+
+`Promise`\<`boolean`\>
+
+#### Inherited from
+
+BarretenbergVerifierBackend.verifyProof
+
+#### Description
+
+Verifies a proof
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier.md
new file mode 100644
index 00000000000..500276ea748
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier.md
@@ -0,0 +1,58 @@
+# BarretenbergVerifier
+
+## Constructors
+
+### new BarretenbergVerifier(options)
+
+```ts
+new BarretenbergVerifier(options): BarretenbergVerifier
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `options` | [`BackendOptions`](../type-aliases/BackendOptions.md) |
+
+#### Returns
+
+[`BarretenbergVerifier`](BarretenbergVerifier.md)
+
+## Methods
+
+### destroy()
+
+```ts
+destroy(): Promise<void>
+```
+
+#### Returns
+
+`Promise`\<`void`\>
+
+***
+
+### verifyProof()
+
+```ts
+verifyProof(proofData, verificationKey): Promise<boolean>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `proofData` | `ProofData` |
+| `verificationKey` | `Uint8Array` |
+
+#### Returns
+
+`Promise`\<`boolean`\>
+
+#### Description
+
+Verifies a proof
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/index.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/index.md
new file mode 100644
index 00000000000..14dfac681d4
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/index.md
@@ -0,0 +1,40 @@
+# backend_barretenberg
+
+## Exports
+
+### Classes
+
+| Class | Description |
+| :------ | :------ |
+| [BarretenbergBackend](classes/BarretenbergBackend.md) | - |
+| [BarretenbergVerifier](classes/BarretenbergVerifier.md) | - |
+
+### Type Aliases
+
+| Type alias | Description |
+| :------ | :------ |
+| [BackendOptions](type-aliases/BackendOptions.md) | - |
+
+## References
+
+### CompiledCircuit
+
+Renames and re-exports [Backend](index.md#backend)
+
+***
+
+### ProofData
+
+Renames and re-exports [Backend](index.md#backend)
+
+## Variables
+
+### Backend
+
+```ts
+Backend: any;
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
new file mode 100644
index 00000000000..b49a479f4f4
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions.md
@@ -0,0 +1,21 @@
+# BackendOptions
+
+```ts
+type BackendOptions: object;
+```
+
+## Description
+
+An options object, currently only used to specify the number of threads to use.
+
+## Type declaration
+
+| Member | Type | Description |
+| :------ | :------ | :------ |
+| `memory` | `object` | - |
+| `memory.maximum` | `number` | - |
+| `threads` | `number` | **Description**<br /><br />Number of threads |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
new file mode 100644
index 00000000000..d7d5128f9e3
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/backend_barretenberg/typedoc-sidebar.cjs
@@ -0,0 +1,4 @@
+// @ts-check
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+const typedocSidebar = { items: [{"type":"category","label":"Classes","items":[{"type":"doc","id":"reference/NoirJS/backend_barretenberg/classes/BarretenbergBackend","label":"BarretenbergBackend"},{"type":"doc","id":"reference/NoirJS/backend_barretenberg/classes/BarretenbergVerifier","label":"BarretenbergVerifier"}]},{"type":"category","label":"Type Aliases","items":[{"type":"doc","id":"reference/NoirJS/backend_barretenberg/type-aliases/BackendOptions","label":"BackendOptions"}]}]};
+module.exports = typedocSidebar.items;
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/.nojekyll b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/.nojekyll
new file mode 100644
index 00000000000..e2ac6616add
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/.nojekyll
@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/classes/Noir.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/classes/Noir.md
new file mode 100644
index 00000000000..ead255bc504
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/classes/Noir.md
@@ -0,0 +1,52 @@
+# Noir
+
+## Constructors
+
+### new Noir(circuit)
+
+```ts
+new Noir(circuit): Noir
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `circuit` | `CompiledCircuit` |
+
+#### Returns
+
+[`Noir`](Noir.md)
+
+## Methods
+
+### execute()
+
+```ts
+execute(inputs, foreignCallHandler?): Promise<object>
+```
+
+#### Parameters
+
+| Parameter | Type |
+| :------ | :------ |
+| `inputs` | `InputMap` |
+| `foreignCallHandler`? | [`ForeignCallHandler`](../type-aliases/ForeignCallHandler.md) |
+
+#### Returns
+
+`Promise`\<`object`\>
+
+#### Description
+
+Allows to execute a circuit to get its witness and return value.
+
+#### Example
+
+```typescript
+async execute(inputs)
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/and.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/and.md
new file mode 100644
index 00000000000..c783283e396
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/and.md
@@ -0,0 +1,22 @@
+# and()
+
+```ts
+and(lhs, rhs): string
+```
+
+Performs a bitwise AND operation between `lhs` and `rhs`
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `lhs` | `string` |  |
+| `rhs` | `string` |  |
+
+## Returns
+
+`string`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/blake2s256.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/blake2s256.md
new file mode 100644
index 00000000000..7882d0da8d5
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/blake2s256.md
@@ -0,0 +1,21 @@
+# blake2s256()
+
+```ts
+blake2s256(inputs): Uint8Array
+```
+
+Calculates the Blake2s256 hash of the input bytes
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `inputs` | `Uint8Array` |  |
+
+## Returns
+
+`Uint8Array`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
new file mode 100644
index 00000000000..5e3cd53e9d3
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify.md
@@ -0,0 +1,28 @@
+# ecdsa\_secp256k1\_verify()
+
+```ts
+ecdsa_secp256k1_verify(
+   hashed_msg, 
+   public_key_x_bytes, 
+   public_key_y_bytes, 
+   signature): boolean
+```
+
+Verifies a ECDSA signature over the secp256k1 curve.
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `hashed_msg` | `Uint8Array` |  |
+| `public_key_x_bytes` | `Uint8Array` |  |
+| `public_key_y_bytes` | `Uint8Array` |  |
+| `signature` | `Uint8Array` |  |
+
+## Returns
+
+`boolean`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
new file mode 100644
index 00000000000..0b20ff68957
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify.md
@@ -0,0 +1,28 @@
+# ecdsa\_secp256r1\_verify()
+
+```ts
+ecdsa_secp256r1_verify(
+   hashed_msg, 
+   public_key_x_bytes, 
+   public_key_y_bytes, 
+   signature): boolean
+```
+
+Verifies a ECDSA signature over the secp256r1 curve.
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `hashed_msg` | `Uint8Array` |  |
+| `public_key_x_bytes` | `Uint8Array` |  |
+| `public_key_y_bytes` | `Uint8Array` |  |
+| `signature` | `Uint8Array` |  |
+
+## Returns
+
+`boolean`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/keccak256.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/keccak256.md
new file mode 100644
index 00000000000..d10f155ce86
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/keccak256.md
@@ -0,0 +1,21 @@
+# keccak256()
+
+```ts
+keccak256(inputs): Uint8Array
+```
+
+Calculates the Keccak256 hash of the input bytes
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `inputs` | `Uint8Array` |  |
+
+## Returns
+
+`Uint8Array`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/sha256.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/sha256.md
new file mode 100644
index 00000000000..6ba4ecac022
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/sha256.md
@@ -0,0 +1,21 @@
+# sha256()
+
+```ts
+sha256(inputs): Uint8Array
+```
+
+Calculates the SHA256 hash of the input bytes
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `inputs` | `Uint8Array` |  |
+
+## Returns
+
+`Uint8Array`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/xor.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/xor.md
new file mode 100644
index 00000000000..8d762b895d3
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/functions/xor.md
@@ -0,0 +1,22 @@
+# xor()
+
+```ts
+xor(lhs, rhs): string
+```
+
+Performs a bitwise XOR operation between `lhs` and `rhs`
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `lhs` | `string` |  |
+| `rhs` | `string` |  |
+
+## Returns
+
+`string`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/index.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/index.md
new file mode 100644
index 00000000000..166508f7124
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/index.md
@@ -0,0 +1,49 @@
+# noir_js
+
+## Exports
+
+### Classes
+
+| Class | Description |
+| :------ | :------ |
+| [Noir](classes/Noir.md) | - |
+
+### Type Aliases
+
+| Type alias | Description |
+| :------ | :------ |
+| [ErrorWithPayload](type-aliases/ErrorWithPayload.md) | - |
+| [ForeignCallHandler](type-aliases/ForeignCallHandler.md) | A callback which performs an foreign call and returns the response. |
+| [ForeignCallInput](type-aliases/ForeignCallInput.md) | - |
+| [ForeignCallOutput](type-aliases/ForeignCallOutput.md) | - |
+| [WitnessMap](type-aliases/WitnessMap.md) | - |
+
+### Functions
+
+| Function | Description |
+| :------ | :------ |
+| [and](functions/and.md) | Performs a bitwise AND operation between `lhs` and `rhs` |
+| [blake2s256](functions/blake2s256.md) | Calculates the Blake2s256 hash of the input bytes |
+| [ecdsa\_secp256k1\_verify](functions/ecdsa_secp256k1_verify.md) | Verifies a ECDSA signature over the secp256k1 curve. |
+| [ecdsa\_secp256r1\_verify](functions/ecdsa_secp256r1_verify.md) | Verifies a ECDSA signature over the secp256r1 curve. |
+| [keccak256](functions/keccak256.md) | Calculates the Keccak256 hash of the input bytes |
+| [sha256](functions/sha256.md) | Calculates the SHA256 hash of the input bytes |
+| [xor](functions/xor.md) | Performs a bitwise XOR operation between `lhs` and `rhs` |
+
+## References
+
+### CompiledCircuit
+
+Renames and re-exports [InputMap](index.md#inputmap)
+
+## Variables
+
+### InputMap
+
+```ts
+InputMap: any;
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ErrorWithPayload.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ErrorWithPayload.md
new file mode 100644
index 00000000000..e8c2f4aef3d
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ErrorWithPayload.md
@@ -0,0 +1,15 @@
+# ErrorWithPayload
+
+```ts
+type ErrorWithPayload: ExecutionError & object;
+```
+
+## Type declaration
+
+| Member | Type | Description |
+| :------ | :------ | :------ |
+| `decodedAssertionPayload` | `any` | - |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
new file mode 100644
index 00000000000..812b8b16481
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallHandler.md
@@ -0,0 +1,24 @@
+# ForeignCallHandler
+
+```ts
+type ForeignCallHandler: (name, inputs) => Promise<ForeignCallOutput[]>;
+```
+
+A callback which performs an foreign call and returns the response.
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `name` | `string` | The identifier for the type of foreign call being performed. |
+| `inputs` | [`ForeignCallInput`](ForeignCallInput.md)[] | An array of hex encoded inputs to the foreign call. |
+
+## Returns
+
+`Promise`\<[`ForeignCallOutput`](ForeignCallOutput.md)[]\>
+
+outputs - An array of hex encoded outputs containing the results of the foreign call.
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
new file mode 100644
index 00000000000..dd95809186a
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallInput.md
@@ -0,0 +1,9 @@
+# ForeignCallInput
+
+```ts
+type ForeignCallInput: string[];
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
new file mode 100644
index 00000000000..b71fb78a946
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/ForeignCallOutput.md
@@ -0,0 +1,9 @@
+# ForeignCallOutput
+
+```ts
+type ForeignCallOutput: string | string[];
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
new file mode 100644
index 00000000000..258c46f9d0c
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/type-aliases/WitnessMap.md
@@ -0,0 +1,9 @@
+# WitnessMap
+
+```ts
+type WitnessMap: Map<number, string>;
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
new file mode 100644
index 00000000000..b3156097df6
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_js/typedoc-sidebar.cjs
@@ -0,0 +1,4 @@
+// @ts-check
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+const typedocSidebar = { items: [{"type":"category","label":"Classes","items":[{"type":"doc","id":"reference/NoirJS/noir_js/classes/Noir","label":"Noir"}]},{"type":"category","label":"Type Aliases","items":[{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ErrorWithPayload","label":"ErrorWithPayload"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallHandler","label":"ForeignCallHandler"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallInput","label":"ForeignCallInput"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/ForeignCallOutput","label":"ForeignCallOutput"},{"type":"doc","id":"reference/NoirJS/noir_js/type-aliases/WitnessMap","label":"WitnessMap"}]},{"type":"category","label":"Functions","items":[{"type":"doc","id":"reference/NoirJS/noir_js/functions/and","label":"and"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/blake2s256","label":"blake2s256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/ecdsa_secp256k1_verify","label":"ecdsa_secp256k1_verify"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/ecdsa_secp256r1_verify","label":"ecdsa_secp256r1_verify"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/keccak256","label":"keccak256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/sha256","label":"sha256"},{"type":"doc","id":"reference/NoirJS/noir_js/functions/xor","label":"xor"}]}]};
+module.exports = typedocSidebar.items;
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/.nojekyll b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/.nojekyll
new file mode 100644
index 00000000000..e2ac6616add
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/.nojekyll
@@ -0,0 +1 @@
+TypeDoc added this file to prevent GitHub Pages from using Jekyll. You can turn off this behavior by setting the `githubPages` option to false.
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/compile.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/compile.md
new file mode 100644
index 00000000000..6faf763b37f
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/compile.md
@@ -0,0 +1,51 @@
+# compile()
+
+```ts
+compile(
+   fileManager, 
+   projectPath?, 
+   logFn?, 
+debugLogFn?): Promise<ProgramCompilationArtifacts>
+```
+
+Compiles a Noir project
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `fileManager` | `FileManager` | The file manager to use |
+| `projectPath`? | `string` | The path to the project inside the file manager. Defaults to the root of the file manager |
+| `logFn`? | `LogFn` | A logging function. If not provided, console.log will be used |
+| `debugLogFn`? | `LogFn` | A debug logging function. If not provided, logFn will be used |
+
+## Returns
+
+`Promise`\<[`ProgramCompilationArtifacts`](../index.md#programcompilationartifacts)\>
+
+## Example
+
+```typescript
+// Node.js
+
+import { compile_program, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager(myProjectPath);
+const myCompiledCode = await compile_program(fm);
+```
+
+```typescript
+// Browser
+
+import { compile_program, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager('/');
+for (const path of files) {
+  await fm.writeFile(path, await getFileAsStream(path));
+}
+const myCompiledCode = await compile_program(fm);
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/compile_contract.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/compile_contract.md
new file mode 100644
index 00000000000..7d0b39a43ef
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/compile_contract.md
@@ -0,0 +1,51 @@
+# compile\_contract()
+
+```ts
+compile_contract(
+   fileManager, 
+   projectPath?, 
+   logFn?, 
+debugLogFn?): Promise<ContractCompilationArtifacts>
+```
+
+Compiles a Noir project
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `fileManager` | `FileManager` | The file manager to use |
+| `projectPath`? | `string` | The path to the project inside the file manager. Defaults to the root of the file manager |
+| `logFn`? | `LogFn` | A logging function. If not provided, console.log will be used |
+| `debugLogFn`? | `LogFn` | A debug logging function. If not provided, logFn will be used |
+
+## Returns
+
+`Promise`\<[`ContractCompilationArtifacts`](../index.md#contractcompilationartifacts)\>
+
+## Example
+
+```typescript
+// Node.js
+
+import { compile_contract, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager(myProjectPath);
+const myCompiledCode = await compile_contract(fm);
+```
+
+```typescript
+// Browser
+
+import { compile_contract, createFileManager } from '@noir-lang/noir_wasm';
+
+const fm = createFileManager('/');
+for (const path of files) {
+  await fm.writeFile(path, await getFileAsStream(path));
+}
+const myCompiledCode = await compile_contract(fm);
+```
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/createFileManager.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/createFileManager.md
new file mode 100644
index 00000000000..7e65c1d69c7
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/createFileManager.md
@@ -0,0 +1,21 @@
+# createFileManager()
+
+```ts
+createFileManager(dataDir): FileManager
+```
+
+Creates a new FileManager instance based on fs in node and memfs in the browser (via webpack alias)
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `dataDir` | `string` | root of the file system |
+
+## Returns
+
+`FileManager`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md
new file mode 100644
index 00000000000..fcea9275341
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/functions/inflateDebugSymbols.md
@@ -0,0 +1,21 @@
+# inflateDebugSymbols()
+
+```ts
+inflateDebugSymbols(debugSymbols): any
+```
+
+Decompresses and decodes the debug symbols
+
+## Parameters
+
+| Parameter | Type | Description |
+| :------ | :------ | :------ |
+| `debugSymbols` | `string` | The base64 encoded debug symbols |
+
+## Returns
+
+`any`
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/index.md b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/index.md
new file mode 100644
index 00000000000..b6e0f9d1bc0
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/index.md
@@ -0,0 +1,49 @@
+# noir_wasm
+
+## Exports
+
+### Functions
+
+| Function | Description |
+| :------ | :------ |
+| [compile](functions/compile.md) | Compiles a Noir project |
+| [compile\_contract](functions/compile_contract.md) | Compiles a Noir project |
+| [createFileManager](functions/createFileManager.md) | Creates a new FileManager instance based on fs in node and memfs in the browser (via webpack alias) |
+| [inflateDebugSymbols](functions/inflateDebugSymbols.md) | Decompresses and decodes the debug symbols |
+
+## References
+
+### compile\_program
+
+Renames and re-exports [compile](functions/compile.md)
+
+## Interfaces
+
+### ContractCompilationArtifacts
+
+The compilation artifacts of a given contract.
+
+#### Properties
+
+| Property | Type | Description |
+| :------ | :------ | :------ |
+| `contract` | `ContractArtifact` | The compiled contract. |
+| `warnings` | `unknown`[] | Compilation warnings. |
+
+***
+
+### ProgramCompilationArtifacts
+
+The compilation artifacts of a given program.
+
+#### Properties
+
+| Property | Type | Description |
+| :------ | :------ | :------ |
+| `name` | `string` | not part of the compilation output, injected later |
+| `program` | `ProgramArtifact` | The compiled contract. |
+| `warnings` | `unknown`[] | Compilation warnings. |
+
+***
+
+Generated using [typedoc-plugin-markdown](https://www.npmjs.com/package/typedoc-plugin-markdown) and [TypeDoc](https://typedoc.org/)
diff --git a/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs
new file mode 100644
index 00000000000..e0870710349
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/NoirJS/noir_wasm/typedoc-sidebar.cjs
@@ -0,0 +1,4 @@
+// @ts-check
+/** @type {import('@docusaurus/plugin-content-docs').SidebarsConfig} */
+const typedocSidebar = { items: [{"type":"doc","id":"reference/NoirJS/noir_wasm/index","label":"API"},{"type":"category","label":"Functions","items":[{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/compile","label":"compile"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/compile_contract","label":"compile_contract"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/createFileManager","label":"createFileManager"},{"type":"doc","id":"reference/NoirJS/noir_wasm/functions/inflateDebugSymbols","label":"inflateDebugSymbols"}]}]};
+module.exports = typedocSidebar.items;
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/reference/_category_.json b/docs/versioned_docs/version-v0.31.0/reference/_category_.json
new file mode 100644
index 00000000000..5b6a20a609a
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/_category_.json
@@ -0,0 +1,5 @@
+{
+    "position": 4,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/reference/debugger/_category_.json b/docs/versioned_docs/version-v0.31.0/reference/debugger/_category_.json
new file mode 100644
index 00000000000..27869205ad3
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/debugger/_category_.json
@@ -0,0 +1,6 @@
+{
+    "label": "Debugger",
+    "position": 1,
+    "collapsible": true,
+    "collapsed": true
+}
diff --git a/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_known_limitations.md b/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_known_limitations.md
new file mode 100644
index 00000000000..936d416ac4b
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_known_limitations.md
@@ -0,0 +1,59 @@
+---
+title: Known limitations
+description:
+  An overview of known limitations of the current version of the Noir debugger
+keywords:
+  [
+    Nargo,
+    Noir Debugger,
+    VS Code,
+  ]
+sidebar_position: 2
+---
+
+# Debugger Known Limitations
+
+There are currently some limits to what the debugger can observe. 
+
+## Mutable references
+
+The debugger is currently blind to any state mutated via a mutable reference. For example, in:
+
+```
+let mut x = 1;
+let y = &mut x;
+*y = 2;
+```
+
+The update on `x` will not be observed by the debugger. That means, when running `vars` from the debugger REPL, or inspecting the _local variables_ pane in the VS Code debugger, `x` will appear with value 1 despite having executed `*y = 2;`.
+
+## Variables of type function or mutable references are opaque
+
+When inspecting variables, any variable of type `Function` or `MutableReference` will render its value as `<<function>>` or `<<mutable ref>>`.
+
+## Debugger instrumentation affects resulting ACIR
+                      
+In order to make the state of local variables observable, the debugger compiles Noir circuits interleaving foreign calls that track any mutations to them. While this works (except in the cases described above) and doesn't introduce any behavior changes, it does as a side effect produce bigger bytecode. In particular, when running the command `opcodes` on the REPL debugger, you will notice Unconstrained VM blocks that look like this:
+
+```
+...
+5    BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [], q_c: 2 }), Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(2))], q_c: 0 })]
+       |       outputs=[]
+  5.0  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(0) }
+  5.1  |   Mov { destination: RegisterIndex(3), source: RegisterIndex(1) }
+  5.2  |   Const { destination: RegisterIndex(0), value: Value { inner: 0 } }
+  5.3  |   Const { destination: RegisterIndex(1), value: Value { inner: 0 } }
+  5.4  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(2) }
+  5.5  |   Mov { destination: RegisterIndex(3), source: RegisterIndex(3) }
+  5.6  |   Call { location: 8 }
+  5.7  |   Stop
+  5.8  |   ForeignCall { function: "__debug_var_assign", destinations: [], inputs: [RegisterIndex(RegisterIndex(2)), RegisterIndex(RegisterIndex(3))] }
+...
+```               
+                                    
+If you are interested in debugging/inspecting compiled ACIR without these synthetic changes, you can invoke the REPL debugger with the `--skip-instrumentation` flag or launch the VS Code debugger with the `skipConfiguration` property set to true in its launch configuration. You can find more details about those in the [Debugger REPL reference](debugger_repl.md) and the [VS Code Debugger reference](debugger_vscode.md).
+
+:::note
+Skipping debugger instrumentation means you won't be able to inspect values of local variables.
+:::
+
diff --git a/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_repl.md b/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_repl.md
new file mode 100644
index 00000000000..46e2011304e
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_repl.md
@@ -0,0 +1,360 @@
+---
+title: REPL Debugger
+description:
+  Noir Debugger REPL options and commands. 
+keywords:
+  [
+    Nargo,
+    Noir CLI,
+    Noir Debugger,
+    REPL,
+  ]
+sidebar_position: 1
+---
+
+## Running the REPL debugger
+
+`nargo debug [OPTIONS] [WITNESS_NAME]`
+
+Runs the Noir REPL debugger. If a `WITNESS_NAME` is provided the debugger writes the resulting execution witness to a `WITNESS_NAME` file.
+
+### Options
+
+| Option                | Description                                                  |
+| --------------------- | ------------------------------------------------------------ |
+| `-p, --prover-name <PROVER_NAME>` | The name of the toml file which contains the inputs for the prover [default: Prover]|
+| `--package <PACKAGE>` | The name of the package to debug                             |
+| `--print-acir`        | Display the ACIR for compiled circuit                        |
+| `--deny-warnings`     | Treat all warnings as errors                                 |
+| `--silence-warnings`  | Suppress warnings                                            |
+| `-h, --help`          | Print help                                                   |
+
+None of these options are required.
+
+:::note
+Since the debugger starts by compiling the target package, all Noir compiler options are also available. Check out the [compiler reference](../nargo_commands.md#nargo-compile) to learn more about the compiler options.
+:::
+
+## REPL commands
+
+Once the debugger is running, it accepts the following commands.
+
+#### `help` (h)
+
+Displays the menu of available commands.
+
+```
+> help
+Available commands:
+
+  opcodes                          display ACIR opcodes
+  into                             step into to the next opcode
+  next                             step until a new source location is reached
+  out                              step until a new source location is reached
+                                   and the current stack frame is finished
+  break LOCATION:OpcodeLocation    add a breakpoint at an opcode location
+  over                             step until a new source location is reached
+                                   without diving into function calls
+  restart                          restart the debugging session
+  delete LOCATION:OpcodeLocation   delete breakpoint at an opcode location
+  witness                          show witness map
+  witness index:u32                display a single witness from the witness map
+  witness index:u32 value:String   update a witness with the given value
+  memset index:usize value:String  update a memory cell with the given
+                                   value
+  continue                         continue execution until the end of the
+                                   program
+  vars                             show variable values available at this point
+                                   in execution
+  stacktrace                       display the current stack trace
+  memory                           show memory (valid when executing unconstrained code)                                 value
+  step                             step to the next ACIR opcode
+
+Other commands:
+
+  help  Show this help message
+  quit  Quit repl
+
+```
+
+### Stepping through programs
+
+#### `next` (n)
+
+Step until the next Noir source code location. While other commands, such as [`into`](#into-i) and [`step`](#step-s), allow for finer grained control of the program's execution at the opcode level, `next` is source code centric. For example:
+
+```
+3    ...
+4    fn main(x: u32) {
+5        assert(entry_point(x) == 2);
+6        swap_entry_point(x, x + 1);
+7 ->     assert(deep_entry_point(x) == 4);
+8        multiple_values_entry_point(x);
+9    }
+```
+
+
+Using `next` here would cause the debugger to jump to the definition of `deep_entry_point` (if available). 
+
+If you want to step over `deep_entry_point` and go straight to line 8, use [the `over` command](#over) instead.
+
+#### `over`
+
+Step until the next source code location, without diving into function calls. For example:
+
+```
+3    ...
+4    fn main(x: u32) {
+5        assert(entry_point(x) == 2);
+6        swap_entry_point(x, x + 1);
+7 ->     assert(deep_entry_point(x) == 4);
+8        multiple_values_entry_point(x);
+9    }
+```
+
+
+Using `over` here would cause the debugger to execute until line 8 (`multiple_values_entry_point(x);`).
+
+If you want to step into `deep_entry_point` instead, use [the `next` command](#next-n).
+
+#### `out`
+
+Step until the end of the current function call. For example:
+
+```
+  3    ...
+  4    fn main(x: u32) {
+  5        assert(entry_point(x) == 2);
+  6        swap_entry_point(x, x + 1);
+  7 ->     assert(deep_entry_point(x) == 4);
+  8        multiple_values_entry_point(x);
+  9    }
+ 10    
+ 11    unconstrained fn returns_multiple_values(x: u32) -> (u32, u32, u32, u32) {
+ 12    ...
+ ...
+ 55    
+ 56    unconstrained fn deep_entry_point(x: u32) -> u32 {
+ 57 ->     level_1(x + 1)
+ 58    }
+
+```
+
+Running `out` here will resume execution until line 8.
+
+#### `step` (s)
+
+Skips to the next ACIR code. A compiled Noir program is a sequence of ACIR opcodes. However, an unconstrained VM opcode denotes the start of an unconstrained code block, to be executed by the unconstrained VM. For example (redacted for brevity):
+
+```
+0  BLACKBOX::RANGE [(_0, num_bits: 32)] [ ]
+1 ->  BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))]
+	1.0  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(0) }
+	1.1  |   Const { destination: RegisterIndex(0), value: Value { inner: 0 } }
+	1.2  |   Const { destination: RegisterIndex(1), value: Value { inner: 0 } }
+	1.3  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(2) }
+	1.4  |   Call { location: 7 }
+	...
+	1.43 |   Return
+2    EXPR [ (1, _1) -2 ]
+```
+
+The `->` here shows the debugger paused at an ACIR opcode: `BRILLIG`, at index 1, which denotes an unconstrained code block is about to start.
+
+Using the `step` command at this point would result in the debugger stopping at ACIR opcode 2, `EXPR`, skipping unconstrained computation steps.
+
+Use [the `into` command](#into-i) instead if you want to follow unconstrained computation step by step.
+
+#### `into` (i)
+
+Steps into the next opcode. A compiled Noir program is a sequence of ACIR opcodes. However, a BRILLIG opcode denotes the start of an unconstrained code block, to be executed by the unconstrained VM. For example (redacted for brevity):
+
+```
+0  BLACKBOX::RANGE [(_0, num_bits: 32)] [ ]
+1 ->  BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))]
+	1.0  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(0) }
+	1.1  |   Const { destination: RegisterIndex(0), value: Value { inner: 0 } }
+	1.2  |   Const { destination: RegisterIndex(1), value: Value { inner: 0 } }
+	1.3  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(2) }
+	1.4  |   Call { location: 7 }
+	...
+	1.43 |   Return
+2    EXPR [ (1, _1) -2 ]
+``` 
+
+The `->` here shows the debugger paused at an ACIR opcode: `BRILLIG`, at index 1, which denotes an unconstrained code block is about to start.
+
+Using the `into` command at this point would result in the debugger stopping at opcode 1.0, `Mov ...`, allowing the debugger user to follow unconstrained computation step by step.
+
+Use [the `step` command](#step-s) instead if you want to skip to the next ACIR code directly.
+
+#### `continue` (c)
+
+Continues execution until the next breakpoint, or the end of the program.
+
+#### `restart` (res)
+
+Interrupts execution, and restarts a new debugging session from scratch.
+
+#### `opcodes` (o)
+
+Display the program's ACIR opcode sequence. For example:
+
+```
+0  BLACKBOX::RANGE [(_0, num_bits: 32)] [ ]
+1 ->  BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))]
+	1.0  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(0) }
+	1.1  |   Const { destination: RegisterIndex(0), value: Value { inner: 0 } }
+	1.2  |   Const { destination: RegisterIndex(1), value: Value { inner: 0 } }
+	1.3  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(2) }
+	1.4  |   Call { location: 7 }
+	...
+	1.43 |   Return
+2     EXPR [ (1, _1) -2 ]
+```
+
+### Breakpoints
+
+#### `break [Opcode]` (or shorthand `b [Opcode]`)
+
+Sets a breakpoint on the specified opcode index. To get a list of the program opcode numbers, see [the `opcode` command](#opcodes-o). For example:
+
+```
+0  BLACKBOX::RANGE [(_0, num_bits: 32)] [ ]
+1 ->  BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))]
+	1.0  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(0) }
+	1.1  |   Const { destination: RegisterIndex(0), value: Value { inner: 0 } }
+	1.2  |   Const { destination: RegisterIndex(1), value: Value { inner: 0 } }
+	1.3  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(2) }
+	1.4  |   Call { location: 7 }
+	...
+	1.43 |   Return
+2    EXPR [ (1, _1) -2 ]
+```
+
+In this example, issuing a `break 1.2` command adds break on opcode 1.2, as denoted by the `*` character:
+
+```
+0  BLACKBOX::RANGE [(_0, num_bits: 32)] [ ]
+1 ->  BRILLIG inputs=[Single(Expression { mul_terms: [], linear_combinations: [(1, Witness(0))], q_c: 0 })] outputs=[Simple(Witness(1))]
+	1.0  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(0) }
+	1.1  |   Const { destination: RegisterIndex(0), value: Value { inner: 0 } }
+	1.2  | * Const { destination: RegisterIndex(1), value: Value { inner: 0 } }
+	1.3  |   Mov { destination: RegisterIndex(2), source: RegisterIndex(2) }
+	1.4  |   Call { location: 7 }
+	...
+	1.43 |   Return
+2    EXPR [ (1, _1) -2 ]
+```
+
+Running [the `continue` command](#continue-c) at this point would cause the debugger to execute the program until opcode 1.2.
+
+#### `delete [Opcode]` (or shorthand `d [Opcode]`)
+
+Deletes a breakpoint at an opcode location. Usage is analogous to [the `break` command](#).
+
+### Variable inspection
+
+#### vars
+
+Show variable values available at this point in execution.
+
+:::note
+The ability to inspect variable values from the debugger depends on compilation to be run in a special debug instrumentation mode. This instrumentation weaves variable tracing code with the original source code. 
+
+So variable value inspection comes at the expense of making the resulting ACIR bytecode bigger and harder to understand and optimize.
+
+If you find this compromise unacceptable, you can run the debugger with the flag `--skip-debug-instrumentation`. This will compile your circuit without any additional debug information, so the resulting ACIR bytecode will be identical to the one produced by standard Noir compilation. However, if you opt for this, the `vars` command will not be available while debugging.
+:::
+
+
+### Stacktrace
+
+#### `stacktrace`
+
+Displays the current stack trace.
+
+
+### Witness map
+
+#### `witness` (w)
+
+Show witness map. For example:
+
+```
+_0 = 0
+_1 = 2
+_2 = 1
+```
+
+#### `witness [Witness Index]`
+
+Display a single witness from the witness map. For example:
+
+```
+> witness 1
+_1 = 2
+```
+
+#### `witness [Witness Index] [New value]`
+
+Overwrite the given index with a new value. For example:
+
+```
+> witness 1 3
+_1 = 3
+```
+
+
+### Unconstrained VM memory
+
+#### `memory`
+
+Show unconstrained VM memory state. For example:
+
+```
+> memory
+At opcode 1.13: Store { destination_pointer: RegisterIndex(0), source: RegisterIndex(3) }
+...
+> registers
+0 = 0
+1 = 10
+2 = 0
+3 = 1
+4 = 1
+5 = 2³²
+6 = 1
+> into
+At opcode 1.14: Const { destination: RegisterIndex(5), value: Value { inner: 1 } }
+...
+> memory
+0 = 1
+>
+```
+
+In the example above: we start with clean memory, then step through a `Store` opcode which stores the value of register 3 (1) into the memory address stored in register 0 (0). Thus now `memory` shows memory address 0 contains value 1.
+
+:::note
+This command is only functional while the debugger is executing unconstrained code.
+:::
+
+#### `memset [Memory address] [New value]`
+
+Update a memory cell with the given value. For example:
+
+```
+> memory
+0 = 1
+> memset 0 2
+> memory
+0 = 2
+> memset 1 4
+> memory
+0 = 2
+1 = 4
+>
+```
+
+:::note
+This command is only functional while the debugger is executing unconstrained code.
+:::
\ No newline at end of file
diff --git a/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_vscode.md b/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_vscode.md
new file mode 100644
index 00000000000..c027332b3b0
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/debugger/debugger_vscode.md
@@ -0,0 +1,82 @@
+---
+title: VS Code Debugger
+description:
+  VS Code Debugger configuration and features.
+keywords:
+  [
+    Nargo,
+    Noir CLI,
+    Noir Debugger,
+    VS Code,
+    IDE,
+  ]
+sidebar_position: 0
+---
+
+# VS Code Noir Debugger Reference
+
+The Noir debugger enabled by the vscode-noir extension ships with default settings such that the most common scenario should run without any additional configuration steps.
+
+These defaults can nevertheless be overridden by defining a launch configuration file. This page provides a reference for the properties you can override via a launch configuration file, as well as documenting the Nargo `dap` command, which is a dependency of the VS Code Noir debugger. 
+
+
+## Creating and editing launch configuration files
+
+To create a launch configuration file from VS Code, open the _debug pane_, and click on _create a launch.json file_. 
+
+![Creating a launch configuration file](@site/static/img/debugger/ref1-create-launch.png)
+
+A `launch.json` file will be created, populated with basic defaults. 
+
+### Noir Debugger launch.json properties
+
+#### projectFolder
+
+_String, optional._
+
+Absolute path to the Nargo project to debug. By default, it is dynamically determined by looking for the nearest `Nargo.toml` file to the active file at the moment of launching the debugger. 
+
+#### proverName
+
+_String, optional._
+
+Name of the prover input to use. Defaults to `Prover`, which looks for a file named `Prover.toml` at the `projectFolder`.
+
+#### generateAcir
+
+_Boolean, optional._
+
+If true, generate ACIR opcodes instead of unconstrained opcodes which will be closer to release binaries but less convenient for debugging. Defaults to `false`.
+                
+#### skipInstrumentation
+
+_Boolean, optional._
+
+Skips variables debugging instrumentation of code, making debugging less convenient but the resulting binary smaller and closer to production. Defaults to `false`.
+
+:::note
+Skipping instrumentation causes the debugger to be unable to inspect local variables.
+:::
+
+## `nargo dap [OPTIONS]`
+
+When run without any option flags, it starts the Nargo Debug Adapter Protocol server, which acts as the debugging backend for the VS Code Noir Debugger. 
+
+All option flags are related to preflight checks. The Debug Adapter Protocol specifies how errors are to be informed from a running DAP server, but it doesn't specify mechanisms to communicate server initialization errors between the DAP server and its client IDE. 
+
+Thus `nargo dap` ships with a _preflight check_ mode. If flag `--preflight-check` and the rest of the `--preflight-*` flags are provided, Nargo will run the same initialization routine except it will not start the DAP server.
+
+`vscode-noir` will then run `nargo dap` in preflight check mode first before a debugging session starts. If the preflight check ends in error, vscode-noir will present stderr and stdout output from this process through its own Output pane in VS Code. This makes it possible for users to diagnose what pieces of configuration might be wrong or missing in case of initialization errors.
+
+If the preflight check succeeds, `vscode-noir` proceeds to start the DAP server normally but running `nargo dap` without any additional flags.
+
+### Options
+
+| Option                                  | Description                                                                         |
+| --------------------------------------------------------- | --------------------------------------------------------------------------------------------------------- |
+| `--preflight-check`                     | If present, dap runs in preflight check mode.                               |
+| `--preflight-project-folder <PREFLIGHT_PROJECT_FOLDER>`   | Absolute path to the project to debug for preflight check.                        |
+| `--preflight-prover-name <PREFLIGHT_PROVER_NAME>`       | Name of prover file to use for preflight check                              |
+| `--preflight-generate-acir`                 | Optional. If present, compile in ACIR mode while running preflight check.                                 |
+| `--preflight-skip-instrumentation`            | Optional. If present, compile without introducing debug instrumentation while running preflight check.  |
+| `-h, --help`                            | Print help.                                               |
diff --git a/docs/versioned_docs/version-v0.31.0/reference/nargo_commands.md b/docs/versioned_docs/version-v0.31.0/reference/nargo_commands.md
new file mode 100644
index 00000000000..ab9dd879d85
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/reference/nargo_commands.md
@@ -0,0 +1,244 @@
+---
+title: Nargo
+description:
+  Noir CLI Commands for Noir Prover and Verifier to create, execute, prove and verify programs,
+  generate Solidity verifier smart contract and compile into JSON file containing ACIR
+  representation and ABI of circuit.
+keywords:
+  [
+    Nargo,
+    Noir CLI,
+    Noir Prover,
+    Noir Verifier,
+    generate Solidity verifier,
+    compile JSON file,
+    ACIR representation,
+    ABI of circuit,
+    TypeScript,
+  ]
+sidebar_position: 0
+---
+
+# Command-Line Help for `nargo`
+
+This document contains the help content for the `nargo` command-line program.
+
+**Command Overview:**
+
+* [`nargo`↴](#nargo)
+* [`nargo check`↴](#nargo-check)
+* [`nargo fmt`↴](#nargo-fmt)
+* [`nargo compile`↴](#nargo-compile)
+* [`nargo new`↴](#nargo-new)
+* [`nargo init`↴](#nargo-init)
+* [`nargo execute`↴](#nargo-execute)
+* [`nargo test`↴](#nargo-test)
+* [`nargo info`↴](#nargo-info)
+* [`nargo lsp`↴](#nargo-lsp)
+
+## `nargo`
+
+Noir's package manager
+
+**Usage:** `nargo <COMMAND>`
+
+###### **Subcommands:**
+
+* `check` — Checks the constraint system for errors
+* `fmt` — Format the Noir files in a workspace
+* `compile` — Compile the program and its secret execution trace into ACIR format
+* `new` — Create a Noir project in a new directory
+* `init` — Create a Noir project in the current directory
+* `execute` — Executes a circuit to calculate its return value
+* `test` — Run the tests for this program
+* `info` — Provides detailed information on each of a program's function (represented by a single circuit)
+* `lsp` — Starts the Noir LSP server
+
+###### **Options:**
+
+
+
+
+## `nargo check`
+
+Checks the constraint system for errors
+
+**Usage:** `nargo check [OPTIONS]`
+
+###### **Options:**
+
+* `--package <PACKAGE>` — The name of the package to check
+* `--workspace` — Check all packages in the workspace
+* `--overwrite` — Force overwrite of existing files
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+
+  Default value: `4`
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo fmt`
+
+Format the Noir files in a workspace
+
+**Usage:** `nargo fmt [OPTIONS]`
+
+###### **Options:**
+
+* `--check` — Run noirfmt in check mode
+
+
+
+## `nargo compile`
+
+Compile the program and its secret execution trace into ACIR format
+
+**Usage:** `nargo compile [OPTIONS]`
+
+###### **Options:**
+
+* `--package <PACKAGE>` — The name of the package to compile
+* `--workspace` — Compile all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+
+  Default value: `4`
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo new`
+
+Create a Noir project in a new directory
+
+**Usage:** `nargo new [OPTIONS] <PATH>`
+
+###### **Arguments:**
+
+* `<PATH>` — The path to save the new project
+
+###### **Options:**
+
+* `--name <NAME>` — Name of the package [default: package directory name]
+* `--lib` — Use a library template
+* `--bin` — Use a binary template [default]
+* `--contract` — Use a contract template
+
+
+
+## `nargo init`
+
+Create a Noir project in the current directory
+
+**Usage:** `nargo init [OPTIONS]`
+
+###### **Options:**
+
+* `--name <NAME>` — Name of the package [default: current directory name]
+* `--lib` — Use a library template
+* `--bin` — Use a binary template [default]
+* `--contract` — Use a contract template
+
+
+
+## `nargo execute`
+
+Executes a circuit to calculate its return value
+
+**Usage:** `nargo execute [OPTIONS] [WITNESS_NAME]`
+
+###### **Arguments:**
+
+* `<WITNESS_NAME>` — Write the execution witness to named file
+
+###### **Options:**
+
+* `-p`, `--prover-name <PROVER_NAME>` — The name of the toml file which contains the inputs for the prover
+
+  Default value: `Prover`
+* `--package <PACKAGE>` — The name of the package to execute
+* `--workspace` — Execute all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+
+  Default value: `4`
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+* `--oracle-resolver <ORACLE_RESOLVER>` — JSON RPC url to solve oracle calls
+
+
+
+## `nargo test`
+
+Run the tests for this program
+
+**Usage:** `nargo test [OPTIONS] [TEST_NAME]`
+
+###### **Arguments:**
+
+* `<TEST_NAME>` — If given, only tests with names containing this string will be run
+
+###### **Options:**
+
+* `--show-output` — Display output of `println` statements
+* `--exact` — Only run tests that match exactly
+* `--package <PACKAGE>` — The name of the package to test
+* `--workspace` — Test all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+
+  Default value: `4`
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+* `--oracle-resolver <ORACLE_RESOLVER>` — JSON RPC url to solve oracle calls
+
+
+
+## `nargo info`
+
+Provides detailed information on each of a program's function (represented by a single circuit)
+
+Current information provided per circuit: 1. The number of ACIR opcodes 2. Counts the final number gates in the circuit used by a backend
+
+**Usage:** `nargo info [OPTIONS]`
+
+###### **Options:**
+
+* `--package <PACKAGE>` — The name of the package to detail
+* `--workspace` — Detail all packages in the workspace
+* `--expression-width <EXPRESSION_WIDTH>` — Override the expression width requested by the backend
+
+  Default value: `4`
+* `--force` — Force a full recompilation
+* `--print-acir` — Display the ACIR for compiled circuit
+* `--deny-warnings` — Treat all warnings as errors
+* `--silence-warnings` — Suppress warnings
+
+
+
+## `nargo lsp`
+
+Starts the Noir LSP server
+
+Starts an LSP server which allows IDEs such as VS Code to display diagnostics in Noir source.
+
+VS Code Noir Language Support: https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir
+
+**Usage:** `nargo lsp`
+
+
+
+<hr/>
+
+<small><i>
+    This document was generated automatically by
+    <a href="https://crates.io/crates/clap-markdown"><code>clap-markdown</code></a>.
+</i></small>
+
diff --git a/docs/versioned_docs/version-v0.31.0/tooling/debugger.md b/docs/versioned_docs/version-v0.31.0/tooling/debugger.md
new file mode 100644
index 00000000000..9b7565ba9ff
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/tooling/debugger.md
@@ -0,0 +1,26 @@
+---
+title: Debugger
+description: Learn about the Noir Debugger, in its REPL or VS Code versions.
+keywords: [Nargo, VSCode, Visual Studio Code, REPL, Debugger]
+sidebar_position: 2
+---
+
+# Noir Debugger
+
+There are currently two ways of debugging Noir programs:
+
+1. From VS Code, via the [vscode-noir](https://github.com/noir-lang/vscode-noir) extension. You can install it via the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir).
+2. Via the REPL debugger, which ships with Nargo.
+
+In order to use either version of the debugger, you will need to install recent enough versions of Noir, [Nargo](../getting_started/installation/index.md) and vscode-noir:
+
+- Noir & Nargo ≥0.28.0
+- Noir's VS Code extension ≥0.0.11
+
+:::info
+At the moment, the debugger supports debugging binary projects, but not contracts.
+:::
+
+We cover the VS Code Noir debugger more in depth in [its VS Code debugger how-to guide](../how_to/debugger/debugging_with_vs_code.md) and [the reference](../reference/debugger/debugger_vscode.md).
+
+The REPL debugger is discussed at length in [the REPL debugger how-to guide](../how_to/debugger/debugging_with_the_repl.md) and [the reference](../reference/debugger/debugger_repl.md).
diff --git a/docs/versioned_docs/version-v0.31.0/tooling/language_server.md b/docs/versioned_docs/version-v0.31.0/tooling/language_server.md
new file mode 100644
index 00000000000..81e0356ef8a
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/tooling/language_server.md
@@ -0,0 +1,43 @@
+---
+title: Language Server
+description: Learn about the Noir Language Server, how to install the components, and configuration that may be required.
+keywords: [Nargo, Language Server, LSP, VSCode, Visual Studio Code]
+sidebar_position: 0
+---
+
+This section helps you install and configure the Noir Language Server.
+
+The Language Server Protocol (LSP) has two components, the [Server](#language-server) and the [Client](#language-client). Below we describe each in the context of Noir.
+
+## Language Server
+
+The Server component is provided by the Nargo command line tool that you installed at the beginning of this guide.
+As long as Nargo is installed and you've used it to run other commands in this guide, it should be good to go!
+
+If you'd like to verify that the `nargo lsp` command is available, you can run `nargo --help` and look for `lsp` in the list of commands. If you see it, you're using a version of Noir with LSP support.
+
+## Language Client
+
+The Client component is usually an editor plugin that launches the Server. It communicates LSP messages between the editor and the Server. For example, when you save a file, the Client will alert the Server, so it can try to compile the project and report any errors.
+
+Currently, Noir provides a Language Client for Visual Studio Code via the [vscode-noir](https://github.com/noir-lang/vscode-noir) extension. You can install it via the [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=noir-lang.vscode-noir).
+
+> **Note:** Noir's Language Server Protocol support currently assumes users' VSCode workspace root to be the same as users' Noir project root (i.e. where Nargo.toml lies).
+>
+> If LSP features seem to be missing / malfunctioning, make sure you are opening your Noir project directly (instead of as a sub-folder) in your VSCode instance.
+
+When your language server is running correctly and the VSCode plugin is installed, you should see handy codelens buttons for compilation, measuring circuit size, execution, and tests:
+
+![Compile and Execute](@site/static/img/codelens_compile_execute.png)
+![Run test](@site/static/img/codelens_run_test.png)
+
+You should also see your tests in the `testing` panel:
+
+![Testing panel](@site/static/img/codelens_testing_panel.png)
+
+### Configuration
+
+- **Noir: Enable LSP** - If checked, the extension will launch the Language Server via `nargo lsp` and communicate with it.
+- **Noir: Nargo Flags** - Additional flags may be specified if you require them to be added when the extension calls `nargo lsp`.
+- **Noir: Nargo Path** - An absolute path to a Nargo binary with the `lsp` command. This may be useful if Nargo is not within the `PATH` of your editor.
+- **Noir > Trace: Server** - Setting this to `"messages"` or `"verbose"` will log LSP messages between the Client and Server. Useful for debugging.
diff --git a/docs/versioned_docs/version-v0.31.0/tooling/testing.md b/docs/versioned_docs/version-v0.31.0/tooling/testing.md
new file mode 100644
index 00000000000..d3e0c522473
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/tooling/testing.md
@@ -0,0 +1,62 @@
+---
+title: Testing in Noir
+description: Learn how to use Nargo to test your Noir program in a quick and easy way
+keywords: [Nargo, testing, Noir, compile, test]
+sidebar_position: 1
+---
+
+You can test your Noir programs using Noir circuits.
+
+Nargo will automatically compile and run any functions which have the decorator `#[test]` on them if
+you run `nargo test`.
+
+For example if you have a program like:
+
+```rust
+fn add(x: u64, y: u64) -> u64 {
+    x + y
+}
+#[test]
+fn test_add() {
+    assert(add(2,2) == 4);
+    assert(add(0,1) == 1);
+    assert(add(1,0) == 1);
+}
+```
+
+Running `nargo test` will test that the `test_add` function can be executed while satisfying all
+the constraints which allows you to test that add returns the expected values. Test functions can't
+have any arguments currently.
+
+### Test fail
+
+You can write tests that are expected to fail by using the decorator `#[test(should_fail)]`. For example:
+
+```rust
+fn add(x: u64, y: u64) -> u64 {
+    x + y
+}
+#[test(should_fail)]
+fn test_add() {
+    assert(add(2,2) == 5);
+}
+```
+
+You can be more specific and make it fail with a specific reason by using `should_fail_with = "<the reason for failure>`:
+
+```rust
+fn main(african_swallow_avg_speed : Field) {
+    assert(african_swallow_avg_speed == 65, "What is the airspeed velocity of an unladen swallow");
+}
+
+#[test]
+fn test_king_arthur() {
+    main(65);
+}
+
+#[test(should_fail_with = "What is the airspeed velocity of an unladen swallow")]
+fn test_bridgekeeper() {
+    main(32);
+}
+
+```
diff --git a/docs/versioned_docs/version-v0.31.0/tutorials/noirjs_app.md b/docs/versioned_docs/version-v0.31.0/tutorials/noirjs_app.md
new file mode 100644
index 00000000000..cbb1938a5c6
--- /dev/null
+++ b/docs/versioned_docs/version-v0.31.0/tutorials/noirjs_app.md
@@ -0,0 +1,327 @@
+---
+title: Building a web app with NoirJS
+description: Learn how to setup a new app that uses Noir to generate and verify zero-knowledge SNARK proofs in a typescript or javascript environment.
+keywords: [how to, guide, javascript, typescript, noir, barretenberg, zero-knowledge, proofs, app]
+sidebar_position: 0
+pagination_next: noir/concepts/data_types/index
+---
+
+NoirJS is a set of packages meant to work both in a browser and a server environment. In this tutorial, we will build a simple web app using them. From here, you should get an idea on how to proceed with your own Noir projects!
+
+You can find the complete app code for this guide [here](https://github.com/noir-lang/tiny-noirjs-app).
+
+## Setup
+
+:::note
+
+Feel free to use whatever versions, just keep in mind that Nargo and the NoirJS packages are meant to be in sync. For example, Nargo 0.27.x matches `noir_js@0.27.x`, etc.
+
+In this guide, we will be pinned to 0.27.0.
+
+:::
+
+Before we start, we want to make sure we have Node and Nargo installed.
+
+We start by opening a terminal and executing `node --version`. If we don't get an output like `v20.10.0`, that means node is not installed. Let's do that by following the handy [nvm guide](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script).
+
+As for `Nargo`, we can follow the [Nargo guide](../getting_started/installation/index.md) to install it. If you're lazy, just paste this on a terminal and run `noirup`:
+
+```sh
+curl -L https://raw.githubusercontent.com/noir-lang/noirup/main/install | bash
+```
+
+Easy enough. Onwards!
+
+## Our project
+
+ZK is a powerful technology. An app that doesn't reveal one of the inputs to _anyone_ is almost unbelievable, yet Noir makes it as easy as a single line of code.
+
+In fact, it's so simple that it comes nicely packaged in `nargo`. Let's do that!
+
+### Nargo
+
+Run:
+
+`nargo new circuit`
+
+And... That's about it. Your program is ready to be compiled and run.
+
+To compile, let's `cd` into the `circuit` folder to enter our project, and call:
+
+`nargo compile`
+
+This compiles our circuit into `json` format and add it to a new `target` folder.
+
+:::info
+
+At this point in the tutorial, your folder structure should look like this:
+
+```tree
+.
+└── circuit <---- our working directory
+    ├── Nargo.toml
+    ├── src
+    │   └── main.nr
+    └── target
+        └── circuit.json
+```
+
+:::
+
+### Node and Vite
+
+If you want to explore Nargo, feel free to go on a side-quest now and follow the steps in the
+[getting started](../getting_started/hello_noir/index.md) guide. However, we want our app to run on the browser, so we need Vite.
+
+Vite is a powerful tool to generate static websites. While it provides all kinds of features, let's just go barebones with some good old vanilla JS.
+
+To do this this, go back to the previous folder (`cd ..`) and create a new vite project by running `npm create vite` and choosing "Vanilla" and "Javascript".
+
+A wild `vite-project` directory should now appear in your root folder! Let's not waste any time and dive right in:
+
+```bash
+cd vite-project
+```
+
+### Setting Up Vite and Configuring the Project
+
+Before we proceed with any coding, let's get our environment tailored for Noir. We'll start by laying down the foundations with a `vite.config.js` file. This little piece of configuration is our secret sauce for making sure everything meshes well with the NoirJS libraries and other special setups we might need, like handling WebAssembly modules. Here’s how you get that going:
+
+#### Creating the vite.config.js
+
+In your freshly minted `vite-project` folder, create a new file named `vite.config.js` and open it in your code editor. Paste the following to set the stage:
+
+```javascript
+import { defineConfig } from "vite";
+import copy from "rollup-plugin-copy";
+
+export default defineConfig({
+  esbuild: {
+    target: "esnext",
+  },
+  optimizeDeps: {
+    esbuildOptions: {
+      target: "esnext",
+    },
+  },
+  plugins: [
+    copy({
+      targets: [
+        { src: "node_modules/**/*.wasm", dest: "node_modules/.vite/dist" },
+      ],
+      copySync: true,
+      hook: "buildStart",
+    }),
+  ],
+  server: {
+    port: 3000,
+  },
+});
+```
+
+#### Install Dependencies
+
+Now that our stage is set, install the necessary NoirJS packages along with our other dependencies:
+
+```bash
+npm install && npm install @noir-lang/backend_barretenberg@0.27.0 @noir-lang/noir_js@0.27.0
+npm install rollup-plugin-copy --save-dev
+```
+
+:::info
+
+At this point in the tutorial, your folder structure should look like this:
+
+```tree
+.
+└── circuit
+    └── ...etc...
+└── vite-project <---- our working directory
+    └── ...etc...
+```
+
+:::
+
+#### Some cleanup
+
+`npx create vite` is amazing but it creates a bunch of files we don't really need for our simple example. Actually, let's just delete everything except for `vite.config.js`, `index.html`, `main.js` and `package.json`. I feel lighter already.
+
+![my heart is ready for you, noir.js](@site/static/img/memes/titanic.jpeg)
+
+## HTML
+
+Our app won't run like this, of course. We need some working HTML, at least. Let's open our broken-hearted `index.html` and replace everything with this code snippet:
+
+```html
+<!DOCTYPE html>
+<head>
+  <style>
+    .outer {
+        display: flex;
+        justify-content: space-between;
+        width: 100%;
+    }
+    .inner {
+        width: 45%;
+        border: 1px solid black;
+        padding: 10px;
+        word-wrap: break-word;
+    }
+  </style>
+</head>
+<body>
+  <script type="module" src="/main.js"></script>
+  <h1>Noir app</h1>
+  <div class="input-area">
+    <input id="guessInput" type="number" placeholder="Enter your guess" />
+    <button id="submitGuess">Submit Guess</button>
+  </div>
+  <div class="outer">
+    <div id="logs" class="inner"><h2>Logs</h2></div>
+    <div id="results" class="inner"><h2>Proof</h2></div>
+  </div>
+</body>
+</html>
+```
+
+It _could_ be a beautiful UI... Depending on which universe you live in.
+
+## Some good old vanilla Javascript
+
+Our love for Noir needs undivided attention, so let's just open `main.js` and delete everything (this is where the romantic scenery becomes a bit creepy).
+
+Start by pasting in this boilerplate code:
+
+```js
+const setup = async () => {
+  await Promise.all([
+    import('@noir-lang/noirc_abi').then((module) =>
+      module.default(new URL('@noir-lang/noirc_abi/web/noirc_abi_wasm_bg.wasm', import.meta.url).toString()),
+    ),
+    import('@noir-lang/acvm_js').then((module) =>
+      module.default(new URL('@noir-lang/acvm_js/web/acvm_js_bg.wasm', import.meta.url).toString()),
+    ),
+  ]);
+};
+
+function display(container, msg) {
+  const c = document.getElementById(container);
+  const p = document.createElement('p');
+  p.textContent = msg;
+  c.appendChild(p);
+}
+
+document.getElementById('submitGuess').addEventListener('click', async () => {
+  try {
+    // here's where love happens
+  } catch (err) {
+    display('logs', 'Oh 💔 Wrong guess');
+  }
+});
+```
+
+The display function doesn't do much. We're simply manipulating our website to see stuff happening. For example, if the proof fails, it will simply log a broken heart 😢
+
+As for the `setup` function, it's just a sad reminder that dealing with `wasm` on the browser is not as easy as it should. Just copy, paste, and forget.
+
+:::info
+
+At this point in the tutorial, your folder structure should look like this:
+
+```tree
+.
+└── circuit
+    └── ...same as above
+└── vite-project
+    ├── vite.config.js
+    ├── main.js
+    ├── package.json
+    └── index.html
+```
+
+You'll see other files and folders showing up (like `package-lock.json`, `node_modules`) but you shouldn't have to care about those.
+
+:::
+
+## Some NoirJS
+
+We're starting with the good stuff now. If you've compiled the circuit as described above, you should have a `json` file we want to import at the very top of our `main.js` file:
+
+```ts
+import circuit from '../circuit/target/circuit.json';
+```
+
+[Noir is backend-agnostic](../index.mdx#whats-new-about-noir). We write Noir, but we also need a proving backend. That's why we need to import and instantiate the two dependencies we installed above: `BarretenbergBackend` and `Noir`. Let's import them right below:
+
+```js
+import { BarretenbergBackend, BarretenbergVerifier as Verifier } from '@noir-lang/backend_barretenberg';
+import { Noir } from '@noir-lang/noir_js';
+```
+
+And instantiate them inside our try-catch block:
+
+```ts
+// try {
+const backend = new BarretenbergBackend(circuit);
+const noir = new Noir(circuit);
+// }
+```
+
+:::note
+
+For the remainder of the tutorial, everything will be happening inside the `try` block
+
+:::
+
+## Our app
+
+Now for the app itself. We're capturing whatever is in the input when people press the submit button. Just add this:
+
+```js
+const x = parseInt(document.getElementById('guessInput').value);
+const input = { x, y: 2 };
+```
+
+Now we're ready to prove stuff! Let's feed some inputs to our circuit and calculate the proof:
+
+```js
+await setup(); // let's squeeze our wasm inits here
+
+display('logs', 'Generating proof... ⌛');
+const { witness } = await noir.execute(input);
+const proof = await backend.generateProof(witness);
+display('logs', 'Generating proof... ✅');
+display('results', proof.proof);
+```
+
+You're probably eager to see stuff happening, so go and run your app now!
+
+From your terminal, run `npm run dev`. If it doesn't open a browser for you, just visit `localhost:5173`. You should now see the worst UI ever, with an ugly input.
+
+![Getting Started 0](@site/static/img/noir_getting_started_1.png)
+
+Now, our circuit says `fn main(x: Field, y: pub Field)`. This means only the `y` value is public, and it's hardcoded above: `input = { x, y: 2 }`. In other words, you won't need to send your secret`x` to the verifier!
+
+By inputting any number other than 2 in the input box and clicking "submit", you should get a valid proof. Otherwise the proof won't even generate correctly. By the way, if you're human, you shouldn't be able to understand anything on the "proof" box. That's OK. We like you, human ❤️.
+
+## Verifying
+
+Time to celebrate, yes! But we shouldn't trust machines so blindly. Let's add these lines to see our proof being verified:
+
+```js
+display('logs', 'Verifying proof... ⌛');
+const verificationKey = await backend.getVerificationKey();
+const verifier = new Verifier();
+const isValid = await verifier.verifyProof(proof, verificationKey);
+if (isValid) display('logs', 'Verifying proof... ✅');
+```
+
+You have successfully generated a client-side Noir web app!
+
+![coded app without math knowledge](@site/static/img/memes/flextape.jpeg)
+
+## Further Reading
+
+You can see how noirjs is used in a full stack Next.js hardhat application in the [noir-starter repo here](https://github.com/noir-lang/noir-starter/tree/main/vite-hardhat). The example shows how to calculate a proof in the browser and verify it with a deployed Solidity verifier contract from noirjs.
+
+You should also check out the more advanced examples in the [noir-examples repo](https://github.com/noir-lang/noir-examples), where you'll find reference usage for some cool apps.
diff --git a/docs/versioned_sidebars/version-v0.31.0-sidebars.json b/docs/versioned_sidebars/version-v0.31.0-sidebars.json
new file mode 100644
index 00000000000..b9ad026f69f
--- /dev/null
+++ b/docs/versioned_sidebars/version-v0.31.0-sidebars.json
@@ -0,0 +1,93 @@
+{
+  "sidebar": [
+    {
+      "type": "doc",
+      "id": "index"
+    },
+    {
+      "type": "category",
+      "label": "Getting Started",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "getting_started"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "The Noir Language",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "noir"
+        }
+      ]
+    },
+    {
+      "type": "html",
+      "value": "<div class=\"divider\"></div>",
+      "defaultStyle": true
+    },
+    {
+      "type": "category",
+      "label": "How To Guides",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "how_to"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Explainers",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "explainers"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Tutorials",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "tutorials"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Reference",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "reference"
+        }
+      ]
+    },
+    {
+      "type": "category",
+      "label": "Tooling",
+      "items": [
+        {
+          "type": "autogenerated",
+          "dirName": "tooling"
+        }
+      ]
+    },
+    {
+      "type": "html",
+      "value": "<div class=\"divider\"></div>",
+      "defaultStyle": true
+    },
+    {
+      "type": "doc",
+      "id": "migration_notes",
+      "label": "Migration notes"
+    }
+  ]
+}
diff --git a/examples/recursion/recurse_leaf/src/main.nr b/examples/recursion/recurse_leaf/src/main.nr
index b6a2b49b219..4859e84d49e 100644
--- a/examples/recursion/recurse_leaf/src/main.nr
+++ b/examples/recursion/recurse_leaf/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 #[recursive]
 fn main(
     verification_key: [Field; 114],
@@ -17,4 +15,4 @@ fn main(
     );
     // Take output of previous proof and add another number to it.
     public_inputs[2] as u64 + num
-}
\ No newline at end of file
+}
diff --git a/examples/recursion/recurse_node/src/main.nr b/examples/recursion/recurse_node/src/main.nr
index 7c983dcf050..60192493b54 100644
--- a/examples/recursion/recurse_node/src/main.nr
+++ b/examples/recursion/recurse_node/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(
     verification_key: [Field; 114],
     public_inputs: pub [Field; 4],
@@ -14,4 +12,4 @@ fn main(
         key_hash
     );
     public_inputs[3] as u64
-}
\ No newline at end of file
+}
diff --git a/noir_stdlib/src/aes128.nr b/noir_stdlib/src/aes128.nr
index e6e2a5e4997..7b0876b86f3 100644
--- a/noir_stdlib/src/aes128.nr
+++ b/noir_stdlib/src/aes128.nr
@@ -1,4 +1,4 @@
 #[foreign(aes128_encrypt)]
 // docs:start:aes128
-pub fn aes128_encrypt<N>(input: [u8; N], iv: [u8; 16], key: [u8; 16]) -> [u8] {}
+pub fn aes128_encrypt<let N: u32>(input: [u8; N], iv: [u8; 16], key: [u8; 16]) -> [u8] {}
 // docs:end:aes128
diff --git a/noir_stdlib/src/array.nr b/noir_stdlib/src/array.nr
index 6fba197dd05..ad9c7093d07 100644
--- a/noir_stdlib/src/array.nr
+++ b/noir_stdlib/src/array.nr
@@ -2,7 +2,7 @@ use crate::cmp::Ord;
 
 // TODO: Once we fully move to the new SSA pass this module can be removed and replaced
 // by the methods in the `slice` module
-impl<T, N> [T; N] {
+impl<T, let N: u32> [T; N] {
     #[builtin(array_len)]
     pub fn len(self) -> u32 {}
 
@@ -110,7 +110,7 @@ impl<T, N> [T; N] {
 
 // helper function used to look up the position of a value in an array of Field
 // Note that function returns 0 if the value is not found
-unconstrained fn find_index<N>(a: [u32; N], find: u32) -> u32 {
+unconstrained fn find_index<let N: u32>(a: [u32; N], find: u32) -> u32 {
     let mut result = 0;
     for i in 0..a.len() {
         if a[i] == find {
diff --git a/noir_stdlib/src/cmp.nr b/noir_stdlib/src/cmp.nr
index 457b2cfa167..bdd5e2bc5ec 100644
--- a/noir_stdlib/src/cmp.nr
+++ b/noir_stdlib/src/cmp.nr
@@ -18,7 +18,7 @@ impl Eq for i64 { fn eq(self, other: i64) -> bool { self == other } }
 impl Eq for () { fn eq(_self: Self, _other: ()) -> bool { true } }
 impl Eq for bool { fn eq(self, other: bool) -> bool { self == other } }
 
-impl<T, N> Eq for [T; N] where T: Eq {
+impl<T, let N: u32> Eq for [T; N] where T: Eq {
     fn eq(self, other: [T; N]) -> bool {
         let mut result = true;
         for i in 0 .. self.len() {
@@ -38,7 +38,7 @@ impl<T> Eq for [T] where T: Eq {
     }
 }
 
-impl<N> Eq for str<N> {
+impl<let N: u32> Eq for str<N> {
     fn eq(self, other: str<N>) -> bool {
         let self_bytes = self.as_bytes();
         let other_bytes = other.as_bytes();
@@ -203,7 +203,7 @@ impl Ord for bool {
     }
 }
 
-impl<T, N> Ord for [T; N] where T: Ord {
+impl<T, let N: u32> Ord for [T; N] where T: Ord {
     // The first non-equal element of both arrays determines
     // the ordering for the whole array.
     fn cmp(self, other: [T; N]) -> Ordering {
diff --git a/noir_stdlib/src/collections/bounded_vec.nr b/noir_stdlib/src/collections/bounded_vec.nr
index aae96e5943d..a1a0aaf1403 100644
--- a/noir_stdlib/src/collections/bounded_vec.nr
+++ b/noir_stdlib/src/collections/bounded_vec.nr
@@ -1,11 +1,11 @@
 use crate::{cmp::Eq, convert::From};
 
-struct BoundedVec<T, MaxLen> {
+struct BoundedVec<T, let MaxLen: u32> {
     storage: [T; MaxLen],
     len: u32,
 }
 
-impl<T, MaxLen> BoundedVec<T, MaxLen> {
+impl<T, let MaxLen: u32> BoundedVec<T, MaxLen> {
     pub fn new() -> Self {
         let zeroed = crate::unsafe::zeroed();
         BoundedVec { storage: [zeroed; MaxLen], len: 0 }
@@ -41,7 +41,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
         self.storage
     }
 
-    pub fn extend_from_array<Len>(&mut self, array: [T; Len]) {
+    pub fn extend_from_array<let Len: u32>(&mut self, array: [T; Len]) {
         let new_len = self.len + array.len();
         assert(new_len <= MaxLen, "extend_from_array out of bounds");
         for i in 0..array.len() {
@@ -59,7 +59,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
         self.len = new_len;
     }
 
-    pub fn extend_from_bounded_vec<Len>(&mut self, vec: BoundedVec<T, Len>) {
+    pub fn extend_from_bounded_vec<let Len: u32>(&mut self, vec: BoundedVec<T, Len>) {
         let append_len = vec.len();
         let new_len = self.len + append_len;
         assert(new_len <= MaxLen, "extend_from_bounded_vec out of bounds");
@@ -74,7 +74,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
         self.len = new_len;
     }
 
-    pub fn from_array<Len>(array: [T; Len]) -> Self {
+    pub fn from_array<let Len: u32>(array: [T; Len]) -> Self {
         assert(Len <= MaxLen, "from array out of bounds");
         let mut vec: BoundedVec<T, MaxLen> = BoundedVec::new();
         vec.extend_from_array(array);
@@ -103,7 +103,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
     }
 }
 
-impl<T, MaxLen> Eq for BoundedVec<T, MaxLen> where T: Eq {
+impl<T, let MaxLen: u32> Eq for BoundedVec<T, MaxLen> where T: Eq {
     fn eq(self, other: BoundedVec<T, MaxLen>) -> bool {
         // TODO: https://github.com/noir-lang/noir/issues/4837
         //
@@ -114,7 +114,7 @@ impl<T, MaxLen> Eq for BoundedVec<T, MaxLen> where T: Eq {
     }
 }
 
-impl<T, MaxLen, Len> From<[T; Len]> for BoundedVec<T, MaxLen> {
+impl<T, let MaxLen: u32, let Len: u32> From<[T; Len]> for BoundedVec<T, MaxLen> {
     fn from(array: [T; Len]) -> BoundedVec<T, MaxLen>  {
         BoundedVec::from_array(array)
     }
diff --git a/noir_stdlib/src/collections/map.nr b/noir_stdlib/src/collections/map.nr
index 84e94166869..8324583632f 100644
--- a/noir_stdlib/src/collections/map.nr
+++ b/noir_stdlib/src/collections/map.nr
@@ -15,7 +15,7 @@ global MAX_LOAD_FACTOR_DEN0MINATOR = 4;
 // Size of the underlying table must be known at compile time.
 // It is advised to select capacity N as a power of two, or a prime number 
 // because utilized probing scheme is best tailored for it.
-struct HashMap<K, V, N, B> {
+struct HashMap<K, V, let N: u32, B> {
     _table: [Slot<K, V>; N],
 
     // Amount of valid elements in the map.
@@ -77,7 +77,7 @@ impl<K, V> Slot<K, V> {
 // While conducting lookup, we iterate attempt from 0 to N - 1 due to heuristic,
 // that if we have went that far without finding desired, 
 // it is very unlikely to be after - performance will be heavily degraded.
-impl<K, V, N, B, H> HashMap<K, V, N, B> {
+impl<K, V, let N: u32, B, H> HashMap<K, V, N, B> {
     // Creates a new instance of HashMap with specified BuildHasher.
     // docs:start:with_hasher
     pub fn with_hasher(_build_hasher: B) -> Self
@@ -424,7 +424,7 @@ impl<K, V, N, B, H> HashMap<K, V, N, B> {
 // equal sets of key-value entries, 
 // thus one is a subset of the other and vice versa.
 // docs:start:eq
-impl<K, V, N, B, H> Eq for HashMap<K, V, N, B>
+impl<K, V, let N: u32, B, H> Eq for HashMap<K, V, N, B>
 where
     K: Eq + Hash,
     V: Eq,
@@ -460,7 +460,7 @@ where
 }
 
 // docs:start:default
-impl<K, V, N, B, H> Default for HashMap<K, V, N, B>
+impl<K, V, let N: u32, B, H> Default for HashMap<K, V, N, B>
 where
     B: BuildHasher<H> + Default,
     H: Hasher + Default
diff --git a/noir_stdlib/src/compat.nr b/noir_stdlib/src/compat.nr
index 5d80c422c33..06da8150767 100644
--- a/noir_stdlib/src/compat.nr
+++ b/noir_stdlib/src/compat.nr
@@ -1,4 +1,7 @@
+global BN254_MODULUS_BE_BYTES: [u8] = &[
+    48, 100, 78, 114, 225, 49, 160, 41, 184, 80, 69, 182, 129, 129, 88, 93, 40, 51, 232, 72, 121, 185, 112, 145, 67, 225, 245, 147, 240, 0, 0, 1
+];
+
 pub fn is_bn254() -> bool {
-    // bn254 truncates its curve order to 0
-    21888242871839275222246405745257275088548364400416034343698204186575808495617 == 0
+    crate::field::modulus_be_bytes() == BN254_MODULUS_BE_BYTES
 }
diff --git a/noir_stdlib/src/default.nr b/noir_stdlib/src/default.nr
index bd2f1ce0cd2..0acb3966034 100644
--- a/noir_stdlib/src/default.nr
+++ b/noir_stdlib/src/default.nr
@@ -17,7 +17,7 @@ impl Default for i64 { fn default() -> i64 { 0 } }
 impl Default for () { fn default() -> () { () } }
 impl Default for bool { fn default() -> bool { false } }
 
-impl<T, N> Default for [T; N] where T: Default {
+impl<T, let N: u32> Default for [T; N] where T: Default {
     fn default() -> [T; N] {
         [T::default(); N]
     }
diff --git a/noir_stdlib/src/ec/montcurve.nr b/noir_stdlib/src/ec/montcurve.nr
index 7dc756781c0..12b48d66b9d 100644
--- a/noir_stdlib/src/ec/montcurve.nr
+++ b/noir_stdlib/src/ec/montcurve.nr
@@ -114,7 +114,7 @@ mod affine {
 
         // Scalar multiplication with scalar represented by a bit array (little-endian convention).
         // If k is the natural number represented by `bits`, then this computes p + ... + p k times.
-        fn bit_mul<N>(self, bits: [u1; N], p: Point) -> Point {
+        fn bit_mul<let N: u32>(self, bits: [u1; N], p: Point) -> Point {
             self.into_tecurve().bit_mul(bits, p.into_tecurve()).into_montcurve()
         }
 
@@ -124,7 +124,7 @@ mod affine {
         }
 
         // Multi-scalar multiplication (n[0]*p[0] + ... + n[N]*p[N], where * denotes scalar multiplication)
-        fn msm<N>(self, n: [Field; N], p: [Point; N]) -> Point {
+        fn msm<let N: u32>(self, n: [Field; N], p: [Point; N]) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
@@ -315,7 +315,7 @@ mod curvegroup {
 
         // Scalar multiplication with scalar represented by a bit array (little-endian convention).
         // If k is the natural number represented by `bits`, then this computes p + ... + p k times.
-        fn bit_mul<N>(self, bits: [u1; N], p: Point) -> Point {
+        fn bit_mul<let N: u32>(self, bits: [u1; N], p: Point) -> Point {
             self.into_tecurve().bit_mul(bits, p.into_tecurve()).into_montcurve()
         }
 
@@ -325,7 +325,7 @@ mod curvegroup {
         }
 
         // Multi-scalar multiplication (n[0]*p[0] + ... + n[N]*p[N], where * denotes scalar multiplication)
-        fn msm<N>(self, n: [Field; N], p: [Point; N]) -> Point {
+        fn msm<let N: u32>(self, n: [Field; N], p: [Point; N]) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
diff --git a/noir_stdlib/src/ec/swcurve.nr b/noir_stdlib/src/ec/swcurve.nr
index 9dd324f3085..3ad3af41cff 100644
--- a/noir_stdlib/src/ec/swcurve.nr
+++ b/noir_stdlib/src/ec/swcurve.nr
@@ -134,7 +134,7 @@ mod affine {
 
         // Scalar multiplication with scalar represented by a bit array (little-endian convention).
         // If k is the natural number represented by `bits`, then this computes p + ... + p k times.
-        fn bit_mul<N>(self, bits: [u1; N], p: Point) -> Point {
+        fn bit_mul<let N: u32>(self, bits: [u1; N], p: Point) -> Point {
             self.into_group().bit_mul(bits, p.into_group()).into_affine()
         }
 
@@ -144,7 +144,7 @@ mod affine {
         }
 
         // Multi-scalar multiplication (n[0]*p[0] + ... + n[N]*p[N], where * denotes scalar multiplication)
-        pub fn msm<N>(self, n: [Field; N], p: [Point; N]) -> Point {
+        pub fn msm<let N: u32>(self, n: [Field; N], p: [Point; N]) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
@@ -336,7 +336,7 @@ mod curvegroup {
 
         // Scalar multiplication with scalar represented by a bit array (little-endian convention).
         // If k is the natural number represented by `bits`, then this computes p + ... + p k times.
-        fn bit_mul<N>(self, bits: [u1; N], p: Point) -> Point {
+        fn bit_mul<let N: u32>(self, bits: [u1; N], p: Point) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
@@ -363,7 +363,7 @@ mod curvegroup {
         }
 
         // Multi-scalar multiplication (n[0]*p[0] + ... + n[N]*p[N], where * denotes scalar multiplication)
-        fn msm<N>(self, n: [Field; N], p: [Point; N]) -> Point {
+        fn msm<let N: u32>(self, n: [Field; N], p: [Point; N]) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
diff --git a/noir_stdlib/src/ec/tecurve.nr b/noir_stdlib/src/ec/tecurve.nr
index 506fe89313a..aaf66f903cc 100644
--- a/noir_stdlib/src/ec/tecurve.nr
+++ b/noir_stdlib/src/ec/tecurve.nr
@@ -132,7 +132,7 @@ mod affine {
 
         // Scalar multiplication with scalar represented by a bit array (little-endian convention).
         // If k is the natural number represented by `bits`, then this computes p + ... + p k times.
-        fn bit_mul<N>(self, bits: [u1; N], p: Point) -> Point {
+        fn bit_mul<let N: u32>(self, bits: [u1; N], p: Point) -> Point {
             self.into_group().bit_mul(bits, p.into_group()).into_affine()
         }
 
@@ -142,7 +142,7 @@ mod affine {
         }
 
         // Multi-scalar multiplication (n[0]*p[0] + ... + n[N]*p[N], where * denotes scalar multiplication)
-        fn msm<N>(self, n: [Field; N], p: [Point; N]) -> Point {
+        fn msm<let N: u32>(self, n: [Field; N], p: [Point; N]) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
@@ -340,7 +340,7 @@ mod curvegroup {
 
         // Scalar multiplication with scalar represented by a bit array (little-endian convention).
         // If k is the natural number represented by `bits`, then this computes p + ... + p k times.
-        fn bit_mul<N>(self, bits: [u1; N], p: Point) -> Point {
+        fn bit_mul<let N: u32>(self, bits: [u1; N], p: Point) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
@@ -367,7 +367,7 @@ mod curvegroup {
         }
 
         // Multi-scalar multiplication (n[0]*p[0] + ... + n[N]*p[N], where * denotes scalar multiplication)
-        fn msm<N>(self, n: [Field; N], p: [Point; N]) -> Point {
+        fn msm<let N: u32>(self, n: [Field; N], p: [Point; N]) -> Point {
             let mut out = Point::zero();
 
             for i in 0..N {
diff --git a/noir_stdlib/src/ecdsa_secp256k1.nr b/noir_stdlib/src/ecdsa_secp256k1.nr
index f84e2221f57..8a70184dca8 100644
--- a/noir_stdlib/src/ecdsa_secp256k1.nr
+++ b/noir_stdlib/src/ecdsa_secp256k1.nr
@@ -1,6 +1,6 @@
 #[foreign(ecdsa_secp256k1)]
 // docs:start:ecdsa_secp256k1
-pub fn verify_signature<N>(
+pub fn verify_signature<let N: u32>(
     public_key_x: [u8; 32],
     public_key_y: [u8; 32],
     signature: [u8; 64],
diff --git a/noir_stdlib/src/ecdsa_secp256r1.nr b/noir_stdlib/src/ecdsa_secp256r1.nr
index 76e68aeeafa..8772fa7c2ca 100644
--- a/noir_stdlib/src/ecdsa_secp256r1.nr
+++ b/noir_stdlib/src/ecdsa_secp256r1.nr
@@ -1,6 +1,6 @@
 #[foreign(ecdsa_secp256r1)]
 // docs:start:ecdsa_secp256r1
-pub fn verify_signature<N>(
+pub fn verify_signature<let N: u32>(
     public_key_x: [u8; 32],
     public_key_y: [u8; 32],
     signature: [u8; 64],
diff --git a/noir_stdlib/src/embedded_curve_ops.nr b/noir_stdlib/src/embedded_curve_ops.nr
index cd8c421e136..c5617094c0a 100644
--- a/noir_stdlib/src/embedded_curve_ops.nr
+++ b/noir_stdlib/src/embedded_curve_ops.nr
@@ -52,6 +52,14 @@ struct EmbeddedCurveScalar {
     hi: Field,
 }
 
+impl EmbeddedCurveScalar {
+    #[field(bn254)]
+    fn from_field(scalar: Field) -> EmbeddedCurveScalar {
+        let (a,b) = crate::field::bn254::decompose(scalar);
+        EmbeddedCurveScalar { lo: a, hi: b }
+    }
+}
+
 // Computes a multi scalar multiplication over the embedded curve.
 // For bn254, We have Grumpkin and Baby JubJub.
 // For bls12-381, we have JubJub and Bandersnatch.
@@ -60,7 +68,7 @@ struct EmbeddedCurveScalar {
 // underlying proof system.
 #[foreign(multi_scalar_mul)]
 // docs:start:multi_scalar_mul
-pub fn multi_scalar_mul<N>(
+pub fn multi_scalar_mul<let N: u32>(
     points: [EmbeddedCurvePoint; N],
     scalars: [EmbeddedCurveScalar; N]
 ) -> [Field; 3]
diff --git a/noir_stdlib/src/hash.nr b/noir_stdlib/src/hash.nr
index 6c295d127ab..493430c99a4 100644
--- a/noir_stdlib/src/hash.nr
+++ b/noir_stdlib/src/hash.nr
@@ -5,49 +5,87 @@ mod poseidon2;
 use crate::default::Default;
 use crate::uint128::U128;
 use crate::sha256::{digest, sha256_var};
-use crate::embedded_curve_ops::EmbeddedCurvePoint;
+use crate::embedded_curve_ops::{EmbeddedCurvePoint, EmbeddedCurveScalar, multi_scalar_mul};
 
 #[foreign(sha256)]
 // docs:start:sha256
-pub fn sha256<N>(input: [u8; N]) -> [u8; 32]
+pub fn sha256<let N: u32>(input: [u8; N]) -> [u8; 32]
 // docs:end:sha256
 {}
 
 #[foreign(blake2s)]
 // docs:start:blake2s
-pub fn blake2s<N>(input: [u8; N]) -> [u8; 32]
+pub fn blake2s<let N: u32>(input: [u8; N]) -> [u8; 32]
 // docs:end:blake2s
 {}
 
 #[foreign(blake3)]
 // docs:start:blake3
-pub fn blake3<N>(input: [u8; N]) -> [u8; 32]
+pub fn blake3<let N: u32>(input: [u8; N]) -> [u8; 32]
 // docs:end:blake3
 {}
 
 // docs:start:pedersen_commitment
-pub fn pedersen_commitment<N>(input: [Field; N]) -> EmbeddedCurvePoint {
+pub fn pedersen_commitment<let N: u32>(input: [Field; N]) -> EmbeddedCurvePoint {
     // docs:end:pedersen_commitment
-    pedersen_commitment_with_separator(input, 0)
+    let value = pedersen_commitment_with_separator(input, 0);
+    if (value.x == 0) & (value.y == 0) {
+        EmbeddedCurvePoint { x: 0, y: 0, is_infinite: true }
+    } else {
+        EmbeddedCurvePoint { x: value.x, y: value.y, is_infinite: false }
+    }
 }
 
-#[foreign(pedersen_commitment)]
-pub fn __pedersen_commitment_with_separator<N>(input: [Field; N], separator: u32) -> [Field; 2] {}
+fn pedersen_commitment_with_separator_noir<let N: u32>(input: [Field; N], separator: u32) -> EmbeddedCurvePoint {
+    let mut points = [EmbeddedCurveScalar { lo: 0, hi: 0 }; N];
+    for i in 0..N {
+        points[i] = EmbeddedCurveScalar::from_field(input[i]);
+    }
+    let generators = derive_generators("DEFAULT_DOMAIN_SEPARATOR".as_bytes(), separator);
+    let values = multi_scalar_mul(generators, points);
+    EmbeddedCurvePoint { x: values[0], y: values[1], is_infinite: values[2] as bool }
+}
 
-pub fn pedersen_commitment_with_separator<N>(input: [Field; N], separator: u32) -> EmbeddedCurvePoint {
+pub fn pedersen_commitment_with_separator<let N: u32>(input: [Field; N], separator: u32) -> EmbeddedCurvePoint {
     let values = __pedersen_commitment_with_separator(input, separator);
     EmbeddedCurvePoint { x: values[0], y: values[1], is_infinite: false }
 }
 
 // docs:start:pedersen_hash
-pub fn pedersen_hash<N>(input: [Field; N]) -> Field
+pub fn pedersen_hash<let N: u32>(input: [Field; N]) -> Field
 // docs:end:pedersen_hash
 {
     pedersen_hash_with_separator(input, 0)
 }
 
+#[field(bn254)]
+fn derive_generators<let N: u32, let M: u32>(
+    domain_separator_bytes: [u8; M],
+    starting_index: u32
+) -> [EmbeddedCurvePoint; N] {
+    crate::assert_constant(domain_separator_bytes);
+    crate::assert_constant(starting_index);
+    __derive_generators(domain_separator_bytes, starting_index)
+}
+
+#[builtin(derive_pedersen_generators)]
+#[field(bn254)]
+fn __derive_generators<let N: u32, let M: u32>(domain_separator_bytes: [u8; M], starting_index: u32) -> [EmbeddedCurvePoint; N] {}
+
+fn pedersen_hash_with_separator_noir<let N: u32>(input: [Field; N], separator: u32) -> Field {
+    let v1 = pedersen_commitment_with_separator(input, separator);
+    let length_generator : [EmbeddedCurvePoint; 1] = derive_generators("pedersen_hash_length".as_bytes(), 0);
+    multi_scalar_mul(
+        [length_generator[0], v1],
+        [EmbeddedCurveScalar { lo: N as Field, hi: 0 }, EmbeddedCurveScalar { lo: 1, hi: 0 }]
+    )[0]
+}
+
 #[foreign(pedersen_hash)]
-pub fn pedersen_hash_with_separator<N>(input: [Field; N], separator: u32) -> Field {}
+pub fn pedersen_hash_with_separator<let N: u32>(input: [Field; N], separator: u32) -> Field {}
+
+#[foreign(pedersen_commitment)]
+fn __pedersen_commitment_with_separator<let N: u32>(input: [Field; N], separator: u32) -> [Field; 2] {}
 
 pub fn hash_to_field(inputs: [Field]) -> Field {
     let mut sum = 0;
@@ -62,12 +100,12 @@ pub fn hash_to_field(inputs: [Field]) -> Field {
 
 #[foreign(keccak256)]
 // docs:start:keccak256
-pub fn keccak256<N>(input: [u8; N], message_size: u32) -> [u8; 32]
+pub fn keccak256<let N: u32>(input: [u8; N], message_size: u32) -> [u8; 32]
 // docs:end:keccak256
 {}
 
 #[foreign(poseidon2_permutation)]
-pub fn poseidon2_permutation<N>(_input: [Field; N], _state_length: u32) -> [Field; N] {}
+pub fn poseidon2_permutation<let N: u32>(_input: [Field; N], _state_length: u32) -> [Field; N] {}
 
 #[foreign(sha256_compression)]
 pub fn sha256_compression(_input: [u32; 16], _state: [u32; 8]) -> [u32; 8] {}
@@ -172,7 +210,7 @@ impl Hash for U128 {
     }
 }
 
-impl<T, N> Hash for [T; N] where T: Hash {
+impl<T, let N: u32> Hash for [T; N] where T: Hash {
     fn hash<H>(self, state: &mut H) where H: Hasher{
         for elem in self {
             elem.hash(state);
@@ -222,3 +260,11 @@ impl<A, B, C, D, E> Hash for (A, B, C, D, E) where A: Hash, B: Hash, C: Hash, D:
         self.4.hash(state);
     }
 }
+
+#[test]
+fn assert_pedersen_noir() {
+    // TODO: make this a fuzzer test once fuzzer supports curve-specific blackbox functions.
+    let input = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+    assert_eq(pedersen_hash_with_separator(input, 4), pedersen_hash_with_separator_noir(input, 4));
+    assert_eq(pedersen_commitment_with_separator(input, 4), pedersen_commitment_with_separator_noir(input, 4));
+}
diff --git a/noir_stdlib/src/hash/mimc.nr b/noir_stdlib/src/hash/mimc.nr
index 6c5502c2fbf..de4475d9446 100644
--- a/noir_stdlib/src/hash/mimc.nr
+++ b/noir_stdlib/src/hash/mimc.nr
@@ -6,7 +6,7 @@ use crate::default::Default;
 // You must use constants generated for the native field
 // Rounds number should be ~ log(p)/log(exp)
 // For 254 bit primes, exponent 7 and 91 rounds seems to be recommended
-fn mimc<N>(x: Field, k: Field, constants: [Field; N], exp: Field) -> Field {
+fn mimc<let N: u32>(x: Field, k: Field, constants: [Field; N], exp: Field) -> Field {
     //round 0
     let mut t = x + k;
     let mut h = t.pow_32(exp);
@@ -116,7 +116,8 @@ global MIMC_BN254_CONSTANTS: [Field; MIMC_BN254_ROUNDS] = [
 
 //mimc implementation with hardcoded parameters for BN254 curve.
 #[field(bn254)]
-pub fn mimc_bn254<N>(array: [Field; N]) -> Field {
+#[no_predicates]
+pub fn mimc_bn254<let N: u32>(array: [Field; N]) -> Field {
     let exponent = 7;
     let mut r = 0;
     for elem in array {
diff --git a/noir_stdlib/src/hash/poseidon.nr b/noir_stdlib/src/hash/poseidon.nr
index c4b5f0fcb6f..963808f6053 100644
--- a/noir_stdlib/src/hash/poseidon.nr
+++ b/noir_stdlib/src/hash/poseidon.nr
@@ -6,7 +6,7 @@ use crate::default::Default;
 // A config struct defining the parameters of the Poseidon instance to use.
 //
 // A thorough writeup of this method (along with an unoptimized method) can be found at: https://spec.filecoin.io/algorithms/crypto/poseidon/
-struct PoseidonConfig<T, N, X> { 
+struct PoseidonConfig<let T: u32, let N: u32, let X: u32> { 
     // State width, should be equal to `T`
     t: Field,
     // Number of full rounds. should be even
@@ -28,7 +28,7 @@ struct PoseidonConfig<T, N, X> {
     sparse_mds: [Field; X],
 }
 
-pub fn config<T, N, X>(
+pub fn config<let T: u32, let N: u32, let X: u32>(
     t: Field,
     rf: u8,
     rp: u8,
@@ -40,14 +40,17 @@ pub fn config<T, N, X>(
 ) -> PoseidonConfig<T, N, X> {
     // Input checks
     assert_eq(rf & 1, 0);
-    assert_eq((t as u8) * rf + rp, N);
-    assert_eq(t, T);
+    assert_eq((t as u8) * rf + rp, N as u8);
+    assert_eq(t, T as Field);
     assert(alpha != 0);
 
     PoseidonConfig { t, rf, rp, alpha, round_constants, mds, presparse_mds, sparse_mds }
 }
 
-pub fn permute<T, N, X>(pos_conf: PoseidonConfig<T, N, X>, mut state: [Field; T]) -> [Field; T] {
+pub fn permute<let T: u32, let N: u32, let X: u32>(
+    pos_conf: PoseidonConfig<T, N, X>,
+    mut state: [Field; T]
+) -> [Field; T] {
     let PoseidonConfig {t, rf, rp, alpha, round_constants, mds, presparse_mds, sparse_mds } = pos_conf;
 
     for i in 0..state.len() {
@@ -109,7 +112,7 @@ pub fn permute<T, N, X>(pos_conf: PoseidonConfig<T, N, X>, mut state: [Field; T]
 }
 
 // Performs matrix multiplication on a vector
-fn apply_matrix<N>(matrix: [[Field; N]; N], vec: [Field; N]) -> [Field; N] {
+fn apply_matrix<let N: u32>(matrix: [[Field; N]; N], vec: [Field; N]) -> [Field; N] {
     let mut out = [0; N];
 
     for i in 0..N {
@@ -122,7 +125,7 @@ fn apply_matrix<N>(matrix: [[Field; N]; N], vec: [Field; N]) -> [Field; N] {
 }
 
 // Corresponding absorption.
-fn absorb<T, N, X, O>(
+fn absorb<let T: u32, let N: u32, let X: u32, let O: u32>(
     pos_conf: PoseidonConfig<T, N, X>,
     // Initial state; usually [0; O]
     mut state: [Field; T],
@@ -152,7 +155,7 @@ fn absorb<T, N, X, O>(
     state
 }
 
-fn sigma<O>(x: [Field; O]) -> [Field; O] {
+fn sigma<let O: u32>(x: [Field; O]) -> [Field; O] {
     let mut y = x;
     for i in 0..O {
         let t = y[i];
diff --git a/noir_stdlib/src/hash/poseidon/bn254.nr b/noir_stdlib/src/hash/poseidon/bn254.nr
index 54f22884e29..01c03a56a81 100644
--- a/noir_stdlib/src/hash/poseidon/bn254.nr
+++ b/noir_stdlib/src/hash/poseidon/bn254.nr
@@ -6,7 +6,8 @@ use crate::hash::poseidon::{PoseidonConfig, absorb};
 
 // Variable-length Poseidon-128 sponge as suggested in second bullet point of §3 of https://eprint.iacr.org/2019/458.pdf
 #[field(bn254)]
-pub fn sponge<N>(msg: [Field; N]) -> Field {
+#[no_predicates]
+pub fn sponge<let N: u32>(msg: [Field; N]) -> Field {
     absorb(consts::x5_5_config(), [0; 5], 4, 1, msg)[1]
 }
 
diff --git a/noir_stdlib/src/hash/poseidon2.nr b/noir_stdlib/src/hash/poseidon2.nr
index 04d922b581d..08cf68d1f82 100644
--- a/noir_stdlib/src/hash/poseidon2.nr
+++ b/noir_stdlib/src/hash/poseidon2.nr
@@ -11,8 +11,8 @@ struct Poseidon2 {
 }
 
 impl Poseidon2 {
-
-    pub fn hash<N>(input: [Field; N], message_size: u32) -> Field {
+    #[no_predicates]
+    pub fn hash<let N: u32>(input: [Field; N], message_size: u32) -> Field {
         if message_size == N {
             Poseidon2::hash_internal(input, N, false)
         } else {
@@ -95,7 +95,7 @@ impl Poseidon2 {
         result
     }
 
-    fn hash_internal<N>(input: [Field; N], in_len: u32, is_variable_length: bool) -> Field {
+    fn hash_internal<let N: u32>(input: [Field; N], in_len: u32, is_variable_length: bool) -> Field {
         let two_pow_64 = 18446744073709551616;
         let iv : Field = (in_len as Field) * two_pow_64;
         let mut sponge = Poseidon2::new(iv);
diff --git a/noir_stdlib/src/lib.nr b/noir_stdlib/src/lib.nr
index ad47171fa46..1a756f441ba 100644
--- a/noir_stdlib/src/lib.nr
+++ b/noir_stdlib/src/lib.nr
@@ -26,6 +26,7 @@ mod prelude;
 mod uint128;
 mod bigint;
 mod runtime;
+mod meta;
 
 // Oracle calls are required to be wrapped in an unconstrained function
 // Thus, the only argument to the `println` oracle is expected to always be an ident
diff --git a/noir_stdlib/src/merkle.nr b/noir_stdlib/src/merkle.nr
index 9b15fe7313d..17e539ab9b7 100644
--- a/noir_stdlib/src/merkle.nr
+++ b/noir_stdlib/src/merkle.nr
@@ -2,7 +2,7 @@
 // Currently we assume that it is a binary tree, so depth k implies a width of 2^k
 // XXX: In the future we can add an arity parameter
 // Returns the merkle root of the tree from the provided leaf, its hashpath, using a pedersen hash function.
-pub fn compute_merkle_root<N>(leaf: Field, index: Field, hash_path: [Field; N]) -> Field {
+pub fn compute_merkle_root<let N: u32>(leaf: Field, index: Field, hash_path: [Field; N]) -> Field {
     let n = hash_path.len();
     let index_bits = index.to_le_bits(n as u32);
     let mut current = leaf;
diff --git a/noir_stdlib/src/meta.nr b/noir_stdlib/src/meta.nr
new file mode 100644
index 00000000000..1825888130b
--- /dev/null
+++ b/noir_stdlib/src/meta.nr
@@ -0,0 +1 @@
+mod type_def;
diff --git a/noir_stdlib/src/meta/type_def.nr b/noir_stdlib/src/meta/type_def.nr
new file mode 100644
index 00000000000..b9354485921
--- /dev/null
+++ b/noir_stdlib/src/meta/type_def.nr
@@ -0,0 +1,16 @@
+impl TypeDefinition {
+    /// Return a syntactic version of this type definition as a type.
+    /// For example, `as_type(quote { type Foo<A, B> { ... } })` would return `Foo<A, B>`
+    #[builtin(type_def_as_type)]
+    fn as_type(self) -> Quoted {}
+
+    /// Return each generic on this type. The names of these generics are unchanged
+    /// so users may need to keep name collisions in mind if this is used directly in a macro.
+    #[builtin(type_def_generics)]
+    fn generics(self) -> [Quoted] {}
+
+    /// Returns (name, type) pairs of each field in this type. Each type is as-is
+    /// with any generic arguments unchanged.
+    #[builtin(type_def_fields)]
+    fn fields(self) -> [(Quoted, Quoted)] {}
+}
diff --git a/noir_stdlib/src/option.nr b/noir_stdlib/src/option.nr
index c94a1cf836e..df020e75615 100644
--- a/noir_stdlib/src/option.nr
+++ b/noir_stdlib/src/option.nr
@@ -57,7 +57,7 @@ impl<T> Option<T> {
     }
 
     /// Asserts `self.is_some()` with a provided custom message and returns the contained `Some` value
-    fn expect<N, MessageTypes>(self, message: fmtstr<N, MessageTypes>) -> T {
+    fn expect<let N: u32, MessageTypes>(self, message: fmtstr<N, MessageTypes>) -> T {
         assert(self.is_some(), message);
         self._value
     }
diff --git a/noir_stdlib/src/schnorr.nr b/noir_stdlib/src/schnorr.nr
index c63915061cb..24ca514025c 100644
--- a/noir_stdlib/src/schnorr.nr
+++ b/noir_stdlib/src/schnorr.nr
@@ -1,6 +1,6 @@
 #[foreign(schnorr_verify)]
 // docs:start:schnorr_verify
-pub fn verify_signature<N>(
+pub fn verify_signature<let N: u32>(
     public_key_x: Field,
     public_key_y: Field,
     signature: [u8; 64],
diff --git a/noir_stdlib/src/sha256.nr b/noir_stdlib/src/sha256.nr
index d856043fcfa..96ea8bb82c3 100644
--- a/noir_stdlib/src/sha256.nr
+++ b/noir_stdlib/src/sha256.nr
@@ -16,8 +16,8 @@ fn msg_u8_to_u32(msg: [u8; 64]) -> [u32; 16] {
     msg32
 }
 // SHA-256 hash function
-pub fn digest<N>(msg: [u8; N]) -> [u8; 32] {
-    sha256_var(msg, N)
+pub fn digest<let N: u32>(msg: [u8; N]) -> [u8; 32] {
+    sha256_var(msg, N as u64)
 }
 
 fn hash_final_block(msg_block: [u8; 64], mut state: [u32; 8]) -> [u8; 32] {
@@ -38,12 +38,13 @@ fn hash_final_block(msg_block: [u8; 64], mut state: [u32; 8]) -> [u8; 32] {
 }
 
 // Variable size SHA-256 hash
-pub fn sha256_var<N>(msg: [u8; N], message_size: u64) -> [u8; 32] {
+#[no_predicates]
+pub fn sha256_var<let N: u32>(msg: [u8; N], message_size: u64) -> [u8; 32] {
     let mut msg_block: [u8; 64] = [0; 64];
     let mut h: [u32; 8] = [1779033703, 3144134277, 1013904242, 2773480762, 1359893119, 2600822924, 528734635, 1541459225]; // Intermediate hash, starting with the canonical initial value
     let mut i: u64 = 0; // Message byte pointer
     for k in 0..N {
-        if k < message_size {
+        if k as u64 < message_size {
             // Populate msg_block
             msg_block[i] = msg[k];
             i = i + 1;
diff --git a/noir_stdlib/src/sha512.nr b/noir_stdlib/src/sha512.nr
index 0f8ffcfcb1c..993f328341f 100644
--- a/noir_stdlib/src/sha512.nr
+++ b/noir_stdlib/src/sha512.nr
@@ -87,7 +87,8 @@ fn msg_u8_to_u64(msg: [u8; 128]) -> [u64; 16] {
     msg64
 }
 // SHA-512 hash function
-pub fn digest<N>(msg: [u8; N]) -> [u8; 64] {
+#[no_predicates]
+pub fn digest<let N: u32>(msg: [u8; N]) -> [u8; 64] {
     let mut msg_block: [u8; 128] = [0; 128];
     // noir-fmt:ignore
     let mut h: [u64; 8] = [7640891576956012808, 13503953896175478587, 4354685564936845355, 11912009170470909681, 5840696475078001361, 11170449401992604703, 2270897969802886507, 6620516959819538809]; // Intermediate hash, starting with the canonical initial value
diff --git a/noir_stdlib/src/slice.nr b/noir_stdlib/src/slice.nr
index bf05ae0cf64..1a40abcf704 100644
--- a/noir_stdlib/src/slice.nr
+++ b/noir_stdlib/src/slice.nr
@@ -44,7 +44,7 @@ impl<T> [T] {
         self
     }
 
-    pub fn as_array<N>(self) -> [T; N] {
+    pub fn as_array<let N: u32>(self) -> [T; N] {
         assert(self.len() == N);
 
         let mut array = [crate::unsafe::zeroed(); N];
@@ -53,4 +53,53 @@ impl<T> [T] {
         }
         array
     }
+
+    // Apply a function to each element of the slice, returning a new slice
+    // containing the mapped elements.
+    pub fn map<U, Env>(self, f: fn[Env](T) -> U) -> [U] {
+        let mut ret = &[];
+        for elem in self {
+            ret = ret.push_back(f(elem));
+        }
+        ret
+    }
+
+    // Apply a function to each element of the slice and an accumulator value,
+    // returning the final accumulated value. This function is also sometimes
+    // called `foldl`, `fold_left`, `reduce`, or `inject`.
+    pub fn fold<U, Env>(self, mut accumulator: U, f: fn[Env](U, T) -> U) -> U {
+        for elem in self {
+            accumulator = f(accumulator, elem);
+        }
+        accumulator
+    }
+
+    // Apply a function to each element of the slice and an accumulator value,
+    // returning the final accumulated value. Unlike fold, reduce uses the first
+    // element of the given slice as its starting accumulator value.
+    pub fn reduce<Env>(self, f: fn[Env](T, T) -> T) -> T {
+        let mut accumulator = self[0];
+        for i in 1..self.len() {
+            accumulator = f(accumulator, self[i]);
+        }
+        accumulator
+    }
+
+    // Returns true if all elements in the slice satisfy the predicate
+    pub fn all<Env>(self, predicate: fn[Env](T) -> bool) -> bool {
+        let mut ret = true;
+        for elem in self {
+            ret &= predicate(elem);
+        }
+        ret
+    }
+
+    // Returns true if any element in the slice satisfies the predicate
+    pub fn any<Env>(self, predicate: fn[Env](T) -> bool) -> bool {
+        let mut ret = false;
+        for elem in self {
+            ret |= predicate(elem);
+        }
+        ret
+    }
 }
diff --git a/noir_stdlib/src/string.nr b/noir_stdlib/src/string.nr
index 12b5a1e75ec..5f8f3de775d 100644
--- a/noir_stdlib/src/string.nr
+++ b/noir_stdlib/src/string.nr
@@ -1,5 +1,5 @@
 use crate::collections::vec::Vec;
-impl<N> str<N> {
+impl<let N: u32> str<N> {
     /// Converts the given string into a byte array
     #[builtin(str_as_bytes)]
     pub fn as_bytes(self) -> [u8; N] {}
diff --git a/noir_stdlib/src/test.nr b/noir_stdlib/src/test.nr
index e6a7e03fefc..f8db6079193 100644
--- a/noir_stdlib/src/test.nr
+++ b/noir_stdlib/src/test.nr
@@ -1,5 +1,5 @@
 #[oracle(create_mock)]
-unconstrained fn create_mock_oracle<N>(name: str<N>) -> Field {}
+unconstrained fn create_mock_oracle<let N: u32>(name: str<N>) -> Field {}
 
 #[oracle(set_mock_params)]
 unconstrained fn set_mock_params_oracle<P>(id: Field, params: P) {}
@@ -21,7 +21,7 @@ struct OracleMock {
 }
 
 impl OracleMock {
-    unconstrained pub fn mock<N>(name: str<N>) -> Self {
+    unconstrained pub fn mock<let N: u32>(name: str<N>) -> Self {
         Self { id: create_mock_oracle(name) }
     }
 
diff --git a/noir_stdlib/src/uint128.nr b/noir_stdlib/src/uint128.nr
index 173fa54863a..e99818bafa0 100644
--- a/noir_stdlib/src/uint128.nr
+++ b/noir_stdlib/src/uint128.nr
@@ -66,7 +66,7 @@ impl U128 {
         bytes
     }
 
-    pub fn from_hex<N>(hex: str<N>) -> U128 {
+    pub fn from_hex<let N: u32>(hex: str<N>) -> U128 {
         let N = N as u32;
         let bytes = hex.as_bytes();
         // string must starts with "0x"
@@ -319,13 +319,12 @@ mod tests {
     use crate::uint128::{U128, pow64, pow63};
 
     #[test]
-    fn test_not() {
-        let num = U128::from_u64s_le(0, 0);
+    fn test_not(lo: u64, hi: u64) {
+        let num = U128::from_u64s_le(lo, hi);
         let not_num = num.not();
 
-        let max_u64: Field = pow64 - 1;
-        assert_eq(not_num.hi, max_u64);
-        assert_eq(not_num.lo, max_u64);
+        assert_eq(not_num.hi, (hi.not() as Field));
+        assert_eq(not_num.lo, (lo.not() as Field));
 
         let not_not_num = not_num.not();
         assert_eq(num, not_not_num);
@@ -493,6 +492,15 @@ mod tests {
         let end = a.to_integer();
         assert_eq(start, end);
     }
+
+    #[test]
+    fn integer_conversions_fuzz(lo: u64, hi: u64) {
+        let start: Field = (lo as Field) + pow64 * (hi as Field);
+        let a = U128::from_integer(start);
+        let end = a.to_integer();
+        assert_eq(start, end);
+    }
+
     #[test]
     fn test_wrapping_mul() {
         // 1*0==0
diff --git a/scripts/install_bb.sh b/scripts/install_bb.sh
index c3ed476200a..b0d55b6ff1d 100755
--- a/scripts/install_bb.sh
+++ b/scripts/install_bb.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="0.41.0"
+VERSION="0.43.0"
 
 BBUP_PATH=~/.bb/bbup
 
diff --git a/test_programs/benchmarks/bench_eddsa_poseidon/src/main.nr b/test_programs/benchmarks/bench_eddsa_poseidon/src/main.nr
index 31c2f1f2d13..cb853e48c30 100644
--- a/test_programs/benchmarks/bench_eddsa_poseidon/src/main.nr
+++ b/test_programs/benchmarks/bench_eddsa_poseidon/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::eddsa::{eddsa_poseidon_verify};
+use std::eddsa::eddsa_poseidon_verify;
 
 fn main(
     msg: pub Field,
@@ -9,4 +9,4 @@ fn main(
     s: Field
 ) -> pub bool {
     eddsa_poseidon_verify(pub_key_x, pub_key_y, s, r8_x, r8_y, msg)
-}
\ No newline at end of file
+}
diff --git a/test_programs/benchmarks/bench_poseidon_hash/src/main.nr b/test_programs/benchmarks/bench_poseidon_hash/src/main.nr
index 38adeef6ec7..9900e91c1d7 100644
--- a/test_programs/benchmarks/bench_poseidon_hash/src/main.nr
+++ b/test_programs/benchmarks/bench_poseidon_hash/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::hash::poseidon;
+use std::hash::poseidon;
 
 fn main(input: [Field; 2]) -> pub Field {
     poseidon::bn254::hash_2(input)
diff --git a/test_programs/benchmarks/bench_poseidon_hash_100/src/main.nr b/test_programs/benchmarks/bench_poseidon_hash_100/src/main.nr
index fc9a5b7a970..1c9bbfe61bf 100644
--- a/test_programs/benchmarks/bench_poseidon_hash_100/src/main.nr
+++ b/test_programs/benchmarks/bench_poseidon_hash_100/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::hash;
+use std::hash;
 
 global SIZE = 100;
 
@@ -9,4 +9,4 @@ fn main(input: [[Field; 2]; SIZE]) -> pub [Field; SIZE] {
     }
 
     results
-}
\ No newline at end of file
+}
diff --git a/test_programs/benchmarks/bench_poseidon_hash_30/src/main.nr b/test_programs/benchmarks/bench_poseidon_hash_30/src/main.nr
index 4d2d94e4946..3edb47e9f72 100644
--- a/test_programs/benchmarks/bench_poseidon_hash_30/src/main.nr
+++ b/test_programs/benchmarks/bench_poseidon_hash_30/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::hash;
+use std::hash;
 
 global SIZE = 30;
 
@@ -9,4 +9,4 @@ fn main(input: [[Field; 2]; SIZE]) -> pub [Field; SIZE] {
     }
 
     results
-}
\ No newline at end of file
+}
diff --git a/test_programs/benchmarks/bench_sha256_100/src/main.nr b/test_programs/benchmarks/bench_sha256_100/src/main.nr
index d78ca8002d2..6df856a83fc 100644
--- a/test_programs/benchmarks/bench_sha256_100/src/main.nr
+++ b/test_programs/benchmarks/bench_sha256_100/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 global SIZE = 100;
 
 fn main(input: [[u8; 2]; SIZE]) -> pub [[u8; 32]; SIZE] {
@@ -9,4 +7,4 @@ fn main(input: [[u8; 2]; SIZE]) -> pub [[u8; 32]; SIZE] {
     }
 
     results
-}
\ No newline at end of file
+}
diff --git a/test_programs/benchmarks/bench_sha256_30/src/main.nr b/test_programs/benchmarks/bench_sha256_30/src/main.nr
index fa66d626586..220c1cfbbed 100644
--- a/test_programs/benchmarks/bench_sha256_30/src/main.nr
+++ b/test_programs/benchmarks/bench_sha256_30/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 global SIZE = 30;
 
 fn main(input: [[u8; 2]; SIZE]) -> pub [[u8; 32]; SIZE] {
@@ -9,4 +7,4 @@ fn main(input: [[u8; 2]; SIZE]) -> pub [[u8; 32]; SIZE] {
     }
 
     results
-}
\ No newline at end of file
+}
diff --git a/test_programs/compile_failure/array_length_defaulting/src/main.nr b/test_programs/compile_failure/array_length_defaulting/src/main.nr
index 216a9ae3f0c..40543db2870 100644
--- a/test_programs/compile_failure/array_length_defaulting/src/main.nr
+++ b/test_programs/compile_failure/array_length_defaulting/src/main.nr
@@ -1,5 +1,5 @@
 fn main() {
-    let x = dep::std::unsafe::zeroed();
+    let x = std::unsafe::zeroed();
     foo(x);
 }
 
diff --git a/test_programs/compile_failure/assert_constant_fail/src/main.nr b/test_programs/compile_failure/assert_constant_fail/src/main.nr
index cf682607083..b8d5d255228 100644
--- a/test_programs/compile_failure/assert_constant_fail/src/main.nr
+++ b/test_programs/compile_failure/assert_constant_fail/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::assert_constant;
+use std::assert_constant;
 
 fn main(x: Field) {
     foo(5, x);
diff --git a/test_programs/compile_failure/brillig_nested_slices/src/main.nr b/test_programs/compile_failure/brillig_nested_slices/src/main.nr
index 3d8a6748ccf..ee61195cf8f 100644
--- a/test_programs/compile_failure/brillig_nested_slices/src/main.nr
+++ b/test_programs/compile_failure/brillig_nested_slices/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::slice;
+use std::slice;
 // Tests nested slice passing to/from functions
 unconstrained fn push_back_to_slice<T>(slice: [T], item: T) -> [T] {
     slice.push_back(item)
diff --git a/test_programs/compile_failure/dep_impl_primitive/src/main.nr b/test_programs/compile_failure/dep_impl_primitive/src/main.nr
index e61ae82b62c..40578574c75 100644
--- a/test_programs/compile_failure/dep_impl_primitive/src/main.nr
+++ b/test_programs/compile_failure/dep_impl_primitive/src/main.nr
@@ -1,4 +1,4 @@
-use dep::bad_impl;
+use bad_impl;
 
 fn main(x: Field) {
     x.something();
diff --git a/test_programs/compile_failure/dep_submodule_overlap/Nargo.toml b/test_programs/compile_failure/dep_submodule_overlap/Nargo.toml
new file mode 100644
index 00000000000..0d5a6221ef2
--- /dev/null
+++ b/test_programs/compile_failure/dep_submodule_overlap/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "dep_submodule_overlap"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.28.0"
+
+[dependencies]
+reexporting_lib = { path = "../../test_libraries/reexporting_lib" }
diff --git a/test_programs/compile_failure/dep_submodule_overlap/src/lib.nr b/test_programs/compile_failure/dep_submodule_overlap/src/lib.nr
new file mode 100644
index 00000000000..e2e82b2f5cd
--- /dev/null
+++ b/test_programs/compile_failure/dep_submodule_overlap/src/lib.nr
@@ -0,0 +1,3 @@
+struct MyStruct {
+    inner: Field
+}
diff --git a/test_programs/compile_failure/dep_submodule_overlap/src/main.nr b/test_programs/compile_failure/dep_submodule_overlap/src/main.nr
new file mode 100644
index 00000000000..c53630c53ca
--- /dev/null
+++ b/test_programs/compile_failure/dep_submodule_overlap/src/main.nr
@@ -0,0 +1,9 @@
+use reexporting_lib::{MyStruct, lib};
+
+mod lib;
+use crate::lib::MyStruct;
+
+fn main() {
+    let x = MyStruct { inner: 0 };
+    assert(lib::is_struct_zero(x));
+}
diff --git a/test_programs/compile_failure/depend_on_bin/src/main.nr b/test_programs/compile_failure/depend_on_bin/src/main.nr
index 4e03e8eb41e..d7aff600fe6 100644
--- a/test_programs/compile_failure/depend_on_bin/src/main.nr
+++ b/test_programs/compile_failure/depend_on_bin/src/main.nr
@@ -1,4 +1,4 @@
-use dep::bin_dep;
+use bin_dep;
 
 fn main(x : Field) {
     assert(x == 1);
diff --git a/test_programs/compile_failure/negate_unsigned/src/main.nr b/test_programs/compile_failure/negate_unsigned/src/main.nr
index db5f9b0820f..4d3c5abe5a4 100644
--- a/test_programs/compile_failure/negate_unsigned/src/main.nr
+++ b/test_programs/compile_failure/negate_unsigned/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     let var = -1 as u8;
     std::println(var);
diff --git a/test_programs/compile_failure/non_comptime_local_fn_call/Nargo.toml b/test_programs/compile_failure/non_comptime_local_fn_call/Nargo.toml
new file mode 100644
index 00000000000..2597f0c4653
--- /dev/null
+++ b/test_programs/compile_failure/non_comptime_local_fn_call/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "non_comptime_local_fn_call"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.31.0"
+
+[dependencies]
diff --git a/test_programs/compile_failure/non_comptime_local_fn_call/src/main.nr b/test_programs/compile_failure/non_comptime_local_fn_call/src/main.nr
new file mode 100644
index 00000000000..d75bb1a922a
--- /dev/null
+++ b/test_programs/compile_failure/non_comptime_local_fn_call/src/main.nr
@@ -0,0 +1,9 @@
+fn main() {
+    comptime {
+        let _a = id(3);
+    }
+}
+
+fn id(x: Field) -> Field {
+    x
+}
diff --git a/test_programs/compile_failure/orphaned_trait_impl/src/main.nr b/test_programs/compile_failure/orphaned_trait_impl/src/main.nr
index dfd88d8f074..dd04aa454b2 100644
--- a/test_programs/compile_failure/orphaned_trait_impl/src/main.nr
+++ b/test_programs/compile_failure/orphaned_trait_impl/src/main.nr
@@ -1,4 +1,4 @@
-impl dep::crate1::MyTrait for dep::crate2::MyStruct {
+impl crate1::MyTrait for crate2::MyStruct {
 }
 
 fn main(x: Field, y: pub Field) {
diff --git a/test_programs/compile_failure/overlapping_dep_and_mod/Nargo.toml b/test_programs/compile_failure/overlapping_dep_and_mod/Nargo.toml
new file mode 100644
index 00000000000..b2c3e5f94be
--- /dev/null
+++ b/test_programs/compile_failure/overlapping_dep_and_mod/Nargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+members = [
+    "bin", 
+    "foo",
+]
+default-member = "bin"
diff --git a/test_programs/compile_failure/overlapping_dep_and_mod/bin/Nargo.toml b/test_programs/compile_failure/overlapping_dep_and_mod/bin/Nargo.toml
new file mode 100644
index 00000000000..57e704462db
--- /dev/null
+++ b/test_programs/compile_failure/overlapping_dep_and_mod/bin/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "overlapping_dep_and_mod"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.29.0"
+
+[dependencies]
+foo = { path = "../foo" }
diff --git a/test_programs/compile_failure/overlapping_dep_and_mod/bin/Prover.toml b/test_programs/compile_failure/overlapping_dep_and_mod/bin/Prover.toml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test_programs/compile_failure/overlapping_dep_and_mod/bin/src/main.nr b/test_programs/compile_failure/overlapping_dep_and_mod/bin/src/main.nr
new file mode 100644
index 00000000000..675e889b7e5
--- /dev/null
+++ b/test_programs/compile_failure/overlapping_dep_and_mod/bin/src/main.nr
@@ -0,0 +1,12 @@
+fn main() -> pub Field {
+    assert(foo::bar() + foo::baz() == 3);
+    assert(foo::bar() == 1);
+    assert(foo::baz() == 2);
+    foo::bar() + foo::baz()
+}
+
+mod foo {
+    pub(crate) fn bar() -> Field {
+        1
+    }
+}
diff --git a/test_programs/compile_failure/overlapping_dep_and_mod/foo/Nargo.toml b/test_programs/compile_failure/overlapping_dep_and_mod/foo/Nargo.toml
new file mode 100644
index 00000000000..857d4e722a8
--- /dev/null
+++ b/test_programs/compile_failure/overlapping_dep_and_mod/foo/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "foo"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.29.0"
+
+[dependencies]
diff --git a/test_programs/compile_failure/overlapping_dep_and_mod/foo/src/lib.nr b/test_programs/compile_failure/overlapping_dep_and_mod/foo/src/lib.nr
new file mode 100644
index 00000000000..7834e2c9276
--- /dev/null
+++ b/test_programs/compile_failure/overlapping_dep_and_mod/foo/src/lib.nr
@@ -0,0 +1,3 @@
+pub fn baz() -> Field {
+    2
+}
diff --git a/test_programs/compile_failure/regression_5008/Nargo.toml b/test_programs/compile_failure/regression_5008/Nargo.toml
new file mode 100644
index 00000000000..920c00660cf
--- /dev/null
+++ b/test_programs/compile_failure/regression_5008/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "regression_5008"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.28.0"
+
+[dependencies]
diff --git a/test_programs/compile_failure/regression_5008/src/main.nr b/test_programs/compile_failure/regression_5008/src/main.nr
new file mode 100644
index 00000000000..6d9645ee6eb
--- /dev/null
+++ b/test_programs/compile_failure/regression_5008/src/main.nr
@@ -0,0 +1,17 @@
+struct Bar {
+    value: Field,
+}
+
+struct Foo{
+    bar: &mut Bar,
+}
+
+impl Foo {
+    unconstrained fn crash_fn(self) {}
+}
+
+fn main() {
+    let foo = Foo { bar: &mut Bar { value: 0 } };
+
+    foo.crash_fn();
+}
diff --git a/test_programs/compile_failure/restricted_bit_sizes/src/main.nr b/test_programs/compile_failure/restricted_bit_sizes/src/main.nr
index 01e72bfcfd7..a3fea13cc3a 100644
--- a/test_programs/compile_failure/restricted_bit_sizes/src/main.nr
+++ b/test_programs/compile_failure/restricted_bit_sizes/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::assert_constant;
+use std::assert_constant;
 
 fn main() -> pub u63 {
     5
diff --git a/test_programs/compile_failure/turbofish_generic_count/src/main.nr b/test_programs/compile_failure/turbofish_generic_count/src/main.nr
index a360641fa15..4091b2f0581 100644
--- a/test_programs/compile_failure/turbofish_generic_count/src/main.nr
+++ b/test_programs/compile_failure/turbofish_generic_count/src/main.nr
@@ -1,4 +1,3 @@
-
 struct Bar<T> {
     one: Field,
     two: Field,
@@ -7,7 +6,7 @@ struct Bar<T> {
 
 impl<T> Bar<T> {
     fn zeroed<A>(_self: Self) -> A {
-        dep::std::unsafe::zeroed()
+        std::unsafe::zeroed()
     }
 }
 
diff --git a/test_programs/compile_failure/type_definition_annotation/Nargo.toml b/test_programs/compile_failure/type_definition_annotation/Nargo.toml
new file mode 100644
index 00000000000..dc90816e16b
--- /dev/null
+++ b/test_programs/compile_failure/type_definition_annotation/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "type_definition_annotation"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.31.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/test_programs/compile_failure/type_definition_annotation/src/main.nr b/test_programs/compile_failure/type_definition_annotation/src/main.nr
new file mode 100644
index 00000000000..91f9c3a52f4
--- /dev/null
+++ b/test_programs/compile_failure/type_definition_annotation/src/main.nr
@@ -0,0 +1,8 @@
+#[fail_assert]
+struct Foo { x: Field }
+
+comptime fn fail_assert(_typ: TypeDefinition) {
+    assert(false);
+}
+
+fn main() {}
diff --git a/test_programs/compile_success_contract/abi_attribute/Nargo.toml b/test_programs/compile_success_contract/abi_attribute/Nargo.toml
new file mode 100644
index 00000000000..56fa88ccb68
--- /dev/null
+++ b/test_programs/compile_success_contract/abi_attribute/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "abi_attribute"
+type = "contract"
+authors = [""]
+
+[dependencies]
diff --git a/test_programs/compile_success_contract/abi_attribute/src/main.nr b/test_programs/compile_success_contract/abi_attribute/src/main.nr
new file mode 100644
index 00000000000..d658823d519
--- /dev/null
+++ b/test_programs/compile_success_contract/abi_attribute/src/main.nr
@@ -0,0 +1,9 @@
+contract Foo {
+    #[abi(foo)]
+    global foo: Field = 42;
+    
+    #[abi(bar)]
+    struct Bar {
+        inner: Field
+    }
+}
diff --git a/test_programs/compile_success_contract/recursive_method/Nargo.toml b/test_programs/compile_success_contract/recursive_method/Nargo.toml
new file mode 100644
index 00000000000..8142e5b3278
--- /dev/null
+++ b/test_programs/compile_success_contract/recursive_method/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "recursive_method"
+type = "contract"
+authors = [""]
+
+[dependencies]
diff --git a/test_programs/compile_success_contract/recursive_method/src/main.nr b/test_programs/compile_success_contract/recursive_method/src/main.nr
new file mode 100644
index 00000000000..6fd4bf3338d
--- /dev/null
+++ b/test_programs/compile_success_contract/recursive_method/src/main.nr
@@ -0,0 +1,6 @@
+contract Foo {
+    #[recursive]
+    fn contract_entrypoint() -> pub Field {
+        1
+    }
+}
diff --git a/test_programs/compile_success_empty/impl_with_where_clause/Nargo.toml b/test_programs/compile_success_empty/comptime_array_len/Nargo.toml
similarity index 62%
rename from test_programs/compile_success_empty/impl_with_where_clause/Nargo.toml
rename to test_programs/compile_success_empty/comptime_array_len/Nargo.toml
index ef9bdce2640..c07deddc6c5 100644
--- a/test_programs/compile_success_empty/impl_with_where_clause/Nargo.toml
+++ b/test_programs/compile_success_empty/comptime_array_len/Nargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "impl_with_where_clause"
+name = "comptime_array_len"
 type = "bin"
 authors = [""]
 
diff --git a/test_programs/compile_success_empty/comptime_array_len/src/main.nr b/test_programs/compile_success_empty/comptime_array_len/src/main.nr
new file mode 100644
index 00000000000..c98a3de01dd
--- /dev/null
+++ b/test_programs/compile_success_empty/comptime_array_len/src/main.nr
@@ -0,0 +1,6 @@
+fn main() {
+    comptime
+    {
+        assert_eq([1, 2, 3].len(), 3);
+    }
+}
diff --git a/test_programs/compile_success_empty/comptime_as_slice/Nargo.toml b/test_programs/compile_success_empty/comptime_as_slice/Nargo.toml
new file mode 100644
index 00000000000..90c67b07b2b
--- /dev/null
+++ b/test_programs/compile_success_empty/comptime_as_slice/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "array_to_slice"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.24.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/test_programs/compile_success_empty/comptime_as_slice/src/main.nr b/test_programs/compile_success_empty/comptime_as_slice/src/main.nr
new file mode 100644
index 00000000000..07c5e344cc2
--- /dev/null
+++ b/test_programs/compile_success_empty/comptime_as_slice/src/main.nr
@@ -0,0 +1,9 @@
+fn main() {
+    comptime
+    {
+        let ws: [Field; 3] = [1; 3];
+        let ws_as_slice: [Field] = ws.as_slice();
+
+        assert_eq(ws[0], ws_as_slice[0]);
+    }
+}
diff --git a/test_programs/compile_success_empty/comptime_type_definition/Nargo.toml b/test_programs/compile_success_empty/comptime_type_definition/Nargo.toml
new file mode 100644
index 00000000000..099545a9e71
--- /dev/null
+++ b/test_programs/compile_success_empty/comptime_type_definition/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "comptime_type_definition"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.31.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/test_programs/compile_success_empty/comptime_type_definition/src/main.nr b/test_programs/compile_success_empty/comptime_type_definition/src/main.nr
new file mode 100644
index 00000000000..025f6a0b0bf
--- /dev/null
+++ b/test_programs/compile_success_empty/comptime_type_definition/src/main.nr
@@ -0,0 +1,13 @@
+fn main() {}
+
+#[my_comptime_fn]
+struct MyType<A, B, C> {
+    field1: [A; 10],
+    field2: (B, C),
+}
+
+comptime fn my_comptime_fn(typ: TypeDefinition) {
+    let _ = typ.as_type();
+    assert_eq(typ.generics().len(), 3);
+    assert_eq(typ.fields().len(), 2);
+}
diff --git a/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr b/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr
index 5446cfbb1e4..9b5d95c11bc 100644
--- a/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr
+++ b/test_programs/compile_success_empty/conditional_regression_to_bits/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     //Regression for to_le_bits() constant evaluation 
     // binary array representation of u8 1
diff --git a/test_programs/compile_success_empty/derive_impl/Nargo.toml b/test_programs/compile_success_empty/derive_impl/Nargo.toml
new file mode 100644
index 00000000000..26a6020a6b1
--- /dev/null
+++ b/test_programs/compile_success_empty/derive_impl/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "derive_impl"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.30.0"
+
+[dependencies]
diff --git a/test_programs/compile_success_empty/derive_impl/src/main.nr b/test_programs/compile_success_empty/derive_impl/src/main.nr
new file mode 100644
index 00000000000..abad6d4f8e1
--- /dev/null
+++ b/test_programs/compile_success_empty/derive_impl/src/main.nr
@@ -0,0 +1,44 @@
+comptime fn derive_default(typ: TypeDefinition) -> Quoted {
+    let generics: [Quoted] = typ.generics();
+    assert_eq(
+        generics.len(), 0, "derive_default: Deriving Default on generic types is currently unimplemented"
+    );
+
+    let type_name = typ.as_type();
+    let fields = typ.fields();
+
+    let fields = join(make_field_exprs(fields));
+
+    quote {
+        impl Default for $type_name {
+            fn default() -> Self {
+                Self { $fields }
+            }
+        }
+    }
+}
+
+#[derive_default]
+struct Foo {
+    x: Field,
+    y: u32,
+}
+
+comptime fn make_field_exprs(fields: [(Quoted, Quoted)]) -> [Quoted] {
+    let mut result = &[];
+    for my_field in fields {
+        let name = my_field.0;
+        result = result.push_back(quote { $name: Default::default(), });
+    }
+    result
+}
+
+comptime fn join(slice: [Quoted]) -> Quoted {
+    let mut result = quote {};
+    for elem in slice {
+        result = quote { $result $elem };
+    }
+    result
+}
+
+fn main() {}
diff --git a/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr b/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr
index becd3c8927a..fa6be84c26e 100644
--- a/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr
+++ b/test_programs/compile_success_empty/ec_baby_jubjub/src/main.nr
@@ -1,14 +1,14 @@
 // Tests may be checked against https://github.com/cfrg/draft-irtf-cfrg-hash-to-curve/tree/main/poc
-use dep::std::ec::tecurve::affine::Curve as AffineCurve;
-use dep::std::ec::tecurve::affine::Point as Gaffine;
-use dep::std::ec::tecurve::curvegroup::Curve;
-use dep::std::ec::tecurve::curvegroup::Point as G;
+use std::ec::tecurve::affine::Curve as AffineCurve;
+use std::ec::tecurve::affine::Point as Gaffine;
+use std::ec::tecurve::curvegroup::Curve;
+use std::ec::tecurve::curvegroup::Point as G;
 
-use dep::std::ec::swcurve::affine::Point as SWGaffine;
-use dep::std::ec::swcurve::curvegroup::Point as SWG;
+use std::ec::swcurve::affine::Point as SWGaffine;
+use std::ec::swcurve::curvegroup::Point as SWG;
 
-use dep::std::ec::montcurve::affine::Point as MGaffine;
-use dep::std::ec::montcurve::curvegroup::Point as MG;
+use std::ec::montcurve::affine::Point as MGaffine;
+use std::ec::montcurve::curvegroup::Point as MG;
 
 fn main() {
     // This test only makes sense if Field is the right prime field.
diff --git a/test_programs/compile_success_empty/impl_where_clause/Nargo.toml b/test_programs/compile_success_empty/impl_where_clause/Nargo.toml
new file mode 100644
index 00000000000..7d0d5f3513e
--- /dev/null
+++ b/test_programs/compile_success_empty/impl_where_clause/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "impl_where_clause"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.31.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/test_programs/compile_success_empty/impl_where_clause/src/main.nr b/test_programs/compile_success_empty/impl_where_clause/src/main.nr
new file mode 100644
index 00000000000..2f3223efaae
--- /dev/null
+++ b/test_programs/compile_success_empty/impl_where_clause/src/main.nr
@@ -0,0 +1,34 @@
+struct MyStruct<T> {
+    a: u32,
+    b: T,
+}
+
+struct InnerStruct {
+    a: Field,
+    b: Field,
+}
+
+trait MyEq {
+    fn my_eq(self, other: Self) -> bool;
+}
+
+impl MyEq for InnerStruct {
+    fn my_eq(self, other: InnerStruct) -> bool {
+        (self.a == other.a) & (self.b == other.b)
+    }
+}
+
+impl<T> MyStruct<T> where T: MyEq {
+    fn my_eq(self, other: Self) -> bool {
+        (self.a == other.a) & self.b.my_eq(other.b)
+    }
+}
+
+fn main() {
+    let inner = InnerStruct { a: 1, b: 2 };
+    let my_struct = MyStruct { a: 5, b: inner };
+    assert(my_struct.my_eq(my_struct));
+
+    let mut my_struct_new = MyStruct { a: 5, b: InnerStruct { a: 10, b: 15 } };
+    assert(my_struct_new.my_eq(my_struct_new));
+}
diff --git a/test_programs/compile_success_empty/intrinsic_die/src/main.nr b/test_programs/compile_success_empty/intrinsic_die/src/main.nr
index a6c6d3df9a1..17aaf02c283 100644
--- a/test_programs/compile_success_empty/intrinsic_die/src/main.nr
+++ b/test_programs/compile_success_empty/intrinsic_die/src/main.nr
@@ -1,7 +1,5 @@
-use dep::std;
 // This test checks that we perform dead-instruction-elimination on intrinsic functions.
 fn main(x: Field) {
-    let hash = std::hash::pedersen_commitment([x]);
     let g1_x = 0x0000000000000000000000000000000000000000000000000000000000000001;
     let g1_y = 0x0000000000000002cf135e7506a45d632d270d45f1181294833fc48d823f272c;
     let g1 = std::embedded_curve_ops::EmbeddedCurvePoint { x: g1_x, y: g1_y, is_infinite: false };
diff --git a/test_programs/compile_success_empty/macros/src/main.nr b/test_programs/compile_success_empty/macros/src/main.nr
new file mode 100644
index 00000000000..1b00a084c61
--- /dev/null
+++ b/test_programs/compile_success_empty/macros/src/main.nr
@@ -0,0 +1,13 @@
+comptime fn my_macro(x: Field, y: Field) -> Quoted {
+    // Current version of macros in Noir are not hygienic
+    // so we can quote a and b here and expect them to resolve
+    // to the a and b in main at the callsite of my_macro.
+    quote { $x + $y + a + b }
+}
+
+fn main() {
+    let a = 100;
+    let b = 200;
+    let result = my_macro!(1, 2);
+    assert_eq(result, 1 + 2 + a + b);
+}
diff --git a/test_programs/compile_success_empty/method_call_regression/src/main.nr b/test_programs/compile_success_empty/method_call_regression/src/main.nr
index 8bb7ebcac45..88b8dc57196 100644
--- a/test_programs/compile_success_empty/method_call_regression/src/main.nr
+++ b/test_programs/compile_success_empty/method_call_regression/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     // s: Struct<?, ()>
     let s = Struct { b: () };
diff --git a/test_programs/compile_success_empty/numeric_generics/src/main.nr b/test_programs/compile_success_empty/numeric_generics/src/main.nr
index 1e03a382fed..340c18c2a1d 100644
--- a/test_programs/compile_success_empty/numeric_generics/src/main.nr
+++ b/test_programs/compile_success_empty/numeric_generics/src/main.nr
@@ -36,4 +36,3 @@ fn foo(mut s: MyStruct<2+1>) -> MyStruct<10/2-2> {
     s.data[0] = s.data[0] + 1;
     s
 }
-
diff --git a/test_programs/compile_success_empty/numeric_generics_explicit/Nargo.toml b/test_programs/compile_success_empty/numeric_generics_explicit/Nargo.toml
new file mode 100644
index 00000000000..bc3d43498db
--- /dev/null
+++ b/test_programs/compile_success_empty/numeric_generics_explicit/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "numeric_generics_explicit"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.30.0"
+
+[dependencies]
\ No newline at end of file
diff --git a/test_programs/compile_success_empty/numeric_generics_explicit/src/main.nr b/test_programs/compile_success_empty/numeric_generics_explicit/src/main.nr
new file mode 100644
index 00000000000..7c4f7761ff6
--- /dev/null
+++ b/test_programs/compile_success_empty/numeric_generics_explicit/src/main.nr
@@ -0,0 +1,111 @@
+// Regression that a global of the same name does not trigger a duplicate definition error
+global N = 1000;
+
+fn main() {
+    let a = id([1, 2]);
+    let b = id([1, 2, 3]);
+
+    let itWorks1 = MyStruct { data: a };
+    assert(itWorks1.data[1] == 2);
+    let itWorks2 = MyStruct { data: b };
+    assert(itWorks2.data[1] == 2);
+
+    let c = [1, 2];
+    let itAlsoWorks = MyStruct { data: c };
+    assert(itAlsoWorks.data[1] == 2);
+
+    assert(foo(itWorks2).data[0] == itWorks2.data[0] + 1);
+
+    double_numeric_generics_test();
+
+    let my_type = PublicStorage::read::<MyType, 3>();
+    assert(my_type.a == 1);
+    assert(my_type.b == 2);
+    assert(my_type.c == 3);
+
+    let foo = baz::<10>();
+    assert(foo.data == [1; 10]);
+}
+
+// Used in the signature of a function
+fn id<let I: Field>(x: [Field; I]) -> [Field; I] {
+    x
+}
+
+// Used as a field of a struct
+struct MyStruct<let S: u32> {
+    data: [Field; S],
+}
+
+// Used in an impl
+impl<let S: u32> MyStruct<S> {
+    fn insert(mut self: Self, index: Field, elem: Field) -> Self {
+        // Regression test for numeric generics on impls
+        assert(index as u32 < S);
+
+        self.data[index] = elem;
+        self
+    }
+}
+
+fn foo(mut s: MyStruct<2+1>) -> MyStruct<10/2-2> {
+    s.data[0] = s.data[0] + 1;
+    s
+}
+
+fn baz<let N: u32>() -> MyStruct<N> {
+    MyStruct { data: [1; N] }
+}
+
+fn double<let N: u32>() -> u32 {
+    // Used as an expression
+    N * 2
+}
+
+fn double_numeric_generics_test() {
+    // Example usage of a numeric generic arguments.
+    assert(double::<9>() == 18);
+    assert(double::<123>() == 246);
+    assert(double::<7 + 8>() == 30);
+}
+
+struct MyType {
+    a: Field,
+    b: Field,
+    c: Field,
+}
+
+impl<let N: u32> Deserialize<N> for MyType {
+    fn deserialize(fields: [Field; N]) -> Self {
+        MyType { a: fields[0], b: fields[1], c: fields[2] }
+    }
+}
+
+trait Deserialize<let N: u32> {
+    fn deserialize(fields: [Field; N]) -> Self;
+}
+
+struct PublicStorage {}
+
+impl PublicStorage {
+    fn read<T, let N: u32>() -> T where T: Deserialize<N> {
+        // Used as a type within a function body
+        let mut fields: [Field; N] = [0; N];
+        // Used a loop bound
+        for i in 0..N {
+            fields[i] = i as Field + 1;
+        }
+        T::deserialize(fields)
+    }
+}
+
+// Check that we can thread numeric generics into nested structs
+// and also that we can handle nested structs with numeric generics
+// which are declared after the parent struct
+struct NestedNumeric<let N: u32> {
+    a: Field,
+    b: InnerNumeric<N>
+}
+struct InnerNumeric<let N: u32> {
+    inner: [u32; N],
+}
diff --git a/test_programs/compile_success_empty/overlapping_dep_and_mod/Nargo.toml b/test_programs/compile_success_empty/overlapping_dep_and_mod/Nargo.toml
new file mode 100644
index 00000000000..b2c3e5f94be
--- /dev/null
+++ b/test_programs/compile_success_empty/overlapping_dep_and_mod/Nargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+members = [
+    "bin", 
+    "foo",
+]
+default-member = "bin"
diff --git a/test_programs/compile_success_empty/overlapping_dep_and_mod/bin/Nargo.toml b/test_programs/compile_success_empty/overlapping_dep_and_mod/bin/Nargo.toml
new file mode 100644
index 00000000000..57e704462db
--- /dev/null
+++ b/test_programs/compile_success_empty/overlapping_dep_and_mod/bin/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "overlapping_dep_and_mod"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.29.0"
+
+[dependencies]
+foo = { path = "../foo" }
diff --git a/test_programs/compile_success_empty/overlapping_dep_and_mod/bin/src/main.nr b/test_programs/compile_success_empty/overlapping_dep_and_mod/bin/src/main.nr
new file mode 100644
index 00000000000..1d9c917d91a
--- /dev/null
+++ b/test_programs/compile_success_empty/overlapping_dep_and_mod/bin/src/main.nr
@@ -0,0 +1,9 @@
+fn main() {
+    let _ = foo::bar() + dep::foo::baz();
+}
+
+mod foo {
+    pub(crate) fn bar() -> Field {
+        5
+    }
+}
diff --git a/test_programs/compile_success_empty/overlapping_dep_and_mod/foo/Nargo.toml b/test_programs/compile_success_empty/overlapping_dep_and_mod/foo/Nargo.toml
new file mode 100644
index 00000000000..857d4e722a8
--- /dev/null
+++ b/test_programs/compile_success_empty/overlapping_dep_and_mod/foo/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "foo"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.29.0"
+
+[dependencies]
diff --git a/test_programs/compile_success_empty/overlapping_dep_and_mod/foo/src/lib.nr b/test_programs/compile_success_empty/overlapping_dep_and_mod/foo/src/lib.nr
new file mode 100644
index 00000000000..cb8392ed275
--- /dev/null
+++ b/test_programs/compile_success_empty/overlapping_dep_and_mod/foo/src/lib.nr
@@ -0,0 +1,5 @@
+// foo/lib.nr
+
+pub fn baz() -> Field {
+    6
+}
diff --git a/test_programs/compile_success_empty/reexports/src/main.nr b/test_programs/compile_success_empty/reexports/src/main.nr
index ed469ff77d0..0fd65a33564 100644
--- a/test_programs/compile_success_empty/reexports/src/main.nr
+++ b/test_programs/compile_success_empty/reexports/src/main.nr
@@ -1,4 +1,4 @@
-use dep::reexporting_lib::{FooStruct, MyStruct, lib};
+use reexporting_lib::{FooStruct, MyStruct, lib};
 
 fn main() {
     let x: FooStruct = MyStruct { inner: 0 };
diff --git a/test_programs/compile_success_empty/regression_2099/src/main.nr b/test_programs/compile_success_empty/regression_2099/src/main.nr
index f92373ce63a..660f72f56e5 100644
--- a/test_programs/compile_success_empty/regression_2099/src/main.nr
+++ b/test_programs/compile_success_empty/regression_2099/src/main.nr
@@ -1,13 +1,13 @@
-use dep::std::ec::tecurve::affine::Curve as AffineCurve;
-use dep::std::ec::tecurve::affine::Point as Gaffine;
-use dep::std::ec::tecurve::curvegroup::Curve;
-use dep::std::ec::tecurve::curvegroup::Point as G;
+use std::ec::tecurve::affine::Curve as AffineCurve;
+use std::ec::tecurve::affine::Point as Gaffine;
+use std::ec::tecurve::curvegroup::Curve;
+use std::ec::tecurve::curvegroup::Point as G;
 
-use dep::std::ec::swcurve::affine::Point as SWGaffine;
-use dep::std::ec::swcurve::curvegroup::Point as SWG;
+use std::ec::swcurve::affine::Point as SWGaffine;
+use std::ec::swcurve::curvegroup::Point as SWG;
 
-use dep::std::ec::montcurve::affine::Point as MGaffine;
-use dep::std::ec::montcurve::curvegroup::Point as MG;
+use std::ec::montcurve::affine::Point as MGaffine;
+use std::ec::montcurve::curvegroup::Point as MG;
 
 fn main() {
     // Define Baby Jubjub (ERC-2494) parameters in affine representation
diff --git a/test_programs/compile_success_empty/regression_3635/src/main.nr b/test_programs/compile_success_empty/regression_3635/src/main.nr
index 97a04f9d93f..edc6d8690e8 100644
--- a/test_programs/compile_success_empty/regression_3635/src/main.nr
+++ b/test_programs/compile_success_empty/regression_3635/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     let x: u8 = 0x61;
     let y: u8 = "a".as_bytes()[0];
diff --git a/test_programs/compile_success_empty/regression_4635/src/main.nr b/test_programs/compile_success_empty/regression_4635/src/main.nr
index 23918e30785..350b60ba3f7 100644
--- a/test_programs/compile_success_empty/regression_4635/src/main.nr
+++ b/test_programs/compile_success_empty/regression_4635/src/main.nr
@@ -8,7 +8,7 @@ impl FromField for Field {
     }
 }
 
-trait Deserialize<N> {
+trait Deserialize<let N: u32> {
     fn deserialize(fields: [Field; N]) -> Self;
 }
 
diff --git a/test_programs/compile_success_empty/str_as_bytes/src/main.nr b/test_programs/compile_success_empty/str_as_bytes/src/main.nr
index 6fdd926ce7f..1330924e501 100644
--- a/test_programs/compile_success_empty/str_as_bytes/src/main.nr
+++ b/test_programs/compile_success_empty/str_as_bytes/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 fn main() {
     let a = "hello";
     let b = a.as_bytes();
diff --git a/test_programs/compile_success_empty/trait_default_implementation/src/main.nr b/test_programs/compile_success_empty/trait_default_implementation/src/main.nr
index 2f5bff8c40c..90c375b6010 100644
--- a/test_programs/compile_success_empty/trait_default_implementation/src/main.nr
+++ b/test_programs/compile_success_empty/trait_default_implementation/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 trait MyDefault {
     fn my_default(x: Field, y: Field) -> Self;
 
diff --git a/test_programs/compile_success_empty/trait_generics/src/main.nr b/test_programs/compile_success_empty/trait_generics/src/main.nr
index 30b2e79d579..56ce7e8970c 100644
--- a/test_programs/compile_success_empty/trait_generics/src/main.nr
+++ b/test_programs/compile_success_empty/trait_generics/src/main.nr
@@ -29,7 +29,7 @@ impl MyInto<u32> for Field {
 
 /// Serialize example
 
-trait Serializable<N> {
+trait Serializable<let N: u32> {
     fn serialize(self) -> [Field; N];
 }
 
diff --git a/test_programs/compile_success_empty/trait_impl_with_where_clause/Nargo.toml b/test_programs/compile_success_empty/trait_impl_with_where_clause/Nargo.toml
new file mode 100644
index 00000000000..672569634ea
--- /dev/null
+++ b/test_programs/compile_success_empty/trait_impl_with_where_clause/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "trait_impl_with_where_clause"
+type = "bin"
+authors = [""]
+
+[dependencies]
diff --git a/test_programs/compile_success_empty/impl_with_where_clause/src/main.nr b/test_programs/compile_success_empty/trait_impl_with_where_clause/src/main.nr
similarity index 100%
rename from test_programs/compile_success_empty/impl_with_where_clause/src/main.nr
rename to test_programs/compile_success_empty/trait_impl_with_where_clause/src/main.nr
diff --git a/test_programs/compile_success_empty/trait_override_implementation/src/main.nr b/test_programs/compile_success_empty/trait_override_implementation/src/main.nr
index 85528291870..21d89b1b261 100644
--- a/test_programs/compile_success_empty/trait_override_implementation/src/main.nr
+++ b/test_programs/compile_success_empty/trait_override_implementation/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 trait MyDefault {
     fn my_default(x: Field, y: Field) -> Self;
 
diff --git a/test_programs/compile_success_empty/traits/src/main.nr b/test_programs/compile_success_empty/traits/src/main.nr
index ed804559fed..0a5644e7530 100644
--- a/test_programs/compile_success_empty/traits/src/main.nr
+++ b/test_programs/compile_success_empty/traits/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 trait MyDefault {
     fn my_default(x: Field, y: Field) -> Self;
 }
diff --git a/test_programs/compile_success_empty/vectors/src/main.nr b/test_programs/compile_success_empty/vectors/src/main.nr
index d105ceed180..ac02a4691dd 100644
--- a/test_programs/compile_success_empty/vectors/src/main.nr
+++ b/test_programs/compile_success_empty/vectors/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::collections::vec::Vec;
+use std::collections::vec::Vec;
 
 fn main(x: Field, y: pub Field) {
     let mut vector = Vec::new();
diff --git a/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr b/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr
index ab0ae9a48b8..a4207794a8a 100644
--- a/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr
+++ b/test_programs/compile_success_empty/workspace_reexport_bug/binary/src/main.nr
@@ -1,2 +1,2 @@
-use dep::library::ReExportMeFromAnotherLib;
+use library::ReExportMeFromAnotherLib;
 fn main(_x: ReExportMeFromAnotherLib) {}
diff --git a/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr b/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr
index 8e84662ed03..e3a1539ea65 100644
--- a/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr
+++ b/test_programs/compile_success_empty/workspace_reexport_bug/library/src/lib.nr
@@ -1,2 +1,2 @@
 // Re-export 
-use dep::library2::ReExportMeFromAnotherLib;
+use library2::ReExportMeFromAnotherLib;
diff --git a/test_programs/execution_failure/div_by_zero_constants/src/main.nr b/test_programs/execution_failure/div_by_zero_constants/src/main.nr
index 58adc5444b1..f90b3ef9429 100644
--- a/test_programs/execution_failure/div_by_zero_constants/src/main.nr
+++ b/test_programs/execution_failure/div_by_zero_constants/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     let a: Field = 3 / 0;
     std::println(a);
diff --git a/test_programs/execution_failure/div_by_zero_numerator_witness/src/main.nr b/test_programs/execution_failure/div_by_zero_numerator_witness/src/main.nr
index f51b26d5ba1..012e823b297 100644
--- a/test_programs/execution_failure/div_by_zero_numerator_witness/src/main.nr
+++ b/test_programs/execution_failure/div_by_zero_numerator_witness/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(x: Field) {
     let a: Field = x / 0;
     std::println(a);
diff --git a/test_programs/execution_failure/div_by_zero_witness/src/main.nr b/test_programs/execution_failure/div_by_zero_witness/src/main.nr
index a814f88f320..eaa3c1f2a72 100644
--- a/test_programs/execution_failure/div_by_zero_witness/src/main.nr
+++ b/test_programs/execution_failure/div_by_zero_witness/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // It is expected that `y` must be equal to 0.
 fn main(x: Field, y: pub Field) {
     let a: Field = x / y;
diff --git a/test_programs/execution_failure/hashmap_load_factor/src/main.nr b/test_programs/execution_failure/hashmap_load_factor/src/main.nr
index 907c3628142..e95da67a084 100644
--- a/test_programs/execution_failure/hashmap_load_factor/src/main.nr
+++ b/test_programs/execution_failure/hashmap_load_factor/src/main.nr
@@ -1,6 +1,6 @@
-use dep::std::collections::map::HashMap;
-use dep::std::hash::BuildHasherDefault;
-use dep::std::hash::poseidon2::Poseidon2Hasher;
+use std::collections::map::HashMap;
+use std::hash::BuildHasherDefault;
+use std::hash::poseidon2::Poseidon2Hasher;
 
 struct Entry{
     key: Field,
diff --git a/test_programs/execution_success/4_sub/src/main.nr b/test_programs/execution_success/4_sub/src/main.nr
index 6aef8e7b208..2b4fc395705 100644
--- a/test_programs/execution_success/4_sub/src/main.nr
+++ b/test_programs/execution_success/4_sub/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Test unsafe integer subtraction with underflow: 12 - 2418266113 = 1876701195 modulo 2^32
 fn main(mut x: u32, y: u32, z: u32) {
     x = std::wrapping_sub(x,y);
diff --git a/test_programs/execution_success/5_over/src/main.nr b/test_programs/execution_success/5_over/src/main.nr
index 313d580a8d1..6c4153e4b49 100644
--- a/test_programs/execution_success/5_over/src/main.nr
+++ b/test_programs/execution_success/5_over/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Test unsafe integer arithmetic
 // Test odd bits integer
 fn main(mut x: u32, y: u32) {
diff --git a/test_programs/execution_success/6/src/main.nr b/test_programs/execution_success/6/src/main.nr
index 5ecb809e68b..8657199bd7f 100644
--- a/test_programs/execution_success/6/src/main.nr
+++ b/test_programs/execution_success/6/src/main.nr
@@ -5,7 +5,6 @@
 // If you do not cast, it will take all the bytes from the field element!
 // Mimc input is an array of field elements
 // The function is called mimc_bn254 to emphasize its parameters are chosen for bn254 curve, it should be used only with a proving system using the same curve (e.g Plonk from Aztec)
-use dep::std;
 
 fn main(x: [u8; 5], result: pub [u8; 32]) {
     let mut digest = std::hash::sha256(x);
diff --git a/test_programs/execution_success/6_array/src/main.nr b/test_programs/execution_success/6_array/src/main.nr
index 6aa05f58b71..d7180c260ff 100644
--- a/test_programs/execution_success/6_array/src/main.nr
+++ b/test_programs/execution_success/6_array/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 //Basic tests for arrays
 fn main(x: [u32; 5], y: [u32; 5], mut z: u32, t: u32) {
     let mut c = 2301;
diff --git a/test_programs/execution_success/7/src/main.nr b/test_programs/execution_success/7/src/main.nr
index a6bba978644..ad3fe1aadc8 100644
--- a/test_programs/execution_success/7/src/main.nr
+++ b/test_programs/execution_success/7/src/main.nr
@@ -2,7 +2,6 @@
 //
 // Pre-alpha dependencies must now be prefixed with the word "dep".
 // The line below indicates that we would like to pull in the standard library dependency.
-use dep::std;
 
 fn main(x: [u8; 5], result: [u8; 32]) {
     let digest = std::hash::blake2s(x);
diff --git a/test_programs/execution_success/aes128_encrypt/src/main.nr b/test_programs/execution_success/aes128_encrypt/src/main.nr
index f6ed0f309c3..cd7fb4772e2 100644
--- a/test_programs/execution_success/aes128_encrypt/src/main.nr
+++ b/test_programs/execution_success/aes128_encrypt/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 unconstrained fn decode_ascii(ascii: u8) -> u8 {
     if ascii < 58 {
         ascii - 48
diff --git a/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr b/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr
index 4cbf1bd8e6d..260d609928b 100644
--- a/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr
+++ b/test_programs/execution_success/array_dynamic_blackbox_input/src/main.nr
@@ -18,7 +18,7 @@ fn compute_root(leaf: [u8; 32], path: [u8; 64], _index: u32, root: [u8; 32]) {
             hash_input[j + b] = path[offset + j];
         }
 
-        current = dep::std::hash::sha256(hash_input);
+        current = std::hash::sha256(hash_input);
         index = index >> 1;
     }
 
diff --git a/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr b/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr
index 8faaf69dfc8..15a2747eaa9 100644
--- a/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr
+++ b/test_programs/execution_success/array_dynamic_nested_blackbox_input/src/main.nr
@@ -15,6 +15,6 @@ fn main(mut x: [Foo; 3], y: pub Field, hash_result: pub [u8; 32]) {
     // Make sure that we are passing a dynamic array to the black box function call
     // by setting the array using a dynamic index here
     hash_input[y - 1] = 0;
-    let hash = dep::std::hash::sha256(hash_input);
+    let hash = std::hash::sha256(hash_input);
     assert_eq(hash, hash_result);
 }
diff --git a/test_programs/execution_success/bigint/src/main.nr b/test_programs/execution_success/bigint/src/main.nr
index c454c2b66cd..9385b39e847 100644
--- a/test_programs/execution_success/bigint/src/main.nr
+++ b/test_programs/execution_success/bigint/src/main.nr
@@ -1,5 +1,5 @@
-use dep::std::bigint;
-use dep::std::{bigint::Secpk1Fq, println};
+use std::bigint;
+use std::{bigint::Secpk1Fq, println};
 
 fn main(mut x: [u8; 5], y: [u8; 5]) {
     let a = bigint::Secpk1Fq::from_le_bytes(&[x[0], x[1], x[2], x[3], x[4]]);
@@ -10,8 +10,8 @@ fn main(mut x: [u8; 5], y: [u8; 5]) {
         a_be_bytes[31-i] = x[i];
         b_be_bytes[31-i] = y[i];
     }
-    let a_field = dep::std::field::bytes32_to_field(a_be_bytes);
-    let b_field = dep::std::field::bytes32_to_field(b_be_bytes);
+    let a_field = std::field::bytes32_to_field(a_be_bytes);
+    let b_field = std::field::bytes32_to_field(b_be_bytes);
 
     // Regression for issue #4682
     let c = if x[0] != 0 {
@@ -19,7 +19,7 @@ fn main(mut x: [u8; 5], y: [u8; 5]) {
     } else {
         test_unconstrained2(a, b)
     };
-    assert(c.array[0] == dep::std::wrapping_mul(x[0], y[0]));
+    assert(c.array[0] == std::wrapping_mul(x[0], y[0]));
 
     let a_bytes = a.to_le_bytes();
     let b_bytes = b.to_le_bytes();
diff --git a/test_programs/execution_success/blake3/src/main.nr b/test_programs/execution_success/blake3/src/main.nr
index 3bfea6c5f95..fb056bfa848 100644
--- a/test_programs/execution_success/blake3/src/main.nr
+++ b/test_programs/execution_success/blake3/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(x: [u8; 5], result: [u8; 32]) {
     let digest = std::hash::blake3(x);
     assert(digest == result);
diff --git a/test_programs/execution_success/brillig_blake2s/src/main.nr b/test_programs/execution_success/brillig_blake2s/src/main.nr
index 5bd52666ae9..2743e02e920 100644
--- a/test_programs/execution_success/brillig_blake2s/src/main.nr
+++ b/test_programs/execution_success/brillig_blake2s/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Tests a very simple program.
 // 
 // The features being tested is blake2s in brillig
diff --git a/test_programs/execution_success/brillig_blake3/src/main.nr b/test_programs/execution_success/brillig_blake3/src/main.nr
index 05a5b31f936..64852d775f4 100644
--- a/test_programs/execution_success/brillig_blake3/src/main.nr
+++ b/test_programs/execution_success/brillig_blake3/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 unconstrained fn main(x: [u8; 5], result: [u8; 32]) {
     let digest = std::hash::blake3(x);
     assert(digest == result);
diff --git a/test_programs/execution_success/brillig_block_parameter_liveness/src/main.nr b/test_programs/execution_success/brillig_block_parameter_liveness/src/main.nr
index 142290ecbe2..2809668c574 100644
--- a/test_programs/execution_success/brillig_block_parameter_liveness/src/main.nr
+++ b/test_programs/execution_success/brillig_block_parameter_liveness/src/main.nr
@@ -38,11 +38,11 @@ struct Outer {
 // If we don't take into account block parameter liveness, this function will need 5*500=2500 stack items
 unconstrained fn main(conditions: [bool; 5]) -> pub Outer {
     let out0 = if conditions[0] {
-        let mut outer: Outer = dep::std::unsafe::zeroed();
+        let mut outer: Outer = std::unsafe::zeroed();
         outer.middle_a.inner_a.a = 1;
         outer
     } else {
-        let mut outer: Outer= dep::std::unsafe::zeroed();
+        let mut outer: Outer= std::unsafe::zeroed();
         outer.middle_f.inner_c.d = 2;
         outer
     };
diff --git a/test_programs/execution_success/brillig_cow_regression/src/main.nr b/test_programs/execution_success/brillig_cow_regression/src/main.nr
index 1cae9b1ba41..7cd50860978 100644
--- a/test_programs/execution_success/brillig_cow_regression/src/main.nr
+++ b/test_programs/execution_success/brillig_cow_regression/src/main.nr
@@ -25,7 +25,7 @@ struct NewContractData {
 
 impl NewContractData {
     fn hash(self) -> Field {
-        dep::std::hash::pedersen_hash([self.contract_address, self.portal_contract_address])
+        std::hash::pedersen_hash([self.contract_address, self.portal_contract_address])
     }
 }
 
@@ -173,6 +173,6 @@ unconstrained fn main(kernel_data: DataToHash) -> pub [Field; NUM_FIELDS_PER_SHA
         }
     }
 
-    let sha_digest = dep::std::hash::sha256(hash_input_flattened);
+    let sha_digest = std::hash::sha256(hash_input_flattened);
     U256::from_bytes32(sha_digest).to_u128_limbs()
 }
diff --git a/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr b/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr
index 5d84d885567..78343dcd26c 100644
--- a/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr
+++ b/test_programs/execution_success/brillig_ecdsa_secp256k1/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Tests a very simple program.
 // 
 // The features being tested is ecdsa in brillig
diff --git a/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr b/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr
index 9da07f531aa..48debadb012 100644
--- a/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr
+++ b/test_programs/execution_success/brillig_ecdsa_secp256r1/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Tests a very simple program.
 // 
 // The features being tested is ecdsa in brillig
diff --git a/test_programs/execution_success/brillig_fns_as_values/src/main.nr b/test_programs/execution_success/brillig_fns_as_values/src/main.nr
index 9248bff2f4c..1476c447431 100644
--- a/test_programs/execution_success/brillig_fns_as_values/src/main.nr
+++ b/test_programs/execution_success/brillig_fns_as_values/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 struct MyStruct {
     operation: fn (u32) -> u32,
 }
diff --git a/test_programs/execution_success/brillig_hash_to_field/src/main.nr b/test_programs/execution_success/brillig_hash_to_field/src/main.nr
index 53ed85b3ddd..78759bd84c6 100644
--- a/test_programs/execution_success/brillig_hash_to_field/src/main.nr
+++ b/test_programs/execution_success/brillig_hash_to_field/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Tests a very simple program.
 // 
 // The features being tested is hash_to_field in brillig
diff --git a/test_programs/execution_success/brillig_keccak/src/main.nr b/test_programs/execution_success/brillig_keccak/src/main.nr
index a300bc18279..9150e38f208 100644
--- a/test_programs/execution_success/brillig_keccak/src/main.nr
+++ b/test_programs/execution_success/brillig_keccak/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Tests a very simple program.
 // 
 // The features being tested is keccak256 in brillig
diff --git a/test_programs/execution_success/brillig_oracle/src/main.nr b/test_programs/execution_success/brillig_oracle/src/main.nr
index 6a9e5806621..0305cb06978 100644
--- a/test_programs/execution_success/brillig_oracle/src/main.nr
+++ b/test_programs/execution_success/brillig_oracle/src/main.nr
@@ -1,5 +1,5 @@
-use dep::std::slice;
-use dep::std::test::OracleMock;
+use std::slice;
+use std::test::OracleMock;
 
 // Tests oracle usage in brillig/unconstrained functions
 fn main(_x: Field) {
diff --git a/test_programs/execution_success/brillig_pedersen/src/main.nr b/test_programs/execution_success/brillig_pedersen/src/main.nr
index 2379818c454..17c79f9d0ae 100644
--- a/test_programs/execution_success/brillig_pedersen/src/main.nr
+++ b/test_programs/execution_success/brillig_pedersen/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 unconstrained fn main(x: Field, y: Field, salt: Field, out_x: Field, out_y: Field, out_hash: Field) {
     let res = std::hash::pedersen_commitment_with_separator([x, y], 0);
     assert(res.x == out_x);
diff --git a/test_programs/execution_success/brillig_sha256/src/main.nr b/test_programs/execution_success/brillig_sha256/src/main.nr
index e76109df9c3..fcc01978a0a 100644
--- a/test_programs/execution_success/brillig_sha256/src/main.nr
+++ b/test_programs/execution_success/brillig_sha256/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Tests a very simple program.
 // 
 // The features being tested is sha256 in brillig
diff --git a/test_programs/execution_success/brillig_slices/src/main.nr b/test_programs/execution_success/brillig_slices/src/main.nr
index 2cf1850f151..89f838a3a57 100644
--- a/test_programs/execution_success/brillig_slices/src/main.nr
+++ b/test_programs/execution_success/brillig_slices/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::slice;
+use std::slice;
 unconstrained fn main(x: Field, y: Field) {
     let mut slice: [Field] = &[y, x];
     assert(slice.len() == 2);
diff --git a/test_programs/execution_success/conditional_1/src/main.nr b/test_programs/execution_success/conditional_1/src/main.nr
index 5064c82bce9..e7d780263b8 100644
--- a/test_programs/execution_success/conditional_1/src/main.nr
+++ b/test_programs/execution_success/conditional_1/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn sort(mut a: [u32; 4]) -> [u32; 4] {
     for i in 1..4 {
         for j in 0..i {
diff --git a/test_programs/execution_success/conditional_2/src/main.nr b/test_programs/execution_success/conditional_2/src/main.nr
index 5b3f64f6be5..ea23ec3cf3b 100644
--- a/test_programs/execution_success/conditional_2/src/main.nr
+++ b/test_programs/execution_success/conditional_2/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn must_be_zero(x: u8) {
     assert(x == 0);
 }
diff --git a/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr b/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr
index d260fa49dc3..de5ad20a642 100644
--- a/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr
+++ b/test_programs/execution_success/conditional_regression_short_circuit/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(a: u32, mut c: [u32; 4], x: [u8; 5], result: pub [u8; 32]) {
     //regression for short-circuit2
     if 35 == a {
diff --git a/test_programs/execution_success/databus/src/main.nr b/test_programs/execution_success/databus/src/main.nr
index 1cf95be8a22..7e5c23d508d 100644
--- a/test_programs/execution_success/databus/src/main.nr
+++ b/test_programs/execution_success/databus/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(mut x: u32, y: call_data u32, z: call_data [u32; 4]) -> return_data u32 {
     let a = z[x];
     a + foo(y)
diff --git a/test_programs/execution_success/diamond_deps_0/src/main.nr b/test_programs/execution_success/diamond_deps_0/src/main.nr
index ca95c6e0aa8..690d6fc9fc8 100644
--- a/test_programs/execution_success/diamond_deps_0/src/main.nr
+++ b/test_programs/execution_success/diamond_deps_0/src/main.nr
@@ -1,6 +1,6 @@
-use dep::dep1::call_dep1_then_dep2;
-use dep::dep2::call_dep2;
-use dep::dep2::RESOLVE_THIS;
+use dep1::call_dep1_then_dep2;
+use dep2::call_dep2;
+use dep2::RESOLVE_THIS;
 
 fn main(x: Field, y: pub Field) -> pub Field {
     call_dep1_then_dep2(x, y) + call_dep2(x, y) + RESOLVE_THIS
diff --git a/test_programs/execution_success/double_verify_nested_proof/src/main.nr b/test_programs/execution_success/double_verify_nested_proof/src/main.nr
index 95d4b6f6995..5f0eb1a5b53 100644
--- a/test_programs/execution_success/double_verify_nested_proof/src/main.nr
+++ b/test_programs/execution_success/double_verify_nested_proof/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 
 // This circuit aggregates two recursive proofs from `double_verify_proof_recursive`.
 // Recursive aggregation is a backend-specific process and it is expected for backends 
diff --git a/test_programs/execution_success/double_verify_proof/src/main.nr b/test_programs/execution_success/double_verify_proof/src/main.nr
index d832ce0f049..d3b909c3fa4 100644
--- a/test_programs/execution_success/double_verify_proof/src/main.nr
+++ b/test_programs/execution_success/double_verify_proof/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 
 // This circuit aggregates two proofs from `assert_statement_recursive`.
 fn main(
diff --git a/test_programs/execution_success/double_verify_proof_recursive/src/main.nr b/test_programs/execution_success/double_verify_proof_recursive/src/main.nr
index 86b4971c3a6..2555bbc4758 100644
--- a/test_programs/execution_success/double_verify_proof_recursive/src/main.nr
+++ b/test_programs/execution_success/double_verify_proof_recursive/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 
 // This circuit aggregates two proofs from `assert_statement_recursive`.
 #[recursive]
diff --git a/test_programs/execution_success/ecdsa_secp256k1/src/main.nr b/test_programs/execution_success/ecdsa_secp256k1/src/main.nr
index ac0359e4bb8..7f0999fc360 100644
--- a/test_programs/execution_success/ecdsa_secp256k1/src/main.nr
+++ b/test_programs/execution_success/ecdsa_secp256k1/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(
     message: [u8; 38],
     hashed_message: [u8; 32],
diff --git a/test_programs/execution_success/ecdsa_secp256r1/src/main.nr b/test_programs/execution_success/ecdsa_secp256r1/src/main.nr
index c64e390d652..09f427c37d9 100644
--- a/test_programs/execution_success/ecdsa_secp256r1/src/main.nr
+++ b/test_programs/execution_success/ecdsa_secp256r1/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(hashed_message: [u8; 32], pub_key_x: [u8; 32], pub_key_y: [u8; 32], signature: [u8; 64]) {
     let valid_signature = std::ecdsa_secp256r1::verify_signature(pub_key_x, pub_key_y, signature, hashed_message);
     assert(valid_signature);
diff --git a/test_programs/execution_success/ecdsa_secp256r1_3x/src/main.nr b/test_programs/execution_success/ecdsa_secp256r1_3x/src/main.nr
index e7a6be9d47a..b5bd633915f 100644
--- a/test_programs/execution_success/ecdsa_secp256r1_3x/src/main.nr
+++ b/test_programs/execution_success/ecdsa_secp256r1_3x/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(
     hashed_message: [u8; 32],
     pub_key_x: [u8; 32],
diff --git a/test_programs/execution_success/eddsa/src/main.nr b/test_programs/execution_success/eddsa/src/main.nr
index ada15d5405c..407ca049806 100644
--- a/test_programs/execution_success/eddsa/src/main.nr
+++ b/test_programs/execution_success/eddsa/src/main.nr
@@ -1,9 +1,9 @@
-use dep::std::compat;
-use dep::std::ec::consts::te::baby_jubjub;
-use dep::std::ec::tecurve::affine::Point as TEPoint;
-use dep::std::hash;
-use dep::std::eddsa::{eddsa_to_pub, eddsa_poseidon_verify, eddsa_verify};
-use dep::std::hash::poseidon2::Poseidon2Hasher;
+use std::compat;
+use std::ec::consts::te::baby_jubjub;
+use std::ec::tecurve::affine::Point as TEPoint;
+use std::hash;
+use std::eddsa::{eddsa_to_pub, eddsa_poseidon_verify, eddsa_verify};
+use std::hash::poseidon2::Poseidon2Hasher;
 
 fn main(msg: pub Field, _priv_key_a: Field, _priv_key_b: Field) {
     // Skip this test for non-bn254 backends
diff --git a/test_programs/execution_success/embedded_curve_ops/src/main.nr b/test_programs/execution_success/embedded_curve_ops/src/main.nr
index 46f919e947a..4eeda39c6aa 100644
--- a/test_programs/execution_success/embedded_curve_ops/src/main.nr
+++ b/test_programs/execution_success/embedded_curve_ops/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(priv_key: Field, pub_x: pub Field, pub_y: pub Field) {
     let g1_y = 17631683881184975370165255887551781615748388533673675138860;
     let g1 = std::embedded_curve_ops::EmbeddedCurvePoint { x: 1, y: g1_y, is_infinite: false };
diff --git a/test_programs/execution_success/fold_numeric_generic_poseidon/src/main.nr b/test_programs/execution_success/fold_numeric_generic_poseidon/src/main.nr
index f9f3e75789b..7d12d63634b 100644
--- a/test_programs/execution_success/fold_numeric_generic_poseidon/src/main.nr
+++ b/test_programs/execution_success/fold_numeric_generic_poseidon/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::hash::{pedersen_hash_with_separator, poseidon2::Poseidon2};
+use std::hash::{pedersen_hash_with_separator, poseidon2::Poseidon2};
 
 global NUM_HASHES = 2;
 global HASH_LENGTH = 10;
diff --git a/test_programs/execution_success/generics/src/main.nr b/test_programs/execution_success/generics/src/main.nr
index c8616960559..f754fb96292 100644
--- a/test_programs/execution_success/generics/src/main.nr
+++ b/test_programs/execution_success/generics/src/main.nr
@@ -34,7 +34,7 @@ impl Bar<Field> {
 impl<T> Bar<T> {
     // This is to test that we can use turbofish on methods as well
     fn zeroed<A>(_self: Self) -> A {
-        dep::std::unsafe::zeroed()
+        std::unsafe::zeroed()
     }
 }
 
diff --git a/test_programs/execution_success/hash_to_field/src/main.nr b/test_programs/execution_success/hash_to_field/src/main.nr
index 242b5ecbc18..bb4f829ec33 100644
--- a/test_programs/execution_success/hash_to_field/src/main.nr
+++ b/test_programs/execution_success/hash_to_field/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(input: Field) -> pub Field {
     std::hash::hash_to_field(&[input])
 }
diff --git a/test_programs/execution_success/hashmap/src/main.nr b/test_programs/execution_success/hashmap/src/main.nr
index 76daa594a89..8cf70cc5970 100644
--- a/test_programs/execution_success/hashmap/src/main.nr
+++ b/test_programs/execution_success/hashmap/src/main.nr
@@ -1,9 +1,9 @@
 mod utils;
 
-use dep::std::collections::map::HashMap;
-use dep::std::hash::BuildHasherDefault;
-use dep::std::hash::poseidon2::Poseidon2Hasher;
-use dep::std::cmp::Eq;
+use std::collections::map::HashMap;
+use std::hash::BuildHasherDefault;
+use std::hash::poseidon2::Poseidon2Hasher;
+use std::cmp::Eq;
 
 use utils::cut;
 
diff --git a/test_programs/execution_success/import/src/main.nr b/test_programs/execution_success/import/src/main.nr
index 7dcc16fed16..0f5aa7e5460 100644
--- a/test_programs/execution_success/import/src/main.nr
+++ b/test_programs/execution_success/import/src/main.nr
@@ -2,7 +2,7 @@ mod import;
 use crate::import::hello;
 
 fn main(x: Field, y: Field) {
-    let _k = dep::std::hash::pedersen_commitment([x]);
+    let _k = std::hash::pedersen_commitment([x]);
     let _l = hello(x);
 
     assert(x != import::hello(y));
diff --git a/test_programs/execution_success/is_unconstrained/src/main.nr b/test_programs/execution_success/is_unconstrained/src/main.nr
index af40af1029f..ddafc73c598 100644
--- a/test_programs/execution_success/is_unconstrained/src/main.nr
+++ b/test_programs/execution_success/is_unconstrained/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::runtime::is_unconstrained;
+use std::runtime::is_unconstrained;
 
 fn check(should_be_unconstrained: bool) {
     assert_eq(should_be_unconstrained, is_unconstrained());
diff --git a/test_programs/execution_success/keccak256/src/main.nr b/test_programs/execution_success/keccak256/src/main.nr
index eb401fe614c..ff18cae0c9c 100644
--- a/test_programs/execution_success/keccak256/src/main.nr
+++ b/test_programs/execution_success/keccak256/src/main.nr
@@ -1,5 +1,4 @@
 // docs:start:keccak256
-use dep::std;
 
 fn main(x: Field, result: [u8; 32]) {
     // We use the `as` keyword here to denote the fact that we want to take just the first byte from the x Field
diff --git a/test_programs/execution_success/merkle_insert/src/main.nr b/test_programs/execution_success/merkle_insert/src/main.nr
index ac9a7b34ea3..a08088e847b 100644
--- a/test_programs/execution_success/merkle_insert/src/main.nr
+++ b/test_programs/execution_success/merkle_insert/src/main.nr
@@ -1,5 +1,4 @@
-use dep::std;
-use dep::std::hash::mimc;
+use std::hash::mimc;
 
 fn main(
     old_root: Field,
diff --git a/test_programs/execution_success/modulus/src/main.nr b/test_programs/execution_success/modulus/src/main.nr
index 35f63fdc8c5..1627cc0dba2 100644
--- a/test_programs/execution_success/modulus/src/main.nr
+++ b/test_programs/execution_success/modulus/src/main.nr
@@ -1,10 +1,13 @@
-use dep::std;
-
 fn main(bn254_modulus_be_bytes: [u8; 32], bn254_modulus_be_bits: [u1; 254]) {
     let modulus_size = std::field::modulus_num_bits();
     // NOTE: The constraints used in this circuit will only work when testing nargo with the plonk bn254 backend
     assert(modulus_size == 254);
 
+    assert_reverse(
+        std::field::modulus_be_bytes(),
+        std::field::modulus_le_bytes()
+    );
+
     let modulus_be_byte_array = std::field::modulus_be_bytes();
     for i in 0..32 {
         assert(modulus_be_byte_array[i] == bn254_modulus_be_bytes[i]);
@@ -23,3 +26,9 @@ fn main(bn254_modulus_be_bytes: [u8; 32], bn254_modulus_be_bits: [u1; 254]) {
         assert(modulus_le_bits[i] == bn254_modulus_be_bits[253 - i]);
     }
 }
+
+fn assert_reverse(forwards: [u8], backwards: [u8]) {
+    for i in 0..32 {
+        assert_eq(forwards[i], backwards[31 - i]);
+    }
+}
diff --git a/test_programs/execution_success/no_predicates_numeric_generic_poseidon/src/main.nr b/test_programs/execution_success/no_predicates_numeric_generic_poseidon/src/main.nr
index dcb5e6bc5ca..94db8c2b414 100644
--- a/test_programs/execution_success/no_predicates_numeric_generic_poseidon/src/main.nr
+++ b/test_programs/execution_success/no_predicates_numeric_generic_poseidon/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::hash::{pedersen_hash_with_separator, poseidon2::Poseidon2};
+use std::hash::{pedersen_hash_with_separator, poseidon2::Poseidon2};
 
 global NUM_HASHES = 2;
 global HASH_LENGTH = 10;
diff --git a/test_programs/execution_success/operator_overloading/src/main.nr b/test_programs/execution_success/operator_overloading/src/main.nr
index 3956ea5c577..c2c831d0c1e 100644
--- a/test_programs/execution_success/operator_overloading/src/main.nr
+++ b/test_programs/execution_success/operator_overloading/src/main.nr
@@ -1,5 +1,5 @@
-use dep::std::ops::{Add, Sub, Mul, Div, Rem, BitAnd, BitOr, BitXor, Shl, Shr};
-use dep::std::cmp::Ordering;
+use std::ops::{Add, Sub, Mul, Div, Rem, BitAnd, BitOr, BitXor, Shl, Shr};
+use std::cmp::Ordering;
 
 // x = 3, y = 9
 fn main(x: u32, y: u32) {
diff --git a/test_programs/execution_success/overlapping_dep_and_mod/Nargo.toml b/test_programs/execution_success/overlapping_dep_and_mod/Nargo.toml
new file mode 100644
index 00000000000..b2c3e5f94be
--- /dev/null
+++ b/test_programs/execution_success/overlapping_dep_and_mod/Nargo.toml
@@ -0,0 +1,6 @@
+[workspace]
+members = [
+    "bin", 
+    "foo",
+]
+default-member = "bin"
diff --git a/test_programs/execution_success/overlapping_dep_and_mod/bin/Nargo.toml b/test_programs/execution_success/overlapping_dep_and_mod/bin/Nargo.toml
new file mode 100644
index 00000000000..57e704462db
--- /dev/null
+++ b/test_programs/execution_success/overlapping_dep_and_mod/bin/Nargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "overlapping_dep_and_mod"
+type = "bin"
+authors = [""]
+compiler_version = ">=0.29.0"
+
+[dependencies]
+foo = { path = "../foo" }
diff --git a/test_programs/execution_success/overlapping_dep_and_mod/bin/Prover.toml b/test_programs/execution_success/overlapping_dep_and_mod/bin/Prover.toml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test_programs/execution_success/overlapping_dep_and_mod/bin/src/main.nr b/test_programs/execution_success/overlapping_dep_and_mod/bin/src/main.nr
new file mode 100644
index 00000000000..16c940f12fc
--- /dev/null
+++ b/test_programs/execution_success/overlapping_dep_and_mod/bin/src/main.nr
@@ -0,0 +1,14 @@
+// bin/main.nr
+
+fn main() -> pub Field {
+    assert(foo::bar() + dep::foo::bar() == 11);
+    assert(foo::bar() == 5);
+    assert(dep::foo::bar() == 6);
+    foo::bar() + dep::foo::bar()
+}
+
+mod foo {
+    pub(crate) fn bar() -> Field {
+        5
+    }
+}
diff --git a/test_programs/execution_success/overlapping_dep_and_mod/foo/Nargo.toml b/test_programs/execution_success/overlapping_dep_and_mod/foo/Nargo.toml
new file mode 100644
index 00000000000..857d4e722a8
--- /dev/null
+++ b/test_programs/execution_success/overlapping_dep_and_mod/foo/Nargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "foo"
+type = "lib"
+authors = [""]
+compiler_version = ">=0.29.0"
+
+[dependencies]
diff --git a/test_programs/execution_success/overlapping_dep_and_mod/foo/src/lib.nr b/test_programs/execution_success/overlapping_dep_and_mod/foo/src/lib.nr
new file mode 100644
index 00000000000..09283defed7
--- /dev/null
+++ b/test_programs/execution_success/overlapping_dep_and_mod/foo/src/lib.nr
@@ -0,0 +1,5 @@
+// foo/lib.nr
+
+pub fn bar() -> Field {
+    6
+}
diff --git a/test_programs/execution_success/pedersen_check/src/main.nr b/test_programs/execution_success/pedersen_check/src/main.nr
index 90ef218249b..c71b2b570da 100644
--- a/test_programs/execution_success/pedersen_check/src/main.nr
+++ b/test_programs/execution_success/pedersen_check/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(x: Field, y: Field, salt: Field, out_x: Field, out_y: Field, out_hash: Field) {
     let res = std::hash::pedersen_commitment([x, y]);
     assert(res.x == out_x);
diff --git a/test_programs/execution_success/pedersen_commitment/src/main.nr b/test_programs/execution_success/pedersen_commitment/src/main.nr
index a3a9aea1cf0..81c605a64dd 100644
--- a/test_programs/execution_success/pedersen_commitment/src/main.nr
+++ b/test_programs/execution_success/pedersen_commitment/src/main.nr
@@ -1,5 +1,4 @@
 // docs:start:pedersen-commitment
-use dep::std;
 
 fn main(x: Field, y: Field, expected_commitment: std::embedded_curve_ops::EmbeddedCurvePoint) {
     let commitment = std::hash::pedersen_commitment([x, y]);
diff --git a/test_programs/execution_success/pedersen_hash/src/main.nr b/test_programs/execution_success/pedersen_hash/src/main.nr
index 20c7de12d6c..f8ec56a9d98 100644
--- a/test_programs/execution_success/pedersen_hash/src/main.nr
+++ b/test_programs/execution_success/pedersen_hash/src/main.nr
@@ -1,5 +1,4 @@
 // docs:start:pedersen-hash
-use dep::std;
 
 fn main(x: Field, y: Field, expected_hash: Field) {
     let hash = std::hash::pedersen_hash([x, y]);
diff --git a/test_programs/execution_success/poseidon_bn254_hash/src/main.nr b/test_programs/execution_success/poseidon_bn254_hash/src/main.nr
index a1607956190..cf1c190e5c9 100644
--- a/test_programs/execution_success/poseidon_bn254_hash/src/main.nr
+++ b/test_programs/execution_success/poseidon_bn254_hash/src/main.nr
@@ -1,6 +1,6 @@
 // docs:start:poseidon
-use dep::std::hash::poseidon;
-use dep::std::hash::poseidon2;
+use std::hash::poseidon;
+use std::hash::poseidon2;
 
 fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field, x3: [Field; 4], y3: Field) {
     let hash1 = poseidon::bn254::hash_2(x1);
diff --git a/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr b/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr
index 910a17c8c89..137f3e5d2a6 100644
--- a/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr
+++ b/test_programs/execution_success/poseidonsponge_x5_254/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::hash::poseidon;
+use std::hash::poseidon;
 
 fn main(x: [Field; 7]) {
     // Test optimized sponge
diff --git a/test_programs/execution_success/prelude/src/main.nr b/test_programs/execution_success/prelude/src/main.nr
index 226341f1e7b..4fe6080222e 100644
--- a/test_programs/execution_success/prelude/src/main.nr
+++ b/test_programs/execution_success/prelude/src/main.nr
@@ -8,8 +8,8 @@ fn main() {
 
 mod a {
     // We don't want to give an error due to re-importing elements that are already in the prelude.
-    use dep::std::collections::vec::Vec;
-    use dep::std::option::Option;
+    use std::collections::vec::Vec;
+    use std::option::Option;
 
     fn main() {
         let _xs = Vec::new();
diff --git a/test_programs/execution_success/regression_3051/src/main.nr b/test_programs/execution_success/regression_3051/src/main.nr
index 2e7d10fd7b0..90eb652db7a 100644
--- a/test_programs/execution_success/regression_3051/src/main.nr
+++ b/test_programs/execution_success/regression_3051/src/main.nr
@@ -19,6 +19,6 @@ impl Bar for u64 {
 }
 
 fn main() {
-    dep::std::println(1.foo());
-    dep::std::println(1.bar());
+    std::println(1.foo());
+    std::println(1.bar());
 }
diff --git a/test_programs/execution_success/regression_3394/src/main.nr b/test_programs/execution_success/regression_3394/src/main.nr
index 94b6c818ff2..59494253757 100644
--- a/test_programs/execution_success/regression_3394/src/main.nr
+++ b/test_programs/execution_success/regression_3394/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     let x : i8 = -128;
     std::println(x);
diff --git a/test_programs/execution_success/regression_4088/src/main.nr b/test_programs/execution_success/regression_4088/src/main.nr
index 9e4d7892fc3..12a7afca68c 100644
--- a/test_programs/execution_success/regression_4088/src/main.nr
+++ b/test_programs/execution_success/regression_4088/src/main.nr
@@ -1,4 +1,4 @@
-trait Serialize<N> {
+trait Serialize<let N: u32> {
     fn serialize(self) -> [Field; N];
 }
 
@@ -12,7 +12,7 @@ impl Serialize<1> for ValueNote {
     }
 }
 
-fn check<N>(serialized_note: [Field; N]) {
+fn check<let N: u32>(serialized_note: [Field; N]) {
     assert(serialized_note[0] == 0);
 }
 
diff --git a/test_programs/execution_success/regression_4124/src/main.nr b/test_programs/execution_success/regression_4124/src/main.nr
index 49ff68ee6ad..6caea017798 100644
--- a/test_programs/execution_success/regression_4124/src/main.nr
+++ b/test_programs/execution_success/regression_4124/src/main.nr
@@ -1,6 +1,6 @@
-use dep::std::option::Option;
+use std::option::Option;
 
-trait MyDeserialize<N> {
+trait MyDeserialize<let N: u32> {
     fn deserialize(fields: [Field; N]) -> Self;
 }
 
@@ -10,8 +10,8 @@ impl MyDeserialize<1> for Field {
     }
 }
 
-pub fn storage_read<N>() -> [Field; N] {
-    dep::std::unsafe::zeroed()
+pub fn storage_read<let N: u32>() -> [Field; N] {
+    std::unsafe::zeroed()
 }
 
 struct PublicMutable<T> {
diff --git a/test_programs/execution_success/regression_4449/src/main.nr b/test_programs/execution_success/regression_4449/src/main.nr
index 454a93f5d1a..66bab2e09f4 100644
--- a/test_programs/execution_success/regression_4449/src/main.nr
+++ b/test_programs/execution_success/regression_4449/src/main.nr
@@ -1,5 +1,4 @@
 // Regression test for issue #4449
-use dep::std;
 
 fn main(x: u8, result: [u8; 32]) {
     let x = x % 31;
diff --git a/test_programs/execution_success/regression_5045/src/main.nr b/test_programs/execution_success/regression_5045/src/main.nr
index 015fb1b2555..cf39b2f97e4 100644
--- a/test_programs/execution_success/regression_5045/src/main.nr
+++ b/test_programs/execution_success/regression_5045/src/main.nr
@@ -1,5 +1,5 @@
-use dep::std::embedded_curve_ops::EmbeddedCurvePoint;
-use dep::std::embedded_curve_ops::EmbeddedCurveScalar;
+use std::embedded_curve_ops::EmbeddedCurvePoint;
+use std::embedded_curve_ops::EmbeddedCurveScalar;
 
 fn main(is_active: bool) {
     let a = EmbeddedCurvePoint {
@@ -11,7 +11,7 @@ fn main(is_active: bool) {
     if is_active {
         let bad = EmbeddedCurvePoint { x: 0, y: 5, is_infinite: false };
         let d = bad.double();
-        let e = dep::std::embedded_curve_ops::multi_scalar_mul(
+        let e = std::embedded_curve_ops::multi_scalar_mul(
             [a, bad],
             [EmbeddedCurveScalar { lo: 1, hi: 0 }, EmbeddedCurveScalar { lo: 1, hi: 0 }]
         );
diff --git a/test_programs/execution_success/regression_5202/src/main.nr b/test_programs/execution_success/regression_5202/src/main.nr
new file mode 100644
index 00000000000..2ebfd7890ba
--- /dev/null
+++ b/test_programs/execution_success/regression_5202/src/main.nr
@@ -0,0 +1,23 @@
+use fraction::{Fraction, MAX, floor, toFraction, addFraction};
+
+fn main() {
+    let g1 = toFraction(true, 33333333, 5);
+    let g2 = toFraction(true, 500000, 33333333);
+    let a = addFraction(g1, g2);
+
+    let f1 = floor(a);
+    let f2 = MAX;
+    assert(f1.sign);
+    assert(f2.sign);
+
+    if f1.sign != f2.sign {
+        if (f1.sign) { () } else { () }
+    } else {
+        // Test fails here before the fix to #5202.
+        // An optimization which assumes an if condition to be true/false
+        // within the then/else branch respectively wasn't being set properly
+        // causing f1.sign to be assumed to be false in this else branch.
+        assert(f1.sign);
+        assert(f2.sign);
+    }
+}
diff --git a/test_programs/execution_success/regression_5252/src/main.nr b/test_programs/execution_success/regression_5252/src/main.nr
new file mode 100644
index 00000000000..0bfd596a777
--- /dev/null
+++ b/test_programs/execution_success/regression_5252/src/main.nr
@@ -0,0 +1,23 @@
+use std::hash::{mimc, poseidon, poseidon2::Poseidon2};
+
+global NUM_HASHES = 3;
+global HASH_LENGTH = 20;
+
+pub fn poseidon_hash<N>(inputs: [Field; N]) -> Field {
+    Poseidon2::hash(inputs, inputs.len())
+}
+
+fn main(
+    to_hash: [[Field; HASH_LENGTH]; NUM_HASHES],
+    enable: [bool; NUM_HASHES]
+) -> pub [Field; NUM_HASHES] {
+    let mut result = [0; NUM_HASHES];
+    for i in 0..NUM_HASHES {
+        let enable = enable[i];
+        let to_hash = to_hash[i];
+        if enable {
+            result[i] = poseidon_hash(to_hash) + poseidon::bn254::sponge(to_hash) + mimc::mimc_bn254(to_hash);
+        }
+    }
+    result
+}
diff --git a/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr b/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr
index 1a6931a6870..c7db543f1bb 100644
--- a/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr
+++ b/test_programs/execution_success/regression_method_cannot_be_found/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 struct Item {
     id: Field,
 }
diff --git a/test_programs/execution_success/schnorr/src/main.nr b/test_programs/execution_success/schnorr/src/main.nr
index 1067d9707b2..5bc0ca9fefb 100644
--- a/test_programs/execution_success/schnorr/src/main.nr
+++ b/test_programs/execution_success/schnorr/src/main.nr
@@ -1,5 +1,4 @@
-use dep::std;
-use dep::std::embedded_curve_ops;
+use std::embedded_curve_ops;
 
 // Note: If main has any unsized types, then the verifier will never be able
 // to figure out the circuit instance
@@ -37,11 +36,7 @@ fn main(
 // Meanwhile, you have to use a message with 32 additional bytes:
 // If you want to verify a signature on a message of 10 bytes, you need to pass a message of length 42,
 // where the first 10 bytes are the one from the original message (the other bytes are not used)
-pub fn verify_signature_noir<M>(
-    public_key: embedded_curve_ops::EmbeddedCurvePoint,
-    signature: [u8; 64],
-    message: [u8; M]
-) -> bool {
+pub fn verify_signature_noir<M>(public_key: embedded_curve_ops::EmbeddedCurvePoint, signature: [u8; 64], message: [u8; M]) -> bool {
     let N = message.len() - 32;
 
     //scalar lo/hi from bytes
@@ -90,11 +85,7 @@ pub fn bytes_to_scalar(bytes: [u8; 64], offset: u32) -> embedded_curve_ops::Embe
     sig_s
 }
 
-pub fn assert_valid_signature<M>(
-    public_key: embedded_curve_ops::EmbeddedCurvePoint,
-    signature: [u8; 64],
-    message: [u8; M]
-) {
+pub fn assert_valid_signature<M>(public_key: embedded_curve_ops::EmbeddedCurvePoint, signature: [u8; 64], message: [u8; M]) {
     let N = message.len() - 32;
     //scalar lo/hi from bytes
     let sig_s = bytes_to_scalar(signature, 0);
diff --git a/test_programs/execution_success/sha256/src/main.nr b/test_programs/execution_success/sha256/src/main.nr
index d4240ded8b3..4f999d349f0 100644
--- a/test_programs/execution_success/sha256/src/main.nr
+++ b/test_programs/execution_success/sha256/src/main.nr
@@ -9,7 +9,6 @@
 //
 // Not yet here: For R1CS, it is more about manipulating arithmetic gates to get performance
 // This can be done in ACIR!
-use dep::std;
 
 fn main(x: Field, result: [u8; 32]) {
     // We use the `as` keyword here to denote the fact that we want to take just the first byte from the x Field
diff --git a/test_programs/execution_success/sha2_byte/src/main.nr b/test_programs/execution_success/sha2_byte/src/main.nr
index fa8ddfbdf69..aecd9fba2f3 100644
--- a/test_programs/execution_success/sha2_byte/src/main.nr
+++ b/test_programs/execution_success/sha2_byte/src/main.nr
@@ -1,5 +1,4 @@
 // Test Noir implementations of SHA256 and SHA512 on a one-byte message.
-use dep::std;
 
 fn main(x: Field, result256: [u8; 32], result512: [u8; 64]) {
     let digest256 = std::sha256::digest([x as u8]);
diff --git a/test_programs/execution_success/signed_comparison/src/main.nr b/test_programs/execution_success/signed_comparison/src/main.nr
index d020be380fb..0fe72112f5a 100644
--- a/test_programs/execution_success/signed_comparison/src/main.nr
+++ b/test_programs/execution_success/signed_comparison/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(mut x: i8, mut y: i8, z: i8) {
     let mut s1: i8 = 5;
     let mut s2: i8 = 8;
diff --git a/test_programs/execution_success/signed_division/src/main.nr b/test_programs/execution_success/signed_division/src/main.nr
index 6289a2f9ed9..207ef59986b 100644
--- a/test_programs/execution_success/signed_division/src/main.nr
+++ b/test_programs/execution_success/signed_division/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Testing signed integer division: 
 //  7/3  = 2
 // -7/3  = -2
diff --git a/test_programs/execution_success/simple_print/src/main.nr b/test_programs/execution_success/simple_print/src/main.nr
index 6038b995af0..3a68f8cc4c3 100644
--- a/test_programs/execution_success/simple_print/src/main.nr
+++ b/test_programs/execution_success/simple_print/src/main.nr
@@ -1,6 +1,5 @@
 // Simple program for testing the logging
 // of single witnesses and witness arrays.
-use dep::std;
 
 fn main(x: Field, y: pub Field) {
     std::println(x);
diff --git a/test_programs/execution_success/simple_shield/src/main.nr b/test_programs/execution_success/simple_shield/src/main.nr
index 548ba17d462..d84288b9fd6 100644
--- a/test_programs/execution_success/simple_shield/src/main.nr
+++ b/test_programs/execution_success/simple_shield/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(
     // Public key of note
   // all notes have the same denomination
diff --git a/test_programs/execution_success/slice_coercion/src/main.nr b/test_programs/execution_success/slice_coercion/src/main.nr
index a7ba0443bd1..4a83b739523 100644
--- a/test_programs/execution_success/slice_coercion/src/main.nr
+++ b/test_programs/execution_success/slice_coercion/src/main.nr
@@ -23,5 +23,5 @@ fn main(expected: pub Field, first: Field) {
 fn regression_4967() {
     let var1: [(i32, u8)] = [(1, 2)];
     assert(var1.len() == 1);
-    dep::std::println(var1);
+    std::println(var1);
 }
diff --git a/test_programs/execution_success/slices/src/main.nr b/test_programs/execution_success/slices/src/main.nr
index b20e3478898..2bd4dbd97b0 100644
--- a/test_programs/execution_success/slices/src/main.nr
+++ b/test_programs/execution_success/slices/src/main.nr
@@ -1,5 +1,4 @@
-use dep::std::slice;
-use dep::std;
+use std::slice;
 
 fn main(x: Field, y: pub Field) {
     let mut slice = &[0; 2];
@@ -46,6 +45,14 @@ fn main(x: Field, y: pub Field) {
     assert(append[0] == 1);
     assert(append[4] == 5);
 
+    let mapped = &[1, 2].map(|x| x + 1);
+    assert_eq(mapped, &[2, 3]);
+
+    assert_eq(&[1, 2, 3].fold(0, |acc, x| acc + x), 6);
+    assert_eq(&[1, 2, 3].reduce(|acc, x| acc + x), 6);
+    assert(&[2, 4, 6].all(|x| x > 0));
+    assert(&[2, 4, 6].any(|x| x > 5));
+
     regression_2083();
     // The parameters to this function must come from witness values (inputs to main)
     regression_merge_slices(x, y);
diff --git a/test_programs/execution_success/strings/src/main.nr b/test_programs/execution_success/strings/src/main.nr
index cff229d368a..d28a9f483ac 100644
--- a/test_programs/execution_success/strings/src/main.nr
+++ b/test_programs/execution_success/strings/src/main.nr
@@ -1,4 +1,3 @@
-use dep::std;
 // Test global string literals
 global HELLO_WORLD = "hello world";
 
diff --git a/test_programs/execution_success/to_bits/src/main.nr b/test_programs/execution_success/to_bits/src/main.nr
index 18f65f0bd66..84ace83903a 100644
--- a/test_programs/execution_success/to_bits/src/main.nr
+++ b/test_programs/execution_success/to_bits/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     let field = 1000;
     let be_bits = field.to_be_bits(16);
diff --git a/test_programs/execution_success/to_bytes_integration/src/main.nr b/test_programs/execution_success/to_bytes_integration/src/main.nr
index 3c43caf1806..21c4ad90bfe 100644
--- a/test_programs/execution_success/to_bytes_integration/src/main.nr
+++ b/test_programs/execution_success/to_bytes_integration/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(x: Field, a: Field) {
     let y: Field = 2040124;
     let be_byte_array = y.to_be_bytes(31);
diff --git a/test_programs/execution_success/trait_method_mut_self/src/main.nr b/test_programs/execution_success/trait_method_mut_self/src/main.nr
index fa47fd5d881..9cc8375b140 100644
--- a/test_programs/execution_success/trait_method_mut_self/src/main.nr
+++ b/test_programs/execution_success/trait_method_mut_self/src/main.nr
@@ -1,5 +1,5 @@
-use dep::std::hash::Hasher;
-use dep::std::hash::poseidon2::Poseidon2Hasher;
+use std::hash::Hasher;
+use std::hash::poseidon2::Poseidon2Hasher;
 
 fn main(x: Field, y: pub Field) {
     let mut a_mut_ref = AType { x };
diff --git a/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr b/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr
index 62dd5a2c111..e36a263093a 100644
--- a/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr
+++ b/test_programs/execution_success/traits_in_crates_1/crate1/src/lib.nr
@@ -2,7 +2,7 @@ trait MyTrait {
     fn Add10(&mut self);
 }
 
-impl MyTrait for dep::crate2::MyStruct {
+impl MyTrait for crate2::MyStruct {
     fn Add10(&mut self) {
         self.Q += 10;
     }
diff --git a/test_programs/execution_success/traits_in_crates_1/src/main.nr b/test_programs/execution_success/traits_in_crates_1/src/main.nr
index 7ba2f63c5c0..2afec29ee1f 100644
--- a/test_programs/execution_success/traits_in_crates_1/src/main.nr
+++ b/test_programs/execution_success/traits_in_crates_1/src/main.nr
@@ -1,5 +1,5 @@
 fn main(x: Field, y: pub Field) {
-    let mut V = dep::crate2::MyStruct { Q: x };
+    let mut V = crate2::MyStruct { Q: x };
     V.Add10();
     assert(V.Q == y);
 }
diff --git a/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr b/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr
index 38870489131..fe6a94a4a95 100644
--- a/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr
+++ b/test_programs/execution_success/traits_in_crates_2/crate2/src/lib.nr
@@ -2,7 +2,7 @@ struct MyStruct {
     Q: Field,
 }
 
-impl dep::crate1::MyTrait for MyStruct {
+impl crate1::MyTrait for MyStruct {
     fn Add10(&mut self) {
         self.Q += 10;
     }
diff --git a/test_programs/execution_success/traits_in_crates_2/src/main.nr b/test_programs/execution_success/traits_in_crates_2/src/main.nr
index 7ba2f63c5c0..2afec29ee1f 100644
--- a/test_programs/execution_success/traits_in_crates_2/src/main.nr
+++ b/test_programs/execution_success/traits_in_crates_2/src/main.nr
@@ -1,5 +1,5 @@
 fn main(x: Field, y: pub Field) {
-    let mut V = dep::crate2::MyStruct { Q: x };
+    let mut V = crate2::MyStruct { Q: x };
     V.Add10();
     assert(V.Q == y);
 }
diff --git a/test_programs/execution_success/turbofish_call_func_diff_types/src/main.nr b/test_programs/execution_success/turbofish_call_func_diff_types/src/main.nr
index b880d3ae047..36c7d2926c1 100644
--- a/test_programs/execution_success/turbofish_call_func_diff_types/src/main.nr
+++ b/test_programs/execution_success/turbofish_call_func_diff_types/src/main.nr
@@ -1,6 +1,6 @@
-use dep::std::hash::Hasher;
-use dep::std::hash::poseidon2::Poseidon2Hasher;
-use dep::std::hash::poseidon::PoseidonHasher;
+use std::hash::Hasher;
+use std::hash::poseidon2::Poseidon2Hasher;
+use std::hash::poseidon::PoseidonHasher;
 
 fn main(x: Field, y: pub Field) {
     let mut hasher = PoseidonHasher::default();
diff --git a/test_programs/execution_success/u128/src/main.nr b/test_programs/execution_success/u128/src/main.nr
index a403571ea74..d0835ccf30f 100644
--- a/test_programs/execution_success/u128/src/main.nr
+++ b/test_programs/execution_success/u128/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(mut x: u32, y: u32, z: u32, big_int: U128, hexa: str<7>) {
     let a = U128::from_u64s_le(x as u64, x as u64);
     let b = U128::from_u64s_le(y as u64, x as u64);
diff --git a/test_programs/execution_success/unit_value/src/main.nr b/test_programs/execution_success/unit_value/src/main.nr
index f3844e03cf2..a488f267b4c 100644
--- a/test_programs/execution_success/unit_value/src/main.nr
+++ b/test_programs/execution_success/unit_value/src/main.nr
@@ -1,5 +1,5 @@
 fn get_transaction() {
-    dep::std::unsafe::zeroed()
+    std::unsafe::zeroed()
 }
 
 fn main() {
diff --git a/test_programs/execution_success/wildcard_type/Nargo.toml b/test_programs/execution_success/wildcard_type/Nargo.toml
new file mode 100644
index 00000000000..e3d7fc636af
--- /dev/null
+++ b/test_programs/execution_success/wildcard_type/Nargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "wildcard_type"
+type = "bin"
+authors = [""]
+
+[dependencies]
diff --git a/test_programs/execution_success/wildcard_type/Prover.toml b/test_programs/execution_success/wildcard_type/Prover.toml
new file mode 100644
index 00000000000..c7c8371dfa4
--- /dev/null
+++ b/test_programs/execution_success/wildcard_type/Prover.toml
@@ -0,0 +1 @@
+enable = [4,7]
diff --git a/test_programs/execution_success/wildcard_type/src/main.nr b/test_programs/execution_success/wildcard_type/src/main.nr
new file mode 100644
index 00000000000..c27f9987c48
--- /dev/null
+++ b/test_programs/execution_success/wildcard_type/src/main.nr
@@ -0,0 +1,23 @@
+struct bar {
+    enable: [bool; 4],
+    data: [Field; 2],
+    pad: u32,
+}
+
+fn main(enable: [Field; 2]) -> pub [Field; 4] {
+    let mut result = [0; 4];
+    let a: [_; 4] = foo(enable[1]);
+    for i in 0..4 {
+        result[i] = a[i].data[i % 2];
+    }
+    result
+}
+
+fn foo(x: Field) -> [bar; 4] {
+    [
+        bar { enable: [true, true, false, false], data: [x, x + 1], pad: 0 },
+        bar { enable: [true, false, false, false], data: [x + 2, x + 7], pad: 0 },
+        bar { enable: [true, true, false, true], data: [x + 3, x + 5], pad: 0 },
+        bar { enable: [false, false, false, false], data: [x + 4, x - 1], pad: 0 }
+    ]
+}
diff --git a/test_programs/execution_success/wrapping_operations/src/main.nr b/test_programs/execution_success/wrapping_operations/src/main.nr
index 85fd65b193c..d8345884c82 100644
--- a/test_programs/execution_success/wrapping_operations/src/main.nr
+++ b/test_programs/execution_success/wrapping_operations/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(x: u8, y: u8) {
     assert(std::wrapping_sub(x, 1) == y);
     assert(std::wrapping_add(y, 1) == x);
diff --git a/test_programs/format.sh b/test_programs/format.sh
index 3c679b8689e..fa63d228752 100755
--- a/test_programs/format.sh
+++ b/test_programs/format.sh
@@ -2,7 +2,7 @@
 set -e
 
 # These tests are incompatible with gas reporting
-excluded_dirs=("workspace" "workspace_default_member" "workspace_reexport_bug")
+excluded_dirs=("workspace" "overlapping_dep_and_mod" "overlapping_dep_and_mod_fix" "workspace_default_member" "workspace_reexport_bug")
 
 # These tests cause failures in CI with a stack overflow for some reason.
 ci_excluded_dirs=("eddsa")
diff --git a/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr b/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr
index 253e999ce07..62e03c153ed 100644
--- a/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr
+++ b/test_programs/noir_test_failure/should_fail_mismatch/src/main.nr
@@ -2,14 +2,9 @@
 fn test_different_string() {
     assert_eq(0, 1, "Different string");
 }
-// The assert message has a space
-#[test(should_fail_with = "Not equal")]
-fn test_with_extra_space() {
-    assert_eq(0, 1, "Not equal ");
-}
-// The assert message has a space
-#[test(should_fail_with = "Not equal")]
-fn test_runtime_mismatch() {
-    // We use a pedersen commitment here so that the assertion failure is only known at runtime.
-    assert_eq(dep::std::hash::pedersen_commitment([27]).x, 0, "Not equal ");
-}
+
+// The failure reason is a substring of the expected message, but it should be the other way around
+#[test(should_fail_with = "Definitely Not equal!")]
+fn test_wrong_expectation() {
+    assert_eq(0, 1, "Not equal");
+}
\ No newline at end of file
diff --git a/test_programs/noir_test_success/brillig_overflow_checks/src/main.nr b/test_programs/noir_test_success/brillig_overflow_checks/src/main.nr
index 5d73ef96d49..35a0c44218f 100644
--- a/test_programs/noir_test_success/brillig_overflow_checks/src/main.nr
+++ b/test_programs/noir_test_success/brillig_overflow_checks/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::field::bn254::{TWO_POW_128, assert_gt};
+use std::field::bn254::{TWO_POW_128, assert_gt};
 
 #[test(should_fail_with = "attempt to add with overflow")]
 unconstrained fn test_overflow_add() {
diff --git a/test_programs/noir_test_success/comptime_globals/src/main.nr b/test_programs/noir_test_success/comptime_globals/src/main.nr
index efe9f0742b9..95c54b96609 100644
--- a/test_programs/noir_test_success/comptime_globals/src/main.nr
+++ b/test_programs/noir_test_success/comptime_globals/src/main.nr
@@ -5,7 +5,7 @@ comptime global FOO: Field = foo();
 // Due to this function's mutability and branching, SSA currently fails
 // to fold this function into a constant before the assert_constant check
 // is evaluated before loop unrolling.
-fn foo() -> Field {
+comptime fn foo() -> Field {
     let mut three = 3;
     if three == 3 { 5 } else { 6 }
 }
diff --git a/test_programs/noir_test_success/embedded_curve_ops/src/main.nr b/test_programs/noir_test_success/embedded_curve_ops/src/main.nr
index 9e3c5d87874..225e86397fd 100644
--- a/test_programs/noir_test_success/embedded_curve_ops/src/main.nr
+++ b/test_programs/noir_test_success/embedded_curve_ops/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::embedded_curve_ops::{EmbeddedCurvePoint, EmbeddedCurveScalar, multi_scalar_mul};
+use std::embedded_curve_ops::{EmbeddedCurvePoint, EmbeddedCurveScalar, multi_scalar_mul};
 
 #[test]
     
diff --git a/test_programs/noir_test_success/field_comparisons/src/main.nr b/test_programs/noir_test_success/field_comparisons/src/main.nr
index 105d82ca755..8613e6d6c4f 100644
--- a/test_programs/noir_test_success/field_comparisons/src/main.nr
+++ b/test_programs/noir_test_success/field_comparisons/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::field::bn254::{TWO_POW_128, assert_gt};
+use std::field::bn254::{TWO_POW_128, assert_gt};
 
 #[test(should_fail)]
 fn test_assert_gt_should_fail_eq() {
diff --git a/test_programs/noir_test_success/fuzzer_checks/Nargo.toml b/test_programs/noir_test_success/fuzzer_checks/Nargo.toml
new file mode 100644
index 00000000000..cd09d0d344d
--- /dev/null
+++ b/test_programs/noir_test_success/fuzzer_checks/Nargo.toml
@@ -0,0 +1,5 @@
+[package]
+name = "fuzzer_checks"
+type = "bin"
+authors = [""]
+[dependencies]
diff --git a/test_programs/noir_test_success/fuzzer_checks/src/main.nr b/test_programs/noir_test_success/fuzzer_checks/src/main.nr
new file mode 100644
index 00000000000..2b928db092e
--- /dev/null
+++ b/test_programs/noir_test_success/fuzzer_checks/src/main.nr
@@ -0,0 +1,6 @@
+
+#[test(should_fail_with = "42 is not allowed")]
+fn finds_magic_value(x: u32) {
+    let x = x as u64;
+    assert(2 * x != 42, "42 is not allowed");
+}
diff --git a/test_programs/noir_test_success/mock_oracle/src/main.nr b/test_programs/noir_test_success/mock_oracle/src/main.nr
index d840ffaef66..4d3dd8d030b 100644
--- a/test_programs/noir_test_success/mock_oracle/src/main.nr
+++ b/test_programs/noir_test_success/mock_oracle/src/main.nr
@@ -1,4 +1,4 @@
-use dep::std::test::OracleMock;
+use std::test::OracleMock;
 
 struct Point {
     x: Field,
diff --git a/test_programs/noir_test_success/regression_4561/src/main.nr b/test_programs/noir_test_success/regression_4561/src/main.nr
new file mode 100644
index 00000000000..ad40941ff51
--- /dev/null
+++ b/test_programs/noir_test_success/regression_4561/src/main.nr
@@ -0,0 +1,78 @@
+// Regression test for issue #4561
+use std::test::OracleMock;
+
+type TReturnElem = [Field; 3];
+type TReturn = [TReturnElem; 2];
+
+#[oracle(simple_nested_return)]
+unconstrained fn simple_nested_return_oracle() -> TReturn {}
+
+unconstrained fn simple_nested_return_unconstrained() -> TReturn {
+    simple_nested_return_oracle()
+}
+
+#[test]
+fn test_simple_nested_return() {
+    OracleMock::mock("simple_nested_return").returns([1, 2, 3, 4, 5, 6]);
+    assert_eq(simple_nested_return_unconstrained(), [[1, 2, 3], [4, 5, 6]]);
+}
+
+#[oracle(nested_with_fields_return)]
+unconstrained fn nested_with_fields_return_oracle() -> (Field, TReturn, Field) {}
+
+unconstrained fn nested_with_fields_return_unconstrained() -> (Field, TReturn, Field) {
+    nested_with_fields_return_oracle()
+}
+
+#[test]
+fn test_nested_with_fields_return() {
+    OracleMock::mock("nested_with_fields_return").returns((0, [1, 2, 3, 4, 5, 6], 7));
+    assert_eq(nested_with_fields_return_unconstrained(), (0, [[1, 2, 3], [4, 5, 6]], 7));
+}
+
+#[oracle(two_nested_return)]
+unconstrained fn two_nested_return_oracle() -> (Field, TReturn, Field, TReturn) {}
+
+unconstrained fn two_nested_return_unconstrained() -> (Field, TReturn, Field, TReturn) {
+    two_nested_return_oracle()
+}
+
+#[test]
+fn two_nested_return() {
+    OracleMock::mock("two_nested_return").returns((0, [1, 2, 3, 4, 5, 6], 7, [1, 2, 3, 4, 5, 6]));
+    assert_eq(two_nested_return_unconstrained(), (0, [[1, 2, 3], [4, 5, 6]], 7, [[1, 2, 3], [4, 5, 6]]));
+}
+
+#[oracle(foo_return)]
+unconstrained fn foo_return() -> (Field, TReturn, TestTypeFoo) {}
+unconstrained fn foo_return_unconstrained() -> (Field, TReturn, TestTypeFoo) {
+    foo_return()
+}
+
+struct TestTypeFoo {
+    a: Field,
+    b: [[[Field; 3]; 4]; 2],
+    c: [TReturnElem; 2],
+    d: TReturnElem,
+}
+
+#[test]
+fn complexe_struct_return() {
+    OracleMock::mock("foo_return").returns(
+        (
+            0, [1, 2, 3, 4, 5, 6], 7, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], [1, 2, 3, 4, 5, 6]
+        )
+    );
+    let foo_x = foo_return_unconstrained();
+    assert_eq((foo_x.0, foo_x.1), (0, [[1, 2, 3], [4, 5, 6]]));
+    assert_eq(foo_x.2.a, 7);
+    assert_eq(
+        foo_x.2.b, [
+        [[1, 2, 3], [4, 5, 6], [7, 8, 9], [10, 11, 12]], [[13, 14, 15], [16, 17, 18], [19, 20, 21], [22, 23, 24]]
+    ]
+    );
+    let a: TReturnElem = [1, 2, 3];
+    let b: TReturnElem = [4, 5, 6];
+    assert_eq(foo_x.2.c, [a, b]);
+    assert_eq(foo_x.2.d, a);
+}
diff --git a/test_programs/noir_test_success/should_fail_with_matches/src/main.nr b/test_programs/noir_test_success/should_fail_with_matches/src/main.nr
index 1f5c29e58a2..42696762ffe 100644
--- a/test_programs/noir_test_success/should_fail_with_matches/src/main.nr
+++ b/test_programs/noir_test_success/should_fail_with_matches/src/main.nr
@@ -3,6 +3,11 @@ fn test_should_fail_with_match() {
     assert_eq(0, 1, "Not equal");
 }
 
+#[test(should_fail_with = "Not equal")]
+fn test_should_fail_with_match_partial_match() {
+    assert_eq(0, 1, "Definitely Not equal!");
+}
+
 #[test(should_fail)]
 fn test_should_fail_without_match() {
     assert_eq(0, 1);
@@ -10,21 +15,21 @@ fn test_should_fail_without_match() {
 
 #[test(should_fail_with = "Not equal")]
 fn test_should_fail_with_runtime_match() {
-    assert_eq(dep::std::hash::pedersen_commitment([27]).x, 0, "Not equal");
+    assert_eq(std::hash::pedersen_commitment([27]).x, 0, "Not equal");
 }
 
 #[test(should_fail)]
 fn test_should_fail_without_runtime_match() {
-    assert_eq(dep::std::hash::pedersen_commitment([27]).x, 0);
+    assert_eq(std::hash::pedersen_commitment([27]).x, 0);
 }
 
 struct InvalidPointError {
-    point: dep::std::embedded_curve_ops::EmbeddedCurvePoint,
+    point: std::embedded_curve_ops::EmbeddedCurvePoint,
 }
 
 #[test(should_fail_with = "InvalidPointError { point: EmbeddedCurvePoint { x: 0x1cea3a116d01eb94d568ef04c3dfbc39f96f015ed801ab8958e360d406503ce0, y: 0x2721b237df87234acc36a238b8f231a3d31d18fe3845fff4cc59f0bd873818f8, is_infinite: false } }")]
 fn test_should_fail_with_struct() {
-    let hash = dep::std::hash::pedersen_commitment([27]);
+    let hash = std::hash::pedersen_commitment([27]);
     assert_eq(hash.x, 0, InvalidPointError { point: hash });
 }
 
@@ -37,7 +42,7 @@ fn test_should_fail_with_basic_type_fmt_string() {
 
 #[test(should_fail_with = "Invalid hash: EmbeddedCurvePoint { x: 0x1cea3a116d01eb94d568ef04c3dfbc39f96f015ed801ab8958e360d406503ce0, y: 0x2721b237df87234acc36a238b8f231a3d31d18fe3845fff4cc59f0bd873818f8, is_infinite: false }")]
 fn test_should_fail_with_struct_fmt_string() {
-    let hash = dep::std::hash::pedersen_commitment([27]);
+    let hash = std::hash::pedersen_commitment([27]);
     assert_eq(hash.x, 0, f"Invalid hash: {hash}");
 }
 
@@ -48,6 +53,11 @@ unconstrained fn unconstrained_test_should_fail_with_match() {
     assert_eq(0, 1, "Not equal");
 }
 
+#[test(should_fail_with = "Not equal")]
+unconstrained fn unconstrained_test_should_fail_with_match_partial_match() {
+    assert_eq(0, 1, "Definitely Not equal!");
+}
+
 #[test(should_fail)]
 unconstrained fn unconstrained_test_should_fail_without_match() {
     assert_eq(0, 1);
@@ -55,17 +65,17 @@ unconstrained fn unconstrained_test_should_fail_without_match() {
 
 #[test(should_fail_with = "Not equal")]
 unconstrained fn unconstrained_test_should_fail_with_runtime_match() {
-    assert_eq(dep::std::hash::pedersen_commitment([27]).x, 0, "Not equal");
+    assert_eq(std::hash::pedersen_commitment([27]).x, 0, "Not equal");
 }
 
 #[test(should_fail)]
 unconstrained fn unconstrained_test_should_fail_without_runtime_match() {
-    assert_eq(dep::std::hash::pedersen_commitment([27]).x, 0);
+    assert_eq(std::hash::pedersen_commitment([27]).x, 0);
 }
 
 #[test(should_fail_with = "InvalidPointError { point: EmbeddedCurvePoint { x: 0x1cea3a116d01eb94d568ef04c3dfbc39f96f015ed801ab8958e360d406503ce0, y: 0x2721b237df87234acc36a238b8f231a3d31d18fe3845fff4cc59f0bd873818f8, is_infinite: false } }")]
 unconstrained fn unconstrained_test_should_fail_with_struct() {
-    let hash = dep::std::hash::pedersen_commitment([27]);
+    let hash = std::hash::pedersen_commitment([27]);
     assert_eq(hash.x, 0, InvalidPointError { point: hash });
 }
 
@@ -78,6 +88,6 @@ unconstrained fn unconstrained_test_should_fail_with_basic_type_fmt_string() {
 
 #[test(should_fail_with = "Invalid hash: EmbeddedCurvePoint { x: 0x1cea3a116d01eb94d568ef04c3dfbc39f96f015ed801ab8958e360d406503ce0, y: 0x2721b237df87234acc36a238b8f231a3d31d18fe3845fff4cc59f0bd873818f8, is_infinite: false }")]
 unconstrained fn unconstrained_test_should_fail_with_struct_fmt_string() {
-    let hash = dep::std::hash::pedersen_commitment([27]);
+    let hash = std::hash::pedersen_commitment([27]);
     assert_eq(hash.x, 0, f"Invalid hash: {hash}");
 }
diff --git a/test_programs/rebuild.sh b/test_programs/rebuild.sh
index 2d4147cb08c..094c3902583 100755
--- a/test_programs/rebuild.sh
+++ b/test_programs/rebuild.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-NO_PARALLEL=${1:-}
-
 process_dir() {
     local dir=$1
     local current_dir=$2
@@ -62,28 +60,7 @@ for dir in $current_dir/benchmarks/*; do
     dirs_to_process+=("$dir")
 done
 
-# Process each directory in parallel
-pids=()
-if [ -z $NO_PARALLEL ]; then
-for dir in "${dirs_to_process[@]}"; do
-    process_dir "$dir" "$current_dir" &
-    pids+=($!)
-done
-else
-for dir in "${dirs_to_process[@]}"; do
-    process_dir "$dir" "$current_dir"
-    pids+=($!)
-done
-fi
 
-# Check the exit status of each background job.
-for pid in "${pids[@]}"; do
-    wait $pid || exit_status=$?
-done
+parallel -j0  process_dir {} "$current_dir" ::: ${dirs_to_process[@]}
 
-# Exit with a failure status if any job failed.
-if [ ! -z "$exit_status" ]; then
-    echo "Rebuild failed!"
-    exit $exit_status
-fi
 echo "Rebuild Succeeded!"
diff --git a/test_programs/test_libraries/diamond_deps_1/src/lib.nr b/test_programs/test_libraries/diamond_deps_1/src/lib.nr
index 60c001ec64e..d76ce5a05e9 100644
--- a/test_programs/test_libraries/diamond_deps_1/src/lib.nr
+++ b/test_programs/test_libraries/diamond_deps_1/src/lib.nr
@@ -1,4 +1,4 @@
-use dep::dep2::call_dep2;
+use dep2::call_dep2;
 
 pub fn call_dep1_then_dep2(x: Field, y: Field) -> Field {
     call_dep2(x, y)
diff --git a/test_programs/test_libraries/exporting_lib/src/lib.nr b/test_programs/test_libraries/exporting_lib/src/lib.nr
index bfb1819132a..fdd9f139d41 100644
--- a/test_programs/test_libraries/exporting_lib/src/lib.nr
+++ b/test_programs/test_libraries/exporting_lib/src/lib.nr
@@ -4,6 +4,6 @@ struct MyStruct {
 
 type FooStruct = MyStruct;
 
-fn is_struct_zero(val: MyStruct) -> bool {
+pub fn is_struct_zero(val: MyStruct) -> bool {
     val.inner == 0
 }
diff --git a/test_programs/test_libraries/reexporting_lib/src/lib.nr b/test_programs/test_libraries/reexporting_lib/src/lib.nr
index f12dfe01ecd..1bced548304 100644
--- a/test_programs/test_libraries/reexporting_lib/src/lib.nr
+++ b/test_programs/test_libraries/reexporting_lib/src/lib.nr
@@ -1,3 +1,3 @@
-use dep::exporting_lib::{MyStruct, FooStruct};
+use exporting_lib::{MyStruct, FooStruct};
 
-use dep::exporting_lib as lib;
+use exporting_lib as lib;
diff --git a/tooling/debugger/Cargo.toml b/tooling/debugger/Cargo.toml
index a3bf12f5368..05b28f9d95a 100644
--- a/tooling/debugger/Cargo.toml
+++ b/tooling/debugger/Cargo.toml
@@ -18,6 +18,7 @@ noirc_frontend.workspace = true
 noirc_printable_type.workspace = true
 noirc_errors.workspace = true
 noirc_driver.workspace = true
+noirc_artifacts.workspace = true
 thiserror.workspace = true
 codespan-reporting.workspace = true
 dap.workspace = true
diff --git a/tooling/debugger/src/context.rs b/tooling/debugger/src/context.rs
index 4436ce0ec3d..cb36988bf0b 100644
--- a/tooling/debugger/src/context.rs
+++ b/tooling/debugger/src/context.rs
@@ -10,9 +10,9 @@ use acvm::{BlackBoxFunctionSolver, FieldElement};
 
 use codespan_reporting::files::{Files, SimpleFile};
 use fm::FileId;
-use nargo::artifacts::debug::{DebugArtifact, StackFrame};
 use nargo::errors::{ExecutionError, Location};
 use nargo::NargoError;
+use noirc_artifacts::debug::{DebugArtifact, StackFrame};
 use noirc_driver::DebugFile;
 
 use std::collections::BTreeMap;
diff --git a/tooling/debugger/src/dap.rs b/tooling/debugger/src/dap.rs
index 40b77f0ad2a..77abf3093cd 100644
--- a/tooling/debugger/src/dap.rs
+++ b/tooling/debugger/src/dap.rs
@@ -24,7 +24,7 @@ use dap::types::{
     Breakpoint, DisassembledInstruction, Scope, Source, StackFrame, SteppingGranularity,
     StoppedEventReason, Thread, Variable,
 };
-use nargo::artifacts::debug::DebugArtifact;
+use noirc_artifacts::debug::DebugArtifact;
 
 use fm::FileId;
 use noirc_driver::CompiledProgram;
diff --git a/tooling/debugger/src/foreign_calls.rs b/tooling/debugger/src/foreign_calls.rs
index 03b1a35dfa5..62443d4065c 100644
--- a/tooling/debugger/src/foreign_calls.rs
+++ b/tooling/debugger/src/foreign_calls.rs
@@ -3,10 +3,8 @@ use acvm::{
     pwg::ForeignCallWaitInfo,
     AcirField, FieldElement,
 };
-use nargo::{
-    artifacts::debug::{DebugArtifact, DebugVars, StackFrame},
-    ops::{DefaultForeignCallExecutor, ForeignCallExecutor},
-};
+use nargo::ops::{DefaultForeignCallExecutor, ForeignCallExecutor};
+use noirc_artifacts::debug::{DebugArtifact, DebugVars, StackFrame};
 use noirc_errors::debug_info::{DebugFnId, DebugVarId};
 use noirc_printable_type::ForeignCallError;
 
diff --git a/tooling/debugger/src/lib.rs b/tooling/debugger/src/lib.rs
index 9168a6228f0..9d0059ee495 100644
--- a/tooling/debugger/src/lib.rs
+++ b/tooling/debugger/src/lib.rs
@@ -13,7 +13,7 @@ use acvm::acir::circuit::brillig::BrilligBytecode;
 use acvm::{acir::circuit::Circuit, acir::native_types::WitnessMap};
 use acvm::{BlackBoxFunctionSolver, FieldElement};
 
-use nargo::artifacts::debug::DebugArtifact;
+use noirc_artifacts::debug::DebugArtifact;
 
 use nargo::NargoError;
 use noirc_driver::CompiledProgram;
diff --git a/tooling/debugger/src/repl.rs b/tooling/debugger/src/repl.rs
index 07f9333d51c..7d8c6e0947d 100644
--- a/tooling/debugger/src/repl.rs
+++ b/tooling/debugger/src/repl.rs
@@ -5,9 +5,10 @@ use acvm::acir::circuit::{Circuit, Opcode, OpcodeLocation};
 use acvm::acir::native_types::{Witness, WitnessMap};
 use acvm::brillig_vm::brillig::Opcode as BrilligOpcode;
 use acvm::{BlackBoxFunctionSolver, FieldElement};
+use nargo::NargoError;
 
 use crate::foreign_calls::DefaultDebugForeignCallExecutor;
-use nargo::{artifacts::debug::DebugArtifact, NargoError};
+use noirc_artifacts::debug::DebugArtifact;
 
 use easy_repl::{command, CommandStatus, Repl};
 use noirc_printable_type::PrintableValueDisplay;
diff --git a/tooling/debugger/src/source_code_printer.rs b/tooling/debugger/src/source_code_printer.rs
index e298eb8aadd..e9586b786bd 100644
--- a/tooling/debugger/src/source_code_printer.rs
+++ b/tooling/debugger/src/source_code_printer.rs
@@ -1,5 +1,5 @@
 use codespan_reporting::files::Files;
-use nargo::artifacts::debug::DebugArtifact;
+use noirc_artifacts::debug::DebugArtifact;
 use noirc_errors::Location;
 use owo_colors::OwoColorize;
 use std::ops::Range;
@@ -143,7 +143,7 @@ fn render_line(
 //
 // Consider for example the file (line numbers added to facilitate this doc):
 // ```
-// 1 use dep::std::hash::poseidon;
+// 1 use std::hash::poseidon;
 // 2
 // 3 fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field) {
 // 4    let hash1 = poseidon::bn254::hash_2(x1);
@@ -157,7 +157,7 @@ fn render_line(
 //
 // If the location to render is `poseidon::bn254::hash_2(x1)`, we'll render the file as:
 // ```
-// 1   use dep::std::hash::poseidon;
+// 1   use std::hash::poseidon;
 // 2
 // 3   fn main(x1: [Field; 2], y1: pub Field, x2: [Field; 4], y2: pub Field) {
 // 4      let hash1 = <b>poseidon::bn254::hash_2(x1)</b>;
@@ -224,7 +224,7 @@ mod tests {
     use crate::source_code_printer::PrintedLine::Content;
     use acvm::acir::circuit::OpcodeLocation;
     use fm::FileManager;
-    use nargo::artifacts::debug::DebugArtifact;
+    use noirc_artifacts::debug::DebugArtifact;
     use noirc_errors::{debug_info::DebugInfo, Location, Span};
     use std::collections::BTreeMap;
     use std::ops::Range;
diff --git a/tooling/fuzzer/Cargo.toml b/tooling/fuzzer/Cargo.toml
new file mode 100644
index 00000000000..ef49d707d6a
--- /dev/null
+++ b/tooling/fuzzer/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "noir_fuzzer"
+description = "A fuzzer for Noir programs"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+acvm.workspace = true
+nargo.workspace = true
+noirc_artifacts.workspace = true
+noirc_abi.workspace = true
+proptest.workspace = true
+rand.workspace = true
diff --git a/tooling/fuzzer/src/dictionary/mod.rs b/tooling/fuzzer/src/dictionary/mod.rs
new file mode 100644
index 00000000000..bf2ab87be29
--- /dev/null
+++ b/tooling/fuzzer/src/dictionary/mod.rs
@@ -0,0 +1,124 @@
+//! This module defines how to build a dictionary of values which are likely to be correspond
+//! to significant inputs during fuzzing by inspecting the [Program] being fuzzed.
+//!
+//! This dictionary can be fed into the fuzzer's [strategy][proptest::strategy::Strategy] in order to bias it towards
+//! generating these values to ensure they get proper coverage.
+use std::collections::HashSet;
+
+use acvm::{
+    acir::{
+        circuit::{
+            brillig::{BrilligBytecode, BrilligInputs},
+            directives::Directive,
+            opcodes::{BlackBoxFuncCall, FunctionInput},
+            Circuit, Opcode, Program,
+        },
+        native_types::Expression,
+    },
+    brillig_vm::brillig::Opcode as BrilligOpcode,
+    AcirField,
+};
+
+/// Constructs a [HashSet<F>] of values pulled from a [Program<F>] which are likely to be correspond
+/// to significant inputs during fuzzing.
+pub(super) fn build_dictionary_from_program<F: AcirField>(program: &Program<F>) -> HashSet<F> {
+    let constrained_dictionaries = program.functions.iter().map(build_dictionary_from_circuit);
+    let unconstrained_dictionaries =
+        program.unconstrained_functions.iter().map(build_dictionary_from_unconstrained_function);
+    let dictionaries = constrained_dictionaries.chain(unconstrained_dictionaries);
+
+    let mut constants: HashSet<F> = HashSet::new();
+    for dictionary in dictionaries {
+        constants.extend(dictionary);
+    }
+    constants
+}
+
+fn build_dictionary_from_circuit<F: AcirField>(circuit: &Circuit<F>) -> HashSet<F> {
+    let mut constants: HashSet<F> = HashSet::new();
+
+    fn insert_expr<F: AcirField>(dictionary: &mut HashSet<F>, expr: &Expression<F>) {
+        let quad_coefficients = expr.mul_terms.iter().map(|(k, _, _)| *k);
+        let linear_coefficients = expr.linear_combinations.iter().map(|(k, _)| *k);
+        let coefficients = linear_coefficients.chain(quad_coefficients);
+
+        dictionary.extend(coefficients.clone());
+        dictionary.insert(expr.q_c);
+
+        // We divide the constant term by any coefficients in the expression to aid solving constraints such as `2 * x - 4 == 0`.
+        let scaled_constants = coefficients.map(|coefficient| expr.q_c / coefficient);
+        dictionary.extend(scaled_constants);
+    }
+
+    fn insert_array_len<F: AcirField, T>(dictionary: &mut HashSet<F>, array: &[T]) {
+        let array_length = array.len() as u128;
+        dictionary.insert(F::from(array_length));
+        dictionary.insert(F::from(array_length - 1));
+    }
+
+    for opcode in &circuit.opcodes {
+        match opcode {
+            Opcode::AssertZero(expr)
+            | Opcode::Call { predicate: Some(expr), .. }
+            | Opcode::MemoryOp { predicate: Some(expr), .. }
+            | Opcode::Directive(Directive::ToLeRadix { a: expr, .. }) => {
+                insert_expr(&mut constants, expr)
+            }
+
+            Opcode::MemoryInit { init, .. } => insert_array_len(&mut constants, init),
+
+            Opcode::BrilligCall { inputs, predicate, .. } => {
+                for input in inputs {
+                    match input {
+                        BrilligInputs::Single(expr) => insert_expr(&mut constants, expr),
+                        BrilligInputs::Array(exprs) => {
+                            exprs.iter().for_each(|expr| insert_expr(&mut constants, expr));
+                            insert_array_len(&mut constants, exprs);
+                        }
+                        BrilligInputs::MemoryArray(_) => (),
+                    }
+                }
+                if let Some(predicate) = predicate {
+                    insert_expr(&mut constants, predicate)
+                }
+            }
+
+            Opcode::BlackBoxFuncCall(BlackBoxFuncCall::RANGE {
+                input: FunctionInput { num_bits, .. },
+            }) => {
+                let field = 1u128.wrapping_shl(*num_bits);
+                constants.insert(F::from(field));
+                constants.insert(F::from(field - 1));
+            }
+            _ => (),
+        }
+    }
+
+    constants
+}
+
+fn build_dictionary_from_unconstrained_function<F: AcirField>(
+    function: &BrilligBytecode<F>,
+) -> HashSet<F> {
+    let mut constants: HashSet<F> = HashSet::new();
+
+    for opcode in &function.bytecode {
+        match opcode {
+            BrilligOpcode::Cast { bit_size, .. } => {
+                let field = 1u128.wrapping_shl(*bit_size);
+                constants.insert(F::from(field));
+                constants.insert(F::from(field - 1));
+            }
+            BrilligOpcode::Const { bit_size, value, .. } => {
+                constants.insert(*value);
+
+                let field = 1u128.wrapping_shl(*bit_size);
+                constants.insert(F::from(field));
+                constants.insert(F::from(field - 1));
+            }
+            _ => (),
+        }
+    }
+
+    constants
+}
diff --git a/tooling/fuzzer/src/lib.rs b/tooling/fuzzer/src/lib.rs
new file mode 100644
index 00000000000..28d7353f35a
--- /dev/null
+++ b/tooling/fuzzer/src/lib.rs
@@ -0,0 +1,96 @@
+//! This module has been adapted from Foundry's fuzzing implementation for the EVM.
+//! https://github.com/foundry-rs/foundry/blob/6a85dbaa62f1c305f31cab37781232913055ae28/crates/evm/evm/src/executors/fuzz/mod.rs#L40
+//!
+//! Code is used under the MIT license.
+
+use acvm::{blackbox_solver::StubbedBlackBoxSolver, FieldElement};
+use dictionary::build_dictionary_from_program;
+use noirc_abi::InputMap;
+use proptest::test_runner::{TestCaseError, TestError, TestRunner};
+
+mod dictionary;
+mod strategies;
+mod types;
+
+use types::{CaseOutcome, CounterExampleOutcome, FuzzOutcome, FuzzTestResult};
+
+use noirc_artifacts::program::ProgramArtifact;
+
+use nargo::ops::{execute_program, DefaultForeignCallExecutor};
+
+/// An executor for Noir programs which which provides fuzzing support using [`proptest`].
+///
+/// After instantiation, calling `fuzz` will proceed to hammer the program with
+/// inputs, until it finds a counterexample. The provided [`TestRunner`] contains all the
+/// configuration which can be overridden via [environment variables](proptest::test_runner::Config)
+pub struct FuzzedExecutor {
+    /// The program to be fuzzed
+    program: ProgramArtifact,
+
+    /// The fuzzer
+    runner: TestRunner,
+}
+
+impl FuzzedExecutor {
+    /// Instantiates a fuzzed executor given a testrunner
+    pub fn new(program: ProgramArtifact, runner: TestRunner) -> Self {
+        Self { program, runner }
+    }
+
+    /// Fuzzes the provided program.
+    pub fn fuzz(&self) -> FuzzTestResult {
+        let dictionary = build_dictionary_from_program(&self.program.bytecode);
+        let strategy = strategies::arb_input_map(&self.program.abi, dictionary);
+
+        let run_result: Result<(), TestError<InputMap>> =
+            self.runner.clone().run(&strategy, |input_map| {
+                let fuzz_res = self.single_fuzz(input_map)?;
+
+                match fuzz_res {
+                    FuzzOutcome::Case(_) => Ok(()),
+                    FuzzOutcome::CounterExample(CounterExampleOutcome {
+                        exit_reason: status,
+                        ..
+                    }) => Err(TestCaseError::fail(status)),
+                }
+            });
+
+        match run_result {
+            Ok(()) => FuzzTestResult { success: true, reason: None, counterexample: None },
+
+            Err(TestError::Abort(reason)) => FuzzTestResult {
+                success: false,
+                reason: Some(reason.to_string()),
+                counterexample: None,
+            },
+            Err(TestError::Fail(reason, counterexample)) => {
+                let reason = reason.to_string();
+                let reason = if reason.is_empty() { None } else { Some(reason) };
+
+                FuzzTestResult { success: false, reason, counterexample: Some(counterexample) }
+            }
+        }
+    }
+
+    /// Granular and single-step function that runs only one fuzz and returns either a `CaseOutcome`
+    /// or a `CounterExampleOutcome`
+    pub fn single_fuzz(&self, input_map: InputMap) -> Result<FuzzOutcome, TestCaseError> {
+        let initial_witness = self.program.abi.encode(&input_map, None).unwrap();
+        let result = execute_program(
+            &self.program.bytecode,
+            initial_witness,
+            &StubbedBlackBoxSolver,
+            &mut DefaultForeignCallExecutor::<FieldElement>::new(false, None),
+        );
+
+        // TODO: Add handling for `vm.assume` equivalent
+
+        match result {
+            Ok(_) => Ok(FuzzOutcome::Case(CaseOutcome { case: input_map })),
+            Err(err) => Ok(FuzzOutcome::CounterExample(CounterExampleOutcome {
+                exit_reason: err.to_string(),
+                counterexample: input_map,
+            })),
+        }
+    }
+}
diff --git a/tooling/fuzzer/src/strategies/int.rs b/tooling/fuzzer/src/strategies/int.rs
new file mode 100644
index 00000000000..d11cafcfae5
--- /dev/null
+++ b/tooling/fuzzer/src/strategies/int.rs
@@ -0,0 +1,83 @@
+use proptest::{
+    strategy::{NewTree, Strategy},
+    test_runner::TestRunner,
+};
+use rand::Rng;
+
+/// Strategy for signed ints (up to i128).
+/// The strategy combines 2 different strategies, each assigned a specific weight:
+/// 1. Generate purely random value in a range. This will first choose bit size uniformly (up `bits`
+///    param). Then generate a value for this bit size.
+/// 2. Generate a random value around the edges (+/- 3 around min, 0 and max possible value)
+#[derive(Debug)]
+pub struct IntStrategy {
+    /// Bit size of int (e.g. 128)
+    bits: usize,
+    /// The weight for edge cases (+/- 3 around 0 and max possible value)
+    edge_weight: usize,
+    /// The weight for purely random values
+    random_weight: usize,
+}
+
+impl IntStrategy {
+    /// Create a new strategy.
+    /// # Arguments
+    /// * `bits` - Size of int in bits
+    pub fn new(bits: usize) -> Self {
+        Self { bits, edge_weight: 10usize, random_weight: 50usize }
+    }
+
+    fn generate_edge_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+        let rng = runner.rng();
+
+        let offset = rng.gen_range(0..4);
+        // Choose if we want values around min, -0, +0, or max
+        let kind = rng.gen_range(0..4);
+        let start = match kind {
+            0 => self.type_min() + offset,
+            1 => -offset - 1i128,
+            2 => offset,
+            3 => self.type_max() - offset,
+            _ => unreachable!(),
+        };
+        Ok(proptest::num::i128::BinarySearch::new(start))
+    }
+
+    fn generate_random_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+        let rng = runner.rng();
+
+        let start: i128 = rng.gen_range(self.type_min()..=self.type_max());
+        Ok(proptest::num::i128::BinarySearch::new(start))
+    }
+
+    fn type_max(&self) -> i128 {
+        if self.bits < 128 {
+            (1i128 << (self.bits - 1)) - 1
+        } else {
+            i128::MAX
+        }
+    }
+
+    fn type_min(&self) -> i128 {
+        if self.bits < 128 {
+            -(1i128 << (self.bits - 1))
+        } else {
+            i128::MIN
+        }
+    }
+}
+
+impl Strategy for IntStrategy {
+    type Tree = proptest::num::i128::BinarySearch;
+    type Value = i128;
+
+    fn new_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+        let total_weight = self.random_weight + self.edge_weight;
+        let bias = runner.rng().gen_range(0..total_weight);
+        // randomly select one of 2 strategies
+        match bias {
+            x if x < self.edge_weight => self.generate_edge_tree(runner),
+            _ => self.generate_random_tree(runner),
+        }
+    }
+}
diff --git a/tooling/fuzzer/src/strategies/mod.rs b/tooling/fuzzer/src/strategies/mod.rs
new file mode 100644
index 00000000000..46187a28d5b
--- /dev/null
+++ b/tooling/fuzzer/src/strategies/mod.rs
@@ -0,0 +1,99 @@
+use int::IntStrategy;
+use prop::collection::vec;
+use proptest::prelude::*;
+
+use acvm::{AcirField, FieldElement};
+
+use noirc_abi::{input_parser::InputValue, Abi, AbiType, InputMap, Sign};
+use std::collections::{BTreeMap, HashSet};
+use uint::UintStrategy;
+
+mod int;
+mod uint;
+
+pub(super) fn arb_value_from_abi_type(
+    abi_type: &AbiType,
+    dictionary: HashSet<FieldElement>,
+) -> SBoxedStrategy<InputValue> {
+    match abi_type {
+        AbiType::Field => vec(any::<u8>(), 32)
+            .prop_map(|bytes| InputValue::Field(FieldElement::from_be_bytes_reduce(&bytes)))
+            .sboxed(),
+        AbiType::Integer { width, sign } if sign == &Sign::Unsigned => {
+            UintStrategy::new(*width as usize, dictionary)
+                .prop_map(|uint| InputValue::Field(uint.into()))
+                .sboxed()
+        }
+        AbiType::Integer { width, .. } => {
+            let shift = 2i128.pow(*width);
+            IntStrategy::new(*width as usize)
+                .prop_map(move |mut int| {
+                    if int < 0 {
+                        int += shift
+                    }
+                    InputValue::Field(int.into())
+                })
+                .sboxed()
+        }
+        AbiType::Boolean => {
+            any::<bool>().prop_map(|val| InputValue::Field(FieldElement::from(val))).sboxed()
+        }
+
+        AbiType::String { length } => {
+            // Strings only allow ASCII characters as each character must be able to be represented by a single byte.
+            let string_regex = format!("[[:ascii:]]{{{length}}}");
+            proptest::string::string_regex(&string_regex)
+                .expect("parsing of regex should always succeed")
+                .prop_map(InputValue::String)
+                .sboxed()
+        }
+        AbiType::Array { length, typ } => {
+            let length = *length as usize;
+            let elements = vec(arb_value_from_abi_type(typ, dictionary), length..=length);
+
+            elements.prop_map(InputValue::Vec).sboxed()
+        }
+
+        AbiType::Struct { fields, .. } => {
+            let fields: Vec<SBoxedStrategy<(String, InputValue)>> = fields
+                .iter()
+                .map(|(name, typ)| {
+                    (Just(name.clone()), arb_value_from_abi_type(typ, dictionary.clone())).sboxed()
+                })
+                .collect();
+
+            fields
+                .prop_map(|fields| {
+                    let fields: BTreeMap<_, _> = fields.into_iter().collect();
+                    InputValue::Struct(fields)
+                })
+                .sboxed()
+        }
+
+        AbiType::Tuple { fields } => {
+            let fields: Vec<_> =
+                fields.iter().map(|typ| arb_value_from_abi_type(typ, dictionary.clone())).collect();
+            fields.prop_map(InputValue::Vec).sboxed()
+        }
+    }
+}
+
+pub(super) fn arb_input_map(
+    abi: &Abi,
+    dictionary: HashSet<FieldElement>,
+) -> BoxedStrategy<InputMap> {
+    let values: Vec<_> = abi
+        .parameters
+        .iter()
+        .map(|param| {
+            (Just(param.name.clone()), arb_value_from_abi_type(&param.typ, dictionary.clone()))
+        })
+        .collect();
+
+    values
+        .prop_map(|values| {
+            let input_map: InputMap = values.into_iter().collect();
+            input_map
+        })
+        .boxed()
+}
diff --git a/tooling/fuzzer/src/strategies/uint.rs b/tooling/fuzzer/src/strategies/uint.rs
new file mode 100644
index 00000000000..94610dbc829
--- /dev/null
+++ b/tooling/fuzzer/src/strategies/uint.rs
@@ -0,0 +1,98 @@
+use std::collections::HashSet;
+
+use acvm::{AcirField, FieldElement};
+use proptest::{
+    strategy::{NewTree, Strategy},
+    test_runner::TestRunner,
+};
+use rand::Rng;
+
+/// Value tree for unsigned ints (up to u128).
+/// The strategy combines 2 different strategies, each assigned a specific weight:
+/// 1. Generate purely random value in a range. This will first choose bit size uniformly (up `bits`
+///    param). Then generate a value for this bit size.
+/// 2. Generate a random value around the edges (+/- 3 around 0 and max possible value)
+#[derive(Debug)]
+pub struct UintStrategy {
+    /// Bit size of uint (e.g. 128)
+    bits: usize,
+    /// A set of fixtures to be generated
+    fixtures: Vec<FieldElement>,
+    /// The weight for edge cases (+/- 3 around 0 and max possible value)
+    edge_weight: usize,
+    /// The weight for fixtures
+    fixtures_weight: usize,
+    /// The weight for purely random values
+    random_weight: usize,
+}
+
+impl UintStrategy {
+    /// Create a new strategy.
+    /// # Arguments
+    /// * `bits` - Size of uint in bits
+    /// * `fixtures` - Set of `FieldElements` representing values which the fuzzer weight towards testing.
+    pub fn new(bits: usize, fixtures: HashSet<FieldElement>) -> Self {
+        Self {
+            bits,
+            fixtures: fixtures.into_iter().collect(),
+            edge_weight: 10usize,
+            fixtures_weight: 40usize,
+            random_weight: 50usize,
+        }
+    }
+
+    fn generate_edge_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+        let rng = runner.rng();
+        // Choose if we want values around 0 or max
+        let is_min = rng.gen_bool(0.5);
+        let offset = rng.gen_range(0..4);
+        let start = if is_min { offset } else { self.type_max().saturating_sub(offset) };
+        Ok(proptest::num::u128::BinarySearch::new(start))
+    }
+
+    fn generate_fixtures_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+        // generate random cases if there's no fixtures
+        if self.fixtures.is_empty() {
+            return self.generate_random_tree(runner);
+        }
+
+        // Generate value tree from fixture.
+        let fixture = &self.fixtures[runner.rng().gen_range(0..self.fixtures.len())];
+        if fixture.num_bits() <= self.bits as u32 {
+            return Ok(proptest::num::u128::BinarySearch::new(fixture.to_u128()));
+        }
+
+        // If fixture is not a valid type, generate random value.
+        self.generate_random_tree(runner)
+    }
+
+    fn generate_random_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+        let rng = runner.rng();
+        let start = rng.gen_range(0..=self.type_max());
+
+        Ok(proptest::num::u128::BinarySearch::new(start))
+    }
+
+    fn type_max(&self) -> u128 {
+        if self.bits < 128 {
+            (1 << self.bits) - 1
+        } else {
+            u128::MAX
+        }
+    }
+}
+
+impl Strategy for UintStrategy {
+    type Tree = proptest::num::u128::BinarySearch;
+    type Value = u128;
+    fn new_tree(&self, runner: &mut TestRunner) -> NewTree<Self> {
+        let total_weight = self.random_weight + self.fixtures_weight + self.edge_weight;
+        let bias = runner.rng().gen_range(0..total_weight);
+        // randomly select one of 3 strategies
+        match bias {
+            x if x < self.edge_weight => self.generate_edge_tree(runner),
+            x if x < self.edge_weight + self.fixtures_weight => self.generate_fixtures_tree(runner),
+            _ => self.generate_random_tree(runner),
+        }
+    }
+}
diff --git a/tooling/fuzzer/src/types.rs b/tooling/fuzzer/src/types.rs
new file mode 100644
index 00000000000..dbd4ba94ec1
--- /dev/null
+++ b/tooling/fuzzer/src/types.rs
@@ -0,0 +1,42 @@
+use noirc_abi::InputMap;
+
+type CounterExample = InputMap;
+
+/// The outcome of a fuzz test
+#[derive(Debug)]
+pub struct FuzzTestResult {
+    /// Whether the test case was successful. This means that the program executed
+    /// properly, or that there was a constraint failure and that the test was expected to fail
+    /// (has the `should_fail` attribute)
+    pub success: bool,
+
+    /// If there was a constraint failure, this field will be populated. Note that the test can
+    /// still be successful (i.e self.success == true) when it's expected to fail.
+    pub reason: Option<String>,
+
+    /// Minimal reproduction test case for failing fuzz tests
+    pub counterexample: Option<CounterExample>,
+}
+
+/// Returned by a single fuzz in the case of a successful run
+#[derive(Debug)]
+pub struct CaseOutcome {
+    /// Data of a single fuzz test case
+    pub case: InputMap,
+}
+
+/// Returned by a single fuzz when a counterexample has been discovered
+#[derive(Debug)]
+pub struct CounterExampleOutcome {
+    /// Minimal reproduction test case for failing test
+    pub counterexample: CounterExample,
+    /// The status of the call
+    pub exit_reason: String,
+}
+
+/// Outcome of a single fuzz
+#[derive(Debug)]
+pub enum FuzzOutcome {
+    Case(CaseOutcome),
+    CounterExample(CounterExampleOutcome),
+}
diff --git a/tooling/lsp/Cargo.toml b/tooling/lsp/Cargo.toml
index a599b096e52..ac3e3b1d30a 100644
--- a/tooling/lsp/Cargo.toml
+++ b/tooling/lsp/Cargo.toml
@@ -19,6 +19,7 @@ nargo_toml.workspace = true
 noirc_driver.workspace = true
 noirc_errors.workspace = true
 noirc_frontend.workspace = true
+noirc_artifacts.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 tower.workspace = true
diff --git a/tooling/lsp/src/requests/profile_run.rs b/tooling/lsp/src/requests/profile_run.rs
index 7d06bc87c85..57bc3299455 100644
--- a/tooling/lsp/src/requests/profile_run.rs
+++ b/tooling/lsp/src/requests/profile_run.rs
@@ -5,11 +5,9 @@ use std::{
 
 use acvm::acir::circuit::ExpressionWidth;
 use async_lsp::{ErrorCode, ResponseError};
-use nargo::{
-    artifacts::debug::DebugArtifact, insert_all_files_for_workspace_into_file_manager,
-    ops::report_errors,
-};
+use nargo::{insert_all_files_for_workspace_into_file_manager, ops::report_errors};
 use nargo_toml::{find_package_manifest, resolve_workspace_from_toml, PackageSelection};
+use noirc_artifacts::debug::DebugArtifact;
 use noirc_driver::{
     file_manager_with_stdlib, CompileOptions, DebugFile, NOIR_ARTIFACT_VERSION_STRING,
 };
diff --git a/tooling/lsp/src/solver.rs b/tooling/lsp/src/solver.rs
index 0fcac73b905..9d1185e3a79 100644
--- a/tooling/lsp/src/solver.rs
+++ b/tooling/lsp/src/solver.rs
@@ -24,6 +24,14 @@ impl BlackBoxFunctionSolver<acvm::FieldElement> for WrapperSolver {
         self.0.pedersen_commitment(inputs, domain_separator)
     }
 
+    fn pedersen_hash(
+        &self,
+        inputs: &[acvm::FieldElement],
+        domain_separator: u32,
+    ) -> Result<acvm::FieldElement, acvm::BlackBoxResolutionError> {
+        self.0.pedersen_hash(inputs, domain_separator)
+    }
+
     fn multi_scalar_mul(
         &self,
         points: &[acvm::FieldElement],
@@ -36,14 +44,6 @@ impl BlackBoxFunctionSolver<acvm::FieldElement> for WrapperSolver {
         self.0.multi_scalar_mul(points, scalars_lo, scalars_hi)
     }
 
-    fn pedersen_hash(
-        &self,
-        inputs: &[acvm::FieldElement],
-        domain_separator: u32,
-    ) -> Result<acvm::FieldElement, acvm::BlackBoxResolutionError> {
-        self.0.pedersen_hash(inputs, domain_separator)
-    }
-
     fn ec_add(
         &self,
         input1_x: &acvm::FieldElement,
diff --git a/tooling/nargo/Cargo.toml b/tooling/nargo/Cargo.toml
index 8abec267d20..b0cf1cfcbb1 100644
--- a/tooling/nargo/Cargo.toml
+++ b/tooling/nargo/Cargo.toml
@@ -18,13 +18,12 @@ noirc_errors.workspace = true
 noirc_frontend.workspace = true
 noirc_printable_type.workspace = true
 iter-extended.workspace = true
-serde.workspace = true
 thiserror.workspace = true
-codespan-reporting.workspace = true
 tracing.workspace = true
 rayon = "1.8.0"
 jsonrpc.workspace = true
 rand.workspace = true
+serde.workspace = true
 
 [dev-dependencies]
 # TODO: This dependency is used to generate unit tests for `get_all_paths_in_dir`
diff --git a/tooling/nargo/src/lib.rs b/tooling/nargo/src/lib.rs
index 3deced041f8..c0c7602d14d 100644
--- a/tooling/nargo/src/lib.rs
+++ b/tooling/nargo/src/lib.rs
@@ -7,7 +7,6 @@
 //! This name was used because it sounds like `cargo` and
 //! Noir Package Manager abbreviated is npm, which is already taken.
 
-pub mod artifacts;
 pub mod constants;
 pub mod errors;
 pub mod ops;
diff --git a/tooling/nargo/src/ops/test.rs b/tooling/nargo/src/ops/test.rs
index ace2e9f0d0c..18c6f2530b9 100644
--- a/tooling/nargo/src/ops/test.rs
+++ b/tooling/nargo/src/ops/test.rs
@@ -128,7 +128,7 @@ fn check_expected_failure_message(
     };
 
     let expected_failure_message_matches =
-        matches!(&failed_assertion, Some(message) if message == expected_failure_message);
+        matches!(&failed_assertion, Some(message) if message.contains(expected_failure_message));
     if expected_failure_message_matches {
         return TestStatus::Pass;
     }
diff --git a/tooling/nargo_cli/Cargo.toml b/tooling/nargo_cli/Cargo.toml
index 7c7e7b9d5ca..e0e54449a6f 100644
--- a/tooling/nargo_cli/Cargo.toml
+++ b/tooling/nargo_cli/Cargo.toml
@@ -32,6 +32,8 @@ noirc_driver.workspace = true
 noirc_frontend = { workspace = true, features = ["bn254"] }
 noirc_abi.workspace = true
 noirc_errors.workspace = true
+noir_fuzzer.workspace = true
+noirc_artifacts.workspace = true
 acvm = { workspace = true, features = ["bn254"] }
 bn254_blackbox_solver.workspace = true
 toml.workspace = true
@@ -54,6 +56,7 @@ color-eyre.workspace = true
 tokio = { version = "1.0", features = ["io-std", "rt"] }
 dap.workspace = true
 clap-markdown = { git = "https://github.com/noir-lang/clap-markdown", rev = "450d759532c88f0dba70891ceecdbc9ff8f25d2b", optional = true }
+proptest.workspace = true
 
 notify = "6.1.1"
 notify-debouncer-full = "0.3.1"
diff --git a/tooling/nargo_cli/benches/criterion.rs b/tooling/nargo_cli/benches/criterion.rs
index 9f67bcffd6e..effab7d7c27 100644
--- a/tooling/nargo_cli/benches/criterion.rs
+++ b/tooling/nargo_cli/benches/criterion.rs
@@ -28,16 +28,10 @@ macro_rules! criterion_command {
     };
 }
 criterion_command!(execution, "execute");
-criterion_command!(prove, "prove");
 
 criterion_group! {
     name = execution_benches;
     config = Criterion::default().sample_size(20).measurement_time(Duration::from_secs(20)).with_profiler(PProfProfiler::new(100, Output::Flamegraph(None)));
     targets = criterion_selected_tests_execution
 }
-criterion_group! {
-    name = prove_benches;
-    config = Criterion::default().sample_size(10).measurement_time(Duration::from_secs(20)).with_profiler(PProfProfiler::new(100, Output::Flamegraph(None)));
-    targets = criterion_selected_tests_prove
-}
-criterion_main!(execution_benches, prove_benches);
+criterion_main!(execution_benches);
diff --git a/tooling/nargo_cli/build.rs b/tooling/nargo_cli/build.rs
index fcc09653c7d..f5a05437899 100644
--- a/tooling/nargo_cli/build.rs
+++ b/tooling/nargo_cli/build.rs
@@ -58,376 +58,297 @@ const IGNORED_BRILLIG_TESTS: [&str; 11] = [
     &"is_unconstrained",
 ];
 
-fn generate_execution_success_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "execution_success";
+/// Certain features are only available in the elaborator.
+/// We skip these tests for non-elaborator code since they are not
+/// expected to work there. This can be removed once the old code is removed.
+const IGNORED_NEW_FEATURE_TESTS: [&str; 4] =
+    ["macros", "wildcard_type", "type_definition_annotation", "numeric_generics_explicit"];
+
+fn read_test_cases(
+    test_data_dir: &Path,
+    test_sub_dir: &str,
+) -> impl Iterator<Item = (String, PathBuf)> {
     let test_data_dir = test_data_dir.join(test_sub_dir);
-
     let test_case_dirs =
         fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
 
-    for test_dir in test_case_dirs {
+    test_case_dirs.into_iter().map(|dir| {
         let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+            dir.file_name().into_string().expect("Directory can't be converted to string");
         if test_name.contains('-') {
             panic!(
                 "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
             );
-        };
-        let test_dir = &test_dir.path();
-
-        let brillig_ignored =
-            if IGNORED_BRILLIG_TESTS.contains(&test_name.as_str()) { "\n#[ignore]" } else { "" };
-
-        write!(
-            test_file,
-            r#"
-#[test]
-fn execution_success_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force");
-
-    cmd.assert().success();
-}}
+        }
+        (test_name, dir.path())
+    })
+}
 
+fn generate_test_case(
+    test_file: &mut File,
+    test_type: &str,
+    test_name: &str,
+    test_dir: &std::path::Display,
+    test_content: &str,
+) {
+    write!(
+        test_file,
+        r#"
 #[test]
-fn execution_success_elaborator_{test_name}() {{
+fn {test_type}_{test_name}() {{
     let test_program_dir = PathBuf::from("{test_dir}");
 
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force").arg("--use-elaborator");
-
-    cmd.assert().success();
+    let mut nargo = Command::cargo_bin("nargo").unwrap();
+    nargo.arg("--program-dir").arg(test_program_dir);
+    {test_content}
 }}
+"#
+    )
+    .expect("Could not write templated test file.");
+}
 
-#[test]{brillig_ignored}
-fn execution_success_{test_name}_brillig() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force").arg("--force-brillig");
+fn generate_execution_success_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_type = "execution_success";
+    let test_cases = read_test_cases(test_data_dir, test_type);
+    for (test_name, test_dir) in test_cases {
+        let test_dir = test_dir.display();
 
-    cmd.assert().success();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
+        generate_test_case(
+            test_file,
+            test_type,
+            &test_name,
+            &test_dir,
+            r#"
+                nargo.arg("execute").arg("--force");
+            
+                nargo.assert().success();"#,
+        );
+
+        if !IGNORED_NEW_FEATURE_TESTS.contains(&test_name.as_str()) {
+            generate_test_case(
+                test_file,
+                test_type,
+                &format!("legacy_{test_name}"),
+                &test_dir,
+                r#"
+                nargo.arg("execute").arg("--force").arg("--use-legacy");
+            
+                nargo.assert().success();"#,
+            );
+        }
+
+        if !IGNORED_BRILLIG_TESTS.contains(&test_name.as_str()) {
+            generate_test_case(
+                test_file,
+                test_type,
+                &format!("{test_name}_brillig"),
+                &test_dir,
+                r#"
+                nargo.arg("execute").arg("--force").arg("--force-brillig");
+            
+                nargo.assert().success();"#,
+            );
+        }
     }
 }
 
 fn generate_execution_failure_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "execution_failure";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+    let test_type = "execution_failure";
+    let test_cases = read_test_cases(test_data_dir, test_type);
+    for (test_name, test_dir) in test_cases {
+        let test_dir = test_dir.display();
 
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
+        generate_test_case(
             test_file,
+            test_type,
+            &test_name,
+            &test_dir,
             r#"
-#[test]
-fn execution_failure_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force");
+                nargo.arg("execute").arg("--force");
+            
+                nargo.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());"#,
+        );
 
-    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
-}}
-
-#[test]
-fn execution_failure_elaborator_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("execute").arg("--force").arg("--use-elaborator");
-
-    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
+        generate_test_case(
+            test_file,
+            test_type,
+            &format!("legacy_{test_name}"),
+            &test_dir,
+            r#"
+                nargo.arg("execute").arg("--force").arg("--use-legacy");
+            
+                nargo.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());"#,
+        );
     }
 }
 
 fn generate_noir_test_success_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "noir_test_success";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
+    let test_type = "noir_test_success";
+    let test_cases = read_test_cases(test_data_dir, "noir_test_success");
+    for (test_name, test_dir) in test_cases {
+        let test_dir = test_dir.display();
 
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
+        generate_test_case(
             test_file,
+            test_type,
+            &test_name,
+            &test_dir,
             r#"
-#[test]
-fn noir_test_success_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("test");
-
-    cmd.assert().success();
-}}
-
-#[test]
-fn noir_test_success_elaborator_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("test").arg("--use-elaborator");
+        nargo.arg("test");
+        
+        nargo.assert().success();"#,
+        );
 
-    cmd.assert().success();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
+        generate_test_case(
+            test_file,
+            test_type,
+            &format!("legacy_{test_name}"),
+            &test_dir,
+            r#"
+        nargo.arg("test").arg("--use-legacy");
+        
+        nargo.assert().success();"#,
+        );
     }
 }
 
 fn generate_noir_test_failure_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "noir_test_failure";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
+    let test_type = "noir_test_failure";
+    let test_cases = read_test_cases(test_data_dir, test_type);
+    for (test_name, test_dir) in test_cases {
+        let test_dir = test_dir.display();
+        generate_test_case(
             test_file,
+            test_type,
+            &test_name,
+            &test_dir,
             r#"
-#[test]
-fn noir_test_failure_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("test");
-
-    cmd.assert().failure();
-}}
+        nargo.arg("test");
+        
+        nargo.assert().failure();"#,
+        );
 
-#[test]
-fn noir_test_failure_elaborator_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("test").arg("--use-elaborator");
-
-    cmd.assert().failure();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
+        generate_test_case(
+            test_file,
+            test_type,
+            &format!("legacy_{test_name}"),
+            &test_dir,
+            r#"
+        nargo.arg("test").arg("--use-legacy");
+        
+        nargo.assert().failure();"#,
+        );
     }
 }
 
 fn generate_compile_success_empty_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "compile_success_empty";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
-
-        write!(
+    let test_type = "compile_success_empty";
+    let test_cases = read_test_cases(test_data_dir, test_type);
+    for (test_name, test_dir) in test_cases {
+        let test_dir = test_dir.display();
+
+        let assert_zero_opcodes = r#"
+        let output = nargo.output().expect("Failed to execute command");
+
+        if !output.status.success() {{
+            panic!("`nargo info` failed with: {}", String::from_utf8(output.stderr).unwrap_or_default());
+        }}
+    
+        // `compile_success_empty` tests should be able to compile down to an empty circuit.
+        let json: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|e| {{
+            panic!("JSON was not well-formatted {:?}\n\n{:?}", e, std::str::from_utf8(&output.stdout))
+        }});
+        let num_opcodes = &json["programs"][0]["functions"][0]["acir_opcodes"];
+        assert_eq!(num_opcodes.as_u64().expect("number of opcodes should fit in a u64"), 0);
+        "#;
+
+        generate_test_case(
             test_file,
-            r#"
-#[test]
-fn compile_success_empty_{test_name}() {{
-
-    let test_program_dir = PathBuf::from("{test_dir}");
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("info");
-    cmd.arg("--json");
-    cmd.arg("--force");
-
-    let output = cmd.output().expect("Failed to execute command");
-
-    if !output.status.success() {{
-        panic!("`nargo info` failed with: {{}}", String::from_utf8(output.stderr).unwrap_or_default());
-    }}
-
-    // `compile_success_empty` tests should be able to compile down to an empty circuit.
-    let json: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|e| {{
-        panic!("JSON was not well-formatted {{:?}}\n\n{{:?}}", e, std::str::from_utf8(&output.stdout))
-    }});
-    let num_opcodes = &json["programs"][0]["functions"][0]["acir_opcodes"];
-    assert_eq!(num_opcodes.as_u64().expect("number of opcodes should fit in a u64"), 0);
-}}
-
-#[test]
-fn compile_success_empty_elaborator_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("info");
-    cmd.arg("--json");
-    cmd.arg("--force");
-    cmd.arg("--use-elaborator");
-
-    let output = cmd.output().expect("Failed to execute command");
-
-    if !output.status.success() {{
-        panic!("`nargo info` failed with: {{}}", String::from_utf8(output.stderr).unwrap_or_default());
-    }}
-
-    // `compile_success_empty` tests should be able to compile down to an empty circuit.
-    let json: serde_json::Value = serde_json::from_slice(&output.stdout).unwrap_or_else(|e| {{
-        panic!("JSON was not well-formatted {{:?}}\n\n{{:?}}", e, std::str::from_utf8(&output.stdout))
-    }});
-    let num_opcodes = &json["programs"][0]["functions"][0]["acir_opcodes"];
-    assert_eq!(num_opcodes.as_u64().expect("number of opcodes should fit in a u64"), 0);
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
+            test_type,
+            &test_name,
+            &test_dir,
+            &format!(
+                r#"
+                nargo.arg("info").arg("--json").arg("--force");
+                
+                {assert_zero_opcodes}"#,
+            ),
+        );
+
+        if !IGNORED_NEW_FEATURE_TESTS.contains(&test_name.as_str()) {
+            generate_test_case(
+                test_file,
+                test_type,
+                &format!("legacy_{test_name}"),
+                &test_dir,
+                &format!(
+                    r#"
+                nargo.arg("info").arg("--json").arg("--force").arg("--use-legacy");
+                
+                {assert_zero_opcodes}"#,
+                ),
+            );
+        }
     }
 }
 
 fn generate_compile_success_contract_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "compile_success_contract";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
+    let test_type = "compile_success_contract";
+    let test_cases = read_test_cases(test_data_dir, test_type);
+    for (test_name, test_dir) in test_cases {
+        let test_dir = test_dir.display();
 
-        write!(
+        generate_test_case(
             test_file,
+            test_type,
+            &test_name,
+            &test_dir,
             r#"
-#[test]
-fn compile_success_contract_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("compile").arg("--force");
+        nargo.arg("compile").arg("--force");
+        
+        nargo.assert().success();"#,
+        );
 
-    cmd.assert().success();
-}}
-#[test]
-fn compile_success_contract_elaborator_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("compile").arg("--force").arg("--use-elaborator");
-
-    cmd.assert().success();
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
+        generate_test_case(
+            test_file,
+            test_type,
+            &format!("legacy_{test_name}"),
+            &test_dir,
+            r#"
+        nargo.arg("compile").arg("--force").arg("--use-legacy");
+        
+        nargo.assert().success();"#,
+        );
     }
 }
 
 fn generate_compile_failure_tests(test_file: &mut File, test_data_dir: &Path) {
-    let test_sub_dir = "compile_failure";
-    let test_data_dir = test_data_dir.join(test_sub_dir);
-
-    let test_case_dirs =
-        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
-
-    for test_dir in test_case_dirs {
-        let test_name =
-            test_dir.file_name().into_string().expect("Directory can't be converted to string");
-        if test_name.contains('-') {
-            panic!(
-                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
-            );
-        };
-        let test_dir = &test_dir.path();
+    let test_type = "compile_failure";
+    let test_cases = read_test_cases(test_data_dir, test_type);
+    for (test_name, test_dir) in test_cases {
+        let test_dir = test_dir.display();
 
-        write!(
+        generate_test_case(
             test_file,
-            r#"
-#[test]
-fn compile_failure_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("compile").arg("--force");
-
-    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
-}}
-#[test]
-fn compile_failure_elaborator_{test_name}() {{
-    let test_program_dir = PathBuf::from("{test_dir}");
-
-    let mut cmd = Command::cargo_bin("nargo").unwrap();
-    cmd.arg("--program-dir").arg(test_program_dir);
-    cmd.arg("compile").arg("--force").arg("--use-elaborator");
-
-    cmd.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());
-}}
-            "#,
-            test_dir = test_dir.display(),
-        )
-        .expect("Could not write templated test file.");
+            test_type,
+            &test_name,
+            &test_dir,
+            r#"nargo.arg("compile").arg("--force");
+        
+        nargo.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());"#,
+        );
+
+        if !IGNORED_NEW_FEATURE_TESTS.contains(&test_name.as_str()) {
+            generate_test_case(
+                test_file,
+                test_type,
+                &format!("legacy_{test_name}"),
+                &test_dir,
+                r#"
+            nargo.arg("compile").arg("--force").arg("--use-legacy");
+            
+            nargo.assert().failure().stderr(predicate::str::contains("The application panicked (crashed).").not());"#,
+            );
+        }
     }
 }
diff --git a/tooling/nargo_cli/src/cli/check_cmd.rs b/tooling/nargo_cli/src/cli/check_cmd.rs
index e2e1f147b90..2db3b10429a 100644
--- a/tooling/nargo_cli/src/cli/check_cmd.rs
+++ b/tooling/nargo_cli/src/cli/check_cmd.rs
@@ -87,7 +87,7 @@ fn check_package(
         compile_options.deny_warnings,
         compile_options.disable_macros,
         compile_options.silence_warnings,
-        compile_options.use_elaborator,
+        compile_options.use_legacy,
     )?;
 
     if package.is_library() || package.is_contract() {
@@ -160,9 +160,9 @@ pub(crate) fn check_crate_and_report_errors(
     deny_warnings: bool,
     disable_macros: bool,
     silence_warnings: bool,
-    use_elaborator: bool,
+    use_legacy: bool,
 ) -> Result<(), CompileError> {
-    let result = check_crate(context, crate_id, deny_warnings, disable_macros, use_elaborator);
+    let result = check_crate(context, crate_id, deny_warnings, disable_macros, use_legacy);
     report_errors(result, &context.file_manager, deny_warnings, silence_warnings)
 }
 
diff --git a/tooling/nargo_cli/src/cli/compile_cmd.rs b/tooling/nargo_cli/src/cli/compile_cmd.rs
index bd76cf24805..e83b1728c93 100644
--- a/tooling/nargo_cli/src/cli/compile_cmd.rs
+++ b/tooling/nargo_cli/src/cli/compile_cmd.rs
@@ -3,7 +3,6 @@ use std::path::Path;
 use std::time::Duration;
 
 use fm::FileManager;
-use nargo::artifacts::program::ProgramArtifact;
 use nargo::ops::{collect_errors, compile_contract, compile_program, report_errors};
 use nargo::package::Package;
 use nargo::workspace::Workspace;
@@ -11,7 +10,7 @@ use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_driver::file_manager_with_stdlib;
 use noirc_driver::NOIR_ARTIFACT_VERSION_STRING;
-use noirc_driver::{CompilationResult, CompileOptions, CompiledContract, CompiledProgram};
+use noirc_driver::{CompilationResult, CompileOptions, CompiledContract};
 
 use noirc_frontend::graph::CrateName;
 
@@ -121,39 +120,22 @@ pub(super) fn compile_workspace_full(
     let compiled_workspace =
         compile_workspace(&workspace_file_manager, &parsed_files, workspace, compile_options);
 
-    let (compiled_programs, compiled_contracts) = report_errors(
+    report_errors(
         compiled_workspace,
         &workspace_file_manager,
         compile_options.deny_warnings,
         compile_options.silence_warnings,
     )?;
 
-    let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
-        .into_iter()
-        .filter(|package| !package.is_library())
-        .cloned()
-        .partition(|package| package.is_binary());
-
-    // Save build artifacts to disk.
-    for (package, program) in binary_packages.into_iter().zip(compiled_programs) {
-        let program = nargo::ops::transform_program(program, compile_options.expression_width);
-        save_program(program.clone(), &package, &workspace.target_directory_path());
-    }
-    let circuit_dir = workspace.target_directory_path();
-    for (package, contract) in contract_packages.into_iter().zip(compiled_contracts) {
-        let contract = nargo::ops::transform_contract(contract, compile_options.expression_width);
-        save_contract(contract, &package, &circuit_dir, compile_options.show_artifact_paths);
-    }
-
     Ok(())
 }
 
-pub(super) fn compile_workspace(
+fn compile_workspace(
     file_manager: &FileManager,
     parsed_files: &ParsedFiles,
     workspace: &Workspace,
     compile_options: &CompileOptions,
-) -> CompilationResult<(Vec<CompiledProgram>, Vec<CompiledContract>)> {
+) -> CompilationResult<()> {
     let (binary_packages, contract_packages): (Vec<_>, Vec<_>) = workspace
         .into_iter()
         .filter(|package| !package.is_library())
@@ -161,32 +143,20 @@ pub(super) fn compile_workspace(
         .partition(|package| package.is_binary());
 
     // Compile all of the packages in parallel.
-    let program_results: Vec<CompilationResult<CompiledProgram>> = binary_packages
-        .par_iter()
-        .map(|package| {
-            let program_artifact_path = workspace.package_build_path(package);
-            let cached_program: Option<CompiledProgram> =
-                read_program_from_file(program_artifact_path)
-                    .ok()
-                    .filter(|p| p.noir_version == NOIR_ARTIFACT_VERSION_STRING)
-                    .map(|p| p.into());
-
-            compile_program(file_manager, parsed_files, package, compile_options, cached_program)
-        })
-        .collect();
-    let contract_results: Vec<CompilationResult<CompiledContract>> = contract_packages
-        .par_iter()
-        .map(|package| compile_contract(file_manager, parsed_files, package, compile_options))
-        .collect();
-
-    // Collate any warnings/errors which were encountered during compilation.
-    let compiled_programs = collect_errors(program_results);
-    let compiled_contracts = collect_errors(contract_results);
+    let program_warnings_or_errors: CompilationResult<()> =
+        compile_programs(file_manager, parsed_files, workspace, &binary_packages, compile_options);
+    let contract_warnings_or_errors: CompilationResult<()> = compiled_contracts(
+        file_manager,
+        parsed_files,
+        &contract_packages,
+        compile_options,
+        &workspace.target_directory_path(),
+    );
 
-    match (compiled_programs, compiled_contracts) {
-        (Ok((programs, program_warnings)), Ok((contracts, contract_warnings))) => {
+    match (program_warnings_or_errors, contract_warnings_or_errors) {
+        (Ok((_, program_warnings)), Ok((_, contract_warnings))) => {
             let warnings = [program_warnings, contract_warnings].concat();
-            Ok(((programs, contracts), warnings))
+            Ok(((), warnings))
         }
         (Err(program_errors), Err(contract_errors)) => {
             Err([program_errors, contract_errors].concat())
@@ -195,22 +165,79 @@ pub(super) fn compile_workspace(
     }
 }
 
-pub(super) fn save_program(program: CompiledProgram, package: &Package, circuit_dir: &Path) {
-    let program_artifact = ProgramArtifact::from(program.clone());
-    save_program_to_file(&program_artifact, &package.name, circuit_dir);
+fn compile_programs(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    workspace: &Workspace,
+    binary_packages: &[Package],
+    compile_options: &CompileOptions,
+) -> CompilationResult<()> {
+    let load_cached_program = |package| {
+        let program_artifact_path = workspace.package_build_path(package);
+        read_program_from_file(program_artifact_path)
+            .ok()
+            .filter(|p| p.noir_version == NOIR_ARTIFACT_VERSION_STRING)
+            .map(|p| p.into())
+    };
+
+    let program_results: Vec<CompilationResult<()>> = binary_packages
+        .par_iter()
+        .map(|package| {
+            let (program, warnings) = compile_program(
+                file_manager,
+                parsed_files,
+                package,
+                compile_options,
+                load_cached_program(package),
+            )?;
+            let program = nargo::ops::transform_program(program, compile_options.expression_width);
+            save_program_to_file(
+                &program.clone().into(),
+                &package.name,
+                workspace.target_directory_path(),
+            );
+            Ok(((), warnings))
+        })
+        .collect();
+
+    // Collate any warnings/errors which were encountered during compilation.
+    collect_errors(program_results).map(|(_, warnings)| ((), warnings))
+}
+
+fn compiled_contracts(
+    file_manager: &FileManager,
+    parsed_files: &ParsedFiles,
+    contract_packages: &[Package],
+    compile_options: &CompileOptions,
+    target_dir: &Path,
+) -> CompilationResult<()> {
+    let contract_results: Vec<CompilationResult<()>> = contract_packages
+        .par_iter()
+        .map(|package| {
+            let (contract, warnings) =
+                compile_contract(file_manager, parsed_files, package, compile_options)?;
+            let contract =
+                nargo::ops::transform_contract(contract, compile_options.expression_width);
+            save_contract(contract, package, target_dir, compile_options.show_artifact_paths);
+            Ok(((), warnings))
+        })
+        .collect();
+
+    // Collate any warnings/errors which were encountered during compilation.
+    collect_errors(contract_results).map(|(_, warnings)| ((), warnings))
 }
 
 fn save_contract(
     contract: CompiledContract,
     package: &Package,
-    circuit_dir: &Path,
+    target_dir: &Path,
     show_artifact_paths: bool,
 ) {
     let contract_name = contract.name.clone();
     let artifact_path = save_contract_to_file(
         &contract.into(),
         &format!("{}-{}", package.name, contract_name),
-        circuit_dir,
+        target_dir,
     );
     if show_artifact_paths {
         println!("Saved contract artifact to: {}", artifact_path.display());
diff --git a/tooling/nargo_cli/src/cli/debug_cmd.rs b/tooling/nargo_cli/src/cli/debug_cmd.rs
index 086dddc27e5..778009bf791 100644
--- a/tooling/nargo_cli/src/cli/debug_cmd.rs
+++ b/tooling/nargo_cli/src/cli/debug_cmd.rs
@@ -6,7 +6,6 @@ use bn254_blackbox_solver::Bn254BlackBoxSolver;
 use clap::Args;
 
 use fm::FileManager;
-use nargo::artifacts::debug::DebugArtifact;
 use nargo::constants::PROVER_INPUT_FILE;
 use nargo::errors::CompileError;
 use nargo::ops::{compile_program, compile_program_with_debug_instrumenter, report_errors};
@@ -16,6 +15,7 @@ use nargo::{insert_all_files_for_workspace_into_file_manager, parse_all};
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_abi::input_parser::{Format, InputValue};
 use noirc_abi::InputMap;
+use noirc_artifacts::debug::DebugArtifact;
 use noirc_driver::{
     file_manager_with_stdlib, CompileOptions, CompiledProgram, NOIR_ARTIFACT_VERSION_STRING,
 };
diff --git a/tooling/nargo_cli/src/cli/execute_cmd.rs b/tooling/nargo_cli/src/cli/execute_cmd.rs
index b548336275b..cf9dc1141a1 100644
--- a/tooling/nargo_cli/src/cli/execute_cmd.rs
+++ b/tooling/nargo_cli/src/cli/execute_cmd.rs
@@ -3,7 +3,6 @@ use acvm::FieldElement;
 use bn254_blackbox_solver::Bn254BlackBoxSolver;
 use clap::Args;
 
-use nargo::artifacts::debug::DebugArtifact;
 use nargo::constants::PROVER_INPUT_FILE;
 use nargo::errors::try_to_diagnose_runtime_error;
 use nargo::ops::DefaultForeignCallExecutor;
@@ -11,6 +10,7 @@ use nargo::package::Package;
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_abi::input_parser::{Format, InputValue};
 use noirc_abi::InputMap;
+use noirc_artifacts::debug::DebugArtifact;
 use noirc_driver::{CompileOptions, CompiledProgram, NOIR_ARTIFACT_VERSION_STRING};
 use noirc_frontend::graph::CrateName;
 
diff --git a/tooling/nargo_cli/src/cli/export_cmd.rs b/tooling/nargo_cli/src/cli/export_cmd.rs
index 324eed340ad..ee30b29b0f0 100644
--- a/tooling/nargo_cli/src/cli/export_cmd.rs
+++ b/tooling/nargo_cli/src/cli/export_cmd.rs
@@ -89,7 +89,7 @@ fn compile_exported_functions(
         compile_options.deny_warnings,
         compile_options.disable_macros,
         compile_options.silence_warnings,
-        compile_options.use_elaborator,
+        compile_options.use_legacy,
     )?;
 
     let exported_functions = context.get_all_exported_functions_in_crate(&crate_id);
diff --git a/tooling/nargo_cli/src/cli/fs/program.rs b/tooling/nargo_cli/src/cli/fs/program.rs
index ba017651667..caeaafd4ab3 100644
--- a/tooling/nargo_cli/src/cli/fs/program.rs
+++ b/tooling/nargo_cli/src/cli/fs/program.rs
@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use nargo::artifacts::{contract::ContractArtifact, program::ProgramArtifact};
+use noirc_artifacts::{contract::ContractArtifact, program::ProgramArtifact};
 use noirc_frontend::graph::CrateName;
 
 use crate::errors::FilesystemError;
diff --git a/tooling/nargo_cli/src/cli/info_cmd.rs b/tooling/nargo_cli/src/cli/info_cmd.rs
index 7c50e907dc9..3759fb31c76 100644
--- a/tooling/nargo_cli/src/cli/info_cmd.rs
+++ b/tooling/nargo_cli/src/cli/info_cmd.rs
@@ -3,11 +3,9 @@ use std::collections::HashMap;
 use acvm::acir::circuit::ExpressionWidth;
 use clap::Args;
 use iter_extended::vecmap;
-use nargo::{
-    artifacts::{debug::DebugArtifact, program::ProgramArtifact},
-    package::Package,
-};
+use nargo::package::Package;
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
+use noirc_artifacts::{debug::DebugArtifact, program::ProgramArtifact};
 use noirc_driver::{CompileOptions, NOIR_ARTIFACT_VERSION_STRING};
 use noirc_errors::{debug_info::OpCodesCount, Location};
 use noirc_frontend::graph::CrateName;
diff --git a/tooling/nargo_cli/src/cli/test_cmd.rs b/tooling/nargo_cli/src/cli/test_cmd.rs
index 99c284e5019..de9e8dc5d7c 100644
--- a/tooling/nargo_cli/src/cli/test_cmd.rs
+++ b/tooling/nargo_cli/src/cli/test_cmd.rs
@@ -10,7 +10,8 @@ use nargo::{
 };
 use nargo_toml::{get_package_manifest, resolve_workspace_from_toml, PackageSelection};
 use noirc_driver::{
-    check_crate, file_manager_with_stdlib, CompileOptions, NOIR_ARTIFACT_VERSION_STRING,
+    check_crate, compile_no_check, file_manager_with_stdlib, CompileOptions,
+    NOIR_ARTIFACT_VERSION_STRING,
 };
 use noirc_frontend::{
     graph::CrateName,
@@ -175,7 +176,7 @@ fn run_test<S: BlackBoxFunctionSolver<FieldElement> + Default>(
         crate_id,
         compile_options.deny_warnings,
         compile_options.disable_macros,
-        compile_options.use_elaborator,
+        compile_options.use_legacy,
     )
     .expect("Any errors should have occurred when collecting test functions");
 
@@ -185,14 +186,47 @@ fn run_test<S: BlackBoxFunctionSolver<FieldElement> + Default>(
 
     let blackbox_solver = S::default();
 
-    nargo::ops::run_test(
-        &blackbox_solver,
-        &mut context,
-        test_function,
-        show_output,
-        foreign_call_resolver_url,
-        compile_options,
-    )
+    let test_function_has_no_arguments = context
+        .def_interner
+        .function_meta(&test_function.get_id())
+        .function_signature()
+        .0
+        .is_empty();
+
+    if test_function_has_no_arguments {
+        nargo::ops::run_test(
+            &blackbox_solver,
+            &mut context,
+            test_function,
+            show_output,
+            foreign_call_resolver_url,
+            compile_options,
+        )
+    } else {
+        use noir_fuzzer::FuzzedExecutor;
+        use proptest::test_runner::TestRunner;
+
+        let compiled_program =
+            compile_no_check(&mut context, compile_options, test_function.get_id(), None, false);
+        match compiled_program {
+            Ok(compiled_program) => {
+                let runner = TestRunner::default();
+
+                let fuzzer = FuzzedExecutor::new(compiled_program.into(), runner);
+
+                let result = fuzzer.fuzz();
+                if result.success {
+                    TestStatus::Pass
+                } else {
+                    TestStatus::Fail {
+                        message: result.reason.unwrap_or_default(),
+                        error_diagnostic: None,
+                    }
+                }
+            }
+            Err(err) => TestStatus::CompileError(err.into()),
+        }
+    }
 }
 
 fn get_tests_in_package(
@@ -209,7 +243,7 @@ fn get_tests_in_package(
         compile_options.deny_warnings,
         compile_options.disable_macros,
         compile_options.silence_warnings,
-        compile_options.use_elaborator,
+        compile_options.use_legacy,
     )?;
 
     Ok(context
diff --git a/tooling/nargo_cli/tests/stdlib-tests.rs b/tooling/nargo_cli/tests/stdlib-tests.rs
index 0bb967e7502..03d40cc018b 100644
--- a/tooling/nargo_cli/tests/stdlib-tests.rs
+++ b/tooling/nargo_cli/tests/stdlib-tests.rs
@@ -1,7 +1,6 @@
 use std::{collections::BTreeMap, path::PathBuf};
 
-use acvm::blackbox_solver::StubbedBlackBoxSolver;
-use noirc_driver::{check_crate, file_manager_with_stdlib, CompileOptions};
+use noirc_driver::{check_crate, compile_no_check, file_manager_with_stdlib, CompileOptions};
 use noirc_frontend::hir::FunctionNameMatch;
 
 use nargo::{
@@ -30,7 +29,7 @@ fn run_stdlib_tests() {
     let (mut context, dummy_crate_id) =
         prepare_package(&file_manager, &parsed_files, &dummy_package);
 
-    let result = check_crate(&mut context, dummy_crate_id, true, false, false);
+    let result = check_crate(&mut context, dummy_crate_id, false, false, false);
     report_errors(result, &context.file_manager, true, false)
         .expect("Error encountered while compiling standard library");
 
@@ -44,15 +43,52 @@ fn run_stdlib_tests() {
     let test_report: Vec<(String, TestStatus)> = test_functions
         .into_iter()
         .map(|(test_name, test_function)| {
-            let status = run_test(
-                &StubbedBlackBoxSolver,
-                &mut context,
-                &test_function,
-                false,
-                None,
-                &CompileOptions::default(),
-            );
+            let test_function_has_no_arguments = context
+                .def_interner
+                .function_meta(&test_function.get_id())
+                .function_signature()
+                .0
+                .is_empty();
 
+            let status = if test_function_has_no_arguments {
+                run_test(
+                    &bn254_blackbox_solver::Bn254BlackBoxSolver,
+                    &mut context,
+                    &test_function,
+                    false,
+                    None,
+                    &CompileOptions::default(),
+                )
+            } else {
+                use noir_fuzzer::FuzzedExecutor;
+                use proptest::test_runner::TestRunner;
+
+                let compiled_program = compile_no_check(
+                    &mut context,
+                    &CompileOptions::default(),
+                    test_function.get_id(),
+                    None,
+                    false,
+                );
+                match compiled_program {
+                    Ok(compiled_program) => {
+                        let runner = TestRunner::default();
+
+                        let fuzzer = FuzzedExecutor::new(compiled_program.into(), runner);
+
+                        let result = fuzzer.fuzz();
+                        if result.success {
+                            TestStatus::Pass
+                        } else {
+                            TestStatus::Fail {
+                                message: result.reason.unwrap_or_default(),
+                                error_diagnostic: None,
+                            }
+                        }
+                    }
+                    Err(err) => TestStatus::CompileError(err.into()),
+                }
+            };
             (test_name, status)
         })
         .collect();
diff --git a/tooling/nargo_fmt/src/items.rs b/tooling/nargo_fmt/src/items.rs
index 7f998f45b59..80b641fd830 100644
--- a/tooling/nargo_fmt/src/items.rs
+++ b/tooling/nargo_fmt/src/items.rs
@@ -74,7 +74,8 @@ impl<'me, T> Items<'me, T> {
         let mut different_line = false;
 
         let leading = self.visitor.slice(start..end);
-        let leading_trimmed = leading.trim();
+        // Trim any possible whitespace before and after a comma separator
+        let leading_trimmed = leading.trim().trim_start_matches(',').trim();
 
         let starts_with_block_comment = leading_trimmed.starts_with("/*");
         let ends_with_block_comment = leading_trimmed.ends_with("*/");
diff --git a/tooling/nargo_fmt/src/rewrite/expr.rs b/tooling/nargo_fmt/src/rewrite/expr.rs
index 7ff943aea62..820a9af9ac3 100644
--- a/tooling/nargo_fmt/src/rewrite/expr.rs
+++ b/tooling/nargo_fmt/src/rewrite/expr.rs
@@ -166,7 +166,7 @@ pub(crate) fn rewrite(
             format!("{path_string}{turbofish}")
         }
         ExpressionKind::Lambda(_) => visitor.slice(span).to_string(),
-        ExpressionKind::Quote(block) => format!("quote {}", rewrite_block(visitor, block, span)),
+        ExpressionKind::Quote(_) => visitor.slice(span).to_string(),
         ExpressionKind::Comptime(block, block_span) => {
             format!("comptime {}", rewrite_block(visitor, block, block_span))
         }
@@ -174,6 +174,13 @@ pub(crate) fn rewrite(
         ExpressionKind::Resolved(_) => {
             unreachable!("ExpressionKind::Resolved should only emitted by the comptime interpreter")
         }
+        ExpressionKind::Unquote(expr) => {
+            if matches!(&expr.kind, ExpressionKind::Variable(..)) {
+                format!("${expr}")
+            } else {
+                format!("$({})", rewrite_sub_expr(visitor, shape, *expr))
+            }
+        }
     }
 }
 
diff --git a/tooling/nargo_fmt/src/rewrite/typ.rs b/tooling/nargo_fmt/src/rewrite/typ.rs
index 278457f82d1..3298ed8ae73 100644
--- a/tooling/nargo_fmt/src/rewrite/typ.rs
+++ b/tooling/nargo_fmt/src/rewrite/typ.rs
@@ -55,6 +55,10 @@ pub(crate) fn rewrite(visitor: &FmtVisitor, _shape: Shape, typ: UnresolvedType)
 
             format!("fn{env}({args}) -> {return_type}")
         }
+        UnresolvedTypeData::Resolved(_) => {
+            unreachable!("Unexpected macro expansion of a type in nargo fmt input")
+        }
+
         UnresolvedTypeData::Unspecified => todo!(),
         UnresolvedTypeData::FieldElement
         | UnresolvedTypeData::Integer(_, _)
@@ -64,7 +68,7 @@ pub(crate) fn rewrite(visitor: &FmtVisitor, _shape: Shape, typ: UnresolvedType)
         | UnresolvedTypeData::Expression(_)
         | UnresolvedTypeData::String(_)
         | UnresolvedTypeData::FormatString(_, _)
-        | UnresolvedTypeData::Code
+        | UnresolvedTypeData::Quoted(_)
         | UnresolvedTypeData::TraitAsType(_, _) => visitor.slice(typ.span.unwrap()).into(),
         UnresolvedTypeData::Error => unreachable!(),
     }
diff --git a/tooling/nargo_fmt/src/utils.rs b/tooling/nargo_fmt/src/utils.rs
index 2c5c3085e66..020f411ae2f 100644
--- a/tooling/nargo_fmt/src/utils.rs
+++ b/tooling/nargo_fmt/src/utils.rs
@@ -3,7 +3,7 @@ use std::borrow::Cow;
 use crate::items::HasItem;
 use crate::rewrite;
 use crate::visitor::{FmtVisitor, Shape};
-use noirc_frontend::ast::{Expression, Ident, Param, Visibility};
+use noirc_frontend::ast::{Expression, Ident, Param, UnresolvedGeneric, Visibility};
 use noirc_frontend::hir::resolution::errors::Span;
 use noirc_frontend::lexer::Lexer;
 use noirc_frontend::token::Token;
@@ -80,6 +80,7 @@ pub(crate) fn find_comment_end(slice: &str, is_last: bool) -> usize {
                 std::cmp::max(find_comment_end(slice) + block, separator_index + 1)
             }
             (_, Some(newline)) if newline > separator_index => newline + 1,
+            (None, None) => 0,
             _ => slice.len(),
         }
     } else if let Some(newline_index) = newline_index {
@@ -170,6 +171,26 @@ impl HasItem for Ident {
     }
 }
 
+impl HasItem for UnresolvedGeneric {
+    fn span(&self) -> Span {
+        self.span()
+    }
+
+    fn format(self, visitor: &FmtVisitor, _shape: Shape) -> String {
+        match self {
+            UnresolvedGeneric::Variable(_) => visitor.slice(self.span()).into(),
+            UnresolvedGeneric::Numeric { ident, typ } => {
+                let mut result = "".to_owned();
+                result.push_str(&ident.0.contents);
+                result.push_str(": ");
+                let typ = rewrite::typ(visitor, _shape, typ);
+                result.push_str(&typ);
+                result
+            }
+        }
+    }
+}
+
 pub(crate) fn first_line_width(exprs: &str) -> usize {
     exprs.lines().next().map_or(0, |line: &str| line.chars().count())
 }
diff --git a/tooling/nargo_fmt/src/visitor/item.rs b/tooling/nargo_fmt/src/visitor/item.rs
index a5d042dc71e..5aaaf20ff47 100644
--- a/tooling/nargo_fmt/src/visitor/item.rs
+++ b/tooling/nargo_fmt/src/visitor/item.rs
@@ -44,7 +44,7 @@ impl super::FmtVisitor<'_> {
 
         if !func.def.generics.is_empty() {
             let full_span = name_span.end()..params_open;
-            let start = name_span.end();
+            let start = self.span_before(full_span.clone(), Token::Less).start();
             let end = self.span_after(full_span, Token::Greater).start();
 
             let generics = func.def.generics;
@@ -188,8 +188,8 @@ impl super::FmtVisitor<'_> {
                         continue;
                     }
 
-                    let slice =
-                        self.slice(self.last_position..impl_.object_type.span.unwrap().end());
+                    let before_brace = self.span_before(span, Token::LeftBrace).start();
+                    let slice = self.slice(self.last_position..before_brace).trim();
                     let after_brace = self.span_after(span, Token::LeftBrace).start();
                     self.last_position = after_brace;
 
diff --git a/tooling/nargo_fmt/tests/expected/contract.nr b/tooling/nargo_fmt/tests/expected/contract.nr
index 97a6ebd6b77..e3a5877725a 100644
--- a/tooling/nargo_fmt/tests/expected/contract.nr
+++ b/tooling/nargo_fmt/tests/expected/contract.nr
@@ -3,11 +3,11 @@
 // Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
 // Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 contract Benchmarking {
-    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
+    use aztec::protocol_types::abis::function_selector::FunctionSelector;
 
-    use dep::value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
+    use value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
 
-    use dep::aztec::{
+    use aztec::{
         context::Context, note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader},
         log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet},
         types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN},
diff --git a/tooling/nargo_fmt/tests/expected/fn.nr b/tooling/nargo_fmt/tests/expected/fn.nr
index 3d231cd3f7f..4dde9a1b3ec 100644
--- a/tooling/nargo_fmt/tests/expected/fn.nr
+++ b/tooling/nargo_fmt/tests/expected/fn.nr
@@ -61,3 +61,11 @@ fn main(
 ) {}
 
 pub fn from_baz(x: [Field; crate::foo::MAGIC_NUMBER]) {}
+
+fn id<T, let I: Field>(x: [Field; I]) -> [Field; I] {}
+
+fn id_two<T, let I: Field>(x: [Field; I]) -> [Field; I] {}
+
+fn whitespace_before_generics<T>(foo: T) {}
+
+fn more_whitespace_before_generics<T>(foo: T) {}
diff --git a/tooling/nargo_fmt/tests/expected/impl.nr b/tooling/nargo_fmt/tests/expected/impl.nr
index 1c0d4564b5e..3c2fa42837a 100644
--- a/tooling/nargo_fmt/tests/expected/impl.nr
+++ b/tooling/nargo_fmt/tests/expected/impl.nr
@@ -1,10 +1,10 @@
-impl Type {}
+impl MyType {}
 
-impl Type<A> {}
+impl MyType<A> {}
 
-impl Type<A, B> {}
+impl MyType<A, B> {}
 
-impl Type {
+impl MyType {
     fn method(self) {}
 
     fn method(mut self) {}
@@ -12,10 +12,16 @@ impl Type {
     fn method(&mut self) {}
 }
 
-impl Type {
+impl MyType {
     fn method(self) {}
 }
 
-impl Type {
+impl MyType {
     fn method(self) {}
 }
+
+impl<T> MyStruct<T> where T: MyEq {
+    fn my_eq(self, other: Self) -> bool {
+        (self.a == other.a) & self.b.my_eq(other.b)
+    }
+}
diff --git a/tooling/nargo_fmt/tests/expected/import_braces.nr b/tooling/nargo_fmt/tests/expected/import_braces.nr
index 49c9d09001e..9c74c477f5f 100644
--- a/tooling/nargo_fmt/tests/expected/import_braces.nr
+++ b/tooling/nargo_fmt/tests/expected/import_braces.nr
@@ -1 +1 @@
-use dep::std::hash::sha256;
+use std::hash::sha256;
diff --git a/tooling/nargo_fmt/tests/expected/let.nr b/tooling/nargo_fmt/tests/expected/let.nr
index c57801155a0..df03f7c0b04 100644
--- a/tooling/nargo_fmt/tests/expected/let.nr
+++ b/tooling/nargo_fmt/tests/expected/let.nr
@@ -51,10 +51,10 @@ fn let_() {
 
     let expr = Expr { /*A boolean literal (true, false).*/ kind: ExprKind::Bool(true) };
 
-    let mut V = dep::crate2::MyStruct { Q: x };
-    let mut V = dep::crate2::MyStruct {};
-    let mut V = dep::crate2::MyStruct {/*test*/};
-    let mut V = dep::crate2::MyStruct {
+    let mut V = crate2::MyStruct { Q: x };
+    let mut V = crate2::MyStruct {};
+    let mut V = crate2::MyStruct {/*test*/};
+    let mut V = crate2::MyStruct {
         // sad
     };
 }
diff --git a/tooling/nargo_fmt/tests/expected/print.nr b/tooling/nargo_fmt/tests/expected/print.nr
index 3bce0941da2..d8404f674b0 100644
--- a/tooling/nargo_fmt/tests/expected/print.nr
+++ b/tooling/nargo_fmt/tests/expected/print.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     std::print("Hello world");
     std::println("Hello world");
diff --git a/tooling/nargo_fmt/tests/expected/print2.nr b/tooling/nargo_fmt/tests/expected/print2.nr
index 3bce0941da2..d8404f674b0 100644
--- a/tooling/nargo_fmt/tests/expected/print2.nr
+++ b/tooling/nargo_fmt/tests/expected/print2.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     std::print("Hello world");
     std::println("Hello world");
diff --git a/tooling/nargo_fmt/tests/expected/singleton_import.nr b/tooling/nargo_fmt/tests/expected/singleton_import.nr
new file mode 100644
index 00000000000..bb1bad500d9
--- /dev/null
+++ b/tooling/nargo_fmt/tests/expected/singleton_import.nr
@@ -0,0 +1,2 @@
+use dep::std;
+use some_crate;
diff --git a/tooling/nargo_fmt/tests/input/contract.nr b/tooling/nargo_fmt/tests/input/contract.nr
index 97a6ebd6b77..e3a5877725a 100644
--- a/tooling/nargo_fmt/tests/input/contract.nr
+++ b/tooling/nargo_fmt/tests/input/contract.nr
@@ -3,11 +3,11 @@
 // Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 
 // Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 contract Benchmarking {
-    use dep::aztec::protocol_types::abis::function_selector::FunctionSelector;
+    use aztec::protocol_types::abis::function_selector::FunctionSelector;
 
-    use dep::value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
+    use value_note::{utils::{increment, decrement}, value_note::{VALUE_NOTE_LEN, ValueNote, ValueNoteMethods}};
 
-    use dep::aztec::{
+    use aztec::{
         context::Context, note::{note_getter_options::NoteGetterOptions, note_header::NoteHeader},
         log::emit_unencrypted_log, state_vars::{Map, PublicMutable, PrivateSet},
         types::type_serialization::field_serialization::{FieldSerializationMethods, FIELD_SERIALIZED_LEN},
diff --git a/tooling/nargo_fmt/tests/input/fn.nr b/tooling/nargo_fmt/tests/input/fn.nr
index 1c6d201fa39..16ed95a540d 100644
--- a/tooling/nargo_fmt/tests/input/fn.nr
+++ b/tooling/nargo_fmt/tests/input/fn.nr
@@ -44,3 +44,13 @@ fn main(
 ) {}
 
 pub fn from_baz(x: [Field; crate::foo::MAGIC_NUMBER]) {}
+
+fn id< T   ,    let  I :  Field > ( x :  [ Field ;  I ] )  -> [Field; I ]  {  }
+
+fn id_two<T, 
+let   I :    Field >(x: [Field ;  I])  ->   [ Field; I] {}
+
+fn whitespace_before_generics <    T   >  (foo: T) {}
+
+fn more_whitespace_before_generics   <    
+T   >  (foo: T) {}
diff --git a/tooling/nargo_fmt/tests/input/impl.nr b/tooling/nargo_fmt/tests/input/impl.nr
index 1f111371a43..4ca838c2964 100644
--- a/tooling/nargo_fmt/tests/input/impl.nr
+++ b/tooling/nargo_fmt/tests/input/impl.nr
@@ -1,10 +1,10 @@
-impl Type {}
+impl MyType {}
 
-impl Type<A> {}
+impl MyType<A> {}
 
-impl Type<A, B> {}
+impl MyType<A, B> {}
 
-impl Type {
+impl MyType {
     fn method(self) {}
 
     fn method(mut self) {}
@@ -12,10 +12,16 @@ impl Type {
     fn method(&mut self) {}
 }
 
-impl Type {
+impl MyType {
 fn method(self) {}
 }
 
-impl Type {
+impl MyType {
             fn method(self) {}
+}
+
+impl<T> MyStruct<T> where T: MyEq {
+    fn my_eq(self, other: Self) -> bool {
+        (self.a == other.a) & self.b.my_eq(other.b)
+    }
 }
\ No newline at end of file
diff --git a/tooling/nargo_fmt/tests/input/import_braces.nr b/tooling/nargo_fmt/tests/input/import_braces.nr
index 88c7e9562a8..0647bbaa580 100644
--- a/tooling/nargo_fmt/tests/input/import_braces.nr
+++ b/tooling/nargo_fmt/tests/input/import_braces.nr
@@ -1 +1 @@
-use dep::std::hash::{sha256};
\ No newline at end of file
+use std::hash::{sha256};
diff --git a/tooling/nargo_fmt/tests/input/let.nr b/tooling/nargo_fmt/tests/input/let.nr
index 67c4ab8bd52..4918a92a51a 100644
--- a/tooling/nargo_fmt/tests/input/let.nr
+++ b/tooling/nargo_fmt/tests/input/let.nr
@@ -26,10 +26,10 @@ kind: ExprKind::Bool(true),
 
     let expr = Expr {/*A boolean literal (true, false).*/kind: ExprKind::Bool(true),};
 
-    let mut V = dep::crate2::MyStruct { Q: x };
-    let mut V = dep::crate2::MyStruct {};
-    let mut V = dep::crate2::MyStruct {/*test*/};
-    let mut V = dep::crate2::MyStruct {
+    let mut V = crate2::MyStruct { Q: x };
+    let mut V = crate2::MyStruct {};
+    let mut V = crate2::MyStruct {/*test*/};
+    let mut V = crate2::MyStruct {
         // sad
     };
 }
diff --git a/tooling/nargo_fmt/tests/input/print.nr b/tooling/nargo_fmt/tests/input/print.nr
index 3bce0941da2..d8404f674b0 100644
--- a/tooling/nargo_fmt/tests/input/print.nr
+++ b/tooling/nargo_fmt/tests/input/print.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     std::print("Hello world");
     std::println("Hello world");
diff --git a/tooling/nargo_fmt/tests/input/print2.nr b/tooling/nargo_fmt/tests/input/print2.nr
index 3bce0941da2..d8404f674b0 100644
--- a/tooling/nargo_fmt/tests/input/print2.nr
+++ b/tooling/nargo_fmt/tests/input/print2.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main() {
     std::print("Hello world");
     std::println("Hello world");
diff --git a/tooling/nargo_fmt/tests/input/singleton_import.nr b/tooling/nargo_fmt/tests/input/singleton_import.nr
new file mode 100644
index 00000000000..bb1bad500d9
--- /dev/null
+++ b/tooling/nargo_fmt/tests/input/singleton_import.nr
@@ -0,0 +1,2 @@
+use dep::std;
+use some_crate;
diff --git a/tooling/noir_codegen/package.json b/tooling/noir_codegen/package.json
index 5d3a7d6315e..eb9694a3b0c 100644
--- a/tooling/noir_codegen/package.json
+++ b/tooling/noir_codegen/package.json
@@ -3,7 +3,7 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.30.0",
+  "version": "0.31.0",
   "packageManager": "yarn@3.5.1",
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
diff --git a/tooling/noir_js/package.json b/tooling/noir_js/package.json
index eca3f29957f..3bb2ab5826f 100644
--- a/tooling/noir_js/package.json
+++ b/tooling/noir_js/package.json
@@ -3,7 +3,7 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.30.0",
+  "version": "0.31.0",
   "packageManager": "yarn@3.5.1",
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
diff --git a/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr b/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr
index a9aaae5f2f7..5a20a92048f 100644
--- a/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr
+++ b/tooling/noir_js/test/noir_compiled_examples/assert_lt/src/main.nr
@@ -1,5 +1,3 @@
-use dep::std;
-
 fn main(x: u64, y: pub u64) -> pub u64 {
     // We include a println statement to show that noirJS will ignore this and continue execution
     std::println("foo");
diff --git a/tooling/noir_js_backend_barretenberg/package.json b/tooling/noir_js_backend_barretenberg/package.json
index af3011068bf..b0c9e85315a 100644
--- a/tooling/noir_js_backend_barretenberg/package.json
+++ b/tooling/noir_js_backend_barretenberg/package.json
@@ -3,7 +3,7 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.30.0",
+  "version": "0.31.0",
   "packageManager": "yarn@3.5.1",
   "license": "(MIT OR Apache-2.0)",
   "type": "module",
@@ -41,7 +41,7 @@
     "lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.41.0",
+    "@aztec/bb.js": "0.43.0",
     "@noir-lang/types": "workspace:*",
     "fflate": "^0.8.0"
   },
diff --git a/tooling/noir_js_backend_barretenberg/src/backend.ts b/tooling/noir_js_backend_barretenberg/src/backend.ts
index ce2c2712491..96c4d13aa61 100644
--- a/tooling/noir_js_backend_barretenberg/src/backend.ts
+++ b/tooling/noir_js_backend_barretenberg/src/backend.ts
@@ -45,9 +45,10 @@ export class BarretenbergVerifierBackend implements VerifierBackend {
       const { Barretenberg, RawBuffer, Crs } = await import('@aztec/bb.js');
       const api = await Barretenberg.new(this.options);
 
+      const honkRecursion = false;
       const [_exact, _total, subgroupSize] = await api.acirGetCircuitSizes(
         this.acirUncompressedBytecode,
-        /*honkRecursion=*/ false, // TODO(https://github.com/AztecProtocol/barretenberg/issues/1013): Remove this flag
+        honkRecursion,
       );
       const crs = await Crs.new(subgroupSize + 1);
       await api.commonInitSlabAllocator(subgroupSize);
diff --git a/tooling/noir_js_types/package.json b/tooling/noir_js_types/package.json
index b2b84b640a5..0de1a1fd4be 100644
--- a/tooling/noir_js_types/package.json
+++ b/tooling/noir_js_types/package.json
@@ -4,7 +4,7 @@
     "The Noir Team <team@noir-lang.org>"
   ],
   "packageManager": "yarn@3.5.1",
-  "version": "0.30.0",
+  "version": "0.31.0",
   "license": "(MIT OR Apache-2.0)",
   "homepage": "https://noir-lang.org/",
   "repository": {
diff --git a/tooling/noirc_abi/Cargo.toml b/tooling/noirc_abi/Cargo.toml
index baae2dfa35e..c007a61bfcf 100644
--- a/tooling/noirc_abi/Cargo.toml
+++ b/tooling/noirc_abi/Cargo.toml
@@ -23,13 +23,9 @@ num-traits = "0.2"
 [dev-dependencies]
 strum = "0.24"
 strum_macros = "0.24"
+proptest.workspace = true
+proptest-derive.workspace = true
 
 [features]
-bn254 = [
-    "acvm/bn254",
-    "noirc_frontend/bn254",
-]
-bls12_381 = [
-    "acvm/bls12_381",
-    "noirc_frontend/bls12_381",
-]
\ No newline at end of file
+bn254 = ["acvm/bn254"]
+bls12_381 = ["acvm/bls12_381"]
diff --git a/tooling/noirc_abi_wasm/package.json b/tooling/noirc_abi_wasm/package.json
index 399a333f157..b33bb159fcd 100644
--- a/tooling/noirc_abi_wasm/package.json
+++ b/tooling/noirc_abi_wasm/package.json
@@ -3,7 +3,7 @@
   "contributors": [
     "The Noir Team <team@noir-lang.org>"
   ],
-  "version": "0.30.0",
+  "version": "0.31.0",
   "license": "(MIT OR Apache-2.0)",
   "homepage": "https://noir-lang.org/",
   "repository": {
diff --git a/tooling/noirc_artifacts/Cargo.toml b/tooling/noirc_artifacts/Cargo.toml
new file mode 100644
index 00000000000..4249604f949
--- /dev/null
+++ b/tooling/noirc_artifacts/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "noirc_artifacts"
+description = "Definitions of Nargo's build artifacts"
+version.workspace = true
+authors.workspace = true
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+acvm.workspace = true
+fm.workspace = true
+noirc_abi.workspace = true
+noirc_driver.workspace = true
+noirc_errors.workspace = true
+noirc_printable_type.workspace = true
+serde.workspace = true
+codespan-reporting.workspace = true
+
+
+[dev-dependencies]
+tempfile.workspace = true
diff --git a/tooling/nargo/src/artifacts/contract.rs b/tooling/noirc_artifacts/src/contract.rs
similarity index 100%
rename from tooling/nargo/src/artifacts/contract.rs
rename to tooling/noirc_artifacts/src/contract.rs
diff --git a/tooling/nargo/src/artifacts/debug.rs b/tooling/noirc_artifacts/src/debug.rs
similarity index 99%
rename from tooling/nargo/src/artifacts/debug.rs
rename to tooling/noirc_artifacts/src/debug.rs
index 21102c40fcf..11a3e1c4dd7 100644
--- a/tooling/nargo/src/artifacts/debug.rs
+++ b/tooling/noirc_artifacts/src/debug.rs
@@ -186,7 +186,7 @@ impl<'a> Files<'a> for DebugArtifact {
 
 #[cfg(test)]
 mod tests {
-    use crate::artifacts::debug::DebugArtifact;
+    use crate::debug::DebugArtifact;
     use acvm::acir::circuit::OpcodeLocation;
     use fm::FileManager;
     use noirc_errors::{debug_info::DebugInfo, Location, Span};
diff --git a/tooling/nargo/src/artifacts/debug_vars.rs b/tooling/noirc_artifacts/src/debug_vars.rs
similarity index 100%
rename from tooling/nargo/src/artifacts/debug_vars.rs
rename to tooling/noirc_artifacts/src/debug_vars.rs
diff --git a/tooling/nargo/src/artifacts/mod.rs b/tooling/noirc_artifacts/src/lib.rs
similarity index 73%
rename from tooling/nargo/src/artifacts/mod.rs
rename to tooling/noirc_artifacts/src/lib.rs
index c7b3736f90b..77873ed9409 100644
--- a/tooling/nargo/src/artifacts/mod.rs
+++ b/tooling/noirc_artifacts/src/lib.rs
@@ -1,8 +1,14 @@
+#![forbid(unsafe_code)]
+#![warn(unused_crate_dependencies, unused_extern_crates)]
+#![warn(unreachable_pub)]
+#![warn(clippy::semicolon_if_nothing_returned)]
+
 //! This module defines the structure of Nargo's different compilation artifacts.
 //!
 //! These artifacts are intended to remain independent of any applications being built on top of Noir.
 //! Should any projects require/desire a different artifact format, it's expected that they will write a transformer
 //! to generate them using these artifacts as a starting point.
+
 pub mod contract;
 pub mod debug;
 mod debug_vars;
diff --git a/tooling/nargo/src/artifacts/program.rs b/tooling/noirc_artifacts/src/program.rs
similarity index 100%
rename from tooling/nargo/src/artifacts/program.rs
rename to tooling/noirc_artifacts/src/program.rs
diff --git a/yarn.lock b/yarn.lock
index a947ec56aba..73dfbf6e82e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -221,9 +221,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aztec/bb.js@npm:0.41.0":
-  version: 0.41.0
-  resolution: "@aztec/bb.js@npm:0.41.0"
+"@aztec/bb.js@npm:0.43.0":
+  version: 0.43.0
+  resolution: "@aztec/bb.js@npm:0.43.0"
   dependencies:
     comlink: ^4.4.1
     commander: ^10.0.1
@@ -231,7 +231,7 @@ __metadata:
     tslib: ^2.4.0
   bin:
     bb.js: dest/node/main.js
-  checksum: e5e0095eaff3de45726366726337b131bb6ff7cf2cb53be705572c7d6715dae4c948bf86a03cfad68bc98c0c2d83e64cbe3723cc72260c8dbfa262af8cb81f9b
+  checksum: 63d2617529e00a05e1ac9364639dc10761e50cb6a16e010ac6354011440de037112a82d7cdd29a65b139af528c7d865b047e157b25d15ac36ff701863d550a5b
   languageName: node
   linkType: hard
 
@@ -4396,7 +4396,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@noir-lang/backend_barretenberg@workspace:tooling/noir_js_backend_barretenberg"
   dependencies:
-    "@aztec/bb.js": 0.41.0
+    "@aztec/bb.js": 0.43.0
     "@noir-lang/types": "workspace:*"
     "@types/node": ^20.6.2
     "@types/prettier": ^3