diff --git a/Cargo.lock b/Cargo.lock
index 68c48520e..ca61ac343 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -156,6 +156,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03918c3dbd7701a85c6b9887732e2921175f26c350b4563841d0958c21d57e6d"
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.6"
@@ -164,9 +170,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "async-compression"
-version = "0.4.25"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40f6024f3f856663b45fd0c9b6f2024034a702f453549449e0d84a305900dad4"
+checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8"
 dependencies = [
  "brotli",
  "flate2",
@@ -339,6 +345,21 @@ dependencies = [
  "virtue",
 ]
 
+[[package]]
+name = "bit-set"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
+
 [[package]]
 name = "bitcoin"
 version = "0.32.6"
@@ -432,6 +453,19 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "blake3"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3888aaa89e4b2a40fca9848e400f6a658a5a3978de7be858e209cafa8be9a4a0"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -443,7 +477,7 @@ dependencies = [
 
 [[package]]
 name = "brk"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "brk_bundler",
  "brk_cli",
@@ -457,14 +491,13 @@ dependencies = [
  "brk_mcp",
  "brk_parser",
  "brk_server",
- "brk_state",
  "brk_store",
  "brk_vec",
 ]
 
 [[package]]
 name = "brk_bundler"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "brk_rolldown",
  "log",
@@ -475,7 +508,7 @@ dependencies = [
 
 [[package]]
 name = "brk_cli"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "bitcoincore-rpc",
  "brk_computer",
@@ -498,8 +531,9 @@ dependencies = [
 
 [[package]]
 name = "brk_computer"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
+ "bincode",
  "bitcoin",
  "bitcoincore-rpc",
  "brk_core",
@@ -508,18 +542,22 @@ dependencies = [
  "brk_indexer",
  "brk_logger",
  "brk_parser",
- "brk_state",
+ "brk_store",
  "brk_vec",
  "color-eyre",
+ "derive_deref",
+ "either",
  "fjall",
- "jiff",
  "log",
  "rayon",
+ "serde",
+ "zerocopy",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "brk_core"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "bincode",
  "bitcoin",
@@ -540,7 +578,7 @@ dependencies = [
 
 [[package]]
 name = "brk_exit"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "brk_logger",
  "ctrlc",
@@ -549,7 +587,7 @@ dependencies = [
 
 [[package]]
 name = "brk_fetcher"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "brk_core",
  "brk_logger",
@@ -561,7 +599,7 @@ dependencies = [
 
 [[package]]
 name = "brk_indexer"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
@@ -579,7 +617,7 @@ dependencies = [
 
 [[package]]
 name = "brk_interface"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "brk_computer",
  "brk_core",
@@ -588,7 +626,7 @@ dependencies = [
  "brk_vec",
  "color-eyre",
  "derive_deref",
- "schemars 1.0.1",
+ "schemars 1.0.4",
  "serde",
  "serde_json",
  "serde_with",
@@ -597,7 +635,7 @@ dependencies = [
 
 [[package]]
 name = "brk_logger"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "color-eyre",
  "env_logger",
@@ -607,18 +645,17 @@ dependencies = [
 
 [[package]]
 name = "brk_mcp"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "axum",
  "brk_interface",
  "brk_rmcp",
  "log",
- "tracing",
 ]
 
 [[package]]
 name = "brk_parser"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "bitcoin",
  "bitcoincore-rpc",
@@ -633,9 +670,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rmcp"
-version = "0.1.8"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26db177d2933b727fe5f53b52d5ebead13d57f94ed8637717117a8bb1a3f1bae"
+checksum = "0dde96460b07f97f8522cef62fa5e9d5271a5183b13e6d75379ab43c1fb0b106"
 dependencies = [
  "base64 0.22.1",
  "brk_rmcp-macros",
@@ -648,7 +685,7 @@ dependencies = [
  "paste",
  "pin-project-lite",
  "rand 0.9.1",
- "schemars 1.0.1",
+ "schemars 1.0.4",
  "serde",
  "serde_json",
  "sse-stream",
@@ -663,9 +700,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rmcp-macros"
-version = "0.1.8"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4557e65ffea1466260a6ab13e3ba54bcee69c39576e4bfb8b81e50b375924540"
+checksum = "48a3cb1aadff2f3aaaed76d17e71d6b828cafbd3fe9fbaba07d31b8ed10e63c2"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -676,9 +713,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2a28608031195a1df827c2e9ac11f7b26acc2e447e0999e9914520941dd93a3"
+checksum = "e84c9b257b6d6e15e6598f320fbe6dcc8615827dbd207aa73378a86723485e9f"
 dependencies = [
  "anyhow",
  "append-only-vec",
@@ -689,9 +726,9 @@ dependencies = [
  "brk_rolldown_ecmascript_utils",
  "brk_rolldown_error",
  "brk_rolldown_fs",
- "brk_rolldown_loader_utils",
  "brk_rolldown_plugin",
  "brk_rolldown_plugin_data_uri",
+ "brk_rolldown_plugin_hmr",
  "brk_rolldown_resolver",
  "brk_rolldown_rstr",
  "brk_rolldown_sourcemap",
@@ -703,12 +740,13 @@ dependencies = [
  "css-module-lexer",
  "dunce",
  "futures",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools",
  "itoa",
  "memchr",
  "notify",
  "oxc",
+ "oxc_ecmascript",
  "oxc_index",
  "petgraph",
  "rustc-hash",
@@ -722,9 +760,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_common"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bf1ae1dbbde9bd49b1202936e5ae4ecad753d0ddfbbd0c4b06a9c48d3889276"
+checksum = "ca6da445ded7b4b07e9b48fd1855091ca87ee83777ae49326644019c0255278b"
 dependencies = [
  "anyhow",
  "arcstr",
@@ -741,7 +779,9 @@ dependencies = [
  "derive_more",
  "fast-glob",
  "itertools",
+ "num-bigint",
  "oxc",
+ "oxc_ecmascript",
  "oxc_index",
  "oxc_resolver",
  "rustc-hash",
@@ -753,10 +793,11 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_debug"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1966b2aa72cbb9442a3158b818d6352d344270e3d148d9e0c4eb07b355cef959"
+checksum = "a554a589c6027241dc5735ed2f9387ca4e6771b5a3c68b974b086cde857475a9"
 dependencies = [
+ "blake3",
  "brk_rolldown_debug_action",
  "dashmap",
  "rustc-hash",
@@ -768,9 +809,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_debug_action"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b094d3b0275f415a6386251b9485c941edbf38833ae03db3da32aae803593de"
+checksum = "4f0f12e60c7f66ff8efe64dfb47da84ce6216e9c969442f70fb0edf4f3d7d5d1"
 dependencies = [
  "serde",
  "ts-rs",
@@ -778,9 +819,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_ecmascript"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11ff89014347e7090ebf569c6ac7b32482690d5679c5073fb9050a7778d890b"
+checksum = "d0e6d41996222d97ada7efb7f00be28becae01fd6dd68ced9b2d659f9811f3ff"
 dependencies = [
  "arcstr",
  "brk_rolldown_error",
@@ -791,9 +832,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_ecmascript_utils"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938a6078497d6841166f63354e9bc9e029c2afb80a5344ee8c416359e80e66bc"
+checksum = "43216eb0cd76628bfc878a34c26f8deaba7f1ab2a3afed3912670c53eae67c25"
 dependencies = [
  "brk_rolldown_common",
  "oxc",
@@ -802,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_error"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71f9aa1cd9aacf8d66e2523a76dc8302718c344b11d3f81bec61e2a4fa97361"
+checksum = "744db025ff88c465df4d4faed5e3c8f3ef91ae9b3183bbc80c62d41dc636c4f5"
 dependencies = [
  "anyhow",
  "arcstr",
@@ -822,30 +863,19 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_fs"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c752f5bdf13702e5a515af3699b72206c4b4a1b87844eb5dc28e01ca065912dd"
+checksum = "9c38de0fd6c358c873e4a70e0054b65b6e08262f0676c47394c4f9f392f11c42"
 dependencies = [
  "oxc_resolver",
  "vfs",
 ]
 
-[[package]]
-name = "brk_rolldown_loader_utils"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8397251ae82b01b89c723d30a67988e307dc76802e854f4a7c4824fd6560c1b"
-dependencies = [
- "anyhow",
- "brk_rolldown_common",
- "serde_json",
-]
-
 [[package]]
 name = "brk_rolldown_plugin"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5be2dc55688443ebe37ef38d4e2912f6ec9a31c9490d3cef91f5cedf511f49f"
+checksum = "66b3739b2e98ee755130b5d624135d2a8623051341a1b942ac1aed4fe65d5a95"
 dependencies = [
  "anyhow",
  "arcstr",
@@ -873,9 +903,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_plugin_data_uri"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bc4e963da4c646a8d9396042a1dd3414850bbb8411df9f052de6e69cd6d9495"
+checksum = "36f094093ec33d62c17012772db763bd1f3b9d8ee5bcbc374e6f8e9d66555279"
 dependencies = [
  "arcstr",
  "base64-simd",
@@ -886,10 +916,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "brk_rolldown_resolver"
-version = "0.0.1"
+name = "brk_rolldown_plugin_hmr"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1955303e224ad9284a40415dce7ab10de6c8675d51f6b173ec664fda069b50b4"
+checksum = "37ed61d459d0aa300b568ac2cf2153c7c4e5c510f901b9efce744f0d5134cc7f"
+dependencies = [
+ "arcstr",
+ "brk_rolldown_common",
+ "brk_rolldown_plugin",
+ "oxc",
+]
+
+[[package]]
+name = "brk_rolldown_resolver"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65ae763e1c514bcfec0dd87be351f5000658feb0e4b1bcb5f199c60e6cbe7150"
 dependencies = [
  "arcstr",
  "brk_rolldown_common",
@@ -903,18 +945,18 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_rstr"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88fb9fe9f824838c4b74ecd63d9d4109ff24fafb43056c191fed58a778167230"
+checksum = "a251b8c38c8b6c177319a5d1f1fb609a120f35e73a52af575792f94dfd42fd1a"
 dependencies = [
  "oxc",
 ]
 
 [[package]]
 name = "brk_rolldown_sourcemap"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "607e6e8442cb0796834581e6922c5e1c648b6f139b135b81b31bed920c14ae10"
+checksum = "a5465d4ebe0e0801f163d19779bf9858051aff2c291efc64fa6dde83d2e3238d"
 dependencies = [
  "brk_rolldown_utils",
  "memchr",
@@ -925,18 +967,18 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_std_utils"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4606e3131c5f4f7c9a0b02c3cd12d8b74501359d71b1e9af53bf6542934e02c7"
+checksum = "50a28045a4b7ec4c5f8ff06a170d21e0c9a1d41e2baecc8348241f4d3d69a165"
 dependencies = [
  "regex",
 ]
 
 [[package]]
 name = "brk_rolldown_tracing"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "602c2dd4104cfc60f9207ea3f070ad1ed1f71f5676118ec4f0dd4be93f2eced9"
+checksum = "35845acebabca843c6b2c3e1928c393c588ff0ba4bb4bcfcd571c1cc11b13d89"
 dependencies = [
  "tracing",
  "tracing-chrome",
@@ -945,9 +987,9 @@ dependencies = [
 
 [[package]]
 name = "brk_rolldown_utils"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c213fcc1635c4c9de882a10beb295743bd6baa551f789bde0aa16bab5c3919a"
+checksum = "22e3b2a75f83b012138bc63c16e238dfebd9484f99fb77a35fe96a10ff6ef437"
 dependencies = [
  "anyhow",
  "arcstr",
@@ -960,7 +1002,7 @@ dependencies = [
  "fast-glob",
  "form_urlencoded",
  "futures",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "infer",
  "itoa",
  "memchr",
@@ -976,12 +1018,13 @@ dependencies = [
  "serde_json",
  "simdutf8",
  "sugar_path",
+ "tokio",
  "xxhash-rust",
 ]
 
 [[package]]
 name = "brk_server"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "axum",
  "bitcoincore-rpc",
@@ -1010,32 +1053,21 @@ dependencies = [
  "zip",
 ]
 
-[[package]]
-name = "brk_state"
-version = "0.0.71"
-dependencies = [
- "bincode",
- "brk_core",
- "derive_deref",
- "serde",
- "zerocopy",
- "zerocopy-derive",
-]
-
 [[package]]
 name = "brk_store"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "brk_core",
  "byteview",
  "fjall",
+ "log",
 ]
 
 [[package]]
 name = "brk_string_wizard"
-version = "0.0.1"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455a8c39f673a5eedbeee3d131f87abb6a8a405476b9f0766cfdd7d047750fc0"
+checksum = "a3e6948e03baceed9fc3e8b3274bf9fefdf56bcdd517a6ff4ecf1843a59178f7"
 dependencies = [
  "oxc_index",
  "oxc_sourcemap",
@@ -1045,7 +1077,7 @@ dependencies = [
 
 [[package]]
 name = "brk_vec"
-version = "0.0.71"
+version = "0.0.80"
 dependencies = [
  "arc-swap",
  "brk_core",
@@ -1085,9 +1117,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.17.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 dependencies = [
  "allocator-api2",
 ]
@@ -1118,37 +1150,27 @@ checksum = "6236364b88b9b6d0bc181ba374cf1ab55ba3ef97a1cb6f8cddad48a273767fb5"
 
 [[package]]
 name = "bzip2"
-version = "0.5.2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49ecfb22d906f800d4fe833b6282cf4dc1c298f5057ca0b5445e5c209735ca47"
+checksum = "bea8dcd42434048e4f7a304411d9273a411f647446c1234a65ce0554923f4cff"
 dependencies = [
- "bzip2-sys",
-]
-
-[[package]]
-name = "bzip2-sys"
-version = "0.1.13+1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
-dependencies = [
- "cc",
- "pkg-config",
+ "libbz2-rs-sys",
 ]
 
 [[package]]
 name = "castaway"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0abae9be0aaf9ea96a3b1b8b1b55c602ca751eba1b1500220cea4ecbafe7c0d5"
+checksum = "dec551ab6e7578819132c713a93c022a05d60159dc86e7a7050223577484c55a"
 dependencies = [
  "rustversion",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.27"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
 dependencies = [
  "jobserver",
  "libc",
@@ -1205,18 +1227,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "be92d32e80243a54711e5d7ce823c35c41c9d929dc4ab58e1276f625841aadf9"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "707eab41e9622f9139419d573eca0900137718000c517d47da73045f54331c3d"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1226,9 +1248,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1242,6 +1264,12 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
+[[package]]
+name = "clean-path"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aaa6b4b263a5d737e9bf6b7c09b72c41a5480aec4d7219af827f6564e950b6a5"
+
 [[package]]
 name = "color-eyre"
 version = "0.6.5"
@@ -1305,6 +1333,15 @@ version = "0.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea0095f6103c2a8b44acd6fd15960c801dafebf02e21940360833e0673f48ba7"
 
+[[package]]
+name = "concurrent_lru"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7feb5cb312f774e8a24540e27206db4e890f7d488563671d24a16389cf4c2e4e"
+dependencies = [
+ "once_cell",
+]
+
 [[package]]
 name = "constant_time_eq"
 version = "0.3.1"
@@ -1334,9 +1371,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -1579,6 +1616,12 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
 [[package]]
 name = "enum_dispatch"
 version = "0.3.13"
@@ -1640,6 +1683,17 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "fancy-regex"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298"
+dependencies = [
+ "bit-set",
+ "regex-automata 0.4.9",
+ "regex-syntax 0.8.5",
+]
+
 [[package]]
 name = "fast-glob"
 version = "0.4.5"
@@ -1848,11 +1902,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "r-efi",
  "wasi 0.14.2+wasi-0.2.4",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -1993,9 +2045,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
+checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2056,9 +2108,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.4",
@@ -2112,6 +2164,17 @@ dependencies = [
  "compare",
 ]
 
+[[package]]
+name = "io-uring"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b86e202f00093dcba4275d4636b93ef9dd75d025ae560d2521b45ea28ab49013"
+dependencies = [
+ "bitflags 2.9.1",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -2241,6 +2304,12 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
+[[package]]
+name = "libbz2-rs-sys"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775bf80d5878ab7c2b1080b5351a48b2f737d9f6f8b383574eebcc22be0dfccb"
+
 [[package]]
 name = "libc"
 version = "0.2.174"
@@ -2269,9 +2338,9 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
@@ -2362,9 +2431,9 @@ checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "memmap2"
-version = "0.9.5"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
+checksum = "483758ad303d734cec05e5c12b41d7e93e6a6390c5e9dae6bdeb7c1259012d28"
 dependencies = [
  "libc",
 ]
@@ -2386,9 +2455,9 @@ dependencies = [
 
 [[package]]
 name = "minreq"
-version = "2.13.4"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d2aaba477837b46ec1289588180fabfccf0c3b1d1a0c6b1866240cd6cd5ce9"
+checksum = "84885312a86831bff4a3cb04a1e54a3f698407e3274c83249313f194d3e0b678"
 dependencies = [
  "log",
  "rustls",
@@ -2410,6 +2479,15 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "nibble_vec"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "nix"
 version = "0.30.1"
@@ -2439,12 +2517,11 @@ checksum = "610a5acd306ec67f907abe5567859a3c693fb9886eb1f012ab8f2a47bef3db51"
 
 [[package]]
 name = "notify"
-version = "8.0.0"
+version = "8.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
+checksum = "3163f59cd3fa0e9ef8c32f242966a7b9994fd7378366099593e0e73077cd8c97"
 dependencies = [
  "bitflags 2.9.1",
- "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
@@ -2453,7 +2530,7 @@ dependencies = [
  "mio",
  "notify-types",
  "walkdir",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2547,9 +2624,9 @@ checksum = "48dd4f4a2c8405440fd0462561f0e5806bd0f77e86f51c761481bdd4018b545e"
 
 [[package]]
 name = "oxc"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e31318da7866fb30c000877ae98c30d1f76212e4bdc6c088c5cb847e5d40954"
+checksum = "e3692c2bbd698b3b2b18c4062b9df584f390d6154bb3815147d77b61354e3f0b"
 dependencies = [
  "oxc_allocator",
  "oxc_ast",
@@ -2571,10 +2648,11 @@ dependencies = [
 
 [[package]]
 name = "oxc-browserslist"
-version = "2.0.6"
+version = "2.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7bcc31e3014fa4226346b8596cda0f5cb5797045fa2760c6b871407db5642c"
+checksum = "20605046d78dbba8ed6c1c10b5ee21a83d265825943bce8bc40d17b4c48d5aca"
 dependencies = [
+ "bincode",
  "nom",
  "rustc-hash",
  "serde",
@@ -2585,9 +2663,9 @@ dependencies = [
 
 [[package]]
 name = "oxc-miette"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98b2c44324a4372caf6e3128a22744263c973e809fc598db3749ef3ff5e9fed4"
+checksum = "00cb1a49ec377f62606cbf047794efd37d668dbcbcefaeb5bf43f89b3c391418"
 dependencies = [
  "cfg-if",
  "owo-colors",
@@ -2599,9 +2677,9 @@ dependencies = [
 
 [[package]]
 name = "oxc-miette-derive"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bd3da01a295024fa79e3b4aba14b590d91256a274ff29cc5ee8f55183b2df24"
+checksum = "1739910e9871fe8d6e311f80fb2793756335aec97b0f985e778cbf4bc5cf574f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2610,9 +2688,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_allocator"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4cb225affc487a1bc867455220d5427d0f2a35ed25d896f99bb3b912d49fb9e"
+checksum = "905a588c0a12c71ddb94d4eaee6ea3770f9132017956936777763ebcde66d58c"
 dependencies = [
  "allocator-api2",
  "bumpalo",
@@ -2625,9 +2703,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ced8dcc14d588fa32594d70ff8f194712036d02d7a96718bce38abbfec72ed6"
+checksum = "d203d52b5de3eba556625cac42290ac81f9995c82009b9f6ec041237f068ba9b"
 dependencies = [
  "bitflags 2.9.1",
  "oxc_allocator",
@@ -2641,9 +2719,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast_macros"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43494643bd6d76a62446c58ae98568bf630c0bdd90726d7956d3f8e1e17f5906"
+checksum = "b31a7f8a301f434bd73f7735f02d7d823c2d4a83bd1ce1b04bfd3b0b50c5a054"
 dependencies = [
  "phf",
  "proc-macro2",
@@ -2653,9 +2731,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_ast_visit"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "761d7f84b87080cf337c843fa60a1c3f50eb53eba0ec1e42d8758e99cd834031"
+checksum = "c353d88dd55b1beb8338a99d908f2d5828f336b82821298d090ff4247c7a9b15"
 dependencies = [
  "oxc_allocator",
  "oxc_ast",
@@ -2666,9 +2744,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_cfg"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d561bbe6e05cd3be34802a22e799c3c9bd5987daee2dbb51b2561ab78d39420"
+checksum = "4e1a01365605258dfafd0cb85b4340f20676eb726baa6feb799ea2fbee66739b"
 dependencies = [
  "bitflags 2.9.1",
  "itertools",
@@ -2681,9 +2759,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_codegen"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d694cadd4d0d86831197d720ad245ea3c82366db778230dfa8d80475d2049c80"
+checksum = "bcb7de0fc40c9a935e8483692f7d17371d0d9f001ef92d0734094096851ef86a"
 dependencies = [
  "bitflags 2.9.1",
  "cow-utils",
@@ -2702,9 +2780,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_data_structures"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebcebde288c0dbc9b8bb7ecf8d4eb3d64c6f122609fbca9f89dce356786fa19"
+checksum = "7087f6bf6910ef41df29d07eb67b163207aafd7efa0801d3b57c2e072c8b9ed1"
 dependencies = [
  "ropey",
  "rustversion",
@@ -2712,19 +2790,20 @@ dependencies = [
 
 [[package]]
 name = "oxc_diagnostics"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136bd60c8d25e6c1b879a01d5f52ad260385afa2d74b0aa81c1cbc9680b468ef"
+checksum = "4fe0cbd689125f1510f44235fee96887f1f1f42a3420afc802db60ff654030cf"
 dependencies = [
  "cow-utils",
  "oxc-miette",
+ "percent-encoding",
 ]
 
 [[package]]
 name = "oxc_ecmascript"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "405573ecc303a3e9852b2873aad30e8249b3e3cb668cf265f53a9072dada8d50"
+checksum = "2141d6765bc6e75ff286aeb6f580f1ceeea40c48d23d07b943e1fb92367a8968"
 dependencies = [
  "num-bigint",
  "num-traits",
@@ -2735,9 +2814,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_estree"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcd0073f1b212fda3c1e37728db069bf22d136a90f58da4f6214a6ada7552dde"
+checksum = "1216c5ef637573a66b9e4006a6edb432274799bd9e55059607a52aaa6bdbad9a"
 dependencies = [
  "itoa",
  "oxc_data_structures",
@@ -2756,9 +2835,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_isolated_declarations"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc08c216028563ebe9f35e9ff661c24d5f885735775d21fc00d579f7a06db10a"
+checksum = "bba6deb4abf0dab2818cb73254535656607ed574f0bd271331967269a714ebb1"
 dependencies = [
  "bitflags 2.9.1",
  "oxc_allocator",
@@ -2773,9 +2852,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_mangler"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b301242a458a38572ec3ffd73d836de068019d605a49360f0c80ff9fcdbb0485"
+checksum = "30668818436a7791798112326f43fcfd94a65a23364e9cb24939f77d7dc7ded2"
 dependencies = [
  "fixedbitset",
  "itertools",
@@ -2790,9 +2869,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_minifier"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87d130925e189994a4695d7379f14fd427f347642741d8180baa0b8a6699607b"
+checksum = "f2d92fc42e0f6ed63d689f0070c398e53fe04d5a553c681a3085798dfacb2ef4"
 dependencies = [
  "cow-utils",
  "oxc_allocator",
@@ -2812,9 +2891,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_parser"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c0b65b7f87759287bc7c8d394733cda9bca5e14fe7b71388932c926f8cde67b"
+checksum = "55a30d3f398929eaac185d328e43233f857626dedd8be5b8c78bfc0c63a32d7c"
 dependencies = [
  "bitflags 2.9.1",
  "cow-utils",
@@ -2835,9 +2914,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_regular_expression"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0899e918e7da993922ac9d85a7cacefc5519afbab002a4e239aa0a8dc2201297"
+checksum = "7e40e3de8fc6bb9091ec5d364a951405bca49ada74c5b0250e0cbb33583c9efc"
 dependencies = [
  "bitflags 2.9.1",
  "oxc_allocator",
@@ -2851,15 +2930,16 @@ dependencies = [
 
 [[package]]
 name = "oxc_resolver"
-version = "11.2.1"
+version = "11.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9fbd425311540ada87997dbec6e9a2e0bab00b7e82db8e6ef79a0d0a9cfce1"
+checksum = "e300c931167c1f902f8029a7aac00372cc1742c6a0c9f625a8b67dd337f557c7"
 dependencies = [
  "cfg-if",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "json-strip-comments",
  "once_cell",
  "papaya",
+ "pnp",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -2870,9 +2950,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_semantic"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b916b0e8bf2045895726a5069947789226eaae47e0f27412956163e02bd20816"
+checksum = "5ef32d3854235cea74e7abdd294ed2bc2a9398e18ddf36a762d51a5b41d9a7b9"
 dependencies = [
  "itertools",
  "oxc_allocator",
@@ -2907,9 +2987,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_span"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51599c317d4e19c07978bde4af8a40844a2410fb7b455836c3441a41865acfa"
+checksum = "e755e211d32f1d52255eebb39dfb8a787620e5d163e3c6bbe3ad8cb0cca75c40"
 dependencies = [
  "compact_str",
  "oxc-miette",
@@ -2921,9 +3001,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_syntax"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee16107642e60a1f53dac2dbaaf1a1cdc696c0f7427946f8b8906f3e09a85f0"
+checksum = "817dd63f7421c08f9cf1fe1463208590cc0cca524bfafa3f252ae519587cdf70"
 dependencies = [
  "bitflags 2.9.1",
  "cow-utils",
@@ -2943,14 +3023,14 @@ dependencies = [
 
 [[package]]
 name = "oxc_transformer"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bd95eedb44dd519dfe157334512977de744725cda45d4c9005369e3f155d6b4"
+checksum = "82d36761790513485a774a582a7d0b7e4e1c86f3f0dc76bb776363b367fb2482"
 dependencies = [
  "base64 0.22.1",
  "compact_str",
  "cow-utils",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "memchr",
  "oxc-browserslist",
@@ -2974,9 +3054,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_transformer_plugins"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3aa2124adf31739ae94ca9ee5ecb727b42ad7bc3e33ca072a6c9fa791d9f7b5"
+checksum = "3a5e4e99e6ca788dc45d5216e8311c49957c29c8d521fa5d82887b316856cb3c"
 dependencies = [
  "cow-utils",
  "itoa",
@@ -2996,9 +3076,9 @@ dependencies = [
 
 [[package]]
 name = "oxc_traverse"
-version = "0.73.2"
+version = "0.76.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd6b3996c515cf7ce1c204b3b01a5a1469462412885ea6fa7f0d236d8f2c454"
+checksum = "c80b098496732c9cdcb34398332c9a7679cfc20d6258a6cad56e4031c889db32"
 dependencies = [
  "itoa",
  "oxc_allocator",
@@ -3014,9 +3094,9 @@ dependencies = [
 
 [[package]]
 name = "papaya"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af228bb1296c9b044ee75e2a2325409c2d899bcfcc6150e5e41f148e0a87dd20"
+checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
 dependencies = [
  "equivalent",
  "seize",
@@ -3070,6 +3150,18 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "path-slash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
+
+[[package]]
+name = "pathdiff"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
+
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -3094,35 +3186,36 @@ checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca"
 dependencies = [
  "fixedbitset",
  "hashbrown 0.15.4",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "serde",
 ]
 
 [[package]]
 name = "phf"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
 dependencies = [
  "phf_macros",
  "phf_shared",
+ "serde",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
 dependencies = [
+ "fastrand",
  "phf_shared",
- "rand 0.8.5",
 ]
 
 [[package]]
 name = "phf_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -3133,9 +3226,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
 dependencies = [
  "siphasher",
 ]
@@ -3178,6 +3271,26 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
+[[package]]
+name = "pnp"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc6da10bf83fe58dfcd4ab14ab45c8d3a375663cfd8f44e924c54379b431dbd3"
+dependencies = [
+ "byteorder",
+ "clean-path",
+ "concurrent_lru",
+ "fancy-regex",
+ "miniz_oxide",
+ "path-slash",
+ "pathdiff",
+ "radix_trie",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.11.1"
@@ -3199,6 +3312,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
+[[package]]
+name = "ppmd-rust"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c834641d8ad1b348c9ee86dec3b9840d805acd5f24daa5f90c788951a52ff59b"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.21"
@@ -3264,6 +3383,16 @@ version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
+[[package]]
+name = "radix_trie"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd"
+dependencies = [
+ "endian-type",
+ "nibble_vec",
+]
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -3424,9 +3553,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "regress"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ef7fa9ed0256d64a688a3747d0fef7a88851c18a5e1d57f115f38ec2e09366"
+checksum = "145bb27393fe455dd64d6cbc8d059adfa392590a45eadf079c01b11857e7b010"
 dependencies = [
  "hashbrown 0.15.4",
  "memchr",
@@ -3563,9 +3692,9 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe8c9d1c68d67dd9f97ecbc6f932b60eb289c5dbddd8aa1405484a8fd2fcd984"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
 dependencies = [
  "dyn-clone",
  "ref-cast",
@@ -3576,9 +3705,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ca9fcb757952f8e8629b9ab066fc62da523c46c2b247b1708a3be06dd82530b"
+checksum = "33d020396d1d138dc19f1165df7545479dcd58d93810dc5d646a16e55abefa80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3691,7 +3820,7 @@ version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "memchr",
  "ryu",
@@ -3710,9 +3839,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
 dependencies = [
  "serde",
 ]
@@ -3731,16 +3860,17 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42"
+checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "schemars 0.9.0",
+ "schemars 1.0.4",
  "serde",
  "serde_derive",
  "serde_json",
@@ -3750,9 +3880,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77"
+checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -4057,15 +4187,17 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.45.1"
+version = "1.46.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+checksum = "0cc3a2344dafbe23a245241fe8b09735b521110d30fcefbbd5feb1797ca35d17"
 dependencies = [
  "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
+ "slab",
  "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
@@ -4108,44 +4240,42 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "ed0aee96c12fa71097902e0bb061a5e1ebd766a6636bb605ba401c45c1650eac"
 dependencies = [
+ "indexmap 2.10.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
-dependencies = [
- "indexmap 2.9.0",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_write",
+ "toml_parser",
+ "toml_writer",
  "winnow",
 ]
 
 [[package]]
-name = "toml_write"
-version = "0.1.2"
+name = "toml_datetime"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30"
+dependencies = [
+ "winnow",
+]
+
+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
 
 [[package]]
 name = "tower"
@@ -4444,9 +4574,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vfs"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ec343ec20aa715908fd028a4b8e7c99a349d13143224222e4d61c316d1e7f0a"
+checksum = "9e723b9e1c02a3cf9f9d0de6a4ddb8cdc1df859078902fe0ae0589d615711ae6"
 dependencies = [
  "filetime",
 ]
@@ -4799,12 +4929,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winnow"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
-dependencies = [
- "memchr",
-]
+checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
 
 [[package]]
 name = "wit-bindgen-rt"
@@ -4869,9 +4996,9 @@ dependencies = [
 
 [[package]]
 name = "zip"
-version = "4.2.0"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ab361742de920c5535880f89bbd611ee62002bf11341d16a5f057bb8ba6899"
+checksum = "9aed4ac33e8eb078c89e6cbb1d5c4c7703ec6d299fc3e7c3695af8f8b423468b"
 dependencies = [
  "aes",
  "arbitrary",
@@ -4882,10 +5009,11 @@ dependencies = [
  "flate2",
  "getrandom 0.3.3",
  "hmac",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "liblzma",
  "memchr",
  "pbkdf2",
+ "ppmd-rust",
  "sha1",
  "time",
  "zeroize",
diff --git a/Cargo.toml b/Cargo.toml
index da2139dcf..4013b4726 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ members = ["crates/*"]
 package.description = "The Bitcoin Research Kit is a suite of tools designed to extract, compute and display data stored on a Bitcoin Core node"
 package.license = "MIT"
 package.edition = "2024"
-package.version = "0.0.71"
+package.version = "0.0.80"
 package.homepage = "https://bitcoinresearchkit.org"
 package.repository = "https://github.com/bitcoinresearchkit/brk"
 package.readme = "README.md"
@@ -14,6 +14,10 @@ lto = "fat"
 codegen-units = 1
 panic = "abort"
 
+[profile.profiling]
+inherits = "release"
+debug = true
+
 [profile.dist]
 inherits = "release"
 
@@ -23,40 +27,39 @@ axum = "0.8.4"
 bincode = { version = "2.0.1", features = ["serde"] }
 bitcoin = { version = "0.32.6", features = ["serde"] }
 bitcoincore-rpc = "0.19.0"
-brk_bundler = { version = "0.0.71", path = "crates/brk_bundler" }
-brk_cli = { version = "0.0.71", path = "crates/brk_cli" }
-brk_computer = { version = "0.0.71", path = "crates/brk_computer" }
-brk_core = { version = "0.0.71", path = "crates/brk_core" }
-brk_exit = { version = "0.0.71", path = "crates/brk_exit" }
-brk_fetcher = { version = "0.0.71", path = "crates/brk_fetcher" }
-brk_indexer = { version = "0.0.71", path = "crates/brk_indexer" }
-brk_interface = { version = "0.0.71", path = "crates/brk_interface" }
-brk_logger = { version = "0.0.71", path = "crates/brk_logger" }
-brk_mcp = { version = "0.0.71", path = "crates/brk_mcp" }
-brk_parser = { version = "0.0.71", path = "crates/brk_parser" }
-brk_rmcp = { version = "0.1.8", features = ["transport-streamable-http-server", "transport-worker"]}
+brk_bundler = { version = "0.0.80", path = "crates/brk_bundler" }
+brk_cli = { version = "0.0.80", path = "crates/brk_cli" }
+brk_computer = { version = "0.0.80", path = "crates/brk_computer" }
+brk_core = { version = "0.0.80", path = "crates/brk_core" }
+brk_exit = { version = "0.0.80", path = "crates/brk_exit" }
+brk_fetcher = { version = "0.0.80", path = "crates/brk_fetcher" }
+brk_indexer = { version = "0.0.80", path = "crates/brk_indexer" }
+brk_interface = { version = "0.0.80", path = "crates/brk_interface" }
+brk_logger = { version = "0.0.80", path = "crates/brk_logger" }
+brk_mcp = { version = "0.0.80", path = "crates/brk_mcp" }
+brk_parser = { version = "0.0.80", path = "crates/brk_parser" }
+brk_rmcp = { version = "0.2.1", features = ["transport-streamable-http-server", "transport-worker"]}
 # brk_rmcp = { path = "../rust-sdk/crates/rmcp", features = ["transport-streamable-http-server", "transport-worker"]}
-brk_server = { version = "0.0.71", path = "crates/brk_server" }
-brk_state = { version = "0.0.71", path = "crates/brk_state" }
-brk_store = { version = "0.0.71", path = "crates/brk_store" }
-brk_vec = { version = "0.0.71", path = "crates/brk_vec" }
+brk_server = { version = "0.0.80", path = "crates/brk_server" }
+brk_store = { version = "0.0.80", path = "crates/brk_store" }
+brk_vec = { version = "0.0.80", path = "crates/brk_vec" }
 byteview = "=0.6.1"
-clap = { version = "4.5.40", features = ["string"] }
-clap_derive = "4.5.40"
+clap = { version = "4.5.41", features = ["string"] }
+clap_derive = "4.5.41"
 color-eyre = "0.6.5"
 derive_deref = "1.1.1"
 fjall = "2.11.1"
 jiff = "0.2.15"
 log = { version = "0.4.27" }
-minreq = { version = "2.13.4", features = ["https", "serde_json"] }
+minreq = { version = "2.14.0", features = ["https", "serde_json"] }
 rayon = "1.10.0"
-schemars = "1.0.1"
+schemars = "1.0.4"
 serde = { version = "1.0.219" }
 serde_bytes = "0.11.17"
 serde_derive = "1.0.219"
 serde_json = { version = "1.0.140", features = ["float_roundtrip"] }
 tabled = "0.20.0"
-tokio = { version = "1.45.1", features = ["rt-multi-thread"] }
+tokio = { version = "1.46.1", features = ["rt-multi-thread"] }
 zerocopy = { version = "0.8.26" }
 zerocopy-derive = "0.8.26"
 
diff --git a/README.md b/README.md
index 72620cf74..66dc9ddbc 100644
--- a/README.md
+++ b/README.md
@@ -46,8 +46,7 @@ The toolkit can be used in various ways to accommodate as many needs as possible
   Just like the website, it's entirely free, with no authentication or rate-limiting.
 - **[AI](https://github.com/bitcoinresearchkit/brk/blob/main/crates/brk_mcp/README.md#brk-mcp)** \
   LLMs have to possibility to connect to BRK's backend through a [MCP](https://modelcontextprotocol.io/introduction). \
-  It will give them access to the same tools as the API, with no restrictions, and allow you to have your very own data analysts. \
-  One-shot output examples: [Document](https://claude.ai/public/artifacts/71194d29-f965-417c-ba09-fdf0e4ecb1d5) // [Dashboard](https://claude.ai/public/artifacts/beef143f-399a-4ed4-b8bf-c986b776de42) // [Dashboard 2](https://claude.ai/public/artifacts/5430ae49-bb3d-4fc1-ab24-f1e33deb40dc)
+  It will give them access to the same tools as the API, with no restrictions, and allow you to have your very own data analysts.
 - **[CLI](https://crates.io/crates/brk_cli)** \
   Node runners are strongly encouraged to try out and self-host their own instance using BRK's command line interface. \
   The CLI has multiple cogs available for users to tweak to adapt to all situations with even the possibility for web developers to create their own custom website which could later on be added as an alternative front-end.
@@ -73,7 +72,6 @@ In contrast, existing alternatives tend to be either [very costly](https://studi
 - [`brk_parser`](https://crates.io/crates/brk_parser): A very fast Bitcoin Core block parser and iterator built on top of bitcoin-rust
 - [`brk_interface`](https://crates.io/crates/brk_interface): An interface to BRK's engine
 - [`brk_server`](https://crates.io/crates/brk_server): A server that serves Bitcoin data and swappable front-ends, built on top of `brk_indexer`, `brk_fetcher` and `brk_computer`
-- [`brk_state`](https://crates.io/crates/brk_state): Various states used mainly by the computer
 - [`brk_store`](https://crates.io/crates/brk_store): A thin wrapper around [`fjall`](https://crates.io/crates/fjall)
 - [`brk_vec`](https://crates.io/crates/brk_vec): A push-only, truncable, compressable, saveable Vec
 - [`brk_bundler`](https://crates.io/crates/brk_bundler): A thin wrapper around [`rolldown`](https://rolldown.rs/)
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 000000000..8ae918195
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,99 @@
+# TODO
+
+- __crates__
+  - _cli_
+    - check disk space on first launch
+    - add custom path support for config.toml
+    - maybe add bitcoind download and launch support
+      - via: https://github.com/rust-bitcoin/corepc/blob/master/node
+    - test read/write speed, add warning if too low (<2gb/s)
+    - pull latest version and notify is out of date
+  - _computer_
+    - **add rollback of states (in stateful)**
+    - add support for per index computation
+    - fix feerate which is always ZERO due to coinbase transaction
+    - before computing multiple sources check their length, panic if not equal
+    - add oracle price dataset (https://utxo.live/oracle/UTXOracle.py)
+    - add address counts relative to all datasets
+    - make decade, quarter, year datasets `computed` instead of `eager`
+    - add 6 months (semester) interval datasets to builder
+    - some datasets in `indexes` can probably be removed
+    - add revived/sent supply datasets
+    - add `in-sats` version of all price datasets (average and co)
+    - add `p2pk` group (sum of `p2pk33` and `p2pk65`)
+    - add chopiness datasets
+    - add utxo count, address count, supply data for  by reused addresses in groups by address type
+    - add more date ranges (3-6 months and more)
+    - add puell multiple dataset
+    - add pi cycle dataset
+    - add emas of price
+    - add 7d and 30d ema to sell side risk ratio and sopr
+    - don't compute everything for all cohorts as some datasets combinations are irrelevant
+      - addresses/utxos by amount don't need mvrvz for example
+    - add all possible charts from:
+      - https://mainnet.observer
+      - https://glassnode.com
+      - https://checkonchain.com
+      - https://researchbitcoin.net/exciting-update-coming-to-the-bitcoin-lab/
+      - https://mempool.space/research
+  - _indexer_
+    - parse only the needed block number
+      - maybe using https://developer.bitcoin.org/reference/rpc/getblockhash.html
+  - _interface_
+    - create pagination enum
+      - from to
+      - from option<count>
+      - to option<count>
+      - page + option<per page> default 1000 max 1000
+    - from/to/count params don’t cap all combinations
+      - example: from -10,000 count 10, won’t work if underlying vec isn’t 10k or more long
+  - _parser_
+    - save `vec` file instead of `json`
+    - support lock file, process in read only if already opened in write mode
+    - if less than X (10 maybe ?) get block using rpc instead of parsing the block files
+  - _server_
+    - api
+      - add extensions support (.json .csv …)
+      - if format instead of extension then don't download file
+    - add support for https (rustls)
+  - _vec_
+    - add native lock file support (once it's available in stable rust)
+    - improve compressed mode (slow reads)
+    - add ema support
+- __docs__
+  - _README_
+    - add a comparison table with alternatives
+    - add contribution section where help is needed
+      - documentation/mcp/datasets/different front ends
+    - add faq
+- __websites__
+  - _default_
+    - explorer
+      - blocks
+      - transactions
+      - addresses
+      - miners
+      - maybe xpubs
+    - charts
+      - improve some names and colors
+      - remove `sum` series when it's a duplicate of the `base` (in subsidy for example)
+      - selected unit sometimes changes when going back end forth
+      - add support for custom charts
+      - separate z-score charts from "realized price" (with their own prices), have 4y, 2y and 1y
+      - price scale format depends on unit, hide digits for sats for example (if/when possible)
+    - table
+      - pagination
+      - exports (.json, .csv,…)
+    - search
+      - datasets add legend, and keywords ?
+      - height/address/txid
+    - api
+      - add api page with interactivity
+    - global
+      - **fix navigation/history**
+      - move share button to footer ?
+      - Use `ichart.createPane()` in wrapper
+      - improve behavior when local storage is unavailable
+        - by having a global state
+- __global__
+  - check `TODO`s in codebase
diff --git a/assets/claude-step3.png b/assets/claude-step3.png
index 3aa5fdc3f..af3735423 100644
Binary files a/assets/claude-step3.png and b/assets/claude-step3.png differ
diff --git a/assets/claude-step4.png b/assets/claude-step4.png
index 65e1aa519..17277ec61 100644
Binary files a/assets/claude-step4.png and b/assets/claude-step4.png differ
diff --git a/crates/brk/Cargo.toml b/crates/brk/Cargo.toml
index 99b24ae24..4d872f4b9 100644
--- a/crates/brk/Cargo.toml
+++ b/crates/brk/Cargo.toml
@@ -21,7 +21,6 @@ full = [
     "parser",
     "interface",
     "server",
-    "state",
     "store",
     "vec",
 ]
@@ -36,7 +35,6 @@ mcp = ["brk_mcp"]
 parser = ["brk_parser"]
 interface = ["brk_interface"]
 server = ["brk_server"]
-state = ["brk_state"]
 store = ["brk_store"]
 vec = ["brk_vec"]
 
@@ -53,7 +51,6 @@ brk_mcp = { workspace = true, optional = true }
 brk_parser = { workspace = true, optional = true }
 brk_interface = { workspace = true, optional = true }
 brk_server = { workspace = true, optional = true }
-brk_state = { workspace = true, optional = true }
 brk_store = { workspace = true, optional = true }
 brk_vec = { workspace = true, optional = true }
 
diff --git a/crates/brk/flamegraph.sh b/crates/brk/flamegraph.sh
new file mode 100755
index 000000000..1a00c11d7
--- /dev/null
+++ b/crates/brk/flamegraph.sh
@@ -0,0 +1,2 @@
+cargo build --profile profiling
+flamegraph -- ../../target/profiling/brk
diff --git a/crates/brk/samply.sh b/crates/brk/samply.sh
new file mode 100755
index 000000000..f11387b4f
--- /dev/null
+++ b/crates/brk/samply.sh
@@ -0,0 +1,2 @@
+cargo build --profile profiling
+samply record ../../target/profiling/brk
diff --git a/crates/brk/src/lib.rs b/crates/brk/src/lib.rs
index 12223db75..f568a5ba6 100644
--- a/crates/brk/src/lib.rs
+++ b/crates/brk/src/lib.rs
@@ -47,10 +47,6 @@ pub use brk_interface as interface;
 #[doc(inline)]
 pub use brk_server as server;
 
-#[cfg(feature = "state")]
-#[doc(inline)]
-pub use brk_state as state;
-
 #[cfg(feature = "store")]
 #[doc(inline)]
 pub use brk_store as store;
diff --git a/crates/brk_bundler/Cargo.toml b/crates/brk_bundler/Cargo.toml
index 0b4986718..f3f6ebb68 100644
--- a/crates/brk_bundler/Cargo.toml
+++ b/crates/brk_bundler/Cargo.toml
@@ -9,7 +9,8 @@ repository.workspace = true
 
 [dependencies]
 log = { workspace = true }
-notify = "8.0.0"
-brk_rolldown = "0.0.1"
+notify = "8.1.0"
+brk_rolldown = "0.1.1"
+# brk_rolldown = { path = "../../../rolldown/crates/rolldown"}
 sugar_path = "1.2.0"
 tokio = { workspace = true }
diff --git a/crates/brk_bundler/src/lib.rs b/crates/brk_bundler/src/lib.rs
index 7da9996ef..c86a16872 100644
--- a/crates/brk_bundler/src/lib.rs
+++ b/crates/brk_bundler/src/lib.rs
@@ -81,7 +81,7 @@ pub async fn bundle(websites_path: &Path, source_folder: &str, watch: bool) -> i
         let mut entry_watcher = notify::recommended_watcher(
             move |res: Result<notify::Event, notify::Error>| match res {
                 Ok(_) => write_index_clone(),
-                Err(e) => error!("watch error: {:?}", e),
+                Err(e) => error!("watch error: {e:?}"),
             },
         )
         .unwrap();
@@ -112,7 +112,7 @@ pub async fn bundle(websites_path: &Path, source_folder: &str, watch: bool) -> i
                         let _ = fs::copy(&source_path, &dist_path);
                     }
                 }),
-                Err(e) => error!("watch error: {:?}", e),
+                Err(e) => error!("watch error: {e:?}"),
             },
         )
         .unwrap();
diff --git a/crates/brk_cli/Cargo.toml b/crates/brk_cli/Cargo.toml
index 475097f47..c3b74a84e 100644
--- a/crates/brk_cli/Cargo.toml
+++ b/crates/brk_cli/Cargo.toml
@@ -24,7 +24,7 @@ color-eyre = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true }
 tokio = { workspace = true }
-toml = "0.8.23"
+toml = "0.9.2"
 
 [[bin]]
 name = "brk"
diff --git a/crates/brk_computer/Cargo.toml b/crates/brk_computer/Cargo.toml
index 132b60f33..32cc7b581 100644
--- a/crates/brk_computer/Cargo.toml
+++ b/crates/brk_computer/Cargo.toml
@@ -8,6 +8,7 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
+bincode = { workspace = true }
 bitcoin = { workspace = true }
 bitcoincore-rpc = { workspace = true }
 brk_core = { workspace = true }
@@ -16,10 +17,17 @@ brk_fetcher = { workspace = true }
 brk_indexer = { workspace = true }
 brk_logger = { workspace = true }
 brk_parser = { workspace = true }
-brk_state = { workspace = true }
+brk_store = { workspace = true }
 brk_vec = { workspace = true }
 color-eyre = { workspace = true }
+derive_deref = { workspace = true }
+either = "1.15.0"
 fjall = { workspace = true }
-jiff = { workspace = true }
 log = { workspace = true }
 rayon = { workspace = true }
+serde = { workspace = true }
+zerocopy = { workspace = true }
+zerocopy-derive = { workspace = true }
+
+[package.metadata.cargo-machete]
+ignored = ["zerocopy"]
diff --git a/crates/brk_computer/examples/main.rs b/crates/brk_computer/examples/main.rs
index d7520f530..ee69e3f57 100644
--- a/crates/brk_computer/examples/main.rs
+++ b/crates/brk_computer/examples/main.rs
@@ -13,7 +13,8 @@ pub fn main() -> color_eyre::Result<()> {
 
     brk_logger::init(Some(Path::new(".log")));
 
-    let bitcoin_dir = default_bitcoin_path();
+    // let bitcoin_dir = default_bitcoin_path();
+    let bitcoin_dir = Path::new("/Volumes/WD_BLACK/bitcoin");
 
     let rpc = Box::leak(Box::new(bitcoincore_rpc::Client::new(
         "http://localhost:8332",
@@ -23,11 +24,11 @@ pub fn main() -> color_eyre::Result<()> {
 
     // Can't increase main thread's stack programatically, thus we need to use another thread
     thread::Builder::new()
-        .stack_size(32 * 1024 * 1024)
+        .stack_size(256 * 1024 * 1024)
         .spawn(move || -> color_eyre::Result<()> {
             let parser = Parser::new(bitcoin_dir.join("blocks"), default_brk_path(), rpc);
 
-            let _outputs_dir = default_brk_path().join("outputs");
+            let _outputs_dir = Path::new("/Volumes/WD_BLACK/brk").join("outputs");
             let outputs_dir = _outputs_dir.as_path();
             // let outputs_dir = Path::new("../../_outputs");
 
diff --git a/crates/brk_computer/flamegraph.sh b/crates/brk_computer/flamegraph.sh
new file mode 100755
index 000000000..23a23b08b
--- /dev/null
+++ b/crates/brk_computer/flamegraph.sh
@@ -0,0 +1,2 @@
+cargo build --profile profiling
+flamegraph -- ../../target/profiling/examples/main
diff --git a/crates/brk_computer/samply.sh b/crates/brk_computer/samply.sh
new file mode 100755
index 000000000..d32802d12
--- /dev/null
+++ b/crates/brk_computer/samply.sh
@@ -0,0 +1,2 @@
+cargo build --example main --profile profiling
+samply record ../../target/profiling/examples/main
diff --git a/crates/brk_computer/src/lib.rs b/crates/brk_computer/src/lib.rs
index 6bb159a1e..c2e5b1cbc 100644
--- a/crates/brk_computer/src/lib.rs
+++ b/crates/brk_computer/src/lib.rs
@@ -10,12 +10,14 @@ use brk_exit::Exit;
 use brk_fetcher::Fetcher;
 use brk_indexer::Indexer;
 use brk_vec::{Computation, Format};
+use log::info;
 
+mod states;
 mod stores;
 mod utils;
 mod vecs;
 
-use log::info;
+use states::*;
 use stores::Stores;
 use vecs::Vecs;
 
@@ -66,7 +68,12 @@ impl Computer {
         exit: &Exit,
     ) -> color_eyre::Result<()> {
         info!("Computing...");
-        self.vecs
-            .compute(indexer, starting_indexes, self.fetcher.as_mut(), exit)
+        self.vecs.compute(
+            indexer,
+            starting_indexes,
+            self.fetcher.as_mut(),
+            exit,
+            &mut self.stores,
+        )
     }
 }
diff --git a/crates/brk_state/src/block.rs b/crates/brk_computer/src/states/block.rs
similarity index 100%
rename from crates/brk_state/src/block.rs
rename to crates/brk_computer/src/states/block.rs
diff --git a/crates/brk_computer/src/states/cohorts/address.rs b/crates/brk_computer/src/states/cohorts/address.rs
new file mode 100644
index 000000000..41e5a3749
--- /dev/null
+++ b/crates/brk_computer/src/states/cohorts/address.rs
@@ -0,0 +1,120 @@
+use std::path::Path;
+
+use brk_core::{AddressData, Dollars, Height, Result, Sats};
+
+use crate::SupplyState;
+
+use super::CohortState;
+
+#[derive(Clone)]
+pub struct AddressCohortState {
+    pub address_count: usize,
+    pub inner: CohortState,
+}
+
+impl AddressCohortState {
+    pub fn default_and_import(path: &Path, name: &str, compute_dollars: bool) -> Result<Self> {
+        Ok(Self {
+            address_count: 0,
+            inner: CohortState::default_and_import(path, name, compute_dollars)?,
+        })
+    }
+
+    pub fn height(&self) -> Option<Height> {
+        self.inner.height()
+    }
+
+    pub fn reset_price_to_amount(&mut self) -> Result<()> {
+        self.inner.reset_price_to_amount()
+    }
+
+    pub fn reset_single_iteration_values(&mut self) {
+        self.inner.reset_single_iteration_values();
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn send(
+        &mut self,
+        addressdata: &mut AddressData,
+        value: Sats,
+        current_price: Option<Dollars>,
+        prev_price: Option<Dollars>,
+        blocks_old: usize,
+        days_old: f64,
+        older_than_hour: bool,
+    ) -> Result<()> {
+        let compute_price = current_price.is_some();
+
+        let prev_realized_price = compute_price.then(|| addressdata.realized_price());
+        let prev_supply_state = SupplyState {
+            utxos: addressdata.outputs_len as usize,
+            value: addressdata.amount(),
+        };
+
+        addressdata.send(value, prev_price)?;
+
+        let supply_state = SupplyState {
+            utxos: addressdata.outputs_len as usize,
+            value: addressdata.amount(),
+        };
+
+        self.inner.send_(
+            &SupplyState { utxos: 1, value },
+            current_price,
+            prev_price,
+            blocks_old,
+            days_old,
+            older_than_hour,
+            compute_price.then(|| (addressdata.realized_price(), &supply_state)),
+            prev_realized_price.map(|prev_price| (prev_price, &prev_supply_state)),
+        );
+
+        Ok(())
+    }
+
+    pub fn receive(&mut self, address_data: &mut AddressData, value: Sats, price: Option<Dollars>) {
+        let compute_price = price.is_some();
+
+        let prev_realized_price = compute_price.then(|| address_data.realized_price());
+        let prev_supply_state = SupplyState {
+            utxos: address_data.outputs_len as usize,
+            value: address_data.amount(),
+        };
+
+        address_data.receive(value, price);
+
+        let supply_state = SupplyState {
+            utxos: address_data.outputs_len as usize,
+            value: address_data.amount(),
+        };
+
+        self.inner.receive_(
+            &SupplyState { utxos: 1, value },
+            price,
+            compute_price.then(|| (address_data.realized_price(), &supply_state)),
+            prev_realized_price.map(|prev_price| (prev_price, &prev_supply_state)),
+        );
+    }
+
+    pub fn add(&mut self, addressdata: &AddressData) {
+        self.address_count += 1;
+        self.inner.increment_(
+            &addressdata.into(),
+            addressdata.realized_cap,
+            addressdata.realized_price(),
+        );
+    }
+
+    pub fn subtract(&mut self, addressdata: &AddressData) {
+        self.address_count = self.address_count.checked_sub(1).unwrap();
+        self.inner.decrement_(
+            &addressdata.into(),
+            addressdata.realized_cap,
+            addressdata.realized_price(),
+        );
+    }
+
+    pub fn commit(&mut self, height: Height) -> Result<()> {
+        self.inner.commit(height)
+    }
+}
diff --git a/crates/brk_state/src/cohort.rs b/crates/brk_computer/src/states/cohorts/common.rs
similarity index 59%
rename from crates/brk_state/src/cohort.rs
rename to crates/brk_computer/src/states/cohorts/common.rs
index dde7d5435..ec63241d6 100644
--- a/crates/brk_state/src/cohort.rs
+++ b/crates/brk_computer/src/states/cohorts/common.rs
@@ -2,9 +2,7 @@ use std::{cmp::Ordering, path::Path};
 
 use brk_core::{CheckedSub, Dollars, Height, Result, Sats};
 
-use crate::{PriceToAmount, UnrealizedState};
-
-use super::{RealizedState, SupplyState};
+use crate::{PriceToAmount, RealizedState, SupplyState, UnrealizedState};
 
 #[derive(Clone)]
 pub struct CohortState {
@@ -12,7 +10,8 @@ pub struct CohortState {
     pub realized: Option<RealizedState>,
     pub satblocks_destroyed: Sats,
     pub satdays_destroyed: Sats,
-    pub price_to_amount: PriceToAmount,
+
+    price_to_amount: PriceToAmount,
 }
 
 impl CohortState {
@@ -26,6 +25,22 @@ impl CohortState {
         })
     }
 
+    pub fn height(&self) -> Option<Height> {
+        self.price_to_amount.height()
+    }
+
+    pub fn reset_price_to_amount(&mut self) -> Result<()> {
+        self.price_to_amount.reset()
+    }
+
+    pub fn price_to_amount_first_key_value(&self) -> Option<(&Dollars, &Sats)> {
+        self.price_to_amount.first_key_value()
+    }
+
+    pub fn price_to_amount_last_key_value(&self) -> Option<(&Dollars, &Sats)> {
+        self.price_to_amount.last_key_value()
+    }
+
     pub fn reset_single_iteration_values(&mut self) {
         self.satdays_destroyed = Sats::ZERO;
         self.satblocks_destroyed = Sats::ZERO;
@@ -41,7 +56,23 @@ impl CohortState {
             if let Some(realized) = self.realized.as_mut() {
                 let price = price.unwrap();
                 realized.increment(supply_state, price);
-                *self.price_to_amount.entry(price).or_default() += supply_state.value;
+                self.price_to_amount.increment(price, supply_state);
+            }
+        }
+    }
+
+    pub fn increment_(
+        &mut self,
+        supply_state: &SupplyState,
+        realized_cap: Dollars,
+        realized_price: Dollars,
+    ) {
+        self.supply += supply_state;
+
+        if supply_state.value > Sats::ZERO {
+            if let Some(realized) = self.realized.as_mut() {
+                realized.increment_(realized_cap);
+                self.price_to_amount.increment(realized_price, supply_state);
             }
         }
     }
@@ -53,27 +84,60 @@ impl CohortState {
             if let Some(realized) = self.realized.as_mut() {
                 let price = price.unwrap();
                 realized.decrement(supply_state, price);
-                self.decrement_price_to_amount(supply_state, price);
+                self.price_to_amount.decrement(price, supply_state);
             }
         }
     }
 
-    fn decrement_price_to_amount(&mut self, supply_state: &SupplyState, price: Dollars) {
-        let amount = self.price_to_amount.get_mut(&price).unwrap();
-        *amount -= supply_state.value;
-        if *amount == Sats::ZERO {
-            self.price_to_amount.remove(&price);
+    pub fn decrement_(
+        &mut self,
+        supply_state: &SupplyState,
+        realized_cap: Dollars,
+        realized_price: Dollars,
+    ) {
+        self.supply -= supply_state;
+
+        if supply_state.value > Sats::ZERO {
+            if let Some(realized) = self.realized.as_mut() {
+                realized.decrement_(realized_cap);
+                self.price_to_amount.decrement(realized_price, supply_state);
+            }
         }
     }
 
     pub fn receive(&mut self, supply_state: &SupplyState, price: Option<Dollars>) {
+        self.receive_(
+            supply_state,
+            price,
+            price.map(|price| (price, supply_state)),
+            None,
+        );
+    }
+
+    pub fn receive_(
+        &mut self,
+        supply_state: &SupplyState,
+        price: Option<Dollars>,
+        price_to_amount_increment: Option<(Dollars, &SupplyState)>,
+        price_to_amount_decrement: Option<(Dollars, &SupplyState)>,
+    ) {
         self.supply += supply_state;
 
         if supply_state.value > Sats::ZERO {
             if let Some(realized) = self.realized.as_mut() {
                 let price = price.unwrap();
                 realized.receive(supply_state, price);
-                *self.price_to_amount.entry(price).or_default() += supply_state.value;
+
+                if let Some((price, supply)) = price_to_amount_increment
+                    && supply.value.is_not_zero()
+                {
+                    self.price_to_amount.increment(price, supply);
+                }
+                if let Some((price, supply)) = price_to_amount_decrement
+                    && supply.value.is_not_zero()
+                {
+                    self.price_to_amount.decrement(price, supply);
+                }
             }
         }
     }
@@ -87,6 +151,34 @@ impl CohortState {
         days_old: f64,
         older_than_hour: bool,
     ) {
+        self.send_(
+            supply_state,
+            current_price,
+            prev_price,
+            blocks_old,
+            days_old,
+            older_than_hour,
+            None,
+            prev_price.map(|prev_price| (prev_price, supply_state)),
+        );
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn send_(
+        &mut self,
+        supply_state: &SupplyState,
+        current_price: Option<Dollars>,
+        prev_price: Option<Dollars>,
+        blocks_old: usize,
+        days_old: f64,
+        older_than_hour: bool,
+        price_to_amount_increment: Option<(Dollars, &SupplyState)>,
+        price_to_amount_decrement: Option<(Dollars, &SupplyState)>,
+    ) {
+        if supply_state.utxos == 0 {
+            return;
+        }
+
         self.supply -= supply_state;
 
         if supply_state.value > Sats::ZERO {
@@ -99,7 +191,16 @@ impl CohortState {
                 let current_price = current_price.unwrap();
                 let prev_price = prev_price.unwrap();
                 realized.send(supply_state, current_price, prev_price, older_than_hour);
-                self.decrement_price_to_amount(supply_state, prev_price);
+                if let Some((price, supply)) = price_to_amount_increment
+                    && supply.value.is_not_zero()
+                {
+                    self.price_to_amount.increment(price, supply);
+                }
+                if let Some((price, supply)) = price_to_amount_decrement
+                    && supply.value.is_not_zero()
+                {
+                    self.price_to_amount.decrement(price, supply);
+                }
             }
         }
     }
diff --git a/crates/brk_computer/src/states/cohorts/mod.rs b/crates/brk_computer/src/states/cohorts/mod.rs
new file mode 100644
index 000000000..b3dc7b22f
--- /dev/null
+++ b/crates/brk_computer/src/states/cohorts/mod.rs
@@ -0,0 +1,7 @@
+mod address;
+mod common;
+mod utxo;
+
+pub use address::*;
+pub use common::*;
+pub use utxo::*;
diff --git a/crates/brk_computer/src/states/cohorts/utxo.rs b/crates/brk_computer/src/states/cohorts/utxo.rs
new file mode 100644
index 000000000..15ccd2836
--- /dev/null
+++ b/crates/brk_computer/src/states/cohorts/utxo.rs
@@ -0,0 +1,27 @@
+use std::path::Path;
+
+use brk_core::{Height, Result};
+use derive_deref::{Deref, DerefMut};
+
+use super::CohortState;
+
+#[derive(Clone, Deref, DerefMut)]
+pub struct UTXOCohortState(CohortState);
+
+impl UTXOCohortState {
+    pub fn default_and_import(path: &Path, name: &str, compute_dollars: bool) -> Result<Self> {
+        Ok(Self(CohortState::default_and_import(
+            path,
+            name,
+            compute_dollars,
+        )?))
+    }
+
+    pub fn height(&self) -> Option<Height> {
+        self.0.height()
+    }
+
+    pub fn reset_price_to_amount(&mut self) -> Result<()> {
+        self.0.reset_price_to_amount()
+    }
+}
diff --git a/crates/brk_computer/src/states/mod.rs b/crates/brk_computer/src/states/mod.rs
new file mode 100644
index 000000000..5976a47b9
--- /dev/null
+++ b/crates/brk_computer/src/states/mod.rs
@@ -0,0 +1,15 @@
+mod block;
+mod cohorts;
+mod price_to_amount;
+mod realized;
+mod supply;
+mod transacted;
+mod unrealized;
+
+pub use block::*;
+pub use cohorts::*;
+pub use price_to_amount::*;
+pub use realized::*;
+pub use supply::*;
+pub use transacted::*;
+pub use unrealized::*;
diff --git a/crates/brk_state/src/price_to_amount.rs b/crates/brk_computer/src/states/price_to_amount.rs
similarity index 74%
rename from crates/brk_state/src/price_to_amount.rs
rename to crates/brk_computer/src/states/price_to_amount.rs
index 1b68adca5..493b76336 100644
--- a/crates/brk_state/src/price_to_amount.rs
+++ b/crates/brk_computer/src/states/price_to_amount.rs
@@ -2,7 +2,6 @@ use std::{
     collections::BTreeMap,
     fs::{self, File},
     io::{BufReader, BufWriter},
-    ops::{Deref, DerefMut},
     path::{Path, PathBuf},
 };
 
@@ -11,6 +10,8 @@ use brk_core::{Dollars, Height, Result, Sats};
 use derive_deref::{Deref, DerefMut};
 use serde::{Deserialize, Serialize};
 
+use crate::states::SupplyState;
+
 #[derive(Clone, Debug)]
 pub struct PriceToAmount {
     pathbuf: PathBuf,
@@ -46,8 +47,36 @@ impl PriceToAmount {
         })
     }
 
+    pub fn iter(&self) -> impl Iterator<Item = (&Dollars, &Sats)> {
+        self.state.iter()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.state.is_empty()
+    }
+
+    pub fn first_key_value(&self) -> Option<(&Dollars, &Sats)> {
+        self.state.first_key_value()
+    }
+
+    pub fn last_key_value(&self) -> Option<(&Dollars, &Sats)> {
+        self.state.last_key_value()
+    }
+
+    pub fn increment(&mut self, price: Dollars, supply_state: &SupplyState) {
+        *self.state.entry(price).or_default() += supply_state.value;
+    }
+
+    pub fn decrement(&mut self, price: Dollars, supply_state: &SupplyState) {
+        let amount = self.state.get_mut(&price).unwrap();
+        *amount -= supply_state.value;
+        if *amount == Sats::ZERO {
+            self.state.remove(&price);
+        }
+    }
+
     pub fn reset(&mut self) -> Result<()> {
-        self.clear();
+        self.state.clear();
         self.height = None;
         fs::remove_dir_all(&self.pathbuf)?;
         fs::create_dir_all(&self.pathbuf)?;
@@ -89,16 +118,3 @@ impl PriceToAmount {
         path.join("height")
     }
 }
-
-impl Deref for PriceToAmount {
-    type Target = BTreeMap<Dollars, Sats>;
-    fn deref(&self) -> &Self::Target {
-        &self.state
-    }
-}
-
-impl DerefMut for PriceToAmount {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.state
-    }
-}
diff --git a/crates/brk_state/src/realized.rs b/crates/brk_computer/src/states/realized.rs
similarity index 89%
rename from crates/brk_state/src/realized.rs
rename to crates/brk_computer/src/states/realized.rs
index 7d673ae8d..a4eea6f66 100644
--- a/crates/brk_state/src/realized.rs
+++ b/crates/brk_computer/src/states/realized.rs
@@ -42,6 +42,10 @@ impl RealizedState {
             return;
         }
 
+        self.increment_(price * supply_state.value)
+    }
+
+    pub fn increment_(&mut self, realized_cap: Dollars) {
         if self.cap == Dollars::NAN {
             self.cap = Dollars::ZERO;
             self.profit = Dollars::ZERO;
@@ -52,13 +56,15 @@ impl RealizedState {
             self.adj_value_destroyed = Dollars::ZERO;
         }
 
-        let value = price * supply_state.value;
-        self.cap += value;
+        self.cap += realized_cap;
     }
 
     pub fn decrement(&mut self, supply_state: &SupplyState, price: Dollars) {
-        let value = price * supply_state.value;
-        self.cap = self.cap.checked_sub(value).unwrap();
+        self.decrement_(price * supply_state.value);
+    }
+
+    pub fn decrement_(&mut self, realized_cap: Dollars) {
+        self.cap = self.cap.checked_sub(realized_cap).unwrap();
     }
 
     pub fn receive(&mut self, supply_state: &SupplyState, current_price: Dollars) {
diff --git a/crates/brk_state/src/supply.rs b/crates/brk_computer/src/states/supply.rs
similarity index 80%
rename from crates/brk_state/src/supply.rs
rename to crates/brk_computer/src/states/supply.rs
index c9bd95442..4c26830d3 100644
--- a/crates/brk_state/src/supply.rs
+++ b/crates/brk_computer/src/states/supply.rs
@@ -1,6 +1,6 @@
 use std::ops::{Add, AddAssign, SubAssign};
 
-use brk_core::{CheckedSub, Sats};
+use brk_core::{AddressData, CheckedSub, Sats};
 use serde::Serialize;
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
@@ -39,3 +39,12 @@ impl SubAssign<&SupplyState> for SupplyState {
         self.value = self.value.checked_sub(rhs.value).unwrap();
     }
 }
+
+impl From<&AddressData> for SupplyState {
+    fn from(value: &AddressData) -> Self {
+        Self {
+            utxos: value.outputs_len as usize,
+            value: value.amount(),
+        }
+    }
+}
diff --git a/crates/brk_computer/src/states/transacted.rs b/crates/brk_computer/src/states/transacted.rs
new file mode 100644
index 000000000..64f8c3b73
--- /dev/null
+++ b/crates/brk_computer/src/states/transacted.rs
@@ -0,0 +1,48 @@
+use std::ops::{Add, AddAssign};
+
+use brk_core::{ByAmountRange, GroupedByType, OutputType, Sats};
+
+use super::SupplyState;
+
+#[derive(Default, Debug)]
+pub struct Transacted {
+    pub spendable_supply: SupplyState,
+    pub by_type: GroupedByType<SupplyState>,
+    pub by_size_group: ByAmountRange<SupplyState>,
+}
+
+impl Transacted {
+    #[allow(clippy::inconsistent_digit_grouping)]
+    pub fn iterate(&mut self, value: Sats, _type: OutputType) {
+        let supply = SupplyState { utxos: 1, value };
+
+        *self.by_type.get_mut(_type) += &supply;
+
+        if _type.is_unspendable() {
+            return;
+        }
+
+        self.spendable_supply += &supply;
+
+        *self.by_size_group.get_mut(value) += &supply;
+    }
+}
+
+impl Add for Transacted {
+    type Output = Self;
+    fn add(self, rhs: Self) -> Self::Output {
+        Self {
+            spendable_supply: self.spendable_supply + rhs.spendable_supply,
+            by_type: self.by_type + rhs.by_type,
+            by_size_group: self.by_size_group + rhs.by_size_group,
+        }
+    }
+}
+
+impl AddAssign for Transacted {
+    fn add_assign(&mut self, rhs: Self) {
+        self.by_size_group += rhs.by_size_group;
+        self.spendable_supply += &rhs.spendable_supply;
+        self.by_type += rhs.by_type;
+    }
+}
diff --git a/crates/brk_state/src/unrealized.rs b/crates/brk_computer/src/states/unrealized.rs
similarity index 100%
rename from crates/brk_state/src/unrealized.rs
rename to crates/brk_computer/src/states/unrealized.rs
diff --git a/crates/brk_computer/src/stores.rs b/crates/brk_computer/src/stores.rs
index b1b886c68..f52d94ac1 100644
--- a/crates/brk_computer/src/stores.rs
+++ b/crates/brk_computer/src/stores.rs
@@ -1,34 +1,641 @@
-use std::path::Path;
+use std::{path::Path, thread};
 
-use brk_core::Version;
-use fjall::TransactionalKeyspace;
+use brk_core::{
+    AddressData, ByAddressType, EmptyAddressData, Height, OutputType, P2AAddressIndex,
+    P2PK33AddressIndex, P2PK65AddressIndex, P2PKHAddressIndex, P2SHAddressIndex, P2TRAddressIndex,
+    P2WPKHAddressIndex, P2WSHAddressIndex, Result, TypeIndex, Version,
+};
+use brk_store::{AnyStore, Store};
+use fjall::{PersistMode, TransactionalKeyspace};
+use log::info;
 
-const _VERSION: Version = Version::ZERO;
+use crate::vecs::stateful::{AddressTypeToTypeIndexTree, WithAddressDataSource};
+
+const VERSION: Version = Version::ZERO;
 
 #[derive(Clone)]
 pub struct Stores {
-    // pub address_to_utxos_received: Store<AddressIndexOutputIndex, Unit>,
-    // pub address_to_utxos_spent: Store<AddressIndexOutputIndex, Unit>,
+    keyspace: TransactionalKeyspace,
+
+    pub p2aaddressindex_to_addressdata: Store<P2AAddressIndex, AddressData>,
+    pub p2aaddressindex_to_emptyaddressdata: Store<P2AAddressIndex, EmptyAddressData>,
+    pub p2pk33addressindex_to_addressdata: Store<P2PK33AddressIndex, AddressData>,
+    pub p2pk33addressindex_to_emptyaddressdata: Store<P2PK33AddressIndex, EmptyAddressData>,
+    pub p2pk65addressindex_to_addressdata: Store<P2PK65AddressIndex, AddressData>,
+    pub p2pk65addressindex_to_emptyaddressdata: Store<P2PK65AddressIndex, EmptyAddressData>,
+    pub p2pkhaddressindex_to_addressdata: Store<P2PKHAddressIndex, AddressData>,
+    pub p2pkhaddressindex_to_emptyaddressdata: Store<P2PKHAddressIndex, EmptyAddressData>,
+    pub p2shaddressindex_to_addressdata: Store<P2SHAddressIndex, AddressData>,
+    pub p2shaddressindex_to_emptyaddressdata: Store<P2SHAddressIndex, EmptyAddressData>,
+    pub p2traddressindex_to_addressdata: Store<P2TRAddressIndex, AddressData>,
+    pub p2traddressindex_to_emptyaddressdata: Store<P2TRAddressIndex, EmptyAddressData>,
+    pub p2wpkhaddressindex_to_addressdata: Store<P2WPKHAddressIndex, AddressData>,
+    pub p2wpkhaddressindex_to_emptyaddressdata: Store<P2WPKHAddressIndex, EmptyAddressData>,
+    pub p2wshaddressindex_to_addressdata: Store<P2WSHAddressIndex, AddressData>,
+    pub p2wshaddressindex_to_emptyaddressdata: Store<P2WSHAddressIndex, EmptyAddressData>,
 }
 
 impl Stores {
-    pub fn import(_: &Path, _: Version, _: &TransactionalKeyspace) -> color_eyre::Result<Self> {
-        // let address_to_utxos_received = Store::import(
-        //     keyspace.clone(),
-        //     path,
-        //     "address_to_utxos_received",
-        //     version + VERSION + Version::ZERO,
-        // )?;
-        // let address_to_utxos_spent = Store::import(
-        //     keyspace.clone(),
-        //     path,
-        //     "address_to_utxos_spent",
-        //     version + VERSION + Version::ZERO,
-        // )?;
+    pub fn import(
+        path: &Path,
+        version: Version,
+        keyspace: &TransactionalKeyspace,
+    ) -> color_eyre::Result<Self> {
+        let (
+            (p2aaddressindex_to_addressdata, p2aaddressindex_to_emptyaddressdata),
+            (p2pk33addressindex_to_addressdata, p2pk33addressindex_to_emptyaddressdata),
+            (p2pk65addressindex_to_addressdata, p2pk65addressindex_to_emptyaddressdata),
+            (p2pkhaddressindex_to_addressdata, p2pkhaddressindex_to_emptyaddressdata),
+            (p2shaddressindex_to_addressdata, p2shaddressindex_to_emptyaddressdata),
+            (p2traddressindex_to_addressdata, p2traddressindex_to_emptyaddressdata),
+            (p2wpkhaddressindex_to_addressdata, p2wpkhaddressindex_to_emptyaddressdata),
+            (p2wshaddressindex_to_addressdata, p2wshaddressindex_to_emptyaddressdata),
+        ) = thread::scope(|scope| {
+            let p2a = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2aaddressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2aaddressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            let p2pk33 = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2pk33addressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2pk33addressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            let p2pk65 = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2pk65addressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2pk65addressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            let p2pkh = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2pkhaddressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2pkhaddressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            let p2sh = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2shaddressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2shaddressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            let p2tr = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2traddressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2traddressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            let p2wpkh = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2wpkhaddressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2wpkhaddressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            let p2wsh = scope.spawn(|| {
+                (
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2wshaddressindex_to_addressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                    Store::import(
+                        keyspace,
+                        path,
+                        "p2wshaddressindex_to_emptyaddressdata",
+                        version + VERSION + Version::ZERO,
+                        None,
+                    )
+                    .unwrap(),
+                )
+            });
+
+            (
+                p2a.join().unwrap(),
+                p2pk33.join().unwrap(),
+                p2pk65.join().unwrap(),
+                p2pkh.join().unwrap(),
+                p2sh.join().unwrap(),
+                p2tr.join().unwrap(),
+                p2wpkh.join().unwrap(),
+                p2wsh.join().unwrap(),
+            )
+        });
 
         Ok(Self {
-            // address_to_utxos_received,
-            // address_to_utxos_spent,
+            keyspace: keyspace.clone(),
+
+            p2aaddressindex_to_addressdata,
+            p2aaddressindex_to_emptyaddressdata,
+
+            p2pk33addressindex_to_addressdata,
+            p2pk33addressindex_to_emptyaddressdata,
+
+            p2pk65addressindex_to_addressdata,
+            p2pk65addressindex_to_emptyaddressdata,
+
+            p2pkhaddressindex_to_addressdata,
+            p2pkhaddressindex_to_emptyaddressdata,
+
+            p2shaddressindex_to_addressdata,
+            p2shaddressindex_to_emptyaddressdata,
+
+            p2traddressindex_to_addressdata,
+            p2traddressindex_to_emptyaddressdata,
+
+            p2wpkhaddressindex_to_addressdata,
+            p2wpkhaddressindex_to_emptyaddressdata,
+
+            p2wshaddressindex_to_addressdata,
+            p2wshaddressindex_to_emptyaddressdata,
         })
     }
+
+    pub fn starting_height(&self) -> Height {
+        self.as_slice()
+            .into_iter()
+            .map(|store| store.height().map(Height::incremented).unwrap_or_default())
+            .min()
+            .unwrap()
+    }
+
+    pub fn reset(&mut self) -> Result<()> {
+        info!("Resetting stores...");
+        info!("> If it gets stuck here, stop the program and start it again");
+
+        self.as_mut_slice()
+            .into_iter()
+            .try_for_each(|store| store.reset())?;
+
+        self.keyspace
+            .persist(PersistMode::SyncAll)
+            .map_err(|e| e.into())
+    }
+
+    pub fn get_addressdata(
+        &self,
+        address_type: OutputType,
+        type_index: TypeIndex,
+    ) -> Result<Option<AddressData>> {
+        Ok(match address_type {
+            OutputType::P2A => self
+                .p2aaddressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2PK33 => self
+                .p2pk33addressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2PK65 => self
+                .p2pk65addressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2PKH => self
+                .p2pkhaddressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2SH => self
+                .p2shaddressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2TR => self
+                .p2traddressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2WPKH => self
+                .p2wpkhaddressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2WSH => self
+                .p2wshaddressindex_to_addressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            _ => unreachable!(),
+        })
+    }
+
+    pub fn get_emptyaddressdata(
+        &self,
+        address_type: OutputType,
+        type_index: TypeIndex,
+    ) -> Result<Option<EmptyAddressData>> {
+        Ok(match address_type {
+            OutputType::P2A => self
+                .p2aaddressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2PK33 => self
+                .p2pk33addressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2PK65 => self
+                .p2pk65addressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2PKH => self
+                .p2pkhaddressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2SH => self
+                .p2shaddressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2TR => self
+                .p2traddressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2WPKH => self
+                .p2wpkhaddressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            OutputType::P2WSH => self
+                .p2wshaddressindex_to_emptyaddressdata
+                .get(&type_index.into())?
+                .map(|c| c.into_owned()),
+            _ => unreachable!(),
+        })
+    }
+
+    pub fn commit(
+        &mut self,
+        height: Height,
+        addresstype_to_typeindex_to_addressdata: AddressTypeToTypeIndexTree<
+            WithAddressDataSource<AddressData>,
+        >,
+        addresstype_to_typeindex_to_emptyaddressdata: AddressTypeToTypeIndexTree<
+            WithAddressDataSource<EmptyAddressData>,
+        >,
+    ) -> Result<()> {
+        let ByAddressType {
+            p2pk65,
+            p2pk33,
+            p2pkh,
+            p2sh,
+            p2wpkh,
+            p2wsh,
+            p2tr,
+            p2a,
+        } = addresstype_to_typeindex_to_addressdata.unwrap();
+
+        let ByAddressType {
+            p2pk65: empty_p2pk65,
+            p2pk33: empty_p2pk33,
+            p2pkh: empty_p2pkh,
+            p2sh: empty_p2sh,
+            p2wpkh: empty_p2wpkh,
+            p2wsh: empty_p2wsh,
+            p2tr: empty_p2tr,
+            p2a: empty_p2a,
+        } = addresstype_to_typeindex_to_emptyaddressdata.unwrap();
+
+        thread::scope(|s| {
+            s.spawn(|| {
+                self.p2aaddressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2a
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2a.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            s.spawn(|| {
+                self.p2pk33addressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2pk33
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2pk33.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            s.spawn(|| {
+                self.p2pk65addressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2pk65
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2pk65.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            s.spawn(|| {
+                self.p2pkhaddressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2pkh
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2pkh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            s.spawn(|| {
+                self.p2shaddressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2sh
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2sh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            s.spawn(|| {
+                self.p2traddressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2tr
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2tr.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            s.spawn(|| {
+                self.p2wpkhaddressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2wpkh
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2wpkh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            s.spawn(|| {
+                self.p2wshaddressindex_to_addressdata.commit_(
+                    height,
+                    empty_p2wsh
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_addressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    p2wsh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+        });
+
+        thread::scope(|scope| {
+            scope.spawn(|| {
+                self.p2aaddressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2a.iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2a.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            scope.spawn(|| {
+                self.p2pk33addressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2pk33
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2pk33.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            scope.spawn(|| {
+                self.p2pk65addressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2pk65
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2pk65.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            scope.spawn(|| {
+                self.p2pkhaddressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2pkh
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2pkh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            scope.spawn(|| {
+                self.p2shaddressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2sh.iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2sh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            scope.spawn(|| {
+                self.p2traddressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2tr.iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2tr.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            scope.spawn(|| {
+                self.p2wpkhaddressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2wpkh
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2wpkh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+            scope.spawn(|| {
+                self.p2wshaddressindex_to_emptyaddressdata.commit_(
+                    height,
+                    p2wsh
+                        .iter()
+                        .filter(|(_, addressdata)| addressdata.is_from_emptyaddressdata())
+                        .map(|(typeindex, _)| (*typeindex).into()),
+                    empty_p2wsh.iter().map(|(typeindex, addressdata)| {
+                        ((*typeindex).into(), addressdata.deref().clone())
+                    }),
+                )
+            });
+        });
+
+        self.keyspace
+            .persist(PersistMode::SyncAll)
+            .map_err(|e| e.into())
+    }
+
+    pub fn as_slice(&self) -> [&(dyn AnyStore + Send + Sync); 16] {
+        [
+            &self.p2aaddressindex_to_addressdata,
+            &self.p2aaddressindex_to_emptyaddressdata,
+            &self.p2pk33addressindex_to_addressdata,
+            &self.p2pk33addressindex_to_emptyaddressdata,
+            &self.p2pk65addressindex_to_addressdata,
+            &self.p2pk65addressindex_to_emptyaddressdata,
+            &self.p2pkhaddressindex_to_addressdata,
+            &self.p2pkhaddressindex_to_emptyaddressdata,
+            &self.p2shaddressindex_to_addressdata,
+            &self.p2shaddressindex_to_emptyaddressdata,
+            &self.p2traddressindex_to_addressdata,
+            &self.p2traddressindex_to_emptyaddressdata,
+            &self.p2wpkhaddressindex_to_addressdata,
+            &self.p2wpkhaddressindex_to_emptyaddressdata,
+            &self.p2wshaddressindex_to_addressdata,
+            &self.p2wshaddressindex_to_emptyaddressdata,
+        ]
+    }
+
+    fn as_mut_slice(&mut self) -> [&mut (dyn AnyStore + Send + Sync); 16] {
+        [
+            &mut self.p2aaddressindex_to_addressdata,
+            &mut self.p2aaddressindex_to_emptyaddressdata,
+            &mut self.p2pk33addressindex_to_addressdata,
+            &mut self.p2pk33addressindex_to_emptyaddressdata,
+            &mut self.p2pk65addressindex_to_addressdata,
+            &mut self.p2pk65addressindex_to_emptyaddressdata,
+            &mut self.p2pkhaddressindex_to_addressdata,
+            &mut self.p2pkhaddressindex_to_emptyaddressdata,
+            &mut self.p2shaddressindex_to_addressdata,
+            &mut self.p2shaddressindex_to_emptyaddressdata,
+            &mut self.p2traddressindex_to_addressdata,
+            &mut self.p2traddressindex_to_emptyaddressdata,
+            &mut self.p2wpkhaddressindex_to_addressdata,
+            &mut self.p2wpkhaddressindex_to_emptyaddressdata,
+            &mut self.p2wshaddressindex_to_addressdata,
+            &mut self.p2wshaddressindex_to_emptyaddressdata,
+        ]
+    }
 }
diff --git a/crates/brk_computer/src/vecs/blocks.rs b/crates/brk_computer/src/vecs/blocks.rs
index 75644192d..9a3a0da59 100644
--- a/crates/brk_computer/src/vecs/blocks.rs
+++ b/crates/brk_computer/src/vecs/blocks.rs
@@ -8,9 +8,11 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, EagerVec, Format};
 
+use crate::vecs::grouped::Source;
+
 use super::{
     Indexes,
-    grouped::{ComputedVecsFromDateIndex, ComputedVecsFromHeight, StorableVecGeneatorOptions},
+    grouped::{ComputedVecsFromDateIndex, ComputedVecsFromHeight, VecBuilderOptions},
     indexes,
 };
 
@@ -34,8 +36,9 @@ impl Vecs {
     pub fn forced_import(
         path: &Path,
         version: Version,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
+        indexes: &indexes::Vecs,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
             height_to_interval: EagerVec::forced_import(
@@ -47,18 +50,22 @@ impl Vecs {
             timeindexes_to_timestamp: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "timestamp",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_first(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_first(),
             )?,
             indexes_to_block_interval: ComputedVecsFromHeight::forced_import(
                 path,
                 "block_interval",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_percentiles()
                     .add_minmax()
                     .add_average(),
@@ -66,32 +73,32 @@ impl Vecs {
             indexes_to_block_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "block_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_block_weight: ComputedVecsFromHeight::forced_import(
                 path,
                 "block_weight",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_block_size: ComputedVecsFromHeight::forced_import(
                 path,
                 "block_size",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             height_to_vbytes: EagerVec::forced_import(
                 path,
@@ -102,12 +109,12 @@ impl Vecs {
             indexes_to_block_vbytes: ComputedVecsFromHeight::forced_import(
                 path,
                 "block_vbytes",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             difficultyepoch_to_timestamp: EagerVec::forced_import(
                 path,
diff --git a/crates/brk_computer/src/vecs/cointime.rs b/crates/brk_computer/src/vecs/cointime.rs
index ecb6563ef..c98e410e7 100644
--- a/crates/brk_computer/src/vecs/cointime.rs
+++ b/crates/brk_computer/src/vecs/cointime.rs
@@ -7,13 +7,13 @@ use brk_vec::{AnyCollectableVec, Computation, Format, VecIterator};
 
 use crate::vecs::{
     fetched,
-    grouped::{ComputedRatioVecsFromDateIndex, ComputedValueVecsFromHeight},
+    grouped::{ComputedRatioVecsFromDateIndex, ComputedValueVecsFromHeight, Source},
     stateful, transactions,
 };
 
 use super::{
     Indexes,
-    grouped::{ComputedVecsFromHeight, StorableVecGeneatorOptions},
+    grouped::{ComputedVecsFromHeight, VecBuilderOptions},
     indexes,
 };
 
@@ -51,8 +51,9 @@ impl Vecs {
     pub fn forced_import(
         path: &Path,
         version: Version,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
+        indexes: &indexes::Vecs,
         fetched: Option<&fetched::Vecs>,
     ) -> color_eyre::Result<Self> {
         let compute_dollars = fetched.is_some();
@@ -61,194 +62,234 @@ impl Vecs {
             indexes_to_coinblocks_created: ComputedVecsFromHeight::forced_import(
                 path,
                 "coinblocks_created",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_coinblocks_stored: ComputedVecsFromHeight::forced_import(
                 path,
                 "coinblocks_stored",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_liveliness: ComputedVecsFromHeight::forced_import(
                 path,
                 "liveliness",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_vaultedness: ComputedVecsFromHeight::forced_import(
                 path,
                 "vaultedness",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_activity_to_vaultedness_ratio: ComputedVecsFromHeight::forced_import(
                 path,
                 "activity_to_vaultedness_ratio",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_vaulted_supply: ComputedValueVecsFromHeight::forced_import(
                 path,
                 "vaulted_supply",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ONE,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                VecBuilderOptions::default().add_last(),
                 compute_dollars,
+                indexes,
             )?,
             indexes_to_active_supply: ComputedValueVecsFromHeight::forced_import(
                 path,
                 "active_supply",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ONE,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                VecBuilderOptions::default().add_last(),
                 compute_dollars,
+                indexes,
             )?,
             indexes_to_thermo_cap: ComputedVecsFromHeight::forced_import(
                 path,
                 "thermo_cap",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ONE,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_investor_cap: ComputedVecsFromHeight::forced_import(
                 path,
                 "investor_cap",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ONE,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_vaulted_cap: ComputedVecsFromHeight::forced_import(
                 path,
                 "vaulted_cap",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ONE,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_active_cap: ComputedVecsFromHeight::forced_import(
                 path,
                 "active_cap",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ONE,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_vaulted_price: ComputedVecsFromHeight::forced_import(
                 path,
                 "vaulted_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_vaulted_price_ratio: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "vaulted_price",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_active_price: ComputedVecsFromHeight::forced_import(
                 path,
                 "active_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_active_price_ratio: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "active_price",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_true_market_mean: ComputedVecsFromHeight::forced_import(
                 path,
                 "true_market_mean",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_true_market_mean_ratio: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "true_market_mean",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_cointime_value_destroyed: ComputedVecsFromHeight::forced_import(
                 path,
                 "cointime_value_destroyed",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_cointime_value_created: ComputedVecsFromHeight::forced_import(
                 path,
                 "cointime_value_created",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_cointime_value_stored: ComputedVecsFromHeight::forced_import(
                 path,
                 "cointime_value_stored",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_cointime_price: ComputedVecsFromHeight::forced_import(
                 path,
                 "cointime_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_cointime_cap: ComputedVecsFromHeight::forced_import(
                 path,
                 "cointime_cap",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_cointime_price_ratio: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "cointime_price",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
         })
     }
@@ -264,7 +305,7 @@ impl Vecs {
         stateful: &stateful::Vecs,
         exit: &Exit,
     ) -> color_eyre::Result<()> {
-        let circulating_supply = &stateful.utxos_vecs.all.1.height_to_supply;
+        let circulating_supply = &stateful.utxo_vecs.all.1.height_to_supply;
 
         self.indexes_to_coinblocks_created.compute_all(
             indexer,
@@ -282,7 +323,7 @@ impl Vecs {
         )?;
 
         let indexes_to_coinblocks_destroyed =
-            &stateful.utxos_vecs.all.1.indexes_to_coinblocks_destroyed;
+            &stateful.utxo_vecs.all.1.indexes_to_coinblocks_destroyed;
 
         self.indexes_to_coinblocks_stored.compute_all(
             indexer,
@@ -392,7 +433,7 @@ impl Vecs {
 
         if let Some(fetched) = fetched {
             let realized_cap = stateful
-                .utxos_vecs
+                .utxo_vecs
                 .all
                 .1
                 .height_to_realized_cap
@@ -400,7 +441,7 @@ impl Vecs {
                 .unwrap();
 
             let realized_price = stateful
-                .utxos_vecs
+                .utxo_vecs
                 .all
                 .1
                 .indexes_to_realized_price
diff --git a/crates/brk_computer/src/vecs/constants.rs b/crates/brk_computer/src/vecs/constants.rs
index 2180f727d..6607df3d5 100644
--- a/crates/brk_computer/src/vecs/constants.rs
+++ b/crates/brk_computer/src/vecs/constants.rs
@@ -5,9 +5,11 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, AnyVec, Computation, Format};
 
+use crate::vecs::grouped::Source;
+
 use super::{
     Indexes,
-    grouped::{ComputedVecsFromHeight, StorableVecGeneatorOptions},
+    grouped::{ComputedVecsFromHeight, VecBuilderOptions},
     indexes,
 };
 
@@ -25,41 +27,50 @@ impl Vecs {
     pub fn forced_import(
         path: &Path,
         version: Version,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
+        indexes: &indexes::Vecs,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
             constant_0: ComputedVecsFromHeight::forced_import(
                 path,
                 "constant_0",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             constant_1: ComputedVecsFromHeight::forced_import(
                 path,
                 "constant_1",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             constant_50: ComputedVecsFromHeight::forced_import(
                 path,
                 "constant_50",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             constant_100: ComputedVecsFromHeight::forced_import(
                 path,
                 "constant_100",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
         })
     }
diff --git a/crates/brk_computer/src/vecs/fetched.rs b/crates/brk_computer/src/vecs/fetched.rs
index 2fdd97e17..8ae500870 100644
--- a/crates/brk_computer/src/vecs/fetched.rs
+++ b/crates/brk_computer/src/vecs/fetched.rs
@@ -2,18 +2,22 @@ use std::path::Path;
 
 use brk_core::{
     Cents, Close, DateIndex, DecadeIndex, DifficultyEpoch, Dollars, Height, High, Low, MonthIndex,
-    OHLCCents, OHLCDollars, OHLCSats, Open, QuarterIndex, Sats, Version, WeekIndex, YearIndex,
+    OHLCCents, OHLCDollars, OHLCSats, Open, QuarterIndex, Sats, SemesterIndex, Version, WeekIndex,
+    YearIndex,
 };
 use brk_exit::Exit;
 use brk_fetcher::Fetcher;
 use brk_indexer::Indexer;
-use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, EagerVec, Format, StoredIndex};
+use brk_vec::{
+    AnyCollectableVec, AnyIterableVec, AnyVec, Computation, EagerVec, Format, StoredIndex,
+    VecIterator,
+};
+
+use crate::vecs::grouped::Source;
 
 use super::{
     Indexes,
-    grouped::{
-        ComputedVecsFromDateIndex, ComputedVecsFromHeightStrict, StorableVecGeneatorOptions,
-    },
+    grouped::{ComputedVecsFromDateIndex, ComputedVecsFromHeightStrict, VecBuilderOptions},
     indexes,
 };
 
@@ -57,6 +61,8 @@ pub struct Vecs {
     pub monthindex_to_ohlc_in_sats: EagerVec<MonthIndex, OHLCSats>,
     pub quarterindex_to_ohlc: EagerVec<QuarterIndex, OHLCDollars>,
     pub quarterindex_to_ohlc_in_sats: EagerVec<QuarterIndex, OHLCSats>,
+    pub semesterindex_to_ohlc: EagerVec<SemesterIndex, OHLCDollars>,
+    pub semesterindex_to_ohlc_in_sats: EagerVec<SemesterIndex, OHLCSats>,
     pub yearindex_to_ohlc: EagerVec<YearIndex, OHLCDollars>,
     pub yearindex_to_ohlc_in_sats: EagerVec<YearIndex, OHLCSats>,
     // pub halvingepoch_to_ohlc: StorableVec<Halvingepoch, OHLCDollars>,
@@ -72,8 +78,9 @@ impl Vecs {
     pub fn forced_import(
         path: &Path,
         version: Version,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
+        indexes: &indexes::Vecs,
     ) -> color_eyre::Result<Self> {
         let mut fetched_path = path.to_owned();
         fetched_path.pop();
@@ -83,7 +90,7 @@ impl Vecs {
             dateindex_to_ohlc_in_cents: EagerVec::forced_import(
                 &fetched_path,
                 "ohlc_in_cents",
-                version + VERSION + Version::ZERO,
+                version + Version::ZERO,
                 format,
             )?,
             dateindex_to_ohlc: EagerVec::forced_import(
@@ -125,7 +132,7 @@ impl Vecs {
             height_to_ohlc_in_cents: EagerVec::forced_import(
                 &fetched_path,
                 "ohlc_in_cents",
-                version + VERSION + Version::ZERO,
+                version + Version::ZERO,
                 format,
             )?,
             height_to_ohlc: EagerVec::forced_import(
@@ -167,122 +174,138 @@ impl Vecs {
             timeindexes_to_open: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "open",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_first(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_first(),
             )?,
             timeindexes_to_high: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "high",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_max(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_max(),
             )?,
             timeindexes_to_low: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "low",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_min(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_min(),
             )?,
             timeindexes_to_close: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "close",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             timeindexes_to_open_in_sats: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "open_in_sats",
-                true,
+                Source::Compute,
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_first(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_first(),
             )?,
             timeindexes_to_high_in_sats: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "high_in_sats",
-                true,
+                Source::Compute,
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_max(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_max(),
             )?,
             timeindexes_to_low_in_sats: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "low_in_sats",
-                true,
+                Source::Compute,
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_min(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_min(),
             )?,
             timeindexes_to_close_in_sats: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "close_in_sats",
-                true,
+                Source::Compute,
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             chainindexes_to_open: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "open",
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_first(),
+                VecBuilderOptions::default().add_first(),
             )?,
             chainindexes_to_high: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "high",
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_max(),
+                VecBuilderOptions::default().add_max(),
             )?,
             chainindexes_to_low: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "low",
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_min(),
+                VecBuilderOptions::default().add_min(),
             )?,
             chainindexes_to_close: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "close",
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                VecBuilderOptions::default().add_last(),
             )?,
             chainindexes_to_open_in_sats: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "open_in_sats",
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_first(),
+                VecBuilderOptions::default().add_first(),
             )?,
             chainindexes_to_high_in_sats: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "high_in_sats",
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_max(),
+                VecBuilderOptions::default().add_max(),
             )?,
             chainindexes_to_low_in_sats: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "low_in_sats",
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_min(),
+                VecBuilderOptions::default().add_min(),
             )?,
             chainindexes_to_close_in_sats: ComputedVecsFromHeightStrict::forced_import(
                 path,
                 "close_in_sats",
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                VecBuilderOptions::default().add_last(),
             )?,
             weekindex_to_ohlc: EagerVec::forced_import(
                 path,
@@ -332,6 +355,18 @@ impl Vecs {
                 version + VERSION + VERSION_IN_SATS + Version::ZERO,
                 format,
             )?,
+            semesterindex_to_ohlc: EagerVec::forced_import(
+                path,
+                "ohlc",
+                version + VERSION + Version::ZERO,
+                format,
+            )?,
+            semesterindex_to_ohlc_in_sats: EagerVec::forced_import(
+                path,
+                "ohlc_in_sats",
+                version + VERSION + VERSION_IN_SATS + Version::ZERO,
+                format,
+            )?,
             yearindex_to_ohlc: EagerVec::forced_import(
                 path,
                 "ohlc",
@@ -422,21 +457,34 @@ impl Vecs {
             exit,
         )?;
 
+        let mut prev = None;
         self.dateindex_to_ohlc_in_cents.compute_transform(
             starting_indexes.dateindex,
             &indexes.dateindex_to_date,
             |(di, d, this)| {
-                let mut ohlc = fetcher.get_date(d).unwrap();
-                if let Some(prev) = di.decremented() {
-                    let prev_open = *this
-                        .get_or_read(prev, &this.mmap().load())
-                        .unwrap()
-                        .unwrap()
-                        .close;
+                if prev.is_none() {
+                    let i = di.unwrap_to_usize();
+                    prev.replace(if i > 0 {
+                        this.into_iter().unwrap_get_inner_(i - 1)
+                    } else {
+                        OHLCCents::default()
+                    });
+                }
+
+                let ohlc = if di.unwrap_to_usize() + 100 >= this.len()
+                    && let Ok(mut ohlc) = fetcher.get_date(d)
+                {
+                    let prev_open = *prev.as_ref().unwrap().close;
                     *ohlc.open = prev_open;
                     *ohlc.high = (*ohlc.high).max(prev_open);
                     *ohlc.low = (*ohlc.low).min(prev_open);
-                }
+                    ohlc
+                } else {
+                    prev.clone().unwrap()
+                };
+
+                prev.replace(ohlc.clone());
+
                 (di, ohlc)
             },
             exit,
@@ -604,12 +652,15 @@ impl Vecs {
             starting_indexes.weekindex,
             self.timeindexes_to_close.weekindex.unwrap_last(),
             |(i, close, ..)| {
+                let open = weekindex_first_iter.unwrap_get_inner(i);
+                let high = weekindex_max_iter.unwrap_get_inner(i);
+                let low = weekindex_min_iter.unwrap_get_inner(i);
                 (
                     i,
                     OHLCDollars {
-                        open: weekindex_first_iter.unwrap_get_inner(i),
-                        high: weekindex_max_iter.unwrap_get_inner(i),
-                        low: weekindex_min_iter.unwrap_get_inner(i),
+                        open,
+                        high,
+                        low,
                         close,
                     },
                 )
@@ -687,6 +738,27 @@ impl Vecs {
             exit,
         )?;
 
+        let mut semesterindex_first_iter =
+            self.timeindexes_to_open.semesterindex.unwrap_first().iter();
+        let mut semesterindex_max_iter = self.timeindexes_to_high.semesterindex.unwrap_max().iter();
+        let mut semesterindex_min_iter = self.timeindexes_to_low.semesterindex.unwrap_min().iter();
+        self.semesterindex_to_ohlc.compute_transform(
+            starting_indexes.semesterindex,
+            self.timeindexes_to_close.semesterindex.unwrap_last(),
+            |(i, close, ..)| {
+                (
+                    i,
+                    OHLCDollars {
+                        open: semesterindex_first_iter.unwrap_get_inner(i),
+                        high: semesterindex_max_iter.unwrap_get_inner(i),
+                        low: semesterindex_min_iter.unwrap_get_inner(i),
+                        close,
+                    },
+                )
+            },
+            exit,
+        )?;
+
         let mut yearindex_first_iter = self.timeindexes_to_open.yearindex.unwrap_first().iter();
         let mut yearindex_max_iter = self.timeindexes_to_high.yearindex.unwrap_max().iter();
         let mut yearindex_min_iter = self.timeindexes_to_low.yearindex.unwrap_min().iter();
@@ -1038,6 +1110,40 @@ impl Vecs {
             exit,
         )?;
 
+        let mut semesterindex_first_iter = self
+            .timeindexes_to_open_in_sats
+            .semesterindex
+            .unwrap_first()
+            .iter();
+        let mut semesterindex_max_iter = self
+            .timeindexes_to_high_in_sats
+            .semesterindex
+            .unwrap_max()
+            .iter();
+        let mut semesterindex_min_iter = self
+            .timeindexes_to_low_in_sats
+            .semesterindex
+            .unwrap_min()
+            .iter();
+        self.semesterindex_to_ohlc_in_sats.compute_transform(
+            starting_indexes.semesterindex,
+            self.timeindexes_to_close_in_sats
+                .semesterindex
+                .unwrap_last(),
+            |(i, close, ..)| {
+                (
+                    i,
+                    OHLCSats {
+                        open: semesterindex_first_iter.unwrap_get_inner(i),
+                        high: semesterindex_max_iter.unwrap_get_inner(i),
+                        low: semesterindex_min_iter.unwrap_get_inner(i),
+                        close,
+                    },
+                )
+            },
+            exit,
+        )?;
+
         let mut yearindex_first_iter = self
             .timeindexes_to_open_in_sats
             .yearindex
@@ -1127,6 +1233,7 @@ impl Vecs {
                 &self.difficultyepoch_to_ohlc,
                 &self.monthindex_to_ohlc,
                 &self.quarterindex_to_ohlc,
+                &self.semesterindex_to_ohlc,
                 &self.yearindex_to_ohlc,
                 // &self.halvingepoch_to_ohlc,
                 &self.decadeindex_to_ohlc,
@@ -1136,6 +1243,7 @@ impl Vecs {
                 &self.difficultyepoch_to_ohlc_in_sats,
                 &self.monthindex_to_ohlc_in_sats,
                 &self.quarterindex_to_ohlc_in_sats,
+                &self.semesterindex_to_ohlc_in_sats,
                 &self.yearindex_to_ohlc_in_sats,
                 // &self.halvingepoch_to_ohlc_in_sats,
                 &self.decadeindex_to_ohlc_in_sats,
diff --git a/crates/brk_computer/src/vecs/grouped/builder_computed.rs b/crates/brk_computer/src/vecs/grouped/builder_computed.rs
new file mode 100644
index 000000000..8115570c9
--- /dev/null
+++ b/crates/brk_computer/src/vecs/grouped/builder_computed.rs
@@ -0,0 +1,474 @@
+use std::path::Path;
+
+use brk_core::{FromCoarserIndex, Result, Version};
+use brk_exit::Exit;
+use brk_vec::{
+    AnyCollectableVec, AnyIterableVec, BoxedAnyIterableVec, CloneableAnyIterableVec, Computation,
+    ComputedVec, ComputedVecFrom2, Format, StoredIndex,
+};
+
+use crate::vecs::grouped::{EagerVecBuilder, VecBuilderOptions};
+
+use super::ComputedType;
+
+#[allow(clippy::type_complexity)]
+#[derive(Clone)]
+pub struct ComputedVecBuilder<I, T, S1I, S2T>
+where
+    I: StoredIndex,
+    T: ComputedType,
+    S2T: ComputedType,
+{
+    pub first: Option<Box<ComputedVecFrom2<I, T, S1I, T, I, S2T>>>,
+    pub average: Option<Box<ComputedVecFrom2<I, T, S1I, T, I, S2T>>>,
+    pub sum: Option<Box<ComputedVecFrom2<I, T, S1I, T, I, S2T>>>,
+    pub max: Option<Box<ComputedVecFrom2<I, T, S1I, T, I, S2T>>>,
+    pub min: Option<Box<ComputedVecFrom2<I, T, S1I, T, I, S2T>>>,
+    pub last: Option<Box<ComputedVecFrom2<I, T, S1I, T, I, S2T>>>,
+    pub cumulative: Option<Box<ComputedVecFrom2<I, T, S1I, T, I, S2T>>>,
+}
+
+const VERSION: Version = Version::ZERO;
+
+impl<I, T, S1I, S2T> ComputedVecBuilder<I, T, S1I, S2T>
+where
+    I: StoredIndex,
+    T: ComputedType + 'static,
+    S1I: StoredIndex + 'static + FromCoarserIndex<I>,
+    S2T: ComputedType,
+{
+    #[allow(clippy::too_many_arguments)]
+    pub fn forced_import(
+        path: &Path,
+        name: &str,
+        version: Version,
+        format: Format,
+        computation: Computation,
+        source: Option<BoxedAnyIterableVec<S1I, T>>,
+        source_extra: &EagerVecBuilder<S1I, T>,
+        len_source: BoxedAnyIterableVec<I, S2T>,
+        options: ComputedVecBuilderOptions,
+    ) -> color_eyre::Result<Self> {
+        let only_one_active = options.is_only_one_active();
+
+        let suffix = |s: &str| format!("{name}_{s}");
+
+        let maybe_suffix = |s: &str| {
+            if only_one_active {
+                name.to_string()
+            } else {
+                suffix(s)
+            }
+        };
+
+        Ok(Self {
+            first: options.first.then(|| {
+                Box::new(
+                    ComputedVec::forced_import_or_init_from_2(
+                        computation,
+                        path,
+                        &maybe_suffix("first"),
+                        version + VERSION + Version::ZERO,
+                        format,
+                        source_extra
+                            .first
+                            .as_ref()
+                            .map_or_else(|| source.as_ref().unwrap().clone(), |v| v.clone()),
+                        len_source.clone(),
+                        |i: I, source, len_source| {
+                            if i.unwrap_to_usize() >= len_source.len() {
+                                return None;
+                            }
+                            source
+                                .next_at(S1I::min_from(i))
+                                .map(|(_, cow)| cow.into_owned())
+                        },
+                    )
+                    .unwrap(),
+                )
+            }),
+            last: options.last.then(|| {
+                Box::new(
+                    ComputedVec::forced_import_or_init_from_2(
+                        computation,
+                        path,
+                        name,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        source_extra.last.as_ref().map_or_else(
+                            || {
+                                source
+                                    .as_ref()
+                                    .unwrap_or_else(|| {
+                                        dbg!(path, name, I::to_string());
+                                        panic!()
+                                    })
+                                    .clone()
+                            },
+                            |v| v.clone(),
+                        ),
+                        len_source.clone(),
+                        |i: I, source, len_source| {
+                            if i.unwrap_to_usize() >= len_source.len() {
+                                return None;
+                            }
+                            source
+                                .next_at(S1I::max_from(i, source.len()))
+                                .map(|(_, cow)| cow.into_owned())
+                        },
+                    )
+                    .unwrap(),
+                )
+            }),
+            min: options.min.then(|| {
+                Box::new(
+                    ComputedVec::forced_import_or_init_from_2(
+                        computation,
+                        path,
+                        &maybe_suffix("min"),
+                        version + VERSION + Version::ZERO,
+                        format,
+                        source_extra
+                            .min
+                            .as_ref()
+                            .map_or_else(|| source.as_ref().unwrap().clone(), |v| v.clone()),
+                        len_source.clone(),
+                        |i: I, source, len_source| {
+                            if i.unwrap_to_usize() >= len_source.len() {
+                                return None;
+                            }
+                            S1I::inclusive_range_from(i, source.len())
+                                .flat_map(|i| source.next_at(i).map(|(_, cow)| cow.into_owned()))
+                                .min()
+                        },
+                    )
+                    .unwrap(),
+                )
+            }),
+            max: options.max.then(|| {
+                Box::new(
+                    ComputedVec::forced_import_or_init_from_2(
+                        computation,
+                        path,
+                        &maybe_suffix("max"),
+                        version + VERSION + Version::ZERO,
+                        format,
+                        source_extra
+                            .max
+                            .as_ref()
+                            .map_or_else(|| source.as_ref().unwrap().clone(), |v| v.clone()),
+                        len_source.clone(),
+                        |i: I, source, len_source| {
+                            if i.unwrap_to_usize() >= len_source.len() {
+                                return None;
+                            }
+                            S1I::inclusive_range_from(i, source.len())
+                                .flat_map(|i| source.next_at(i).map(|(_, cow)| cow.into_owned()))
+                                .max()
+                        },
+                    )
+                    .unwrap(),
+                )
+            }),
+            average: options.average.then(|| {
+                Box::new(
+                    ComputedVec::forced_import_or_init_from_2(
+                        computation,
+                        path,
+                        &maybe_suffix("average"),
+                        version + VERSION + Version::ZERO,
+                        format,
+                        source_extra
+                            .average
+                            .as_ref()
+                            .map_or_else(|| source.as_ref().unwrap().clone(), |v| v.clone()),
+                        len_source.clone(),
+                        |i: I, source, len_source| {
+                            if i.unwrap_to_usize() >= len_source.len() {
+                                return None;
+                            }
+                            let vec = S1I::inclusive_range_from(i, source.len())
+                                .flat_map(|i| source.next_at(i).map(|(_, cow)| cow.into_owned()))
+                                .collect::<Vec<_>>();
+                            if vec.is_empty() {
+                                return None;
+                            }
+                            let mut sum = T::from(0);
+                            let len = vec.len();
+                            vec.into_iter().for_each(|v| sum += v);
+                            Some(sum / len)
+                        },
+                    )
+                    .unwrap(),
+                )
+            }),
+            sum: options.sum.then(|| {
+                Box::new(
+                    ComputedVec::forced_import_or_init_from_2(
+                        computation,
+                        path,
+                        &(if !options.last && !options.average && !options.min && !options.max {
+                            name.to_string()
+                        } else {
+                            maybe_suffix("sum")
+                        }),
+                        version + VERSION + Version::ZERO,
+                        format,
+                        source_extra
+                            .sum
+                            .as_ref()
+                            .map_or_else(|| source.as_ref().unwrap().clone(), |v| v.clone()),
+                        len_source.clone(),
+                        |i: I, source, len_source| {
+                            if i.unwrap_to_usize() >= len_source.len() {
+                                return None;
+                            }
+                            let vec = S1I::inclusive_range_from(i, source.len())
+                                .flat_map(|i| source.next_at(i).map(|(_, cow)| cow.into_owned()))
+                                .collect::<Vec<_>>();
+                            if vec.is_empty() {
+                                return None;
+                            }
+                            let mut sum = T::from(0);
+                            vec.into_iter().for_each(|v| sum += v);
+                            Some(sum)
+                        },
+                    )
+                    .unwrap(),
+                )
+            }),
+            cumulative: options.cumulative.then(|| {
+                Box::new(
+                    ComputedVec::forced_import_or_init_from_2(
+                        computation,
+                        path,
+                        &suffix("cumulative"),
+                        version + VERSION + Version::ZERO,
+                        format,
+                        source_extra.cumulative.as_ref().unwrap().boxed_clone(),
+                        len_source.clone(),
+                        |i: I, source, len_source| {
+                            if i.unwrap_to_usize() >= len_source.len() {
+                                return None;
+                            }
+                            source
+                                .next_at(S1I::max_from(i, source.len()))
+                                .map(|(_, cow)| cow.into_owned())
+                        },
+                    )
+                    .unwrap(),
+                )
+            }),
+        })
+    }
+
+    pub fn compute_if_necessary<T2>(
+        &mut self,
+        max_from: I,
+        len_source: &impl AnyIterableVec<I, T2>,
+        exit: &Exit,
+    ) -> Result<()> {
+        if let Some(first) = self.first.as_mut() {
+            first.compute_if_necessary(max_from, len_source, exit)?;
+        }
+        if let Some(last) = self.last.as_mut() {
+            last.compute_if_necessary(max_from, len_source, exit)?;
+        }
+        if let Some(min) = self.min.as_mut() {
+            min.compute_if_necessary(max_from, len_source, exit)?;
+        }
+        if let Some(max) = self.max.as_mut() {
+            max.compute_if_necessary(max_from, len_source, exit)?;
+        }
+        if let Some(average) = self.average.as_mut() {
+            average.compute_if_necessary(max_from, len_source, exit)?;
+        }
+        if let Some(sum) = self.sum.as_mut() {
+            sum.compute_if_necessary(max_from, len_source, exit)?;
+        }
+        if let Some(cumulative) = self.cumulative.as_mut() {
+            cumulative.compute_if_necessary(max_from, len_source, exit)?;
+        }
+
+        Ok(())
+    }
+
+    pub fn starting_index(&self, max_from: I) -> I {
+        max_from.min(I::from(
+            self.vecs().into_iter().map(|v| v.len()).min().unwrap(),
+        ))
+    }
+
+    pub fn unwrap_first(&self) -> &ComputedVecFrom2<I, T, S1I, T, I, S2T> {
+        self.first.as_ref().unwrap()
+    }
+    #[allow(unused)]
+    pub fn unwrap_average(&self) -> &ComputedVecFrom2<I, T, S1I, T, I, S2T> {
+        self.average.as_ref().unwrap()
+    }
+    pub fn unwrap_sum(&self) -> &ComputedVecFrom2<I, T, S1I, T, I, S2T> {
+        self.sum.as_ref().unwrap()
+    }
+    pub fn unwrap_max(&self) -> &ComputedVecFrom2<I, T, S1I, T, I, S2T> {
+        self.max.as_ref().unwrap()
+    }
+    pub fn unwrap_min(&self) -> &ComputedVecFrom2<I, T, S1I, T, I, S2T> {
+        self.min.as_ref().unwrap()
+    }
+    pub fn unwrap_last(&self) -> &ComputedVecFrom2<I, T, S1I, T, I, S2T> {
+        self.last.as_ref().unwrap()
+    }
+    #[allow(unused)]
+    pub fn unwrap_cumulative(&self) -> &ComputedVecFrom2<I, T, S1I, T, I, S2T> {
+        self.cumulative.as_ref().unwrap()
+    }
+
+    pub fn vecs(&self) -> Vec<&dyn AnyCollectableVec> {
+        let mut v: Vec<&dyn AnyCollectableVec> = vec![];
+
+        if let Some(first) = self.first.as_ref() {
+            v.push(first.as_ref());
+        }
+        if let Some(last) = self.last.as_ref() {
+            v.push(last.as_ref());
+        }
+        if let Some(min) = self.min.as_ref() {
+            v.push(min.as_ref());
+        }
+        if let Some(max) = self.max.as_ref() {
+            v.push(max.as_ref());
+        }
+        if let Some(average) = self.average.as_ref() {
+            v.push(average.as_ref());
+        }
+        if let Some(sum) = self.sum.as_ref() {
+            v.push(sum.as_ref());
+        }
+        if let Some(cumulative) = self.cumulative.as_ref() {
+            v.push(cumulative.as_ref());
+        }
+
+        v
+    }
+}
+
+#[derive(Default, Clone, Copy)]
+pub struct ComputedVecBuilderOptions {
+    average: bool,
+    sum: bool,
+    max: bool,
+    min: bool,
+    first: bool,
+    last: bool,
+    cumulative: bool,
+}
+
+impl From<VecBuilderOptions> for ComputedVecBuilderOptions {
+    fn from(value: VecBuilderOptions) -> Self {
+        Self {
+            average: value.average(),
+            sum: value.sum(),
+            max: value.max(),
+            min: value.min(),
+            first: value.first(),
+            last: value.last(),
+            cumulative: value.cumulative(),
+        }
+    }
+}
+
+impl ComputedVecBuilderOptions {
+    pub fn add_first(mut self) -> Self {
+        self.first = true;
+        self
+    }
+
+    pub fn add_last(mut self) -> Self {
+        self.last = true;
+        self
+    }
+
+    pub fn add_min(mut self) -> Self {
+        self.min = true;
+        self
+    }
+
+    pub fn add_max(mut self) -> Self {
+        self.max = true;
+        self
+    }
+
+    pub fn add_average(mut self) -> Self {
+        self.average = true;
+        self
+    }
+
+    pub fn add_sum(mut self) -> Self {
+        self.sum = true;
+        self
+    }
+
+    pub fn add_cumulative(mut self) -> Self {
+        self.cumulative = true;
+        self
+    }
+
+    #[allow(unused)]
+    pub fn rm_min(mut self) -> Self {
+        self.min = false;
+        self
+    }
+
+    #[allow(unused)]
+    pub fn rm_max(mut self) -> Self {
+        self.max = false;
+        self
+    }
+
+    #[allow(unused)]
+    pub fn rm_average(mut self) -> Self {
+        self.average = false;
+        self
+    }
+
+    #[allow(unused)]
+    pub fn rm_sum(mut self) -> Self {
+        self.sum = false;
+        self
+    }
+
+    #[allow(unused)]
+    pub fn rm_cumulative(mut self) -> Self {
+        self.cumulative = false;
+        self
+    }
+
+    pub fn add_minmax(mut self) -> Self {
+        self.min = true;
+        self.max = true;
+        self
+    }
+
+    pub fn is_only_one_active(&self) -> bool {
+        [
+            self.average,
+            self.sum,
+            self.max,
+            self.min,
+            self.first,
+            self.last,
+            self.cumulative,
+        ]
+        .iter()
+        .filter(|b| **b)
+        .count()
+            == 1
+    }
+
+    pub fn copy_self_extra(&self) -> Self {
+        Self {
+            cumulative: self.cumulative,
+            ..Self::default()
+        }
+    }
+}
diff --git a/crates/brk_computer/src/vecs/grouped/builder.rs b/crates/brk_computer/src/vecs/grouped/builder_eager.rs
similarity index 94%
rename from crates/brk_computer/src/vecs/grouped/builder.rs
rename to crates/brk_computer/src/vecs/grouped/builder_eager.rs
index 88eb692b6..3a7d6e536 100644
--- a/crates/brk_computer/src/vecs/grouped/builder.rs
+++ b/crates/brk_computer/src/vecs/grouped/builder_eager.rs
@@ -10,7 +10,7 @@ use crate::utils::get_percentile;
 use super::ComputedType;
 
 #[derive(Clone, Debug)]
-pub struct ComputedVecBuilder<I, T>
+pub struct EagerVecBuilder<I, T>
 where
     I: StoredIndex,
     T: ComputedType,
@@ -31,7 +31,7 @@ where
 
 const VERSION: Version = Version::ZERO;
 
-impl<I, T> ComputedVecBuilder<I, T>
+impl<I, T> EagerVecBuilder<I, T>
 where
     I: StoredIndex,
     T: ComputedType,
@@ -41,20 +41,10 @@ where
         name: &str,
         version: Version,
         format: Format,
-        options: StorableVecGeneatorOptions,
+        options: VecBuilderOptions,
     ) -> color_eyre::Result<Self> {
         let only_one_active = options.is_only_one_active();
 
-        let prefix = |s: &str| format!("{s}_{name}");
-
-        let maybe_prefix = |s: &str| {
-            if only_one_active {
-                name.to_string()
-            } else {
-                prefix(s)
-            }
-        };
-
         let suffix = |s: &str| format!("{name}_{s}");
 
         let maybe_suffix = |s: &str| {
@@ -70,7 +60,7 @@ where
                 Box::new(
                     EagerVec::forced_import(
                         path,
-                        &maybe_prefix("first"),
+                        &maybe_suffix("first"),
                         version + VERSION + Version::ZERO,
                         format,
                     )
@@ -130,7 +120,7 @@ where
                 Box::new(
                     EagerVec::forced_import(
                         path,
-                        &(if !options.last {
+                        &(if !options.last && !options.average && !options.min && !options.max {
                             name.to_string()
                         } else {
                             maybe_suffix("sum")
@@ -145,7 +135,7 @@ where
                 Box::new(
                     EagerVec::forced_import(
                         path,
-                        &prefix("cumulative"),
+                        &suffix("cumulative"),
                         version + VERSION + Version::ZERO,
                         format,
                     )
@@ -221,7 +211,7 @@ where
             cumulative_vec.iter().unwrap_get_inner(index)
         });
         source.iter_at(index).try_for_each(|(i, v)| -> Result<()> {
-            cumulative = cumulative.clone() + v.into_inner();
+            cumulative = cumulative.clone() + v.into_owned();
             cumulative_vec.forced_push_at(i, cumulative.clone(), exit)
         })?;
 
@@ -261,7 +251,7 @@ where
         first_indexes
             .iter_at(index)
             .try_for_each(|(i, first_index)| -> Result<()> {
-                let first_index = first_index.into_inner();
+                let first_index = first_index.into_owned();
 
                 let count_index = count_indexes_iter.unwrap_get_inner(i);
 
@@ -284,7 +274,7 @@ where
                     //     dbg!(first_index, count_index, last_index);
                     // })
                     // .unwrap()
-                    // .into_inner();
+                    // .into_owned();
                     last.forced_push_at(index, v, exit)?;
                 }
 
@@ -304,7 +294,7 @@ where
                     source_iter.set(first_index);
                     let mut values = (&mut source_iter)
                         .take(*count_index)
-                        .map(|(_, v)| v.into_inner())
+                        .map(|(_, v)| v.into_owned())
                         .collect::<Vec<_>>();
 
                     if needs_sorted {
@@ -394,7 +384,7 @@ where
     pub fn from_aligned<I2>(
         &mut self,
         max_from: I,
-        source: &ComputedVecBuilder<I2, T>,
+        source: &EagerVecBuilder<I2, T>,
         first_indexes: &impl AnyIterableVec<I, I2>,
         count_indexes: &impl AnyIterableVec<I, StoredUsize>,
         exit: &Exit,
@@ -435,7 +425,7 @@ where
         first_indexes
             .iter_at(index)
             .try_for_each(|(i, first_index, ..)| -> Result<()> {
-                let first_index = first_index.into_inner();
+                let first_index = first_index.into_owned();
 
                 let count_index = count_indexes_iter.unwrap_get_inner(i);
 
@@ -473,7 +463,7 @@ where
                             source_max_iter.set(first_index);
                             let mut values = source_max_iter
                                 .take(*count_index)
-                                .map(|(_, v)| v.into_inner())
+                                .map(|(_, v)| v.into_owned())
                                 .collect::<Vec<_>>();
                             values.sort_unstable();
                             max.forced_push_at(i, values.last().unwrap().clone(), exit)?;
@@ -484,7 +474,7 @@ where
                             source_min_iter.set(first_index);
                             let mut values = source_min_iter
                                 .take(*count_index)
-                                .map(|(_, v)| v.into_inner())
+                                .map(|(_, v)| v.into_owned())
                                 .collect::<Vec<_>>();
                             values.sort_unstable();
                             min.forced_push_at(i, values.first().unwrap().clone(), exit)?;
@@ -497,7 +487,7 @@ where
                             source_average_iter.set(first_index);
                             let values = source_average_iter
                                 .take(*count_index)
-                                .map(|(_, v)| v.into_inner())
+                                .map(|(_, v)| v.into_owned())
                                 .collect::<Vec<_>>();
 
                             let len = values.len();
@@ -513,7 +503,7 @@ where
                             source_sum_iter.set(first_index);
                             let values = source_sum_iter
                                 .take(*count_index)
-                                .map(|(_, v)| v.into_inner())
+                                .map(|(_, v)| v.into_owned())
                                 .collect::<Vec<_>>();
 
                             let sum = values.into_iter().fold(T::from(0), |a, b| a + b);
@@ -716,7 +706,7 @@ where
 }
 
 #[derive(Default, Clone, Copy)]
-pub struct StorableVecGeneatorOptions {
+pub struct VecBuilderOptions {
     average: bool,
     sum: bool,
     max: bool,
@@ -731,7 +721,55 @@ pub struct StorableVecGeneatorOptions {
     cumulative: bool,
 }
 
-impl StorableVecGeneatorOptions {
+impl VecBuilderOptions {
+    pub fn average(&self) -> bool {
+        self.average
+    }
+
+    pub fn sum(&self) -> bool {
+        self.sum
+    }
+
+    pub fn max(&self) -> bool {
+        self.max
+    }
+
+    pub fn _90p(&self) -> bool {
+        self._90p
+    }
+
+    pub fn _75p(&self) -> bool {
+        self._75p
+    }
+
+    pub fn median(&self) -> bool {
+        self.median
+    }
+
+    pub fn _25p(&self) -> bool {
+        self._25p
+    }
+
+    pub fn _10p(&self) -> bool {
+        self._10p
+    }
+
+    pub fn min(&self) -> bool {
+        self.min
+    }
+
+    pub fn first(&self) -> bool {
+        self.first
+    }
+
+    pub fn last(&self) -> bool {
+        self.last
+    }
+
+    pub fn cumulative(&self) -> bool {
+        self.cumulative
+    }
+
     pub fn add_first(mut self) -> Self {
         self.first = true;
         self
diff --git a/crates/brk_computer/src/vecs/grouped/from_dateindex.rs b/crates/brk_computer/src/vecs/grouped/from_dateindex.rs
index a99a1e066..77a366e60 100644
--- a/crates/brk_computer/src/vecs/grouped/from_dateindex.rs
+++ b/crates/brk_computer/src/vecs/grouped/from_dateindex.rs
@@ -1,15 +1,18 @@
 use std::path::Path;
 
 use brk_core::{
-    DateIndex, DecadeIndex, MonthIndex, QuarterIndex, Result, Version, WeekIndex, YearIndex,
+    DateIndex, DecadeIndex, MonthIndex, QuarterIndex, Result, SemesterIndex, Version, WeekIndex,
+    YearIndex,
 };
 use brk_exit::Exit;
 use brk_indexer::Indexer;
-use brk_vec::{AnyCollectableVec, AnyIterableVec, EagerVec, Format};
+use brk_vec::{
+    AnyCollectableVec, AnyIterableVec, CloneableAnyIterableVec, Computation, EagerVec, Format,
+};
 
-use crate::vecs::{Indexes, indexes};
+use crate::vecs::{Indexes, grouped::ComputedVecBuilder, indexes};
 
-use super::{ComputedType, ComputedVecBuilder, StorableVecGeneatorOptions};
+use super::{ComputedType, EagerVecBuilder, Source, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedVecsFromDateIndex<T>
@@ -17,33 +20,37 @@ where
     T: ComputedType + PartialOrd,
 {
     pub dateindex: Option<EagerVec<DateIndex, T>>,
-    pub dateindex_extra: ComputedVecBuilder<DateIndex, T>,
-    pub weekindex: ComputedVecBuilder<WeekIndex, T>,
-    pub monthindex: ComputedVecBuilder<MonthIndex, T>,
-    pub quarterindex: ComputedVecBuilder<QuarterIndex, T>,
-    pub yearindex: ComputedVecBuilder<YearIndex, T>,
-    pub decadeindex: ComputedVecBuilder<DecadeIndex, T>,
+    pub dateindex_extra: EagerVecBuilder<DateIndex, T>,
+    pub weekindex: ComputedVecBuilder<WeekIndex, T, DateIndex, WeekIndex>,
+    pub monthindex: ComputedVecBuilder<MonthIndex, T, DateIndex, MonthIndex>,
+    pub quarterindex: ComputedVecBuilder<QuarterIndex, T, DateIndex, QuarterIndex>,
+    pub semesterindex: ComputedVecBuilder<SemesterIndex, T, DateIndex, SemesterIndex>,
+    pub yearindex: ComputedVecBuilder<YearIndex, T, DateIndex, YearIndex>,
+    pub decadeindex: ComputedVecBuilder<DecadeIndex, T, DateIndex, DecadeIndex>,
 }
 
 const VERSION: Version = Version::ZERO;
 
 impl<T> ComputedVecsFromDateIndex<T>
 where
-    T: ComputedType,
+    T: ComputedType + 'static,
 {
+    #[allow(clippy::too_many_arguments)]
     pub fn forced_import(
         path: &Path,
         name: &str,
-        compute_source: bool,
+        source: Source<DateIndex, T>,
         version: Version,
         format: Format,
-        options: StorableVecGeneatorOptions,
+        computation: Computation,
+        indexes: &indexes::Vecs,
+        options: VecBuilderOptions,
     ) -> color_eyre::Result<Self> {
-        let dateindex = compute_source.then(|| {
+        let dateindex = source.is_compute().then(|| {
             EagerVec::forced_import(path, name, version + VERSION + Version::ZERO, format).unwrap()
         });
 
-        let dateindex_extra = ComputedVecBuilder::forced_import(
+        let dateindex_extra = EagerVecBuilder::forced_import(
             path,
             name,
             version + VERSION + Version::ZERO,
@@ -53,44 +60,77 @@ where
 
         let options = options.remove_percentiles();
 
+        let dateindex_source = source.vec().or(dateindex.as_ref().map(|v| v.boxed_clone()));
+
         Ok(Self {
-            dateindex,
-            dateindex_extra,
             weekindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                computation,
+                dateindex_source.clone(),
+                &dateindex_extra,
+                indexes.weekindex_to_weekindex.boxed_clone(),
+                options.into(),
             )?,
             monthindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                dateindex_source.clone(),
+                &dateindex_extra,
+                indexes.monthindex_to_monthindex.boxed_clone(),
+                options.into(),
             )?,
             quarterindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                dateindex_source.clone(),
+                &dateindex_extra,
+                indexes.quarterindex_to_quarterindex.boxed_clone(),
+                options.into(),
+            )?,
+            semesterindex: ComputedVecBuilder::forced_import(
+                path,
+                name,
+                version + VERSION + Version::ZERO,
+                format,
+                Computation::Lazy,
+                dateindex_source.clone(),
+                &dateindex_extra,
+                indexes.semesterindex_to_semesterindex.boxed_clone(),
+                options.into(),
             )?,
             yearindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                dateindex_source.clone(),
+                &dateindex_extra,
+                indexes.yearindex_to_yearindex.boxed_clone(),
+                options.into(),
             )?,
             decadeindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                dateindex_source.clone(),
+                &dateindex_extra,
+                indexes.decadeindex_to_decadeindex.boxed_clone(),
+                options.into(),
             )?,
+            dateindex,
+            dateindex_extra,
         })
     }
 
@@ -133,65 +173,45 @@ where
         if let Some(dateindex) = dateindex {
             self.dateindex_extra
                 .extend(starting_indexes.dateindex, dateindex, exit)?;
-
-            self.weekindex.compute(
-                starting_indexes.weekindex,
-                dateindex,
-                &indexes.weekindex_to_first_dateindex,
-                &indexes.weekindex_to_dateindex_count,
-                exit,
-            )?;
-
-            self.monthindex.compute(
-                starting_indexes.monthindex,
-                dateindex,
-                &indexes.monthindex_to_first_dateindex,
-                &indexes.monthindex_to_dateindex_count,
-                exit,
-            )?;
         } else {
             let dateindex = self.dateindex.as_ref().unwrap();
 
             self.dateindex_extra
                 .extend(starting_indexes.dateindex, dateindex, exit)?;
-
-            self.weekindex.compute(
-                starting_indexes.weekindex,
-                dateindex,
-                &indexes.weekindex_to_first_dateindex,
-                &indexes.weekindex_to_dateindex_count,
-                exit,
-            )?;
-
-            self.monthindex.compute(
-                starting_indexes.monthindex,
-                dateindex,
-                &indexes.monthindex_to_first_dateindex,
-                &indexes.monthindex_to_dateindex_count,
-                exit,
-            )?;
         }
 
-        self.quarterindex.from_aligned(
+        self.weekindex.compute_if_necessary(
+            starting_indexes.weekindex,
+            &indexes.weekindex_to_dateindex_count,
+            exit,
+        )?;
+
+        self.monthindex.compute_if_necessary(
+            starting_indexes.monthindex,
+            &indexes.monthindex_to_dateindex_count,
+            exit,
+        )?;
+
+        self.quarterindex.compute_if_necessary(
             starting_indexes.quarterindex,
-            &self.monthindex,
-            &indexes.quarterindex_to_first_monthindex,
             &indexes.quarterindex_to_monthindex_count,
             exit,
         )?;
 
-        self.yearindex.from_aligned(
+        self.semesterindex.compute_if_necessary(
+            starting_indexes.semesterindex,
+            &indexes.semesterindex_to_monthindex_count,
+            exit,
+        )?;
+
+        self.yearindex.compute_if_necessary(
             starting_indexes.yearindex,
-            &self.monthindex,
-            &indexes.yearindex_to_first_monthindex,
             &indexes.yearindex_to_monthindex_count,
             exit,
         )?;
 
-        self.decadeindex.from_aligned(
+        self.decadeindex.compute_if_necessary(
             starting_indexes.decadeindex,
-            &self.yearindex,
-            &indexes.decadeindex_to_first_yearindex,
             &indexes.decadeindex_to_yearindex_count,
             exit,
         )?;
@@ -208,6 +228,7 @@ where
             self.weekindex.vecs(),
             self.monthindex.vecs(),
             self.quarterindex.vecs(),
+            self.semesterindex.vecs(),
             self.yearindex.vecs(),
             self.decadeindex.vecs(),
         ]
diff --git a/crates/brk_computer/src/vecs/grouped/from_height.rs b/crates/brk_computer/src/vecs/grouped/from_height.rs
index a8ed7e0d7..0ed075529 100644
--- a/crates/brk_computer/src/vecs/grouped/from_height.rs
+++ b/crates/brk_computer/src/vecs/grouped/from_height.rs
@@ -1,16 +1,22 @@
 use std::path::Path;
 
 use brk_core::{
-    DateIndex, DecadeIndex, DifficultyEpoch, Height, MonthIndex, QuarterIndex, Result, Version,
-    WeekIndex, YearIndex,
+    DateIndex, DecadeIndex, DifficultyEpoch, Height, MonthIndex, QuarterIndex, Result,
+    SemesterIndex, Version, WeekIndex, YearIndex,
 };
 use brk_exit::Exit;
 use brk_indexer::Indexer;
-use brk_vec::{AnyCollectableVec, AnyIterableVec, EagerVec, Format};
+use brk_vec::{
+    AnyCollectableVec, AnyIterableVec, CloneableAnyIterableVec, Computation, EagerVec, Format,
+};
 
-use crate::vecs::{Indexes, indexes};
+use crate::vecs::{
+    Indexes,
+    grouped::{ComputedVecBuilder, Source},
+    indexes,
+};
 
-use super::{ComputedType, ComputedVecBuilder, StorableVecGeneatorOptions};
+use super::{ComputedType, EagerVecBuilder, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedVecsFromHeight<T>
@@ -18,37 +24,41 @@ where
     T: ComputedType + PartialOrd,
 {
     pub height: Option<EagerVec<Height, T>>,
-    pub height_extra: ComputedVecBuilder<Height, T>,
-    pub dateindex: ComputedVecBuilder<DateIndex, T>,
-    pub weekindex: ComputedVecBuilder<WeekIndex, T>,
-    pub difficultyepoch: ComputedVecBuilder<DifficultyEpoch, T>,
-    pub monthindex: ComputedVecBuilder<MonthIndex, T>,
-    pub quarterindex: ComputedVecBuilder<QuarterIndex, T>,
-    pub yearindex: ComputedVecBuilder<YearIndex, T>,
+    pub height_extra: EagerVecBuilder<Height, T>,
+    pub dateindex: EagerVecBuilder<DateIndex, T>,
+    pub weekindex: ComputedVecBuilder<WeekIndex, T, DateIndex, WeekIndex>,
+    pub difficultyepoch: EagerVecBuilder<DifficultyEpoch, T>,
+    pub monthindex: ComputedVecBuilder<MonthIndex, T, DateIndex, MonthIndex>,
+    pub quarterindex: ComputedVecBuilder<QuarterIndex, T, DateIndex, QuarterIndex>,
+    pub semesterindex: ComputedVecBuilder<SemesterIndex, T, DateIndex, SemesterIndex>,
+    pub yearindex: ComputedVecBuilder<YearIndex, T, DateIndex, YearIndex>,
     // TODO: pub halvingepoch: StorableVecGeneator<Halvingepoch, T>,
-    pub decadeindex: ComputedVecBuilder<DecadeIndex, T>,
+    pub decadeindex: ComputedVecBuilder<DecadeIndex, T, DateIndex, DecadeIndex>,
 }
 
 const VERSION: Version = Version::ZERO;
 
 impl<T> ComputedVecsFromHeight<T>
 where
-    T: ComputedType + Ord + From<f64>,
+    T: ComputedType + Ord + From<f64> + 'static,
     f64: From<T>,
 {
+    #[allow(clippy::too_many_arguments)]
     pub fn forced_import(
         path: &Path,
         name: &str,
-        compute_source: bool,
+        source: Source<Height, T>,
         version: Version,
         format: Format,
-        options: StorableVecGeneatorOptions,
+        computation: Computation,
+        indexes: &indexes::Vecs,
+        options: VecBuilderOptions,
     ) -> color_eyre::Result<Self> {
-        let height = compute_source.then(|| {
+        let height = source.is_compute().then(|| {
             EagerVec::forced_import(path, name, version + VERSION + Version::ZERO, format).unwrap()
         });
 
-        let height_extra = ComputedVecBuilder::forced_import(
+        let height_extra = EagerVecBuilder::forced_import(
             path,
             name,
             version + VERSION + Version::ZERO,
@@ -56,7 +66,7 @@ where
             options.copy_self_extra(),
         )?;
 
-        let dateindex = ComputedVecBuilder::forced_import(
+        let dateindex = EagerVecBuilder::forced_import(
             path,
             name,
             version + VERSION + Version::ZERO,
@@ -67,46 +77,77 @@ where
         let options = options.remove_percentiles();
 
         Ok(Self {
-            height,
-            height_extra,
-            dateindex,
             weekindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
-            )?,
-            difficultyepoch: ComputedVecBuilder::forced_import(
-                path,
-                name,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
+                computation,
+                None,
+                &dateindex,
+                indexes.weekindex_to_weekindex.boxed_clone(),
+                options.into(),
             )?,
             monthindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.monthindex_to_monthindex.boxed_clone(),
+                options.into(),
             )?,
             quarterindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.quarterindex_to_quarterindex.boxed_clone(),
+                options.into(),
+            )?,
+            semesterindex: ComputedVecBuilder::forced_import(
+                path,
+                name,
+                version + VERSION + Version::ZERO,
+                format,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.semesterindex_to_semesterindex.boxed_clone(),
+                options.into(),
             )?,
             yearindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.yearindex_to_yearindex.boxed_clone(),
+                options.into(),
+            )?,
+            decadeindex: ComputedVecBuilder::forced_import(
+                path,
+                name,
+                version + VERSION + Version::ZERO,
+                format,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.decadeindex_to_decadeindex.boxed_clone(),
+                options.into(),
             )?,
             // halvingepoch: StorableVecGeneator::forced_import(path, name, version + VERSION + Version::ZERO, format, options)?,
-            decadeindex: ComputedVecBuilder::forced_import(
+            height,
+            height_extra,
+            dateindex,
+            difficultyepoch: EagerVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
@@ -144,9 +185,9 @@ where
         indexes: &indexes::Vecs,
         starting_indexes: &Indexes,
         exit: &Exit,
-        height: Option<&impl AnyIterableVec<Height, T>>,
+        height_vec: Option<&impl AnyIterableVec<Height, T>>,
     ) -> color_eyre::Result<()> {
-        if let Some(height) = height {
+        if let Some(height) = height_vec {
             self.height_extra
                 .extend(starting_indexes.height, height, exit)?;
 
@@ -188,42 +229,38 @@ where
             )?;
         }
 
-        self.weekindex.from_aligned(
+        self.weekindex.compute_if_necessary(
             starting_indexes.weekindex,
-            &self.dateindex,
-            &indexes.weekindex_to_first_dateindex,
             &indexes.weekindex_to_dateindex_count,
             exit,
         )?;
 
-        self.monthindex.from_aligned(
+        self.monthindex.compute_if_necessary(
             starting_indexes.monthindex,
-            &self.dateindex,
-            &indexes.monthindex_to_first_dateindex,
             &indexes.monthindex_to_dateindex_count,
             exit,
         )?;
 
-        self.quarterindex.from_aligned(
+        self.quarterindex.compute_if_necessary(
             starting_indexes.quarterindex,
-            &self.monthindex,
-            &indexes.quarterindex_to_first_monthindex,
             &indexes.quarterindex_to_monthindex_count,
             exit,
         )?;
 
-        self.yearindex.from_aligned(
+        self.semesterindex.compute_if_necessary(
+            starting_indexes.semesterindex,
+            &indexes.semesterindex_to_monthindex_count,
+            exit,
+        )?;
+
+        self.yearindex.compute_if_necessary(
             starting_indexes.yearindex,
-            &self.monthindex,
-            &indexes.yearindex_to_first_monthindex,
             &indexes.yearindex_to_monthindex_count,
             exit,
         )?;
 
-        self.decadeindex.from_aligned(
+        self.decadeindex.compute_if_necessary(
             starting_indexes.decadeindex,
-            &self.yearindex,
-            &indexes.decadeindex_to_first_yearindex,
             &indexes.decadeindex_to_yearindex_count,
             exit,
         )?;
@@ -242,6 +279,7 @@ where
             self.difficultyepoch.vecs(),
             self.monthindex.vecs(),
             self.quarterindex.vecs(),
+            self.semesterindex.vecs(),
             self.yearindex.vecs(),
             // self.halvingepoch.vecs(),
             self.decadeindex.vecs(),
diff --git a/crates/brk_computer/src/vecs/grouped/from_height_strict.rs b/crates/brk_computer/src/vecs/grouped/from_height_strict.rs
index 845a2d08e..1147a7f54 100644
--- a/crates/brk_computer/src/vecs/grouped/from_height_strict.rs
+++ b/crates/brk_computer/src/vecs/grouped/from_height_strict.rs
@@ -7,7 +7,7 @@ use brk_vec::{AnyCollectableVec, EagerVec, Format};
 
 use crate::vecs::{Indexes, indexes};
 
-use super::{ComputedType, ComputedVecBuilder, StorableVecGeneatorOptions};
+use super::{ComputedType, EagerVecBuilder, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedVecsFromHeightStrict<T>
@@ -15,8 +15,8 @@ where
     T: ComputedType + PartialOrd,
 {
     pub height: EagerVec<Height, T>,
-    pub height_extra: ComputedVecBuilder<Height, T>,
-    pub difficultyepoch: ComputedVecBuilder<DifficultyEpoch, T>,
+    pub height_extra: EagerVecBuilder<Height, T>,
+    pub difficultyepoch: EagerVecBuilder<DifficultyEpoch, T>,
     // TODO: pub halvingepoch: StorableVecGeneator<Halvingepoch, T>,
 }
 
@@ -32,12 +32,12 @@ where
         name: &str,
         version: Version,
         format: Format,
-        options: StorableVecGeneatorOptions,
+        options: VecBuilderOptions,
     ) -> color_eyre::Result<Self> {
         let height =
             EagerVec::forced_import(path, name, version + VERSION + Version::ZERO, format)?;
 
-        let height_extra = ComputedVecBuilder::forced_import(
+        let height_extra = EagerVecBuilder::forced_import(
             path,
             name,
             version + VERSION + Version::ZERO,
@@ -50,7 +50,7 @@ where
         Ok(Self {
             height,
             height_extra,
-            difficultyepoch: ComputedVecBuilder::forced_import(
+            difficultyepoch: EagerVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
diff --git a/crates/brk_computer/src/vecs/grouped/from_txindex.rs b/crates/brk_computer/src/vecs/grouped/from_txindex.rs
index 031b95828..a9eb32948 100644
--- a/crates/brk_computer/src/vecs/grouped/from_txindex.rs
+++ b/crates/brk_computer/src/vecs/grouped/from_txindex.rs
@@ -2,17 +2,22 @@ use std::path::Path;
 
 use brk_core::{
     Bitcoin, DateIndex, DecadeIndex, DifficultyEpoch, Dollars, Height, MonthIndex, QuarterIndex,
-    Result, Sats, TxIndex, Version, WeekIndex, YearIndex,
+    Result, Sats, SemesterIndex, TxIndex, Version, WeekIndex, YearIndex,
 };
 use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{
-    AnyCollectableVec, AnyVec, CollectableVec, EagerVec, Format, StoredIndex, VecIterator,
+    AnyCollectableVec, AnyVec, CloneableAnyIterableVec, CollectableVec, Computation, EagerVec,
+    Format, StoredIndex, VecIterator,
 };
 
-use crate::vecs::{Indexes, fetched, indexes};
+use crate::vecs::{
+    Indexes, fetched,
+    grouped::{ComputedVecBuilder, Source},
+    indexes,
+};
 
-use super::{ComputedType, ComputedVecBuilder, StorableVecGeneatorOptions};
+use super::{ComputedType, EagerVecBuilder, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedVecsFromTxindex<T>
@@ -20,40 +25,44 @@ where
     T: ComputedType + PartialOrd,
 {
     pub txindex: Option<Box<EagerVec<TxIndex, T>>>,
-    pub height: ComputedVecBuilder<Height, T>,
-    pub dateindex: ComputedVecBuilder<DateIndex, T>,
-    pub weekindex: ComputedVecBuilder<WeekIndex, T>,
-    pub difficultyepoch: ComputedVecBuilder<DifficultyEpoch, T>,
-    pub monthindex: ComputedVecBuilder<MonthIndex, T>,
-    pub quarterindex: ComputedVecBuilder<QuarterIndex, T>,
-    pub yearindex: ComputedVecBuilder<YearIndex, T>,
+    pub height: EagerVecBuilder<Height, T>,
+    pub dateindex: EagerVecBuilder<DateIndex, T>,
+    pub weekindex: ComputedVecBuilder<WeekIndex, T, DateIndex, WeekIndex>,
+    pub difficultyepoch: EagerVecBuilder<DifficultyEpoch, T>,
+    pub monthindex: ComputedVecBuilder<MonthIndex, T, DateIndex, MonthIndex>,
+    pub quarterindex: ComputedVecBuilder<QuarterIndex, T, DateIndex, QuarterIndex>,
+    pub semesterindex: ComputedVecBuilder<SemesterIndex, T, DateIndex, SemesterIndex>,
+    pub yearindex: ComputedVecBuilder<YearIndex, T, DateIndex, YearIndex>,
     // TODO: pub halvingepoch: StorableVecGeneator<Halvingepoch, T>,
-    pub decadeindex: ComputedVecBuilder<DecadeIndex, T>,
+    pub decadeindex: ComputedVecBuilder<DecadeIndex, T, DateIndex, DecadeIndex>,
 }
 
 const VERSION: Version = Version::ZERO;
 
 impl<T> ComputedVecsFromTxindex<T>
 where
-    T: ComputedType + Ord + From<f64>,
+    T: ComputedType + Ord + From<f64> + 'static,
     f64: From<T>,
 {
+    #[allow(clippy::too_many_arguments)]
     pub fn forced_import(
         path: &Path,
         name: &str,
-        compute_source: bool,
+        source: Source<TxIndex, T>,
         version: Version,
         format: Format,
-        options: StorableVecGeneatorOptions,
+        computation: Computation,
+        indexes: &indexes::Vecs,
+        options: VecBuilderOptions,
     ) -> color_eyre::Result<Self> {
-        let txindex = compute_source.then(|| {
+        let txindex = source.is_compute().then(|| {
             Box::new(
                 EagerVec::forced_import(path, name, version + VERSION + Version::ZERO, format)
                     .unwrap(),
             )
         });
 
-        let height = ComputedVecBuilder::forced_import(
+        let height = EagerVecBuilder::forced_import(
             path,
             name,
             version + VERSION + Version::ZERO,
@@ -63,45 +72,86 @@ where
 
         let options = options.remove_percentiles();
 
+        let dateindex = EagerVecBuilder::forced_import(
+            path,
+            name,
+            version + VERSION + Version::ZERO,
+            format,
+            options,
+        )?;
+
         Ok(Self {
-            txindex,
-            height,
-            dateindex: ComputedVecBuilder::forced_import(
-                path,
-                name,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
             weekindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
-            )?,
-            difficultyepoch: ComputedVecBuilder::forced_import(
-                path,
-                name,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
+                computation,
+                None,
+                &dateindex,
+                indexes.weekindex_to_weekindex.boxed_clone(),
+                options.into(),
             )?,
             monthindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.monthindex_to_monthindex.boxed_clone(),
+                options.into(),
             )?,
             quarterindex: ComputedVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
                 format,
-                options,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.quarterindex_to_quarterindex.boxed_clone(),
+                options.into(),
+            )?,
+            semesterindex: ComputedVecBuilder::forced_import(
+                path,
+                name,
+                version + VERSION + Version::ZERO,
+                format,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.semesterindex_to_semesterindex.boxed_clone(),
+                options.into(),
             )?,
             yearindex: ComputedVecBuilder::forced_import(
+                path,
+                name,
+                version + VERSION + Version::ZERO,
+                format,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.yearindex_to_yearindex.boxed_clone(),
+                options.into(),
+            )?,
+            decadeindex: ComputedVecBuilder::forced_import(
+                path,
+                name,
+                version + VERSION + Version::ZERO,
+                format,
+                Computation::Lazy,
+                None,
+                &dateindex,
+                indexes.decadeindex_to_decadeindex.boxed_clone(),
+                options.into(),
+            )?,
+
+            txindex,
+            height,
+            dateindex,
+            difficultyepoch: EagerVecBuilder::forced_import(
                 path,
                 name,
                 version + VERSION + Version::ZERO,
@@ -109,13 +159,6 @@ where
                 options,
             )?,
             // halvingepoch: StorableVecGeneator::forced_import(path, name, version + VERSION + Version::ZERO, format, options)?,
-            decadeindex: ComputedVecBuilder::forced_import(
-                path,
-                name,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
         })
     }
 
@@ -196,42 +239,38 @@ where
             exit,
         )?;
 
-        self.weekindex.from_aligned(
+        self.weekindex.compute_if_necessary(
             starting_indexes.weekindex,
-            &self.dateindex,
             &indexes.weekindex_to_first_dateindex,
-            &indexes.weekindex_to_dateindex_count,
             exit,
         )?;
 
-        self.monthindex.from_aligned(
+        self.monthindex.compute_if_necessary(
             starting_indexes.monthindex,
-            &self.dateindex,
-            &indexes.monthindex_to_first_dateindex,
             &indexes.monthindex_to_dateindex_count,
             exit,
         )?;
 
-        self.quarterindex.from_aligned(
+        self.quarterindex.compute_if_necessary(
             starting_indexes.quarterindex,
-            &self.monthindex,
-            &indexes.quarterindex_to_first_monthindex,
             &indexes.quarterindex_to_monthindex_count,
             exit,
         )?;
 
-        self.yearindex.from_aligned(
+        self.semesterindex.compute_if_necessary(
+            starting_indexes.semesterindex,
+            &indexes.semesterindex_to_monthindex_count,
+            exit,
+        )?;
+
+        self.yearindex.compute_if_necessary(
             starting_indexes.yearindex,
-            &self.monthindex,
-            &indexes.yearindex_to_first_monthindex,
             &indexes.yearindex_to_monthindex_count,
             exit,
         )?;
 
-        self.decadeindex.from_aligned(
+        self.decadeindex.compute_if_necessary(
             starting_indexes.decadeindex,
-            &self.yearindex,
-            &indexes.decadeindex_to_first_yearindex,
             &indexes.decadeindex_to_yearindex_count,
             exit,
         )?;
@@ -258,6 +297,7 @@ where
             self.difficultyepoch.vecs(),
             self.monthindex.vecs(),
             self.quarterindex.vecs(),
+            self.semesterindex.vecs(),
             self.yearindex.vecs(),
             // self.halvingepoch.vecs(),
             self.decadeindex.vecs(),
diff --git a/crates/brk_computer/src/vecs/grouped/mod.rs b/crates/brk_computer/src/vecs/grouped/mod.rs
index 10457ca49..5c4e67968 100644
--- a/crates/brk_computer/src/vecs/grouped/mod.rs
+++ b/crates/brk_computer/src/vecs/grouped/mod.rs
@@ -1,21 +1,25 @@
-mod builder;
+mod builder_computed;
+mod builder_eager;
 mod from_dateindex;
 mod from_height;
 mod from_height_strict;
 mod from_txindex;
 mod ratio_from_dateindex;
+mod source;
 mod r#type;
 mod value_from_dateindex;
 mod value_from_height;
 mod value_from_txindex;
 mod value_height;
 
-pub use builder::*;
+pub use builder_computed::*;
+pub use builder_eager::*;
 pub use from_dateindex::*;
 pub use from_height::*;
 pub use from_height_strict::*;
 pub use from_txindex::*;
 pub use ratio_from_dateindex::*;
+pub use source::*;
 use r#type::*;
 pub use value_from_dateindex::*;
 pub use value_from_height::*;
diff --git a/crates/brk_computer/src/vecs/grouped/ratio_from_dateindex.rs b/crates/brk_computer/src/vecs/grouped/ratio_from_dateindex.rs
index 75fa03460..1bc7f6f77 100644
--- a/crates/brk_computer/src/vecs/grouped/ratio_from_dateindex.rs
+++ b/crates/brk_computer/src/vecs/grouped/ratio_from_dateindex.rs
@@ -4,80 +4,86 @@ use brk_core::{Date, DateIndex, Dollars, Result, StoredF32, Version};
 use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{
-    AnyCollectableVec, AnyIterableVec, AnyVec, CollectableVec, EagerVec, Format, StoredIndex,
-    VecIterator,
+    AnyCollectableVec, AnyIterableVec, AnyVec, CollectableVec, Computation, EagerVec, Format,
+    StoredIndex, VecIterator,
 };
 
 use crate::{
     utils::get_percentile,
-    vecs::{Indexes, fetched, indexes},
+    vecs::{Indexes, fetched, grouped::source::Source, indexes},
 };
 
-use super::{ComputedVecsFromDateIndex, StorableVecGeneatorOptions};
+use super::{ComputedVecsFromDateIndex, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedRatioVecsFromDateIndex {
     pub price: Option<ComputedVecsFromDateIndex<Dollars>>,
 
     pub ratio: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_sma: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_1w_sma: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_1m_sma: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_1y_sma: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_4y_sma: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_1y_sma_momentum_oscillator: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_4y_sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_1y_sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p99_9: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p99_5: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p99: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p1: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p0_5: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p0_1: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p1sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p2sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p3sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_m1sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_m2sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_m3sd: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_p99_9_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p99_5_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p99_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p1_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p0_5_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p0_1_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p1sd_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p2sd_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_p3sd_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_m1sd_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_m2sd_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_m3sd_as_price: ComputedVecsFromDateIndex<Dollars>,
-    pub ratio_zscore: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_4y_zscore: ComputedVecsFromDateIndex<StoredF32>,
-    pub ratio_1y_zscore: ComputedVecsFromDateIndex<StoredF32>,
+    pub ratio_sma: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_1w_sma: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_1m_sma: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_1y_sma: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_4y_sma: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_1y_sma_momentum_oscillator: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_4y_sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_1y_sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p99_9: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p99_5: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p99: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p1: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p0_5: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p0_1: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p1sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p2sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p3sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_m1sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_m2sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_m3sd: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_p99_9_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p99_5_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p99_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p1_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p0_5_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p0_1_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p1sd_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p2sd_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_p3sd_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_m1sd_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_m2sd_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_m3sd_as_price: Option<ComputedVecsFromDateIndex<Dollars>>,
+    pub ratio_zscore: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_4y_zscore: Option<ComputedVecsFromDateIndex<StoredF32>>,
+    pub ratio_1y_zscore: Option<ComputedVecsFromDateIndex<StoredF32>>,
 }
 
 const VERSION: Version = Version::ZERO;
 
 impl ComputedRatioVecsFromDateIndex {
+    #[allow(clippy::too_many_arguments)]
     pub fn forced_import(
         path: &Path,
         name: &str,
-        compute_source: bool,
+        source: Source<DateIndex, Dollars>,
         version: Version,
         format: Format,
+        computation: Computation,
+        indexes: &indexes::Vecs,
+        extended: bool,
     ) -> color_eyre::Result<Self> {
-        let options = StorableVecGeneatorOptions::default().add_last();
+        let options = VecBuilderOptions::default().add_last();
 
         Ok(Self {
-            price: compute_source.then(|| {
+            price: source.is_compute().then(|| {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     name,
-                    true,
+                    Source::Compute,
                     version + VERSION,
                     format,
+                    computation,
+                    indexes,
                     options,
                 )
                 .unwrap()
@@ -85,299 +91,481 @@ impl ComputedRatioVecsFromDateIndex {
             ratio: ComputedVecsFromDateIndex::forced_import(
                 path,
                 &format!("{name}_ratio"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_sma: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_sma"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_1w_sma: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_1w_sma"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_1m_sma: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_1m_sma"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_1y_sma: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_1y_sma"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_4y_sma: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_4y_sma"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_1y_sma_momentum_oscillator: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_1y_sma_momentum_oscillator"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_4y_sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_4y_sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_1y_sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_1y_sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p99_9: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p99_9"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p99_5: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p99_5"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p99: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p99"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p1: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p1"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p0_5: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p0_5"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p0_1: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p0_1"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p1sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p1sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p2sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p2sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p3sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p3sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_m1sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_m1sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_m2sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_m2sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_m3sd: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_m3sd"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p99_9_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p99_9_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p99_5_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p99_5_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p99_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p99_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p1_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p1_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p0_5_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p0_5_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p0_1_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p0_1_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p1sd_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p1sd_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p2sd_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p2sd_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_p3sd_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_p3sd_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_m1sd_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_m1sd_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_m2sd_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_m2sd_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_m3sd_as_price: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_m3sd_as_price"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_zscore: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_zscore"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_4y_zscore: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_4y_zscore"),
-                true,
-                version + VERSION + Version::ZERO,
-                format,
-                options,
-            )?,
-            ratio_1y_zscore: ComputedVecsFromDateIndex::forced_import(
-                path,
-                &format!("{name}_ratio_1y_zscore"),
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
                 options,
             )?,
+            ratio_sma: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_sma"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_1w_sma: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_1w_sma"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_1m_sma: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_1m_sma"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_1y_sma: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_1y_sma"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_4y_sma: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_4y_sma"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_1y_sma_momentum_oscillator: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_1y_sma_momentum_oscillator"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_4y_sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_4y_sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_1y_sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_1y_sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p99_9: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p99_9"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p99_5: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p99_5"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p99: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p99"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p1: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p1"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p0_5: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p0_5"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p0_1: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p0_1"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p1sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p1sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p2sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p2sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p3sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p3sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_m1sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_m1sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_m2sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_m2sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_m3sd: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_m3sd"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p99_9_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p99_9_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p99_5_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p99_5_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p99_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p99_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p1_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p1_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p0_5_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p0_5_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p0_1_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p0_1_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p1sd_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p1sd_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p2sd_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p2sd_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_p3sd_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_p3sd_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_m1sd_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_m1sd_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_m2sd_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_m2sd_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_m3sd_as_price: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_m3sd_as_price"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_zscore: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_zscore"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_4y_zscore: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_4y_zscore"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
+            ratio_1y_zscore: extended.then(|| {
+                ComputedVecsFromDateIndex::forced_import(
+                    path,
+                    &format!("{name}_ratio_1y_zscore"),
+                    Source::Compute,
+                    version + VERSION + Version::ZERO,
+                    format,
+                    computation,
+                    indexes,
+                    options,
+                )
+                .unwrap()
+            }),
         })
     }
 
@@ -456,9 +644,13 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
+        if self.ratio_sma.is_none() {
+            return Ok(());
+        }
+
         let min_ratio_date = DateIndex::try_from(Date::MIN_RATIO).unwrap();
 
-        self.ratio_sma.compute_all(
+        self.ratio_sma.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -474,7 +666,7 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_1w_sma.compute_all(
+        self.ratio_1w_sma.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -490,7 +682,7 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_1m_sma.compute_all(
+        self.ratio_1m_sma.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -506,7 +698,7 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_1y_sma.compute_all(
+        self.ratio_1y_sma.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -522,7 +714,7 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_4y_sma.compute_all(
+        self.ratio_4y_sma.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -538,27 +730,38 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_1y_sma_momentum_oscillator.compute_all(
-            indexer,
-            indexes,
-            starting_indexes,
-            exit,
-            |v, _, _, starting_indexes, exit| {
-                let mut ratio_1y_sma_iter =
-                    self.ratio_1y_sma.dateindex.as_ref().unwrap().into_iter();
-                v.compute_transform(
-                    starting_indexes.dateindex,
-                    self.ratio.dateindex.as_ref().unwrap(),
-                    |(i, ratio, ..)| {
-                        (
-                            i,
-                            StoredF32::from(*ratio / *ratio_1y_sma_iter.unwrap_get_inner(i) - 1.0),
-                        )
-                    },
-                    exit,
-                )
-            },
-        )?;
+        self.ratio_1y_sma_momentum_oscillator
+            .as_mut()
+            .unwrap()
+            .compute_all(
+                indexer,
+                indexes,
+                starting_indexes,
+                exit,
+                |v, _, _, starting_indexes, exit| {
+                    let mut ratio_1y_sma_iter = self
+                        .ratio_1y_sma
+                        .as_ref()
+                        .unwrap()
+                        .dateindex
+                        .as_ref()
+                        .unwrap()
+                        .into_iter();
+                    v.compute_transform(
+                        starting_indexes.dateindex,
+                        self.ratio.dateindex.as_ref().unwrap(),
+                        |(i, ratio, ..)| {
+                            (
+                                i,
+                                StoredF32::from(
+                                    *ratio / *ratio_1y_sma_iter.unwrap_get_inner(i) - 1.0,
+                                ),
+                            )
+                        },
+                        exit,
+                    )
+                },
+            )?;
 
         let ratio_version = self.ratio.dateindex.as_ref().unwrap().version();
         self.mut_ratio_vecs()
@@ -588,9 +791,30 @@ impl ComputedRatioVecsFromDateIndex {
         //     unreachable!();
         // }
 
-        let mut sma_iter = self.ratio_sma.dateindex.as_ref().unwrap().into_iter();
-        let mut _4y_sma_iter = self.ratio_4y_sma.dateindex.as_ref().unwrap().into_iter();
-        let mut _1y_sma_iter = self.ratio_1y_sma.dateindex.as_ref().unwrap().into_iter();
+        let mut sma_iter = self
+            .ratio_sma
+            .as_ref()
+            .unwrap()
+            .dateindex
+            .as_ref()
+            .unwrap()
+            .into_iter();
+        let mut _4y_sma_iter = self
+            .ratio_4y_sma
+            .as_ref()
+            .unwrap()
+            .dateindex
+            .as_ref()
+            .unwrap()
+            .into_iter();
+        let mut _1y_sma_iter = self
+            .ratio_1y_sma
+            .as_ref()
+            .unwrap()
+            .dateindex
+            .as_ref()
+            .unwrap()
+            .into_iter();
 
         let nan = StoredF32::from(f32::NAN);
         self.ratio
@@ -601,111 +825,153 @@ impl ComputedRatioVecsFromDateIndex {
             .try_for_each(|(index, ratio)| -> Result<()> {
                 if index < min_ratio_date {
                     self.ratio_p0_1
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_p0_5
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_p1
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_p99
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_p99_5
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_p99_9
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_4y_sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_1y_sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
 
                     self.ratio_p1sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_p2sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_p3sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_m1sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_m2sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                     self.ratio_m3sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, nan, exit)?;
                 } else {
-                    let ratio = ratio.into_inner();
+                    let ratio = ratio.into_owned();
                     let pos = sorted.binary_search(&ratio).unwrap_or_else(|pos| pos);
                     sorted.insert(pos, ratio);
-                    self.ratio_p0_1.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        get_percentile(&sorted, 0.001),
-                        exit,
-                    )?;
-                    self.ratio_p0_5.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        get_percentile(&sorted, 0.005),
-                        exit,
-                    )?;
-                    self.ratio_p1.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        get_percentile(&sorted, 0.01),
-                        exit,
-                    )?;
-                    self.ratio_p99.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        get_percentile(&sorted, 0.99),
-                        exit,
-                    )?;
+                    self.ratio_p0_1
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, get_percentile(&sorted, 0.001), exit)?;
+                    self.ratio_p0_5
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, get_percentile(&sorted, 0.005), exit)?;
+                    self.ratio_p1
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, get_percentile(&sorted, 0.01), exit)?;
+                    self.ratio_p99
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, get_percentile(&sorted, 0.99), exit)?;
                     self.ratio_p99_5
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, get_percentile(&sorted, 0.995), exit)?;
                     self.ratio_p99_9
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
@@ -720,6 +986,8 @@ impl ComputedRatioVecsFromDateIndex {
                     );
 
                     self.ratio_sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
@@ -734,6 +1002,8 @@ impl ComputedRatioVecsFromDateIndex {
                     );
 
                     self.ratio_4y_sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
@@ -748,41 +1018,55 @@ impl ComputedRatioVecsFromDateIndex {
                     );
 
                     self.ratio_1y_sd
+                        .as_mut()
+                        .unwrap()
                         .dateindex
                         .as_mut()
                         .unwrap()
                         .forced_push_at(index, _1y_sd, exit)?;
 
-                    self.ratio_p1sd.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        avg + sd,
-                        exit,
-                    )?;
-                    self.ratio_p2sd.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        avg + 2 * sd,
-                        exit,
-                    )?;
-                    self.ratio_p3sd.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        avg + 3 * sd,
-                        exit,
-                    )?;
-                    self.ratio_m1sd.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        avg - sd,
-                        exit,
-                    )?;
-                    self.ratio_m2sd.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        avg - 2 * sd,
-                        exit,
-                    )?;
-                    self.ratio_m3sd.dateindex.as_mut().unwrap().forced_push_at(
-                        index,
-                        avg - 3 * sd,
-                        exit,
-                    )?;
+                    self.ratio_p1sd
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, avg + sd, exit)?;
+                    self.ratio_p2sd
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, avg + 2 * sd, exit)?;
+                    self.ratio_p3sd
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, avg + 3 * sd, exit)?;
+                    self.ratio_m1sd
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, avg - sd, exit)?;
+                    self.ratio_m2sd
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, avg - 2 * sd, exit)?;
+                    self.ratio_m3sd
+                        .as_mut()
+                        .unwrap()
+                        .dateindex
+                        .as_mut()
+                        .unwrap()
+                        .forced_push_at(index, avg - 3 * sd, exit)?;
                 }
 
                 Ok(())
@@ -792,91 +1076,91 @@ impl ComputedRatioVecsFromDateIndex {
             .into_iter()
             .try_for_each(|v| v.safe_flush(exit))?;
 
-        self.ratio_p99_9.compute_rest(
+        self.ratio_p99_9.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p99_5.compute_rest(
+        self.ratio_p99_5.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p99.compute_rest(
+        self.ratio_p99.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p1.compute_rest(
+        self.ratio_p1.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p0_5.compute_rest(
+        self.ratio_p0_5.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p0_1.compute_rest(
+        self.ratio_p0_1.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_sd.compute_rest(
+        self.ratio_sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_4y_sd.compute_rest(
+        self.ratio_4y_sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_1y_sd.compute_rest(
+        self.ratio_1y_sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p1sd.compute_rest(
+        self.ratio_p1sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p2sd.compute_rest(
+        self.ratio_p2sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_p3sd.compute_rest(
+        self.ratio_p3sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_m1sd.compute_rest(
+        self.ratio_m1sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_m2sd.compute_rest(
+        self.ratio_m2sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
             None as Option<&EagerVec<_, _>>,
         )?;
-        self.ratio_m3sd.compute_rest(
+        self.ratio_m3sd.as_mut().unwrap().compute_rest(
             indexes,
             starting_indexes,
             exit,
@@ -887,13 +1171,20 @@ impl ComputedRatioVecsFromDateIndex {
             std::mem::transmute(&self.price.as_ref().unwrap().dateindex)
         });
 
-        self.ratio_p99_as_price.compute_all(
+        self.ratio_p99_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p99.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p99
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -906,13 +1197,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p99_5_as_price.compute_all(
+        self.ratio_p99_5_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p99_5.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p99_5
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -925,13 +1223,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p99_9_as_price.compute_all(
+        self.ratio_p99_9_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p99_9.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p99_9
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -944,13 +1249,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p1_as_price.compute_all(
+        self.ratio_p1_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p1.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p1
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -963,13 +1275,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p0_5_as_price.compute_all(
+        self.ratio_p0_5_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p0_5.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p0_5
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -982,13 +1301,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p0_1_as_price.compute_all(
+        self.ratio_p0_1_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p0_1.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p0_1
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -1001,13 +1327,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p1sd_as_price.compute_all(
+        self.ratio_p1sd_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p1sd.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p1sd
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -1020,13 +1353,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p2sd_as_price.compute_all(
+        self.ratio_p2sd_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p2sd.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p2sd
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -1039,13 +1379,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_p3sd_as_price.compute_all(
+        self.ratio_p3sd_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_p3sd.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_p3sd
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -1058,13 +1405,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_m1sd_as_price.compute_all(
+        self.ratio_m1sd_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_m1sd.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_m1sd
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -1077,13 +1431,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_m2sd_as_price.compute_all(
+        self.ratio_m2sd_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_m2sd.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_m2sd
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -1096,13 +1457,20 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_m3sd_as_price.compute_all(
+        self.ratio_m3sd_as_price.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
             exit,
             |vec, _, _, starting_indexes, exit| {
-                let mut iter = self.ratio_m3sd.dateindex.as_ref().unwrap().into_iter();
+                let mut iter = self
+                    .ratio_m3sd
+                    .as_ref()
+                    .unwrap()
+                    .dateindex
+                    .as_ref()
+                    .unwrap()
+                    .into_iter();
                 vec.compute_transform(
                     starting_indexes.dateindex,
                     date_to_price,
@@ -1115,7 +1483,7 @@ impl ComputedRatioVecsFromDateIndex {
             },
         )?;
 
-        self.ratio_zscore.compute_all(
+        self.ratio_zscore.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -1124,14 +1492,14 @@ impl ComputedRatioVecsFromDateIndex {
                 vec.compute_zscore(
                     starting_indexes.dateindex,
                     self.ratio.dateindex.as_ref().unwrap(),
-                    self.ratio_sma.dateindex.as_ref().unwrap(),
-                    self.ratio_sd.dateindex.as_ref().unwrap(),
+                    self.ratio_sma.as_ref().unwrap().dateindex.as_ref().unwrap(),
+                    self.ratio_sd.as_ref().unwrap().dateindex.as_ref().unwrap(),
                     exit,
                 )
             },
         )?;
 
-        self.ratio_4y_zscore.compute_all(
+        self.ratio_4y_zscore.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -1140,14 +1508,24 @@ impl ComputedRatioVecsFromDateIndex {
                 vec.compute_zscore(
                     starting_indexes.dateindex,
                     self.ratio.dateindex.as_ref().unwrap(),
-                    self.ratio_4y_sma.dateindex.as_ref().unwrap(),
-                    self.ratio_4y_sd.dateindex.as_ref().unwrap(),
+                    self.ratio_4y_sma
+                        .as_ref()
+                        .unwrap()
+                        .dateindex
+                        .as_ref()
+                        .unwrap(),
+                    self.ratio_4y_sd
+                        .as_ref()
+                        .unwrap()
+                        .dateindex
+                        .as_ref()
+                        .unwrap(),
                     exit,
                 )
             },
         )?;
 
-        self.ratio_1y_zscore.compute_all(
+        self.ratio_1y_zscore.as_mut().unwrap().compute_all(
             indexer,
             indexes,
             starting_indexes,
@@ -1156,8 +1534,18 @@ impl ComputedRatioVecsFromDateIndex {
                 vec.compute_zscore(
                     starting_indexes.dateindex,
                     self.ratio.dateindex.as_ref().unwrap(),
-                    self.ratio_1y_sma.dateindex.as_ref().unwrap(),
-                    self.ratio_1y_sd.dateindex.as_ref().unwrap(),
+                    self.ratio_1y_sma
+                        .as_ref()
+                        .unwrap()
+                        .dateindex
+                        .as_ref()
+                        .unwrap(),
+                    self.ratio_1y_sd
+                        .as_ref()
+                        .unwrap()
+                        .dateindex
+                        .as_ref()
+                        .unwrap(),
                     exit,
                 )
             },
@@ -1167,65 +1555,122 @@ impl ComputedRatioVecsFromDateIndex {
     }
 
     fn mut_ratio_vecs(&mut self) -> Vec<&mut EagerVec<DateIndex, StoredF32>> {
-        vec![
-            self.ratio_sd.dateindex.as_mut().unwrap(),
-            self.ratio_4y_sd.dateindex.as_mut().unwrap(),
-            self.ratio_1y_sd.dateindex.as_mut().unwrap(),
-            self.ratio_p99_9.dateindex.as_mut().unwrap(),
-            self.ratio_p99_5.dateindex.as_mut().unwrap(),
-            self.ratio_p99.dateindex.as_mut().unwrap(),
-            self.ratio_p1.dateindex.as_mut().unwrap(),
-            self.ratio_p0_5.dateindex.as_mut().unwrap(),
-            self.ratio_p0_1.dateindex.as_mut().unwrap(),
-            self.ratio_p1sd.dateindex.as_mut().unwrap(),
-            self.ratio_p2sd.dateindex.as_mut().unwrap(),
-            self.ratio_p3sd.dateindex.as_mut().unwrap(),
-            self.ratio_m1sd.dateindex.as_mut().unwrap(),
-            self.ratio_m2sd.dateindex.as_mut().unwrap(),
-            self.ratio_m3sd.dateindex.as_mut().unwrap(),
+        [
+            self.ratio_sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_4y_sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_1y_sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p99_9
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p99_5
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p99
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p1
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p0_5
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p0_1
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p1sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p2sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_p3sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_m1sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_m2sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
+            self.ratio_m3sd
+                .as_mut()
+                .map_or(vec![], |v| vec![v.dateindex.as_mut().unwrap()]),
         ]
+        .into_iter()
+        .flatten()
+        .collect::<Vec<_>>()
     }
 
     pub fn vecs(&self) -> Vec<&dyn AnyCollectableVec> {
         [
             self.price.as_ref().map_or(vec![], |v| v.vecs()),
             self.ratio.vecs(),
-            self.ratio_sma.vecs(),
-            self.ratio_1w_sma.vecs(),
-            self.ratio_1m_sma.vecs(),
-            self.ratio_1y_sma.vecs(),
-            self.ratio_4y_sma.vecs(),
-            self.ratio_1y_sma_momentum_oscillator.vecs(),
-            self.ratio_sd.vecs(),
-            self.ratio_1y_sd.vecs(),
-            self.ratio_4y_sd.vecs(),
-            self.ratio_p99_9.vecs(),
-            self.ratio_p99_5.vecs(),
-            self.ratio_p99.vecs(),
-            self.ratio_p1.vecs(),
-            self.ratio_p0_5.vecs(),
-            self.ratio_p0_1.vecs(),
-            self.ratio_p1sd.vecs(),
-            self.ratio_p2sd.vecs(),
-            self.ratio_p3sd.vecs(),
-            self.ratio_m1sd.vecs(),
-            self.ratio_m2sd.vecs(),
-            self.ratio_m3sd.vecs(),
-            self.ratio_p99_9_as_price.vecs(),
-            self.ratio_p99_5_as_price.vecs(),
-            self.ratio_p99_as_price.vecs(),
-            self.ratio_p1_as_price.vecs(),
-            self.ratio_p0_5_as_price.vecs(),
-            self.ratio_p0_1_as_price.vecs(),
-            self.ratio_p1sd_as_price.vecs(),
-            self.ratio_p2sd_as_price.vecs(),
-            self.ratio_p3sd_as_price.vecs(),
-            self.ratio_m1sd_as_price.vecs(),
-            self.ratio_m2sd_as_price.vecs(),
-            self.ratio_m3sd_as_price.vecs(),
-            self.ratio_zscore.vecs(),
-            self.ratio_1y_zscore.vecs(),
-            self.ratio_4y_zscore.vecs(),
+            self.ratio_sma.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_1w_sma.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_1m_sma.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_1y_sma.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_4y_sma.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_1y_sma_momentum_oscillator
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_1y_sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_4y_sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p99_9.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p99_5.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p99.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p1.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p0_5.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p0_1.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p1sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p2sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p3sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_m1sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_m2sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_m3sd.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p99_9_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_p99_5_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_p99_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_p1_as_price.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_p0_5_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_p0_1_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_p1sd_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_p2sd_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_p3sd_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_m1sd_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_m2sd_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_m3sd_as_price
+                .as_ref()
+                .map_or(vec![], |v| v.vecs()),
+            self.ratio_zscore.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_1y_zscore.as_ref().map_or(vec![], |v| v.vecs()),
+            self.ratio_4y_zscore.as_ref().map_or(vec![], |v| v.vecs()),
         ]
         .into_iter()
         .flatten()
diff --git a/crates/brk_computer/src/vecs/grouped/source.rs b/crates/brk_computer/src/vecs/grouped/source.rs
new file mode 100644
index 000000000..d8886e4f5
--- /dev/null
+++ b/crates/brk_computer/src/vecs/grouped/source.rs
@@ -0,0 +1,51 @@
+use brk_vec::BoxedAnyIterableVec;
+
+#[derive(Clone)]
+pub enum Source<I, T> {
+    Compute,
+    None,
+    Vec(BoxedAnyIterableVec<I, T>),
+}
+
+impl<I, T> Source<I, T> {
+    pub fn is_compute(&self) -> bool {
+        matches!(self, Self::Compute)
+    }
+
+    pub fn is_none(&self) -> bool {
+        matches!(self, Self::None)
+    }
+
+    pub fn is_vec(&self) -> bool {
+        matches!(self, Self::Vec(_))
+    }
+
+    pub fn vec(self) -> Option<BoxedAnyIterableVec<I, T>> {
+        match self {
+            Self::Vec(v) => Some(v),
+            _ => None,
+        }
+    }
+}
+
+impl<I, T> From<bool> for Source<I, T> {
+    fn from(value: bool) -> Self {
+        if value { Self::Compute } else { Self::None }
+    }
+}
+
+impl<I, T> From<BoxedAnyIterableVec<I, T>> for Source<I, T> {
+    fn from(value: BoxedAnyIterableVec<I, T>) -> Self {
+        Self::Vec(value)
+    }
+}
+
+impl<I, T> From<Option<BoxedAnyIterableVec<I, T>>> for Source<I, T> {
+    fn from(value: Option<BoxedAnyIterableVec<I, T>>) -> Self {
+        if let Some(v) = value {
+            Self::Vec(v)
+        } else {
+            Self::None
+        }
+    }
+}
diff --git a/crates/brk_computer/src/vecs/grouped/type.rs b/crates/brk_computer/src/vecs/grouped/type.rs
index c98b6498f..357e6d6ba 100644
--- a/crates/brk_computer/src/vecs/grouped/type.rs
+++ b/crates/brk_computer/src/vecs/grouped/type.rs
@@ -1,13 +1,14 @@
-use std::ops::{Add, Div};
+use std::ops::{Add, AddAssign, Div};
 
 use brk_vec::StoredType;
 
 pub trait ComputedType
 where
-    Self: StoredType + From<usize> + Div<usize, Output = Self> + Add<Output = Self> + Ord,
+    Self:
+        StoredType + From<usize> + Div<usize, Output = Self> + Add<Output = Self> + AddAssign + Ord,
 {
 }
 impl<T> ComputedType for T where
-    T: StoredType + From<usize> + Div<usize, Output = Self> + Add<Output = Self> + Ord
+    T: StoredType + From<usize> + Div<usize, Output = Self> + Add<Output = Self> + AddAssign + Ord
 {
 }
diff --git a/crates/brk_computer/src/vecs/grouped/value_from_dateindex.rs b/crates/brk_computer/src/vecs/grouped/value_from_dateindex.rs
index 87195f2f1..124fec3ea 100644
--- a/crates/brk_computer/src/vecs/grouped/value_from_dateindex.rs
+++ b/crates/brk_computer/src/vecs/grouped/value_from_dateindex.rs
@@ -3,11 +3,11 @@ use std::path::Path;
 use brk_core::{Bitcoin, DateIndex, Dollars, Result, Sats, Version};
 use brk_exit::Exit;
 use brk_indexer::Indexer;
-use brk_vec::{AnyCollectableVec, CollectableVec, EagerVec, Format, StoredVec};
+use brk_vec::{AnyCollectableVec, CollectableVec, Computation, EagerVec, Format, StoredVec};
 
 use crate::vecs::{Indexes, fetched, grouped::ComputedVecsFromDateIndex, indexes};
 
-use super::StorableVecGeneatorOptions;
+use super::{Source, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedValueVecsFromDateIndex {
@@ -19,39 +19,48 @@ pub struct ComputedValueVecsFromDateIndex {
 const VERSION: Version = Version::ZERO;
 
 impl ComputedValueVecsFromDateIndex {
+    #[allow(clippy::too_many_arguments)]
     pub fn forced_import(
         path: &Path,
         name: &str,
-        compute_source: bool,
+        source: Source<DateIndex, Sats>,
         version: Version,
         format: Format,
-        options: StorableVecGeneatorOptions,
+        computation: Computation,
+        options: VecBuilderOptions,
         compute_dollars: bool,
+        indexes: &indexes::Vecs,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
             sats: ComputedVecsFromDateIndex::forced_import(
                 path,
                 name,
-                compute_source,
+                source,
                 version + VERSION,
                 format,
+                computation,
+                indexes,
                 options,
             )?,
             bitcoin: ComputedVecsFromDateIndex::forced_import(
                 path,
                 &format!("{name}_in_btc"),
-                true,
+                Source::Compute,
                 version + VERSION,
                 format,
+                computation,
+                indexes,
                 options,
             )?,
             dollars: compute_dollars.then(|| {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &format!("{name}_in_usd"),
-                    true,
+                    Source::Compute,
                     version + VERSION,
                     format,
+                    computation,
+                    indexes,
                     options,
                 )
                 .unwrap()
diff --git a/crates/brk_computer/src/vecs/grouped/value_from_height.rs b/crates/brk_computer/src/vecs/grouped/value_from_height.rs
index 277dafaeb..b582475aa 100644
--- a/crates/brk_computer/src/vecs/grouped/value_from_height.rs
+++ b/crates/brk_computer/src/vecs/grouped/value_from_height.rs
@@ -3,11 +3,11 @@ use std::path::Path;
 use brk_core::{Bitcoin, Dollars, Height, Result, Sats, Version};
 use brk_exit::Exit;
 use brk_indexer::Indexer;
-use brk_vec::{AnyCollectableVec, CollectableVec, EagerVec, Format, StoredVec};
+use brk_vec::{AnyCollectableVec, CollectableVec, Computation, EagerVec, Format, StoredVec};
 
-use crate::vecs::{Indexes, fetched, indexes};
+use crate::vecs::{Indexes, fetched, grouped::Source, indexes};
 
-use super::{ComputedVecsFromHeight, StorableVecGeneatorOptions};
+use super::{ComputedVecsFromHeight, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedValueVecsFromHeight {
@@ -19,39 +19,48 @@ pub struct ComputedValueVecsFromHeight {
 const VERSION: Version = Version::ZERO;
 
 impl ComputedValueVecsFromHeight {
+    #[allow(clippy::too_many_arguments)]
     pub fn forced_import(
         path: &Path,
         name: &str,
-        compute_source: bool,
+        source: Source<Height, Sats>,
         version: Version,
         format: Format,
-        options: StorableVecGeneatorOptions,
+        computation: Computation,
+        options: VecBuilderOptions,
         compute_dollars: bool,
+        indexes: &indexes::Vecs,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
             sats: ComputedVecsFromHeight::forced_import(
                 path,
                 name,
-                compute_source,
+                source,
                 version + VERSION,
                 format,
+                computation,
+                indexes,
                 options,
             )?,
             bitcoin: ComputedVecsFromHeight::forced_import(
                 path,
                 &format!("{name}_in_btc"),
-                true,
+                Source::Compute,
                 version + VERSION,
                 format,
+                computation,
+                indexes,
                 options,
             )?,
             dollars: compute_dollars.then(|| {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &format!("{name}_in_usd"),
-                    true,
+                    Source::Compute,
                     version + VERSION,
                     format,
+                    computation,
+                    indexes,
                     options,
                 )
                 .unwrap()
diff --git a/crates/brk_computer/src/vecs/grouped/value_from_txindex.rs b/crates/brk_computer/src/vecs/grouped/value_from_txindex.rs
index 91891f98d..534ee33b5 100644
--- a/crates/brk_computer/src/vecs/grouped/value_from_txindex.rs
+++ b/crates/brk_computer/src/vecs/grouped/value_from_txindex.rs
@@ -4,13 +4,13 @@ use brk_core::{Bitcoin, Close, Dollars, Height, Sats, TxIndex, Version};
 use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{
-    AnyCollectableVec, BoxedAnyIterableVec, CloneableAnyIterableVec, CollectableVec, Computation,
-    ComputedVecFrom3, Format, LazyVecFrom1, StoredIndex, StoredVec,
+    AnyCollectableVec, CloneableAnyIterableVec, CollectableVec, Computation, ComputedVecFrom3,
+    Format, LazyVecFrom1, StoredIndex, StoredVec,
 };
 
-use crate::vecs::{Indexes, fetched, indexes};
+use crate::vecs::{Indexes, fetched, grouped::Source, indexes};
 
-use super::{ComputedVecsFromTxindex, StorableVecGeneatorOptions};
+use super::{ComputedVecsFromTxindex, VecBuilderOptions};
 
 #[derive(Clone)]
 pub struct ComputedValueVecsFromTxindex {
@@ -41,14 +41,13 @@ impl ComputedValueVecsFromTxindex {
         path: &Path,
         name: &str,
         indexes: &indexes::Vecs,
-        source: Option<BoxedAnyIterableVec<TxIndex, Sats>>,
+        source: Source<TxIndex, Sats>,
         version: Version,
         computation: Computation,
         format: Format,
         fetched: Option<&fetched::Vecs>,
-        options: StorableVecGeneatorOptions,
+        options: VecBuilderOptions,
     ) -> color_eyre::Result<Self> {
-        let compute_source = source.is_none();
         let compute_dollars = fetched.is_some();
 
         let name_in_btc = format!("{name}_in_btc");
@@ -57,19 +56,23 @@ impl ComputedValueVecsFromTxindex {
         let sats = ComputedVecsFromTxindex::forced_import(
             path,
             name,
-            compute_source,
+            source.clone(),
             version + VERSION,
             format,
+            computation,
+            indexes,
             options,
         )?;
 
+        let source_vec = source.vec();
+
         let bitcoin_txindex = LazyVecFrom1::init(
             &name_in_btc,
             version + VERSION,
-            source.map_or_else(|| sats.txindex.as_ref().unwrap().boxed_clone(), |s| s),
+            source_vec.map_or_else(|| sats.txindex.as_ref().unwrap().boxed_clone(), |s| s),
             |txindex: TxIndex, iter| {
                 iter.next_at(txindex.unwrap_to_usize()).map(|(_, value)| {
-                    let sats = value.into_inner();
+                    let sats = value.into_owned();
                     Bitcoin::from(sats)
                 })
             },
@@ -78,9 +81,11 @@ impl ComputedValueVecsFromTxindex {
         let bitcoin = ComputedVecsFromTxindex::forced_import(
             path,
             &name_in_btc,
-            false,
+            Source::None,
             version + VERSION,
             format,
+            computation,
+            indexes,
             options,
         )?;
 
@@ -100,14 +105,14 @@ impl ComputedValueVecsFromTxindex {
                  height_to_close_iter| {
                     let txindex = txindex.unwrap_to_usize();
                     txindex_to_btc_iter.next_at(txindex).and_then(|(_, value)| {
-                        let btc = value.into_inner();
+                        let btc = value.into_owned();
                         txindex_to_height_iter
                             .next_at(txindex)
                             .and_then(|(_, value)| {
-                                let height = value.into_inner();
+                                let height = value.into_owned();
                                 height_to_close_iter
                                     .next_at(height.unwrap_to_usize())
-                                    .map(|(_, close)| *close.into_inner() * btc)
+                                    .map(|(_, close)| *close.into_owned() * btc)
                             })
                     })
                 },
@@ -124,9 +129,11 @@ impl ComputedValueVecsFromTxindex {
                 ComputedVecsFromTxindex::forced_import(
                     path,
                     &name_in_usd,
-                    false,
+                    Source::None,
                     version + VERSION,
                     format,
+                    computation,
+                    indexes,
                     options,
                 )
                 .unwrap()
diff --git a/crates/brk_computer/src/vecs/grouped/value_height.rs b/crates/brk_computer/src/vecs/grouped/value_height.rs
index b5ed7eaaa..bd2c34036 100644
--- a/crates/brk_computer/src/vecs/grouped/value_height.rs
+++ b/crates/brk_computer/src/vecs/grouped/value_height.rs
@@ -5,7 +5,7 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, CollectableVec, EagerVec, Format, StoredVec};
 
-use crate::vecs::{Indexes, fetched, indexes};
+use crate::vecs::{Indexes, fetched, grouped::Source, indexes};
 
 #[derive(Clone)]
 pub struct ComputedHeightValueVecs {
@@ -20,13 +20,13 @@ impl ComputedHeightValueVecs {
     pub fn forced_import(
         path: &Path,
         name: &str,
-        compute_source: bool,
+        source: Source<Height, Sats>,
         version: Version,
         format: Format,
         compute_dollars: bool,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
-            sats: compute_source.then(|| {
+            sats: source.is_compute().then(|| {
                 EagerVec::forced_import(path, name, version + VERSION + Version::ZERO, format)
                     .unwrap()
             }),
diff --git a/crates/brk_computer/src/vecs/indexes.rs b/crates/brk_computer/src/vecs/indexes.rs
index 7b860aa7c..9c7ed5cda 100644
--- a/crates/brk_computer/src/vecs/indexes.rs
+++ b/crates/brk_computer/src/vecs/indexes.rs
@@ -5,8 +5,8 @@ use brk_core::{
     InputIndex, MonthIndex, OpReturnIndex, OutputIndex, P2AAddressIndex, P2ABytes, P2MSOutputIndex,
     P2PK33AddressIndex, P2PK33Bytes, P2PK65AddressIndex, P2PK65Bytes, P2PKHAddressIndex,
     P2PKHBytes, P2SHAddressIndex, P2SHBytes, P2TRAddressIndex, P2TRBytes, P2WPKHAddressIndex,
-    P2WPKHBytes, P2WSHAddressIndex, P2WSHBytes, QuarterIndex, Sats, StoredUsize, Timestamp,
-    TxIndex, Txid, UnknownOutputIndex, Version, WeekIndex, YearIndex,
+    P2WPKHBytes, P2WSHAddressIndex, P2WSHBytes, QuarterIndex, Sats, SemesterIndex, StoredUsize,
+    Timestamp, TxIndex, Txid, UnknownOutputIndex, Version, WeekIndex, YearIndex,
 };
 use brk_exit::Exit;
 use brk_indexer::Indexer;
@@ -50,6 +50,7 @@ pub struct Vecs {
     pub monthindex_to_first_dateindex: EagerVec<MonthIndex, DateIndex>,
     pub monthindex_to_monthindex: EagerVec<MonthIndex, MonthIndex>,
     pub monthindex_to_quarterindex: EagerVec<MonthIndex, QuarterIndex>,
+    pub monthindex_to_semesterindex: EagerVec<MonthIndex, SemesterIndex>,
     pub monthindex_to_yearindex: EagerVec<MonthIndex, YearIndex>,
     pub opreturnindex_to_opreturnindex:
         ComputedVecFrom1<OpReturnIndex, OpReturnIndex, OpReturnIndex, TxIndex>,
@@ -76,6 +77,9 @@ pub struct Vecs {
     pub quarterindex_to_first_monthindex: EagerVec<QuarterIndex, MonthIndex>,
     pub quarterindex_to_monthindex_count: EagerVec<QuarterIndex, StoredUsize>,
     pub quarterindex_to_quarterindex: EagerVec<QuarterIndex, QuarterIndex>,
+    pub semesterindex_to_first_monthindex: EagerVec<SemesterIndex, MonthIndex>,
+    pub semesterindex_to_monthindex_count: EagerVec<SemesterIndex, StoredUsize>,
+    pub semesterindex_to_semesterindex: EagerVec<SemesterIndex, SemesterIndex>,
     pub txindex_to_height: EagerVec<TxIndex, Height>,
     pub txindex_to_input_count:
         ComputedVecFrom2<TxIndex, StoredUsize, TxIndex, InputIndex, InputIndex, OutputIndex>,
@@ -144,10 +148,10 @@ impl Vecs {
                 txindex_to_first_inputindex_iter
                     .next_at(txindex)
                     .map(|(_, start)| {
-                        let start = usize::from(start.into_inner());
+                        let start = usize::from(start.into_owned());
                         let end = txindex_to_first_inputindex_iter
                             .next_at(txindex + 1)
-                            .map(|(_, v)| usize::from(v.into_inner()))
+                            .map(|(_, v)| usize::from(v.into_owned()))
                             .unwrap_or_else(|| inputindex_to_outputindex_iter.len());
                         StoredUsize::from((start..end).count())
                     })
@@ -167,10 +171,10 @@ impl Vecs {
                 txindex_to_first_outputindex_iter
                     .next_at(txindex)
                     .map(|(_, start)| {
-                        let start = usize::from(start.into_inner());
+                        let start = usize::from(start.into_owned());
                         let end = txindex_to_first_outputindex_iter
                             .next_at(txindex + 1)
-                            .map(|(_, v)| usize::from(v.into_inner()))
+                            .map(|(_, v)| usize::from(v.into_owned()))
                             .unwrap_or_else(|| outputindex_to_value_iter.len());
                         StoredUsize::from((start..end).count())
                     })
@@ -413,6 +417,12 @@ impl Vecs {
                 version + VERSION + Version::ZERO,
                 format,
             )?,
+            monthindex_to_semesterindex: EagerVec::forced_import(
+                path,
+                "semesterindex",
+                version + VERSION + Version::ZERO,
+                format,
+            )?,
             monthindex_to_yearindex: EagerVec::forced_import(
                 path,
                 "yearindex",
@@ -425,6 +435,12 @@ impl Vecs {
                 version + VERSION + Version::ZERO,
                 format,
             )?,
+            semesterindex_to_first_monthindex: EagerVec::forced_import(
+                path,
+                "first_monthindex",
+                version + VERSION + Version::ZERO,
+                format,
+            )?,
             weekindex_to_first_dateindex: EagerVec::forced_import(
                 path,
                 "first_dateindex",
@@ -443,6 +459,12 @@ impl Vecs {
                 version + VERSION + Version::ZERO,
                 format,
             )?,
+            semesterindex_to_semesterindex: EagerVec::forced_import(
+                path,
+                "semesterindex",
+                version + VERSION + Version::ZERO,
+                format,
+            )?,
             weekindex_to_weekindex: EagerVec::forced_import(
                 path,
                 "weekindex",
@@ -521,6 +543,12 @@ impl Vecs {
                 version + VERSION + Version::ZERO,
                 format,
             )?,
+            semesterindex_to_monthindex_count: EagerVec::forced_import(
+                path,
+                "monthindex_count",
+                version + VERSION + Version::ZERO,
+                format,
+            )?,
             yearindex_to_monthindex_count: EagerVec::forced_import(
                 path,
                 "monthindex_count",
@@ -943,6 +971,45 @@ impl Vecs {
                 exit,
             )?;
 
+        // ---
+        // SemesterIndex
+        // ---
+
+        let starting_semesterindex = self
+            .monthindex_to_semesterindex
+            .into_iter()
+            .get_inner(starting_monthindex)
+            .unwrap_or_default();
+
+        self.monthindex_to_semesterindex.compute_from_index(
+            starting_monthindex,
+            &self.monthindex_to_first_dateindex,
+            exit,
+        )?;
+
+        self.semesterindex_to_first_monthindex
+            .compute_inverse_more_to_less(
+                starting_monthindex,
+                &self.monthindex_to_semesterindex,
+                exit,
+            )?;
+
+        // let semester_count = self.semesterindex_to_first_monthindex.len();
+
+        self.semesterindex_to_semesterindex.compute_from_index(
+            starting_semesterindex,
+            &self.semesterindex_to_first_monthindex,
+            exit,
+        )?;
+
+        self.semesterindex_to_monthindex_count
+            .compute_count_from_indexes(
+                starting_semesterindex,
+                &self.semesterindex_to_first_monthindex,
+                &self.monthindex_to_monthindex,
+                exit,
+            )?;
+
         // ---
         // YearIndex
         // ---
@@ -1051,6 +1118,7 @@ impl Vecs {
             weekindex: starting_weekindex,
             monthindex: starting_monthindex,
             quarterindex: starting_quarterindex,
+            semesterindex: starting_semesterindex,
             yearindex: starting_yearindex,
             decadeindex: starting_decadeindex,
             difficultyepoch: starting_difficultyepoch,
@@ -1088,6 +1156,7 @@ impl Vecs {
             &self.monthindex_to_first_dateindex,
             &self.monthindex_to_monthindex,
             &self.monthindex_to_quarterindex,
+            &self.monthindex_to_semesterindex,
             &self.monthindex_to_yearindex,
             &self.opreturnindex_to_opreturnindex,
             &self.outputindex_to_outputindex,
@@ -1103,6 +1172,9 @@ impl Vecs {
             &self.quarterindex_to_first_monthindex,
             &self.quarterindex_to_monthindex_count,
             &self.quarterindex_to_quarterindex,
+            &self.semesterindex_to_first_monthindex,
+            &self.semesterindex_to_monthindex_count,
+            &self.semesterindex_to_semesterindex,
             &self.txindex_to_height,
             &self.txindex_to_txindex,
             &self.txindex_to_input_count,
@@ -1126,6 +1198,7 @@ pub struct Indexes {
     pub weekindex: WeekIndex,
     pub monthindex: MonthIndex,
     pub quarterindex: QuarterIndex,
+    pub semesterindex: SemesterIndex,
     pub yearindex: YearIndex,
     pub decadeindex: DecadeIndex,
     pub difficultyepoch: DifficultyEpoch,
@@ -1145,6 +1218,7 @@ impl Indexes {
         self.weekindex = WeekIndex::from(self.dateindex);
         self.monthindex = MonthIndex::from(self.dateindex);
         self.quarterindex = QuarterIndex::from(self.monthindex);
+        self.semesterindex = SemesterIndex::from(self.monthindex);
         self.yearindex = YearIndex::from(self.monthindex);
         self.decadeindex = DecadeIndex::from(self.dateindex);
         self.difficultyepoch = DifficultyEpoch::from(self.height);
diff --git a/crates/brk_computer/src/vecs/market.rs b/crates/brk_computer/src/vecs/market.rs
index 98e670660..db1fcf27e 100644
--- a/crates/brk_computer/src/vecs/market.rs
+++ b/crates/brk_computer/src/vecs/market.rs
@@ -5,11 +5,11 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, Computation, EagerVec, Format, StoredIndex, VecIterator};
 
+use crate::vecs::grouped::Source;
+
 use super::{
     Indexes, fetched,
-    grouped::{
-        ComputedRatioVecsFromDateIndex, ComputedVecsFromDateIndex, StorableVecGeneatorOptions,
-    },
+    grouped::{ComputedRatioVecsFromDateIndex, ComputedVecsFromDateIndex, VecBuilderOptions},
     indexes, transactions,
 };
 
@@ -165,8 +165,9 @@ impl Vecs {
     pub fn forced_import(
         path: &Path,
         version: Version,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
+        indexes: &indexes::Vecs,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
             height_to_marketcap: EagerVec::forced_import(
@@ -190,1043 +191,1319 @@ impl Vecs {
             indexes_to_marketcap: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "marketcap",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_ath: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "ath",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_drawdown: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "drawdown",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_days_since_ath: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "days_since_ath",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_max_days_between_aths: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "max_days_between_aths",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_max_years_between_aths: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "max_years_between_aths",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
 
             indexes_to_1w_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "1w_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_8d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "8d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_13d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "13d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_21d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "21d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_1m_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "1m_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_34d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "34d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_55d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "55d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_89d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "89d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_144d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "144d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_200d_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "200d_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_1y_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "1y_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_2y_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "2y_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_200w_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "200w_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
             indexes_to_4y_sma: ComputedRatioVecsFromDateIndex::forced_import(
                 path,
                 "4y_sma",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
+                computation,
+                indexes,
+                true,
             )?,
 
             _1d_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1d_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1w_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1w_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1m_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1m_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3m_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3m_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6m_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6m_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _2y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "2y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _4y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "4y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _5y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "5y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _8y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "8y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _10y_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "10y_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _2y_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "2y_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3y_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3y_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _4y_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "4y_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _5y_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "5y_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6y_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6y_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _8y_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "8y_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _10y_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "10y_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
 
             _1w_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1w_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1m_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1m_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3m_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3m_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6m_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6m_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _2y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "2y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _4y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "4y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _5y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "5y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _8y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "8y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _10y_dca_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "10y_dca_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _2y_dca_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "2y_dca_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3y_dca_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3y_dca_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _4y_dca_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "4y_dca_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _5y_dca_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "5y_dca_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6y_dca_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6y_dca_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _8y_dca_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "8y_dca_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _10y_dca_cagr: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "10y_dca_cagr",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1w_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1w_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1m_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1m_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3m_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3m_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6m_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6m_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _2y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "2y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _4y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "4y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _5y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "5y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _8y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "8y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _10y_dca_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "10y_dca_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_1d_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_1d_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_1w_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_1w_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_1m_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_1m_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_3m_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_3m_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_6m_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_6m_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_1y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_1y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_2y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_2y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_3y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_3y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_4y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_4y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_5y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_5y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_6y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_6y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_8y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_8y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             price_10y_ago: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "price_10y_ago",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1w_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1w_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1m_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1m_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3m_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3m_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6m_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6m_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _1y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "1y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _2y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "2y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _3y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "3y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _4y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "4y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _5y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "5y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _6y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "6y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _8y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "8y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             _10y_dca_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "10y_dca_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
 
             dca_class_2025_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2025_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2024_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2024_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2023_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2023_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2022_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2022_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2021_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2021_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2020_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2020_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2019_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2019_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2018_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2018_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2017_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2017_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2016_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2016_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2015_stack: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2015_stack",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
 
             dca_class_2025_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2025_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2024_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2024_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2023_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2023_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2022_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2022_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2021_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2021_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2020_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2020_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2019_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2019_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2018_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2018_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2017_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2017_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2016_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2016_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2015_avg_price: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2015_avg_price",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
 
             dca_class_2025_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2025_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2024_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2024_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2023_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2023_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2022_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2022_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2021_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2021_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2020_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2020_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2019_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2019_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2018_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2018_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2017_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2017_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2016_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2016_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             dca_class_2015_returns: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "dca_class_2015_returns",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
 
             indexes_to_200d_sma_x2_4: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "200d_sma_x2_4",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_200d_sma_x0_8: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "200d_sma_x0_8",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
         })
     }
diff --git a/crates/brk_computer/src/vecs/mining.rs b/crates/brk_computer/src/vecs/mining.rs
index 0dfc6e144..0124e61c9 100644
--- a/crates/brk_computer/src/vecs/mining.rs
+++ b/crates/brk_computer/src/vecs/mining.rs
@@ -5,9 +5,11 @@ use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{AnyCollectableVec, Computation, Format, VecIterator};
 
+use crate::vecs::grouped::Source;
+
 use super::{
     Indexes,
-    grouped::{ComputedVecsFromDateIndex, ComputedVecsFromHeight, StorableVecGeneatorOptions},
+    grouped::{ComputedVecsFromDateIndex, ComputedVecsFromHeight, VecBuilderOptions},
     indexes,
 };
 
@@ -24,33 +26,40 @@ impl Vecs {
     pub fn forced_import(
         path: &Path,
         version: Version,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
+        indexes: &indexes::Vecs,
     ) -> color_eyre::Result<Self> {
         Ok(Self {
             indexes_to_difficulty: ComputedVecsFromHeight::forced_import(
                 path,
                 "difficulty",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_difficultyepoch: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "difficultyepoch",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_halvingepoch: ComputedVecsFromDateIndex::forced_import(
                 path,
                 "halvingepoch",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
         })
     }
diff --git a/crates/brk_computer/src/vecs/mod.rs b/crates/brk_computer/src/vecs/mod.rs
index 9bb9ad0ad..3c53ec106 100644
--- a/crates/brk_computer/src/vecs/mod.rs
+++ b/crates/brk_computer/src/vecs/mod.rs
@@ -20,6 +20,8 @@ pub mod transactions;
 pub use indexes::Indexes;
 use log::info;
 
+use crate::stores::Stores;
+
 const VERSION: Version = Version::ONE;
 
 #[derive(Clone)]
@@ -58,6 +60,7 @@ impl Vecs {
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
+                &indexes,
             )
             .unwrap()
         });
@@ -68,30 +71,35 @@ impl Vecs {
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
+                &indexes,
             )?,
             mining: mining::Vecs::forced_import(
                 path,
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
+                &indexes,
             )?,
             constants: constants::Vecs::forced_import(
                 path,
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
+                &indexes,
             )?,
             market: market::Vecs::forced_import(
                 path,
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
+                &indexes,
             )?,
             stateful: stateful::Vecs::forced_import(
                 path,
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
+                &indexes,
                 fetched.as_ref(),
             )?,
             transactions: transactions::Vecs::forced_import(
@@ -108,6 +116,7 @@ impl Vecs {
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
+                &indexes,
                 fetched.as_ref(),
             )?,
             indexes,
@@ -121,6 +130,7 @@ impl Vecs {
         starting_indexes: brk_indexer::Indexes,
         fetcher: Option<&mut Fetcher>,
         exit: &Exit,
+        stores: &mut Stores,
     ) -> color_eyre::Result<()> {
         info!("Computing indexes...");
         let mut starting_indexes = self.indexes.compute(indexer, starting_indexes, exit)?;
@@ -178,6 +188,7 @@ impl Vecs {
             &self.market,
             &mut starting_indexes,
             exit,
+            stores,
         )?;
 
         self.cointime.compute(
diff --git a/crates/brk_computer/src/vecs/stateful/address_cohort.rs b/crates/brk_computer/src/vecs/stateful/address_cohort.rs
new file mode 100644
index 000000000..68df3badd
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/address_cohort.rs
@@ -0,0 +1,257 @@
+use std::{ops::Deref, path::Path};
+
+use brk_core::{Bitcoin, DateIndex, Dollars, Height, Result, StoredUsize, Version};
+use brk_exit::Exit;
+use brk_indexer::Indexer;
+use brk_vec::{
+    AnyCollectableVec, AnyIterableVec, AnyVec, Computation, EagerVec, Format, VecIterator,
+};
+
+use crate::{
+    states::AddressCohortState,
+    vecs::{
+        Indexes, fetched,
+        grouped::{ComputedVecsFromHeight, Source, VecBuilderOptions},
+        indexes, market,
+        stateful::{
+            common,
+            r#trait::{CohortVecs, DynCohortVecs},
+        },
+    },
+};
+
+const VERSION: Version = Version::ZERO;
+
+#[derive(Clone)]
+pub struct Vecs {
+    starting_height: Height,
+
+    pub state: AddressCohortState,
+
+    pub inner: common::Vecs,
+
+    pub height_to_address_count: EagerVec<Height, StoredUsize>,
+    pub indexes_to_address_count: ComputedVecsFromHeight<StoredUsize>,
+}
+
+impl Vecs {
+    #[allow(clippy::too_many_arguments)]
+    pub fn forced_import(
+        path: &Path,
+        cohort_name: Option<&str>,
+        computation: Computation,
+        format: Format,
+        version: Version,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        states_path: &Path,
+        compute_relative_to_all: bool,
+    ) -> color_eyre::Result<Self> {
+        let compute_dollars = fetched.is_some();
+
+        let suffix = |s: &str| cohort_name.map_or(s.to_string(), |name| format!("{name}_{s}"));
+
+        Ok(Self {
+            starting_height: Height::ZERO,
+            state: AddressCohortState::default_and_import(
+                states_path,
+                cohort_name.unwrap_or_default(),
+                compute_dollars,
+            )?,
+            height_to_address_count: EagerVec::forced_import(
+                path,
+                &suffix("address_count"),
+                version + VERSION + Version::ZERO,
+                format,
+            )?,
+            indexes_to_address_count: ComputedVecsFromHeight::forced_import(
+                path,
+                &suffix("address_count"),
+                Source::None,
+                version + VERSION + Version::ZERO,
+                format,
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
+            )?,
+            inner: common::Vecs::forced_import(
+                path,
+                cohort_name,
+                computation,
+                format,
+                version,
+                indexes,
+                fetched,
+                compute_relative_to_all,
+                false,
+            )?,
+        })
+    }
+}
+
+impl DynCohortVecs for Vecs {
+    fn starting_height(&self) -> Height {
+        [
+            self.state.height().map_or(Height::MAX, |h| h.incremented()),
+            self.height_to_address_count.len().into(),
+            self.inner.starting_height(),
+        ]
+        .into_iter()
+        .min()
+        .unwrap()
+    }
+
+    fn init(&mut self, starting_height: Height) {
+        if starting_height > self.starting_height() {
+            unreachable!()
+        }
+
+        self.starting_height = starting_height;
+
+        if let Some(prev_height) = starting_height.decremented() {
+            self.state.address_count = *self
+                .height_to_address_count
+                .into_iter()
+                .unwrap_get_inner(prev_height);
+        }
+
+        self.inner
+            .init(&mut self.starting_height, &mut self.state.inner);
+    }
+
+    fn validate_computed_versions(&mut self, base_version: Version) -> Result<()> {
+        self.height_to_address_count
+            .validate_computed_version_or_reset_file(
+                base_version + self.height_to_address_count.inner_version(),
+            )?;
+
+        self.inner.validate_computed_versions(base_version)
+    }
+
+    fn forced_pushed_at(&mut self, height: Height, exit: &Exit) -> Result<()> {
+        if self.starting_height > height {
+            return Ok(());
+        }
+
+        self.height_to_address_count.forced_push_at(
+            height,
+            self.state.address_count.into(),
+            exit,
+        )?;
+
+        self.inner.forced_pushed_at(height, exit, &self.state.inner)
+    }
+
+    fn compute_then_force_push_unrealized_states(
+        &mut self,
+        height: Height,
+        height_price: Option<Dollars>,
+        dateindex: Option<DateIndex>,
+        date_price: Option<Option<Dollars>>,
+        exit: &Exit,
+    ) -> Result<()> {
+        self.inner.compute_then_force_push_unrealized_states(
+            height,
+            height_price,
+            dateindex,
+            date_price,
+            exit,
+            &self.state.inner,
+        )
+    }
+
+    fn safe_flush_stateful_vecs(&mut self, height: Height, exit: &Exit) -> Result<()> {
+        self.height_to_address_count.safe_flush(exit)?;
+
+        self.inner
+            .safe_flush_stateful_vecs(height, exit, &mut self.state.inner)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn compute_rest_part1(
+        &mut self,
+        indexer: &Indexer,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        starting_indexes: &Indexes,
+        exit: &Exit,
+    ) -> color_eyre::Result<()> {
+        self.indexes_to_address_count.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&self.height_to_address_count),
+        )?;
+
+        self.inner
+            .compute_rest_part1(indexer, indexes, fetched, starting_indexes, exit)
+    }
+
+    fn vecs(&self) -> Vec<&dyn AnyCollectableVec> {
+        [
+            self.inner.vecs(),
+            self.indexes_to_address_count.vecs(),
+            vec![&self.height_to_address_count],
+        ]
+        .concat()
+    }
+}
+
+impl CohortVecs for Vecs {
+    fn compute_from_stateful(
+        &mut self,
+        starting_indexes: &Indexes,
+        others: &[&Self],
+        exit: &Exit,
+    ) -> Result<()> {
+        self.height_to_address_count.compute_sum_of_others(
+            starting_indexes.height,
+            others
+                .iter()
+                .map(|v| &v.height_to_address_count)
+                .collect::<Vec<_>>()
+                .as_slice(),
+            exit,
+        )?;
+        self.inner.compute_from_stateful(
+            starting_indexes,
+            &others.iter().map(|v| &v.inner).collect::<Vec<_>>(),
+            exit,
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn compute_rest_part2(
+        &mut self,
+        indexer: &Indexer,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        starting_indexes: &Indexes,
+        market: &market::Vecs,
+        height_to_supply: &impl AnyIterableVec<Height, Bitcoin>,
+        dateindex_to_supply: &impl AnyIterableVec<DateIndex, Bitcoin>,
+        height_to_realized_cap: Option<&impl AnyIterableVec<Height, Dollars>>,
+        dateindex_to_realized_cap: Option<&impl AnyIterableVec<DateIndex, Dollars>>,
+        exit: &Exit,
+    ) -> color_eyre::Result<()> {
+        self.inner.compute_rest_part2(
+            indexer,
+            indexes,
+            fetched,
+            starting_indexes,
+            market,
+            height_to_supply,
+            dateindex_to_supply,
+            height_to_realized_cap,
+            dateindex_to_realized_cap,
+            exit,
+        )
+    }
+}
+
+impl Deref for Vecs {
+    type Target = common::Vecs;
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/address_cohorts.rs b/crates/brk_computer/src/vecs/stateful/address_cohorts.rs
new file mode 100644
index 000000000..5f0e623dc
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/address_cohorts.rs
@@ -0,0 +1,550 @@
+use std::path::Path;
+
+use brk_core::{
+    AddressGroups, ByAmountRange, ByGreatEqualAmount, ByLowerThanAmount, GroupFilter, Height,
+    Result, Version,
+};
+use brk_exit::Exit;
+use brk_vec::{Computation, Format};
+use derive_deref::{Deref, DerefMut};
+use rayon::prelude::*;
+
+use crate::vecs::{
+    Indexes, fetched, indexes,
+    stateful::{
+        address_cohort,
+        r#trait::{CohortVecs, DynCohortVecs},
+    },
+};
+
+const VERSION: Version = Version::new(0);
+
+#[derive(Clone, Deref, DerefMut)]
+pub struct Vecs(AddressGroups<(GroupFilter, address_cohort::Vecs)>);
+
+impl Vecs {
+    pub fn forced_import(
+        path: &Path,
+        version: Version,
+        _computation: Computation,
+        format: Format,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        states_path: &Path,
+    ) -> color_eyre::Result<Self> {
+        Ok(Self(
+            AddressGroups {
+                amount_range: ByAmountRange {
+                    _0sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_with_0sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1sat_to_10sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1sat_under_10sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10sats_to_100sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10sats_under_100sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100sats_to_1k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_100sats_under_1k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1k_sats_to_10k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1k_sats_under_10k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10k_sats_to_100k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10k_sats_under_100k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100k_sats_to_1m_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_100k_sats_under_1m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1m_sats_to_10m_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1m_sats_under_10m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10m_sats_to_1btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10m_sats_under_1btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1btc_to_10btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1btc_under_10btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10btc_to_100btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10btc_under_100btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100btc_to_1k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_100btc_under_1k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1k_btc_to_10k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1k_btc_under_10k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10k_btc_to_100k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10k_btc_under_100k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100k_btc_or_more: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_100k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                },
+                lt_amount: ByLowerThanAmount {
+                    _10sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_10sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_100sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_1k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_10k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_100k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1m_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_1m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10m_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_10m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_1btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_10btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_100btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_1k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_10k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_under_100k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                },
+                ge_amount: ByGreatEqualAmount {
+                    _1sat: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1sat"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_100sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100k_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_100k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1m_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10m_sats: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _100btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_100btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _1k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_1k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                    _10k_btc: address_cohort::Vecs::forced_import(
+                        path,
+                        Some("addrs_above_10k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                    )?,
+                },
+            }
+            .into(),
+        ))
+    }
+
+    pub fn compute_overlapping_vecs(
+        &mut self,
+        starting_indexes: &Indexes,
+        exit: &Exit,
+    ) -> Result<()> {
+        let by_size_range = self.0.amount_range.as_vec();
+
+        [
+            self.0
+                .ge_amount
+                .as_mut_vec()
+                .into_iter()
+                .map(|(filter, vecs)| {
+                    (
+                        vecs,
+                        by_size_range
+                            .into_iter()
+                            .filter(|(other, _)| filter.includes(other))
+                            .map(|(_, v)| v)
+                            .collect::<Vec<_>>(),
+                    )
+                })
+                .collect::<Vec<_>>(),
+            self.0
+                .lt_amount
+                .as_mut_vec()
+                .into_iter()
+                .map(|(filter, vecs)| {
+                    (
+                        vecs,
+                        by_size_range
+                            .into_iter()
+                            .filter(|(other, _)| filter.includes(other))
+                            .map(|(_, v)| v)
+                            .collect::<Vec<_>>(),
+                    )
+                })
+                .collect::<Vec<_>>(),
+        ]
+        .into_par_iter()
+        .flatten()
+        .try_for_each(|(vecs, stateful)| {
+            vecs.compute_from_stateful(starting_indexes, &stateful, exit)
+        })
+    }
+
+    pub fn safe_flush_stateful_vecs(&mut self, height: Height, exit: &Exit) -> Result<()> {
+        self.as_mut_separate_vecs()
+            .par_iter_mut()
+            .try_for_each(|(_, v)| v.safe_flush_stateful_vecs(height, exit))
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/addresstype_to_addresscount.rs b/crates/brk_computer/src/vecs/stateful/addresstype_to_addresscount.rs
new file mode 100644
index 000000000..ee387cff6
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/addresstype_to_addresscount.rs
@@ -0,0 +1,47 @@
+use brk_core::{ByAddressType, Height};
+use brk_vec::VecIterator;
+use derive_deref::{Deref, DerefMut};
+
+use crate::vecs::stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount;
+
+#[derive(Debug, Default, Deref, DerefMut)]
+pub struct AddressTypeToAddressCount(ByAddressType<usize>);
+
+impl From<(&AddressTypeToHeightToAddressCount, Height)> for AddressTypeToAddressCount {
+    fn from((groups, starting_height): (&AddressTypeToHeightToAddressCount, Height)) -> Self {
+        if let Some(prev_height) = starting_height.decremented() {
+            Self(ByAddressType {
+                p2pk65: groups
+                    .p2pk65
+                    .into_iter()
+                    .unwrap_get_inner(prev_height)
+                    .into(),
+                p2pk33: groups
+                    .p2pk33
+                    .into_iter()
+                    .unwrap_get_inner(prev_height)
+                    .into(),
+                p2pkh: groups
+                    .p2pkh
+                    .into_iter()
+                    .unwrap_get_inner(prev_height)
+                    .into(),
+                p2sh: groups.p2sh.into_iter().unwrap_get_inner(prev_height).into(),
+                p2wpkh: groups
+                    .p2wpkh
+                    .into_iter()
+                    .unwrap_get_inner(prev_height)
+                    .into(),
+                p2wsh: groups
+                    .p2wsh
+                    .into_iter()
+                    .unwrap_get_inner(prev_height)
+                    .into(),
+                p2tr: groups.p2tr.into_iter().unwrap_get_inner(prev_height).into(),
+                p2a: groups.p2a.into_iter().unwrap_get_inner(prev_height).into(),
+            })
+        } else {
+            Default::default()
+        }
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/addresstype_to_height_to_addresscount.rs b/crates/brk_computer/src/vecs/stateful/addresstype_to_height_to_addresscount.rs
new file mode 100644
index 000000000..98f700654
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/addresstype_to_height_to_addresscount.rs
@@ -0,0 +1,43 @@
+use brk_core::{ByAddressType, Height, Result, StoredUsize};
+use brk_exit::Exit;
+use brk_vec::EagerVec;
+use derive_deref::{Deref, DerefMut};
+
+use crate::vecs::stateful::addresstype_to_addresscount::AddressTypeToAddressCount;
+
+#[derive(Debug, Clone, Deref, DerefMut)]
+pub struct AddressTypeToHeightToAddressCount(ByAddressType<EagerVec<Height, StoredUsize>>);
+
+impl From<ByAddressType<EagerVec<Height, StoredUsize>>> for AddressTypeToHeightToAddressCount {
+    fn from(value: ByAddressType<EagerVec<Height, StoredUsize>>) -> Self {
+        Self(value)
+    }
+}
+
+impl AddressTypeToHeightToAddressCount {
+    pub fn forced_push_at(
+        &mut self,
+        height: Height,
+        addresstype_to_usize: &AddressTypeToAddressCount,
+        exit: &Exit,
+    ) -> Result<()> {
+        self.p2pk65
+            .forced_push_at(height, addresstype_to_usize.p2pk65.into(), exit)?;
+        self.p2pk33
+            .forced_push_at(height, addresstype_to_usize.p2pk33.into(), exit)?;
+        self.p2pkh
+            .forced_push_at(height, addresstype_to_usize.p2pkh.into(), exit)?;
+        self.p2sh
+            .forced_push_at(height, addresstype_to_usize.p2sh.into(), exit)?;
+        self.p2wpkh
+            .forced_push_at(height, addresstype_to_usize.p2wpkh.into(), exit)?;
+        self.p2wsh
+            .forced_push_at(height, addresstype_to_usize.p2wsh.into(), exit)?;
+        self.p2tr
+            .forced_push_at(height, addresstype_to_usize.p2tr.into(), exit)?;
+        self.p2a
+            .forced_push_at(height, addresstype_to_usize.p2a.into(), exit)?;
+
+        Ok(())
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/addresstype_to_indexes_to_addresscount.rs b/crates/brk_computer/src/vecs/stateful/addresstype_to_indexes_to_addresscount.rs
new file mode 100644
index 000000000..fd384f0cd
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/addresstype_to_indexes_to_addresscount.rs
@@ -0,0 +1,89 @@
+use brk_core::{ByAddressType, StoredUsize};
+use brk_exit::Exit;
+use brk_vec::AnyCollectableVec;
+use derive_deref::{Deref, DerefMut};
+
+use crate::vecs::{
+    Indexes, grouped::ComputedVecsFromHeight, indexes,
+    stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount,
+};
+
+#[derive(Clone, Deref, DerefMut)]
+pub struct AddressTypeToIndexesToAddressCount(ByAddressType<ComputedVecsFromHeight<StoredUsize>>);
+
+impl From<ByAddressType<ComputedVecsFromHeight<StoredUsize>>>
+    for AddressTypeToIndexesToAddressCount
+{
+    fn from(value: ByAddressType<ComputedVecsFromHeight<StoredUsize>>) -> Self {
+        Self(value)
+    }
+}
+
+impl AddressTypeToIndexesToAddressCount {
+    pub fn compute(
+        &mut self,
+        // height: Height,
+        indexes: &indexes::Vecs,
+        starting_indexes: &Indexes,
+        exit: &Exit,
+        addresstype_to_height_to_addresscount: &AddressTypeToHeightToAddressCount,
+    ) -> color_eyre::Result<()> {
+        self.p2pk65.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2pk65),
+        )?;
+        self.p2pk33.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2pk33),
+        )?;
+        self.p2pkh.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2pkh),
+        )?;
+        self.p2sh.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2sh),
+        )?;
+        self.p2wpkh.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2wpkh),
+        )?;
+        self.p2wsh.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2wsh),
+        )?;
+        self.p2tr.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2tr),
+        )?;
+        self.p2a.compute_rest(
+            indexes,
+            starting_indexes,
+            exit,
+            Some(&addresstype_to_height_to_addresscount.p2a),
+        )?;
+        Ok(())
+    }
+    //
+    pub fn vecs(&self) -> Vec<&dyn AnyCollectableVec> {
+        self.0
+            .as_typed_vec()
+            .into_iter()
+            .flat_map(|(_, v)| v.vecs())
+            .collect::<Vec<_>>()
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_set.rs b/crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_set.rs
new file mode 100644
index 000000000..640398383
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_set.rs
@@ -0,0 +1,47 @@
+use std::{collections::BTreeSet, mem};
+
+use brk_core::TypeIndex;
+use derive_deref::{Deref, DerefMut};
+
+use super::ByAddressType;
+
+#[derive(Debug, Deref, DerefMut)]
+pub struct AddressTypeToTypeIndexSet(ByAddressType<BTreeSet<TypeIndex>>);
+
+impl AddressTypeToTypeIndexSet {
+    pub fn merge(mut self, mut other: Self) -> Self {
+        Self::merge_(&mut self.p2pk65, &mut other.p2pk65);
+        Self::merge_(&mut self.p2pk33, &mut other.p2pk33);
+        Self::merge_(&mut self.p2pkh, &mut other.p2pkh);
+        Self::merge_(&mut self.p2sh, &mut other.p2sh);
+        Self::merge_(&mut self.p2wpkh, &mut other.p2wpkh);
+        Self::merge_(&mut self.p2wsh, &mut other.p2wsh);
+        Self::merge_(&mut self.p2tr, &mut other.p2tr);
+        Self::merge_(&mut self.p2a, &mut other.p2a);
+        self
+    }
+
+    fn merge_(own: &mut BTreeSet<TypeIndex>, other: &mut BTreeSet<TypeIndex>) {
+        if own.len() >= other.len() {
+            own.append(other);
+        } else {
+            other.append(own);
+            mem::swap(own, other);
+        }
+    }
+}
+
+impl Default for AddressTypeToTypeIndexSet {
+    fn default() -> Self {
+        Self(ByAddressType {
+            p2pk65: BTreeSet::default(),
+            p2pk33: BTreeSet::default(),
+            p2pkh: BTreeSet::default(),
+            p2sh: BTreeSet::default(),
+            p2wpkh: BTreeSet::default(),
+            p2wsh: BTreeSet::default(),
+            p2tr: BTreeSet::default(),
+            p2a: BTreeSet::default(),
+        })
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_tree.rs b/crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_tree.rs
new file mode 100644
index 000000000..02248d441
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_tree.rs
@@ -0,0 +1,51 @@
+use std::{collections::BTreeMap, mem};
+
+use brk_core::TypeIndex;
+use derive_deref::{Deref, DerefMut};
+
+use super::ByAddressType;
+
+#[derive(Debug, Deref, DerefMut)]
+pub struct AddressTypeToTypeIndexTree<T>(ByAddressType<BTreeMap<TypeIndex, T>>);
+
+impl<T> AddressTypeToTypeIndexTree<T> {
+    pub fn merge(mut self, mut other: Self) -> Self {
+        Self::merge_(&mut self.p2pk65, &mut other.p2pk65);
+        Self::merge_(&mut self.p2pk33, &mut other.p2pk33);
+        Self::merge_(&mut self.p2pkh, &mut other.p2pkh);
+        Self::merge_(&mut self.p2sh, &mut other.p2sh);
+        Self::merge_(&mut self.p2wpkh, &mut other.p2wpkh);
+        Self::merge_(&mut self.p2wsh, &mut other.p2wsh);
+        Self::merge_(&mut self.p2tr, &mut other.p2tr);
+        Self::merge_(&mut self.p2a, &mut other.p2a);
+        self
+    }
+
+    fn merge_(own: &mut BTreeMap<TypeIndex, T>, other: &mut BTreeMap<TypeIndex, T>) {
+        if own.len() >= other.len() {
+            own.append(other);
+        } else {
+            other.append(own);
+            mem::swap(own, other);
+        }
+    }
+
+    pub fn unwrap(self) -> ByAddressType<BTreeMap<TypeIndex, T>> {
+        self.0
+    }
+}
+
+impl<T> Default for AddressTypeToTypeIndexTree<T> {
+    fn default() -> Self {
+        Self(ByAddressType {
+            p2pk65: BTreeMap::default(),
+            p2pk33: BTreeMap::default(),
+            p2pkh: BTreeMap::default(),
+            p2sh: BTreeMap::default(),
+            p2wpkh: BTreeMap::default(),
+            p2wsh: BTreeMap::default(),
+            p2tr: BTreeMap::default(),
+            p2a: BTreeMap::default(),
+        })
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/addresstype_to_vec.rs b/crates/brk_computer/src/vecs/stateful/addresstype_to_vec.rs
new file mode 100644
index 000000000..c629ca6c2
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/addresstype_to_vec.rs
@@ -0,0 +1,21 @@
+use derive_deref::{Deref, DerefMut};
+
+use super::ByAddressType;
+
+#[derive(Debug, Deref, DerefMut)]
+pub struct AddressTypeToVec<T>(ByAddressType<Vec<T>>);
+
+impl<T> Default for AddressTypeToVec<T> {
+    fn default() -> Self {
+        Self(ByAddressType {
+            p2pk65: vec![],
+            p2pk33: vec![],
+            p2pkh: vec![],
+            p2sh: vec![],
+            p2wpkh: vec![],
+            p2wsh: vec![],
+            p2tr: vec![],
+            p2a: vec![],
+        })
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/cohort.rs b/crates/brk_computer/src/vecs/stateful/common.rs
similarity index 89%
rename from crates/brk_computer/src/vecs/stateful/cohort.rs
rename to crates/brk_computer/src/vecs/stateful/common.rs
index 356248199..98b7d15a9 100644
--- a/crates/brk_computer/src/vecs/stateful/cohort.rs
+++ b/crates/brk_computer/src/vecs/stateful/common.rs
@@ -1,4 +1,3 @@
-use core::panic;
 use std::path::Path;
 
 use brk_core::{
@@ -6,28 +5,28 @@ use brk_core::{
 };
 use brk_exit::Exit;
 use brk_indexer::Indexer;
-use brk_state::CohortState;
 use brk_vec::{
-    AnyCollectableVec, AnyIterableVec, AnyVec, Computation, EagerVec, Format, StoredIndex,
-    VecIterator,
+    AnyCollectableVec, AnyIterableVec, AnyVec, CloneableAnyIterableVec, Computation, EagerVec,
+    Format, VecIterator,
 };
 
-use crate::vecs::{
-    Indexes, fetched,
-    grouped::{
-        ComputedHeightValueVecs, ComputedRatioVecsFromDateIndex, ComputedValueVecsFromDateIndex,
-        ComputedVecsFromDateIndex, ComputedVecsFromHeight, StorableVecGeneatorOptions,
+use crate::{
+    states::CohortState,
+    vecs::{
+        Indexes, fetched,
+        grouped::{
+            ComputedHeightValueVecs, ComputedRatioVecsFromDateIndex,
+            ComputedValueVecsFromDateIndex, ComputedVecsFromDateIndex, ComputedVecsFromHeight,
+            Source, VecBuilderOptions,
+        },
+        indexes, market,
     },
-    indexes, market,
 };
 
 const VERSION: Version = Version::ZERO;
 
 #[derive(Clone)]
 pub struct Vecs {
-    starting_height: Height,
-    pub state: CohortState,
-
     // Cumulative
     pub height_to_realized_cap: Option<EagerVec<Height, Dollars>>,
     pub height_to_supply: EagerVec<Height, Sats>,
@@ -121,11 +120,11 @@ pub struct Vecs {
         Option<ComputedVecsFromDateIndex<StoredF64>>,
     pub indexes_to_supply_in_profit_relative_to_circulating_supply:
         Option<ComputedVecsFromDateIndex<StoredF64>>,
-    pub indexes_to_cumulative_net_realized_profit_and_loss_30d_change:
+    pub indexes_to_net_realized_profit_and_loss_cumulative_30d_change:
         Option<ComputedVecsFromDateIndex<Dollars>>,
-    pub indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap:
+    pub indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap:
         Option<ComputedVecsFromDateIndex<StoredF32>>,
-    pub indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap:
+    pub indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap:
         Option<ComputedVecsFromDateIndex<StoredF32>>,
 }
 
@@ -134,12 +133,13 @@ impl Vecs {
     pub fn forced_import(
         path: &Path,
         cohort_name: Option<&str>,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
         version: Version,
+        indexes: &indexes::Vecs,
         fetched: Option<&fetched::Vecs>,
-        states_path: &Path,
         compute_relative_to_all: bool,
+        ratio_extended: bool,
     ) -> color_eyre::Result<Self> {
         let compute_dollars = fetched.is_some();
 
@@ -147,16 +147,57 @@ impl Vecs {
 
         let suffix = |s: &str| cohort_name.map_or(s.to_string(), |name| format!("{name}_{s}"));
 
-        let state = CohortState::default_and_import(
-            states_path,
-            cohort_name.unwrap_or_default(),
-            compute_dollars,
-        )?;
+        let dateindex_to_supply_in_profit = compute_dollars.then(|| {
+            EagerVec::forced_import(
+                path,
+                &suffix("supply_in_profit"),
+                version + VERSION + Version::ZERO,
+                format,
+            )
+            .unwrap()
+        });
+
+        let dateindex_to_supply_even = compute_dollars.then(|| {
+            EagerVec::forced_import(
+                path,
+                &suffix("supply_even"),
+                version + VERSION + Version::ZERO,
+                format,
+            )
+            .unwrap()
+        });
+
+        let dateindex_to_supply_in_loss = compute_dollars.then(|| {
+            EagerVec::forced_import(
+                path,
+                &suffix("supply_in_loss"),
+                version + VERSION + Version::ZERO,
+                format,
+            )
+            .unwrap()
+        });
+
+        let dateindex_to_unrealized_profit = compute_dollars.then(|| {
+            EagerVec::forced_import(
+                path,
+                &suffix("unrealized_profit"),
+                version + VERSION + Version::ZERO,
+                format,
+            )
+            .unwrap()
+        });
+
+        let dateindex_to_unrealized_loss = compute_dollars.then(|| {
+            EagerVec::forced_import(
+                path,
+                &suffix("unrealized_loss"),
+                version + VERSION + Version::ZERO,
+                format,
+            )
+            .unwrap()
+        });
 
         Ok(Self {
-            starting_height: Height::ZERO,
-            state,
-
             height_to_supply_in_profit: compute_dollars.then(|| {
                 EagerVec::forced_import(
                     path,
@@ -166,27 +207,21 @@ impl Vecs {
                 )
                 .unwrap()
             }),
-            dateindex_to_supply_in_profit: compute_dollars.then(|| {
-                EagerVec::forced_import(
-                    path,
-                    &suffix("supply_in_profit"),
-                    version + VERSION + Version::ZERO,
-                    format,
-                )
-                .unwrap()
-            }),
             indexes_to_supply_in_profit: compute_dollars.then(|| {
                 ComputedValueVecsFromDateIndex::forced_import(
                     path,
                     &suffix("supply_in_profit"),
-                    false,
+                    dateindex_to_supply_in_profit.as_ref().map(|v | v.boxed_clone()).into(),
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    VecBuilderOptions::default().add_last(),
                     compute_dollars,
+                    indexes,
                 )
                 .unwrap()
             }),
+            dateindex_to_supply_in_profit,
             height_to_supply_even: compute_dollars.then(|| {
                 EagerVec::forced_import(
                     path,
@@ -196,27 +231,21 @@ impl Vecs {
                 )
                 .unwrap()
             }),
-            dateindex_to_supply_even: compute_dollars.then(|| {
-                EagerVec::forced_import(
-                    path,
-                    &suffix("supply_even"),
-                    version + VERSION + Version::ZERO,
-                    format,
-                )
-                .unwrap()
-            }),
             indexes_to_supply_even: compute_dollars.then(|| {
                 ComputedValueVecsFromDateIndex::forced_import(
                     path,
                     &suffix("supply_even"),
-                    false,
+                    dateindex_to_supply_even.as_ref().map(|v | v.boxed_clone()).into(),
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    VecBuilderOptions::default().add_last(),
                     compute_dollars,
+                    indexes,
                 )
                 .unwrap()
             }),
+            dateindex_to_supply_even,
             height_to_supply_in_loss: compute_dollars.then(|| {
                 EagerVec::forced_import(
                     path,
@@ -226,27 +255,21 @@ impl Vecs {
                 )
                 .unwrap()
             }),
-            dateindex_to_supply_in_loss: compute_dollars.then(|| {
-                EagerVec::forced_import(
-                    path,
-                    &suffix("supply_in_loss"),
-                    version + VERSION + Version::ZERO,
-                    format,
-                )
-                .unwrap()
-            }),
             indexes_to_supply_in_loss: compute_dollars.then(|| {
                 ComputedValueVecsFromDateIndex::forced_import(
                     path,
                     &suffix("supply_in_loss"),
-                    false,
+                    dateindex_to_supply_in_loss.as_ref().map(|v | v.boxed_clone()).into(),
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    VecBuilderOptions::default().add_last(),
                     compute_dollars,
+                    indexes,
                 )
                 .unwrap()
             }),
+            dateindex_to_supply_in_loss,
             height_to_unrealized_profit: compute_dollars.then(|| {
                 EagerVec::forced_import(
                     path,
@@ -256,26 +279,20 @@ impl Vecs {
                 )
                 .unwrap()
             }),
-            dateindex_to_unrealized_profit: compute_dollars.then(|| {
-                EagerVec::forced_import(
-                    path,
-                    &suffix("unrealized_profit"),
-                    version + VERSION + Version::ZERO,
-                    format,
-                )
-                .unwrap()
-            }),
             indexes_to_unrealized_profit: compute_dollars.then(|| {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("unrealized_profit"),
-                    false,
+                    dateindex_to_unrealized_profit.as_ref().map(|v | v.boxed_clone()).into(),
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
+            dateindex_to_unrealized_profit,
             height_to_unrealized_loss: compute_dollars.then(|| {
                 EagerVec::forced_import(
                     path,
@@ -303,26 +320,20 @@ impl Vecs {
                 )
                 .unwrap()
             }),
-            dateindex_to_unrealized_loss: compute_dollars.then(|| {
-                EagerVec::forced_import(
-                    path,
-                    &suffix("unrealized_loss"),
-                    version + VERSION + Version::ZERO,
-                    format,
-                )
-                .unwrap()
-            }),
             indexes_to_unrealized_loss: compute_dollars.then(|| {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("unrealized_loss"),
-                    false,
+                    dateindex_to_unrealized_loss.as_ref().map(|v | v.boxed_clone()).into(),
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
+            dateindex_to_unrealized_loss,
             height_to_realized_cap: compute_dollars.then(|| {
                 EagerVec::forced_import(
                     path,
@@ -336,10 +347,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("realized_cap"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -347,10 +360,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("min_price_paid"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -358,10 +373,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("max_price_paid"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -374,7 +391,7 @@ impl Vecs {
             height_to_supply_value: ComputedHeightValueVecs::forced_import(
                 path,
                 &suffix("supply"),
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
                 compute_dollars,
@@ -382,11 +399,13 @@ impl Vecs {
             indexes_to_supply: ComputedValueVecsFromDateIndex::forced_import(
                 path,
                 &suffix("supply"),
-                true,
+                Source::Compute,
                 version + VERSION + Version::ONE,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                VecBuilderOptions::default().add_last(),
                 compute_dollars,
+                indexes,
             )?,
             height_to_utxo_count: EagerVec::forced_import(
                 path,
@@ -397,19 +416,23 @@ impl Vecs {
             indexes_to_utxo_count: ComputedVecsFromHeight::forced_import(
                 path,
                 &suffix("utxo_count"),
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             indexes_to_realized_price: compute_dollars.then(|| {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("realized_price"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -417,9 +440,12 @@ impl Vecs {
                 ComputedRatioVecsFromDateIndex::forced_import(
                     path,
                     &suffix("realized_price"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
+                    computation,
+                    indexes,
+                    ratio_extended,
                 )
                 .unwrap()
             }),
@@ -436,10 +462,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("realized_profit"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default()
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default()
                         .add_sum()
                         .add_cumulative(),
                 )
@@ -458,10 +486,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("realized_loss"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default()
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default()
                         .add_sum()
                         .add_cumulative(),
                 )
@@ -471,10 +501,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("negative_realized_loss"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ONE,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum().add_cumulative(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum().add_cumulative(),
                 )
                 .unwrap()
             }),
@@ -491,10 +523,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("value_created"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum(),
                 )
                 .unwrap()
             }),
@@ -502,10 +536,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("realized_value"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum(),
                 )
                 .unwrap()
             }),
@@ -522,10 +558,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("adjusted_value_created"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum(),
                 )
                 .unwrap()
             }),
@@ -542,10 +580,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("value_destroyed"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum(),
                 )
                 .unwrap()
             }),
@@ -562,10 +602,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("adjusted_value_destroyed"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum(),
                 )
                 .unwrap()
             }),
@@ -573,10 +615,12 @@ impl Vecs {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("realized_cap_30d_change"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -584,10 +628,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("net_realized_profit_and_loss"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default()
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default()
                         .add_sum()
                         .add_cumulative(),
                 )
@@ -623,7 +669,7 @@ impl Vecs {
             height_to_halved_supply_value: ComputedHeightValueVecs::forced_import(
                 path,
                 &suffix("halved_supply"),
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
                 compute_dollars,
@@ -631,11 +677,13 @@ impl Vecs {
             indexes_to_halved_supply: ComputedValueVecsFromDateIndex::forced_import(
                 path,
                 &suffix("halved_supply"),
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+               computation,
+                VecBuilderOptions::default().add_last(),
                 compute_dollars,
+               indexes,
             )?,
             height_to_negative_unrealized_loss: compute_dollars.then(|| {
                 EagerVec::forced_import(
@@ -650,10 +698,12 @@ impl Vecs {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("negative_unrealized_loss"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -670,10 +720,12 @@ impl Vecs {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("net_unrealized_profit_and_loss"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -693,10 +745,12 @@ impl Vecs {
                     ComputedVecsFromDateIndex::forced_import(
                         path,
                         &suffix("net_unrealized_profit_and_loss_relative_to_market_cap"),
-                        true,
+                        Source::Compute,
                         version + VERSION + Version::ONE,
                         format,
-                        StorableVecGeneatorOptions::default().add_last(),
+                       computation,
+                       indexes,
+                        VecBuilderOptions::default().add_last(),
                     )
                     .unwrap()
                 },
@@ -705,10 +759,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("realized_profit_relative_to_realized_cap"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum(),
                 )
                 .unwrap()
             }),
@@ -716,10 +772,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("realized_loss_relative_to_realized_cap"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ZERO,
                     format,
-                    StorableVecGeneatorOptions::default().add_sum(),
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_sum(),
                 )
                 .unwrap()
             }),
@@ -728,10 +786,12 @@ impl Vecs {
                     ComputedVecsFromHeight::forced_import(
                         path,
                         &suffix("net_realized_profit_and_loss_relative_to_realized_cap"),
-                        true,
+                        Source::Compute,
                         version + VERSION + Version::ONE,
                         format,
-                        StorableVecGeneatorOptions::default().add_sum(),
+                       computation,
+                       indexes,
+                        VecBuilderOptions::default().add_sum(),
                     )
                     .unwrap()
                 },
@@ -740,7 +800,7 @@ impl Vecs {
                 ComputedHeightValueVecs::forced_import(
                     path,
                     &suffix("supply_even"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
                     compute_dollars,
@@ -751,7 +811,7 @@ impl Vecs {
                 ComputedHeightValueVecs::forced_import(
                     path,
                     &suffix("supply_in_loss"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
                     compute_dollars,
@@ -762,7 +822,7 @@ impl Vecs {
                 ComputedHeightValueVecs::forced_import(
                     path,
                     &suffix("supply_in_profit"),
-                    false,
+                    Source::None,
                     version + VERSION + Version::ZERO,
                     format,
                     compute_dollars,
@@ -800,10 +860,12 @@ impl Vecs {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("supply_even_relative_to_own_supply"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ONE,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -811,10 +873,12 @@ impl Vecs {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("supply_in_loss_relative_to_own_supply"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ONE,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -822,10 +886,12 @@ impl Vecs {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
                     &suffix("supply_in_profit_relative_to_own_supply"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ONE,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -833,10 +899,12 @@ impl Vecs {
                 ComputedVecsFromHeight::forced_import(
                     path,
                     &suffix("supply_relative_to_circulating_supply"),
-                    true,
+                    Source::Compute,
                     version + VERSION + Version::ONE,
                     format,
-                    StorableVecGeneatorOptions::default().add_last(),
+                    computation,
+                    indexes,
+                    VecBuilderOptions::default().add_last(),
                 )
                 .unwrap()
             }),
@@ -879,10 +947,12 @@ impl Vecs {
                     ComputedVecsFromDateIndex::forced_import(
                         path,
                         &suffix("supply_even_relative_to_circulating_supply"),
-                        true,
+                        Source::Compute,
                         version + VERSION + Version::ONE,
                         format,
-                        StorableVecGeneatorOptions::default().add_last(),
+                       computation,
+                       indexes,
+                        VecBuilderOptions::default().add_last(),
                     )
                     .unwrap()
                 }),
@@ -892,10 +962,12 @@ impl Vecs {
                     ComputedVecsFromDateIndex::forced_import(
                         path,
                         &suffix("supply_in_loss_relative_to_circulating_supply"),
-                        true,
+                        Source::Compute,
                         version + VERSION + Version::ONE,
                         format,
-                        StorableVecGeneatorOptions::default().add_last(),
+                       computation,
+                       indexes,
+                        VecBuilderOptions::default().add_last(),
                     )
                     .unwrap()
                 }),
@@ -905,10 +977,12 @@ impl Vecs {
                     ComputedVecsFromDateIndex::forced_import(
                         path,
                         &suffix("supply_in_profit_relative_to_circulating_supply"),
-                        true,
+                        Source::Compute,
                         version + VERSION + Version::ONE,
                         format,
-                        StorableVecGeneatorOptions::default().add_last(),
+                       computation,
+                       indexes,
+                        VecBuilderOptions::default().add_last(),
                     )
                     .unwrap()
                 }),
@@ -927,49 +1001,59 @@ impl Vecs {
             indexes_to_coinblocks_destroyed: ComputedVecsFromHeight::forced_import(
                 path,
                 &suffix("coinblocks_destroyed"),
-                true,
+                Source::Compute,
                 version + VERSION + Version::TWO,
                 format,
-                StorableVecGeneatorOptions::default().add_sum().add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_coindays_destroyed: ComputedVecsFromHeight::forced_import(
                 path,
                 &suffix("coindays_destroyed"),
-                true,
+                Source::Compute,
                 version + VERSION + Version::TWO,
                 format,
-                StorableVecGeneatorOptions::default().add_sum().add_cumulative(),
+               computation,
+               indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
-            indexes_to_cumulative_net_realized_profit_and_loss_30d_change: compute_dollars.then(|| {
+            indexes_to_net_realized_profit_and_loss_cumulative_30d_change: compute_dollars.then(|| {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
-                    &format!("cumulative_{}", suffix("net_realized_profit_and_loss_30d_change")),
-                    true,
+                    &suffix("net_realized_profit_and_loss_cumulative_30d_change"),
+                    Source::Compute,
                     version + VERSION + Version::new(3),
                     format,
-                    StorableVecGeneatorOptions::default().add_last()
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_last()
                 )
                 .unwrap()
             }),
-            indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap: compute_dollars.then(|| {
+            indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap: compute_dollars.then(|| {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
-                    &format!("cumulative_{}", suffix("net_realized_profit_and_loss_30d_change_relative_to_realized_cap")),
-                    true,
+                    &suffix("net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap"),
+                    Source::Compute,
                     version + VERSION + Version::new(3),
                     format,
-                    StorableVecGeneatorOptions::default().add_last()
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_last()
                 )
                 .unwrap()
             }),
-            indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap: compute_dollars.then(|| {
+            indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap: compute_dollars.then(|| {
                 ComputedVecsFromDateIndex::forced_import(
                     path,
-                    &format!("cumulative_{}", suffix("net_realized_profit_and_loss_30d_change_relative_to_market_cap")),
-                    true,
+                    &suffix("net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap"),
+                    Source::Compute,
                     version + VERSION + Version::new(3),
                     format,
-                    StorableVecGeneatorOptions::default().add_last()
+                   computation,
+                   indexes,
+                    VecBuilderOptions::default().add_last()
                 )
                 .unwrap()
             }),
@@ -978,10 +1062,6 @@ impl Vecs {
 
     pub fn starting_height(&self) -> Height {
         [
-            self.state
-                .price_to_amount
-                .height()
-                .map_or(usize::MAX, |h| h.incremented().unwrap_to_usize()),
             self.height_to_supply.len(),
             self.height_to_utxo_count.len(),
             self.height_to_realized_cap
@@ -1035,25 +1115,19 @@ impl Vecs {
         .unwrap()
     }
 
-    pub fn init(&mut self, starting_height: Height) {
-        if starting_height > self.starting_height() {
-            unreachable!()
-        }
-
-        self.starting_height = starting_height;
-
+    pub fn init(&mut self, starting_height: &mut Height, state: &mut CohortState) {
         if let Some(prev_height) = starting_height.decremented() {
-            self.state.supply.value = self
+            state.supply.value = self
                 .height_to_supply
                 .into_iter()
                 .unwrap_get_inner(prev_height);
-            self.state.supply.utxos = *self
+            state.supply.utxos = *self
                 .height_to_utxo_count
                 .into_iter()
                 .unwrap_get_inner(prev_height);
 
             if let Some(height_to_realized_cap) = self.height_to_realized_cap.as_mut() {
-                self.state.realized.as_mut().unwrap().cap = height_to_realized_cap
+                state.realized.as_mut().unwrap().cap = height_to_realized_cap
                     .into_iter()
                     .unwrap_get_inner(prev_height);
             }
@@ -1286,35 +1360,33 @@ impl Vecs {
         Ok(())
     }
 
-    pub fn forced_pushed_at(&mut self, height: Height, exit: &Exit) -> Result<()> {
-        if self.starting_height > height {
-            return Ok(());
-        }
-
+    pub fn forced_pushed_at(
+        &mut self,
+        height: Height,
+        exit: &Exit,
+        state: &CohortState,
+    ) -> Result<()> {
         self.height_to_supply
-            .forced_push_at(height, self.state.supply.value, exit)?;
+            .forced_push_at(height, state.supply.value, exit)?;
 
         self.height_to_utxo_count.forced_push_at(
             height,
-            StoredUsize::from(self.state.supply.utxos),
+            StoredUsize::from(state.supply.utxos),
             exit,
         )?;
 
         self.height_to_satblocks_destroyed.forced_push_at(
             height,
-            self.state.satblocks_destroyed,
+            state.satblocks_destroyed,
             exit,
         )?;
 
-        self.height_to_satdays_destroyed.forced_push_at(
-            height,
-            self.state.satdays_destroyed,
-            exit,
-        )?;
+        self.height_to_satdays_destroyed
+            .forced_push_at(height, state.satdays_destroyed, exit)?;
 
         if let Some(height_to_realized_cap) = self.height_to_realized_cap.as_mut() {
-            let realized = self.state.realized.as_ref().unwrap_or_else(|| {
-                dbg!((&self.state.realized, &self.state.supply));
+            let realized = state.realized.as_ref().unwrap_or_else(|| {
+                dbg!((&state.realized, &state.supply));
                 panic!();
             });
 
@@ -1355,6 +1427,7 @@ impl Vecs {
         dateindex: Option<DateIndex>,
         date_price: Option<Option<Dollars>>,
         exit: &Exit,
+        state: &CohortState,
     ) -> Result<()> {
         if let Some(height_price) = height_price {
             self.height_to_min_price_paid
@@ -1362,9 +1435,8 @@ impl Vecs {
                 .unwrap()
                 .forced_push_at(
                     height,
-                    self.state
-                        .price_to_amount
-                        .first_key_value()
+                    state
+                        .price_to_amount_first_key_value()
                         .map(|(&dollars, _)| dollars)
                         .unwrap_or(Dollars::NAN),
                     exit,
@@ -1374,17 +1446,15 @@ impl Vecs {
                 .unwrap()
                 .forced_push_at(
                     height,
-                    self.state
-                        .price_to_amount
-                        .last_key_value()
+                    state
+                        .price_to_amount_last_key_value()
                         .map(|(&dollars, _)| dollars)
                         .unwrap_or(Dollars::NAN),
                     exit,
                 )?;
 
-            let (height_unrealized_state, date_unrealized_state) = self
-                .state
-                .compute_unrealized_states(height_price, date_price.unwrap());
+            let (height_unrealized_state, date_unrealized_state) =
+                state.compute_unrealized_states(height_price, date_price.unwrap());
 
             self.height_to_supply_even
                 .as_mut()
@@ -1436,7 +1506,12 @@ impl Vecs {
         Ok(())
     }
 
-    pub fn safe_flush_stateful_vecs(&mut self, height: Height, exit: &Exit) -> Result<()> {
+    pub fn safe_flush_stateful_vecs(
+        &mut self,
+        height: Height,
+        exit: &Exit,
+        state: &mut CohortState,
+    ) -> Result<()> {
         self.height_to_supply.safe_flush(exit)?;
         self.height_to_utxo_count.safe_flush(exit)?;
         self.height_to_satdays_destroyed.safe_flush(exit)?;
@@ -1518,7 +1593,7 @@ impl Vecs {
                 .safe_flush(exit)?;
         }
 
-        self.state.commit(height)?;
+        state.commit(height)?;
 
         Ok(())
     }
@@ -2550,7 +2625,7 @@ impl Vecs {
                     },
                 )?;
 
-            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change
+            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change
                 .as_mut()
                 .unwrap()
                 .compute_all(
@@ -2572,7 +2647,7 @@ impl Vecs {
                     },
                 )?;
 
-            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap.
+            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap.
                 as_mut()
                 .unwrap()
                 .compute_all(
@@ -2583,14 +2658,14 @@ impl Vecs {
                     |v, _, _, starting_indexes, exit| {
                         v.compute_percentage(
                             starting_indexes.dateindex,
-                            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
+                            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
                             *dateindex_to_realized_cap.as_ref().unwrap(),
                             exit,
                         )
                     },
                 )?;
 
-            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap.
+            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap.
                 as_mut()
                 .unwrap()
                 .compute_all(
@@ -2601,7 +2676,7 @@ impl Vecs {
                     |v, _, _, starting_indexes, exit| {
                         v.compute_percentage(
                             starting_indexes.dateindex,
-                            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
+                            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
                             market.indexes_to_marketcap.dateindex.as_ref().unwrap(),
                             exit,
                         )
@@ -2935,11 +3010,11 @@ impl Vecs {
                 .map_or(vec![], |v| v.vecs()),
             self.indexes_to_coinblocks_destroyed.vecs(),
             self.indexes_to_coindays_destroyed.vecs(),
-            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change.as_ref()
+            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change.as_ref()
             .map_or(vec![], |v| v.vecs()),
-            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap.as_ref()
+            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap.as_ref()
             .map_or(vec![], |v| v.vecs()),
-            self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap.as_ref()
+            self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap.as_ref()
             .map_or(vec![], |v| v.vecs()),
         ]
         .into_iter()
diff --git a/crates/brk_computer/src/vecs/stateful/height_to_addresstype_to_vec.rs b/crates/brk_computer/src/vecs/stateful/height_to_addresstype_to_vec.rs
new file mode 100644
index 000000000..5e74cf426
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/height_to_addresstype_to_vec.rs
@@ -0,0 +1,9 @@
+use std::collections::BTreeMap;
+
+use brk_core::Height;
+use derive_deref::{Deref, DerefMut};
+
+use crate::vecs::stateful::AddressTypeToVec;
+
+#[derive(Debug, Default, Deref, DerefMut)]
+pub struct HeightToAddressTypeToVec<T>(pub BTreeMap<Height, AddressTypeToVec<T>>);
diff --git a/crates/brk_computer/src/vecs/stateful/mod.rs b/crates/brk_computer/src/vecs/stateful/mod.rs
index 98c20d091..2e4fb4a50 100644
--- a/crates/brk_computer/src/vecs/stateful/mod.rs
+++ b/crates/brk_computer/src/vecs/stateful/mod.rs
@@ -1,53 +1,91 @@
-use std::{cmp::Ordering, collections::BTreeMap, path::Path, thread};
+use std::{cmp::Ordering, collections::BTreeMap, mem, ops::ControlFlow, path::Path, thread};
 
-use brk_core::{DateIndex, Height, InputIndex, OutputIndex, OutputType, Result, Sats, Version};
+use brk_core::{
+    AddressData, ByAddressType, CheckedSub, DateIndex, Dollars, EmptyAddressData, Height,
+    InputIndex, OutputIndex, OutputType, Result, Sats, StoredUsize, Timestamp, TypeIndex, Version,
+};
 use brk_exit::Exit;
 use brk_indexer::Indexer;
 use brk_vec::{
     AnyCollectableVec, AnyVec, CollectableVec, Computation, EagerVec, Format, GenericStoredVec,
-    StoredIndex, StoredVec, UnsafeSlice, VecIterator,
+    StoredIndex, StoredVec, VecIterator,
 };
+use either::Either;
 use log::info;
-use outputs::OutputCohorts;
 use rayon::prelude::*;
 
-use brk_state::{
-    BlockState, OutputFilter, Outputs, OutputsByDateRange, OutputsByEpoch, OutputsByFromDate,
-    OutputsByFromSize, OutputsBySizeRange, OutputsBySpendableType, OutputsByTerm,
-    OutputsByUpToDate, OutputsByUpToSize, SupplyState, Transacted,
+use crate::{
+    BlockState, SupplyState, Transacted,
+    stores::Stores,
+    vecs::{
+        grouped::{ComputedVecsFromHeight, Source},
+        market,
+        stateful::{
+            addresstype_to_addresscount::AddressTypeToAddressCount,
+            addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount,
+            addresstype_to_indexes_to_addresscount::AddressTypeToIndexesToAddressCount,
+            addresstype_to_typeindex_set::AddressTypeToTypeIndexSet, r#trait::DynCohortVecs,
+        },
+    },
 };
 
-use crate::vecs::market;
-
 use super::{
     Indexes, fetched,
-    grouped::{ComputedValueVecsFromHeight, StorableVecGeneatorOptions},
+    grouped::{ComputedValueVecsFromHeight, VecBuilderOptions},
     indexes, transactions,
 };
 
-pub mod cohort;
-mod outputs;
+mod address_cohort;
+mod address_cohorts;
+mod addresstype_to_addresscount;
+mod addresstype_to_height_to_addresscount;
+mod addresstype_to_indexes_to_addresscount;
+mod addresstype_to_typeindex_set;
+mod addresstype_to_typeindex_tree;
+mod addresstype_to_vec;
+mod common;
+mod height_to_addresstype_to_vec;
+mod range_map;
+mod r#trait;
+mod utxo_cohort;
+mod utxo_cohorts;
+mod withaddressdatasource;
 
-const VERSION: Version = Version::new(5);
+pub use addresstype_to_typeindex_tree::*;
+pub use addresstype_to_vec::*;
+use height_to_addresstype_to_vec::*;
+use range_map::*;
+use r#trait::CohortVecs;
+pub use withaddressdatasource::WithAddressDataSource;
+
+const VERSION: Version = Version::new(18);
 
 #[derive(Clone)]
 pub struct Vecs {
-    chain_state: StoredVec<Height, SupplyState>,
+    pub chain_state: StoredVec<Height, SupplyState>,
 
-    // cointime,...
     pub height_to_unspendable_supply: EagerVec<Height, Sats>,
     pub indexes_to_unspendable_supply: ComputedValueVecsFromHeight,
     pub height_to_opreturn_supply: EagerVec<Height, Sats>,
     pub indexes_to_opreturn_supply: ComputedValueVecsFromHeight,
-    pub utxos_vecs: Outputs<(OutputFilter, cohort::Vecs)>,
+    pub addresstype_to_height_to_address_count: AddressTypeToHeightToAddressCount,
+    pub addresstype_to_height_to_empty_address_count: AddressTypeToHeightToAddressCount,
+    pub addresstype_to_indexes_to_address_count: AddressTypeToIndexesToAddressCount,
+    pub addresstype_to_indexes_to_empty_address_count: AddressTypeToIndexesToAddressCount,
+    pub utxo_vecs: utxo_cohorts::Vecs,
+    pub address_vecs: address_cohorts::Vecs,
+
+    pub indexes_to_address_count: ComputedVecsFromHeight<StoredUsize>,
+    pub indexes_to_empty_address_count: ComputedVecsFromHeight<StoredUsize>,
 }
 
 impl Vecs {
     pub fn forced_import(
         path: &Path,
         version: Version,
-        _computation: Computation,
+        computation: Computation,
         format: Format,
+        indexes: &indexes::Vecs,
         fetched: Option<&fetched::Vecs>,
     ) -> color_eyre::Result<Self> {
         let compute_dollars = fetched.is_some();
@@ -74,11 +112,13 @@ impl Vecs {
             indexes_to_unspendable_supply: ComputedValueVecsFromHeight::forced_import(
                 path,
                 "unspendable_supply",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                VecBuilderOptions::default().add_last(),
                 compute_dollars,
+                indexes,
             )?,
             height_to_opreturn_supply: EagerVec::forced_import(
                 path,
@@ -89,1107 +129,324 @@ impl Vecs {
             indexes_to_opreturn_supply: ComputedValueVecsFromHeight::forced_import(
                 path,
                 "opreturn_supply",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                VecBuilderOptions::default().add_last(),
                 compute_dollars,
+                indexes,
             )?,
-            utxos_vecs: {
-                Outputs::<(OutputFilter, cohort::Vecs)>::from(Outputs {
-                    all: cohort::Vecs::forced_import(
+            indexes_to_address_count: ComputedVecsFromHeight::forced_import(
+                path,
+                "address_count",
+                Source::Compute,
+                version + VERSION + Version::ZERO,
+                format,
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
+            )?,
+            indexes_to_empty_address_count: ComputedVecsFromHeight::forced_import(
+                path,
+                "empty_address_count",
+                Source::Compute,
+                version + VERSION + Version::ZERO,
+                format,
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
+            )?,
+            addresstype_to_height_to_address_count: AddressTypeToHeightToAddressCount::from(
+                ByAddressType {
+                    p2pk65: EagerVec::forced_import(
                         path,
-                        None,
-                        _computation,
-                        format,
+                        "p2pk65_address_count",
                         version + VERSION + Version::ZERO,
-                        fetched,
-                        &states_path,
-                        false,
+                        format,
                     )?,
-                    by_term: OutputsByTerm {
-                        short: cohort::Vecs::forced_import(
-                            path,
-                            Some("sth"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        long: cohort::Vecs::forced_import(
-                            path,
-                            Some("lth"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    by_up_to_date: OutputsByUpToDate {
-                        _1d: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_1d"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1w: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_1w"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1m: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_1m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _2m: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_2m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _3m: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_3m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _4m: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_4m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _5m: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_5m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _6m: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_6m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_1y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _2y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_2y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _3y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_3y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _4y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_4y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _5y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_5y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _6y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_6y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _7y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_7y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _8y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_8y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _10y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_10y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _15y: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_15y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    by_from_date: OutputsByFromDate {
-                        _1d: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1d"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1w: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1w"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _2m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_2m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _3m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_3m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _4m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_4m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _5m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_5m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _6m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_6m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _2y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_2y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _3y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_3y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _4y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_4y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _5y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_5y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _6y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_6y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _7y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_7y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _8y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_8y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _10y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _15y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_15y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    by_date_range: OutputsByDateRange {
-                        start_to_1d: cohort::Vecs::forced_import(
-                            path,
-                            Some("start_to_1d"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1d_to_1w: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1d_to_1w"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1w_to_1m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1w_to_1m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1m_to_2m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1m_to_2m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _2m_to_3m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_2m_to_3m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _3m_to_4m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_3m_to_4m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _4m_to_5m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_4m_to_5m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _5m_to_6m: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_5m_to_6m"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _6m_to_1y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_6m_to_1y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1y_to_2y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1y_to_2y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _2y_to_3y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_2y_to_3y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _3y_to_4y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_3y_to_4y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _4y_to_5y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_4y_to_5y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _5y_to_6y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_5y_to_6y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _6y_to_7y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_6y_to_7y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _7y_to_8y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_7y_to_8y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _8y_to_10y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_8y_to_10y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _10y_to_15y: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10y_to_15y"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _15y_to_end: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_15y_to_end"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    by_epoch: OutputsByEpoch {
-                        _0: cohort::Vecs::forced_import(
-                            path,
-                            Some("epoch_0"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1: cohort::Vecs::forced_import(
-                            path,
-                            Some("epoch_1"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _2: cohort::Vecs::forced_import(
-                            path,
-                            Some("epoch_2"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _3: cohort::Vecs::forced_import(
-                            path,
-                            Some("epoch_3"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _4: cohort::Vecs::forced_import(
-                            path,
-                            Some("epoch_4"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    by_size_range: OutputsBySizeRange {
-                        _0sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("0sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_1sat_to_10sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1sat_to_10sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_10sats_to_100sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10sats_to_100sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_100sats_to_1_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_100sats_to_1_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_1_000sats_to_10_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1_000sats_to_10_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_10_000sats_to_100_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10_000sats_to_100_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_100_000sats_to_1_000_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_100_000sats_to_1_000_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_1_000_000sats_to_10_000_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1_000_000sats_to_10_000_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_10_000_000sats_to_1btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10_000_000sats_to_1btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_1btc_to_10btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1btc_to_10btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_10btc_to_100btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10btc_to_100btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_100btc_to_1_000btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_100btc_to_1_000btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_1_000btc_to_10_000btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1_000btc_to_10_000btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_10_000btc_to_100_000btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10_000btc_to_100_000btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        from_100_000btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_100_000btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    by_up_to_size: OutputsByUpToSize {
-                        _1_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_1_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _10_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_10_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_1btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _10btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_10btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _100btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("up_to_100btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    by_from_size: OutputsByFromSize {
-                        _1_000sats: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1_000sats"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _1btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_1btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _10btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_10btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        _100btc: cohort::Vecs::forced_import(
-                            path,
-                            Some("from_100btc"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                    // by_value: OutputsByValue {
-                    //     up_to_1cent: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("up_to_1cent"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_1c_to_10c: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_1c_to_10c"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_10c_to_1d: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_10c_to_1d"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_1d_to_10d: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_1d_to_10d"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_10usd_to_100usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_10usd_to_100usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_100usd_to_1_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_100usd_to_1_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_1_000usd_to_10_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_1_000usd_to_10_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_10_000usd_to_100_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_10_000usd_to_100_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_100_000usd_to_1_000_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_100_000usd_to_1_000_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_1_000_000usd_to_10_000_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_1_000_000usd_to_10_000_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_10_000_000usd_to_100_000_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_10_000_000usd_to_100_000_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_100_000_000usd_to_1_000_000_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_100_000_000usd_to_1_000_000_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    //     from_1_000_000_000usd: cohort::Vecs::forced_import(
-                    //         path,
-                    //         Some("from_1_000_000_000usd"),
-                    //         _computation,
-                    //         format,
-                    //         fetched,
-                    //     )?,
-                    // },
-                    by_type: OutputsBySpendableType {
-                        p2pk65: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2pk65"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2pk33: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2pk33"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2pkh: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2pkh"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2ms: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2ms"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2sh: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2sh"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2wpkh: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2wpkh"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2wsh: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2wsh"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2tr: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2tr"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        p2a: cohort::Vecs::forced_import(
-                            path,
-                            Some("p2a"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        empty: cohort::Vecs::forced_import(
-                            path,
-                            Some("empty"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                        unknown: cohort::Vecs::forced_import(
-                            path,
-                            Some("unknown"),
-                            _computation,
-                            format,
-                            version + VERSION + Version::ZERO,
-                            fetched,
-                            &states_path,
-                            true,
-                        )?,
-                    },
-                })
-            },
+                    p2pk33: EagerVec::forced_import(
+                        path,
+                        "p2pk33_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2pkh: EagerVec::forced_import(
+                        path,
+                        "p2pkh_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2sh: EagerVec::forced_import(
+                        path,
+                        "p2sh_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2wpkh: EagerVec::forced_import(
+                        path,
+                        "p2wpkh_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2wsh: EagerVec::forced_import(
+                        path,
+                        "p2wsh_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2tr: EagerVec::forced_import(
+                        path,
+                        "p2tr_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2a: EagerVec::forced_import(
+                        path,
+                        "p2a_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                },
+            ),
+            addresstype_to_height_to_empty_address_count: AddressTypeToHeightToAddressCount::from(
+                ByAddressType {
+                    p2pk65: EagerVec::forced_import(
+                        path,
+                        "p2pk65_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2pk33: EagerVec::forced_import(
+                        path,
+                        "p2pk33_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2pkh: EagerVec::forced_import(
+                        path,
+                        "p2pkh_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2sh: EagerVec::forced_import(
+                        path,
+                        "p2sh_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2wpkh: EagerVec::forced_import(
+                        path,
+                        "p2wpkh_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2wsh: EagerVec::forced_import(
+                        path,
+                        "p2wsh_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2tr: EagerVec::forced_import(
+                        path,
+                        "p2tr_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                    p2a: EagerVec::forced_import(
+                        path,
+                        "p2a_empty_address_count",
+                        version + VERSION + Version::ZERO,
+                        format,
+                    )?,
+                },
+            ),
+            addresstype_to_indexes_to_address_count: AddressTypeToIndexesToAddressCount::from(
+                ByAddressType {
+                    p2pk65: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2pk65_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2pk33: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2pk33_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2pkh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2pkh_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2sh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2sh_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2wpkh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2wpkh_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2wsh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2wsh_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2tr: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2tr_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2a: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2a_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                },
+            ),
+            addresstype_to_indexes_to_empty_address_count: AddressTypeToIndexesToAddressCount::from(
+                ByAddressType {
+                    p2pk65: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2pk65_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2pk33: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2pk33_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2pkh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2pkh_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2sh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2sh_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2wpkh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2wpkh_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2wsh: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2wsh_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2tr: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2tr_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                    p2a: ComputedVecsFromHeight::forced_import(
+                        path,
+                        "p2a_empty_address_count",
+                        Source::None,
+                        version + VERSION + Version::ZERO,
+                        format,
+                        computation,
+                        indexes,
+                        VecBuilderOptions::default().add_last(),
+                    )?,
+                },
+            ),
+            utxo_vecs: utxo_cohorts::Vecs::forced_import(
+                path,
+                version,
+                computation,
+                format,
+                indexes,
+                fetched,
+                &states_path,
+            )?,
+            address_vecs: address_cohorts::Vecs::forced_import(
+                path,
+                version,
+                computation,
+                format,
+                indexes,
+                fetched,
+                &states_path,
+            )?,
         })
     }
 
@@ -1204,9 +461,18 @@ impl Vecs {
         // Must take ownership as its indexes will be updated for this specific function
         starting_indexes: &mut Indexes,
         exit: &Exit,
+        stores: &mut Stores,
     ) -> color_eyre::Result<()> {
         let height_to_first_outputindex = &indexer.vecs.height_to_first_outputindex;
         let height_to_first_inputindex = &indexer.vecs.height_to_first_inputindex;
+        let height_to_first_p2aaddressindex = &indexer.vecs.height_to_first_p2aaddressindex;
+        let height_to_first_p2pk33addressindex = &indexer.vecs.height_to_first_p2pk33addressindex;
+        let height_to_first_p2pk65addressindex = &indexer.vecs.height_to_first_p2pk65addressindex;
+        let height_to_first_p2pkhaddressindex = &indexer.vecs.height_to_first_p2pkhaddressindex;
+        let height_to_first_p2shaddressindex = &indexer.vecs.height_to_first_p2shaddressindex;
+        let height_to_first_p2traddressindex = &indexer.vecs.height_to_first_p2traddressindex;
+        let height_to_first_p2wpkhaddressindex = &indexer.vecs.height_to_first_p2wpkhaddressindex;
+        let height_to_first_p2wshaddressindex = &indexer.vecs.height_to_first_p2wshaddressindex;
         let height_to_output_count = transactions.indexes_to_output_count.height.unwrap_sum();
         let height_to_input_count = transactions.indexes_to_input_count.height.unwrap_sum();
         let inputindex_to_outputindex = &indexer.vecs.inputindex_to_outputindex;
@@ -1215,6 +481,7 @@ impl Vecs {
         let height_to_timestamp_fixed = &indexes.height_to_timestamp_fixed;
         let outputindex_to_txindex = &indexes.outputindex_to_txindex;
         let outputindex_to_outputtype = &indexer.vecs.outputindex_to_outputtype;
+        let outputindex_to_typeindex = &indexer.vecs.outputindex_to_typeindex;
         let height_to_unclaimed_rewards = transactions
             .indexes_to_unclaimed_rewards
             .sats
@@ -1231,19 +498,31 @@ impl Vecs {
         let dateindex_to_first_height = &indexes.dateindex_to_first_height;
         let dateindex_to_height_count = &indexes.dateindex_to_height_count;
 
-        let inputindex_to_outputindex_mmap = inputindex_to_outputindex.mmap().load();
-        let outputindex_to_value_mmap = outputindex_to_value.mmap().load();
-        let outputindex_to_outputtype_mmap = outputindex_to_outputtype.mmap().load();
-        let outputindex_to_txindex_mmap = outputindex_to_txindex.mmap().load();
-        let txindex_to_height_mmap = txindex_to_height.mmap().load();
+        let outputindex_to_value_mmap = outputindex_to_value.create_mmap()?;
+        let outputindex_to_outputtype_mmap = outputindex_to_outputtype.create_mmap()?;
+        let outputindex_to_typeindex_mmap = outputindex_to_typeindex.create_mmap()?;
 
+        let mut inputindex_to_outputindex_iter = inputindex_to_outputindex.into_iter();
         let mut height_to_first_outputindex_iter = height_to_first_outputindex.into_iter();
         let mut height_to_first_inputindex_iter = height_to_first_inputindex.into_iter();
+        let mut height_to_first_p2aaddressindex_iter = height_to_first_p2aaddressindex.into_iter();
+        let mut height_to_first_p2pk33addressindex_iter =
+            height_to_first_p2pk33addressindex.into_iter();
+        let mut height_to_first_p2pk65addressindex_iter =
+            height_to_first_p2pk65addressindex.into_iter();
+        let mut height_to_first_p2pkhaddressindex_iter =
+            height_to_first_p2pkhaddressindex.into_iter();
+        let mut height_to_first_p2shaddressindex_iter =
+            height_to_first_p2shaddressindex.into_iter();
+        let mut height_to_first_p2traddressindex_iter =
+            height_to_first_p2traddressindex.into_iter();
+        let mut height_to_first_p2wpkhaddressindex_iter =
+            height_to_first_p2wpkhaddressindex.into_iter();
+        let mut height_to_first_p2wshaddressindex_iter =
+            height_to_first_p2wshaddressindex.into_iter();
         let mut height_to_output_count_iter = height_to_output_count.into_iter();
         let mut height_to_input_count_iter = height_to_input_count.into_iter();
-        // let mut outputindex_to_value_iter_2 = outputindex_to_value.into_iter();
         let mut height_to_close_iter = height_to_close.as_ref().map(|v| v.into_iter());
-        // let mut outputindex_to_outputtype_iter_2 = outputindex_to_outputtype.into_iter();
         let mut height_to_unclaimed_rewards_iter = height_to_unclaimed_rewards.into_iter();
         let mut height_to_timestamp_fixed_iter = height_to_timestamp_fixed.into_iter();
         let mut dateindex_to_close_iter = dateindex_to_close.as_ref().map(|v| v.into_iter());
@@ -1251,11 +530,17 @@ impl Vecs {
         let mut dateindex_to_first_height_iter = dateindex_to_first_height.into_iter();
         let mut dateindex_to_height_count_iter = dateindex_to_height_count.into_iter();
 
-        let mut separate_utxo_vecs = self.utxos_vecs.as_mut_separate_vecs();
-
         let base_version = Version::ZERO
             + height_to_first_outputindex.version()
             + height_to_first_inputindex.version()
+            + height_to_first_p2aaddressindex.version()
+            + height_to_first_p2pk33addressindex.version()
+            + height_to_first_p2pk65addressindex.version()
+            + height_to_first_p2pkhaddressindex.version()
+            + height_to_first_p2shaddressindex.version()
+            + height_to_first_p2traddressindex.version()
+            + height_to_first_p2wpkhaddressindex.version()
+            + height_to_first_p2wshaddressindex.version()
             + height_to_timestamp_fixed.version()
             + height_to_output_count.version()
             + height_to_input_count.version()
@@ -1264,6 +549,7 @@ impl Vecs {
             + txindex_to_height.version()
             + outputindex_to_txindex.version()
             + outputindex_to_outputtype.version()
+            + outputindex_to_typeindex.version()
             + height_to_unclaimed_rewards.version()
             + height_to_close
                 .as_ref()
@@ -1273,11 +559,18 @@ impl Vecs {
                 .map_or(Version::ZERO, |v| v.version())
             + height_to_date_fixed.version()
             + dateindex_to_first_height.version()
-            + dateindex_to_height_count.version();
+            + dateindex_to_height_count.version()
+            + stores.as_slice().into_iter().map(|s| s.version()).sum();
+
+        let mut separate_utxo_vecs = self.utxo_vecs.as_mut_separate_vecs();
+        let mut separate_address_vecs = self.address_vecs.as_mut_separate_vecs();
 
         separate_utxo_vecs
             .par_iter_mut()
             .try_for_each(|(_, v)| v.validate_computed_versions(base_version))?;
+        separate_address_vecs
+            .par_iter_mut()
+            .try_for_each(|(_, v)| v.validate_computed_versions(base_version))?;
         self.height_to_unspendable_supply
             .validate_computed_version_or_reset_file(
                 base_version + self.height_to_unspendable_supply.inner_version(),
@@ -1295,7 +588,17 @@ impl Vecs {
             .map(|(_, v)| v.starting_height())
             .min()
             .unwrap_or_default()
+            .min(
+                separate_address_vecs
+                    .par_iter_mut()
+                    .map(|(_, v)| v.starting_height())
+                    .min()
+                    .unwrap_or_default(),
+            )
             .min(chain_state_starting_height)
+            .min(stores.starting_height())
+            .min(Height::from(self.height_to_unspendable_supply.len()))
+            .min(Height::from(self.height_to_opreturn_supply.len()))
             .cmp(&chain_state_starting_height)
         {
             Ordering::Greater => unreachable!(),
@@ -1323,11 +626,7 @@ impl Vecs {
             Ordering::Less => Height::ZERO,
         };
 
-        let starting_height = starting_indexes
-            .height
-            .min(stateful_starting_height)
-            .min(Height::from(self.height_to_unspendable_supply.len()))
-            .min(Height::from(self.height_to_opreturn_supply.len()));
+        let starting_height = starting_indexes.height.min(stateful_starting_height);
 
         if starting_height.is_zero() {
             info!("Starting processing utxos from the start");
@@ -1336,9 +635,19 @@ impl Vecs {
             chain_state = vec![];
             chain_state_starting_height = Height::ZERO;
 
+            stores.reset()?;
+
+            info!("Resetting utxo price maps...");
+
             separate_utxo_vecs
                 .par_iter_mut()
-                .try_for_each(|(_, v)| v.state.price_to_amount.reset())?;
+                .try_for_each(|(_, v)| v.state.reset_price_to_amount())?;
+
+            info!("Resetting address price maps...");
+
+            separate_address_vecs
+                .par_iter_mut()
+                .try_for_each(|(_, v)| v.state.reset_price_to_amount())?;
         }
 
         if starting_height < Height::from(height_to_date_fixed.len()) {
@@ -1348,6 +657,16 @@ impl Vecs {
                 .par_iter_mut()
                 .for_each(|(_, v)| v.init(starting_height));
 
+            separate_address_vecs
+                .par_iter_mut()
+                .for_each(|(_, v)| v.init(starting_height));
+
+            let height_to_close_vec =
+                height_to_close.map(|height_to_close| height_to_close.collect().unwrap());
+
+            let height_to_timestamp_fixed_vec = height_to_timestamp_fixed.collect().unwrap();
+            let outputindex_range_to_height = RangeMap::from(height_to_first_outputindex);
+
             let mut unspendable_supply = if let Some(prev_height) = starting_height.decremented() {
                 self.height_to_unspendable_supply
                     .into_iter()
@@ -1362,20 +681,38 @@ impl Vecs {
             } else {
                 Sats::ZERO
             };
+            let mut addresstype_to_address_count = AddressTypeToAddressCount::from((
+                &self.addresstype_to_height_to_address_count,
+                starting_height,
+            ));
+            let mut addresstype_to_empty_address_count = AddressTypeToAddressCount::from((
+                &self.addresstype_to_height_to_empty_address_count,
+                starting_height,
+            ));
 
             let mut height = starting_height;
 
+            let mut addresstype_to_typeindex_to_addressdata =
+                AddressTypeToTypeIndexTree::<WithAddressDataSource<AddressData>>::default();
+            let mut addresstype_to_typeindex_to_emptyaddressdata =
+                AddressTypeToTypeIndexTree::<WithAddressDataSource<EmptyAddressData>>::default();
+
             (height.unwrap_to_usize()..height_to_date_fixed.len())
                 .map(Height::from)
                 .try_for_each(|_height| -> color_eyre::Result<()> {
                     height = _height;
 
-                    self.utxos_vecs
+                    info!("Processing chain at {height}...");
+
+                    self.utxo_vecs
                         .as_mut_separate_vecs()
                         .iter_mut()
                         .for_each(|(_, v)| v.state.reset_single_iteration_values());
 
-                    info!("Processing chain at {height}...");
+                    self.address_vecs
+                        .as_mut_separate_vecs()
+                        .iter_mut()
+                        .for_each(|(_, v)| v.state.reset_single_iteration_values());
 
                     let timestamp = height_to_timestamp_fixed_iter.unwrap_get_inner(height);
                     let price = height_to_close_iter
@@ -1390,163 +727,293 @@ impl Vecs {
                     let output_count = height_to_output_count_iter.unwrap_get_inner(height);
                     let input_count = height_to_input_count_iter.unwrap_get_inner(height);
 
-                    let (mut height_to_sent, mut received) = thread::scope(|s| {
-                        if chain_state_starting_height <= height {
-                            s.spawn(|| {
-                                self.utxos_vecs
-                                    .tick_tock_next_block(&chain_state, timestamp);
-                            });
-                        }
-
-                        let sent_handle = s.spawn(|| {
-                            // Skip coinbase
-                            (first_inputindex + 1..first_inputindex + *input_count)
-                                .into_par_iter()
-                                .map(InputIndex::from)
-                                .map(|inputindex| {
-                                    let outputindex = inputindex_to_outputindex
-                                        .get_or_read(inputindex, &inputindex_to_outputindex_mmap)
-                                        .unwrap()
-                                        .unwrap()
-                                        .into_inner();
-
-                                    let value = outputindex_to_value
-                                        .get_or_read(outputindex, &outputindex_to_value_mmap)
-                                        .unwrap()
-                                        .unwrap()
-                                        .into_inner();
-
-                                    let input_type = outputindex_to_outputtype
-                                        .get_or_read(outputindex, &outputindex_to_outputtype_mmap)
-                                        .unwrap()
-                                        .unwrap()
-                                        .into_inner();
-
-                                    // dbg!(input_type);
-
-                                    if input_type.is_unspendable() {
-                                        unreachable!()
-                                    }
-
-                                    let input_txindex = outputindex_to_txindex
-                                        .get_or_read(outputindex, &outputindex_to_txindex_mmap)
-                                        .unwrap()
-                                        .unwrap()
-                                        .into_inner();
-
-                                    let height = txindex_to_height
-                                        .get_or_read(input_txindex, &txindex_to_height_mmap)
-                                        .unwrap()
-                                        .unwrap()
-                                        .into_inner();
-
-                                    (height, value, input_type)
-                                })
-                                .fold(
-                                    BTreeMap::<Height, Transacted>::default,
-                                    |mut tree, (height, value, input_type)| {
-                                        tree.entry(height).or_default().iterate(value, input_type);
-                                        tree
-                                    },
-                                )
-                                .reduce(BTreeMap::<Height, Transacted>::default, |first, second| {
-                                    let (mut source, to_consume) = if first.len() > second.len() {
-                                        (first, second)
-                                    } else {
-                                        (second, first)
-                                    };
-                                    to_consume.into_iter().for_each(|(k, v)| {
-                                        *source.entry(k).or_default() += v;
-                                    });
-                                    source
-                                })
-                        });
-
-                        let received_handle = s.spawn(|| {
-                            (first_outputindex..first_outputindex + *output_count)
-                                .into_par_iter()
-                                .map(OutputIndex::from)
-                                .map(|outputindex| {
-                                    let value = outputindex_to_value
-                                        .get_or_read(outputindex, &outputindex_to_value_mmap)
-                                        .unwrap()
-                                        .unwrap()
-                                        .into_inner();
-
-                                    let output_type = outputindex_to_outputtype
-                                        .get_or_read(outputindex, &outputindex_to_outputtype_mmap)
-                                        .unwrap()
-                                        .unwrap()
-                                        .into_inner();
-
-                                    (value, output_type)
-                                })
-                                .fold(
-                                    Transacted::default,
-                                    |mut transacted, (value, output_type)| {
-                                        transacted.iterate(value, output_type);
-                                        transacted
-                                    },
-                                )
-                                .reduce(Transacted::default, |acc, transacted| acc + transacted)
-                        });
-
-                        (sent_handle.join().unwrap(), received_handle.join().unwrap())
-                    });
-
-                    unspendable_supply += received
-                        .by_type
-                        .unspendable
-                        .as_vec()
-                        .into_iter()
-                        .map(|state| state.value)
-                        .sum::<Sats>()
-                        + height_to_unclaimed_rewards_iter.unwrap_get_inner(height);
-
-                    opreturn_supply += received.by_type.unspendable.opreturn.value;
-
-                    if height == Height::new(0) {
-                        received = Transacted::default();
-                        unspendable_supply += Sats::FIFTY_BTC;
-                    } else if height == Height::new(91_842) || height == Height::new(91_880) {
-                        // Need to destroy invalid coinbases due to duplicate txids
-                        if height == Height::new(91_842) {
-                            height_to_sent.entry(Height::new(91_812)).or_default()
-                        } else {
-                            height_to_sent.entry(Height::new(91_722)).or_default()
-                        }
-                        .iterate(Sats::FIFTY_BTC, OutputType::P2PK65);
+                    let first_addressindexes: ByAddressType<TypeIndex> = ByAddressType {
+                        p2a: height_to_first_p2aaddressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
+                        p2pk33: height_to_first_p2pk33addressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
+                        p2pk65: height_to_first_p2pk65addressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
+                        p2pkh: height_to_first_p2pkhaddressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
+                        p2sh: height_to_first_p2shaddressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
+                        p2tr: height_to_first_p2traddressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
+                        p2wpkh: height_to_first_p2wpkhaddressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
+                        p2wsh: height_to_first_p2wshaddressindex_iter
+                            .unwrap_get_inner(height)
+                            .into(),
                     };
 
-                    if chain_state_starting_height <= height {
+                    let (
+                        mut transacted,
+                        addresstype_to_typedindex_to_received_data,
+                        mut height_to_sent,
+                        addresstype_to_typedindex_to_sent_data,
+                        mut stored_addressindexes,
+                    ) = thread::scope(|scope| {
+                        scope.spawn(|| {
+                            self.utxo_vecs.tick_tock_next_block(&chain_state, timestamp);
+                        });
+
+                        let received = scope.spawn(|| {
+                            let mut transacted = Transacted::default();
+
+                            let mut addresstype_to_typedindex_to_received_data =
+                                AddressTypeToVec::<(TypeIndex, Sats)>::default();
+
+                            let mut receiving_addressindexes = AddressTypeToTypeIndexSet::default();
+
+                            let _ = (first_outputindex..first_outputindex + *output_count)
+                                .map(OutputIndex::from)
+                                .try_for_each(|outputindex| -> ControlFlow<()> {
+                                    let value = outputindex_to_value
+                                        .unwrap_read(outputindex, &outputindex_to_value_mmap);
+
+                                    let output_type = outputindex_to_outputtype
+                                        .unwrap_read(outputindex, &outputindex_to_outputtype_mmap);
+
+                                    transacted.iterate(value, output_type);
+
+                                    if output_type.is_not_address() {
+                                        return ControlFlow::Continue(());
+                                    }
+
+                                    let typeindex = outputindex_to_typeindex
+                                        .unwrap_read(outputindex, &outputindex_to_typeindex_mmap);
+
+                                    receiving_addressindexes
+                                        .get_mut(output_type)
+                                        .unwrap()
+                                        .insert(typeindex);
+
+                                    addresstype_to_typedindex_to_received_data
+                                        .get_mut(output_type)
+                                        .unwrap()
+                                        .push((typeindex, value));
+
+                                    ControlFlow::Continue(())
+                                });
+
+                            (
+                                transacted,
+                                addresstype_to_typedindex_to_received_data,
+                                receiving_addressindexes,
+                            )
+                        });
+
+                        let mut height_to_sent = BTreeMap::<Height, Transacted>::default();
+
+                        let mut addresstype_to_typedindex_to_sent_data =
+                            HeightToAddressTypeToVec::<(TypeIndex, Sats)>::default();
+
+                        let mut sending_addressindexes = AddressTypeToTypeIndexSet::default();
+
+                        // Skip coinbase
+                        let _ = (first_inputindex + 1..first_inputindex + *input_count)
+                            .map(InputIndex::from)
+                            .try_for_each(|inputindex| -> ControlFlow<()> {
+                                let outputindex =
+                                    inputindex_to_outputindex_iter.unwrap_get_inner(inputindex);
+
+                                let value = outputindex_to_value
+                                    .unwrap_read(outputindex, &outputindex_to_value_mmap);
+
+                                let input_type = outputindex_to_outputtype
+                                    .unwrap_read(outputindex, &outputindex_to_outputtype_mmap);
+
+                                let prev_height =
+                                    *outputindex_range_to_height.get(outputindex).unwrap();
+
+                                height_to_sent
+                                    .entry(prev_height)
+                                    .or_default()
+                                    .iterate(value, input_type);
+
+                                if input_type.is_not_address() {
+                                    return ControlFlow::Continue(());
+                                }
+
+                                let typeindex = outputindex_to_typeindex
+                                    .unwrap_read(outputindex, &outputindex_to_typeindex_mmap);
+
+                                sending_addressindexes
+                                    .get_mut(input_type)
+                                    .unwrap()
+                                    .insert(typeindex);
+
+                                addresstype_to_typedindex_to_sent_data
+                                    .entry(prev_height)
+                                    .or_default()
+                                    .get_mut(input_type)
+                                    .unwrap()
+                                    .push((typeindex, value));
+
+                                ControlFlow::Continue(())
+                            });
+
+                        let (
+                            transacted,
+                            addresstype_to_typedindex_to_received_data,
+                            receiving_addressindexes,
+                        ) = received.join().unwrap();
+
+                        let stored_addressindexes =
+                            sending_addressindexes.merge(receiving_addressindexes);
+
+                        (
+                            transacted,
+                            addresstype_to_typedindex_to_received_data,
+                            height_to_sent,
+                            addresstype_to_typedindex_to_sent_data,
+                            stored_addressindexes,
+                        )
+                    });
+
+                    let mut stored_addressdata_with_source = stored_addressindexes
+                        .into_typed_vec()
+                        .into_par_iter()
+                        .flat_map(|(_type, set)| {
+                            set.into_par_iter().map(move |index| (_type, index))
+                        })
+                        .flat_map(|(_type, index)| {
+                            if *first_addressindexes.get(_type).unwrap() <= index {
+                                Some((
+                                    _type,
+                                    index,
+                                    WithAddressDataSource::New(AddressData::default()),
+                                ))
+                            } else if addresstype_to_typeindex_to_addressdata
+                                .get(_type)
+                                .unwrap()
+                                .contains_key(&index)
+                                || addresstype_to_typeindex_to_emptyaddressdata
+                                    .get(_type)
+                                    .unwrap()
+                                    .contains_key(&index)
+                            {
+                                None
+                            } else if let Some(addressdata) =
+                                stores.get_addressdata(_type, index).unwrap()
+                            {
+                                Some((
+                                    _type,
+                                    index,
+                                    WithAddressDataSource::FromAddressDataStore(addressdata),
+                                ))
+                            } else if let Some(emptyaddressdata) =
+                                stores.get_emptyaddressdata(_type, index).unwrap()
+                            {
+                                Some((
+                                    _type,
+                                    index,
+                                    WithAddressDataSource::FromEmptyAddressDataStore(
+                                        emptyaddressdata.into(),
+                                    ),
+                                ))
+                            } else {
+                                unreachable!()
+                            }
+                        })
+                        .fold(
+                            AddressTypeToTypeIndexTree::default,
+                            |mut tree, (_type, index, addressdata)| {
+                                tree.get_mut(_type).unwrap().insert(index, addressdata);
+                                tree
+                            },
+                        )
+                        .reduce(AddressTypeToTypeIndexTree::default, |a, b| a.merge(b));
+
+                    thread::scope(|scope| {
+                        scope.spawn(|| {
+                            addresstype_to_typedindex_to_received_data.process_received(
+                                &mut self.address_vecs,
+                                &mut addresstype_to_typeindex_to_addressdata,
+                                &mut addresstype_to_typeindex_to_emptyaddressdata,
+                                price,
+                                &mut addresstype_to_address_count,
+                                &mut addresstype_to_empty_address_count,
+                                &mut stored_addressdata_with_source,
+                            );
+
+                            addresstype_to_typedindex_to_sent_data
+                                .process_sent(
+                                    &mut self.address_vecs,
+                                    &mut addresstype_to_typeindex_to_addressdata,
+                                    &mut addresstype_to_typeindex_to_emptyaddressdata,
+                                    price,
+                                    &mut addresstype_to_address_count,
+                                    &mut addresstype_to_empty_address_count,
+                                    height_to_close_vec.as_ref(),
+                                    &height_to_timestamp_fixed_vec,
+                                    height,
+                                    timestamp,
+                                    &mut stored_addressdata_with_source,
+                                )
+                                .unwrap();
+                        });
+
+                        if chain_state_starting_height > height {
+                            dbg!(chain_state_starting_height, height);
+                            panic!("temp, just making sure")
+                        }
+
+                        unspendable_supply += transacted
+                            .by_type
+                            .unspendable
+                            .as_vec()
+                            .into_iter()
+                            .map(|state| state.value)
+                            .sum::<Sats>()
+                            + height_to_unclaimed_rewards_iter.unwrap_get_inner(height);
+
+                        opreturn_supply += transacted.by_type.unspendable.opreturn.value;
+
+                        if height == Height::new(0) {
+                            transacted = Transacted::default();
+                            unspendable_supply += Sats::FIFTY_BTC;
+                        } else if height == Height::new(91_842) || height == Height::new(91_880) {
+                            // Need to destroy invalid coinbases due to duplicate txids
+                            if height == Height::new(91_842) {
+                                height_to_sent.entry(Height::new(91_812)).or_default()
+                            } else {
+                                height_to_sent.entry(Height::new(91_722)).or_default()
+                            }
+                            .iterate(Sats::FIFTY_BTC, OutputType::P2PK65);
+                        };
                         // Push current block state before processing sends and receives
                         chain_state.push(BlockState {
-                            supply: received.spendable_supply.clone(),
+                            supply: transacted.spendable_supply.clone(),
                             price,
                             timestamp,
                         });
 
-                        self.utxos_vecs.receive(received, height, price);
+                        self.utxo_vecs.receive(transacted, height, price);
 
-                        let unsafe_chain_state = UnsafeSlice::new(&mut chain_state);
+                        self.utxo_vecs.send(height_to_sent, &mut chain_state);
+                    });
 
-                        height_to_sent.par_iter().for_each(|(height, sent)| unsafe {
-                            (*unsafe_chain_state.get(height.unwrap_to_usize())).supply -=
-                                &sent.spendable_supply;
-                        });
-
-                        self.utxos_vecs.send(height_to_sent, chain_state.as_slice());
-                    } else {
-                        dbg!(chain_state_starting_height, height);
-                        panic!("temp, just making sure")
-                    }
-
-                    let mut separate_utxo_vecs = self.utxos_vecs.as_mut_separate_vecs();
+                    let mut separate_utxo_vecs = self.utxo_vecs.as_mut_separate_vecs();
 
                     separate_utxo_vecs
                         .iter_mut()
                         .try_for_each(|(_, v)| v.forced_pushed_at(height, exit))?;
 
+                    let mut separate_address_vecs = self.address_vecs.as_mut_separate_vecs();
+
+                    separate_address_vecs
+                        .iter_mut()
+                        .try_for_each(|(_, v)| v.forced_pushed_at(height, exit))?;
+
                     self.height_to_unspendable_supply.forced_push_at(
                         height,
                         unspendable_supply,
@@ -1556,6 +1023,15 @@ impl Vecs {
                     self.height_to_opreturn_supply
                         .forced_push_at(height, opreturn_supply, exit)?;
 
+                    self.addresstype_to_height_to_address_count.forced_push_at(
+                        height,
+                        &addresstype_to_address_count,
+                        exit,
+                    )?;
+
+                    self.addresstype_to_height_to_empty_address_count
+                        .forced_push_at(height, &addresstype_to_empty_address_count, exit)?;
+
                     let date = height_to_date_fixed_iter.unwrap_get_inner(height);
                     let dateindex = DateIndex::try_from(date).unwrap();
                     let date_first_height =
@@ -1569,20 +1045,37 @@ impl Vecs {
                         .as_mut()
                         .map(|v| is_date_last_height.then(|| *v.unwrap_get_inner(dateindex)));
 
-                    separate_utxo_vecs.par_iter_mut().try_for_each(|(_, v)| {
-                        v.compute_then_force_push_unrealized_states(
-                            height,
-                            price,
-                            is_date_last_height.then_some(dateindex),
-                            date_price,
-                            exit,
+                    let dateindex = is_date_last_height.then_some(dateindex);
+                    separate_utxo_vecs
+                        .into_par_iter()
+                        .map(|(_, v)| v as &mut dyn DynCohortVecs)
+                        .chain(
+                            separate_address_vecs
+                                .into_par_iter()
+                                .map(|(_, v)| v as &mut dyn DynCohortVecs),
                         )
-                    })?;
+                        .try_for_each(|v| {
+                            v.compute_then_force_push_unrealized_states(
+                                height, price, dateindex, date_price, exit,
+                            )
+                        })?;
 
-                    if height != Height::ZERO && height.unwrap_to_usize() % 20_000 == 0 {
+                    if height != Height::ZERO && height.unwrap_to_usize() % 10_000 == 0 {
                         info!("Flushing...");
                         exit.block();
                         self.flush_states(height, &chain_state, exit)?;
+
+                        // Maybe keep some from the end for both
+                        let addresstype_to_typeindex_to_addressdata_to_consume =
+                            mem::take(&mut addresstype_to_typeindex_to_addressdata);
+                        let addresstype_to_typeindex_to_emptyaddressdata_to_consume =
+                            mem::take(&mut addresstype_to_typeindex_to_emptyaddressdata);
+
+                        stores.commit(
+                            height,
+                            addresstype_to_typeindex_to_addressdata_to_consume,
+                            addresstype_to_typeindex_to_emptyaddressdata_to_consume,
+                        )?;
                         exit.release();
                     }
 
@@ -1594,59 +1087,170 @@ impl Vecs {
             info!("Flushing...");
 
             self.flush_states(height, &chain_state, exit)?;
+            stores.commit(
+                height,
+                mem::take(&mut addresstype_to_typeindex_to_addressdata),
+                mem::take(&mut addresstype_to_typeindex_to_emptyaddressdata),
+            )?;
+        } else {
+            exit.block();
         }
 
         info!("Computing overlapping...");
 
-        self.utxos_vecs
-            .compute_overlapping_vecs(starting_indexes, exit)?;
+        thread::scope(|scope| {
+            scope.spawn(|| {
+                self.utxo_vecs
+                    .compute_overlapping_vecs(starting_indexes, exit)
+                    .unwrap();
+            });
+            scope.spawn(|| {
+                self.address_vecs
+                    .compute_overlapping_vecs(starting_indexes, exit)
+                    .unwrap();
+            });
+        });
 
         info!("Computing rest part 1...");
 
-        self.utxos_vecs
+        self.indexes_to_address_count.compute_all(
+            indexer,
+            indexes,
+            starting_indexes,
+            exit,
+            |v, _, _, starting_indexes, exit| {
+                v.compute_sum_of_others(
+                    starting_indexes.height,
+                    &self
+                        .addresstype_to_height_to_address_count
+                        .as_typed_vec()
+                        .into_iter()
+                        .map(|(_, v)| v)
+                        .collect::<Vec<_>>(),
+                    exit,
+                )
+            },
+        )?;
+
+        self.indexes_to_empty_address_count.compute_all(
+            indexer,
+            indexes,
+            starting_indexes,
+            exit,
+            |v, _, _, starting_indexes, exit| {
+                v.compute_sum_of_others(
+                    starting_indexes.height,
+                    &self
+                        .addresstype_to_height_to_empty_address_count
+                        .as_typed_vec()
+                        .into_iter()
+                        .map(|(_, v)| v)
+                        .collect::<Vec<_>>(),
+                    exit,
+                )
+            },
+        )?;
+
+        self.addresstype_to_indexes_to_address_count.compute(
+            indexes,
+            starting_indexes,
+            exit,
+            &self.addresstype_to_height_to_address_count,
+        )?;
+        self.addresstype_to_indexes_to_empty_address_count.compute(
+            indexes,
+            starting_indexes,
+            exit,
+            &self.addresstype_to_height_to_empty_address_count,
+        )?;
+
+        self.utxo_vecs
             .as_mut_vecs()
-            .par_iter_mut()
-            .try_for_each(|(_, v)| {
-                v.compute_rest_part1(indexer, indexes, fetched, starting_indexes, exit)
+            .into_iter()
+            .map(|(_, v)| v)
+            .map(Either::Left)
+            .chain(
+                self.address_vecs
+                    .as_mut_vecs()
+                    .into_iter()
+                    .map(|(_, v)| v)
+                    .map(Either::Right),
+            )
+            .collect::<Vec<Either<&mut utxo_cohort::Vecs, &mut address_cohort::Vecs>>>()
+            .into_par_iter()
+            .try_for_each(|either| match either {
+                Either::Left(v) => {
+                    v.compute_rest_part1(indexer, indexes, fetched, starting_indexes, exit)
+                }
+                Either::Right(v) => {
+                    v.compute_rest_part1(indexer, indexes, fetched, starting_indexes, exit)
+                }
             })?;
 
         info!("Computing rest part 2...");
 
-        let height_to_supply = self.utxos_vecs.all.1.height_to_supply_value.bitcoin.clone();
+        let height_to_supply = self.utxo_vecs.all.1.height_to_supply_value.bitcoin.clone();
         let dateindex_to_supply = self
-            .utxos_vecs
+            .utxo_vecs
             .all
             .1
             .indexes_to_supply
             .bitcoin
             .dateindex
             .clone();
-        let height_to_realized_cap = self.utxos_vecs.all.1.height_to_realized_cap.clone();
+        let height_to_realized_cap = self.utxo_vecs.all.1.height_to_realized_cap.clone();
         let dateindex_to_realized_cap = self
-            .utxos_vecs
+            .utxo_vecs
             .all
             .1
             .indexes_to_realized_cap
             .as_ref()
             .map(|v| v.dateindex.unwrap_last().clone());
+        let dateindex_to_supply_ref = dateindex_to_supply.as_ref().unwrap();
+        let height_to_realized_cap_ref = height_to_realized_cap.as_ref();
+        let dateindex_to_realized_cap_ref = dateindex_to_realized_cap.as_ref();
 
-        self.utxos_vecs
+        self.utxo_vecs
             .as_mut_vecs()
-            .par_iter_mut()
-            .try_for_each(|(_, v)| {
-                v.compute_rest_part2(
+            .into_iter()
+            .map(|(_, v)| v)
+            .map(Either::Left)
+            .chain(
+                self.address_vecs
+                    .as_mut_vecs()
+                    .into_iter()
+                    .map(|(_, v)| v)
+                    .map(Either::Right),
+            )
+            .collect::<Vec<Either<&mut utxo_cohort::Vecs, &mut address_cohort::Vecs>>>()
+            .into_par_iter()
+            .try_for_each(|either| match either {
+                Either::Left(v) => v.compute_rest_part2(
                     indexer,
                     indexes,
                     fetched,
                     starting_indexes,
                     market,
                     &height_to_supply,
-                    dateindex_to_supply.as_ref().unwrap(),
-                    height_to_realized_cap.as_ref(),
-                    dateindex_to_realized_cap.as_ref(),
+                    dateindex_to_supply_ref,
+                    height_to_realized_cap_ref,
+                    dateindex_to_realized_cap_ref,
                     exit,
-                )
+                ),
+                Either::Right(v) => v.compute_rest_part2(
+                    indexer,
+                    indexes,
+                    fetched,
+                    starting_indexes,
+                    market,
+                    &height_to_supply,
+                    dateindex_to_supply_ref,
+                    height_to_realized_cap_ref,
+                    dateindex_to_realized_cap_ref,
+                    exit,
+                ),
             })?;
+
         self.indexes_to_unspendable_supply.compute_rest(
             indexer,
             indexes,
@@ -1675,12 +1279,24 @@ impl Vecs {
         chain_state: &[BlockState],
         exit: &Exit,
     ) -> Result<()> {
-        self.utxos_vecs
+        self.utxo_vecs
+            .as_mut_separate_vecs()
+            .par_iter_mut()
+            .try_for_each(|(_, v)| v.safe_flush_stateful_vecs(height, exit))?;
+        self.address_vecs
             .as_mut_separate_vecs()
             .par_iter_mut()
             .try_for_each(|(_, v)| v.safe_flush_stateful_vecs(height, exit))?;
         self.height_to_unspendable_supply.safe_flush(exit)?;
         self.height_to_opreturn_supply.safe_flush(exit)?;
+        self.addresstype_to_height_to_address_count
+            .as_mut_vec()
+            .into_iter()
+            .try_for_each(|v| v.safe_flush(exit))?;
+        self.addresstype_to_height_to_empty_address_count
+            .as_mut_vec()
+            .into_iter()
+            .try_for_each(|v| v.safe_flush(exit))?;
 
         self.chain_state.truncate_if_needed(Height::ZERO)?;
         chain_state.iter().for_each(|block_state| {
@@ -1693,13 +1309,32 @@ impl Vecs {
 
     pub fn vecs(&self) -> Vec<&dyn AnyCollectableVec> {
         [
-            self.utxos_vecs
+            self.utxo_vecs
+                .vecs()
+                .into_iter()
+                .flat_map(|v| v.vecs())
+                .collect::<Vec<_>>(),
+            self.address_vecs
                 .vecs()
                 .into_iter()
                 .flat_map(|v| v.vecs())
                 .collect::<Vec<_>>(),
             self.indexes_to_unspendable_supply.vecs(),
             self.indexes_to_opreturn_supply.vecs(),
+            self.indexes_to_address_count.vecs(),
+            self.indexes_to_empty_address_count.vecs(),
+            self.addresstype_to_indexes_to_address_count.vecs(),
+            self.addresstype_to_indexes_to_empty_address_count.vecs(),
+            self.addresstype_to_height_to_address_count
+                .as_typed_vec()
+                .into_iter()
+                .map(|(_, v)| v as &dyn AnyCollectableVec)
+                .collect::<Vec<_>>(),
+            self.addresstype_to_height_to_empty_address_count
+                .as_typed_vec()
+                .into_iter()
+                .map(|(_, v)| v as &dyn AnyCollectableVec)
+                .collect::<Vec<_>>(),
             vec![
                 &self.height_to_unspendable_supply,
                 &self.height_to_opreturn_supply,
@@ -1710,3 +1345,204 @@ impl Vecs {
         .collect::<Vec<_>>()
     }
 }
+
+impl AddressTypeToVec<(TypeIndex, Sats)> {
+    #[allow(clippy::too_many_arguments)]
+    fn process_received(
+        mut self,
+        vecs: &mut address_cohorts::Vecs,
+        addresstype_to_typeindex_to_addressdata: &mut AddressTypeToTypeIndexTree<
+            WithAddressDataSource<AddressData>,
+        >,
+        addresstype_to_typeindex_to_emptyaddressdata: &mut AddressTypeToTypeIndexTree<
+            WithAddressDataSource<EmptyAddressData>,
+        >,
+        price: Option<Dollars>,
+        addresstype_to_address_count: &mut ByAddressType<usize>,
+        addresstype_to_empty_address_count: &mut ByAddressType<usize>,
+        stored_addressdata_with_source: &mut AddressTypeToTypeIndexTree<
+            WithAddressDataSource<AddressData>,
+        >,
+    ) {
+        self.into_typed_vec().into_iter().for_each(|(_type, vec)| {
+            vec.into_iter().for_each(|(type_index, value)| {
+                let mut is_new = false;
+                let mut from_any_empty = false;
+
+                let addressdata_withsource = addresstype_to_typeindex_to_addressdata
+                    .get_mut(_type)
+                    .unwrap()
+                    .entry(type_index)
+                    .or_insert_with(|| {
+                        addresstype_to_typeindex_to_emptyaddressdata
+                            .get_mut(_type)
+                            .unwrap()
+                            .remove(&type_index)
+                            .map(|ad| {
+                                from_any_empty = true;
+                                ad.into()
+                            })
+                            .unwrap_or_else(|| {
+                                let addressdata = stored_addressdata_with_source
+                                    .get_mut(_type)
+                                    .unwrap()
+                                    .remove(&type_index)
+                                    .unwrap();
+                                is_new = addressdata.is_new();
+                                from_any_empty = addressdata.is_from_emptyaddressdata();
+                                addressdata
+                            })
+                    });
+
+                if is_new || from_any_empty {
+                    (*addresstype_to_address_count.get_mut(_type).unwrap()) += 1;
+                    if from_any_empty {
+                        (*addresstype_to_empty_address_count.get_mut(_type).unwrap()) -= 1;
+                    }
+                }
+
+                let addressdata = addressdata_withsource.deref_mut();
+
+                let prev_amount = addressdata.amount();
+
+                let amount = prev_amount + value;
+
+                if is_new
+                    || from_any_empty
+                    || vecs.amount_range.get_mut(amount).0.clone()
+                        != vecs.amount_range.get_mut(prev_amount).0.clone()
+                {
+                    if !is_new && !from_any_empty {
+                        vecs.amount_range
+                            .get_mut(prev_amount)
+                            .1
+                            .state
+                            .subtract(addressdata);
+                    }
+
+                    addressdata.receive(value, price);
+
+                    vecs.amount_range.get_mut(amount).1.state.add(addressdata);
+                } else {
+                    vecs.amount_range
+                        .get_mut(amount)
+                        .1
+                        .state
+                        .receive(addressdata, value, price);
+                }
+            });
+        });
+    }
+}
+
+impl HeightToAddressTypeToVec<(TypeIndex, Sats)> {
+    #[allow(clippy::too_many_arguments)]
+    fn process_sent(
+        self,
+        vecs: &mut address_cohorts::Vecs,
+        addresstype_to_typeindex_to_addressdata: &mut AddressTypeToTypeIndexTree<
+            WithAddressDataSource<AddressData>,
+        >,
+        addresstype_to_typeindex_to_emptyaddressdata: &mut AddressTypeToTypeIndexTree<
+            WithAddressDataSource<EmptyAddressData>,
+        >,
+        price: Option<Dollars>,
+        addresstype_to_address_count: &mut ByAddressType<usize>,
+        addresstype_to_empty_address_count: &mut ByAddressType<usize>,
+        height_to_close_vec: Option<&Vec<brk_core::Close<Dollars>>>,
+        height_to_timestamp_fixed_vec: &[Timestamp],
+        height: Height,
+        timestamp: Timestamp,
+        stored_addressdata_with_source: &mut AddressTypeToTypeIndexTree<
+            WithAddressDataSource<AddressData>,
+        >,
+    ) -> Result<()> {
+        self.0.into_iter().try_for_each(|(prev_height, mut v)| {
+            let prev_price = height_to_close_vec
+                .as_ref()
+                .map(|v| **v.get(prev_height.unwrap_to_usize()).unwrap());
+
+            let prev_timestamp = *height_to_timestamp_fixed_vec
+                .get(prev_height.unwrap_to_usize())
+                .unwrap();
+
+            let blocks_old = height.unwrap_to_usize() - prev_height.unwrap_to_usize();
+
+            let days_old = timestamp.difference_in_days_between_float(prev_timestamp);
+
+            let older_than_hour = timestamp
+                .checked_sub(prev_timestamp)
+                .unwrap()
+                .is_more_than_hour();
+
+            v.into_typed_vec().into_iter().try_for_each(|(_type, vec)| {
+                vec.into_iter().try_for_each(|(type_index, value)| {
+                    let typeindex_to_addressdata = addresstype_to_typeindex_to_addressdata
+                        .get_mut(_type)
+                        .unwrap();
+
+                    let addressdata_withsource = typeindex_to_addressdata
+                        .entry(type_index)
+                        .or_insert_with(|| {
+                            stored_addressdata_with_source
+                                .get_mut(_type)
+                                .unwrap()
+                                .remove(&type_index)
+                                .unwrap()
+                        });
+
+                    let addressdata = addressdata_withsource.deref_mut();
+
+                    let prev_amount = addressdata.amount();
+
+                    let amount = prev_amount.checked_sub(value).unwrap();
+
+                    let will_be_empty = addressdata.outputs_len - 1 == 0;
+
+                    if will_be_empty
+                        || vecs.amount_range.get_mut(amount).0.clone()
+                            != vecs.amount_range.get_mut(prev_amount).0.clone()
+                    {
+                        vecs.amount_range
+                            .get_mut(prev_amount)
+                            .1
+                            .state
+                            .subtract(addressdata);
+
+                        addressdata.send(value, prev_price)?;
+
+                        if will_be_empty {
+                            if amount.is_not_zero() {
+                                unreachable!()
+                            }
+
+                            (*addresstype_to_address_count.get_mut(_type).unwrap()) -= 1;
+                            (*addresstype_to_empty_address_count.get_mut(_type).unwrap()) += 1;
+
+                            let addressdata = typeindex_to_addressdata.remove(&type_index).unwrap();
+
+                            addresstype_to_typeindex_to_emptyaddressdata
+                                .get_mut(_type)
+                                .unwrap()
+                                .insert(type_index, addressdata.into());
+                        } else {
+                            vecs.amount_range.get_mut(amount).1.state.add(addressdata);
+                        }
+                    } else {
+                        vecs.amount_range.get_mut(amount).1.state.send(
+                            addressdata,
+                            value,
+                            price,
+                            prev_price,
+                            blocks_old,
+                            days_old,
+                            older_than_hour,
+                        )?;
+                    }
+
+                    Ok(())
+                })
+            })
+        })
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/outputs.rs b/crates/brk_computer/src/vecs/stateful/outputs.rs
deleted file mode 100644
index c4a16efe7..000000000
--- a/crates/brk_computer/src/vecs/stateful/outputs.rs
+++ /dev/null
@@ -1,258 +0,0 @@
-use std::{collections::BTreeMap, ops::ControlFlow};
-
-use brk_core::{CheckedSub, Dollars, HalvingEpoch, Height, Result, Timestamp};
-use brk_exit::Exit;
-use brk_state::{BlockState, OutputFilter, Outputs, Transacted};
-use brk_vec::StoredIndex;
-use rayon::prelude::*;
-
-use crate::vecs::Indexes;
-
-use super::cohort;
-
-pub trait OutputCohorts {
-    fn tick_tock_next_block(&mut self, chain_state: &[BlockState], timestamp: Timestamp);
-    fn send(&mut self, height_to_sent: BTreeMap<Height, Transacted>, chain_state: &[BlockState]);
-    fn receive(&mut self, received: Transacted, height: Height, price: Option<Dollars>);
-    fn compute_overlapping_vecs(&mut self, starting_indexes: &Indexes, exit: &Exit) -> Result<()>;
-}
-
-impl OutputCohorts for Outputs<(OutputFilter, cohort::Vecs)> {
-    fn tick_tock_next_block(&mut self, chain_state: &[BlockState], timestamp: Timestamp) {
-        if chain_state.is_empty() {
-            return;
-        }
-
-        let prev_timestamp = chain_state.last().unwrap().timestamp;
-
-        self.by_date_range
-            .as_mut_vec()
-            .into_par_iter()
-            .for_each(|(filter, v)| {
-                let state = &mut v.state;
-
-                let _ = chain_state
-                    .iter()
-                    .try_for_each(|block_state| -> ControlFlow<()> {
-                        let prev_days_old = block_state
-                            .timestamp
-                            .difference_in_days_between(prev_timestamp);
-                        let days_old = block_state.timestamp.difference_in_days_between(timestamp);
-
-                        if prev_days_old == days_old {
-                            return ControlFlow::Continue(());
-                        }
-
-                        let is = filter.contains(days_old);
-                        let was = filter.contains(prev_days_old);
-
-                        if is && !was {
-                            state.increment(&block_state.supply, block_state.price);
-                        } else if was && !is {
-                            state.decrement(&block_state.supply, block_state.price);
-                        }
-
-                        ControlFlow::Continue(())
-                    });
-            });
-    }
-
-    fn send(&mut self, height_to_sent: BTreeMap<Height, Transacted>, chain_state: &[BlockState]) {
-        let mut time_based_vecs = self
-            .by_date_range
-            .as_mut_vec()
-            .into_iter()
-            .chain(self.by_epoch.as_mut_vec())
-            .collect::<Vec<_>>();
-
-        let last_timestamp = chain_state.last().unwrap().timestamp;
-        let current_price = chain_state.last().unwrap().price;
-
-        // dbg!(&height_to_sent);
-
-        height_to_sent.into_iter().for_each(|(height, sent)| {
-            let block_state = chain_state.get(height.unwrap_to_usize()).unwrap();
-            let prev_price = block_state.price;
-
-            let blocks_old = chain_state.len() - 1 - height.unwrap_to_usize();
-
-            let days_old = block_state
-                .timestamp
-                .difference_in_days_between(last_timestamp);
-
-            let days_old_foat = block_state
-                .timestamp
-                .difference_in_days_between_float(last_timestamp);
-
-            let older_than_hour =
-                jiff::Timestamp::from(last_timestamp.checked_sub(block_state.timestamp).unwrap())
-                    .as_second()
-                    >= 60 * 60;
-
-            time_based_vecs
-                .iter_mut()
-                .filter(|(filter, _)| match filter {
-                    OutputFilter::From(from) => *from <= days_old,
-                    OutputFilter::To(to) => *to > days_old,
-                    OutputFilter::Range(range) => range.contains(&days_old),
-                    OutputFilter::Epoch(epoch) => *epoch == HalvingEpoch::from(height),
-                    _ => unreachable!(),
-                })
-                .for_each(|(_, vecs)| {
-                    vecs.state.send(
-                        &sent.spendable_supply,
-                        current_price,
-                        prev_price,
-                        blocks_old,
-                        days_old_foat,
-                        older_than_hour,
-                    );
-                });
-
-            sent.by_type.spendable.as_typed_vec().into_iter().for_each(
-                |(output_type, supply_state)| {
-                    self.by_type.get_mut(output_type).1.state.send(
-                        supply_state,
-                        current_price,
-                        prev_price,
-                        blocks_old,
-                        days_old_foat,
-                        older_than_hour,
-                    )
-                },
-            );
-
-            sent.by_size_group
-                .into_iter()
-                .for_each(|(group, supply_state)| {
-                    self.by_size_range.get_mut(group).1.state.send(
-                        &supply_state,
-                        current_price,
-                        prev_price,
-                        blocks_old,
-                        days_old_foat,
-                        older_than_hour,
-                    );
-                });
-        });
-    }
-
-    fn receive(&mut self, received: Transacted, height: Height, price: Option<Dollars>) {
-        let supply_state = received.spendable_supply;
-
-        [
-            &mut self.by_date_range.start_to_1d.1,
-            &mut self.by_epoch.mut_vec_from_height(height).1,
-        ]
-        .into_iter()
-        .for_each(|v| {
-            v.state.receive(&supply_state, price);
-        });
-
-        self.by_type
-            .as_mut_vec()
-            .into_iter()
-            .for_each(|(filter, vecs)| {
-                let output_type = match filter {
-                    OutputFilter::Type(output_type) => *output_type,
-                    _ => unreachable!(),
-                };
-                vecs.state.receive(received.by_type.get(output_type), price)
-            });
-
-        received
-            .by_size_group
-            .into_iter()
-            .for_each(|(group, supply_state)| {
-                self.by_size_range
-                    .get_mut(group)
-                    .1
-                    .state
-                    .receive(&supply_state, price);
-            });
-    }
-
-    fn compute_overlapping_vecs(&mut self, starting_indexes: &Indexes, exit: &Exit) -> Result<()> {
-        let by_date_range = self.by_date_range.as_vec();
-        let by_size_range = self.by_size_range.as_vec();
-
-        [
-            vec![(&mut self.all.1, self.by_epoch.vecs().to_vec())],
-            self.by_from_date
-                .as_mut_vec()
-                .into_iter()
-                .map(|(filter, vecs)| {
-                    (
-                        vecs,
-                        by_date_range
-                            .into_iter()
-                            .filter(|(other, _)| filter.includes(other))
-                            .map(|(_, v)| v)
-                            .collect::<Vec<_>>(),
-                    )
-                })
-                .collect::<Vec<_>>(),
-            self.by_up_to_date
-                .as_mut_vec()
-                .into_iter()
-                .map(|(filter, vecs)| {
-                    (
-                        vecs,
-                        by_date_range
-                            .into_iter()
-                            .filter(|(other, _)| filter.includes(other))
-                            .map(|(_, v)| v)
-                            .collect::<Vec<_>>(),
-                    )
-                })
-                .collect::<Vec<_>>(),
-            self.by_term
-                .as_mut_vec()
-                .into_iter()
-                .map(|(filter, vecs)| {
-                    (
-                        vecs,
-                        by_date_range
-                            .into_iter()
-                            .filter(|(other, _)| filter.includes(other))
-                            .map(|(_, v)| v)
-                            .collect::<Vec<_>>(),
-                    )
-                })
-                .collect::<Vec<_>>(),
-            self.by_from_size
-                .as_mut_vec()
-                .into_iter()
-                .map(|(filter, vecs)| {
-                    (
-                        vecs,
-                        by_size_range
-                            .into_iter()
-                            .filter(|(other, _)| filter.includes(other))
-                            .map(|(_, v)| v)
-                            .collect::<Vec<_>>(),
-                    )
-                })
-                .collect::<Vec<_>>(),
-            self.by_up_to_size
-                .as_mut_vec()
-                .into_iter()
-                .map(|(filter, vecs)| {
-                    (
-                        vecs,
-                        by_size_range
-                            .into_iter()
-                            .filter(|(other, _)| filter.includes(other))
-                            .map(|(_, v)| v)
-                            .collect::<Vec<_>>(),
-                    )
-                })
-                .collect::<Vec<_>>(),
-        ]
-        .into_par_iter()
-        .flatten()
-        .try_for_each(|(vecs, stateful)| {
-            vecs.compute_from_stateful(starting_indexes, &stateful, exit)
-        })
-    }
-}
diff --git a/crates/brk_computer/src/vecs/stateful/range_map.rs b/crates/brk_computer/src/vecs/stateful/range_map.rs
new file mode 100644
index 000000000..ee52d4da1
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/range_map.rs
@@ -0,0 +1,35 @@
+use std::collections::BTreeMap;
+
+use brk_vec::{IndexedVec, StoredIndex, StoredType};
+
+#[derive(Debug)]
+pub struct RangeMap<I, T>(BTreeMap<I, T>);
+
+impl<I, T> RangeMap<I, T>
+where
+    I: StoredIndex,
+    T: StoredIndex,
+{
+    pub fn get(&self, key: I) -> Option<&T> {
+        self.0.range(..=key).next_back().map(|(&min, value)| {
+            if min > key {
+                unreachable!()
+            }
+            value
+        })
+    }
+}
+
+impl<I, T> From<&IndexedVec<I, T>> for RangeMap<T, I>
+where
+    I: StoredIndex,
+    T: StoredIndex + StoredType,
+{
+    fn from(vec: &IndexedVec<I, T>) -> Self {
+        Self(
+            vec.into_iter()
+                .map(|(i, v)| (v.into_owned(), i))
+                .collect::<BTreeMap<_, _>>(),
+        )
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/trait.rs b/crates/brk_computer/src/vecs/stateful/trait.rs
new file mode 100644
index 000000000..db138ebed
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/trait.rs
@@ -0,0 +1,63 @@
+use brk_core::{Bitcoin, DateIndex, Dollars, Height, Result, Version};
+use brk_exit::Exit;
+use brk_indexer::Indexer;
+use brk_vec::{AnyCollectableVec, AnyIterableVec};
+
+use crate::vecs::{Indexes, fetched, indexes, market};
+
+pub trait DynCohortVecs: Send + Sync {
+    fn starting_height(&self) -> Height;
+
+    fn init(&mut self, starting_height: Height);
+
+    fn validate_computed_versions(&mut self, base_version: Version) -> Result<()>;
+
+    fn forced_pushed_at(&mut self, height: Height, exit: &Exit) -> Result<()>;
+
+    fn compute_then_force_push_unrealized_states(
+        &mut self,
+        height: Height,
+        height_price: Option<Dollars>,
+        dateindex: Option<DateIndex>,
+        date_price: Option<Option<Dollars>>,
+        exit: &Exit,
+    ) -> Result<()>;
+
+    fn safe_flush_stateful_vecs(&mut self, height: Height, exit: &Exit) -> Result<()>;
+
+    #[allow(clippy::too_many_arguments)]
+    fn compute_rest_part1(
+        &mut self,
+        indexer: &Indexer,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        starting_indexes: &Indexes,
+        exit: &Exit,
+    ) -> color_eyre::Result<()>;
+
+    fn vecs(&self) -> Vec<&dyn AnyCollectableVec>;
+}
+
+pub trait CohortVecs: DynCohortVecs {
+    fn compute_from_stateful(
+        &mut self,
+        starting_indexes: &Indexes,
+        others: &[&Self],
+        exit: &Exit,
+    ) -> Result<()>;
+
+    #[allow(clippy::too_many_arguments)]
+    fn compute_rest_part2(
+        &mut self,
+        indexer: &Indexer,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        starting_indexes: &Indexes,
+        market: &market::Vecs,
+        height_to_supply: &impl AnyIterableVec<Height, Bitcoin>,
+        dateindex_to_supply: &impl AnyIterableVec<DateIndex, Bitcoin>,
+        height_to_realized_cap: Option<&impl AnyIterableVec<Height, Dollars>>,
+        dateindex_to_realized_cap: Option<&impl AnyIterableVec<DateIndex, Dollars>>,
+        exit: &Exit,
+    ) -> color_eyre::Result<()>;
+}
diff --git a/crates/brk_computer/src/vecs/stateful/utxo_cohort.rs b/crates/brk_computer/src/vecs/stateful/utxo_cohort.rs
new file mode 100644
index 000000000..4058b5906
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/utxo_cohort.rs
@@ -0,0 +1,190 @@
+use std::{ops::Deref, path::Path};
+
+use brk_core::{Bitcoin, DateIndex, Dollars, Height, Result, Version};
+use brk_exit::Exit;
+use brk_indexer::Indexer;
+use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, Format};
+
+use crate::{
+    UTXOCohortState,
+    vecs::{
+        Indexes, fetched, indexes, market,
+        stateful::{
+            common,
+            r#trait::{CohortVecs, DynCohortVecs},
+        },
+    },
+};
+
+#[derive(Clone)]
+pub struct Vecs {
+    starting_height: Height,
+
+    pub state: UTXOCohortState,
+
+    inner: common::Vecs,
+}
+
+impl Vecs {
+    #[allow(clippy::too_many_arguments)]
+    pub fn forced_import(
+        path: &Path,
+        cohort_name: Option<&str>,
+        computation: Computation,
+        format: Format,
+        version: Version,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        states_path: &Path,
+        compute_relative_to_all: bool,
+        ratio_extended: bool,
+    ) -> color_eyre::Result<Self> {
+        let compute_dollars = fetched.is_some();
+
+        Ok(Self {
+            starting_height: Height::ZERO,
+
+            state: UTXOCohortState::default_and_import(
+                states_path,
+                cohort_name.unwrap_or_default(),
+                compute_dollars,
+            )?,
+
+            inner: common::Vecs::forced_import(
+                path,
+                cohort_name,
+                computation,
+                format,
+                version,
+                indexes,
+                fetched,
+                compute_relative_to_all,
+                ratio_extended,
+            )?,
+        })
+    }
+}
+
+impl DynCohortVecs for Vecs {
+    fn starting_height(&self) -> Height {
+        [
+            self.state.height().map_or(Height::MAX, |h| h.incremented()),
+            self.inner.starting_height(),
+        ]
+        .into_iter()
+        .min()
+        .unwrap()
+    }
+
+    fn init(&mut self, starting_height: Height) {
+        if starting_height > self.starting_height() {
+            unreachable!()
+        }
+
+        self.starting_height = starting_height;
+
+        self.inner.init(&mut self.starting_height, &mut self.state);
+    }
+
+    fn validate_computed_versions(&mut self, base_version: Version) -> Result<()> {
+        self.inner.validate_computed_versions(base_version)
+    }
+
+    fn forced_pushed_at(&mut self, height: Height, exit: &Exit) -> Result<()> {
+        if self.starting_height > height {
+            return Ok(());
+        }
+
+        self.inner.forced_pushed_at(height, exit, &self.state)
+    }
+
+    fn compute_then_force_push_unrealized_states(
+        &mut self,
+        height: Height,
+        height_price: Option<Dollars>,
+        dateindex: Option<DateIndex>,
+        date_price: Option<Option<Dollars>>,
+        exit: &Exit,
+    ) -> Result<()> {
+        self.inner.compute_then_force_push_unrealized_states(
+            height,
+            height_price,
+            dateindex,
+            date_price,
+            exit,
+            &self.state,
+        )
+    }
+
+    fn safe_flush_stateful_vecs(&mut self, height: Height, exit: &Exit) -> Result<()> {
+        self.inner
+            .safe_flush_stateful_vecs(height, exit, &mut self.state)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn compute_rest_part1(
+        &mut self,
+        indexer: &Indexer,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        starting_indexes: &Indexes,
+        exit: &Exit,
+    ) -> color_eyre::Result<()> {
+        self.inner
+            .compute_rest_part1(indexer, indexes, fetched, starting_indexes, exit)
+    }
+
+    fn vecs(&self) -> Vec<&dyn AnyCollectableVec> {
+        self.inner.vecs()
+    }
+}
+
+impl CohortVecs for Vecs {
+    fn compute_from_stateful(
+        &mut self,
+        starting_indexes: &Indexes,
+        others: &[&Self],
+        exit: &Exit,
+    ) -> Result<()> {
+        self.inner.compute_from_stateful(
+            starting_indexes,
+            &others.iter().map(|v| &v.inner).collect::<Vec<_>>(),
+            exit,
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    fn compute_rest_part2(
+        &mut self,
+        indexer: &Indexer,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        starting_indexes: &Indexes,
+        market: &market::Vecs,
+        height_to_supply: &impl AnyIterableVec<Height, Bitcoin>,
+        dateindex_to_supply: &impl AnyIterableVec<DateIndex, Bitcoin>,
+        height_to_realized_cap: Option<&impl AnyIterableVec<Height, Dollars>>,
+        dateindex_to_realized_cap: Option<&impl AnyIterableVec<DateIndex, Dollars>>,
+        exit: &Exit,
+    ) -> color_eyre::Result<()> {
+        self.inner.compute_rest_part2(
+            indexer,
+            indexes,
+            fetched,
+            starting_indexes,
+            market,
+            height_to_supply,
+            dateindex_to_supply,
+            height_to_realized_cap,
+            dateindex_to_realized_cap,
+            exit,
+        )
+    }
+}
+
+impl Deref for Vecs {
+    type Target = common::Vecs;
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/utxo_cohorts.rs b/crates/brk_computer/src/vecs/stateful/utxo_cohorts.rs
new file mode 100644
index 000000000..e2e816fa5
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/utxo_cohorts.rs
@@ -0,0 +1,1708 @@
+use std::{collections::BTreeMap, ops::ControlFlow, path::Path};
+
+use brk_core::{
+    ByAgeRange, ByAmountRange, ByEpoch, ByGreatEqualAmount, ByLowerThanAmount, ByMaxAge, ByMinAge,
+    BySpendableType, ByTerm, CheckedSub, Dollars, GroupFilter, HalvingEpoch, Height, Result,
+    Timestamp, UTXOGroups, Version,
+};
+use brk_exit::Exit;
+use brk_vec::{Computation, Format, StoredIndex};
+use derive_deref::{Deref, DerefMut};
+use rayon::prelude::*;
+
+use crate::{
+    states::{BlockState, Transacted},
+    vecs::{Indexes, fetched, indexes, stateful::r#trait::DynCohortVecs},
+};
+
+use super::{r#trait::CohortVecs, utxo_cohort};
+
+const VERSION: Version = Version::new(0);
+
+#[derive(Clone, Deref, DerefMut)]
+pub struct Vecs(UTXOGroups<(GroupFilter, utxo_cohort::Vecs)>);
+
+impl Vecs {
+    pub fn forced_import(
+        path: &Path,
+        version: Version,
+        _computation: Computation,
+        format: Format,
+        indexes: &indexes::Vecs,
+        fetched: Option<&fetched::Vecs>,
+        states_path: &Path,
+    ) -> color_eyre::Result<Self> {
+        Ok(Self(
+            UTXOGroups {
+                all: utxo_cohort::Vecs::forced_import(
+                    path,
+                    None,
+                    _computation,
+                    format,
+                    version + VERSION + Version::ZERO,
+                    indexes,
+                    fetched,
+                    states_path,
+                    false,
+                    true,
+                )?,
+                term: ByTerm {
+                    short: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("short_term_holders"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    long: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("long_term_holders"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                },
+                epoch: ByEpoch {
+                    _0: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("epoch_0"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("epoch_1"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _2: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("epoch_2"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _3: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("epoch_3"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _4: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("epoch_4"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                },
+                _type: BySpendableType {
+                    p2pk65: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2pk65"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2pk33: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2pk33"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2pkh: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2pkh"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2sh: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2sh"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2wpkh: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2wpkh"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2wsh: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2wsh"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2tr: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2tr"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2a: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2a"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    p2ms: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("p2ms_outputs"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    empty: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("empty_outputs"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    unknown: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("unknown_outputs"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                },
+                max_age: ByMaxAge {
+                    _1w: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_1w_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_1m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _2m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_2m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _3m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_3m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _4m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_4m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _5m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_5m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _6m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_6m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_1y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _2y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_2y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _3y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_3y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _4y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_4y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _5y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_5y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _6y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_6y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _7y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_7y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _8y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_8y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _10y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_10y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _12y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_12y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _15y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_15y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                },
+                min_age: ByMinAge {
+                    _1d: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1d_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1w: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1w_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _2m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_2m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _3m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_3m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _4m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_4m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _5m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_5m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _6m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_6m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _2y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_2y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _3y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_3y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _4y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_4y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _5y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_5y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _6y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_6y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _7y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_7y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _8y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_8y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _10y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_10y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _12y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_12y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                },
+                age_range: ByAgeRange {
+                    up_to_1d: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_up_to_1d_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1d_to_1w: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1d_up_to_1w_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1w_to_1m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1w_up_to_1m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1m_to_2m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1m_up_to_2m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _2m_to_3m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_2m_up_to_3m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _3m_to_4m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_3m_up_to_4m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _4m_to_5m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_4m_up_to_5m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _5m_to_6m: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_5m_up_to_6m_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _6m_to_1y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_6m_up_to_1y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _1y_to_2y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_1y_up_to_2y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _2y_to_3y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_2y_up_to_3y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _3y_to_4y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_3y_up_to_4y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _4y_to_5y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_4y_up_to_5y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _5y_to_6y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_5y_up_to_6y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _6y_to_7y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_6y_up_to_7y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _7y_to_8y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_7y_up_to_8y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _8y_to_10y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_8y_up_to_10y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _10y_to_12y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_10y_up_to_12y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    _12y_to_15y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_12y_up_to_15y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                    from_15y: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_at_least_15y_old"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        true,
+                    )?,
+                },
+                amount_range: ByAmountRange {
+                    _0sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_with_0sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1sat_to_10sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1sat_under_10sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10sats_to_100sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10sats_under_100sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100sats_to_1k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_100sats_under_1k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1k_sats_to_10k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1k_sats_under_10k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10k_sats_to_100k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10k_sats_under_100k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100k_sats_to_1m_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_100k_sats_under_1m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1m_sats_to_10m_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1m_sats_under_10m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10m_sats_to_1btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10m_sats_under_1btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1btc_to_10btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1btc_under_10btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10btc_to_100btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10btc_under_100btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100btc_to_1k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_100btc_under_1k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1k_btc_to_10k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1k_btc_under_10k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10k_btc_to_100k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10k_btc_under_100k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100k_btc_or_more: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_100k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                },
+                lt_amount: ByLowerThanAmount {
+                    _10sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_10sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_100sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_1k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_10k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_100k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1m_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_1m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10m_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_10m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_1btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_10btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_100btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_1k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_10k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_under_100k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                },
+                ge_amount: ByGreatEqualAmount {
+                    _1sat: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1sat"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_100sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100k_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_100k_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1m_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10m_sats: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10m_sats"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _100btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_100btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _1k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_1k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                    _10k_btc: utxo_cohort::Vecs::forced_import(
+                        path,
+                        Some("utxos_above_10k_btc"),
+                        _computation,
+                        format,
+                        version + VERSION + Version::ZERO,
+                        indexes,
+                        fetched,
+                        states_path,
+                        true,
+                        false,
+                    )?,
+                },
+            }
+            .into(),
+        ))
+    }
+
+    pub fn tick_tock_next_block(&mut self, chain_state: &[BlockState], timestamp: Timestamp) {
+        if chain_state.is_empty() {
+            return;
+        }
+
+        let prev_timestamp = chain_state.last().unwrap().timestamp;
+
+        let mut vecs = self
+            .age_range
+            .as_mut_vec()
+            .into_iter()
+            .map(|(filter, v)| (filter, &mut v.state))
+            .collect::<Vec<_>>();
+
+        let _ = chain_state
+            .iter()
+            .try_for_each(|block_state| -> ControlFlow<()> {
+                let prev_days_old =
+                    prev_timestamp.difference_in_days_between(block_state.timestamp);
+                let days_old = timestamp.difference_in_days_between(block_state.timestamp);
+
+                if prev_days_old == days_old {
+                    return ControlFlow::Continue(());
+                }
+
+                vecs.iter_mut().for_each(|(filter, state)| {
+                    let is = filter.contains(days_old);
+                    let was = filter.contains(prev_days_old);
+
+                    if is && !was {
+                        state.increment(&block_state.supply, block_state.price);
+                    } else if was && !is {
+                        state.decrement(&block_state.supply, block_state.price);
+                    }
+                });
+
+                ControlFlow::Continue(())
+            });
+    }
+
+    pub fn send(
+        &mut self,
+        height_to_sent: BTreeMap<Height, Transacted>,
+        chain_state: &mut [BlockState],
+    ) {
+        let mut time_based_vecs = self
+            .0
+            .age_range
+            .as_mut_vec()
+            .into_iter()
+            .chain(self.0.epoch.as_mut_vec())
+            .collect::<Vec<_>>();
+
+        let last_timestamp = chain_state.last().unwrap().timestamp;
+        let current_price = chain_state.last().unwrap().price;
+
+        height_to_sent.into_iter().for_each(|(height, sent)| {
+            chain_state[height.unwrap_to_usize()].supply -= &sent.spendable_supply;
+
+            let block_state = chain_state.get(height.unwrap_to_usize()).unwrap();
+            let prev_price = block_state.price;
+
+            let blocks_old = chain_state.len() - 1 - height.unwrap_to_usize();
+
+            let days_old = last_timestamp.difference_in_days_between(block_state.timestamp);
+            let days_old_float =
+                last_timestamp.difference_in_days_between_float(block_state.timestamp);
+
+            let older_than_hour = last_timestamp
+                .checked_sub(block_state.timestamp)
+                .unwrap()
+                .is_more_than_hour();
+
+            time_based_vecs
+                .iter_mut()
+                .filter(|(filter, _)| match filter {
+                    GroupFilter::GreaterOrEqual(from) => *from <= days_old,
+                    GroupFilter::LowerThan(to) => *to > days_old,
+                    GroupFilter::Range(range) => range.contains(&days_old),
+                    GroupFilter::Epoch(epoch) => *epoch == HalvingEpoch::from(height),
+                    _ => unreachable!(),
+                })
+                .for_each(|(_, vecs)| {
+                    vecs.state.send(
+                        &sent.spendable_supply,
+                        current_price,
+                        prev_price,
+                        blocks_old,
+                        days_old_float,
+                        older_than_hour,
+                    );
+                });
+
+            sent.by_type.spendable.as_typed_vec().into_iter().for_each(
+                |(output_type, supply_state)| {
+                    self.0._type.get_mut(output_type).1.state.send(
+                        supply_state,
+                        current_price,
+                        prev_price,
+                        blocks_old,
+                        days_old_float,
+                        older_than_hour,
+                    )
+                },
+            );
+
+            sent.by_size_group
+                .as_typed_vec()
+                .into_iter()
+                .for_each(|(group, supply_state)| {
+                    self.0.amount_range.get_mut(group).1.state.send(
+                        supply_state,
+                        current_price,
+                        prev_price,
+                        blocks_old,
+                        days_old_float,
+                        older_than_hour,
+                    );
+                });
+        });
+    }
+
+    pub fn receive(&mut self, received: Transacted, height: Height, price: Option<Dollars>) {
+        let supply_state = received.spendable_supply;
+
+        [
+            &mut self.0.age_range.up_to_1d.1,
+            &mut self.0.epoch.mut_vec_from_height(height).1,
+        ]
+        .into_iter()
+        .for_each(|v| {
+            v.state.receive(&supply_state, price);
+        });
+
+        self._type
+            .as_mut_vec()
+            .into_iter()
+            .for_each(|(filter, vecs)| {
+                let output_type = match filter {
+                    GroupFilter::Type(output_type) => *output_type,
+                    _ => unreachable!(),
+                };
+                vecs.state.receive(received.by_type.get(output_type), price)
+            });
+
+        received
+            .by_size_group
+            .as_typed_vec()
+            .into_iter()
+            .for_each(|(group, supply_state)| {
+                self.amount_range
+                    .get_mut(group)
+                    .1
+                    .state
+                    .receive(supply_state, price);
+            });
+    }
+
+    pub fn compute_overlapping_vecs(
+        &mut self,
+        starting_indexes: &Indexes,
+        exit: &Exit,
+    ) -> Result<()> {
+        let by_date_range = self.0.age_range.as_vec();
+        let by_size_range = self.0.amount_range.as_vec();
+
+        [
+            vec![(&mut self.0.all.1, self.0.epoch.vecs().to_vec())],
+            self.0
+                .min_age
+                .as_mut_vec()
+                .into_iter()
+                .map(|(filter, vecs)| {
+                    (
+                        vecs,
+                        by_date_range
+                            .into_iter()
+                            .filter(|(other, _)| filter.includes(other))
+                            .map(|(_, v)| v)
+                            .collect::<Vec<_>>(),
+                    )
+                })
+                .collect::<Vec<_>>(),
+            self.0
+                .max_age
+                .as_mut_vec()
+                .into_iter()
+                .map(|(filter, vecs)| {
+                    (
+                        vecs,
+                        by_date_range
+                            .into_iter()
+                            .filter(|(other, _)| filter.includes(other))
+                            .map(|(_, v)| v)
+                            .collect::<Vec<_>>(),
+                    )
+                })
+                .collect::<Vec<_>>(),
+            self.0
+                .term
+                .as_mut_vec()
+                .into_iter()
+                .map(|(filter, vecs)| {
+                    (
+                        vecs,
+                        by_date_range
+                            .into_iter()
+                            .filter(|(other, _)| filter.includes(other))
+                            .map(|(_, v)| v)
+                            .collect::<Vec<_>>(),
+                    )
+                })
+                .collect::<Vec<_>>(),
+            self.0
+                .ge_amount
+                .as_mut_vec()
+                .into_iter()
+                .map(|(filter, vecs)| {
+                    (
+                        vecs,
+                        by_size_range
+                            .into_iter()
+                            .filter(|(other, _)| filter.includes(other))
+                            .map(|(_, v)| v)
+                            .collect::<Vec<_>>(),
+                    )
+                })
+                .collect::<Vec<_>>(),
+            self.0
+                .lt_amount
+                .as_mut_vec()
+                .into_iter()
+                .map(|(filter, vecs)| {
+                    (
+                        vecs,
+                        by_size_range
+                            .into_iter()
+                            .filter(|(other, _)| filter.includes(other))
+                            .map(|(_, v)| v)
+                            .collect::<Vec<_>>(),
+                    )
+                })
+                .collect::<Vec<_>>(),
+        ]
+        .into_par_iter()
+        .flatten()
+        .try_for_each(|(vecs, stateful)| {
+            vecs.compute_from_stateful(starting_indexes, &stateful, exit)
+        })
+    }
+
+    pub fn safe_flush_stateful_vecs(&mut self, height: Height, exit: &Exit) -> Result<()> {
+        self.as_mut_separate_vecs()
+            .par_iter_mut()
+            .try_for_each(|(_, v)| v.safe_flush_stateful_vecs(height, exit))
+    }
+}
diff --git a/crates/brk_computer/src/vecs/stateful/withaddressdatasource.rs b/crates/brk_computer/src/vecs/stateful/withaddressdatasource.rs
new file mode 100644
index 000000000..92dcc1b56
--- /dev/null
+++ b/crates/brk_computer/src/vecs/stateful/withaddressdatasource.rs
@@ -0,0 +1,62 @@
+use brk_core::{AddressData, EmptyAddressData};
+
+#[derive(Debug)]
+pub enum WithAddressDataSource<T> {
+    New(T),
+    FromAddressDataStore(T),
+    FromEmptyAddressDataStore(T),
+}
+
+impl<T> WithAddressDataSource<T> {
+    pub fn is_new(&self) -> bool {
+        matches!(self, Self::New(_))
+    }
+
+    pub fn is_from_addressdata(&self) -> bool {
+        matches!(self, Self::FromAddressDataStore(_))
+    }
+
+    pub fn is_from_emptyaddressdata(&self) -> bool {
+        matches!(self, Self::FromEmptyAddressDataStore(_))
+    }
+
+    pub fn deref(&self) -> &T {
+        match self {
+            Self::New(v) => v,
+            Self::FromAddressDataStore(v) => v,
+            Self::FromEmptyAddressDataStore(v) => v,
+        }
+    }
+
+    pub fn deref_mut(&mut self) -> &mut T {
+        match self {
+            Self::New(v) => v,
+            Self::FromAddressDataStore(v) => v,
+            Self::FromEmptyAddressDataStore(v) => v,
+        }
+    }
+}
+
+impl From<WithAddressDataSource<EmptyAddressData>> for WithAddressDataSource<AddressData> {
+    fn from(value: WithAddressDataSource<EmptyAddressData>) -> Self {
+        match value {
+            WithAddressDataSource::New(v) => Self::New(v.into()),
+            WithAddressDataSource::FromAddressDataStore(v) => Self::FromAddressDataStore(v.into()),
+            WithAddressDataSource::FromEmptyAddressDataStore(v) => {
+                Self::FromEmptyAddressDataStore(v.into())
+            }
+        }
+    }
+}
+
+impl From<WithAddressDataSource<AddressData>> for WithAddressDataSource<EmptyAddressData> {
+    fn from(value: WithAddressDataSource<AddressData>) -> Self {
+        match value {
+            WithAddressDataSource::New(v) => Self::New(v.into()),
+            WithAddressDataSource::FromAddressDataStore(v) => Self::FromAddressDataStore(v.into()),
+            WithAddressDataSource::FromEmptyAddressDataStore(v) => {
+                Self::FromEmptyAddressDataStore(v.into())
+            }
+        }
+    }
+}
diff --git a/crates/brk_computer/src/vecs/transactions.rs b/crates/brk_computer/src/vecs/transactions.rs
index aeae9d3a3..d2e008f30 100644
--- a/crates/brk_computer/src/vecs/transactions.rs
+++ b/crates/brk_computer/src/vecs/transactions.rs
@@ -11,11 +11,13 @@ use brk_vec::{
     ComputedVecFrom1, ComputedVecFrom2, ComputedVecFrom3, Format, StoredIndex, VecIterator,
 };
 
+use crate::vecs::grouped::Source;
+
 use super::{
     Indexes, fetched,
     grouped::{
         ComputedValueVecsFromHeight, ComputedValueVecsFromTxindex, ComputedVecsFromHeight,
-        ComputedVecsFromTxindex, StorableVecGeneatorOptions,
+        ComputedVecsFromTxindex, VecBuilderOptions,
     },
     indexes,
 };
@@ -110,13 +112,13 @@ impl Vecs {
                 inputindex_to_outputindex_iter
                     .next_at(index.unwrap_to_usize())
                     .map(|(inputindex, outputindex)| {
-                        let outputindex = outputindex.into_inner();
+                        let outputindex = outputindex.into_owned();
                         if outputindex == OutputIndex::COINBASE {
                             Sats::ZERO
                         } else if let Some((_, value)) =
                             outputindex_to_value_iter.next_at(outputindex.unwrap_to_usize())
                         {
-                            value.into_inner()
+                            value.into_owned()
                         } else {
                             dbg!(inputindex, outputindex);
                             panic!()
@@ -138,12 +140,12 @@ impl Vecs {
                 txindex_to_base_size_iter
                     .next_at(index)
                     .map(|(_, base_size)| {
-                        let base_size = base_size.into_inner();
+                        let base_size = base_size.into_owned();
                         let total_size = txindex_to_total_size_iter
                             .next_at(index)
                             .unwrap()
                             .1
-                            .into_inner();
+                            .into_owned();
 
                         // This is the exact definition of a weight unit, as defined by BIP-141 (quote above).
                         let wu = usize::from(base_size) * 3 + usize::from(total_size);
@@ -164,7 +166,7 @@ impl Vecs {
                 let index = index.unwrap_to_usize();
                 iter.next_at(index).map(|(_, weight)| {
                     StoredUsize::from(
-                        bitcoin::Weight::from(weight.into_inner()).to_vbytes_ceil() as usize
+                        bitcoin::Weight::from(weight.into_owned()).to_vbytes_ceil() as usize
                     )
                 })
             },
@@ -182,12 +184,12 @@ impl Vecs {
                 txindex_to_height_iter
                     .next_at(index.unwrap_to_usize())
                     .map(|(_, height)| {
-                        let height = height.into_inner();
+                        let height = height.into_owned();
                         let txindex = height_to_first_txindex_iter
                             .next_at(height.unwrap_to_usize())
                             .unwrap()
                             .1
-                            .into_inner();
+                            .into_owned();
 
                         index == txindex
                     })
@@ -211,12 +213,12 @@ impl Vecs {
                 txindex_to_first_inputindex_iter
                     .next_at(txindex)
                     .map(|(_, first_index)| {
-                        let first_index = usize::from(first_index.into_inner());
+                        let first_index = usize::from(first_index.into_owned());
                         let count = *txindex_to_input_count_iter
                             .next_at(txindex)
                             .unwrap()
                             .1
-                            .into_inner();
+                            .into_owned();
                         let range = first_index..first_index + count;
                         range.into_iter().fold(Sats::ZERO, |total, inputindex| {
                             total
@@ -224,7 +226,7 @@ impl Vecs {
                                     .next_at(inputindex)
                                     .unwrap()
                                     .1
-                                    .into_inner()
+                                    .into_owned()
                         })
                     })
             },
@@ -237,7 +239,8 @@ impl Vecs {
         //         true,
         //         version + VERSION + Version::ZERO,
         //         format,
-        //         StorableVecGeneatorOptions::default()
+        // computation,
+        // StorableVecGeneatorOptions::default()
         //             .add_average()
         //             .add_sum()
         //             .add_cumulative(),
@@ -260,12 +263,12 @@ impl Vecs {
                 txindex_to_first_outputindex_iter
                     .next_at(txindex)
                     .map(|(_, first_index)| {
-                        let first_index = usize::from(first_index.into_inner());
+                        let first_index = usize::from(first_index.into_owned());
                         let count = *txindex_to_output_count_iter
                             .next_at(txindex)
                             .unwrap()
                             .1
-                            .into_inner();
+                            .into_owned();
                         let range = first_index..first_index + count;
                         range.into_iter().fold(Sats::ZERO, |total, outputindex| {
                             total
@@ -273,7 +276,7 @@ impl Vecs {
                                     .next_at(outputindex)
                                     .unwrap()
                                     .1
-                                    .into_inner()
+                                    .into_owned()
                         })
                     })
             },
@@ -286,7 +289,8 @@ impl Vecs {
         //         true,
         //         version + VERSION + Version::ZERO,
         //         format,
-        //         StorableVecGeneatorOptions::default()
+        // computation,
+        // StorableVecGeneatorOptions::default()
         //             .add_average()
         //             .add_sum()
         //             .add_cumulative(),
@@ -303,12 +307,12 @@ impl Vecs {
             |txindex: TxIndex, input_iter, output_iter| {
                 let txindex = txindex.unwrap_to_usize();
                 input_iter.next_at(txindex).and_then(|(_, value)| {
-                    let input = value.into_inner();
+                    let input = value.into_owned();
                     if input.is_zero() {
                         return Some(Sats::ZERO);
                     }
                     output_iter.next_at(txindex).map(|(_, value)| {
-                        let output = value.into_inner();
+                        let output = value.into_owned();
                         input.checked_sub(output).unwrap()
                     })
                 })
@@ -326,9 +330,9 @@ impl Vecs {
             |txindex: TxIndex, fee_iter, vsize_iter| {
                 let txindex = txindex.unwrap_to_usize();
                 fee_iter.next_at(txindex).and_then(|(_, value)| {
-                    let fee = value.into_inner();
+                    let fee = value.into_owned();
                     vsize_iter.next_at(txindex).map(|(_, value)| {
-                        let vsize = value.into_inner();
+                        let vsize = value.into_owned();
                         Feerate::from((fee, vsize))
                     })
                 })
@@ -339,10 +343,12 @@ impl Vecs {
             indexes_to_tx_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "tx_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -352,10 +358,12 @@ impl Vecs {
             indexes_to_input_count: ComputedVecsFromTxindex::forced_import(
                 path,
                 "input_count",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -365,10 +373,12 @@ impl Vecs {
             indexes_to_output_count: ComputedVecsFromTxindex::forced_import(
                 path,
                 "output_count",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -378,43 +388,43 @@ impl Vecs {
             indexes_to_tx_v1: ComputedVecsFromHeight::forced_import(
                 path,
                 "tx_v1",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_tx_v2: ComputedVecsFromHeight::forced_import(
                 path,
                 "tx_v2",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_tx_v3: ComputedVecsFromHeight::forced_import(
                 path,
                 "tx_v3",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
             )?,
             indexes_to_fee: ComputedValueVecsFromTxindex::forced_import(
                 path,
                 "fee",
                 indexes,
-                Some(txindex_to_fee.boxed_clone()),
+                Source::Vec(txindex_to_fee.boxed_clone()),
                 version + VERSION + Version::ZERO,
                 computation,
                 format,
                 fetched,
-                StorableVecGeneatorOptions::default()
+                VecBuilderOptions::default()
                     .add_sum()
                     .add_cumulative()
                     .add_percentiles()
@@ -424,10 +434,12 @@ impl Vecs {
             indexes_to_feerate: ComputedVecsFromTxindex::forced_import(
                 path,
                 "feerate",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_percentiles()
                     .add_minmax()
                     .add_average(),
@@ -435,10 +447,12 @@ impl Vecs {
             indexes_to_tx_vsize: ComputedVecsFromTxindex::forced_import(
                 path,
                 "tx_vsize",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_percentiles()
                     .add_minmax()
                     .add_average(),
@@ -446,10 +460,12 @@ impl Vecs {
             indexes_to_tx_weight: ComputedVecsFromTxindex::forced_import(
                 path,
                 "tx_weight",
-                false,
+                Source::None,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_percentiles()
                     .add_minmax()
                     .add_average(),
@@ -457,49 +473,55 @@ impl Vecs {
             indexes_to_subsidy: ComputedValueVecsFromHeight::forced_import(
                 path,
                 "subsidy",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                VecBuilderOptions::default()
                     .add_percentiles()
                     .add_sum()
                     .add_cumulative()
                     .add_minmax()
                     .add_average(),
                 compute_dollars,
+                indexes,
             )?,
             indexes_to_coinbase: ComputedValueVecsFromHeight::forced_import(
                 path,
                 "coinbase",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                VecBuilderOptions::default()
                     .add_sum()
                     .add_cumulative()
                     .add_percentiles()
                     .add_minmax()
                     .add_average(),
                 compute_dollars,
+                indexes,
             )?,
             indexes_to_unclaimed_rewards: ComputedValueVecsFromHeight::forced_import(
                 path,
                 "unclaimed_rewards",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
-                    .add_sum()
-                    .add_cumulative(),
+                computation,
+                VecBuilderOptions::default().add_sum().add_cumulative(),
                 compute_dollars,
+                indexes,
             )?,
             indexes_to_p2a_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2a_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -509,10 +531,12 @@ impl Vecs {
             indexes_to_p2ms_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2ms_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -522,10 +546,12 @@ impl Vecs {
             indexes_to_p2pk33_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2pk33_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -535,10 +561,12 @@ impl Vecs {
             indexes_to_p2pk65_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2pk65_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -548,10 +576,12 @@ impl Vecs {
             indexes_to_p2pkh_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2pkh_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -561,10 +591,12 @@ impl Vecs {
             indexes_to_p2sh_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2sh_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -574,10 +606,12 @@ impl Vecs {
             indexes_to_p2tr_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2tr_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -587,10 +621,12 @@ impl Vecs {
             indexes_to_p2wpkh_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2wpkh_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -600,10 +636,12 @@ impl Vecs {
             indexes_to_p2wsh_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "p2wsh_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -613,10 +651,12 @@ impl Vecs {
             indexes_to_opreturn_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "opreturn_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -626,10 +666,12 @@ impl Vecs {
             indexes_to_unknownoutput_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "unknownoutput_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -639,10 +681,12 @@ impl Vecs {
             indexes_to_emptyoutput_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "emptyoutput_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default()
+                computation,
+                indexes,
+                VecBuilderOptions::default()
                     .add_average()
                     .add_minmax()
                     .add_percentiles()
@@ -652,10 +696,12 @@ impl Vecs {
             indexes_to_exact_utxo_count: ComputedVecsFromHeight::forced_import(
                 path,
                 "exact_utxo_count",
-                true,
+                Source::Compute,
                 version + VERSION + Version::ZERO,
                 format,
-                StorableVecGeneatorOptions::default().add_last(),
+                computation,
+                indexes,
+                VecBuilderOptions::default().add_last(),
             )?,
             txindex_to_is_coinbase,
             inputindex_to_value,
diff --git a/crates/brk_core/src/enums/mod.rs b/crates/brk_core/src/enums/mod.rs
deleted file mode 100644
index 9198ca8e0..000000000
--- a/crates/brk_core/src/enums/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod error;
-mod value;
-
-pub use error::*;
-pub use value::*;
diff --git a/crates/brk_core/src/enums/value.rs b/crates/brk_core/src/enums/value.rs
deleted file mode 100644
index 7adaf7bb2..000000000
--- a/crates/brk_core/src/enums/value.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-use std::{fmt::Debug, ops::Deref};
-
-#[derive(Debug, Clone)]
-pub enum Value<'a, T> {
-    Ref(&'a T),
-    Owned(T),
-}
-
-impl<T> Value<'_, T>
-where
-    T: Sized + Debug + Clone,
-{
-    pub fn into_inner(self) -> T {
-        match self {
-            Self::Ref(t) => t.to_owned(),
-            Self::Owned(t) => t,
-        }
-    }
-}
-impl<T> Deref for Value<'_, T> {
-    type Target = T;
-    fn deref(&self) -> &Self::Target {
-        match self {
-            Self::Ref(t) => t,
-            Self::Owned(t) => t,
-        }
-    }
-}
-impl<T> AsRef<T> for Value<'_, T>
-where
-    T: Sized + Debug + Clone,
-{
-    fn as_ref(&self) -> &T {
-        match self {
-            Self::Ref(t) => t,
-            Self::Owned(t) => t,
-        }
-    }
-}
diff --git a/crates/brk_core/src/enums/error.rs b/crates/brk_core/src/error.rs
similarity index 100%
rename from crates/brk_core/src/enums/error.rs
rename to crates/brk_core/src/error.rs
diff --git a/crates/brk_core/src/groups/address.rs b/crates/brk_core/src/groups/address.rs
new file mode 100644
index 000000000..75a193745
--- /dev/null
+++ b/crates/brk_core/src/groups/address.rs
@@ -0,0 +1,55 @@
+use super::{ByAmountRange, ByGreatEqualAmount, ByLowerThanAmount, GroupFilter};
+
+#[derive(Default, Clone)]
+pub struct AddressGroups<T> {
+    pub ge_amount: ByGreatEqualAmount<T>,
+    pub amount_range: ByAmountRange<T>,
+    pub lt_amount: ByLowerThanAmount<T>,
+}
+
+impl<T> AddressGroups<T> {
+    pub fn as_mut_vecs(&mut self) -> Vec<&mut T> {
+        self.ge_amount
+            .as_mut_vec()
+            .into_iter()
+            .chain(self.amount_range.as_mut_vec())
+            .chain(self.lt_amount.as_mut_vec())
+            .collect::<Vec<_>>()
+    }
+
+    pub fn as_mut_separate_vecs(&mut self) -> Vec<&mut T> {
+        self.amount_range
+            .as_mut_vec()
+            .into_iter()
+            .collect::<Vec<_>>()
+    }
+
+    pub fn as_mut_overlapping_vecs(&mut self) -> Vec<&mut T> {
+        self.lt_amount
+            .as_mut_vec()
+            .into_iter()
+            .chain(self.ge_amount.as_mut_vec())
+            .collect::<Vec<_>>()
+    }
+}
+
+impl<T> AddressGroups<(GroupFilter, T)> {
+    pub fn vecs(&self) -> Vec<&T> {
+        self.amount_range
+            .vecs()
+            .into_iter()
+            .chain(self.lt_amount.vecs())
+            .chain(self.ge_amount.vecs())
+            .collect::<Vec<_>>()
+    }
+}
+
+impl<T> From<AddressGroups<T>> for AddressGroups<(GroupFilter, T)> {
+    fn from(value: AddressGroups<T>) -> Self {
+        Self {
+            amount_range: ByAmountRange::from(value.amount_range),
+            lt_amount: ByLowerThanAmount::from(value.lt_amount),
+            ge_amount: ByGreatEqualAmount::from(value.ge_amount),
+        }
+    }
+}
diff --git a/crates/brk_core/src/groups/by_address_type.rs b/crates/brk_core/src/groups/by_address_type.rs
new file mode 100644
index 000000000..394dca645
--- /dev/null
+++ b/crates/brk_core/src/groups/by_address_type.rs
@@ -0,0 +1,169 @@
+use std::{
+    mem,
+    ops::{Add, AddAssign},
+};
+
+use super::GroupFilter;
+use crate::OutputType;
+
+#[derive(Default, Clone, Debug)]
+pub struct ByAddressType<T> {
+    pub p2pk65: T,
+    pub p2pk33: T,
+    pub p2pkh: T,
+    pub p2sh: T,
+    pub p2wpkh: T,
+    pub p2wsh: T,
+    pub p2tr: T,
+    pub p2a: T,
+}
+
+impl<T> ByAddressType<T> {
+    pub fn get(&self, address_type: OutputType) -> Option<&T> {
+        match address_type {
+            OutputType::P2PK65 => Some(&self.p2pk65),
+            OutputType::P2PK33 => Some(&self.p2pk33),
+            OutputType::P2PKH => Some(&self.p2pkh),
+            OutputType::P2SH => Some(&self.p2sh),
+            OutputType::P2WPKH => Some(&self.p2wpkh),
+            OutputType::P2WSH => Some(&self.p2wsh),
+            OutputType::P2TR => Some(&self.p2tr),
+            OutputType::P2A => Some(&self.p2a),
+            _ => None,
+        }
+    }
+
+    pub fn get_mut(&mut self, address_type: OutputType) -> Option<&mut T> {
+        match address_type {
+            OutputType::P2PK65 => Some(&mut self.p2pk65),
+            OutputType::P2PK33 => Some(&mut self.p2pk33),
+            OutputType::P2PKH => Some(&mut self.p2pkh),
+            OutputType::P2SH => Some(&mut self.p2sh),
+            OutputType::P2WPKH => Some(&mut self.p2wpkh),
+            OutputType::P2WSH => Some(&mut self.p2wsh),
+            OutputType::P2TR => Some(&mut self.p2tr),
+            OutputType::P2A => Some(&mut self.p2a),
+            _ => None,
+        }
+    }
+
+    pub fn as_mut_vec(&mut self) -> [&mut T; 8] {
+        [
+            &mut self.p2pk65,
+            &mut self.p2pk33,
+            &mut self.p2pkh,
+            &mut self.p2sh,
+            &mut self.p2wpkh,
+            &mut self.p2wsh,
+            &mut self.p2tr,
+            &mut self.p2a,
+        ]
+    }
+
+    pub fn as_typed_vec(&self) -> [(OutputType, &T); 8] {
+        [
+            (OutputType::P2PK65, &self.p2pk65),
+            (OutputType::P2PK33, &self.p2pk33),
+            (OutputType::P2PKH, &self.p2pkh),
+            (OutputType::P2SH, &self.p2sh),
+            (OutputType::P2WPKH, &self.p2wpkh),
+            (OutputType::P2WSH, &self.p2wsh),
+            (OutputType::P2TR, &self.p2tr),
+            (OutputType::P2A, &self.p2a),
+        ]
+    }
+
+    pub fn as_mut_typed_vec(&mut self) -> [(OutputType, &mut T); 8] {
+        [
+            (OutputType::P2PK65, &mut self.p2pk65),
+            (OutputType::P2PK33, &mut self.p2pk33),
+            (OutputType::P2PKH, &mut self.p2pkh),
+            (OutputType::P2SH, &mut self.p2sh),
+            (OutputType::P2WPKH, &mut self.p2wpkh),
+            (OutputType::P2WSH, &mut self.p2wsh),
+            (OutputType::P2TR, &mut self.p2tr),
+            (OutputType::P2A, &mut self.p2a),
+        ]
+    }
+
+    pub fn into_typed_vec(&mut self) -> [(OutputType, T); 8]
+    where
+        T: Default,
+    {
+        [
+            (OutputType::P2PK65, mem::take(&mut self.p2pk65)),
+            (OutputType::P2PK33, mem::take(&mut self.p2pk33)),
+            (OutputType::P2PKH, mem::take(&mut self.p2pkh)),
+            (OutputType::P2SH, mem::take(&mut self.p2sh)),
+            (OutputType::P2WPKH, mem::take(&mut self.p2wpkh)),
+            (OutputType::P2WSH, mem::take(&mut self.p2wsh)),
+            (OutputType::P2TR, mem::take(&mut self.p2tr)),
+            (OutputType::P2A, mem::take(&mut self.p2a)),
+        ]
+    }
+}
+
+impl<T> ByAddressType<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 8] {
+        [
+            &self.p2pk65.1,
+            &self.p2pk33.1,
+            &self.p2pkh.1,
+            &self.p2sh.1,
+            &self.p2wpkh.1,
+            &self.p2wsh.1,
+            &self.p2tr.1,
+            &self.p2a.1,
+        ]
+    }
+}
+
+impl<T> From<ByAddressType<T>> for ByAddressType<(GroupFilter, T)> {
+    fn from(value: ByAddressType<T>) -> Self {
+        Self {
+            p2pk65: (GroupFilter::Type(OutputType::P2PK65), value.p2pk65),
+            p2pk33: (GroupFilter::Type(OutputType::P2PK33), value.p2pk33),
+            p2pkh: (GroupFilter::Type(OutputType::P2PKH), value.p2pkh),
+            p2sh: (GroupFilter::Type(OutputType::P2SH), value.p2sh),
+            p2wpkh: (GroupFilter::Type(OutputType::P2WPKH), value.p2wpkh),
+            p2wsh: (GroupFilter::Type(OutputType::P2WSH), value.p2wsh),
+            p2tr: (GroupFilter::Type(OutputType::P2TR), value.p2tr),
+            p2a: (GroupFilter::Type(OutputType::P2A), value.p2a),
+        }
+    }
+}
+
+impl<T> Add for ByAddressType<T>
+where
+    T: Add<Output = T>,
+{
+    type Output = Self;
+    fn add(self, rhs: Self) -> Self::Output {
+        Self {
+            p2pk65: self.p2pk65 + rhs.p2pk65,
+            p2pk33: self.p2pk33 + rhs.p2pk33,
+            p2pkh: self.p2pkh + rhs.p2pkh,
+            p2sh: self.p2sh + rhs.p2sh,
+            p2wpkh: self.p2wpkh + rhs.p2wpkh,
+            p2wsh: self.p2wsh + rhs.p2wsh,
+            p2tr: self.p2tr + rhs.p2tr,
+            p2a: self.p2a + rhs.p2a,
+        }
+    }
+}
+
+impl<T> AddAssign for ByAddressType<T>
+where
+    T: AddAssign,
+{
+    fn add_assign(&mut self, rhs: Self) {
+        self.p2pk65 += rhs.p2pk65;
+        self.p2pk33 += rhs.p2pk33;
+        self.p2pkh += rhs.p2pkh;
+        self.p2sh += rhs.p2sh;
+        self.p2wpkh += rhs.p2wpkh;
+        self.p2wsh += rhs.p2wsh;
+        self.p2tr += rhs.p2tr;
+        self.p2a += rhs.p2a;
+    }
+}
diff --git a/crates/brk_core/src/groups/by_age_range.rs b/crates/brk_core/src/groups/by_age_range.rs
new file mode 100644
index 000000000..676cffbbb
--- /dev/null
+++ b/crates/brk_core/src/groups/by_age_range.rs
@@ -0,0 +1,131 @@
+use super::GroupFilter;
+
+#[derive(Default, Clone)]
+pub struct ByAgeRange<T> {
+    pub up_to_1d: T,
+    pub _1d_to_1w: T,
+    pub _1w_to_1m: T,
+    pub _1m_to_2m: T,
+    pub _2m_to_3m: T,
+    pub _3m_to_4m: T,
+    pub _4m_to_5m: T,
+    pub _5m_to_6m: T,
+    pub _6m_to_1y: T,
+    pub _1y_to_2y: T,
+    pub _2y_to_3y: T,
+    pub _3y_to_4y: T,
+    pub _4y_to_5y: T,
+    pub _5y_to_6y: T,
+    pub _6y_to_7y: T,
+    pub _7y_to_8y: T,
+    pub _8y_to_10y: T,
+    pub _10y_to_12y: T,
+    pub _12y_to_15y: T,
+    pub from_15y: T,
+}
+
+impl<T> From<ByAgeRange<T>> for ByAgeRange<(GroupFilter, T)> {
+    fn from(value: ByAgeRange<T>) -> Self {
+        Self {
+            up_to_1d: (GroupFilter::LowerThan(1), value.up_to_1d),
+            _1d_to_1w: (GroupFilter::Range(1..7), value._1d_to_1w),
+            _1w_to_1m: (GroupFilter::Range(7..30), value._1w_to_1m),
+            _1m_to_2m: (GroupFilter::Range(30..2 * 30), value._1m_to_2m),
+            _2m_to_3m: (GroupFilter::Range(2 * 30..3 * 30), value._2m_to_3m),
+            _3m_to_4m: (GroupFilter::Range(3 * 30..4 * 30), value._3m_to_4m),
+            _4m_to_5m: (GroupFilter::Range(4 * 30..5 * 30), value._4m_to_5m),
+            _5m_to_6m: (GroupFilter::Range(5 * 30..6 * 30), value._5m_to_6m),
+            _6m_to_1y: (GroupFilter::Range(6 * 30..365), value._6m_to_1y),
+            _1y_to_2y: (GroupFilter::Range(365..2 * 365), value._1y_to_2y),
+            _2y_to_3y: (GroupFilter::Range(2 * 365..3 * 365), value._2y_to_3y),
+            _3y_to_4y: (GroupFilter::Range(3 * 365..4 * 365), value._3y_to_4y),
+            _4y_to_5y: (GroupFilter::Range(4 * 365..5 * 365), value._4y_to_5y),
+            _5y_to_6y: (GroupFilter::Range(5 * 365..6 * 365), value._5y_to_6y),
+            _6y_to_7y: (GroupFilter::Range(6 * 365..7 * 365), value._6y_to_7y),
+            _7y_to_8y: (GroupFilter::Range(7 * 365..8 * 365), value._7y_to_8y),
+            _8y_to_10y: (GroupFilter::Range(8 * 365..10 * 365), value._8y_to_10y),
+            _10y_to_12y: (GroupFilter::Range(10 * 365..12 * 365), value._10y_to_12y),
+            _12y_to_15y: (GroupFilter::Range(12 * 365..15 * 365), value._12y_to_15y),
+            from_15y: (GroupFilter::GreaterOrEqual(15 * 365), value.from_15y),
+        }
+    }
+}
+
+impl<T> ByAgeRange<T> {
+    pub fn as_vec(&mut self) -> [&T; 20] {
+        [
+            &self.up_to_1d,
+            &self._1d_to_1w,
+            &self._1w_to_1m,
+            &self._1m_to_2m,
+            &self._2m_to_3m,
+            &self._3m_to_4m,
+            &self._4m_to_5m,
+            &self._5m_to_6m,
+            &self._6m_to_1y,
+            &self._1y_to_2y,
+            &self._2y_to_3y,
+            &self._3y_to_4y,
+            &self._4y_to_5y,
+            &self._5y_to_6y,
+            &self._6y_to_7y,
+            &self._7y_to_8y,
+            &self._8y_to_10y,
+            &self._10y_to_12y,
+            &self._12y_to_15y,
+            &self.from_15y,
+        ]
+    }
+
+    pub fn as_mut_vec(&mut self) -> [&mut T; 20] {
+        [
+            &mut self.up_to_1d,
+            &mut self._1d_to_1w,
+            &mut self._1w_to_1m,
+            &mut self._1m_to_2m,
+            &mut self._2m_to_3m,
+            &mut self._3m_to_4m,
+            &mut self._4m_to_5m,
+            &mut self._5m_to_6m,
+            &mut self._6m_to_1y,
+            &mut self._1y_to_2y,
+            &mut self._2y_to_3y,
+            &mut self._3y_to_4y,
+            &mut self._4y_to_5y,
+            &mut self._5y_to_6y,
+            &mut self._6y_to_7y,
+            &mut self._7y_to_8y,
+            &mut self._8y_to_10y,
+            &mut self._10y_to_12y,
+            &mut self._12y_to_15y,
+            &mut self.from_15y,
+        ]
+    }
+}
+
+impl<T> ByAgeRange<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 20] {
+        [
+            &self.up_to_1d.1,
+            &self._1d_to_1w.1,
+            &self._1w_to_1m.1,
+            &self._1m_to_2m.1,
+            &self._2m_to_3m.1,
+            &self._3m_to_4m.1,
+            &self._4m_to_5m.1,
+            &self._5m_to_6m.1,
+            &self._6m_to_1y.1,
+            &self._1y_to_2y.1,
+            &self._2y_to_3y.1,
+            &self._3y_to_4y.1,
+            &self._4y_to_5y.1,
+            &self._5y_to_6y.1,
+            &self._6y_to_7y.1,
+            &self._7y_to_8y.1,
+            &self._8y_to_10y.1,
+            &self._10y_to_12y.1,
+            &self._12y_to_15y.1,
+            &self.from_15y.1,
+        ]
+    }
+}
diff --git a/crates/brk_core/src/groups/by_amount_range.rs b/crates/brk_core/src/groups/by_amount_range.rs
new file mode 100644
index 000000000..6fdd0594d
--- /dev/null
+++ b/crates/brk_core/src/groups/by_amount_range.rs
@@ -0,0 +1,257 @@
+use std::ops::{Add, AddAssign};
+
+use crate::Sats;
+
+use super::GroupFilter;
+
+#[derive(Debug, Default, Clone)]
+pub struct ByAmountRange<T> {
+    pub _0sats: T,
+    pub _1sat_to_10sats: T,
+    pub _10sats_to_100sats: T,
+    pub _100sats_to_1k_sats: T,
+    pub _1k_sats_to_10k_sats: T,
+    pub _10k_sats_to_100k_sats: T,
+    pub _100k_sats_to_1m_sats: T,
+    pub _1m_sats_to_10m_sats: T,
+    pub _10m_sats_to_1btc: T,
+    pub _1btc_to_10btc: T,
+    pub _10btc_to_100btc: T,
+    pub _100btc_to_1k_btc: T,
+    pub _1k_btc_to_10k_btc: T,
+    pub _10k_btc_to_100k_btc: T,
+    pub _100k_btc_or_more: T,
+}
+
+impl<T> From<ByAmountRange<T>> for ByAmountRange<(GroupFilter, T)> {
+    fn from(value: ByAmountRange<T>) -> Self {
+        #[allow(clippy::inconsistent_digit_grouping)]
+        Self {
+            _0sats: (GroupFilter::LowerThan(Sats::_1.into()), value._0sats),
+            _1sat_to_10sats: (
+                GroupFilter::Range(Sats::_1.into()..Sats::_10.into()),
+                value._1sat_to_10sats,
+            ),
+            _10sats_to_100sats: (
+                GroupFilter::Range(Sats::_10.into()..Sats::_100.into()),
+                value._10sats_to_100sats,
+            ),
+            _100sats_to_1k_sats: (
+                GroupFilter::Range(Sats::_100.into()..Sats::_1K.into()),
+                value._100sats_to_1k_sats,
+            ),
+            _1k_sats_to_10k_sats: (
+                GroupFilter::Range(Sats::_1K.into()..Sats::_10K.into()),
+                value._1k_sats_to_10k_sats,
+            ),
+            _10k_sats_to_100k_sats: (
+                GroupFilter::Range(Sats::_10K.into()..Sats::_100K.into()),
+                value._10k_sats_to_100k_sats,
+            ),
+            _100k_sats_to_1m_sats: (
+                GroupFilter::Range(Sats::_100K.into()..Sats::_1M.into()),
+                value._100k_sats_to_1m_sats,
+            ),
+            _1m_sats_to_10m_sats: (
+                GroupFilter::Range(Sats::_1M.into()..Sats::_10M.into()),
+                value._1m_sats_to_10m_sats,
+            ),
+            _10m_sats_to_1btc: (
+                GroupFilter::Range(Sats::_10M.into()..Sats::_1BTC.into()),
+                value._10m_sats_to_1btc,
+            ),
+            _1btc_to_10btc: (
+                GroupFilter::Range(Sats::_1BTC.into()..Sats::_10BTC.into()),
+                value._1btc_to_10btc,
+            ),
+            _10btc_to_100btc: (
+                GroupFilter::Range(Sats::_10BTC.into()..Sats::_100BTC.into()),
+                value._10btc_to_100btc,
+            ),
+            _100btc_to_1k_btc: (
+                GroupFilter::Range(Sats::_100BTC.into()..Sats::_1K_BTC.into()),
+                value._100btc_to_1k_btc,
+            ),
+            _1k_btc_to_10k_btc: (
+                GroupFilter::Range(Sats::_1K_BTC.into()..Sats::_10K_BTC.into()),
+                value._1k_btc_to_10k_btc,
+            ),
+            _10k_btc_to_100k_btc: (
+                GroupFilter::Range(Sats::_10K_BTC.into()..Sats::_100K_BTC.into()),
+                value._10k_btc_to_100k_btc,
+            ),
+            _100k_btc_or_more: (
+                GroupFilter::GreaterOrEqual(Sats::_100K_BTC.into()),
+                value._100k_btc_or_more,
+            ),
+        }
+    }
+}
+
+impl<T> ByAmountRange<T> {
+    #[allow(clippy::inconsistent_digit_grouping)]
+    pub fn get_mut(&mut self, value: Sats) -> &mut T {
+        if value == Sats::ZERO {
+            &mut self._0sats
+        } else if value < Sats::_10 {
+            &mut self._1sat_to_10sats
+        } else if value < Sats::_100 {
+            &mut self._10sats_to_100sats
+        } else if value < Sats::_1K {
+            &mut self._100sats_to_1k_sats
+        } else if value < Sats::_10K {
+            &mut self._1k_sats_to_10k_sats
+        } else if value < Sats::_100K {
+            &mut self._10k_sats_to_100k_sats
+        } else if value < Sats::_1M {
+            &mut self._100k_sats_to_1m_sats
+        } else if value < Sats::_10M {
+            &mut self._1m_sats_to_10m_sats
+        } else if value < Sats::_1BTC {
+            &mut self._10m_sats_to_1btc
+        } else if value < Sats::_10BTC {
+            &mut self._1btc_to_10btc
+        } else if value < Sats::_100BTC {
+            &mut self._10btc_to_100btc
+        } else if value < Sats::_1K_BTC {
+            &mut self._100btc_to_1k_btc
+        } else if value < Sats::_10K_BTC {
+            &mut self._1k_btc_to_10k_btc
+        } else if value < Sats::_100K_BTC {
+            &mut self._10k_btc_to_100k_btc
+        } else {
+            &mut self._100k_btc_or_more
+        }
+    }
+
+    pub fn as_vec(&self) -> [&T; 15] {
+        [
+            &self._0sats,
+            &self._1sat_to_10sats,
+            &self._10sats_to_100sats,
+            &self._100sats_to_1k_sats,
+            &self._1k_sats_to_10k_sats,
+            &self._10k_sats_to_100k_sats,
+            &self._100k_sats_to_1m_sats,
+            &self._1m_sats_to_10m_sats,
+            &self._10m_sats_to_1btc,
+            &self._1btc_to_10btc,
+            &self._10btc_to_100btc,
+            &self._100btc_to_1k_btc,
+            &self._1k_btc_to_10k_btc,
+            &self._10k_btc_to_100k_btc,
+            &self._100k_btc_or_more,
+        ]
+    }
+
+    pub fn as_typed_vec(&self) -> [(Sats, &T); 15] {
+        [
+            (Sats::ZERO, &self._0sats),
+            (Sats::_1, &self._1sat_to_10sats),
+            (Sats::_10, &self._10sats_to_100sats),
+            (Sats::_100, &self._100sats_to_1k_sats),
+            (Sats::_1K, &self._1k_sats_to_10k_sats),
+            (Sats::_10K, &self._10k_sats_to_100k_sats),
+            (Sats::_100K, &self._100k_sats_to_1m_sats),
+            (Sats::_1M, &self._1m_sats_to_10m_sats),
+            (Sats::_10M, &self._10m_sats_to_1btc),
+            (Sats::_1BTC, &self._1btc_to_10btc),
+            (Sats::_10BTC, &self._10btc_to_100btc),
+            (Sats::_100BTC, &self._100btc_to_1k_btc),
+            (Sats::_1K_BTC, &self._1k_btc_to_10k_btc),
+            (Sats::_10K_BTC, &self._10k_btc_to_100k_btc),
+            (Sats::_100K_BTC, &self._100k_btc_or_more),
+        ]
+    }
+
+    pub fn as_mut_vec(&mut self) -> [&mut T; 15] {
+        [
+            &mut self._0sats,
+            &mut self._1sat_to_10sats,
+            &mut self._10sats_to_100sats,
+            &mut self._100sats_to_1k_sats,
+            &mut self._1k_sats_to_10k_sats,
+            &mut self._10k_sats_to_100k_sats,
+            &mut self._100k_sats_to_1m_sats,
+            &mut self._1m_sats_to_10m_sats,
+            &mut self._10m_sats_to_1btc,
+            &mut self._1btc_to_10btc,
+            &mut self._10btc_to_100btc,
+            &mut self._100btc_to_1k_btc,
+            &mut self._1k_btc_to_10k_btc,
+            &mut self._10k_btc_to_100k_btc,
+            &mut self._100k_btc_or_more,
+        ]
+    }
+}
+
+impl<T> ByAmountRange<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 15] {
+        [
+            &self._0sats.1,
+            &self._1sat_to_10sats.1,
+            &self._10sats_to_100sats.1,
+            &self._100sats_to_1k_sats.1,
+            &self._1k_sats_to_10k_sats.1,
+            &self._10k_sats_to_100k_sats.1,
+            &self._100k_sats_to_1m_sats.1,
+            &self._1m_sats_to_10m_sats.1,
+            &self._10m_sats_to_1btc.1,
+            &self._1btc_to_10btc.1,
+            &self._10btc_to_100btc.1,
+            &self._100btc_to_1k_btc.1,
+            &self._1k_btc_to_10k_btc.1,
+            &self._10k_btc_to_100k_btc.1,
+            &self._100k_btc_or_more.1,
+        ]
+    }
+}
+
+impl<T> Add for ByAmountRange<T>
+where
+    T: Add<Output = T>,
+{
+    type Output = Self;
+    fn add(self, rhs: Self) -> Self::Output {
+        Self {
+            _0sats: self._0sats + rhs._0sats,
+            _1sat_to_10sats: self._1sat_to_10sats + rhs._1sat_to_10sats,
+            _10sats_to_100sats: self._10sats_to_100sats + rhs._10sats_to_100sats,
+            _100sats_to_1k_sats: self._100sats_to_1k_sats + rhs._100sats_to_1k_sats,
+            _1k_sats_to_10k_sats: self._1k_sats_to_10k_sats + rhs._1k_sats_to_10k_sats,
+            _10k_sats_to_100k_sats: self._10k_sats_to_100k_sats + rhs._10k_sats_to_100k_sats,
+            _100k_sats_to_1m_sats: self._100k_sats_to_1m_sats + rhs._100k_sats_to_1m_sats,
+            _1m_sats_to_10m_sats: self._1m_sats_to_10m_sats + rhs._1m_sats_to_10m_sats,
+            _10m_sats_to_1btc: self._10m_sats_to_1btc + rhs._10m_sats_to_1btc,
+            _1btc_to_10btc: self._1btc_to_10btc + rhs._1btc_to_10btc,
+            _10btc_to_100btc: self._10btc_to_100btc + rhs._10btc_to_100btc,
+            _100btc_to_1k_btc: self._100btc_to_1k_btc + rhs._100btc_to_1k_btc,
+            _1k_btc_to_10k_btc: self._1k_btc_to_10k_btc + rhs._1k_btc_to_10k_btc,
+            _10k_btc_to_100k_btc: self._10k_btc_to_100k_btc + rhs._10k_btc_to_100k_btc,
+            _100k_btc_or_more: self._100k_btc_or_more + rhs._100k_btc_or_more,
+        }
+    }
+}
+
+impl<T> AddAssign for ByAmountRange<T>
+where
+    T: AddAssign,
+{
+    fn add_assign(&mut self, rhs: Self) {
+        self._0sats += rhs._0sats;
+        self._1sat_to_10sats += rhs._1sat_to_10sats;
+        self._10sats_to_100sats += rhs._10sats_to_100sats;
+        self._100sats_to_1k_sats += rhs._100sats_to_1k_sats;
+        self._1k_sats_to_10k_sats += rhs._1k_sats_to_10k_sats;
+        self._10k_sats_to_100k_sats += rhs._10k_sats_to_100k_sats;
+        self._100k_sats_to_1m_sats += rhs._100k_sats_to_1m_sats;
+        self._1m_sats_to_10m_sats += rhs._1m_sats_to_10m_sats;
+        self._10m_sats_to_1btc += rhs._10m_sats_to_1btc;
+        self._1btc_to_10btc += rhs._1btc_to_10btc;
+        self._10btc_to_100btc += rhs._10btc_to_100btc;
+        self._100btc_to_1k_btc += rhs._100btc_to_1k_btc;
+        self._1k_btc_to_10k_btc += rhs._1k_btc_to_10k_btc;
+        self._10k_btc_to_100k_btc += rhs._10k_btc_to_100k_btc;
+        self._100k_btc_or_more += rhs._100k_btc_or_more;
+    }
+}
diff --git a/crates/brk_state/src/outputs/by_epoch.rs b/crates/brk_core/src/groups/by_epoch.rs
similarity index 61%
rename from crates/brk_state/src/outputs/by_epoch.rs
rename to crates/brk_core/src/groups/by_epoch.rs
index 46e511bc9..4132fdace 100644
--- a/crates/brk_state/src/outputs/by_epoch.rs
+++ b/crates/brk_core/src/groups/by_epoch.rs
@@ -1,9 +1,9 @@
-use brk_core::{HalvingEpoch, Height};
+use crate::{HalvingEpoch, Height};
 
-use super::OutputFilter;
+use super::GroupFilter;
 
 #[derive(Default, Clone)]
-pub struct OutputsByEpoch<T> {
+pub struct ByEpoch<T> {
     pub _0: T,
     pub _1: T,
     pub _2: T,
@@ -11,19 +11,19 @@ pub struct OutputsByEpoch<T> {
     pub _4: T,
 }
 
-impl<T> From<OutputsByEpoch<T>> for OutputsByEpoch<(OutputFilter, T)> {
-    fn from(value: OutputsByEpoch<T>) -> Self {
+impl<T> From<ByEpoch<T>> for ByEpoch<(GroupFilter, T)> {
+    fn from(value: ByEpoch<T>) -> Self {
         Self {
-            _0: (OutputFilter::Epoch(HalvingEpoch::new(0)), value._0),
-            _1: (OutputFilter::Epoch(HalvingEpoch::new(1)), value._1),
-            _2: (OutputFilter::Epoch(HalvingEpoch::new(2)), value._2),
-            _3: (OutputFilter::Epoch(HalvingEpoch::new(3)), value._3),
-            _4: (OutputFilter::Epoch(HalvingEpoch::new(4)), value._4),
+            _0: (GroupFilter::Epoch(HalvingEpoch::new(0)), value._0),
+            _1: (GroupFilter::Epoch(HalvingEpoch::new(1)), value._1),
+            _2: (GroupFilter::Epoch(HalvingEpoch::new(2)), value._2),
+            _3: (GroupFilter::Epoch(HalvingEpoch::new(3)), value._3),
+            _4: (GroupFilter::Epoch(HalvingEpoch::new(4)), value._4),
         }
     }
 }
 
-impl<T> OutputsByEpoch<T> {
+impl<T> ByEpoch<T> {
     pub fn as_mut_vec(&mut self) -> [&mut T; 5] {
         [
             &mut self._0,
@@ -52,7 +52,7 @@ impl<T> OutputsByEpoch<T> {
     }
 }
 
-impl<T> OutputsByEpoch<(OutputFilter, T)> {
+impl<T> ByEpoch<(GroupFilter, T)> {
     pub fn vecs(&self) -> [&T; 5] {
         [&self._0.1, &self._1.1, &self._2.1, &self._3.1, &self._4.1]
     }
diff --git a/crates/brk_core/src/groups/by_ge_amount.rs b/crates/brk_core/src/groups/by_ge_amount.rs
new file mode 100644
index 000000000..d358dec17
--- /dev/null
+++ b/crates/brk_core/src/groups/by_ge_amount.rs
@@ -0,0 +1,110 @@
+use crate::Sats;
+
+use super::GroupFilter;
+
+#[derive(Default, Clone)]
+pub struct ByGreatEqualAmount<T> {
+    pub _1sat: T,
+    pub _10sats: T,
+    pub _100sats: T,
+    pub _1k_sats: T,
+    pub _10k_sats: T,
+    pub _100k_sats: T,
+    pub _1m_sats: T,
+    pub _10m_sats: T,
+    pub _1btc: T,
+    pub _10btc: T,
+    pub _100btc: T,
+    pub _1k_btc: T,
+    pub _10k_btc: T,
+}
+
+impl<T> ByGreatEqualAmount<T> {
+    pub fn as_mut_vec(&mut self) -> [&mut T; 13] {
+        [
+            &mut self._1sat,
+            &mut self._10sats,
+            &mut self._100sats,
+            &mut self._1k_sats,
+            &mut self._10k_sats,
+            &mut self._100k_sats,
+            &mut self._1m_sats,
+            &mut self._10m_sats,
+            &mut self._1btc,
+            &mut self._10btc,
+            &mut self._100btc,
+            &mut self._1k_btc,
+            &mut self._10k_btc,
+        ]
+    }
+}
+
+impl<T> ByGreatEqualAmount<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 13] {
+        [
+            &self._1sat.1,
+            &self._10sats.1,
+            &self._100sats.1,
+            &self._1k_sats.1,
+            &self._10k_sats.1,
+            &self._100k_sats.1,
+            &self._1m_sats.1,
+            &self._10m_sats.1,
+            &self._1btc.1,
+            &self._10btc.1,
+            &self._100btc.1,
+            &self._1k_btc.1,
+            &self._10k_btc.1,
+        ]
+    }
+}
+
+impl<T> From<ByGreatEqualAmount<T>> for ByGreatEqualAmount<(GroupFilter, T)> {
+    fn from(value: ByGreatEqualAmount<T>) -> Self {
+        Self {
+            _1sat: (GroupFilter::GreaterOrEqual(Sats::_1.into()), value._1sat),
+            _10sats: (GroupFilter::GreaterOrEqual(Sats::_10.into()), value._10sats),
+            _100sats: (
+                GroupFilter::GreaterOrEqual(Sats::_100.into()),
+                value._100sats,
+            ),
+            _1k_sats: (
+                GroupFilter::GreaterOrEqual(Sats::_1K.into()),
+                value._1k_sats,
+            ),
+            _10k_sats: (
+                GroupFilter::GreaterOrEqual(Sats::_10K.into()),
+                value._10k_sats,
+            ),
+            _100k_sats: (
+                GroupFilter::GreaterOrEqual(Sats::_100K.into()),
+                value._100k_sats,
+            ),
+            _1m_sats: (
+                GroupFilter::GreaterOrEqual(Sats::_1M.into()),
+                value._1m_sats,
+            ),
+            _10m_sats: (
+                GroupFilter::GreaterOrEqual(Sats::_10M.into()),
+                value._10m_sats,
+            ),
+            _1btc: (GroupFilter::GreaterOrEqual(Sats::_1BTC.into()), value._1btc),
+            _10btc: (
+                GroupFilter::GreaterOrEqual(Sats::_10BTC.into()),
+                value._10btc,
+            ),
+            _100btc: (
+                GroupFilter::GreaterOrEqual(Sats::_100BTC.into()),
+                value._100btc,
+            ),
+            _1k_btc: (
+                GroupFilter::GreaterOrEqual(Sats::_1K_BTC.into()),
+                value._1k_btc,
+            ),
+            _10k_btc: (
+                GroupFilter::GreaterOrEqual(Sats::_10K_BTC.into()),
+                value._10k_btc,
+            ),
+        }
+    }
+}
diff --git a/crates/brk_core/src/groups/by_lt_amount.rs b/crates/brk_core/src/groups/by_lt_amount.rs
new file mode 100644
index 000000000..8fc2191fe
--- /dev/null
+++ b/crates/brk_core/src/groups/by_lt_amount.rs
@@ -0,0 +1,86 @@
+use crate::Sats;
+
+use super::GroupFilter;
+
+#[derive(Default, Clone)]
+pub struct ByLowerThanAmount<T> {
+    pub _10sats: T,
+    pub _100sats: T,
+    pub _1k_sats: T,
+    pub _10k_sats: T,
+    pub _100k_sats: T,
+    pub _1m_sats: T,
+    pub _10m_sats: T,
+    pub _1btc: T,
+    pub _10btc: T,
+    pub _100btc: T,
+    pub _1k_btc: T,
+    pub _10k_btc: T,
+    pub _100k_btc: T,
+}
+
+impl<T> ByLowerThanAmount<T> {
+    pub fn as_mut_vec(&mut self) -> [&mut T; 13] {
+        [
+            &mut self._10sats,
+            &mut self._100sats,
+            &mut self._1k_sats,
+            &mut self._10k_sats,
+            &mut self._100k_sats,
+            &mut self._1m_sats,
+            &mut self._10m_sats,
+            &mut self._1btc,
+            &mut self._10btc,
+            &mut self._100btc,
+            &mut self._1k_btc,
+            &mut self._10k_btc,
+            &mut self._100k_btc,
+        ]
+    }
+}
+
+impl<T> ByLowerThanAmount<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 13] {
+        [
+            &self._10sats.1,
+            &self._100sats.1,
+            &self._1k_sats.1,
+            &self._10k_sats.1,
+            &self._100k_sats.1,
+            &self._1m_sats.1,
+            &self._10m_sats.1,
+            &self._1btc.1,
+            &self._10btc.1,
+            &self._100btc.1,
+            &self._1k_btc.1,
+            &self._10k_btc.1,
+            &self._100k_btc.1,
+        ]
+    }
+}
+
+impl<T> From<ByLowerThanAmount<T>> for ByLowerThanAmount<(GroupFilter, T)> {
+    fn from(value: ByLowerThanAmount<T>) -> Self {
+        Self {
+            _10sats: (GroupFilter::LowerThan(Sats::_10.into()), value._10sats),
+            _100sats: (GroupFilter::LowerThan(Sats::_100.into()), value._100sats),
+            _1k_sats: (GroupFilter::LowerThan(Sats::_1K.into()), value._1k_sats),
+            _10k_sats: (GroupFilter::LowerThan(Sats::_10K.into()), value._10k_sats),
+            _100k_sats: (GroupFilter::LowerThan(Sats::_100K.into()), value._100k_sats),
+            _1m_sats: (GroupFilter::LowerThan(Sats::_1M.into()), value._1m_sats),
+            _10m_sats: (GroupFilter::LowerThan(Sats::_10M.into()), value._10m_sats),
+            _1btc: (GroupFilter::LowerThan(Sats::_1BTC.into()), value._1btc),
+            _10btc: (GroupFilter::LowerThan(Sats::_10BTC.into()), value._10btc),
+            _100btc: (GroupFilter::LowerThan(Sats::_100BTC.into()), value._100btc),
+            _1k_btc: (GroupFilter::LowerThan(Sats::_1K_BTC.into()), value._1k_btc),
+            _10k_btc: (
+                GroupFilter::LowerThan(Sats::_10K_BTC.into()),
+                value._10k_btc,
+            ),
+            _100k_btc: (
+                GroupFilter::LowerThan(Sats::_100K_BTC.into()),
+                value._100k_btc,
+            ),
+        }
+    }
+}
diff --git a/crates/brk_core/src/groups/by_max_age.rs b/crates/brk_core/src/groups/by_max_age.rs
new file mode 100644
index 000000000..225844fc7
--- /dev/null
+++ b/crates/brk_core/src/groups/by_max_age.rs
@@ -0,0 +1,98 @@
+use super::GroupFilter;
+
+#[derive(Default, Clone)]
+pub struct ByMaxAge<T> {
+    pub _1w: T,
+    pub _1m: T,
+    pub _2m: T,
+    pub _3m: T,
+    pub _4m: T,
+    pub _5m: T,
+    pub _6m: T,
+    pub _1y: T,
+    pub _2y: T,
+    pub _3y: T,
+    pub _4y: T,
+    pub _5y: T,
+    pub _6y: T,
+    pub _7y: T,
+    pub _8y: T,
+    pub _10y: T,
+    pub _12y: T,
+    pub _15y: T,
+}
+
+impl<T> ByMaxAge<T> {
+    pub fn as_mut_vec(&mut self) -> [&mut T; 18] {
+        [
+            &mut self._1w,
+            &mut self._1m,
+            &mut self._2m,
+            &mut self._3m,
+            &mut self._4m,
+            &mut self._5m,
+            &mut self._6m,
+            &mut self._1y,
+            &mut self._2y,
+            &mut self._3y,
+            &mut self._4y,
+            &mut self._5y,
+            &mut self._6y,
+            &mut self._7y,
+            &mut self._8y,
+            &mut self._10y,
+            &mut self._12y,
+            &mut self._15y,
+        ]
+    }
+}
+
+impl<T> ByMaxAge<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 18] {
+        [
+            &self._1w.1,
+            &self._1m.1,
+            &self._2m.1,
+            &self._3m.1,
+            &self._4m.1,
+            &self._5m.1,
+            &self._6m.1,
+            &self._1y.1,
+            &self._2y.1,
+            &self._3y.1,
+            &self._4y.1,
+            &self._5y.1,
+            &self._6y.1,
+            &self._7y.1,
+            &self._8y.1,
+            &self._10y.1,
+            &self._12y.1,
+            &self._15y.1,
+        ]
+    }
+}
+
+impl<T> From<ByMaxAge<T>> for ByMaxAge<(GroupFilter, T)> {
+    fn from(value: ByMaxAge<T>) -> Self {
+        Self {
+            _1w: (GroupFilter::LowerThan(7), value._1w),
+            _1m: (GroupFilter::LowerThan(30), value._1m),
+            _2m: (GroupFilter::LowerThan(2 * 30), value._2m),
+            _3m: (GroupFilter::LowerThan(3 * 30), value._3m),
+            _4m: (GroupFilter::LowerThan(4 * 30), value._4m),
+            _5m: (GroupFilter::LowerThan(5 * 30), value._5m),
+            _6m: (GroupFilter::LowerThan(6 * 30), value._6m),
+            _1y: (GroupFilter::LowerThan(365), value._1y),
+            _2y: (GroupFilter::LowerThan(2 * 365), value._2y),
+            _3y: (GroupFilter::LowerThan(3 * 365), value._3y),
+            _4y: (GroupFilter::LowerThan(4 * 365), value._4y),
+            _5y: (GroupFilter::LowerThan(5 * 365), value._5y),
+            _6y: (GroupFilter::LowerThan(6 * 365), value._6y),
+            _7y: (GroupFilter::LowerThan(7 * 365), value._7y),
+            _8y: (GroupFilter::LowerThan(8 * 365), value._8y),
+            _10y: (GroupFilter::LowerThan(10 * 365), value._10y),
+            _12y: (GroupFilter::LowerThan(12 * 365), value._12y),
+            _15y: (GroupFilter::LowerThan(15 * 365), value._15y),
+        }
+    }
+}
diff --git a/crates/brk_core/src/groups/by_min_age.rs b/crates/brk_core/src/groups/by_min_age.rs
new file mode 100644
index 000000000..6a02fb96f
--- /dev/null
+++ b/crates/brk_core/src/groups/by_min_age.rs
@@ -0,0 +1,98 @@
+use super::GroupFilter;
+
+#[derive(Default, Clone)]
+pub struct ByMinAge<T> {
+    pub _1d: T,
+    pub _1w: T,
+    pub _1m: T,
+    pub _2m: T,
+    pub _3m: T,
+    pub _4m: T,
+    pub _5m: T,
+    pub _6m: T,
+    pub _1y: T,
+    pub _2y: T,
+    pub _3y: T,
+    pub _4y: T,
+    pub _5y: T,
+    pub _6y: T,
+    pub _7y: T,
+    pub _8y: T,
+    pub _10y: T,
+    pub _12y: T,
+}
+
+impl<T> ByMinAge<T> {
+    pub fn as_mut_vec(&mut self) -> [&mut T; 18] {
+        [
+            &mut self._1d,
+            &mut self._1w,
+            &mut self._1m,
+            &mut self._2m,
+            &mut self._3m,
+            &mut self._4m,
+            &mut self._5m,
+            &mut self._6m,
+            &mut self._1y,
+            &mut self._2y,
+            &mut self._3y,
+            &mut self._4y,
+            &mut self._5y,
+            &mut self._6y,
+            &mut self._7y,
+            &mut self._8y,
+            &mut self._10y,
+            &mut self._12y,
+        ]
+    }
+}
+
+impl<T> ByMinAge<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 18] {
+        [
+            &self._1d.1,
+            &self._1w.1,
+            &self._1m.1,
+            &self._2m.1,
+            &self._3m.1,
+            &self._4m.1,
+            &self._5m.1,
+            &self._6m.1,
+            &self._1y.1,
+            &self._2y.1,
+            &self._3y.1,
+            &self._4y.1,
+            &self._5y.1,
+            &self._6y.1,
+            &self._7y.1,
+            &self._8y.1,
+            &self._10y.1,
+            &self._12y.1,
+        ]
+    }
+}
+
+impl<T> From<ByMinAge<T>> for ByMinAge<(GroupFilter, T)> {
+    fn from(value: ByMinAge<T>) -> Self {
+        Self {
+            _1d: (GroupFilter::GreaterOrEqual(1), value._1d),
+            _1w: (GroupFilter::GreaterOrEqual(7), value._1w),
+            _1m: (GroupFilter::GreaterOrEqual(30), value._1m),
+            _2m: (GroupFilter::GreaterOrEqual(2 * 30), value._2m),
+            _3m: (GroupFilter::GreaterOrEqual(3 * 30), value._3m),
+            _4m: (GroupFilter::GreaterOrEqual(4 * 30), value._4m),
+            _5m: (GroupFilter::GreaterOrEqual(5 * 30), value._5m),
+            _6m: (GroupFilter::GreaterOrEqual(6 * 30), value._6m),
+            _1y: (GroupFilter::GreaterOrEqual(365), value._1y),
+            _2y: (GroupFilter::GreaterOrEqual(2 * 365), value._2y),
+            _3y: (GroupFilter::GreaterOrEqual(3 * 365), value._3y),
+            _4y: (GroupFilter::GreaterOrEqual(4 * 365), value._4y),
+            _5y: (GroupFilter::GreaterOrEqual(5 * 365), value._5y),
+            _6y: (GroupFilter::GreaterOrEqual(6 * 365), value._6y),
+            _7y: (GroupFilter::GreaterOrEqual(7 * 365), value._7y),
+            _8y: (GroupFilter::GreaterOrEqual(8 * 365), value._8y),
+            _10y: (GroupFilter::GreaterOrEqual(10 * 365), value._10y),
+            _12y: (GroupFilter::GreaterOrEqual(12 * 365), value._12y),
+        }
+    }
+}
diff --git a/crates/brk_state/src/outputs/by_spendable_type.rs b/crates/brk_core/src/groups/by_spendable_type.rs
similarity index 59%
rename from crates/brk_state/src/outputs/by_spendable_type.rs
rename to crates/brk_core/src/groups/by_spendable_type.rs
index 9f404a103..c97042b19 100644
--- a/crates/brk_state/src/outputs/by_spendable_type.rs
+++ b/crates/brk_core/src/groups/by_spendable_type.rs
@@ -1,11 +1,11 @@
 use std::ops::{Add, AddAssign};
 
-use brk_core::OutputType;
+use crate::OutputType;
 
-use super::OutputFilter;
+use super::GroupFilter;
 
 #[derive(Default, Clone, Debug)]
-pub struct OutputsBySpendableType<T> {
+pub struct BySpendableType<T> {
     pub p2pk65: T,
     pub p2pk33: T,
     pub p2pkh: T,
@@ -19,24 +19,7 @@ pub struct OutputsBySpendableType<T> {
     pub empty: T,
 }
 
-impl<T> OutputsBySpendableType<T> {
-    // pub fn get(&self, output_type: OutputType) -> &T {
-    //     match output_type {
-    //         OutputType::P2PK65 => &self.p2pk65,
-    //         OutputType::P2PK33 => &self.p2pk33,
-    //         OutputType::P2PKH => &self.p2pkh,
-    //         OutputType::P2MS => &self.p2ms,
-    //         OutputType::P2SH => &self.p2sh,
-    //         OutputType::P2WPKH => &self.p2wpkh,
-    //         OutputType::P2WSH => &self.p2wsh,
-    //         OutputType::P2TR => &self.p2tr,
-    //         OutputType::P2A => &self.p2a,
-    //         OutputType::Unknown => &self.unknown,
-    //         OutputType::Empty => &self.empty,
-    //         _ => unreachable!(),
-    //     }
-    // }
-
+impl<T> BySpendableType<T> {
     pub fn get_mut(&mut self, output_type: OutputType) -> &mut T {
         match output_type {
             OutputType::P2PK65 => &mut self.p2pk65,
@@ -54,22 +37,6 @@ impl<T> OutputsBySpendableType<T> {
         }
     }
 
-    // pub fn as_vec(&self) -> [&T; 11] {
-    //     [
-    //         &self.p2pk65,
-    //         &self.p2pk33,
-    //         &self.p2pkh,
-    //         &self.p2ms,
-    //         &self.p2sh,
-    //         &self.p2wpkh,
-    //         &self.p2wsh,
-    //         &self.p2tr,
-    //         &self.p2a,
-    //         &self.unknown,
-    //         &self.empty,
-    //     ]
-    // }
-
     pub fn as_mut_vec(&mut self) -> [&mut T; 11] {
         [
             &mut self.p2pk65,
@@ -103,7 +70,7 @@ impl<T> OutputsBySpendableType<T> {
     }
 }
 
-impl<T> OutputsBySpendableType<(OutputFilter, T)> {
+impl<T> BySpendableType<(GroupFilter, T)> {
     pub fn vecs(&self) -> [&T; 11] {
         [
             &self.p2pk65.1,
@@ -121,25 +88,25 @@ impl<T> OutputsBySpendableType<(OutputFilter, T)> {
     }
 }
 
-impl<T> From<OutputsBySpendableType<T>> for OutputsBySpendableType<(OutputFilter, T)> {
-    fn from(value: OutputsBySpendableType<T>) -> Self {
+impl<T> From<BySpendableType<T>> for BySpendableType<(GroupFilter, T)> {
+    fn from(value: BySpendableType<T>) -> Self {
         Self {
-            p2pk65: (OutputFilter::Type(OutputType::P2PK65), value.p2pk65),
-            p2pk33: (OutputFilter::Type(OutputType::P2PK33), value.p2pk33),
-            p2pkh: (OutputFilter::Type(OutputType::P2PKH), value.p2pkh),
-            p2ms: (OutputFilter::Type(OutputType::P2MS), value.p2ms),
-            p2sh: (OutputFilter::Type(OutputType::P2SH), value.p2sh),
-            p2wpkh: (OutputFilter::Type(OutputType::P2WPKH), value.p2wpkh),
-            p2wsh: (OutputFilter::Type(OutputType::P2WSH), value.p2wsh),
-            p2tr: (OutputFilter::Type(OutputType::P2TR), value.p2tr),
-            p2a: (OutputFilter::Type(OutputType::P2A), value.p2a),
-            unknown: (OutputFilter::Type(OutputType::Unknown), value.unknown),
-            empty: (OutputFilter::Type(OutputType::Empty), value.empty),
+            p2pk65: (GroupFilter::Type(OutputType::P2PK65), value.p2pk65),
+            p2pk33: (GroupFilter::Type(OutputType::P2PK33), value.p2pk33),
+            p2pkh: (GroupFilter::Type(OutputType::P2PKH), value.p2pkh),
+            p2ms: (GroupFilter::Type(OutputType::P2MS), value.p2ms),
+            p2sh: (GroupFilter::Type(OutputType::P2SH), value.p2sh),
+            p2wpkh: (GroupFilter::Type(OutputType::P2WPKH), value.p2wpkh),
+            p2wsh: (GroupFilter::Type(OutputType::P2WSH), value.p2wsh),
+            p2tr: (GroupFilter::Type(OutputType::P2TR), value.p2tr),
+            p2a: (GroupFilter::Type(OutputType::P2A), value.p2a),
+            unknown: (GroupFilter::Type(OutputType::Unknown), value.unknown),
+            empty: (GroupFilter::Type(OutputType::Empty), value.empty),
         }
     }
 }
 
-impl<T> Add for OutputsBySpendableType<T>
+impl<T> Add for BySpendableType<T>
 where
     T: Add<Output = T>,
 {
@@ -161,7 +128,7 @@ where
     }
 }
 
-impl<T> AddAssign for OutputsBySpendableType<T>
+impl<T> AddAssign for BySpendableType<T>
 where
     T: AddAssign,
 {
diff --git a/crates/brk_core/src/groups/by_term.rs b/crates/brk_core/src/groups/by_term.rs
new file mode 100644
index 000000000..9e3978f0b
--- /dev/null
+++ b/crates/brk_core/src/groups/by_term.rs
@@ -0,0 +1,28 @@
+use super::GroupFilter;
+
+#[derive(Default, Clone)]
+pub struct ByTerm<T> {
+    pub short: T,
+    pub long: T,
+}
+
+impl<T> ByTerm<T> {
+    pub fn as_mut_vec(&mut self) -> [&mut T; 2] {
+        [&mut self.short, &mut self.long]
+    }
+}
+
+impl<T> ByTerm<(GroupFilter, T)> {
+    pub fn vecs(&self) -> [&T; 2] {
+        [&self.short.1, &self.long.1]
+    }
+}
+
+impl<T> From<ByTerm<T>> for ByTerm<(GroupFilter, T)> {
+    fn from(value: ByTerm<T>) -> Self {
+        Self {
+            short: (GroupFilter::LowerThan(5 * 30), value.short),
+            long: (GroupFilter::GreaterOrEqual(5 * 30), value.long),
+        }
+    }
+}
diff --git a/crates/brk_state/src/outputs/by_type.rs b/crates/brk_core/src/groups/by_type.rs
similarity index 73%
rename from crates/brk_state/src/outputs/by_type.rs
rename to crates/brk_core/src/groups/by_type.rs
index cf2a542bf..dd07592d6 100644
--- a/crates/brk_state/src/outputs/by_type.rs
+++ b/crates/brk_core/src/groups/by_type.rs
@@ -1,16 +1,16 @@
 use std::ops::{Add, AddAssign};
 
-use brk_core::OutputType;
+use crate::OutputType;
 
-use super::{OutputsBySpendableType, OutputsByUnspendableType};
+use super::{BySpendableType, ByUnspendableType};
 
 #[derive(Default, Clone, Debug)]
-pub struct OutputsByType<T> {
-    pub spendable: OutputsBySpendableType<T>,
-    pub unspendable: OutputsByUnspendableType<T>,
+pub struct GroupedByType<T> {
+    pub spendable: BySpendableType<T>,
+    pub unspendable: ByUnspendableType<T>,
 }
 
-impl<T> OutputsByType<T> {
+impl<T> GroupedByType<T> {
     pub fn get(&self, output_type: OutputType) -> &T {
         match output_type {
             OutputType::P2PK65 => &self.spendable.p2pk65,
@@ -44,25 +44,9 @@ impl<T> OutputsByType<T> {
             OutputType::OpReturn => &mut self.unspendable.opreturn,
         }
     }
-
-    // pub fn as_vec(&self) -> Vec<&T> {
-    // self.spendable
-    //     .as_vec()
-    //     .into_iter()
-    //     .chain(self.unspendable.as_vec())
-    //     .collect::<Vec<_>>()
-    // }
-
-    // pub fn as_mut_vec(&mut self) -> Vec<&mut T> {
-    //     self.spendable
-    //         .as_mut_vec()
-    //         .into_iter()
-    //         .chain(self.unspendable.as_mut_vec())
-    //         .collect::<Vec<_>>()
-    // }
 }
 
-impl<T> Add for OutputsByType<T>
+impl<T> Add for GroupedByType<T>
 where
     T: Add<Output = T>,
 {
@@ -75,7 +59,7 @@ where
     }
 }
 
-impl<T> AddAssign for OutputsByType<T>
+impl<T> AddAssign for GroupedByType<T>
 where
     T: AddAssign,
 {
diff --git a/crates/brk_state/src/outputs/by_unspendable_type.rs b/crates/brk_core/src/groups/by_unspendable_type.rs
similarity index 72%
rename from crates/brk_state/src/outputs/by_unspendable_type.rs
rename to crates/brk_core/src/groups/by_unspendable_type.rs
index f777a094c..2489a7e7f 100644
--- a/crates/brk_state/src/outputs/by_unspendable_type.rs
+++ b/crates/brk_core/src/groups/by_unspendable_type.rs
@@ -1,17 +1,17 @@
 use std::ops::{Add, AddAssign};
 
 #[derive(Default, Clone, Debug)]
-pub struct OutputsByUnspendableType<T> {
+pub struct ByUnspendableType<T> {
     pub opreturn: T,
 }
 
-impl<T> OutputsByUnspendableType<T> {
+impl<T> ByUnspendableType<T> {
     pub fn as_vec(&self) -> [&T; 1] {
         [&self.opreturn]
     }
 }
 
-impl<T> Add for OutputsByUnspendableType<T>
+impl<T> Add for ByUnspendableType<T>
 where
     T: Add<Output = T>,
 {
@@ -23,7 +23,7 @@ where
     }
 }
 
-impl<T> AddAssign for OutputsByUnspendableType<T>
+impl<T> AddAssign for ByUnspendableType<T>
 where
     T: AddAssign,
 {
diff --git a/crates/brk_state/src/outputs/by_value.rs b/crates/brk_core/src/groups/by_value.rs
similarity index 95%
rename from crates/brk_state/src/outputs/by_value.rs
rename to crates/brk_core/src/groups/by_value.rs
index 8aa4e90fb..f58d311b3 100644
--- a/crates/brk_state/src/outputs/by_value.rs
+++ b/crates/brk_core/src/groups/by_value.rs
@@ -1,5 +1,5 @@
 #[derive(Default, Clone)]
-pub struct OutputsByValue<T> {
+pub struct GroupedByValue<T> {
     pub up_to_1cent: T,
     pub from_1c_to_10c: T,
     pub from_10c_to_1d: T,
@@ -16,7 +16,7 @@ pub struct OutputsByValue<T> {
     // ...
 }
 
-impl<T> OutputsByValue<T> {
+impl<T> GroupedByValue<T> {
     pub fn as_mut_vec(&mut self) -> Vec<&mut T> {
         vec![
             &mut self.up_to_1cent,
diff --git a/crates/brk_core/src/groups/filter.rs b/crates/brk_core/src/groups/filter.rs
new file mode 100644
index 000000000..d6a738b4e
--- /dev/null
+++ b/crates/brk_core/src/groups/filter.rs
@@ -0,0 +1,51 @@
+use std::ops::Range;
+
+use crate::{HalvingEpoch, OutputType};
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum GroupFilter {
+    All,
+    LowerThan(usize),
+    Range(Range<usize>),
+    GreaterOrEqual(usize),
+    Epoch(HalvingEpoch),
+    Type(OutputType),
+}
+
+impl GroupFilter {
+    pub fn contains(&self, value: usize) -> bool {
+        match self {
+            GroupFilter::All => true,
+            GroupFilter::LowerThan(max) => *max > value,
+            GroupFilter::GreaterOrEqual(min) => *min <= value,
+            GroupFilter::Range(r) => r.contains(&value),
+            GroupFilter::Epoch(_) => false,
+            GroupFilter::Type(_) => false,
+        }
+    }
+
+    pub fn includes(&self, other: &GroupFilter) -> bool {
+        match self {
+            GroupFilter::All => true,
+            GroupFilter::LowerThan(max) => match other {
+                GroupFilter::All => false,
+                GroupFilter::LowerThan(max2) => max >= max2,
+                GroupFilter::Range(range) => range.end <= *max,
+                GroupFilter::GreaterOrEqual(_) => false,
+                GroupFilter::Epoch(_) => false,
+                GroupFilter::Type(_) => false,
+            },
+            GroupFilter::GreaterOrEqual(min) => match other {
+                GroupFilter::All => false,
+                GroupFilter::LowerThan(_) => false,
+                GroupFilter::Range(range) => range.start >= *min,
+                GroupFilter::GreaterOrEqual(min2) => min <= min2,
+                GroupFilter::Epoch(_) => false,
+                GroupFilter::Type(_) => false,
+            },
+            GroupFilter::Range(_) => false,
+            GroupFilter::Epoch(_) => false,
+            GroupFilter::Type(_) => false,
+        }
+    }
+}
diff --git a/crates/brk_core/src/groups/mod.rs b/crates/brk_core/src/groups/mod.rs
new file mode 100644
index 000000000..8ca92df9f
--- /dev/null
+++ b/crates/brk_core/src/groups/mod.rs
@@ -0,0 +1,31 @@
+mod address;
+mod by_address_type;
+mod by_age_range;
+mod by_amount_range;
+mod by_epoch;
+mod by_ge_amount;
+mod by_lt_amount;
+mod by_max_age;
+mod by_min_age;
+mod by_spendable_type;
+mod by_term;
+mod by_type;
+mod by_unspendable_type;
+mod filter;
+mod utxo;
+
+pub use address::*;
+pub use by_address_type::*;
+pub use by_age_range::*;
+pub use by_amount_range::*;
+pub use by_epoch::*;
+pub use by_ge_amount::*;
+pub use by_lt_amount::*;
+pub use by_max_age::*;
+pub use by_min_age::*;
+pub use by_spendable_type::*;
+pub use by_term::*;
+pub use by_type::*;
+pub use by_unspendable_type::*;
+pub use filter::*;
+pub use utxo::*;
diff --git a/crates/brk_core/src/groups/utxo.rs b/crates/brk_core/src/groups/utxo.rs
new file mode 100644
index 000000000..05bc77921
--- /dev/null
+++ b/crates/brk_core/src/groups/utxo.rs
@@ -0,0 +1,90 @@
+use crate::{
+    ByAgeRange, ByAmountRange, ByEpoch, ByGreatEqualAmount, ByLowerThanAmount, ByMaxAge, ByMinAge,
+    BySpendableType, ByTerm, GroupFilter,
+};
+
+#[derive(Default, Clone)]
+pub struct UTXOGroups<T> {
+    pub all: T,
+    pub age_range: ByAgeRange<T>,
+    pub epoch: ByEpoch<T>,
+    pub min_age: ByMinAge<T>,
+    pub ge_amount: ByGreatEqualAmount<T>,
+    pub amount_range: ByAmountRange<T>,
+    pub term: ByTerm<T>,
+    pub _type: BySpendableType<T>,
+    pub max_age: ByMaxAge<T>,
+    pub lt_amount: ByLowerThanAmount<T>,
+}
+
+impl<T> UTXOGroups<T> {
+    pub fn as_mut_vecs(&mut self) -> Vec<&mut T> {
+        [&mut self.all]
+            .into_iter()
+            .chain(self.term.as_mut_vec())
+            .chain(self.max_age.as_mut_vec())
+            .chain(self.min_age.as_mut_vec())
+            .chain(self.ge_amount.as_mut_vec())
+            .chain(self.age_range.as_mut_vec())
+            .chain(self.epoch.as_mut_vec())
+            .chain(self.amount_range.as_mut_vec())
+            .chain(self.lt_amount.as_mut_vec())
+            .chain(self._type.as_mut_vec())
+            .collect::<Vec<_>>()
+    }
+
+    pub fn as_mut_separate_vecs(&mut self) -> Vec<&mut T> {
+        self.age_range
+            .as_mut_vec()
+            .into_iter()
+            .chain(self.epoch.as_mut_vec())
+            .chain(self.amount_range.as_mut_vec())
+            .chain(self._type.as_mut_vec())
+            .collect::<Vec<_>>()
+    }
+
+    pub fn as_mut_overlapping_vecs(&mut self) -> Vec<&mut T> {
+        [&mut self.all]
+            .into_iter()
+            .chain(self.term.as_mut_vec())
+            .chain(self.max_age.as_mut_vec())
+            .chain(self.min_age.as_mut_vec())
+            .chain(self.lt_amount.as_mut_vec())
+            .chain(self.ge_amount.as_mut_vec())
+            .collect::<Vec<_>>()
+    }
+}
+
+impl<T> UTXOGroups<(GroupFilter, T)> {
+    pub fn vecs(&self) -> Vec<&T> {
+        [&self.all.1]
+            .into_iter()
+            .chain(self.term.vecs())
+            .chain(self.max_age.vecs())
+            .chain(self.min_age.vecs())
+            .chain(self.age_range.vecs())
+            .chain(self.epoch.vecs())
+            .chain(self.amount_range.vecs())
+            .chain(self._type.vecs())
+            .chain(self.lt_amount.vecs())
+            .chain(self.ge_amount.vecs())
+            .collect::<Vec<_>>()
+    }
+}
+
+impl<T> From<UTXOGroups<T>> for UTXOGroups<(GroupFilter, T)> {
+    fn from(value: UTXOGroups<T>) -> Self {
+        Self {
+            all: (GroupFilter::All, value.all),
+            term: ByTerm::from(value.term),
+            max_age: ByMaxAge::from(value.max_age),
+            min_age: ByMinAge::from(value.min_age),
+            age_range: ByAgeRange::from(value.age_range),
+            epoch: ByEpoch::from(value.epoch),
+            amount_range: ByAmountRange::from(value.amount_range),
+            lt_amount: ByLowerThanAmount::from(value.lt_amount),
+            ge_amount: ByGreatEqualAmount::from(value.ge_amount),
+            _type: BySpendableType::from(value._type),
+        }
+    }
+}
diff --git a/crates/brk_core/src/lib.rs b/crates/brk_core/src/lib.rs
index 6e3598d9f..ffffbbe39 100644
--- a/crates/brk_core/src/lib.rs
+++ b/crates/brk_core/src/lib.rs
@@ -1,11 +1,13 @@
 #![doc = include_str!("../README.md")]
 
-mod enums;
+mod error;
+mod groups;
 mod structs;
 mod traits;
 mod utils;
 
-pub use enums::*;
+pub use error::*;
+pub use groups::*;
 pub use structs::*;
 pub use traits::*;
 pub use utils::*;
diff --git a/crates/brk_core/src/structs/addressbytes.rs b/crates/brk_core/src/structs/addressbytes.rs
index d22cf485f..cc4125608 100644
--- a/crates/brk_core/src/structs/addressbytes.rs
+++ b/crates/brk_core/src/structs/addressbytes.rs
@@ -162,7 +162,7 @@ impl fmt::Display for P2PKHBytes {
             .push_opcode(opcodes::all::OP_CHECKSIG)
             .into_script();
         let address = Address::from_script(&script, Network::Bitcoin).unwrap();
-        write!(f, "{}", address)
+        write!(f, "{address}")
     }
 }
 
@@ -192,7 +192,7 @@ impl fmt::Display for P2SHBytes {
             .push_opcode(opcodes::all::OP_EQUAL)
             .into_script();
         let address = Address::from_script(&script, Network::Bitcoin).unwrap();
-        write!(f, "{}", address)
+        write!(f, "{address}")
     }
 }
 
@@ -218,7 +218,7 @@ impl fmt::Display for P2WPKHBytes {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let script = Builder::new().push_int(0).push_slice(*self.0).into_script();
         let address = Address::from_script(&script, Network::Bitcoin).unwrap();
-        write!(f, "{}", address)
+        write!(f, "{address}")
     }
 }
 
@@ -244,7 +244,7 @@ impl fmt::Display for P2WSHBytes {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let script = Builder::new().push_int(0).push_slice(*self.0).into_script();
         let address = Address::from_script(&script, Network::Bitcoin).unwrap();
-        write!(f, "{}", address)
+        write!(f, "{address}")
     }
 }
 
@@ -270,7 +270,7 @@ impl fmt::Display for P2TRBytes {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let script = Builder::new().push_int(1).push_slice(*self.0).into_script();
         let address = Address::from_script(&script, Network::Bitcoin).unwrap();
-        write!(f, "{}", address)
+        write!(f, "{address}")
     }
 }
 
@@ -296,7 +296,7 @@ impl fmt::Display for P2ABytes {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let script = Builder::new().push_int(1).push_slice(*self.0).into_script();
         let address = Address::from_script(&script, Network::Bitcoin).unwrap();
-        write!(f, "{}", address)
+        write!(f, "{address}")
     }
 }
 
diff --git a/crates/brk_core/src/structs/addressdata.rs b/crates/brk_core/src/structs/addressdata.rs
new file mode 100644
index 000000000..c80148ee6
--- /dev/null
+++ b/crates/brk_core/src/structs/addressdata.rs
@@ -0,0 +1,102 @@
+use byteview::ByteView;
+use zerocopy::{FromBytes, IntoBytes};
+
+use crate::{Bitcoin, CheckedSub, Dollars, EmptyAddressData, Error, Result, Sats};
+
+#[derive(Debug, Default, Clone)]
+#[repr(C)]
+pub struct AddressData {
+    pub sent: Sats,
+    pub received: Sats,
+    pub realized_cap: Dollars,
+    pub outputs_len: u32,
+}
+
+impl AddressData {
+    pub fn amount(&self) -> Sats {
+        (u64::from(self.received) - u64::from(self.sent)).into()
+    }
+
+    pub fn realized_price(&self) -> Dollars {
+        (self.realized_cap / Bitcoin::from(self.amount())).round_to_4_digits()
+    }
+
+    #[inline]
+    pub fn has_0_sats(&self) -> bool {
+        self.amount() == Sats::ZERO
+    }
+
+    #[inline]
+    pub fn has_0_utxos(&self) -> bool {
+        self.outputs_len == 0
+    }
+
+    pub fn receive(&mut self, amount: Sats, price: Option<Dollars>) {
+        self.received += amount;
+        self.outputs_len += 1;
+        if let Some(price) = price {
+            self.realized_cap += price * amount;
+        }
+    }
+
+    pub fn send(&mut self, amount: Sats, previous_price: Option<Dollars>) -> Result<()> {
+        if self.amount() < amount {
+            return Err(Error::String("Previous_amount smaller than sent amount"));
+        }
+        self.sent += amount;
+        self.outputs_len -= 1;
+        if let Some(previous_price) = previous_price {
+            self.realized_cap = self
+                .realized_cap
+                .checked_sub(previous_price * amount)
+                .unwrap();
+        }
+        Ok(())
+    }
+}
+
+impl From<EmptyAddressData> for AddressData {
+    fn from(value: EmptyAddressData) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&EmptyAddressData> for AddressData {
+    fn from(value: &EmptyAddressData) -> Self {
+        Self {
+            sent: value.transfered,
+            received: value.transfered,
+            realized_cap: Dollars::ZERO,
+            outputs_len: 0,
+        }
+    }
+}
+
+impl From<ByteView> for AddressData {
+    fn from(value: ByteView) -> Self {
+        Self {
+            // MUST be same order as impl From<&AddressData> for ByteView
+            sent: Sats::read_from_bytes(&value[..8]).unwrap(),
+            received: Sats::read_from_bytes(&value[8..16]).unwrap(),
+            realized_cap: Dollars::read_from_bytes(&value[16..24]).unwrap(),
+            outputs_len: u32::read_from_bytes(&value[24..]).unwrap(),
+        }
+    }
+}
+impl From<AddressData> for ByteView {
+    fn from(value: AddressData) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&AddressData> for ByteView {
+    fn from(value: &AddressData) -> Self {
+        Self::new(
+            &[
+                value.sent.as_bytes(),
+                value.received.as_bytes(),
+                value.realized_cap.as_bytes(),
+                value.outputs_len.as_bytes(),
+            ]
+            .concat(),
+        )
+    }
+}
diff --git a/crates/brk_core/src/structs/bitcoin.rs b/crates/brk_core/src/structs/bitcoin.rs
index 85f911a74..84257c818 100644
--- a/crates/brk_core/src/structs/bitcoin.rs
+++ b/crates/brk_core/src/structs/bitcoin.rs
@@ -1,6 +1,6 @@
 use std::{
     cmp::Ordering,
-    ops::{Add, Div, Mul},
+    ops::{Add, AddAssign, Div, Mul},
 };
 
 use serde::Serialize;
@@ -20,6 +20,12 @@ impl Add for Bitcoin {
     }
 }
 
+impl AddAssign for Bitcoin {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl Mul for Bitcoin {
     type Output = Self;
     fn mul(self, rhs: Self) -> Self::Output {
diff --git a/crates/brk_core/src/structs/cents.rs b/crates/brk_core/src/structs/cents.rs
index 2aa93eca1..3e8750dd9 100644
--- a/crates/brk_core/src/structs/cents.rs
+++ b/crates/brk_core/src/structs/cents.rs
@@ -24,10 +24,28 @@ use super::Dollars;
 )]
 pub struct Cents(i64);
 
+const SIGNIFICANT_DIGITS: i32 = 4;
+
 impl Cents {
     pub const fn mint(value: i64) -> Self {
         Self(value)
     }
+
+    pub fn round_to_4_digits(self) -> Self {
+        let v = self.0;
+
+        let ilog10 = v.checked_ilog10().unwrap_or(0) as i32;
+
+        Self::from(if ilog10 >= SIGNIFICANT_DIGITS {
+            let log_diff = ilog10 - SIGNIFICANT_DIGITS + 1;
+
+            let pow = 10.0_f64.powi(log_diff);
+
+            ((v as f64 / pow).round() * pow) as i64
+        } else {
+            v
+        })
+    }
 }
 
 impl From<Dollars> for Cents {
diff --git a/crates/brk_core/src/structs/date.rs b/crates/brk_core/src/structs/date.rs
index e3ed7398c..f1fe488be 100644
--- a/crates/brk_core/src/structs/date.rs
+++ b/crates/brk_core/src/structs/date.rs
@@ -31,6 +31,10 @@ impl Date {
     pub fn day(&self) -> u8 {
         (self.0 % 1_00) as u8
     }
+
+    pub fn into_jiff(self) -> Date_ {
+        self.into()
+    }
 }
 
 impl Default for Date {
diff --git a/crates/brk_core/src/structs/dateindex.rs b/crates/brk_core/src/structs/dateindex.rs
index 7c079ef26..1b47506c2 100644
--- a/crates/brk_core/src/structs/dateindex.rs
+++ b/crates/brk_core/src/structs/dateindex.rs
@@ -3,11 +3,14 @@ use std::{
     ops::{Add, Rem},
 };
 
+use jiff::Span;
 use serde::Serialize;
-// use color_eyre::eyre::eyre;
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
-use crate::{CheckedSub, Error, Printable};
+use crate::{
+    CheckedSub, DecadeIndex, Error, FromCoarserIndex, MonthIndex, Printable, QuarterIndex,
+    SemesterIndex, WeekIndex, YearIndex,
+};
 
 use super::Date;
 
@@ -103,3 +106,135 @@ impl Printable for DateIndex {
         &["d", "date", "dateindex"]
     }
 }
+
+impl FromCoarserIndex<WeekIndex> for DateIndex {
+    fn min_from(coarser: WeekIndex) -> usize {
+        let coarser = usize::from(coarser);
+        if coarser == 0 {
+            0
+        } else if coarser == 1 {
+            1
+        } else {
+            4 + (coarser - 2) * 7
+        }
+    }
+
+    fn max_from_(coarser: WeekIndex) -> usize {
+        let coarser = usize::from(coarser);
+        if coarser == 0 {
+            0
+        } else if coarser == 1 {
+            3
+        } else {
+            3 + (coarser - 1) * 7
+        }
+    }
+}
+
+impl FromCoarserIndex<MonthIndex> for DateIndex {
+    fn min_from(coarser: MonthIndex) -> usize {
+        let coarser = u16::from(coarser);
+        if coarser == 0 {
+            0
+        } else {
+            let d = Date::new(2009, 1, 1)
+                .into_jiff()
+                .checked_add(Span::new().months(coarser))
+                .unwrap();
+            DateIndex::try_from(Date::from(d)).unwrap().into()
+        }
+    }
+
+    fn max_from_(coarser: MonthIndex) -> usize {
+        let d = Date::new(2009, 1, 31)
+            .into_jiff()
+            .checked_add(Span::new().months(u16::from(coarser)))
+            .unwrap();
+        DateIndex::try_from(Date::from(d)).unwrap().into()
+    }
+}
+
+impl FromCoarserIndex<QuarterIndex> for DateIndex {
+    fn min_from(coarser: QuarterIndex) -> usize {
+        let coarser = u16::from(coarser);
+        if coarser == 0 {
+            0
+        } else {
+            let d = Date::new(2009, 1, 1)
+                .into_jiff()
+                .checked_add(Span::new().months(3 * coarser))
+                .unwrap();
+            DateIndex::try_from(Date::from(d)).unwrap().into()
+        }
+    }
+
+    fn max_from_(coarser: QuarterIndex) -> usize {
+        let d = Date::new(2009, 3, 31)
+            .into_jiff()
+            .checked_add(Span::new().months(3 * u16::from(coarser)))
+            .unwrap();
+        DateIndex::try_from(Date::from(d)).unwrap().into()
+    }
+}
+
+impl FromCoarserIndex<SemesterIndex> for DateIndex {
+    fn min_from(coarser: SemesterIndex) -> usize {
+        let coarser = u16::from(coarser);
+        if coarser == 0 {
+            0
+        } else {
+            let d = Date::new(2009, 1, 1)
+                .into_jiff()
+                .checked_add(Span::new().months(6 * coarser))
+                .unwrap();
+            DateIndex::try_from(Date::from(d)).unwrap().into()
+        }
+    }
+
+    fn max_from_(coarser: SemesterIndex) -> usize {
+        let d = Date::new(2009, 5, 31)
+            .into_jiff()
+            .checked_add(Span::new().months(1 + 6 * u16::from(coarser)))
+            .unwrap();
+        DateIndex::try_from(Date::from(d)).unwrap().into()
+    }
+}
+
+impl FromCoarserIndex<YearIndex> for DateIndex {
+    fn min_from(coarser: YearIndex) -> usize {
+        let coarser = u16::from(coarser);
+        if coarser == 0 {
+            0
+        } else {
+            Self::try_from(Date::new(2009 + coarser, 1, 1))
+                .unwrap()
+                .into()
+        }
+    }
+
+    fn max_from_(coarser: YearIndex) -> usize {
+        Self::try_from(Date::new(2009 + u16::from(coarser), 12, 31))
+            .unwrap()
+            .into()
+    }
+}
+
+impl FromCoarserIndex<DecadeIndex> for DateIndex {
+    fn min_from(coarser: DecadeIndex) -> usize {
+        let coarser = u16::from(coarser);
+        if coarser == 0 {
+            0
+        } else {
+            Self::try_from(Date::new(2000 + 10 * coarser, 1, 1))
+                .unwrap()
+                .into()
+        }
+    }
+
+    fn max_from_(coarser: DecadeIndex) -> usize {
+        let coarser = u16::from(coarser);
+        Self::try_from(Date::new(2009 + (10 * coarser), 12, 31))
+            .unwrap()
+            .into()
+    }
+}
diff --git a/crates/brk_core/src/structs/decadeindex.rs b/crates/brk_core/src/structs/decadeindex.rs
index 5b6e806e6..e02a5a7ff 100644
--- a/crates/brk_core/src/structs/decadeindex.rs
+++ b/crates/brk_core/src/structs/decadeindex.rs
@@ -1,4 +1,7 @@
-use std::{fmt::Debug, ops::Add};
+use std::{
+    fmt::Debug,
+    ops::{Add, AddAssign, Div},
+};
 
 use serde::{Deserialize, Serialize};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
@@ -31,6 +34,18 @@ impl From<u8> for DecadeIndex {
     }
 }
 
+impl From<DecadeIndex> for u8 {
+    fn from(value: DecadeIndex) -> Self {
+        value.0
+    }
+}
+
+impl From<DecadeIndex> for u16 {
+    fn from(value: DecadeIndex) -> Self {
+        value.0 as u16
+    }
+}
+
 impl From<usize> for DecadeIndex {
     fn from(value: usize) -> Self {
         Self(value as u8)
@@ -51,6 +66,27 @@ impl Add<usize> for DecadeIndex {
     }
 }
 
+impl Add<DecadeIndex> for DecadeIndex {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::from(self.0 + rhs.0)
+    }
+}
+
+impl AddAssign for DecadeIndex {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Self(self.0 + rhs.0)
+    }
+}
+
+impl Div<usize> for DecadeIndex {
+    type Output = Self;
+    fn div(self, _: usize) -> Self::Output {
+        unreachable!()
+    }
+}
+
 impl From<DateIndex> for DecadeIndex {
     fn from(value: DateIndex) -> Self {
         Self::from(Date::from(value))
diff --git a/crates/brk_core/src/structs/difficultyepoch.rs b/crates/brk_core/src/structs/difficultyepoch.rs
index 3886ab9a6..fa5772a4f 100644
--- a/crates/brk_core/src/structs/difficultyepoch.rs
+++ b/crates/brk_core/src/structs/difficultyepoch.rs
@@ -1,6 +1,6 @@
 use std::{
     fmt::Debug,
-    ops::{Add, Div},
+    ops::{Add, AddAssign, Div},
 };
 
 use serde::{Deserialize, Serialize};
@@ -54,6 +54,12 @@ impl Add for DifficultyEpoch {
     }
 }
 
+impl AddAssign for DifficultyEpoch {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl Add<usize> for DifficultyEpoch {
     type Output = Self;
 
diff --git a/crates/brk_core/src/structs/dollars.rs b/crates/brk_core/src/structs/dollars.rs
index 0cbb62303..6b3a20d19 100644
--- a/crates/brk_core/src/structs/dollars.rs
+++ b/crates/brk_core/src/structs/dollars.rs
@@ -38,6 +38,14 @@ impl Dollars {
     pub const fn mint(dollars: f64) -> Self {
         Self(dollars)
     }
+
+    pub fn round_nearest_cent(self) -> Self {
+        Dollars((self.0 * 100.0).round() / 100.0)
+    }
+
+    pub fn round_to_4_digits(self) -> Self {
+        Self::from(Cents::from(self).round_to_4_digits())
+    }
 }
 
 impl From<f32> for Dollars {
@@ -235,7 +243,7 @@ impl Mul<Sats> for Dollars {
             self
         } else {
             Self::from(Cents::from(
-                u128::from(rhs) * u128::from(Cents::from(self)) / u128::from(Sats::ONE_BTC),
+                u128::from(rhs) * u128::from(Cents::from(self)) / Sats::ONE_BTC_U128,
             ))
         }
     }
diff --git a/crates/brk_core/src/structs/emptyaddressdata.rs b/crates/brk_core/src/structs/emptyaddressdata.rs
new file mode 100644
index 000000000..d081ed0e8
--- /dev/null
+++ b/crates/brk_core/src/structs/emptyaddressdata.rs
@@ -0,0 +1,44 @@
+use byteview::ByteView;
+use zerocopy::{FromBytes, IntoBytes};
+use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+use crate::{AddressData, Sats};
+
+#[derive(Debug, Default, Clone, FromBytes, Immutable, IntoBytes, KnownLayout)]
+pub struct EmptyAddressData {
+    pub transfered: Sats,
+}
+
+impl From<AddressData> for EmptyAddressData {
+    fn from(value: AddressData) -> Self {
+        Self::from(&value)
+    }
+}
+
+impl From<&AddressData> for EmptyAddressData {
+    fn from(value: &AddressData) -> Self {
+        if value.sent != value.received {
+            dbg!(&value);
+            panic!("Trying to convert not empty wallet to empty !");
+        }
+        Self {
+            transfered: value.sent,
+        }
+    }
+}
+
+impl From<ByteView> for EmptyAddressData {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<EmptyAddressData> for ByteView {
+    fn from(value: EmptyAddressData) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&EmptyAddressData> for ByteView {
+    fn from(value: &EmptyAddressData) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/feerate.rs b/crates/brk_core/src/structs/feerate.rs
index 35b1cd767..d22c10f90 100644
--- a/crates/brk_core/src/structs/feerate.rs
+++ b/crates/brk_core/src/structs/feerate.rs
@@ -1,6 +1,6 @@
 use std::{
     cmp::Ordering,
-    ops::{Add, Div},
+    ops::{Add, AddAssign, Div},
 };
 
 use serde::Serialize;
@@ -35,6 +35,12 @@ impl Add for Feerate {
     }
 }
 
+impl AddAssign for Feerate {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl Div<usize> for Feerate {
     type Output = Self;
     fn div(self, rhs: usize) -> Self::Output {
diff --git a/crates/brk_core/src/structs/halvingepoch.rs b/crates/brk_core/src/structs/halvingepoch.rs
index 66cf19401..cb2e3866e 100644
--- a/crates/brk_core/src/structs/halvingepoch.rs
+++ b/crates/brk_core/src/structs/halvingepoch.rs
@@ -1,6 +1,6 @@
 use std::{
     fmt::Debug,
-    ops::{Add, Div},
+    ops::{Add, AddAssign, Div},
 };
 
 use serde::{Deserialize, Serialize};
@@ -60,6 +60,12 @@ impl Add for HalvingEpoch {
     }
 }
 
+impl AddAssign for HalvingEpoch {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl Add<usize> for HalvingEpoch {
     type Output = Self;
 
diff --git a/crates/brk_core/src/structs/mod.rs b/crates/brk_core/src/structs/mod.rs
index 32142545b..e21c12922 100644
--- a/crates/brk_core/src/structs/mod.rs
+++ b/crates/brk_core/src/structs/mod.rs
@@ -1,5 +1,6 @@
 mod addressbytes;
 mod addressbyteshash;
+mod addressdata;
 mod bitcoin;
 mod blockhash;
 mod blockhashprefix;
@@ -9,6 +10,7 @@ mod dateindex;
 mod decadeindex;
 mod difficultyepoch;
 mod dollars;
+mod emptyaddressdata;
 mod emptyoutputindex;
 mod feerate;
 mod halvingepoch;
@@ -31,6 +33,7 @@ mod p2wshaddressindex;
 mod quarterindex;
 mod rawlocktime;
 mod sats;
+mod semesterindex;
 mod stored_f32;
 mod stored_f64;
 mod stored_u32;
@@ -43,6 +46,7 @@ mod txidprefix;
 mod txindex;
 mod txversion;
 mod typeindex;
+mod typeindex_with_outputindex;
 mod unit;
 mod unknownoutputindex;
 mod version;
@@ -54,6 +58,7 @@ mod yearindex;
 
 pub use addressbytes::*;
 pub use addressbyteshash::*;
+pub use addressdata::*;
 pub use bitcoin::*;
 pub use blockhash::*;
 pub use blockhashprefix::*;
@@ -63,6 +68,7 @@ pub use dateindex::*;
 pub use decadeindex::*;
 pub use difficultyepoch::*;
 pub use dollars::*;
+pub use emptyaddressdata::*;
 pub use emptyoutputindex::*;
 pub use feerate::*;
 pub use halvingepoch::*;
@@ -85,6 +91,7 @@ pub use p2wshaddressindex::*;
 pub use quarterindex::*;
 pub use rawlocktime::*;
 pub use sats::*;
+pub use semesterindex::*;
 pub use stored_f32::*;
 pub use stored_f64::*;
 pub use stored_u8::*;
@@ -97,6 +104,7 @@ pub use txidprefix::*;
 pub use txindex::*;
 pub use txversion::*;
 pub use typeindex::*;
+pub use typeindex_with_outputindex::*;
 pub use unit::*;
 pub use unknownoutputindex::*;
 pub use version::*;
diff --git a/crates/brk_core/src/structs/monthindex.rs b/crates/brk_core/src/structs/monthindex.rs
index d99f95b72..94fdfb4ea 100644
--- a/crates/brk_core/src/structs/monthindex.rs
+++ b/crates/brk_core/src/structs/monthindex.rs
@@ -1,4 +1,7 @@
-use std::{fmt::Debug, ops::Add};
+use std::{
+    fmt::Debug,
+    ops::{Add, AddAssign, Div},
+};
 
 use serde::{Deserialize, Serialize};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
@@ -31,6 +34,12 @@ impl From<u16> for MonthIndex {
     }
 }
 
+impl From<MonthIndex> for u16 {
+    fn from(value: MonthIndex) -> Self {
+        value.0
+    }
+}
+
 impl From<usize> for MonthIndex {
     fn from(value: usize) -> Self {
         Self(value as u16)
@@ -51,6 +60,27 @@ impl Add<usize> for MonthIndex {
     }
 }
 
+impl Add<MonthIndex> for MonthIndex {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::from(self.0 + rhs.0)
+    }
+}
+
+impl AddAssign for MonthIndex {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Self(self.0 + rhs.0)
+    }
+}
+
+impl Div<usize> for MonthIndex {
+    type Output = Self;
+    fn div(self, _: usize) -> Self::Output {
+        unreachable!()
+    }
+}
+
 impl From<DateIndex> for MonthIndex {
     fn from(value: DateIndex) -> Self {
         Self::from(Date::from(value))
diff --git a/crates/brk_core/src/structs/ohlc.rs b/crates/brk_core/src/structs/ohlc.rs
index 7afaceda2..4e13773b4 100644
--- a/crates/brk_core/src/structs/ohlc.rs
+++ b/crates/brk_core/src/structs/ohlc.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, Div};
+use std::ops::{Add, AddAssign, Div};
 
 use derive_deref::{Deref, DerefMut};
 use serde::{Serialize, Serializer, ser::SerializeTuple};
@@ -236,6 +236,15 @@ where
     }
 }
 
+impl<T> AddAssign for Open<T>
+where
+    T: Add<Output = T> + Clone,
+{
+    fn add_assign(&mut self, rhs: Self) {
+        **self = self.0.clone() + rhs.0
+    }
+}
+
 impl<T> Div<usize> for Open<T>
 where
     T: Div<usize, Output = T>,
@@ -324,6 +333,15 @@ where
     }
 }
 
+impl<T> AddAssign for High<T>
+where
+    T: Add<Output = T> + Clone,
+{
+    fn add_assign(&mut self, rhs: Self) {
+        **self = self.0.clone() + rhs.0
+    }
+}
+
 impl<T> Div<usize> for High<T>
 where
     T: Div<usize, Output = T>,
@@ -412,6 +430,15 @@ where
     }
 }
 
+impl<T> AddAssign for Low<T>
+where
+    T: Add<Output = T> + Clone,
+{
+    fn add_assign(&mut self, rhs: Self) {
+        **self = self.0.clone() + rhs.0
+    }
+}
+
 impl<T> Div<usize> for Low<T>
 where
     T: Div<usize, Output = T>,
@@ -515,6 +542,15 @@ where
     }
 }
 
+impl<T> AddAssign for Close<T>
+where
+    T: Add<Output = T> + Clone,
+{
+    fn add_assign(&mut self, rhs: Self) {
+        **self = self.0.clone() + rhs.0
+    }
+}
+
 impl<T> Div<usize> for Close<T>
 where
     T: Div<usize, Output = T>,
diff --git a/crates/brk_core/src/structs/outputindex.rs b/crates/brk_core/src/structs/outputindex.rs
index 6766ce675..80e1e90a9 100644
--- a/crates/brk_core/src/structs/outputindex.rs
+++ b/crates/brk_core/src/structs/outputindex.rs
@@ -28,6 +28,8 @@ use super::Vout;
 pub struct OutputIndex(u64);
 
 impl OutputIndex {
+    pub const ZERO: Self = Self(0);
+
     pub const COINBASE: Self = Self(u64::MAX);
 
     pub fn incremented(self) -> Self {
diff --git a/crates/brk_core/src/structs/outputtype.rs b/crates/brk_core/src/structs/outputtype.rs
index 4a4c70c4f..4f1eab597 100644
--- a/crates/brk_core/src/structs/outputtype.rs
+++ b/crates/brk_core/src/structs/outputtype.rs
@@ -50,6 +50,27 @@ impl OutputType {
         }
     }
 
+    pub fn is_address(&self) -> bool {
+        match self {
+            Self::P2PK65 => true,
+            Self::P2PK33 => true,
+            Self::P2PKH => true,
+            Self::P2MS => false,
+            Self::P2SH => true,
+            Self::OpReturn => false,
+            Self::P2WPKH => true,
+            Self::P2WSH => true,
+            Self::P2TR => true,
+            Self::P2A => true,
+            Self::Empty => false,
+            Self::Unknown => false,
+        }
+    }
+
+    pub fn is_not_address(&self) -> bool {
+        !self.is_address()
+    }
+
     pub fn is_unspendable(&self) -> bool {
         !self.is_spendable()
     }
diff --git a/crates/brk_core/src/structs/p2aaddressindex.rs b/crates/brk_core/src/structs/p2aaddressindex.rs
index 9e268b9ef..6c98a44a3 100644
--- a/crates/brk_core/src/structs/p2aaddressindex.rs
+++ b/crates/brk_core/src/structs/p2aaddressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,6 +31,21 @@ impl From<TypeIndex> for P2AAddressIndex {
         Self(value)
     }
 }
+impl From<P2AAddressIndex> for TypeIndex {
+    fn from(value: P2AAddressIndex) -> Self {
+        value.0
+    }
+}
+impl From<P2AAddressIndex> for u32 {
+    fn from(value: P2AAddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2AAddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<P2AAddressIndex> for usize {
     fn from(value: P2AAddressIndex) -> Self {
         Self::from(*value)
@@ -59,3 +76,19 @@ impl Printable for P2AAddressIndex {
         &["aaddr", "p2aaddr", "p2aaddressindex"]
     }
 }
+
+impl From<ByteView> for P2AAddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2AAddressIndex> for ByteView {
+    fn from(value: P2AAddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2AAddressIndex> for ByteView {
+    fn from(value: &P2AAddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/p2pk33addressindex.rs b/crates/brk_core/src/structs/p2pk33addressindex.rs
index e925af645..c6f5aa7de 100644
--- a/crates/brk_core/src/structs/p2pk33addressindex.rs
+++ b/crates/brk_core/src/structs/p2pk33addressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,6 +31,21 @@ impl From<TypeIndex> for P2PK33AddressIndex {
         Self(value)
     }
 }
+impl From<P2PK33AddressIndex> for TypeIndex {
+    fn from(value: P2PK33AddressIndex) -> Self {
+        value.0
+    }
+}
+impl From<P2PK33AddressIndex> for u32 {
+    fn from(value: P2PK33AddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2PK33AddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<P2PK33AddressIndex> for usize {
     fn from(value: P2PK33AddressIndex) -> Self {
         Self::from(*value)
@@ -60,3 +77,19 @@ impl Printable for P2PK33AddressIndex {
         &["pk33addr", "p2pk33addr", "p2pk33addressindex"]
     }
 }
+
+impl From<ByteView> for P2PK33AddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2PK33AddressIndex> for ByteView {
+    fn from(value: P2PK33AddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2PK33AddressIndex> for ByteView {
+    fn from(value: &P2PK33AddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/p2pk65addressindex.rs b/crates/brk_core/src/structs/p2pk65addressindex.rs
index a16b3a3e6..8de0a1df0 100644
--- a/crates/brk_core/src/structs/p2pk65addressindex.rs
+++ b/crates/brk_core/src/structs/p2pk65addressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,11 +31,26 @@ impl From<TypeIndex> for P2PK65AddressIndex {
         Self(value)
     }
 }
+impl From<P2PK65AddressIndex> for TypeIndex {
+    fn from(value: P2PK65AddressIndex) -> Self {
+        value.0
+    }
+}
 impl From<P2PK65AddressIndex> for usize {
     fn from(value: P2PK65AddressIndex) -> Self {
         Self::from(*value)
     }
 }
+impl From<P2PK65AddressIndex> for u32 {
+    fn from(value: P2PK65AddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2PK65AddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<usize> for P2PK65AddressIndex {
     fn from(value: usize) -> Self {
         Self(TypeIndex::from(value))
@@ -59,3 +76,19 @@ impl Printable for P2PK65AddressIndex {
         &["pk65addr", "p2pk65addr", "p2pk65addressindex"]
     }
 }
+
+impl From<ByteView> for P2PK65AddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2PK65AddressIndex> for ByteView {
+    fn from(value: P2PK65AddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2PK65AddressIndex> for ByteView {
+    fn from(value: &P2PK65AddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/p2pkhaddressindex.rs b/crates/brk_core/src/structs/p2pkhaddressindex.rs
index ca6e8c729..a481af106 100644
--- a/crates/brk_core/src/structs/p2pkhaddressindex.rs
+++ b/crates/brk_core/src/structs/p2pkhaddressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,11 +31,26 @@ impl From<TypeIndex> for P2PKHAddressIndex {
         Self(value)
     }
 }
+impl From<P2PKHAddressIndex> for TypeIndex {
+    fn from(value: P2PKHAddressIndex) -> Self {
+        value.0
+    }
+}
 impl From<P2PKHAddressIndex> for usize {
     fn from(value: P2PKHAddressIndex) -> Self {
         Self::from(*value)
     }
 }
+impl From<P2PKHAddressIndex> for u32 {
+    fn from(value: P2PKHAddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2PKHAddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<usize> for P2PKHAddressIndex {
     fn from(value: usize) -> Self {
         Self(TypeIndex::from(value))
@@ -60,3 +77,19 @@ impl Printable for P2PKHAddressIndex {
         &["pkhaddr", "p2pkhaddr", "p2pkhaddressindex"]
     }
 }
+
+impl From<ByteView> for P2PKHAddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2PKHAddressIndex> for ByteView {
+    fn from(value: P2PKHAddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2PKHAddressIndex> for ByteView {
+    fn from(value: &P2PKHAddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/p2shaddressindex.rs b/crates/brk_core/src/structs/p2shaddressindex.rs
index 90dff9c7a..4ee432881 100644
--- a/crates/brk_core/src/structs/p2shaddressindex.rs
+++ b/crates/brk_core/src/structs/p2shaddressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,6 +31,21 @@ impl From<TypeIndex> for P2SHAddressIndex {
         Self(value)
     }
 }
+impl From<P2SHAddressIndex> for TypeIndex {
+    fn from(value: P2SHAddressIndex) -> Self {
+        value.0
+    }
+}
+impl From<P2SHAddressIndex> for u32 {
+    fn from(value: P2SHAddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2SHAddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<P2SHAddressIndex> for usize {
     fn from(value: P2SHAddressIndex) -> Self {
         Self::from(*value)
@@ -60,3 +77,19 @@ impl Printable for P2SHAddressIndex {
         &["shaddr", "p2shaddr", "p2shaddressindex"]
     }
 }
+
+impl From<ByteView> for P2SHAddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2SHAddressIndex> for ByteView {
+    fn from(value: P2SHAddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2SHAddressIndex> for ByteView {
+    fn from(value: &P2SHAddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/p2traddressindex.rs b/crates/brk_core/src/structs/p2traddressindex.rs
index ff6633516..7f76cb713 100644
--- a/crates/brk_core/src/structs/p2traddressindex.rs
+++ b/crates/brk_core/src/structs/p2traddressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,6 +31,21 @@ impl From<TypeIndex> for P2TRAddressIndex {
         Self(value)
     }
 }
+impl From<P2TRAddressIndex> for TypeIndex {
+    fn from(value: P2TRAddressIndex) -> Self {
+        value.0
+    }
+}
+impl From<P2TRAddressIndex> for u32 {
+    fn from(value: P2TRAddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2TRAddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<P2TRAddressIndex> for usize {
     fn from(value: P2TRAddressIndex) -> Self {
         Self::from(*value)
@@ -60,3 +77,19 @@ impl Printable for P2TRAddressIndex {
         &["traddr", "p2traddr", "p2traddressindex"]
     }
 }
+
+impl From<ByteView> for P2TRAddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2TRAddressIndex> for ByteView {
+    fn from(value: P2TRAddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2TRAddressIndex> for ByteView {
+    fn from(value: &P2TRAddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/p2wpkhaddressindex.rs b/crates/brk_core/src/structs/p2wpkhaddressindex.rs
index fb6528b80..dbda26d63 100644
--- a/crates/brk_core/src/structs/p2wpkhaddressindex.rs
+++ b/crates/brk_core/src/structs/p2wpkhaddressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,11 +31,26 @@ impl From<TypeIndex> for P2WPKHAddressIndex {
         Self(value)
     }
 }
+impl From<P2WPKHAddressIndex> for TypeIndex {
+    fn from(value: P2WPKHAddressIndex) -> Self {
+        value.0
+    }
+}
 impl From<P2WPKHAddressIndex> for usize {
     fn from(value: P2WPKHAddressIndex) -> Self {
         Self::from(*value)
     }
 }
+impl From<P2WPKHAddressIndex> for u32 {
+    fn from(value: P2WPKHAddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2WPKHAddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<usize> for P2WPKHAddressIndex {
     fn from(value: usize) -> Self {
         Self(TypeIndex::from(value))
@@ -60,3 +77,19 @@ impl Printable for P2WPKHAddressIndex {
         &["wpkhaddr", "p2wpkhaddr", "p2wpkhaddressindex"]
     }
 }
+
+impl From<ByteView> for P2WPKHAddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2WPKHAddressIndex> for ByteView {
+    fn from(value: P2WPKHAddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2WPKHAddressIndex> for ByteView {
+    fn from(value: &P2WPKHAddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/p2wshaddressindex.rs b/crates/brk_core/src/structs/p2wshaddressindex.rs
index 6a61485cb..3d92cd598 100644
--- a/crates/brk_core/src/structs/p2wshaddressindex.rs
+++ b/crates/brk_core/src/structs/p2wshaddressindex.rs
@@ -1,7 +1,9 @@
 use std::ops::Add;
 
+use byteview::ByteView;
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
+use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
 use crate::{CheckedSub, Printable, TypeIndex};
@@ -29,6 +31,21 @@ impl From<TypeIndex> for P2WSHAddressIndex {
         Self(value)
     }
 }
+impl From<P2WSHAddressIndex> for TypeIndex {
+    fn from(value: P2WSHAddressIndex) -> Self {
+        value.0
+    }
+}
+impl From<P2WSHAddressIndex> for u32 {
+    fn from(value: P2WSHAddressIndex) -> Self {
+        Self::from(*value)
+    }
+}
+impl From<u32> for P2WSHAddressIndex {
+    fn from(value: u32) -> Self {
+        Self(TypeIndex::from(value))
+    }
+}
 impl From<P2WSHAddressIndex> for usize {
     fn from(value: P2WSHAddressIndex) -> Self {
         Self::from(*value)
@@ -60,3 +77,19 @@ impl Printable for P2WSHAddressIndex {
         &["wshaddr", "p2wshaddr", "p2wshaddressindex"]
     }
 }
+
+impl From<ByteView> for P2WSHAddressIndex {
+    fn from(value: ByteView) -> Self {
+        Self::read_from_bytes(&value).unwrap()
+    }
+}
+impl From<P2WSHAddressIndex> for ByteView {
+    fn from(value: P2WSHAddressIndex) -> Self {
+        Self::from(&value)
+    }
+}
+impl From<&P2WSHAddressIndex> for ByteView {
+    fn from(value: &P2WSHAddressIndex) -> Self {
+        Self::new(value.as_bytes())
+    }
+}
diff --git a/crates/brk_core/src/structs/quarterindex.rs b/crates/brk_core/src/structs/quarterindex.rs
index 6f77bb7a5..3ace803ae 100644
--- a/crates/brk_core/src/structs/quarterindex.rs
+++ b/crates/brk_core/src/structs/quarterindex.rs
@@ -1,4 +1,7 @@
-use std::{fmt::Debug, ops::Add};
+use std::{
+    fmt::Debug,
+    ops::{Add, AddAssign, Div},
+};
 
 use serde::{Deserialize, Serialize};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
@@ -37,6 +40,12 @@ impl From<usize> for QuarterIndex {
     }
 }
 
+impl From<QuarterIndex> for u16 {
+    fn from(value: QuarterIndex) -> Self {
+        value.0
+    }
+}
+
 impl From<QuarterIndex> for usize {
     fn from(value: QuarterIndex) -> Self {
         value.0 as usize
@@ -51,6 +60,27 @@ impl Add<usize> for QuarterIndex {
     }
 }
 
+impl Add<QuarterIndex> for QuarterIndex {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::from(self.0 + rhs.0)
+    }
+}
+
+impl AddAssign for QuarterIndex {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Self(self.0 + rhs.0)
+    }
+}
+
+impl Div<usize> for QuarterIndex {
+    type Output = Self;
+    fn div(self, _: usize) -> Self::Output {
+        unreachable!()
+    }
+}
+
 impl From<MonthIndex> for QuarterIndex {
     fn from(value: MonthIndex) -> Self {
         Self((usize::from(value) / 3) as u16)
diff --git a/crates/brk_core/src/structs/sats.rs b/crates/brk_core/src/structs/sats.rs
index 129be399b..81c00d7ea 100644
--- a/crates/brk_core/src/structs/sats.rs
+++ b/crates/brk_core/src/structs/sats.rs
@@ -36,9 +36,24 @@ pub struct Sats(u64);
 #[allow(clippy::inconsistent_digit_grouping)]
 impl Sats {
     pub const ZERO: Self = Self(0);
-    pub const MAX: Self = Self(u64::MAX);
+    pub const _1: Self = Self(1);
+    pub const _10: Self = Self(10);
+    pub const _100: Self = Self(100);
+    pub const _1K: Self = Self(1_000);
+    pub const _10K: Self = Self(10_000);
+    pub const _100K: Self = Self(100_000);
+    pub const _1M: Self = Self(1_000_000);
+    pub const _10M: Self = Self(10_000_000);
+    pub const _1BTC: Self = Self::ONE_BTC;
+    pub const _10BTC: Self = Self(10_00_000_000);
+    pub const _100BTC: Self = Self(100_00_000_000);
+    pub const _1K_BTC: Self = Self(1_000_00_000_000);
+    pub const _10K_BTC: Self = Self(10_000_00_000_000);
+    pub const _100K_BTC: Self = Self(100_000_00_000_000);
     pub const ONE_BTC: Self = Self(1_00_000_000);
+    pub const MAX: Self = Self(u64::MAX);
     pub const FIFTY_BTC: Self = Self(50_00_000_000);
+    pub const ONE_BTC_U128: u128 = 1_00_000_000;
 
     pub fn new(sats: u64) -> Self {
         Self(sats)
@@ -81,6 +96,10 @@ impl CheckedSub<usize> for Sats {
 impl SubAssign for Sats {
     fn sub_assign(&mut self, rhs: Self) {
         *self = self.checked_sub(rhs).unwrap();
+        //     .unwrap_or_else(|| {
+        //     dbg!((*self, rhs));
+        //     unreachable!();
+        // });
     }
 }
 
diff --git a/crates/brk_core/src/structs/semesterindex.rs b/crates/brk_core/src/structs/semesterindex.rs
new file mode 100644
index 000000000..4d3c0f649
--- /dev/null
+++ b/crates/brk_core/src/structs/semesterindex.rs
@@ -0,0 +1,104 @@
+use std::{
+    fmt::Debug,
+    ops::{Add, AddAssign, Div},
+};
+
+use serde::{Deserialize, Serialize};
+use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
+
+use crate::{CheckedSub, Printable};
+
+use super::MonthIndex;
+
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Default,
+    Serialize,
+    Deserialize,
+    FromBytes,
+    Immutable,
+    IntoBytes,
+    KnownLayout,
+)]
+pub struct SemesterIndex(u16);
+
+impl From<u16> for SemesterIndex {
+    fn from(value: u16) -> Self {
+        Self(value)
+    }
+}
+
+impl From<usize> for SemesterIndex {
+    fn from(value: usize) -> Self {
+        Self(value as u16)
+    }
+}
+
+impl From<SemesterIndex> for u16 {
+    fn from(value: SemesterIndex) -> Self {
+        value.0
+    }
+}
+
+impl From<SemesterIndex> for usize {
+    fn from(value: SemesterIndex) -> Self {
+        value.0 as usize
+    }
+}
+
+impl Add<usize> for SemesterIndex {
+    type Output = Self;
+
+    fn add(self, rhs: usize) -> Self::Output {
+        Self::from(self.0 + rhs as u16)
+    }
+}
+
+impl Add<SemesterIndex> for SemesterIndex {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::from(self.0 + rhs.0)
+    }
+}
+
+impl AddAssign for SemesterIndex {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Self(self.0 + rhs.0)
+    }
+}
+
+impl Div<usize> for SemesterIndex {
+    type Output = Self;
+    fn div(self, _: usize) -> Self::Output {
+        unreachable!()
+    }
+}
+
+impl From<MonthIndex> for SemesterIndex {
+    fn from(value: MonthIndex) -> Self {
+        Self((usize::from(value) / 6) as u16)
+    }
+}
+
+impl CheckedSub for SemesterIndex {
+    fn checked_sub(self, rhs: Self) -> Option<Self> {
+        self.0.checked_sub(rhs.0).map(Self)
+    }
+}
+
+impl Printable for SemesterIndex {
+    fn to_string() -> &'static str {
+        "semesterindex"
+    }
+
+    fn to_possible_strings() -> &'static [&'static str] {
+        &["s", "semester", "semesterindex"]
+    }
+}
diff --git a/crates/brk_core/src/structs/stored_f32.rs b/crates/brk_core/src/structs/stored_f32.rs
index 8da7e21ad..a50799a93 100644
--- a/crates/brk_core/src/structs/stored_f32.rs
+++ b/crates/brk_core/src/structs/stored_f32.rs
@@ -1,7 +1,7 @@
 use core::panic;
 use std::{
     cmp::Ordering,
-    ops::{Add, Div, Mul, Sub},
+    ops::{Add, AddAssign, Div, Mul, Sub},
 };
 
 use derive_deref::Deref;
@@ -70,6 +70,12 @@ impl Add for StoredF32 {
     }
 }
 
+impl AddAssign for StoredF32 {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl From<StoredF32> for f32 {
     fn from(value: StoredF32) -> Self {
         value.0
diff --git a/crates/brk_core/src/structs/stored_f64.rs b/crates/brk_core/src/structs/stored_f64.rs
index 90c89bb9e..f22ff993a 100644
--- a/crates/brk_core/src/structs/stored_f64.rs
+++ b/crates/brk_core/src/structs/stored_f64.rs
@@ -1,7 +1,7 @@
 use std::{
     cmp::Ordering,
     f64,
-    ops::{Add, Div, Mul},
+    ops::{Add, AddAssign, Div, Mul},
 };
 
 use derive_deref::Deref;
@@ -65,6 +65,12 @@ impl Add for StoredF64 {
     }
 }
 
+impl AddAssign for StoredF64 {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl From<StoredF64> for f64 {
     fn from(value: StoredF64) -> Self {
         value.0
diff --git a/crates/brk_core/src/structs/stored_u32.rs b/crates/brk_core/src/structs/stored_u32.rs
index de9569069..b1e4b5d96 100644
--- a/crates/brk_core/src/structs/stored_u32.rs
+++ b/crates/brk_core/src/structs/stored_u32.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, Div};
+use std::ops::{Add, AddAssign, Div};
 
 use derive_deref::Deref;
 use serde::Serialize;
@@ -73,6 +73,12 @@ impl Add for StoredU32 {
     }
 }
 
+impl AddAssign for StoredU32 {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl From<f64> for StoredU32 {
     fn from(value: f64) -> Self {
         if value < 0.0 || value > u32::MAX as f64 {
diff --git a/crates/brk_core/src/structs/stored_u64.rs b/crates/brk_core/src/structs/stored_u64.rs
index 1edd718d8..82a8908dc 100644
--- a/crates/brk_core/src/structs/stored_u64.rs
+++ b/crates/brk_core/src/structs/stored_u64.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, Div};
+use std::ops::{Add, AddAssign, Div};
 
 use derive_deref::Deref;
 use serde::Serialize;
@@ -65,6 +65,12 @@ impl Add for StoredU64 {
     }
 }
 
+impl AddAssign for StoredU64 {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl From<f64> for StoredU64 {
     fn from(value: f64) -> Self {
         if value < 0.0 || value > u32::MAX as f64 {
diff --git a/crates/brk_core/src/structs/stored_u8.rs b/crates/brk_core/src/structs/stored_u8.rs
index 8597589c3..0d36823aa 100644
--- a/crates/brk_core/src/structs/stored_u8.rs
+++ b/crates/brk_core/src/structs/stored_u8.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, Div};
+use std::ops::{Add, AddAssign, Div};
 
 use derive_deref::Deref;
 use serde::Serialize;
@@ -66,6 +66,12 @@ impl Add for StoredU8 {
     }
 }
 
+impl AddAssign for StoredU8 {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl From<f64> for StoredU8 {
     fn from(value: f64) -> Self {
         if value < 0.0 || value > u32::MAX as f64 {
diff --git a/crates/brk_core/src/structs/stored_usize.rs b/crates/brk_core/src/structs/stored_usize.rs
index 547ed8ed7..18bd22749 100644
--- a/crates/brk_core/src/structs/stored_usize.rs
+++ b/crates/brk_core/src/structs/stored_usize.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, Div};
+use std::ops::{Add, AddAssign, Div};
 
 use derive_deref::{Deref, DerefMut};
 use serde::Serialize;
@@ -45,6 +45,11 @@ impl From<usize> for StoredUsize {
         Self(value)
     }
 }
+impl From<StoredUsize> for usize {
+    fn from(value: StoredUsize) -> Self {
+        *value
+    }
+}
 
 impl CheckedSub<StoredUsize> for StoredUsize {
     fn checked_sub(self, rhs: Self) -> Option<Self> {
@@ -66,6 +71,12 @@ impl Add for StoredUsize {
     }
 }
 
+impl AddAssign for StoredUsize {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl From<f64> for StoredUsize {
     fn from(value: f64) -> Self {
         if value < 0.0 || value > u32::MAX as f64 {
diff --git a/crates/brk_core/src/structs/timestamp.rs b/crates/brk_core/src/structs/timestamp.rs
index b5b733eea..67d74dbd6 100644
--- a/crates/brk_core/src/structs/timestamp.rs
+++ b/crates/brk_core/src/structs/timestamp.rs
@@ -1,7 +1,4 @@
-use std::{
-    cmp::Ordering,
-    ops::{Add, Div},
-};
+use std::ops::{Add, AddAssign, Div};
 
 use derive_deref::Deref;
 use jiff::{civil::date, tz::TimeZone};
@@ -29,7 +26,9 @@ use super::Date;
 )]
 pub struct Timestamp(u32);
 
-const ONE_DAY_IN_SEC: i64 = 24 * 60 * 60;
+const ONE_HOUR_IN_SEC: u32 = 60 * 60;
+const ONE_DAY_IN_SEC: u32 = 24 * 60 * 60;
+const ONE_DAY_IN_SEC_F64: f64 = ONE_DAY_IN_SEC as f64;
 
 impl Timestamp {
     pub const ZERO: Self = Self(0);
@@ -50,30 +49,25 @@ impl Timestamp {
         Self::from(trunc_date_time.to_zoned(TimeZone::UTC).unwrap().timestamp())
     }
 
-    pub fn difference_in_days_between(&self, other: Self) -> usize {
-        match self.cmp(&other) {
-            Ordering::Equal => 0,
-            Ordering::Greater => other.difference_in_days_between(*self),
-            Ordering::Less => {
-                (jiff::Timestamp::from(*self)
-                    .duration_until(jiff::Timestamp::from(other))
-                    .as_secs()
-                    / ONE_DAY_IN_SEC) as usize
-            }
-        }
+    #[inline]
+    pub fn difference_in_days_between(&self, older: Self) -> usize {
+        // if self.0 < older.0 {
+        //     unreachable!()
+        // }
+        ((self.0 - older.0) / ONE_DAY_IN_SEC) as usize
     }
 
-    pub fn difference_in_days_between_float(&self, other: Self) -> f64 {
-        match self.cmp(&other) {
-            Ordering::Equal => 0.0,
-            Ordering::Greater => other.difference_in_days_between_float(*self),
-            Ordering::Less => {
-                jiff::Timestamp::from(*self)
-                    .duration_until(jiff::Timestamp::from(other))
-                    .as_secs() as f64
-                    / ONE_DAY_IN_SEC as f64
-            }
-        }
+    #[inline]
+    pub fn difference_in_days_between_float(&self, older: Self) -> f64 {
+        // if self.0 < older.0 {
+        //     unreachable!()
+        // }
+        (self.0 - older.0) as f64 / ONE_DAY_IN_SEC_F64
+    }
+
+    #[inline]
+    pub fn is_more_than_hour(&self) -> bool {
+        self.0 >= ONE_HOUR_IN_SEC
     }
 }
 
@@ -138,6 +132,12 @@ impl Add for Timestamp {
     }
 }
 
+impl AddAssign for Timestamp {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl From<f64> for Timestamp {
     fn from(value: f64) -> Self {
         if value < 0.0 || value > u32::MAX as f64 {
diff --git a/crates/brk_core/src/structs/typeindex.rs b/crates/brk_core/src/structs/typeindex.rs
index 995e91d0a..8ea03066a 100644
--- a/crates/brk_core/src/structs/typeindex.rs
+++ b/crates/brk_core/src/structs/typeindex.rs
@@ -45,6 +45,11 @@ impl From<u32> for TypeIndex {
         Self(value)
     }
 }
+impl From<TypeIndex> for u32 {
+    fn from(value: TypeIndex) -> Self {
+        value.0
+    }
+}
 
 impl From<u64> for TypeIndex {
     fn from(value: u64) -> Self {
diff --git a/crates/brk_core/src/structs/typeindex_with_outputindex.rs b/crates/brk_core/src/structs/typeindex_with_outputindex.rs
new file mode 100644
index 000000000..8a80a1dfd
--- /dev/null
+++ b/crates/brk_core/src/structs/typeindex_with_outputindex.rs
@@ -0,0 +1,48 @@
+use byteview::ByteView;
+use serde::Serialize;
+
+use crate::{TypeIndex, copy_first_4bytes, copy_first_8bytes};
+
+use super::OutputIndex;
+
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Default, Serialize)]
+pub struct TypeIndexWithOutputindex {
+    typeindex: TypeIndex,
+    outputindex: OutputIndex,
+}
+
+impl From<(TypeIndex, OutputIndex)> for TypeIndexWithOutputindex {
+    fn from(value: (TypeIndex, OutputIndex)) -> Self {
+        Self {
+            typeindex: value.0,
+            outputindex: value.1,
+        }
+    }
+}
+
+impl From<ByteView> for TypeIndexWithOutputindex {
+    fn from(value: ByteView) -> Self {
+        let typeindex = TypeIndex::from(u32::from_be_bytes(copy_first_4bytes(&value).unwrap()));
+        let outputindex = OutputIndex::from(u64::from_be_bytes(copy_first_8bytes(&value).unwrap()));
+        Self {
+            typeindex,
+            outputindex,
+        }
+    }
+}
+impl From<TypeIndexWithOutputindex> for ByteView {
+    fn from(value: TypeIndexWithOutputindex) -> Self {
+        ByteView::from(&value)
+    }
+}
+impl From<&TypeIndexWithOutputindex> for ByteView {
+    fn from(value: &TypeIndexWithOutputindex) -> Self {
+        ByteView::from(
+            [
+                u32::from(value.typeindex).to_be_bytes().as_slice(),
+                u64::from(value.outputindex).to_be_bytes().as_slice(),
+            ]
+            .concat(),
+        )
+    }
+}
diff --git a/crates/brk_core/src/structs/version.rs b/crates/brk_core/src/structs/version.rs
index dc740367c..e05109b98 100644
--- a/crates/brk_core/src/structs/version.rs
+++ b/crates/brk_core/src/structs/version.rs
@@ -65,6 +65,12 @@ impl Version {
     }
 }
 
+impl From<Version> for u64 {
+    fn from(value: Version) -> u64 {
+        value.0
+    }
+}
+
 impl From<u64> for Version {
     fn from(value: u64) -> Self {
         Self(value)
diff --git a/crates/brk_core/src/structs/weekindex.rs b/crates/brk_core/src/structs/weekindex.rs
index 811ec4feb..d302cdfe7 100644
--- a/crates/brk_core/src/structs/weekindex.rs
+++ b/crates/brk_core/src/structs/weekindex.rs
@@ -1,4 +1,7 @@
-use std::{fmt::Debug, ops::Add};
+use std::{
+    fmt::Debug,
+    ops::{Add, AddAssign, Div},
+};
 
 use serde::{Deserialize, Serialize};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
@@ -31,6 +34,12 @@ impl From<u16> for WeekIndex {
     }
 }
 
+impl From<WeekIndex> for u16 {
+    fn from(value: WeekIndex) -> Self {
+        value.0
+    }
+}
+
 impl From<usize> for WeekIndex {
     fn from(value: usize) -> Self {
         Self(value as u16)
@@ -43,6 +52,27 @@ impl From<WeekIndex> for usize {
     }
 }
 
+impl Add<WeekIndex> for WeekIndex {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::from(self.0 + rhs.0)
+    }
+}
+
+impl AddAssign for WeekIndex {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Self(self.0 + rhs.0)
+    }
+}
+
+impl Div<usize> for WeekIndex {
+    type Output = Self;
+    fn div(self, _: usize) -> Self::Output {
+        unreachable!()
+    }
+}
+
 impl Add<usize> for WeekIndex {
     type Output = Self;
 
@@ -68,7 +98,6 @@ impl From<Date> for WeekIndex {
             let d = jiff::civil::Date::new(year, 6, 6).unwrap();
             let i = d.iso_week_date();
             let w = i.weeks_in_year();
-            // dbg!(d, w);
             week += w as u16;
             year += 1;
         }
diff --git a/crates/brk_core/src/structs/weight.rs b/crates/brk_core/src/structs/weight.rs
index 5c56ceb6f..10b8ed8ad 100644
--- a/crates/brk_core/src/structs/weight.rs
+++ b/crates/brk_core/src/structs/weight.rs
@@ -1,4 +1,4 @@
-use std::ops::{Add, Div};
+use std::ops::{Add, AddAssign, Div};
 
 use derive_deref::Deref;
 use serde::Serialize;
@@ -58,6 +58,12 @@ impl Add for Weight {
     }
 }
 
+impl AddAssign for Weight {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = *self + rhs
+    }
+}
+
 impl Div<usize> for Weight {
     type Output = Self;
     fn div(self, rhs: usize) -> Self::Output {
diff --git a/crates/brk_core/src/structs/yearindex.rs b/crates/brk_core/src/structs/yearindex.rs
index 78261f78f..8ba72883f 100644
--- a/crates/brk_core/src/structs/yearindex.rs
+++ b/crates/brk_core/src/structs/yearindex.rs
@@ -1,4 +1,7 @@
-use std::{fmt::Debug, ops::Add};
+use std::{
+    fmt::Debug,
+    ops::{Add, AddAssign, Div},
+};
 
 use serde::{Deserialize, Serialize};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
@@ -51,6 +54,27 @@ impl Add<usize> for YearIndex {
     }
 }
 
+impl Add<YearIndex> for YearIndex {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        Self::from(self.0 + rhs.0)
+    }
+}
+
+impl AddAssign for YearIndex {
+    fn add_assign(&mut self, rhs: Self) {
+        *self = Self(self.0 + rhs.0)
+    }
+}
+
+impl Div<usize> for YearIndex {
+    type Output = Self;
+    fn div(self, _: usize) -> Self::Output {
+        unreachable!()
+    }
+}
+
 impl From<DateIndex> for YearIndex {
     fn from(value: DateIndex) -> Self {
         Self::from(Date::from(value))
diff --git a/crates/brk_core/src/traits/from_coarser.rs b/crates/brk_core/src/traits/from_coarser.rs
new file mode 100644
index 000000000..93c1f697e
--- /dev/null
+++ b/crates/brk_core/src/traits/from_coarser.rs
@@ -0,0 +1,18 @@
+use std::ops::RangeInclusive;
+
+pub trait FromCoarserIndex<T>
+where
+    T: Ord + From<usize>,
+{
+    fn min_from(coarser: T) -> usize;
+    fn max_from_(coarser: T) -> usize;
+    fn max_from(coarser: T, len: usize) -> usize {
+        Self::max_from_(coarser).min(len - 1)
+    }
+    fn inclusive_range_from(coarser: T, len: usize) -> RangeInclusive<usize>
+    where
+        T: Clone,
+    {
+        Self::min_from(coarser.clone())..=Self::max_from(coarser, len)
+    }
+}
diff --git a/crates/brk_core/src/traits/mod.rs b/crates/brk_core/src/traits/mod.rs
index ca46c3328..8e724b8e7 100644
--- a/crates/brk_core/src/traits/mod.rs
+++ b/crates/brk_core/src/traits/mod.rs
@@ -1,3 +1,5 @@
+mod from_coarser;
 mod printable;
 
+pub use from_coarser::*;
 pub use printable::*;
diff --git a/crates/brk_core/src/utils/bytes.rs b/crates/brk_core/src/utils/bytes.rs
index e1146adcc..52ea86924 100644
--- a/crates/brk_core/src/utils/bytes.rs
+++ b/crates/brk_core/src/utils/bytes.rs
@@ -1,5 +1,18 @@
 use crate::{Error, Result};
 
+#[allow(clippy::result_unit_err)]
+pub fn copy_first_4bytes(slice: &[u8]) -> Result<[u8; 4]> {
+    let mut buf: [u8; 4] = [0; 4];
+    let buf_len = buf.len();
+    if slice.len() < buf_len {
+        return Err(Error::String("Buffer is too small to convert to 8 bytes"));
+    }
+    slice.iter().take(buf_len).enumerate().for_each(|(i, r)| {
+        buf[i] = *r;
+    });
+    Ok(buf)
+}
+
 #[allow(clippy::result_unit_err)]
 pub fn copy_first_8bytes(slice: &[u8]) -> Result<[u8; 8]> {
     let mut buf: [u8; 8] = [0; 8];
diff --git a/crates/brk_core/src/utils/rlimit.rs b/crates/brk_core/src/utils/rlimit.rs
index 162a52574..f725c7b96 100644
--- a/crates/brk_core/src/utils/rlimit.rs
+++ b/crates/brk_core/src/utils/rlimit.rs
@@ -7,7 +7,7 @@ pub fn setrlimit() -> io::Result<()> {
 
     rlimit::setrlimit(
         Resource::NOFILE,
-        no_file_limit.0.max(210_000),
+        no_file_limit.0.max(10_000),
         no_file_limit.1,
     )?;
 
diff --git a/crates/brk_indexer/src/lib.rs b/crates/brk_indexer/src/lib.rs
index 876e445db..4d1e1ae0a 100644
--- a/crates/brk_indexer/src/lib.rs
+++ b/crates/brk_indexer/src/lib.rs
@@ -7,14 +7,15 @@ use std::{collections::BTreeMap, path::Path, str::FromStr, thread};
 
 use brk_core::{
     AddressBytes, AddressBytesHash, BlockHash, BlockHashPrefix, Height, InputIndex, OutputIndex,
-    OutputType, Sats, Timestamp, TxIndex, Txid, TxidPrefix, TypeIndex, Version, Vin, Vout,
-    setrlimit,
+    OutputType, Sats, Timestamp, TxIndex, Txid, TxidPrefix, TypeIndex, TypeIndexWithOutputindex,
+    Unit, Version, Vin, Vout, setrlimit,
 };
 
 use bitcoin::{Transaction, TxIn, TxOut};
 use brk_exit::Exit;
 use brk_parser::Parser;
-use brk_vec::{AnyVec, VecIterator};
+use brk_store::AnyStore;
+use brk_vec::{AnyVec, Mmap, VecIterator};
 use color_eyre::eyre::{ContextCompat, eyre};
 use log::{error, info};
 use rayon::prelude::*;
@@ -39,6 +40,7 @@ pub struct Indexer {
 impl Indexer {
     pub fn forced_import(outputs_dir: &Path) -> color_eyre::Result<Self> {
         setrlimit()?;
+
         Ok(Self {
             vecs: Vecs::forced_import(&outputs_dir.join("vecs/indexed"), VERSION + Version::ZERO)?,
             stores: Stores::forced_import(&outputs_dir.join("stores"), VERSION + Version::ZERO)?,
@@ -55,6 +57,9 @@ impl Indexer {
         let starting_indexes = Indexes::try_from((&mut self.vecs, &self.stores, rpc))
             .unwrap_or_else(|_report| Indexes::default());
 
+        // dbg!(starting_indexes);
+        // panic!();
+
         exit.block();
         self.stores
             .rollback_if_needed(&mut self.vecs, &starting_indexes)?;
@@ -84,9 +89,9 @@ impl Indexer {
                                 height: Height,
                                 rem: bool,
                                 exit: &Exit|
-         -> color_eyre::Result<()> {
+         -> color_eyre::Result<bool> {
             if height == 0 || (height % SNAPSHOT_BLOCK_RANGE != 0) != rem || exit.triggered() {
-                return Ok(());
+                return Ok(false);
             }
 
             info!("Exporting...");
@@ -94,15 +99,88 @@ impl Indexer {
             stores.commit(height)?;
             vecs.flush(height)?;
             exit.release();
-            Ok(())
+            Ok(true)
         };
 
+        let mut txindex_to_first_outputindex_mmap_opt = None;
+        let mut p2pk65addressindex_to_p2pk65bytes_mmap_opt = None;
+        let mut p2pk33addressindex_to_p2pk33bytes_mmap_opt = None;
+        let mut p2pkhaddressindex_to_p2pkhbytes_mmap_opt = None;
+        let mut p2shaddressindex_to_p2shbytes_mmap_opt = None;
+        let mut p2wpkhaddressindex_to_p2wpkhbytes_mmap_opt = None;
+        let mut p2wshaddressindex_to_p2wshbytes_mmap_opt = None;
+        let mut p2traddressindex_to_p2trbytes_mmap_opt = None;
+        let mut p2aaddressindex_to_p2abytes_mmap_opt = None;
+
+        let reset_mmaps_options =
+            |vecs: &mut Vecs,
+             txindex_to_first_outputindex_mmap_opt: &mut Option<Mmap>,
+             p2pk65addressindex_to_p2pk65bytes_mmap_opt: &mut Option<Mmap>,
+             p2pk33addressindex_to_p2pk33bytes_mmap_opt: &mut Option<Mmap>,
+             p2pkhaddressindex_to_p2pkhbytes_mmap_opt: &mut Option<Mmap>,
+             p2shaddressindex_to_p2shbytes_mmap_opt: &mut Option<Mmap>,
+             p2wpkhaddressindex_to_p2wpkhbytes_mmap_opt: &mut Option<Mmap>,
+             p2wshaddressindex_to_p2wshbytes_mmap_opt: &mut Option<Mmap>,
+             p2traddressindex_to_p2trbytes_mmap_opt: &mut Option<Mmap>,
+             p2aaddressindex_to_p2abytes_mmap_opt: &mut Option<Mmap>| {
+                txindex_to_first_outputindex_mmap_opt
+                    .replace(vecs.txindex_to_first_outputindex.create_mmap().unwrap());
+                p2pk65addressindex_to_p2pk65bytes_mmap_opt.replace(
+                    vecs.p2pk65addressindex_to_p2pk65bytes
+                        .create_mmap()
+                        .unwrap(),
+                );
+                p2pk33addressindex_to_p2pk33bytes_mmap_opt.replace(
+                    vecs.p2pk33addressindex_to_p2pk33bytes
+                        .create_mmap()
+                        .unwrap(),
+                );
+                p2pkhaddressindex_to_p2pkhbytes_mmap_opt
+                    .replace(vecs.p2pkhaddressindex_to_p2pkhbytes.create_mmap().unwrap());
+                p2shaddressindex_to_p2shbytes_mmap_opt
+                    .replace(vecs.p2shaddressindex_to_p2shbytes.create_mmap().unwrap());
+                p2wpkhaddressindex_to_p2wpkhbytes_mmap_opt.replace(
+                    vecs.p2wpkhaddressindex_to_p2wpkhbytes
+                        .create_mmap()
+                        .unwrap(),
+                );
+                p2wshaddressindex_to_p2wshbytes_mmap_opt
+                    .replace(vecs.p2wshaddressindex_to_p2wshbytes.create_mmap().unwrap());
+                p2traddressindex_to_p2trbytes_mmap_opt
+                    .replace(vecs.p2traddressindex_to_p2trbytes.create_mmap().unwrap());
+                p2aaddressindex_to_p2abytes_mmap_opt
+                    .replace(vecs.p2aaddressindex_to_p2abytes.create_mmap().unwrap());
+            };
+
+        reset_mmaps_options(
+            vecs,
+            &mut txindex_to_first_outputindex_mmap_opt,
+            &mut p2pk65addressindex_to_p2pk65bytes_mmap_opt,
+            &mut p2pk33addressindex_to_p2pk33bytes_mmap_opt,
+            &mut p2pkhaddressindex_to_p2pkhbytes_mmap_opt,
+            &mut p2shaddressindex_to_p2shbytes_mmap_opt,
+            &mut p2wpkhaddressindex_to_p2wpkhbytes_mmap_opt,
+            &mut p2wshaddressindex_to_p2wshbytes_mmap_opt,
+            &mut p2traddressindex_to_p2trbytes_mmap_opt,
+            &mut p2aaddressindex_to_p2abytes_mmap_opt,
+        );
+
         parser.parse(start, end).iter().try_for_each(
             |(height, block, blockhash)| -> color_eyre::Result<()> {
                 info!("Indexing block {height}...");
 
                 idxs.height = height;
 
+                let txindex_to_first_outputindex_mmap = txindex_to_first_outputindex_mmap_opt.as_ref().unwrap();
+                let p2pk65addressindex_to_p2pk65bytes_mmap = p2pk65addressindex_to_p2pk65bytes_mmap_opt.as_ref().unwrap();
+                let p2pk33addressindex_to_p2pk33bytes_mmap = p2pk33addressindex_to_p2pk33bytes_mmap_opt.as_ref().unwrap();
+                let p2pkhaddressindex_to_p2pkhbytes_mmap = p2pkhaddressindex_to_p2pkhbytes_mmap_opt.as_ref().unwrap();
+                let p2shaddressindex_to_p2shbytes_mmap = p2shaddressindex_to_p2shbytes_mmap_opt.as_ref().unwrap();
+                let p2wpkhaddressindex_to_p2wpkhbytes_mmap = p2wpkhaddressindex_to_p2wpkhbytes_mmap_opt.as_ref().unwrap();
+                let p2wshaddressindex_to_p2wshbytes_mmap = p2wshaddressindex_to_p2wshbytes_mmap_opt.as_ref().unwrap();
+                let p2traddressindex_to_p2trbytes_mmap = p2traddressindex_to_p2trbytes_mmap_opt.as_ref().unwrap();
+                let p2aaddressindex_to_p2abytes_mmap = p2aaddressindex_to_p2abytes_mmap_opt.as_ref().unwrap();
+
                 // Used to check rapidhash collisions
                 let check_collisions = check_collisions && height > Height::new(COLLISIONS_CHECKED_UP_TO);
 
@@ -132,34 +210,6 @@ impl Indexer {
                 vecs.height_to_total_size.push_if_needed(height, block.total_size().into())?;
                 vecs.height_to_weight.push_if_needed(height, block.weight().into())?;
 
-                let inputs = block
-                    .txdata
-                    .iter()
-                    .enumerate()
-                    .flat_map(|(index, tx)| {
-                        tx.input
-                            .iter()
-                            .enumerate()
-                            .map(move |(vin, txin)| (TxIndex::from(index), Vin::from(vin), txin, tx))
-                    })
-                    .collect::<Vec<_>>();
-
-                let outputs = block
-                    .txdata
-                    .iter()
-                    .enumerate()
-                    .flat_map(|(index, tx)| {
-                        tx.output
-                            .iter()
-                            .enumerate()
-                            .map(move |(vout, txout)| (TxIndex::from(index), Vout::from(vout), txout, tx))
-                    })
-                    .collect::<Vec<_>>();
-
-                let tx_len = block.txdata.len();
-                let outputs_len = outputs.len();
-                let inputs_len = inputs.len();
-
                 let (
                     txid_prefix_to_txid_and_block_txindex_and_prev_txindex_join_handle,
                     input_source_vec_handle,
@@ -169,9 +219,9 @@ impl Indexer {
                         scope.spawn(|| -> color_eyre::Result<_> {
                             block
                                 .txdata
-                                .par_iter()
+                                .iter()
                                 .enumerate()
-                                .map(|(index, tx)| -> color_eyre::Result<_> {
+                                .map(|(index, tx)| {
                                     let txid = Txid::from(tx.compute_txid());
 
                                     let txid_prefix = TxidPrefix::from(&txid);
@@ -186,26 +236,21 @@ impl Indexer {
 
                                     Ok((txid_prefix, (tx, txid, TxIndex::from(index), prev_txindex_opt)))
                                 })
-                                .try_fold(BTreeMap::new, |mut map, tuple| {
-                                    let (key, value) = tuple?;
-                                    map.insert(key, value);
-                                    Ok(map)
-                                })
-                                .try_reduce(BTreeMap::new, |mut map, mut map2| {
-                                    if map.len() > map2.len() {
-                                        map.append(&mut map2);
-                                        Ok(map)
-                                    } else {
-                                        map2.append(&mut map);
-                                        Ok(map2)
-                                    }
-                                })
+                                .collect::<color_eyre::Result<BTreeMap<_, _>>>()
                         });
 
-
                     let input_source_vec_handle = scope.spawn(|| {
-                        let txindex_to_first_outputindex_mmap = vecs
-                            .txindex_to_first_outputindex.mmap().load();
+                        let inputs = block
+                            .txdata
+                            .iter()
+                            .enumerate()
+                            .flat_map(|(index, tx)| {
+                                tx.input
+                                    .iter()
+                                    .enumerate()
+                                    .map(move |(vin, txin)| (TxIndex::from(index), Vin::from(vin), txin, tx))
+                            })
+                            .collect::<Vec<_>>();
 
                         inputs
                             .into_par_iter()
@@ -237,11 +282,11 @@ impl Indexer {
 
                                 let vout = Vout::from(outpoint.vout);
 
-                                let outputindex = vecs.txindex_to_first_outputindex.get_or_read(prev_txindex, &txindex_to_first_outputindex_mmap)?
+                                let outputindex = vecs.txindex_to_first_outputindex.get_or_read(prev_txindex, txindex_to_first_outputindex_mmap)?
                                     .context("Expect outputindex to not be none")
                                     .inspect_err(|_| {
                                         dbg!(outpoint.txid, prev_txindex, vout);
-                                    })?.into_inner()
+                                    })?.into_owned()
                                     + vout;
 
                                 Ok((inputindex, InputSource::PreviousBlock((
@@ -266,157 +311,155 @@ impl Indexer {
                             })
                     });
 
-                    let outputindex_to_txout_outputtype_addressbytes_res_addressindex_opt_handle = scope.spawn(|| {
-                        let p2pk65addressindex_to_p2pk65bytes_mmap = vecs
-                            .p2pk65addressindex_to_p2pk65bytes.mmap().load();
-                        let p2pk33addressindex_to_p2pk33bytes_mmap = vecs.p2pk33addressindex_to_p2pk33bytes.mmap().load();
-                        let p2pkhaddressindex_to_p2pkhbytes_mmap = vecs.p2pkhaddressindex_to_p2pkhbytes.mmap().load();
-                        let p2shaddressindex_to_p2shbytes_mmap = vecs.p2shaddressindex_to_p2shbytes.mmap().load();
-                        let p2wpkhaddressindex_to_p2wpkhbytes_mmap = vecs.p2wpkhaddressindex_to_p2wpkhbytes.mmap().load();
-                        let p2wshaddressindex_to_p2wshbytes_mmap = vecs.p2wshaddressindex_to_p2wshbytes.mmap().load();
-                        let p2traddressindex_to_p2trbytes_mmap = vecs.p2traddressindex_to_p2trbytes.mmap().load();
-                       let p2aaddressindex_to_p2abytes_mmap = vecs.p2aaddressindex_to_p2abytes.mmap().load();
+                    let outputs = block
+                        .txdata
+                        .iter()
+                        .enumerate()
+                        .flat_map(|(index, tx)| {
+                            tx.output
+                                .iter()
+                                .enumerate()
+                                .map(move |(vout, txout)| (TxIndex::from(index), Vout::from(vout), txout, tx))
+                        }).collect::<Vec<_>>();
 
-                        outputs
-                            .into_par_iter()
-                            .enumerate()
-                            .map(
-                                #[allow(clippy::type_complexity)]
-                                |(block_outputindex, (block_txindex, vout, txout, tx))| -> color_eyre::Result<(
-                                    OutputIndex,
-                                    (
-                                        &TxOut,
-                                        TxIndex,
-                                        Vout,
-                                        OutputType,
-                                        brk_core::Result<AddressBytes>,
-                                        Option<TypeIndex>,
-                                        &Transaction,
-                                    ),
-                                )> {
-                                    let txindex = idxs.txindex + block_txindex;
-                                    let outputindex = idxs.outputindex + OutputIndex::from(block_outputindex);
+                    let outputindex_to_txout_outputtype_addressbytes_res_addressindex = outputs.into_par_iter()
+                        .enumerate()
+                        .map(
+                            #[allow(clippy::type_complexity)]
+                            |(block_outputindex, (block_txindex, vout, txout, tx))| -> color_eyre::Result<(
+                                OutputIndex,
+                                (
+                                    &TxOut,
+                                    TxIndex,
+                                    Vout,
+                                    OutputType,
+                                    brk_core::Result<AddressBytes>,
+                                    Option<TypeIndex>,
+                                    &Transaction,
+                                ),
+                            )> {
+                                let txindex = idxs.txindex + block_txindex;
+                                let outputindex = idxs.outputindex + OutputIndex::from(block_outputindex);
 
-                                    let script = &txout.script_pubkey;
+                                let script = &txout.script_pubkey;
 
-                                    let outputtype = OutputType::from(script);
+                                let outputtype = OutputType::from(script);
 
-                                    let address_bytes_res =
-                                        AddressBytes::try_from((script, outputtype)).inspect_err(|_| {
-                                            // dbg!(&txout, height, txi, &tx.compute_txid());
-                                        });
-
-                                    let typeindex_opt = address_bytes_res.as_ref().ok().and_then(|addressbytes| {
-                                        stores
-                                            .addressbyteshash_to_typeindex
-                                            .get(&AddressBytesHash::from((addressbytes, outputtype)))
-                                            .unwrap()
-                                            .map(|v| *v)
-                                            // Checking if not in the future
-                                            .and_then(|typeindex_local| {
-                                                (typeindex_local < idxs.typeindex(outputtype)).then_some(typeindex_local)
-                                            })
+                                let address_bytes_res =
+                                    AddressBytes::try_from((script, outputtype)).inspect_err(|_| {
+                                        // dbg!(&txout, height, txi, &tx.compute_txid());
                                     });
 
-                                    if let Some(Some(typeindex)) = check_collisions.then_some(typeindex_opt) {
-                                        let addressbytes = address_bytes_res.as_ref().unwrap();
+                                let typeindex_opt = address_bytes_res.as_ref().ok().and_then(|addressbytes| {
+                                    stores
+                                        .addressbyteshash_to_typeindex
+                                        .get(&AddressBytesHash::from((addressbytes, outputtype)))
+                                        .unwrap()
+                                        .map(|v| *v)
+                                        // Checking if not in the future
+                                        .and_then(|typeindex_local| {
+                                            (typeindex_local < idxs.typeindex(outputtype)).then_some(typeindex_local)
+                                        })
+                                });
 
-                                        let prev_addressbytes_opt = match outputtype {
-                                            OutputType::P2PK65 => vecs
-                                                .p2pk65addressindex_to_p2pk65bytes
-                                                .get_or_read(typeindex.into(), &p2pk65addressindex_to_p2pk65bytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::P2PK33 => vecs
-                                                .p2pk33addressindex_to_p2pk33bytes
-                                                .get_or_read(typeindex.into(), &p2pk33addressindex_to_p2pk33bytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::P2PKH => vecs
-                                                .p2pkhaddressindex_to_p2pkhbytes
-                                                .get_or_read(typeindex.into(), &p2pkhaddressindex_to_p2pkhbytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::P2SH => vecs
-                                                .p2shaddressindex_to_p2shbytes
-                                                .get_or_read(typeindex.into(), &p2shaddressindex_to_p2shbytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::P2WPKH => vecs
-                                                .p2wpkhaddressindex_to_p2wpkhbytes
-                                                .get_or_read(typeindex.into(), &p2wpkhaddressindex_to_p2wpkhbytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::P2WSH => vecs
-                                                .p2wshaddressindex_to_p2wshbytes
-                                                .get_or_read(typeindex.into(), &p2wshaddressindex_to_p2wshbytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::P2TR => vecs
-                                                .p2traddressindex_to_p2trbytes
-                                                .get_or_read(typeindex.into(), &p2traddressindex_to_p2trbytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::P2A => vecs
-                                                .p2aaddressindex_to_p2abytes
-                                                .get_or_read(typeindex.into(), &p2aaddressindex_to_p2abytes_mmap)?
-                                                .map(|v| AddressBytes::from(v.into_inner())),
-                                            OutputType::Empty | OutputType::OpReturn | OutputType::P2MS | OutputType::Unknown => {
-                                                unreachable!()
-                                            }
-                                        };
-                                        let prev_addressbytes =
-                                            prev_addressbytes_opt.as_ref().context("Expect to have addressbytes")?;
+                                if let Some(Some(typeindex)) = check_collisions.then_some(typeindex_opt) {
+                                    let addressbytes = address_bytes_res.as_ref().unwrap();
 
-                                        if stores.addressbyteshash_to_typeindex.needs(height)
-                                                && prev_addressbytes != addressbytes
-                                        {
-                                            let txid = tx.compute_txid();
-                                            dbg!(
-                                                height,
-                                                txid,
-                                                vout,
-                                                block_txindex,
-                                                outputtype,
-                                                prev_addressbytes,
-                                                addressbytes,
-                                                &idxs,
-                                                typeindex,
-                                                typeindex,
-                                                txout,
-                                                AddressBytesHash::from((addressbytes, outputtype)),
-                                            );
-                                            panic!()
+                                    let prev_addressbytes_opt = match outputtype {
+                                        OutputType::P2PK65 => vecs
+                                            .p2pk65addressindex_to_p2pk65bytes
+                                            .get_or_read(typeindex.into(), p2pk65addressindex_to_p2pk65bytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::P2PK33 => vecs
+                                            .p2pk33addressindex_to_p2pk33bytes
+                                            .get_or_read(typeindex.into(), p2pk33addressindex_to_p2pk33bytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::P2PKH => vecs
+                                            .p2pkhaddressindex_to_p2pkhbytes
+                                            .get_or_read(typeindex.into(), p2pkhaddressindex_to_p2pkhbytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::P2SH => vecs
+                                            .p2shaddressindex_to_p2shbytes
+                                            .get_or_read(typeindex.into(), p2shaddressindex_to_p2shbytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::P2WPKH => vecs
+                                            .p2wpkhaddressindex_to_p2wpkhbytes
+                                            .get_or_read(typeindex.into(), p2wpkhaddressindex_to_p2wpkhbytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::P2WSH => vecs
+                                            .p2wshaddressindex_to_p2wshbytes
+                                            .get_or_read(typeindex.into(), p2wshaddressindex_to_p2wshbytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::P2TR => vecs
+                                            .p2traddressindex_to_p2trbytes
+                                            .get_or_read(typeindex.into(), p2traddressindex_to_p2trbytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::P2A => vecs
+                                            .p2aaddressindex_to_p2abytes
+                                            .get_or_read(typeindex.into(), p2aaddressindex_to_p2abytes_mmap)?
+                                            .map(|v| AddressBytes::from(v.into_owned())),
+                                        OutputType::Empty | OutputType::OpReturn | OutputType::P2MS | OutputType::Unknown => {
+                                            unreachable!()
                                         }
-                                    }
+                                    };
+                                    let prev_addressbytes =
+                                        prev_addressbytes_opt.as_ref().context("Expect to have addressbytes")?;
 
-                                    Ok((
-                                        outputindex,
-                                        (
-                                            txout,
-                                            txindex,
+                                    if stores.addressbyteshash_to_typeindex.needs(height)
+                                            && prev_addressbytes != addressbytes
+                                    {
+                                        let txid = tx.compute_txid();
+                                        dbg!(
+                                            height,
+                                            txid,
                                             vout,
+                                            block_txindex,
                                             outputtype,
-                                            address_bytes_res,
-                                            typeindex_opt,
-                                            tx,
-                                        ),
-                                    ))
-                                },
-                            )
-                            .try_fold(BTreeMap::new, |mut map, tuple| -> color_eyre::Result<_> {
-                                let (key, value) = tuple?;
-                                map.insert(key, value);
-                                Ok(map)
-                            })
-                            .try_reduce(BTreeMap::new, |mut map, mut map2| {
-                                if map.len() > map2.len() {
-                                    map.append(&mut map2);
-                                    Ok(map)
-                                } else {
-                                    map2.append(&mut map);
-                                    Ok(map2)
+                                            prev_addressbytes,
+                                            addressbytes,
+                                            &idxs,
+                                            typeindex,
+                                            typeindex,
+                                            txout,
+                                            AddressBytesHash::from((addressbytes, outputtype)),
+                                        );
+                                        panic!()
+                                    }
                                 }
-                            })
-                    });
+
+                                Ok((
+                                    outputindex,
+                                    (
+                                        txout,
+                                        txindex,
+                                        vout,
+                                        outputtype,
+                                        address_bytes_res,
+                                        typeindex_opt,
+                                        tx,
+                                    ),
+                                ))
+                            },
+                        )
+                        .try_fold(BTreeMap::new, |mut map, tuple| -> color_eyre::Result<_> {
+                            let (key, value) = tuple?;
+                            map.insert(key, value);
+                            Ok(map)
+                        })
+                        .try_reduce(BTreeMap::new, |mut map, mut map2| {
+                            if map.len() > map2.len() {
+                                map.append(&mut map2);
+                                Ok(map)
+                            } else {
+                                map2.append(&mut map);
+                                Ok(map2)
+                            }
+                        });
 
                     (
                         txid_prefix_to_txid_and_block_txindex_and_prev_txindex_handle.join(),
                         input_source_vec_handle.join(),
-                        outputindex_to_txout_outputtype_addressbytes_res_addressindex_opt_handle.join(),
+                        outputindex_to_txout_outputtype_addressbytes_res_addressindex,
                     )
                 });
 
@@ -436,7 +479,11 @@ impl Indexer {
                         .ok()
                         .context(
                             "Expect outputindex_to_txout_outputtype_addressbytes_res_addressindex_opt_handle to join",
-                        )??;
+                        )?;
+
+                let outputs_len = outputindex_to_txout_outputtype_addressbytes_res_addressindex_opt.len();
+                let inputs_len = input_source_vec.len();
+                let tx_len = block.txdata.len();
 
                 let mut new_txindexvout_to_outputindex: BTreeMap<
                     (TxIndex, Vout),
@@ -546,6 +593,10 @@ impl Indexer {
                         new_txindexvout_to_outputindex
                             .insert((txindex, vout), outputindex);
 
+                        if outputtype.is_address() {
+                            stores.addresstype_to_typeindex_with_outputindex.get_mut(outputtype).unwrap().insert_if_needed(TypeIndexWithOutputindex::from((typeindex, outputindex)), Unit, height);
+                        }
+
                         Ok(())
                     },
                 )?;
@@ -687,7 +738,22 @@ impl Indexer {
                 idxs.inputindex += InputIndex::from(inputs_len);
                 idxs.outputindex += OutputIndex::from(outputs_len);
 
-                export_if_needed(stores, vecs, height, false, exit)?;
+                let exported = export_if_needed(stores, vecs, height, false, exit)?;
+
+                if exported {
+                    reset_mmaps_options(
+                        vecs,
+                        &mut txindex_to_first_outputindex_mmap_opt,
+                        &mut p2pk65addressindex_to_p2pk65bytes_mmap_opt,
+                        &mut p2pk33addressindex_to_p2pk33bytes_mmap_opt,
+                        &mut p2pkhaddressindex_to_p2pkhbytes_mmap_opt,
+                        &mut p2shaddressindex_to_p2shbytes_mmap_opt,
+                        &mut p2wpkhaddressindex_to_p2wpkhbytes_mmap_opt,
+                        &mut p2wshaddressindex_to_p2wshbytes_mmap_opt,
+                        &mut p2traddressindex_to_p2trbytes_mmap_opt,
+                        &mut p2aaddressindex_to_p2abytes_mmap_opt,
+                    );
+                }
 
                 Ok(())
             },
@@ -695,8 +761,6 @@ impl Indexer {
 
         export_if_needed(stores, vecs, idxs.height, true, exit)?;
 
-        stores.rotate_memtables();
-
         Ok(starting_indexes)
     }
 }
diff --git a/crates/brk_indexer/src/stores.rs b/crates/brk_indexer/src/stores.rs
index 9ea1ef32c..ee7e69f48 100644
--- a/crates/brk_indexer/src/stores.rs
+++ b/crates/brk_indexer/src/stores.rs
@@ -1,12 +1,13 @@
-use std::{fs, path::Path, thread};
+use std::{borrow::Cow, fs, path::Path, thread};
 
 use brk_core::{
-    AddressBytes, AddressBytesHash, BlockHashPrefix, Height, OutputType, Result, TxIndex,
-    TxidPrefix, TypeIndex, Value, Version,
+    AddressBytes, AddressBytesHash, BlockHashPrefix, ByAddressType, Height, OutputIndex,
+    OutputType, Result, TxIndex, TxidPrefix, TypeIndex, TypeIndexWithOutputindex, Unit, Version,
 };
-use brk_store::Store;
-use brk_vec::AnyIterableVec;
+use brk_store::{AnyStore, Store};
+use brk_vec::{AnyIterableVec, VecIterator};
 use fjall::{PersistMode, TransactionalKeyspace};
+use rayon::prelude::*;
 
 use crate::Indexes;
 
@@ -15,9 +16,12 @@ use super::Vecs;
 #[derive(Clone)]
 pub struct Stores {
     pub keyspace: TransactionalKeyspace,
+
     pub addressbyteshash_to_typeindex: Store<AddressBytesHash, TypeIndex>,
     pub blockhashprefix_to_height: Store<BlockHashPrefix, Height>,
     pub txidprefix_to_txindex: Store<TxidPrefix, TxIndex>,
+    pub addresstype_to_typeindex_with_outputindex:
+        ByAddressType<Store<TypeIndexWithOutputindex, Unit>>,
 }
 
 const VERSION: Version = Version::ZERO;
@@ -62,24 +66,193 @@ impl Stores {
                     None,
                 )
             });
+            let p2aaddressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2aaddressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
+            let p2pk33addressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2pk33addressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
+            let p2pk65addressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2pk65addressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
+            let p2pkhaddressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2pkhaddressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
+            let p2shaddressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2shaddressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
+            let p2traddressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2traddressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
+            let p2wpkhaddressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2wpkhaddressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
+            let p2wshaddressindex_with_outputindex = scope.spawn(|| {
+                Store::import(
+                    &keyspace,
+                    path,
+                    "p2wshaddressindex_with_outputindex",
+                    version + VERSION + Version::ZERO,
+                    Some(false),
+                )
+            });
 
             Ok(Self {
                 keyspace: keyspace.clone(),
+
                 addressbyteshash_to_typeindex: addressbyteshash_to_typeindex.join().unwrap()?,
                 blockhashprefix_to_height: blockhashprefix_to_height.join().unwrap()?,
                 txidprefix_to_txindex: txidprefix_to_txindex.join().unwrap()?,
+                addresstype_to_typeindex_with_outputindex: ByAddressType {
+                    p2pk65: p2pk65addressindex_with_outputindex.join().unwrap()?,
+                    p2pk33: p2pk33addressindex_with_outputindex.join().unwrap()?,
+                    p2pkh: p2pkhaddressindex_with_outputindex.join().unwrap()?,
+                    p2sh: p2shaddressindex_with_outputindex.join().unwrap()?,
+                    p2wpkh: p2wpkhaddressindex_with_outputindex.join().unwrap()?,
+                    p2wsh: p2wshaddressindex_with_outputindex.join().unwrap()?,
+                    p2tr: p2traddressindex_with_outputindex.join().unwrap()?,
+                    p2a: p2aaddressindex_with_outputindex.join().unwrap()?,
+                },
             })
         })
     }
 
+    pub fn starting_height(&self) -> Height {
+        self.as_slice()
+            .into_iter()
+            .map(|store| {
+                // let height =
+                store.height().map(Height::incremented).unwrap_or_default()
+                // dbg!((height, store.name()));
+            })
+            .min()
+            .unwrap()
+    }
+
+    pub fn commit(&mut self, height: Height) -> Result<()> {
+        self.as_mut_slice()
+            .into_par_iter()
+            .try_for_each(|store| store.commit(height))?;
+
+        self.keyspace
+            .persist(PersistMode::SyncAll)
+            .map_err(|e| e.into())
+    }
+
+    fn as_slice(&self) -> [&(dyn AnyStore + Send + Sync); 11] {
+        [
+            &self.addressbyteshash_to_typeindex,
+            &self.blockhashprefix_to_height,
+            &self.txidprefix_to_txindex,
+            &self.addresstype_to_typeindex_with_outputindex.p2a,
+            &self.addresstype_to_typeindex_with_outputindex.p2pk33,
+            &self.addresstype_to_typeindex_with_outputindex.p2pk65,
+            &self.addresstype_to_typeindex_with_outputindex.p2pkh,
+            &self.addresstype_to_typeindex_with_outputindex.p2sh,
+            &self.addresstype_to_typeindex_with_outputindex.p2tr,
+            &self.addresstype_to_typeindex_with_outputindex.p2wpkh,
+            &self.addresstype_to_typeindex_with_outputindex.p2wsh,
+        ]
+    }
+
+    fn as_mut_slice(&mut self) -> [&mut (dyn AnyStore + Send + Sync); 11] {
+        [
+            &mut self.addressbyteshash_to_typeindex,
+            &mut self.blockhashprefix_to_height,
+            &mut self.txidprefix_to_txindex,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2a,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2pk33,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2pk65,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2pkh,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2sh,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2tr,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2wpkh,
+            &mut self.addresstype_to_typeindex_with_outputindex.p2wsh,
+        ]
+    }
+
     pub fn rollback_if_needed(
         &mut self,
         vecs: &mut Vecs,
         starting_indexes: &Indexes,
     ) -> color_eyre::Result<()> {
-        if self.addressbyteshash_to_typeindex.is_empty()
-            && self.blockhashprefix_to_height.is_empty()
-            && self.txidprefix_to_txindex.is_empty()
+        if self.addressbyteshash_to_typeindex.is_empty()?
+            && self.blockhashprefix_to_height.is_empty()?
+            && self.txidprefix_to_txindex.is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2a
+                .is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2pk33
+                .is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2pk65
+                .is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2pkh
+                .is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2sh
+                .is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2tr
+                .is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2wpkh
+                .is_empty()?
+            && self
+                .addresstype_to_typeindex_with_outputindex
+                .p2wsh
+                .is_empty()?
         {
             return Ok(());
         }
@@ -88,7 +261,7 @@ impl Stores {
             vecs.height_to_blockhash
                 .iter_at(starting_indexes.height)
                 .for_each(|(_, v)| {
-                    let blockhashprefix = BlockHashPrefix::from(Value::into_inner(v));
+                    let blockhashprefix = BlockHashPrefix::from(v.into_owned());
                     self.blockhashprefix_to_height.remove(blockhashprefix);
                 });
 
@@ -96,14 +269,14 @@ impl Stores {
                 .height_to_first_p2pk65addressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2pk65addressindex_to_p2pk65bytes_iter =
                     vecs.p2pk65addressindex_to_p2pk65bytes.iter();
 
                 while let Some(typedbytes) = p2pk65addressindex_to_p2pk65bytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2PK65));
@@ -116,14 +289,14 @@ impl Stores {
                 .height_to_first_p2pk33addressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2pk33addressindex_to_p2pk33bytes_iter =
                     vecs.p2pk33addressindex_to_p2pk33bytes.iter();
 
                 while let Some(typedbytes) = p2pk33addressindex_to_p2pk33bytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2PK33));
@@ -136,14 +309,14 @@ impl Stores {
                 .height_to_first_p2pkhaddressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2pkhaddressindex_to_p2pkhbytes_iter =
                     vecs.p2pkhaddressindex_to_p2pkhbytes.iter();
 
                 while let Some(typedbytes) = p2pkhaddressindex_to_p2pkhbytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2PKH));
@@ -156,14 +329,14 @@ impl Stores {
                 .height_to_first_p2shaddressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2shaddressindex_to_p2shbytes_iter =
                     vecs.p2shaddressindex_to_p2shbytes.iter();
 
                 while let Some(typedbytes) = p2shaddressindex_to_p2shbytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2SH));
@@ -176,14 +349,14 @@ impl Stores {
                 .height_to_first_p2traddressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2traddressindex_to_p2trbytes_iter =
                     vecs.p2traddressindex_to_p2trbytes.iter();
 
                 while let Some(typedbytes) = p2traddressindex_to_p2trbytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2TR));
@@ -196,14 +369,14 @@ impl Stores {
                 .height_to_first_p2wpkhaddressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2wpkhaddressindex_to_p2wpkhbytes_iter =
                     vecs.p2wpkhaddressindex_to_p2wpkhbytes.iter();
 
                 while let Some(typedbytes) = p2wpkhaddressindex_to_p2wpkhbytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2WPKH));
@@ -216,14 +389,14 @@ impl Stores {
                 .height_to_first_p2wshaddressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2wshaddressindex_to_p2wshbytes_iter =
                     vecs.p2wshaddressindex_to_p2wshbytes.iter();
 
                 while let Some(typedbytes) = p2wshaddressindex_to_p2wshbytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2WSH));
@@ -236,13 +409,13 @@ impl Stores {
                 .height_to_first_p2aaddressindex
                 .iter()
                 .get(starting_indexes.height)
-                .map(Value::into_inner)
+                .map(Cow::into_owned)
             {
                 let mut p2aaddressindex_to_p2abytes_iter = vecs.p2aaddressindex_to_p2abytes.iter();
 
                 while let Some(typedbytes) = p2aaddressindex_to_p2abytes_iter
                     .get(index)
-                    .map(Value::into_inner)
+                    .map(Cow::into_owned)
                 {
                     let bytes = AddressBytes::from(typedbytes);
                     let hash = AddressBytesHash::from((&bytes, OutputType::P2A));
@@ -251,15 +424,15 @@ impl Stores {
                 }
             }
         } else {
-            self.blockhashprefix_to_height.reset_partition()?;
-            self.addressbyteshash_to_typeindex.reset_partition()?;
+            self.blockhashprefix_to_height.reset()?;
+            self.addressbyteshash_to_typeindex.reset()?;
         }
 
         if starting_indexes.txindex != TxIndex::ZERO {
             vecs.txindex_to_txid
                 .iter_at(starting_indexes.txindex)
                 .for_each(|(txindex, txid)| {
-                    let txidprefix = TxidPrefix::from(&txid.into_inner());
+                    let txidprefix = TxidPrefix::from(&txid.into_owned());
 
                     // "d5d27987d2a3dfc724e359870c6644b40e497bdc0589a033220fe15429d88599"
                     let is_not_first_dup = txindex != TxIndex::new(142783)
@@ -274,52 +447,51 @@ impl Stores {
                     }
                 });
         } else {
-            self.txidprefix_to_txindex.reset_partition()?;
+            self.txidprefix_to_txindex.reset()?;
+        }
+
+        if starting_indexes.outputindex != OutputIndex::ZERO {
+            let mut outputindex_to_typeindex_iter = vecs.outputindex_to_typeindex.into_iter();
+            vecs.outputindex_to_outputtype
+                .iter_at(starting_indexes.outputindex)
+                .filter(|(_, outputtype)| outputtype.is_address())
+                .for_each(|(outputindex, outputtype)| {
+                    let outputtype = outputtype.into_owned();
+
+                    let typeindex = outputindex_to_typeindex_iter.unwrap_get_inner(outputindex);
+
+                    self.addresstype_to_typeindex_with_outputindex
+                        .get_mut(outputtype)
+                        .unwrap()
+                        .remove(TypeIndexWithOutputindex::from((typeindex, outputindex)));
+                });
+        } else {
+            self.addresstype_to_typeindex_with_outputindex.p2a.reset()?;
+            self.addresstype_to_typeindex_with_outputindex
+                .p2pk33
+                .reset()?;
+            self.addresstype_to_typeindex_with_outputindex
+                .p2pk65
+                .reset()?;
+            self.addresstype_to_typeindex_with_outputindex
+                .p2pkh
+                .reset()?;
+            self.addresstype_to_typeindex_with_outputindex
+                .p2sh
+                .reset()?;
+            self.addresstype_to_typeindex_with_outputindex
+                .p2tr
+                .reset()?;
+            self.addresstype_to_typeindex_with_outputindex
+                .p2wpkh
+                .reset()?;
+            self.addresstype_to_typeindex_with_outputindex
+                .p2wsh
+                .reset()?;
         }
 
         self.commit(starting_indexes.height.decremented().unwrap_or_default())?;
 
         Ok(())
     }
-
-    pub fn starting_height(&self) -> Height {
-        [
-            self.addressbyteshash_to_typeindex.height(),
-            self.blockhashprefix_to_height.height(),
-            self.txidprefix_to_txindex.height(),
-        ]
-        .into_iter()
-        .map(|height| height.map(Height::incremented).unwrap_or_default())
-        .min()
-        .unwrap()
-    }
-
-    pub fn commit(&mut self, height: Height) -> Result<()> {
-        thread::scope(|scope| -> Result<()> {
-            let addressbyteshash_to_typeindex_commit_handle =
-                scope.spawn(|| self.addressbyteshash_to_typeindex.commit(height));
-            let blockhashprefix_to_height_commit_handle =
-                scope.spawn(|| self.blockhashprefix_to_height.commit(height));
-            let txidprefix_to_txindex_commit_handle =
-                scope.spawn(|| self.txidprefix_to_txindex.commit(height));
-
-            addressbyteshash_to_typeindex_commit_handle
-                .join()
-                .unwrap()?;
-            blockhashprefix_to_height_commit_handle.join().unwrap()?;
-            txidprefix_to_txindex_commit_handle.join().unwrap()?;
-
-            Ok(())
-        })?;
-
-        self.keyspace
-            .persist(PersistMode::SyncAll)
-            .map_err(|e| e.into())
-    }
-
-    pub fn rotate_memtables(&self) {
-        self.addressbyteshash_to_typeindex.rotate_memtable();
-        self.blockhashprefix_to_height.rotate_memtable();
-        self.txidprefix_to_txindex.rotate_memtable();
-    }
 }
diff --git a/crates/brk_interface/Cargo.toml b/crates/brk_interface/Cargo.toml
index 8d50deb21..b3dc440c9 100644
--- a/crates/brk_interface/Cargo.toml
+++ b/crates/brk_interface/Cargo.toml
@@ -18,5 +18,5 @@ brk_rmcp = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-serde_with = "3.13.0"
+serde_with = "3.14.0"
 tabled = { workspace = true }
diff --git a/crates/brk_interface/src/index.rs b/crates/brk_interface/src/index.rs
index a92b8fd90..4eaf5bb7e 100644
--- a/crates/brk_interface/src/index.rs
+++ b/crates/brk_interface/src/index.rs
@@ -4,7 +4,8 @@ use brk_core::{
     DateIndex, DecadeIndex, DifficultyEpoch, EmptyOutputIndex, HalvingEpoch, Height, InputIndex,
     MonthIndex, OpReturnIndex, OutputIndex, P2AAddressIndex, P2MSOutputIndex, P2PK33AddressIndex,
     P2PK65AddressIndex, P2PKHAddressIndex, P2SHAddressIndex, P2TRAddressIndex, P2WPKHAddressIndex,
-    P2WSHAddressIndex, Printable, QuarterIndex, TxIndex, UnknownOutputIndex, WeekIndex, YearIndex,
+    P2WSHAddressIndex, Printable, QuarterIndex, SemesterIndex, TxIndex, UnknownOutputIndex,
+    WeekIndex, YearIndex,
 };
 use color_eyre::eyre::eyre;
 use schemars::JsonSchema;
@@ -52,6 +53,8 @@ pub enum Index {
     P2WSHAddressIndex,
     #[schemars(description = "Quarter index")]
     QuarterIndex,
+    #[schemars(description = "Semester index")]
+    SemesterIndex,
     #[schemars(description = "Transaction index")]
     TxIndex,
     #[schemars(description = "Unknown output index")]
@@ -63,7 +66,7 @@ pub enum Index {
 }
 
 impl Index {
-    pub fn all() -> [Self; 24] {
+    pub fn all() -> [Self; 25] {
         [
             Self::DateIndex,
             Self::DecadeIndex,
@@ -85,6 +88,7 @@ impl Index {
             Self::P2WPKHAddressIndex,
             Self::P2WSHAddressIndex,
             Self::QuarterIndex,
+            Self::SemesterIndex,
             Self::TxIndex,
             Self::UnknownOutputIndex,
             Self::WeekIndex,
@@ -114,6 +118,7 @@ impl Index {
             Self::P2WPKHAddressIndex => P2WPKHAddressIndex::to_possible_strings(),
             Self::P2WSHAddressIndex => P2WSHAddressIndex::to_possible_strings(),
             Self::QuarterIndex => QuarterIndex::to_possible_strings(),
+            Self::SemesterIndex => SemesterIndex::to_possible_strings(),
             Self::TxIndex => TxIndex::to_possible_strings(),
             Self::UnknownOutputIndex => UnknownOutputIndex::to_possible_strings(),
             Self::WeekIndex => WeekIndex::to_possible_strings(),
@@ -174,7 +179,7 @@ impl TryFrom<&str> for Index {
                 Self::P2WSHAddressIndex
             }
             v if (Self::QuarterIndex).possible_values().contains(&v) => Self::QuarterIndex,
-            v if (Self::QuarterIndex).possible_values().contains(&v) => Self::QuarterIndex,
+            v if (Self::SemesterIndex).possible_values().contains(&v) => Self::SemesterIndex,
             v if (Self::TxIndex).possible_values().contains(&v) => Self::TxIndex,
             v if (Self::WeekIndex).possible_values().contains(&v) => Self::WeekIndex,
             v if (Self::YearIndex).possible_values().contains(&v) => Self::YearIndex,
@@ -188,7 +193,7 @@ impl TryFrom<&str> for Index {
 
 impl fmt::Display for Index {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
     }
 }
 
diff --git a/crates/brk_interface/src/lib.rs b/crates/brk_interface/src/lib.rs
index 59de7ea9d..e9bf3df43 100644
--- a/crates/brk_interface/src/lib.rs
+++ b/crates/brk_interface/src/lib.rs
@@ -6,9 +6,9 @@
 use std::collections::BTreeMap;
 
 use brk_computer::Computer;
-use brk_core::Result;
+use brk_core::{Height, Result};
 use brk_indexer::Indexer;
-use brk_vec::AnyCollectableVec;
+use brk_vec::{AnyCollectableVec, AnyIndexedVec};
 use tabled::settings::Style;
 
 mod deser;
@@ -46,6 +46,10 @@ impl<'a> Interface<'a> {
         }
     }
 
+    pub fn get_height(&self) -> Height {
+        self._indexer.vecs.height_to_blockhash.height()
+    }
+
     pub fn search(&self, params: &Params) -> Vec<(String, &&dyn AnyCollectableVec)> {
         let tuples = params
             .ids
@@ -85,9 +89,19 @@ impl<'a> Interface<'a> {
         vecs: Vec<(String, &&dyn AnyCollectableVec)>,
         params: &ParamsOpt,
     ) -> color_eyre::Result<Output> {
-        let from = params.from();
-        let to = params.to();
-        let format = params.format();
+        let from = params.from().map(|from| {
+            vecs.iter()
+                .map(|(_, v)| v.i64_to_usize(from))
+                .min()
+                .unwrap_or_default()
+        });
+
+        let to = params.to().map(|to| {
+            vecs.iter()
+                .map(|(_, v)| v.i64_to_usize(to))
+                .min()
+                .unwrap_or_default()
+        });
 
         let mut values = vecs
             .iter()
@@ -96,6 +110,8 @@ impl<'a> Interface<'a> {
             })
             .collect::<Result<Vec<_>>>()?;
 
+        let format = params.format();
+
         if values.is_empty() {
             return Ok(Output::default(format));
         }
diff --git a/crates/brk_interface/src/output.rs b/crates/brk_interface/src/output.rs
index 4562ed66d..287e6bd23 100644
--- a/crates/brk_interface/src/output.rs
+++ b/crates/brk_interface/src/output.rs
@@ -36,9 +36,9 @@ impl fmt::Display for Output {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Json(value) => write!(f, "{}", serde_json::to_string_pretty(value).unwrap()),
-            Self::CSV(string) => write!(f, "{}", string),
-            Self::TSV(string) => write!(f, "{}", string),
-            Self::MD(string) => write!(f, "{}", string),
+            Self::CSV(string) => write!(f, "{string}"),
+            Self::TSV(string) => write!(f, "{string}"),
+            Self::MD(string) => write!(f, "{string}"),
         }
     }
 }
diff --git a/crates/brk_interface/src/vecs.rs b/crates/brk_interface/src/vecs.rs
index 1f4b65a68..93ea6c2c0 100644
--- a/crates/brk_interface/src/vecs.rs
+++ b/crates/brk_interface/src/vecs.rs
@@ -101,33 +101,33 @@ impl<'a> Vecs<'a> {
     fn insert(&mut self, vec: &'a dyn AnyCollectableVec) {
         let name = vec.name();
         let serialized_index = vec.index_type_to_string();
-        let split = name.split("_to_").collect::<Vec<_>>();
-        if split.len() != 1
-            && !(split.len() == 2
-                && split.first().is_some_and(|s| {
-                    s == &"up"
-                        || s == &"start"
-                        || s.ends_with("relative")
-                        || s.starts_with("from")
-                        || s == &"cumulative_up"
-                        || s.starts_with("cumulative_start")
-                        || s.starts_with("cumulative_from")
-                        || s == &"activity"
-                }))
-            && !(split.len() == 3
-                && split.first().is_some_and(|s| {
-                    s == &"up"
-                        || s == &"start"
-                        || s.starts_with("from")
-                        || s == &"cumulative_up"
-                        || s == &"cumulative_start"
-                        || s.starts_with("cumulative_from")
-                })
-                && split.get(1).is_some_and(|s| s.ends_with("relative")))
-        {
-            dbg!((&serialized_index, &name, &split));
-            unreachable!();
-        }
+        // let split = name.split("_to_").collect::<Vec<_>>();
+        // if split.len() != 1
+        //     && !(split.len() == 2
+        //         && split.first().is_some_and(|s| {
+        //             s == &"up"
+        //                 || s == &"start"
+        //                 || s.ends_with("relative")
+        //                 || s.starts_with("from")
+        //                 || s == &"cumulative_up"
+        //                 || s.starts_with("cumulative_start")
+        //                 || s.starts_with("cumulative_from")
+        //                 || s == &"activity"
+        //         }))
+        //     && !(split.len() == 3
+        //         && split.first().is_some_and(|s| {
+        //             s == &"up"
+        //                 || s == &"start"
+        //                 || s.starts_with("from")
+        //                 || s == &"cumulative_up"
+        //                 || s == &"cumulative_start"
+        //                 || s.starts_with("cumulative_from")
+        //         })
+        //         && split.get(1).is_some_and(|s| s.ends_with("relative")))
+        // {
+        //     dbg!((&serialized_index, &name, &split));
+        //     unreachable!();
+        // }
         let index = Index::try_from(serialized_index)
             .inspect_err(|_| {
                 dbg!(&serialized_index);
diff --git a/crates/brk_logger/src/lib.rs b/crates/brk_logger/src/lib.rs
index e95f7b465..c11b29ad8 100644
--- a/crates/brk_logger/src/lib.rs
+++ b/crates/brk_logger/src/lib.rs
@@ -14,7 +14,7 @@ use color_eyre::owo_colors::OwoColorize;
 use env_logger::{Builder, Env};
 use jiff::{Timestamp, tz};
 
-#[inline(always)]
+#[inline]
 pub fn init(path: Option<&Path>) {
     let file = path.map(|path| {
         let _ = fs::remove_file(path);
@@ -34,7 +34,7 @@ pub fn init(path: Option<&Path>) {
             .strftime("%Y-%m-%d %H:%M:%S")
             .to_string();
         let level = record.level().as_str().to_lowercase();
-        let level = format!("{:5}", level);
+        let level = format!("{level:5}");
         let target = record.target();
         let dash = "-";
         let args = record.args();
@@ -81,7 +81,7 @@ fn write(
     dash: impl Display,
     args: impl Display,
 ) -> Result<(), std::io::Error> {
-    writeln!(buf, "{} {} {} {}", date_time, dash, level, args)
+    writeln!(buf, "{date_time} {dash} {level} {args}")
     // Don't remove, used to know the target of unwanted logs
     // writeln!(
     //     buf,
diff --git a/crates/brk_mcp/Cargo.toml b/crates/brk_mcp/Cargo.toml
index 6e63c2124..ec71f78ff 100644
--- a/crates/brk_mcp/Cargo.toml
+++ b/crates/brk_mcp/Cargo.toml
@@ -12,4 +12,3 @@ axum = { workspace = true }
 brk_interface = { workspace = true }
 log = { workspace = true }
 brk_rmcp = { workspace = true }
-tracing = "0.1.41"
diff --git a/crates/brk_mcp/README.md b/crates/brk_mcp/README.md
index a4bef4581..7877a138f 100644
--- a/crates/brk_mcp/README.md
+++ b/crates/brk_mcp/README.md
@@ -2,33 +2,43 @@
 
 A Model Context Protocol (MCP) which gives LLMs access to all available tools in BRK
 
+## URLs
+
+- https://eu1.bitcoinresearchkit.org/mcp
+- https://eu2.bitcoinresearchkit.org/mcp
+
 ## Usage
 
-To connect to the MCP you only need the correct URL ([https://bitcoinresearchkit.org/mcp](https://bitcoinresearchkit.org/mcp)) no token or auth is needed.
+To connect to the MCP use any of the previous URL, no token or auth is needed.
 
 This implementation has only been tested with Claude and the [MCP inspector](https://modelcontextprotocol.io/docs/tools/inspector).
 
-Please be aware thtat the technology is very rapidly evolving, thus having issues if probably expected.
+Please be aware that the technology is evolving very rapidly, thus having issues is probably expected. If you, you can join the discord see if there is a solution.
 
 ### Claude
 
 #### Step 1
 
-First we need to connect BRK to Claude.
+First we need to connect BRK to Claude. To do that we need to go to the "Connect apps" menu from the home screen of Claude desktop.
 
-![Caude MCP setup step 1](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step1.png)
+![Image of Claude Desktop home screen](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step1.png)
 
 #### Step 2
 
-Which is done by adding an integration.
+Then simply go to "Add integration".
 
-![Caude MCP setup step 2](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step2.png)
+![Image of the Connect app" menu of Claude Desktop](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step2.png)
 
 #### Step 3
 
-Since BRK's open and free, only a URL is needed.
+Claude's MCP client is (for now?) session based thus using a URL pointing to a load balancer will not work.
 
-![Caude MCP setup step 3](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step3.png)
+Use one of the following URL instead:
+
+- https://eu1.bitcoinresearchkit.org/mcp
+- https://eu2.bitcoinresearchkit.org/mcp
+
+![Image of Add Integration menu of Claude Desktop](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step3.png)
 
 #### Step 4
 
@@ -36,12 +46,4 @@ Verify that it has access to BRK's tools.
 
 Optionally and highly recommended, giving it unsupervised access gives a more fluid experience and prevents possible issues and errors.
 
-![Caude MCP setup step 4](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step4.png)
-
-#### Results
-
-Some examples of dashboard and documents generated by Claude using BRK's tools:
-
-- [Document](https://claude.ai/public/artifacts/71194d29-f965-417c-ba09-fdf0e4ecb1d5)
-- [Dashboard](https://claude.ai/public/artifacts/beef143f-399a-4ed4-b8bf-c986b776de42)
-- [Dashboard2](https://claude.ai/public/artifacts/5430ae49-bb3d-4fc1-ab24-f1e33deb40dc)
+![Image of edit integration meny on Claude Desktop](https://github.com/bitcoinresearchkit/brk/blob/main/assets/claude-step4.png)
diff --git a/crates/brk_parser/src/xor_index.rs b/crates/brk_parser/src/xor_index.rs
index 81b79498d..0ce4cf682 100644
--- a/crates/brk_parser/src/xor_index.rs
+++ b/crates/brk_parser/src/xor_index.rs
@@ -17,14 +17,14 @@ impl XORIndex {
         bytes
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn byte(&mut self, mut byte: u8, xor_bytes: &XORBytes) -> u8 {
         byte ^= xor_bytes[self.0];
         self.increment();
         byte
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn increment(&mut self) {
         self.0 += 1;
         if self.0 == XOR_LEN {
@@ -32,7 +32,7 @@ impl XORIndex {
         }
     }
 
-    #[inline(always)]
+    #[inline]
     pub fn add_assign(&mut self, i: usize) {
         self.0 = (self.0 + i) % XOR_LEN;
     }
diff --git a/crates/brk_server/Cargo.toml b/crates/brk_server/Cargo.toml
index 099f50d3a..50907bd44 100644
--- a/crates/brk_server/Cargo.toml
+++ b/crates/brk_server/Cargo.toml
@@ -32,7 +32,7 @@ serde_json = { workspace = true }
 tokio = { workspace = true }
 tower-http = { version = "0.6.6", features = ["compression-full", "trace"] }
 tracing = "0.1.41"
-zip = "4.2.0"
+zip = "4.3.0"
 
 [package.metadata.cargo-machete]
 ignored = ["clap"]
diff --git a/crates/brk_server/README.md b/crates/brk_server/README.md
index 2a0d632d0..9f92959e7 100644
--- a/crates/brk_server/README.md
+++ b/crates/brk_server/README.md
@@ -49,7 +49,7 @@ Get the count of all existing indexes.
 
 Get the count of all existing vec ids.
 
-#### [`GET /api/vecs/variant-count`](https://bitcoinresearchkit.org/api/vecs/variant-count)
+#### [`GET /api/vecs/vec-count`](https://bitcoinresearchkit.org/api/vecs/vec-count)
 
 Get the count of all existing vecs. \
 Equals to the sum of supported Indexes of each vec id.
diff --git a/crates/brk_server/src/api/interface/bridge.rs b/crates/brk_server/src/api/interface/bridge.rs
index eac299108..5f0cd2bce 100644
--- a/crates/brk_server/src/api/interface/bridge.rs
+++ b/crates/brk_server/src/api/interface/bridge.rs
@@ -36,10 +36,9 @@ impl Bridge for Interface<'static> {
 // File auto-generated, any modifications will be overwritten
 //
 
-export const VERSION = \"v{}\";
+export const VERSION = \"v{VERSION}\";
 
-",
-            VERSION
+"
         );
 
         contents += &indexes
@@ -53,7 +52,7 @@ export const VERSION = \"v{}\";
             .join("\n");
 
         contents += &format!(
-            "\n\n/** @typedef {{{}}} Index */",
+            "\n\n/** @typedef {{{}}} Index */\n",
             indexes
                 .iter()
                 .map(|i| i.to_string())
@@ -61,12 +60,35 @@ export const VERSION = \"v{}\";
                 .join(" | ")
         );
 
-        contents += "\n\n/** @typedef {ReturnType<typeof createVecIdToIndexes>} VecIdToIndexes */";
-        contents += "\n/** @typedef {keyof VecIdToIndexes} VecId */\n";
+        contents += "
+/** @typedef {ReturnType<typeof createIndexes>} Indexes */
 
-        contents += "\nexport function createVecIdToIndexes() {\n";
+export function createIndexes() {
+  return {
+";
 
-        contents += "  return {\n";
+        contents += &indexes
+            .iter()
+            .enumerate()
+            .map(|(i_of_i, i)| {
+                let lowered = i.to_string().to_lowercase();
+                format!("    {lowered}: /** @satisfies {{{i}}} */ ({i_of_i}),",)
+            })
+            .collect::<Vec<_>>()
+            .join("\n");
+
+        contents += "  };\n}\n";
+
+        contents += "
+/** @typedef {ReturnType<typeof createVecIdToIndexes>} VecIdToIndexes
+/** @typedef {keyof VecIdToIndexes} VecId */
+
+/**
+ * @returns {Record<any, number[]>}
+ */
+export function createVecIdToIndexes() {
+  return {
+";
 
         self.id_to_index_to_vec()
             .iter()
diff --git a/crates/brk_server/src/api/interface/mod.rs b/crates/brk_server/src/api/interface/mod.rs
index cf92afe3c..f6e18b74d 100644
--- a/crates/brk_server/src/api/interface/mod.rs
+++ b/crates/brk_server/src/api/interface/mod.rs
@@ -4,9 +4,7 @@ use axum::{
     http::{HeaderMap, StatusCode},
     response::{IntoResponse, Response},
 };
-use brk_core::DateIndex;
 use brk_interface::{Format, Output, Params};
-use brk_vec::{CollectableVec, StoredVec};
 use color_eyre::eyre::eyre;
 
 use crate::traits::{HeaderMapExtended, ResponseExtended};
@@ -50,20 +48,19 @@ fn req_to_response_res(
     let to = params.to();
     let format = params.format();
 
+    // TODO: From and to should be capped here
+
     let weight = vecs
         .iter()
-        .map(|(_, v)| {
-            let len = v.len();
-            let count = StoredVec::<DateIndex, usize>::range_count(from, to, len);
-            count * v.value_type_to_size_of()
-        })
+        .map(|(_, v)| v.range_weight(from, to))
         .sum::<usize>();
 
     if weight > MAX_WEIGHT {
         return Err(eyre!("Request is too heavy, max weight is {MAX_WEIGHT}"));
     }
 
-    let etag = vecs.first().unwrap().1.etag(to);
+    // TODO: height should be from vec, but good enough for now
+    let etag = vecs.first().unwrap().1.etag(interface.get_height(), to);
 
     if headers
         .get_if_none_match()
diff --git a/crates/brk_server/src/traits/header_map.rs b/crates/brk_server/src/traits/header_map.rs
index 18992c830..63e7e2c0f 100644
--- a/crates/brk_server/src/traits/header_map.rs
+++ b/crates/brk_server/src/traits/header_map.rs
@@ -8,7 +8,6 @@ use axum::http::{
     header::{self, IF_MODIFIED_SINCE, IF_NONE_MATCH},
 };
 use jiff::{Timestamp, civil::DateTime, fmt::strtime, tz::TimeZone};
-use log::info;
 
 const MODIFIED_SINCE_FORMAT: &str = "%a, %d %b %Y %H:%M:%S GMT";
 
@@ -140,7 +139,11 @@ impl HeaderMapExtended for HeaderMap {
 
     // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
     fn insert_content_type(&mut self, path: &Path) {
-        match path.extension().unwrap().to_str().unwrap() {
+        match path
+            .extension()
+            .map(|s| s.to_str().unwrap_or_default())
+            .unwrap_or_default()
+        {
             "js" => self.insert_content_type_application_javascript(),
             "json" | "map" => self.insert_content_type_application_json(),
             "html" => self.insert_content_type_text_html(),
@@ -152,10 +155,7 @@ impl HeaderMapExtended for HeaderMap {
             "jpg" | "jpeg" => self.insert_content_type_image_jpeg(),
             "png" => self.insert_content_type_image_png(),
             "webmanifest" => self.insert_content_type_application_manifest_json(),
-            extension => {
-                info!("Extension unsupported: {extension}");
-                panic!()
-            }
+            _ => {}
         }
     }
 
diff --git a/crates/brk_state/Cargo.toml b/crates/brk_state/Cargo.toml
deleted file mode 100644
index fc30b22fd..000000000
--- a/crates/brk_state/Cargo.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[package]
-name = "brk_state"
-description = "Various states used in the Bitcoin Research Kit"
-version.workspace = true
-edition.workspace = true
-license.workspace = true
-homepage.workspace = true
-repository.workspace = true
-
-[dependencies]
-bincode = { workspace = true }
-brk_core = { workspace = true }
-derive_deref = { workspace = true }
-serde = { workspace = true }
-zerocopy = { workspace = true }
-zerocopy-derive = { workspace = true }
-
-[package.metadata.cargo-machete]
-ignored = ["zerocopy"]
diff --git a/crates/brk_state/README.md b/crates/brk_state/README.md
deleted file mode 100644
index 56e84e077..000000000
--- a/crates/brk_state/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# BRK State
-
-Various states used in the Bitcoin Research Kit
diff --git a/crates/brk_state/src/hot.rs b/crates/brk_state/src/hot.rs
deleted file mode 100644
index ce7c8861f..000000000
--- a/crates/brk_state/src/hot.rs
+++ /dev/null
@@ -1,142 +0,0 @@
-pub struct OneShotSats {
-    pub price_paid_state: PricePaidState,
-    pub unrealized_block_state: UnrealizedState,
-    pub unrealized_date_state: Option<UnrealizedState>,
-}
-
-pub struct UnrealizedState {
-    supply_in_profit: Sats,
-    // supply_in_loss: Sats,
-    unrealized_profit: Dollars,
-    unrealized_loss: Dollars,
-}
-
-// Why option ?
-#[derive(Default, Debug)]
-pub struct PricePaidState {
-    pp_p5: Option<Dollars>,
-    pp_p10: Option<Dollars>,
-    pp_p15: Option<Dollars>,
-    pp_p20: Option<Dollars>,
-    pp_p25: Option<Dollars>,
-    pp_p30: Option<Dollars>,
-    pp_p35: Option<Dollars>,
-    pp_p40: Option<Dollars>,
-    pp_p45: Option<Dollars>,
-    pp_median: Option<Dollars>,
-    pp_p55: Option<Dollars>,
-    pp_p60: Option<Dollars>,
-    pp_p65: Option<Dollars>,
-    pp_p70: Option<Dollars>,
-    pp_p75: Option<Dollars>,
-    pp_p80: Option<Dollars>,
-    pp_p85: Option<Dollars>,
-    pp_p90: Option<Dollars>,
-    pp_p95: Option<Dollars>,
-
-    processed_amount: Sats,
-}
-
-pub struct PricePaidStateFull {
-    pp_p1: Option<Dollars>,
-    pp_p2: Option<Dollars>,
-    pp_p3: Option<Dollars>,
-    pp_p4: Option<Dollars>,
-    pp_p5: Option<Dollars>,
-    pp_p6: Option<Dollars>,
-    pp_p7: Option<Dollars>,
-    pp_p8: Option<Dollars>,
-    pp_p9: Option<Dollars>,
-    pp_p10: Option<Dollars>,
-    pp_p11: Option<Dollars>,
-    pp_p12: Option<Dollars>,
-    pp_p13: Option<Dollars>,
-    pp_p14: Option<Dollars>,
-    pp_p15: Option<Dollars>,
-    pp_p16: Option<Dollars>,
-    pp_p17: Option<Dollars>,
-    pp_p18: Option<Dollars>,
-    pp_p19: Option<Dollars>,
-    pp_p20: Option<Dollars>,
-    pp_p21: Option<Dollars>,
-    pp_p22: Option<Dollars>,
-    pp_p23: Option<Dollars>,
-    pp_p24: Option<Dollars>,
-    pp_p25: Option<Dollars>,
-    pp_p26: Option<Dollars>,
-    pp_p27: Option<Dollars>,
-    pp_p28: Option<Dollars>,
-    pp_p29: Option<Dollars>,
-    pp_p30: Option<Dollars>,
-    pp_p31: Option<Dollars>,
-    pp_p32: Option<Dollars>,
-    pp_p33: Option<Dollars>,
-    pp_p34: Option<Dollars>,
-    pp_p35: Option<Dollars>,
-    pp_p36: Option<Dollars>,
-    pp_p37: Option<Dollars>,
-    pp_p38: Option<Dollars>,
-    pp_p39: Option<Dollars>,
-    pp_p40: Option<Dollars>,
-    pp_p41: Option<Dollars>,
-    pp_p42: Option<Dollars>,
-    pp_p43: Option<Dollars>,
-    pp_p44: Option<Dollars>,
-    pp_p45: Option<Dollars>,
-    pp_p46: Option<Dollars>,
-    pp_p47: Option<Dollars>,
-    pp_p48: Option<Dollars>,
-    pp_p49: Option<Dollars>,
-    pp_p50: Option<Dollars>,
-    pp_p51: Option<Dollars>,
-    pp_p52: Option<Dollars>,
-    pp_p53: Option<Dollars>,
-    pp_p54: Option<Dollars>,
-    pp_p55: Option<Dollars>,
-    pp_p56: Option<Dollars>,
-    pp_p57: Option<Dollars>,
-    pp_p58: Option<Dollars>,
-    pp_p59: Option<Dollars>,
-    pp_p60: Option<Dollars>,
-    pp_p61: Option<Dollars>,
-    pp_p62: Option<Dollars>,
-    pp_p63: Option<Dollars>,
-    pp_p64: Option<Dollars>,
-    pp_p65: Option<Dollars>,
-    pp_p66: Option<Dollars>,
-    pp_p67: Option<Dollars>,
-    pp_p68: Option<Dollars>,
-    pp_p69: Option<Dollars>,
-    pp_p70: Option<Dollars>,
-    pp_p71: Option<Dollars>,
-    pp_p72: Option<Dollars>,
-    pp_p73: Option<Dollars>,
-    pp_p74: Option<Dollars>,
-    pp_p75: Option<Dollars>,
-    pp_p76: Option<Dollars>,
-    pp_p77: Option<Dollars>,
-    pp_p78: Option<Dollars>,
-    pp_p79: Option<Dollars>,
-    pp_p80: Option<Dollars>,
-    pp_p81: Option<Dollars>,
-    pp_p82: Option<Dollars>,
-    pp_p83: Option<Dollars>,
-    pp_p84: Option<Dollars>,
-    pp_p85: Option<Dollars>,
-    pp_p86: Option<Dollars>,
-    pp_p87: Option<Dollars>,
-    pp_p88: Option<Dollars>,
-    pp_p89: Option<Dollars>,
-    pp_p90: Option<Dollars>,
-    pp_p91: Option<Dollars>,
-    pp_p92: Option<Dollars>,
-    pp_p93: Option<Dollars>,
-    pp_p94: Option<Dollars>,
-    pp_p95: Option<Dollars>,
-    pp_p96: Option<Dollars>,
-    pp_p97: Option<Dollars>,
-    pp_p98: Option<Dollars>,
-    pp_p99: Option<Dollars>,
-
-    processed_amount: Sats,
-}
diff --git a/crates/brk_state/src/lib.rs b/crates/brk_state/src/lib.rs
deleted file mode 100644
index 049eca714..000000000
--- a/crates/brk_state/src/lib.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#![doc = include_str!("../README.md")]
-// #![doc = "\n## Example\n\n```rust"]
-// #![doc = include_str!("../examples/main.rs")]
-// #![doc = "```"]
-
-mod block;
-mod cohort;
-mod outputs;
-mod realized;
-// mod hot;
-mod price_to_amount;
-mod supply;
-mod transacted;
-mod unrealized;
-
-pub use block::*;
-pub use cohort::*;
-pub use outputs::*;
-pub use realized::*;
-pub use unrealized::*;
-// pub use hot::*;
-pub use price_to_amount::*;
-pub use supply::*;
-pub use transacted::*;
diff --git a/crates/brk_state/src/outputs/by_date_range.rs b/crates/brk_state/src/outputs/by_date_range.rs
deleted file mode 100644
index d482171e1..000000000
--- a/crates/brk_state/src/outputs/by_date_range.rs
+++ /dev/null
@@ -1,126 +0,0 @@
-use super::OutputFilter;
-
-#[derive(Default, Clone)]
-pub struct OutputsByDateRange<T> {
-    pub start_to_1d: T,
-    pub _1d_to_1w: T,
-    pub _1w_to_1m: T,
-    pub _1m_to_2m: T,
-    pub _2m_to_3m: T,
-    pub _3m_to_4m: T,
-    pub _4m_to_5m: T,
-    pub _5m_to_6m: T,
-    pub _6m_to_1y: T,
-    pub _1y_to_2y: T,
-    pub _2y_to_3y: T,
-    pub _3y_to_4y: T,
-    pub _4y_to_5y: T,
-    pub _5y_to_6y: T,
-    pub _6y_to_7y: T,
-    pub _7y_to_8y: T,
-    pub _8y_to_10y: T,
-    pub _10y_to_15y: T,
-    pub _15y_to_end: T,
-}
-
-impl<T> From<OutputsByDateRange<T>> for OutputsByDateRange<(OutputFilter, T)> {
-    fn from(value: OutputsByDateRange<T>) -> Self {
-        Self {
-            start_to_1d: (OutputFilter::To(1), value.start_to_1d),
-            _1d_to_1w: (OutputFilter::Range(1..7), value._1d_to_1w),
-            _1w_to_1m: (OutputFilter::Range(7..30), value._1w_to_1m),
-            _1m_to_2m: (OutputFilter::Range(30..2 * 30), value._1m_to_2m),
-            _2m_to_3m: (OutputFilter::Range(2 * 30..3 * 30), value._2m_to_3m),
-            _3m_to_4m: (OutputFilter::Range(3 * 30..4 * 30), value._3m_to_4m),
-            _4m_to_5m: (OutputFilter::Range(4 * 30..5 * 30), value._4m_to_5m),
-            _5m_to_6m: (OutputFilter::Range(5 * 30..6 * 30), value._5m_to_6m),
-            _6m_to_1y: (OutputFilter::Range(6 * 30..365), value._6m_to_1y),
-            _1y_to_2y: (OutputFilter::Range(365..2 * 365), value._1y_to_2y),
-            _2y_to_3y: (OutputFilter::Range(2 * 365..3 * 365), value._2y_to_3y),
-            _3y_to_4y: (OutputFilter::Range(3 * 365..4 * 365), value._3y_to_4y),
-            _4y_to_5y: (OutputFilter::Range(4 * 365..5 * 365), value._4y_to_5y),
-            _5y_to_6y: (OutputFilter::Range(5 * 365..6 * 365), value._5y_to_6y),
-            _6y_to_7y: (OutputFilter::Range(6 * 365..7 * 365), value._6y_to_7y),
-            _7y_to_8y: (OutputFilter::Range(7 * 365..8 * 365), value._7y_to_8y),
-            _8y_to_10y: (OutputFilter::Range(8 * 365..10 * 365), value._8y_to_10y),
-            _10y_to_15y: (OutputFilter::Range(10 * 365..15 * 365), value._10y_to_15y),
-            _15y_to_end: (OutputFilter::From(15 * 365), value._15y_to_end),
-        }
-    }
-}
-
-impl<T> OutputsByDateRange<T> {
-    pub fn as_vec(&mut self) -> [&T; 19] {
-        [
-            &self.start_to_1d,
-            &self._1d_to_1w,
-            &self._1w_to_1m,
-            &self._1m_to_2m,
-            &self._2m_to_3m,
-            &self._3m_to_4m,
-            &self._4m_to_5m,
-            &self._5m_to_6m,
-            &self._6m_to_1y,
-            &self._1y_to_2y,
-            &self._2y_to_3y,
-            &self._3y_to_4y,
-            &self._4y_to_5y,
-            &self._5y_to_6y,
-            &self._6y_to_7y,
-            &self._7y_to_8y,
-            &self._8y_to_10y,
-            &self._10y_to_15y,
-            &self._15y_to_end,
-        ]
-    }
-
-    pub fn as_mut_vec(&mut self) -> [&mut T; 19] {
-        [
-            &mut self.start_to_1d,
-            &mut self._1d_to_1w,
-            &mut self._1w_to_1m,
-            &mut self._1m_to_2m,
-            &mut self._2m_to_3m,
-            &mut self._3m_to_4m,
-            &mut self._4m_to_5m,
-            &mut self._5m_to_6m,
-            &mut self._6m_to_1y,
-            &mut self._1y_to_2y,
-            &mut self._2y_to_3y,
-            &mut self._3y_to_4y,
-            &mut self._4y_to_5y,
-            &mut self._5y_to_6y,
-            &mut self._6y_to_7y,
-            &mut self._7y_to_8y,
-            &mut self._8y_to_10y,
-            &mut self._10y_to_15y,
-            &mut self._15y_to_end,
-        ]
-    }
-}
-
-impl<T> OutputsByDateRange<(OutputFilter, T)> {
-    pub fn vecs(&self) -> [&T; 19] {
-        [
-            &self.start_to_1d.1,
-            &self._1d_to_1w.1,
-            &self._1w_to_1m.1,
-            &self._1m_to_2m.1,
-            &self._2m_to_3m.1,
-            &self._3m_to_4m.1,
-            &self._4m_to_5m.1,
-            &self._5m_to_6m.1,
-            &self._6m_to_1y.1,
-            &self._1y_to_2y.1,
-            &self._2y_to_3y.1,
-            &self._3y_to_4y.1,
-            &self._4y_to_5y.1,
-            &self._5y_to_6y.1,
-            &self._6y_to_7y.1,
-            &self._7y_to_8y.1,
-            &self._8y_to_10y.1,
-            &self._10y_to_15y.1,
-            &self._15y_to_end.1,
-        ]
-    }
-}
diff --git a/crates/brk_state/src/outputs/by_from_date.rs b/crates/brk_state/src/outputs/by_from_date.rs
deleted file mode 100644
index e590c4ead..000000000
--- a/crates/brk_state/src/outputs/by_from_date.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use super::OutputFilter;
-
-#[derive(Default, Clone)]
-pub struct OutputsByFromDate<T> {
-    pub _1d: T,
-    pub _1w: T,
-    pub _1m: T,
-    pub _2m: T,
-    pub _3m: T,
-    pub _4m: T,
-    pub _5m: T,
-    pub _6m: T,
-    pub _1y: T,
-    pub _2y: T,
-    pub _3y: T,
-    pub _4y: T,
-    pub _5y: T,
-    pub _6y: T,
-    pub _7y: T,
-    pub _8y: T,
-    pub _10y: T,
-    pub _15y: T,
-}
-
-impl<T> OutputsByFromDate<T> {
-    pub fn as_mut_vec(&mut self) -> [&mut T; 18] {
-        [
-            &mut self._1d,
-            &mut self._1w,
-            &mut self._1m,
-            &mut self._2m,
-            &mut self._3m,
-            &mut self._4m,
-            &mut self._5m,
-            &mut self._6m,
-            &mut self._1y,
-            &mut self._2y,
-            &mut self._3y,
-            &mut self._4y,
-            &mut self._5y,
-            &mut self._6y,
-            &mut self._7y,
-            &mut self._8y,
-            &mut self._10y,
-            &mut self._15y,
-        ]
-    }
-}
-
-impl<T> OutputsByFromDate<(OutputFilter, T)> {
-    pub fn vecs(&self) -> [&T; 18] {
-        [
-            &self._1d.1,
-            &self._1w.1,
-            &self._1m.1,
-            &self._2m.1,
-            &self._3m.1,
-            &self._4m.1,
-            &self._5m.1,
-            &self._6m.1,
-            &self._1y.1,
-            &self._2y.1,
-            &self._3y.1,
-            &self._4y.1,
-            &self._5y.1,
-            &self._6y.1,
-            &self._7y.1,
-            &self._8y.1,
-            &self._10y.1,
-            &self._15y.1,
-        ]
-    }
-}
-
-impl<T> From<OutputsByFromDate<T>> for OutputsByFromDate<(OutputFilter, T)> {
-    fn from(value: OutputsByFromDate<T>) -> Self {
-        Self {
-            _1d: (OutputFilter::From(1), value._1d),
-            _1w: (OutputFilter::From(7), value._1w),
-            _1m: (OutputFilter::From(30), value._1m),
-            _2m: (OutputFilter::From(2 * 30), value._2m),
-            _3m: (OutputFilter::From(3 * 30), value._3m),
-            _4m: (OutputFilter::From(4 * 30), value._4m),
-            _5m: (OutputFilter::From(5 * 30), value._5m),
-            _6m: (OutputFilter::From(6 * 30), value._6m),
-            _1y: (OutputFilter::From(365), value._1y),
-            _2y: (OutputFilter::From(2 * 365), value._2y),
-            _3y: (OutputFilter::From(3 * 365), value._3y),
-            _4y: (OutputFilter::From(4 * 365), value._4y),
-            _5y: (OutputFilter::From(5 * 365), value._5y),
-            _6y: (OutputFilter::From(6 * 365), value._6y),
-            _7y: (OutputFilter::From(7 * 365), value._7y),
-            _8y: (OutputFilter::From(8 * 365), value._8y),
-            _10y: (OutputFilter::From(10 * 365), value._10y),
-            _15y: (OutputFilter::From(15 * 365), value._15y),
-        }
-    }
-}
diff --git a/crates/brk_state/src/outputs/by_from_size.rs b/crates/brk_state/src/outputs/by_from_size.rs
deleted file mode 100644
index 27d980d85..000000000
--- a/crates/brk_state/src/outputs/by_from_size.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use brk_core::Sats;
-
-use super::OutputFilter;
-
-#[derive(Default, Clone)]
-pub struct OutputsByFromSize<T> {
-    pub _1_000sats: T,
-    pub _1btc: T,
-    pub _10btc: T,
-    pub _100btc: T,
-}
-
-impl<T> OutputsByFromSize<T> {
-    pub fn as_mut_vec(&mut self) -> [&mut T; 4] {
-        [
-            &mut self._1_000sats,
-            &mut self._1btc,
-            &mut self._10btc,
-            &mut self._100btc,
-        ]
-    }
-}
-
-impl<T> OutputsByFromSize<(OutputFilter, T)> {
-    pub fn vecs(&self) -> [&T; 4] {
-        [
-            &self._1_000sats.1,
-            &self._1btc.1,
-            &self._10btc.1,
-            &self._100btc.1,
-        ]
-    }
-}
-
-impl<T> From<OutputsByFromSize<T>> for OutputsByFromSize<(OutputFilter, T)> {
-    fn from(value: OutputsByFromSize<T>) -> Self {
-        Self {
-            _1_000sats: (OutputFilter::From(1_000), value._1_000sats),
-            _1btc: (OutputFilter::From(usize::from(Sats::ONE_BTC)), value._1btc),
-            _10btc: (
-                OutputFilter::From(usize::from(10 * Sats::ONE_BTC)),
-                value._10btc,
-            ),
-            _100btc: (
-                OutputFilter::From(usize::from(100 * Sats::ONE_BTC)),
-                value._100btc,
-            ),
-        }
-    }
-}
diff --git a/crates/brk_state/src/outputs/by_size_range.rs b/crates/brk_state/src/outputs/by_size_range.rs
deleted file mode 100644
index 0d376acf9..000000000
--- a/crates/brk_state/src/outputs/by_size_range.rs
+++ /dev/null
@@ -1,178 +0,0 @@
-use super::OutputFilter;
-
-#[derive(Default, Clone)]
-pub struct OutputsBySizeRange<T> {
-    pub _0sats: T,
-    pub from_1sat_to_10sats: T,
-    pub from_10sats_to_100sats: T,
-    pub from_100sats_to_1_000sats: T,
-    pub from_1_000sats_to_10_000sats: T,
-    pub from_10_000sats_to_100_000sats: T,
-    pub from_100_000sats_to_1_000_000sats: T,
-    pub from_1_000_000sats_to_10_000_000sats: T,
-    pub from_10_000_000sats_to_1btc: T,
-    pub from_1btc_to_10btc: T,
-    pub from_10btc_to_100btc: T,
-    pub from_100btc_to_1_000btc: T,
-    pub from_1_000btc_to_10_000btc: T,
-    pub from_10_000btc_to_100_000btc: T,
-    pub from_100_000btc: T,
-}
-
-impl<T> From<OutputsBySizeRange<T>> for OutputsBySizeRange<(OutputFilter, T)> {
-    fn from(value: OutputsBySizeRange<T>) -> Self {
-        #[allow(clippy::inconsistent_digit_grouping)]
-        Self {
-            _0sats: (OutputFilter::To(1), value._0sats),
-            from_1sat_to_10sats: (OutputFilter::Range(1..10), value.from_1sat_to_10sats),
-            from_10sats_to_100sats: (OutputFilter::Range(10..100), value.from_10sats_to_100sats),
-            from_100sats_to_1_000sats: (
-                OutputFilter::Range(100..1_000),
-                value.from_100sats_to_1_000sats,
-            ),
-            from_1_000sats_to_10_000sats: (
-                OutputFilter::Range(1_000..10_000),
-                value.from_1_000sats_to_10_000sats,
-            ),
-            from_10_000sats_to_100_000sats: (
-                OutputFilter::Range(10_000..100_000),
-                value.from_10_000sats_to_100_000sats,
-            ),
-            from_100_000sats_to_1_000_000sats: (
-                OutputFilter::Range(100_000..1_000_000),
-                value.from_100_000sats_to_1_000_000sats,
-            ),
-            from_1_000_000sats_to_10_000_000sats: (
-                OutputFilter::Range(1_000_000..10_000_000),
-                value.from_1_000_000sats_to_10_000_000sats,
-            ),
-            from_10_000_000sats_to_1btc: (
-                OutputFilter::Range(10_000_000..1_00_000_000),
-                value.from_10_000_000sats_to_1btc,
-            ),
-            from_1btc_to_10btc: (
-                OutputFilter::Range(1_00_000_000..10_00_000_000),
-                value.from_1btc_to_10btc,
-            ),
-            from_10btc_to_100btc: (
-                OutputFilter::Range(10_00_000_000..100_00_000_000),
-                value.from_10btc_to_100btc,
-            ),
-            from_100btc_to_1_000btc: (
-                OutputFilter::Range(100_00_000_000..1_000_00_000_000),
-                value.from_100btc_to_1_000btc,
-            ),
-            from_1_000btc_to_10_000btc: (
-                OutputFilter::Range(1_000_00_000_000..10_000_00_000_000),
-                value.from_1_000btc_to_10_000btc,
-            ),
-            from_10_000btc_to_100_000btc: (
-                OutputFilter::Range(10_000_00_000_000..100_000_00_000_000),
-                value.from_10_000btc_to_100_000btc,
-            ),
-            from_100_000btc: (
-                OutputFilter::From(100_000_00_000_000),
-                value.from_100_000btc,
-            ),
-        }
-    }
-}
-
-impl<T> OutputsBySizeRange<T> {
-    #[allow(clippy::inconsistent_digit_grouping)]
-    pub fn get_mut(&mut self, group: usize) -> &mut T {
-        if group == 0 {
-            &mut self._0sats
-        } else if group == 1 {
-            &mut self.from_1sat_to_10sats
-        } else if group == 10 {
-            &mut self.from_10sats_to_100sats
-        } else if group == 100 {
-            &mut self.from_100sats_to_1_000sats
-        } else if group == 1_000 {
-            &mut self.from_1_000sats_to_10_000sats
-        } else if group == 10_000 {
-            &mut self.from_10_000sats_to_100_000sats
-        } else if group == 100_000 {
-            &mut self.from_100_000sats_to_1_000_000sats
-        } else if group == 1_000_000 {
-            &mut self.from_1_000_000sats_to_10_000_000sats
-        } else if group == 10_000_000 {
-            &mut self.from_10_000_000sats_to_1btc
-        } else if group == 1_00_000_000 {
-            &mut self.from_1btc_to_10btc
-        } else if group == 10_00_000_000 {
-            &mut self.from_10btc_to_100btc
-        } else if group == 100_00_000_000 {
-            &mut self.from_100btc_to_1_000btc
-        } else if group == 1_000_00_000_000 {
-            &mut self.from_1_000btc_to_10_000btc
-        } else if group == 10_000_00_000_000 {
-            &mut self.from_10_000btc_to_100_000btc
-        } else {
-            &mut self.from_100_000btc
-        }
-    }
-
-    pub fn as_vec(&self) -> [&T; 15] {
-        [
-            &self._0sats,
-            &self.from_1sat_to_10sats,
-            &self.from_10sats_to_100sats,
-            &self.from_100sats_to_1_000sats,
-            &self.from_1_000sats_to_10_000sats,
-            &self.from_10_000sats_to_100_000sats,
-            &self.from_100_000sats_to_1_000_000sats,
-            &self.from_1_000_000sats_to_10_000_000sats,
-            &self.from_10_000_000sats_to_1btc,
-            &self.from_1btc_to_10btc,
-            &self.from_10btc_to_100btc,
-            &self.from_100btc_to_1_000btc,
-            &self.from_1_000btc_to_10_000btc,
-            &self.from_10_000btc_to_100_000btc,
-            &self.from_100_000btc,
-        ]
-    }
-
-    pub fn as_mut_vec(&mut self) -> [&mut T; 15] {
-        [
-            &mut self._0sats,
-            &mut self.from_1sat_to_10sats,
-            &mut self.from_10sats_to_100sats,
-            &mut self.from_100sats_to_1_000sats,
-            &mut self.from_1_000sats_to_10_000sats,
-            &mut self.from_10_000sats_to_100_000sats,
-            &mut self.from_100_000sats_to_1_000_000sats,
-            &mut self.from_1_000_000sats_to_10_000_000sats,
-            &mut self.from_10_000_000sats_to_1btc,
-            &mut self.from_1btc_to_10btc,
-            &mut self.from_10btc_to_100btc,
-            &mut self.from_100btc_to_1_000btc,
-            &mut self.from_1_000btc_to_10_000btc,
-            &mut self.from_10_000btc_to_100_000btc,
-            &mut self.from_100_000btc,
-        ]
-    }
-}
-
-impl<T> OutputsBySizeRange<(OutputFilter, T)> {
-    pub fn vecs(&self) -> [&T; 15] {
-        [
-            &self._0sats.1,
-            &self.from_1sat_to_10sats.1,
-            &self.from_10sats_to_100sats.1,
-            &self.from_100sats_to_1_000sats.1,
-            &self.from_1_000sats_to_10_000sats.1,
-            &self.from_10_000sats_to_100_000sats.1,
-            &self.from_100_000sats_to_1_000_000sats.1,
-            &self.from_1_000_000sats_to_10_000_000sats.1,
-            &self.from_10_000_000sats_to_1btc.1,
-            &self.from_1btc_to_10btc.1,
-            &self.from_10btc_to_100btc.1,
-            &self.from_100btc_to_1_000btc.1,
-            &self.from_1_000btc_to_10_000btc.1,
-            &self.from_10_000btc_to_100_000btc.1,
-            &self.from_100_000btc.1,
-        ]
-    }
-}
diff --git a/crates/brk_state/src/outputs/by_term.rs b/crates/brk_state/src/outputs/by_term.rs
deleted file mode 100644
index 1a80fbb34..000000000
--- a/crates/brk_state/src/outputs/by_term.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use super::OutputFilter;
-
-#[derive(Default, Clone)]
-pub struct OutputsByTerm<T> {
-    pub short: T,
-    pub long: T,
-}
-
-impl<T> OutputsByTerm<T> {
-    pub fn as_mut_vec(&mut self) -> [&mut T; 2] {
-        [&mut self.short, &mut self.long]
-    }
-}
-
-impl<T> OutputsByTerm<(OutputFilter, T)> {
-    pub fn vecs(&self) -> [&T; 2] {
-        [&self.short.1, &self.long.1]
-    }
-}
-
-impl<T> From<OutputsByTerm<T>> for OutputsByTerm<(OutputFilter, T)> {
-    fn from(value: OutputsByTerm<T>) -> Self {
-        Self {
-            short: (OutputFilter::To(5 * 30), value.short),
-            long: (OutputFilter::From(5 * 30), value.long),
-        }
-    }
-}
diff --git a/crates/brk_state/src/outputs/by_up_to_date.rs b/crates/brk_state/src/outputs/by_up_to_date.rs
deleted file mode 100644
index e28ecd0bb..000000000
--- a/crates/brk_state/src/outputs/by_up_to_date.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-use super::OutputFilter;
-
-#[derive(Default, Clone)]
-pub struct OutputsByUpToDate<T> {
-    pub _1d: T,
-    pub _1w: T,
-    pub _1m: T,
-    pub _2m: T,
-    pub _3m: T,
-    pub _4m: T,
-    pub _5m: T,
-    pub _6m: T,
-    pub _1y: T,
-    pub _2y: T,
-    pub _3y: T,
-    pub _4y: T,
-    pub _5y: T,
-    pub _6y: T,
-    pub _7y: T,
-    pub _8y: T,
-    pub _10y: T,
-    pub _15y: T,
-}
-
-impl<T> OutputsByUpToDate<T> {
-    pub fn as_mut_vec(&mut self) -> [&mut T; 18] {
-        [
-            &mut self._1d,
-            &mut self._1w,
-            &mut self._1m,
-            &mut self._2m,
-            &mut self._3m,
-            &mut self._4m,
-            &mut self._5m,
-            &mut self._6m,
-            &mut self._1y,
-            &mut self._2y,
-            &mut self._3y,
-            &mut self._4y,
-            &mut self._5y,
-            &mut self._6y,
-            &mut self._7y,
-            &mut self._8y,
-            &mut self._10y,
-            &mut self._15y,
-        ]
-    }
-}
-
-impl<T> OutputsByUpToDate<(OutputFilter, T)> {
-    pub fn vecs(&self) -> [&T; 18] {
-        [
-            &self._1d.1,
-            &self._1w.1,
-            &self._1m.1,
-            &self._2m.1,
-            &self._3m.1,
-            &self._4m.1,
-            &self._5m.1,
-            &self._6m.1,
-            &self._1y.1,
-            &self._2y.1,
-            &self._3y.1,
-            &self._4y.1,
-            &self._5y.1,
-            &self._6y.1,
-            &self._7y.1,
-            &self._8y.1,
-            &self._10y.1,
-            &self._15y.1,
-        ]
-    }
-}
-
-impl<T> From<OutputsByUpToDate<T>> for OutputsByUpToDate<(OutputFilter, T)> {
-    fn from(value: OutputsByUpToDate<T>) -> Self {
-        Self {
-            _1d: (OutputFilter::To(1), value._1d),
-            _1w: (OutputFilter::To(7), value._1w),
-            _1m: (OutputFilter::To(30), value._1m),
-            _2m: (OutputFilter::To(2 * 30), value._2m),
-            _3m: (OutputFilter::To(3 * 30), value._3m),
-            _4m: (OutputFilter::To(4 * 30), value._4m),
-            _5m: (OutputFilter::To(5 * 30), value._5m),
-            _6m: (OutputFilter::To(6 * 30), value._6m),
-            _1y: (OutputFilter::To(365), value._1y),
-            _2y: (OutputFilter::To(2 * 365), value._2y),
-            _3y: (OutputFilter::To(3 * 365), value._3y),
-            _4y: (OutputFilter::To(4 * 365), value._4y),
-            _5y: (OutputFilter::To(5 * 365), value._5y),
-            _6y: (OutputFilter::To(6 * 365), value._6y),
-            _7y: (OutputFilter::To(7 * 365), value._7y),
-            _8y: (OutputFilter::To(8 * 365), value._8y),
-            _10y: (OutputFilter::To(10 * 365), value._10y),
-            _15y: (OutputFilter::To(15 * 365), value._15y),
-        }
-    }
-}
diff --git a/crates/brk_state/src/outputs/by_up_to_size.rs b/crates/brk_state/src/outputs/by_up_to_size.rs
deleted file mode 100644
index 5987ee28f..000000000
--- a/crates/brk_state/src/outputs/by_up_to_size.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-use brk_core::Sats;
-
-use super::OutputFilter;
-
-#[derive(Default, Clone)]
-pub struct OutputsByUpToSize<T> {
-    pub _1_000sats: T,
-    pub _10_000sats: T,
-    pub _1btc: T,
-    pub _10btc: T,
-    pub _100btc: T,
-}
-
-impl<T> OutputsByUpToSize<T> {
-    pub fn as_mut_vec(&mut self) -> [&mut T; 5] {
-        [
-            &mut self._1_000sats,
-            &mut self._10_000sats,
-            &mut self._1btc,
-            &mut self._10btc,
-            &mut self._100btc,
-        ]
-    }
-}
-
-impl<T> OutputsByUpToSize<(OutputFilter, T)> {
-    pub fn vecs(&self) -> [&T; 5] {
-        [
-            &self._1_000sats.1,
-            &self._10_000sats.1,
-            &self._1btc.1,
-            &self._10btc.1,
-            &self._100btc.1,
-        ]
-    }
-}
-
-impl<T> From<OutputsByUpToSize<T>> for OutputsByUpToSize<(OutputFilter, T)> {
-    fn from(value: OutputsByUpToSize<T>) -> Self {
-        Self {
-            _1_000sats: (OutputFilter::To(1_000), value._1_000sats),
-            _10_000sats: (OutputFilter::To(10_000), value._10_000sats),
-            _1btc: (OutputFilter::To(usize::from(Sats::ONE_BTC)), value._1btc),
-            _10btc: (
-                OutputFilter::To(usize::from(10 * Sats::ONE_BTC)),
-                value._10btc,
-            ),
-            _100btc: (
-                OutputFilter::To(usize::from(100 * Sats::ONE_BTC)),
-                value._100btc,
-            ),
-        }
-    }
-}
diff --git a/crates/brk_state/src/outputs/filter.rs b/crates/brk_state/src/outputs/filter.rs
deleted file mode 100644
index 613258280..000000000
--- a/crates/brk_state/src/outputs/filter.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use std::ops::Range;
-
-use brk_core::{HalvingEpoch, OutputType};
-
-#[derive(Debug, Clone)]
-pub enum OutputFilter {
-    All,
-    To(usize),
-    Range(Range<usize>),
-    From(usize),
-    Epoch(HalvingEpoch),
-    Type(OutputType),
-}
-
-impl OutputFilter {
-    pub fn contains(&self, value: usize) -> bool {
-        match self {
-            OutputFilter::All => true,
-            OutputFilter::To(to) => *to > value,
-            OutputFilter::From(from) => *from <= value,
-            OutputFilter::Range(r) => r.contains(&value),
-            OutputFilter::Epoch(_) => false,
-            OutputFilter::Type(_) => false,
-        }
-    }
-
-    pub fn includes(&self, other: &OutputFilter) -> bool {
-        match self {
-            OutputFilter::All => true,
-            OutputFilter::To(to) => match other {
-                OutputFilter::All => false,
-                OutputFilter::To(to2) => to >= to2,
-                OutputFilter::Range(range) => range.end <= *to,
-                OutputFilter::From(_) => false,
-                OutputFilter::Epoch(_) => false,
-                OutputFilter::Type(_) => false,
-            },
-            OutputFilter::From(from) => match other {
-                OutputFilter::All => false,
-                OutputFilter::To(_) => false,
-                OutputFilter::Range(range) => range.start >= *from,
-                OutputFilter::From(from2) => from <= from2,
-                OutputFilter::Epoch(_) => false,
-                OutputFilter::Type(_) => false,
-            },
-            OutputFilter::Range(_) => false,
-            OutputFilter::Epoch(_) => false,
-            OutputFilter::Type(_) => false,
-        }
-    }
-}
diff --git a/crates/brk_state/src/outputs/mod.rs b/crates/brk_state/src/outputs/mod.rs
deleted file mode 100644
index 97efb4c87..000000000
--- a/crates/brk_state/src/outputs/mod.rs
+++ /dev/null
@@ -1,120 +0,0 @@
-mod by_date_range;
-mod by_epoch;
-mod by_from_date;
-mod by_from_size;
-mod by_size_range;
-mod by_spendable_type;
-mod by_term;
-mod by_type;
-mod by_unspendable_type;
-mod by_up_to_date;
-mod by_up_to_size;
-// mod by_value;
-mod filter;
-
-pub use by_date_range::*;
-pub use by_epoch::*;
-pub use by_from_date::*;
-pub use by_from_size::*;
-pub use by_size_range::*;
-pub use by_spendable_type::*;
-pub use by_term::*;
-pub use by_type::*;
-pub use by_unspendable_type::*;
-pub use by_up_to_date::*;
-pub use by_up_to_size::*;
-// pub use by_value::*;
-pub use filter::*;
-
-#[derive(Default, Clone)]
-pub struct Outputs<T> {
-    pub all: T,
-    pub by_date_range: OutputsByDateRange<T>,
-    pub by_epoch: OutputsByEpoch<T>,
-    pub by_from_date: OutputsByFromDate<T>,
-    pub by_from_size: OutputsByFromSize<T>,
-    pub by_size_range: OutputsBySizeRange<T>,
-    pub by_term: OutputsByTerm<T>,
-    pub by_type: OutputsBySpendableType<T>,
-    pub by_up_to_date: OutputsByUpToDate<T>,
-    pub by_up_to_size: OutputsByUpToSize<T>,
-    // Needs whole UTXO set, TODO later
-    // pub by_value: OutputsByValue<T>,
-}
-
-impl<T> Outputs<T> {
-    pub fn as_mut_vecs(&mut self) -> Vec<&mut T> {
-        [&mut self.all]
-            .into_iter()
-            .chain(self.by_term.as_mut_vec())
-            .chain(self.by_up_to_date.as_mut_vec())
-            .chain(self.by_from_date.as_mut_vec())
-            .chain(self.by_from_size.as_mut_vec())
-            .chain(self.by_date_range.as_mut_vec())
-            .chain(self.by_epoch.as_mut_vec())
-            .chain(self.by_size_range.as_mut_vec())
-            .chain(self.by_up_to_size.as_mut_vec())
-            .chain(self.by_type.as_mut_vec())
-            // .chain(self.by_value.as_mut_vec())
-            .collect::<Vec<_>>()
-    }
-
-    pub fn as_mut_separate_vecs(&mut self) -> Vec<&mut T> {
-        self.by_date_range
-            .as_mut_vec()
-            .into_iter()
-            .chain(self.by_epoch.as_mut_vec())
-            .chain(self.by_size_range.as_mut_vec())
-            .chain(self.by_type.as_mut_vec())
-            // .chain(self.by_value.as_mut_vec())
-            .collect::<Vec<_>>()
-    }
-
-    pub fn as_mut_overlapping_vecs(&mut self) -> Vec<&mut T> {
-        [&mut self.all]
-            .into_iter()
-            .chain(self.by_term.as_mut_vec())
-            .chain(self.by_up_to_date.as_mut_vec())
-            .chain(self.by_from_date.as_mut_vec())
-            .chain(self.by_up_to_size.as_mut_vec())
-            .chain(self.by_from_size.as_mut_vec())
-            .collect::<Vec<_>>()
-    }
-}
-
-impl<T> Outputs<(OutputFilter, T)> {
-    pub fn vecs(&self) -> Vec<&T> {
-        [&self.all.1]
-            .into_iter()
-            .chain(self.by_term.vecs())
-            .chain(self.by_up_to_date.vecs())
-            .chain(self.by_from_date.vecs())
-            .chain(self.by_date_range.vecs())
-            .chain(self.by_epoch.vecs())
-            .chain(self.by_size_range.vecs())
-            .chain(self.by_type.vecs())
-            .chain(self.by_up_to_size.vecs())
-            .chain(self.by_from_size.vecs())
-            // .chain(self.by_value.vecs())
-            .collect::<Vec<_>>()
-    }
-}
-
-impl<T> From<Outputs<T>> for Outputs<(OutputFilter, T)> {
-    fn from(value: Outputs<T>) -> Self {
-        Self {
-            all: (OutputFilter::All, value.all),
-            by_term: OutputsByTerm::from(value.by_term),
-            by_up_to_date: OutputsByUpToDate::from(value.by_up_to_date),
-            by_from_date: OutputsByFromDate::from(value.by_from_date),
-            by_date_range: OutputsByDateRange::from(value.by_date_range),
-            by_epoch: OutputsByEpoch::from(value.by_epoch),
-            by_size_range: OutputsBySizeRange::from(value.by_size_range),
-            by_up_to_size: OutputsByUpToSize::from(value.by_up_to_size),
-            by_from_size: OutputsByFromSize::from(value.by_from_size),
-            // Needs whole UTXO set, TODO later
-            // by_value: OutputsByValue<T>,
-            by_type: OutputsBySpendableType::from(value.by_type),
-        }
-    }
-}
diff --git a/crates/brk_state/src/transacted.rs b/crates/brk_state/src/transacted.rs
deleted file mode 100644
index 271892c5a..000000000
--- a/crates/brk_state/src/transacted.rs
+++ /dev/null
@@ -1,101 +0,0 @@
-use std::{
-    collections::BTreeMap,
-    mem,
-    ops::{Add, AddAssign},
-};
-
-use brk_core::{OutputType, Sats};
-
-use super::{OutputsByType, SupplyState};
-
-#[derive(Default, Debug)]
-pub struct Transacted {
-    pub spendable_supply: SupplyState,
-    pub by_type: OutputsByType<SupplyState>,
-    pub by_size_group: BTreeMap<usize, SupplyState>,
-}
-
-impl Transacted {
-    #[allow(clippy::inconsistent_digit_grouping)]
-    pub fn iterate(&mut self, value: Sats, _type: OutputType) {
-        let supply = SupplyState { utxos: 1, value };
-
-        *self.by_type.get_mut(_type) += &supply;
-
-        if _type.is_unspendable() {
-            return;
-        }
-
-        self.spendable_supply += &supply;
-
-        let _value = usize::from(value);
-
-        // Need to be in sync with by_size !! but plenty fast (I think)
-        if _value == 0 {
-            *self.by_size_group.entry(0).or_default() += &supply;
-        } else if _value < 10 {
-            *self.by_size_group.entry(1).or_default() += &supply;
-        } else if _value < 100 {
-            *self.by_size_group.entry(10).or_default() += &supply;
-        } else if _value < 1_000 {
-            *self.by_size_group.entry(100).or_default() += &supply;
-        } else if _value < 10_000 {
-            *self.by_size_group.entry(1_000).or_default() += &supply;
-        } else if _value < 100_000 {
-            *self.by_size_group.entry(10_000).or_default() += &supply;
-        } else if _value < 1_000_000 {
-            *self.by_size_group.entry(100_000).or_default() += &supply;
-        } else if _value < 10_000_000 {
-            *self.by_size_group.entry(1_000_000).or_default() += &supply;
-        } else if _value < 1_00_000_000 {
-            *self.by_size_group.entry(10_000_000).or_default() += &supply;
-        } else if _value < 10_00_000_000 {
-            *self.by_size_group.entry(1_00_000_000).or_default() += &supply;
-        } else if _value < 100_00_000_000 {
-            *self.by_size_group.entry(10_00_000_000).or_default() += &supply;
-        } else if _value < 1_000_00_000_000 {
-            *self.by_size_group.entry(100_00_000_000).or_default() += &supply;
-        } else if _value < 10_000_00_000_000 {
-            *self.by_size_group.entry(1_000_00_000_000).or_default() += &supply;
-        } else if _value < 100_000_00_000_000 {
-            *self.by_size_group.entry(10_000_00_000_000).or_default() += &supply;
-        } else {
-            *self.by_size_group.entry(100_000_00_000_000).or_default() += &supply;
-        }
-    }
-
-    fn merge_by_size(
-        first: BTreeMap<usize, SupplyState>,
-        second: BTreeMap<usize, SupplyState>,
-    ) -> BTreeMap<usize, SupplyState> {
-        let (mut source, to_consume) = if first.len() > second.len() {
-            (first, second)
-        } else {
-            (second, first)
-        };
-        to_consume.into_iter().for_each(|(k, v)| {
-            *source.entry(k).or_default() += &v;
-        });
-        source
-    }
-}
-
-impl Add for Transacted {
-    type Output = Self;
-    fn add(self, rhs: Self) -> Self::Output {
-        Self {
-            spendable_supply: self.spendable_supply + rhs.spendable_supply,
-            by_type: self.by_type + rhs.by_type,
-            by_size_group: Self::merge_by_size(self.by_size_group, rhs.by_size_group),
-        }
-    }
-}
-
-impl AddAssign for Transacted {
-    fn add_assign(&mut self, rhs: Self) {
-        self.by_size_group =
-            Self::merge_by_size(mem::take(&mut self.by_size_group), rhs.by_size_group);
-        self.spendable_supply += &rhs.spendable_supply;
-        self.by_type += rhs.by_type;
-    }
-}
diff --git a/crates/brk_store/Cargo.toml b/crates/brk_store/Cargo.toml
index 687831ee4..0c1e88c30 100644
--- a/crates/brk_store/Cargo.toml
+++ b/crates/brk_store/Cargo.toml
@@ -13,3 +13,4 @@ repository.workspace = true
 brk_core = { workspace = true }
 byteview = { workspace = true }
 fjall = { workspace = true }
+log = { workspace = true }
diff --git a/crates/brk_store/examples/main.rs b/crates/brk_store/examples/main.rs
index d7f80d31d..82400ecdd 100644
--- a/crates/brk_store/examples/main.rs
+++ b/crates/brk_store/examples/main.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use brk_core::{Dollars, Height, Result, Sats, Version};
-use brk_store::Store;
+use brk_store::{AnyStore, Store};
 
 fn main() -> Result<()> {
     let p = Path::new("./examples/_fjall");
@@ -15,5 +15,7 @@ fn main() -> Result<()> {
 
     store.commit(Height::ZERO)?;
 
+    store.persist()?;
+
     Ok(())
 }
diff --git a/crates/brk_store/src/lib.rs b/crates/brk_store/src/lib.rs
index 7b99eace6..2f51e5d51 100644
--- a/crates/brk_store/src/lib.rs
+++ b/crates/brk_store/src/lib.rs
@@ -4,13 +4,14 @@
 #![doc = "```"]
 
 use std::{
+    borrow::Cow,
     collections::{BTreeMap, BTreeSet},
     fmt::Debug,
-    mem,
+    fs, mem,
     path::Path,
 };
 
-use brk_core::{Height, Result, Value, Version};
+use brk_core::{Height, Result, Version};
 use byteview::ByteView;
 use fjall::{
     PartitionCreateOptions, PersistMode, ReadTransaction, TransactionalKeyspace,
@@ -18,22 +19,25 @@ use fjall::{
 };
 
 mod meta;
+mod r#trait;
+
+use log::info;
 use meta::*;
+pub use r#trait::*;
 
 pub struct Store<Key, Value> {
     meta: StoreMeta,
-    name: String,
+    name: &'static str,
     keyspace: TransactionalKeyspace,
+    // Arc it
     partition: Option<TransactionalPartitionHandle>,
     rtx: ReadTransaction,
     puts: BTreeMap<Key, Value>,
     dels: BTreeSet<Key>,
-    bloom_filter_bits: Option<Option<u8>>,
+    bloom_filters: Option<bool>,
 }
 
-/// Use default if will read
-const DEFAULT_BLOOM_FILTER_BITS: Option<u8> = Some(5);
-// const CHECK_COLLISISONS: bool = true;
+// const CHECK_COLLISIONS: bool = true;
 const MAJOR_FJALL_VERSION: Version = Version::TWO;
 
 pub fn open_keyspace(path: &Path) -> fjall::Result<TransactionalKeyspace> {
@@ -53,14 +57,16 @@ where
         path: &Path,
         name: &str,
         version: Version,
-        bloom_filter_bits: Option<Option<u8>>,
+        bloom_filters: Option<bool>,
     ) -> Result<Self> {
+        fs::create_dir_all(path)?;
+
         let (meta, partition) = StoreMeta::checked_open(
             keyspace,
             &path.join(format!("meta/{name}")),
             MAJOR_FJALL_VERSION + version,
             || {
-                Self::open_partition_handle(keyspace, name, bloom_filter_bits).inspect_err(|e| {
+                Self::open_partition_handle(keyspace, name, bloom_filters).inspect_err(|e| {
                     eprintln!("{e}");
                     eprintln!("Delete {path:?} and try again");
                 })
@@ -71,29 +77,35 @@ where
 
         Ok(Self {
             meta,
-            name: name.to_owned(),
+            name: Box::leak(Box::new(name.to_string())),
             keyspace: keyspace.clone(),
             partition: Some(partition),
             rtx,
             puts: BTreeMap::new(),
             dels: BTreeSet::new(),
-            bloom_filter_bits,
+            bloom_filters,
         })
     }
 
-    pub fn get(&self, key: &'a K) -> Result<Option<Value<V>>> {
+    pub fn get(&self, key: &'a K) -> Result<Option<Cow<V>>> {
         if let Some(v) = self.puts.get(key) {
-            Ok(Some(Value::Ref(v)))
+            Ok(Some(Cow::Borrowed(v)))
         } else if let Some(slice) = self
             .rtx
             .get(self.partition.as_ref().unwrap(), ByteView::from(key))?
         {
-            Ok(Some(Value::Owned(V::from(ByteView::from(slice)))))
+            Ok(Some(Cow::Owned(V::from(ByteView::from(slice)))))
         } else {
             Ok(None)
         }
     }
 
+    pub fn is_empty(&self) -> Result<bool> {
+        self.rtx
+            .is_empty(self.partition.as_ref().unwrap())
+            .map_err(|e| e.into())
+    }
+
     // pub fn puts_first_key_value(&self) -> Option<(&K, &V)> {
     //     self.puts.first_key_value()
     // }
@@ -126,17 +138,17 @@ where
     pub fn insert_if_needed(&mut self, key: K, value: V, height: Height) {
         if self.needs(height) {
             if !self.dels.is_empty() {
-                // self.dels.remove(&key);
-                unreachable!("Shouldn't reach this");
+                self.dels.remove(&key);
+                // unreachable!("Shouldn't reach this");
             }
             self.puts.insert(key, value);
         }
     }
 
     pub fn remove(&mut self, key: K) {
-        if self.is_empty() {
-            return;
-        }
+        // if self.is_empty()? {
+        //     return Ok(());
+        // }
 
         if !self.puts.is_empty() {
             unreachable!("Shouldn't reach this");
@@ -146,6 +158,8 @@ where
             dbg!(key, &self.meta.path());
             unreachable!();
         }
+
+        // Ok(())
     }
 
     // pub fn retain_or_del<F>(&mut self, retain: F)
@@ -161,38 +175,55 @@ where
     //     });
     // }
 
-    pub fn commit(&mut self, height: Height) -> Result<()> {
-        if self.has(height) && self.puts.is_empty() && self.dels.is_empty() {
+    fn open_partition_handle(
+        keyspace: &TransactionalKeyspace,
+        name: &str,
+        bloom_filters: Option<bool>,
+    ) -> Result<TransactionalPartitionHandle> {
+        let mut options = PartitionCreateOptions::default()
+            .max_memtable_size(8 * 1024 * 1024)
+            .manual_journal_persist(true);
+
+        if bloom_filters.is_some_and(|b| !b) {
+            options = options.bloom_filter_bits(None);
+        }
+
+        keyspace.open_partition(name, options).map_err(|e| e.into())
+    }
+
+    pub fn commit_(
+        &mut self,
+        height: Height,
+        remove: impl Iterator<Item = K>,
+        insert: impl Iterator<Item = (K, V)>,
+    ) -> Result<()> {
+        if self.has(height) {
             return Ok(());
         }
 
-        self.meta.export(self.len(), height)?;
+        self.meta.export(height)?;
 
         let mut wtx = self.keyspace.write_tx();
 
         let partition = self.partition.as_ref().unwrap();
 
-        mem::take(&mut self.dels)
-            .into_iter()
-            .for_each(|key| wtx.remove(partition, ByteView::from(key)));
+        remove.for_each(|key| wtx.remove(partition, ByteView::from(key)));
 
-        mem::take(&mut self.puts)
-            .into_iter()
-            .for_each(|(key, value)| {
-                // if CHECK_COLLISISONS {
-                //     #[allow(unused_must_use)]
-                //     if let Ok(Some(value)) = wtx.get(&self.partition, key.as_bytes()) {
-                //         dbg!(
-                //             &key,
-                //             V::try_from(value.as_bytes().into()).unwrap(),
-                //             &self.meta,
-                //             self.rtx.get(&self.partition, key.as_bytes())
-                //         );
-                //         unreachable!();
-                //     }
-                // }
-                wtx.insert(partition, ByteView::from(key), ByteView::from(value))
-            });
+        insert.for_each(|(key, value)| {
+            // if CHECK_COLLISIONS {
+            //     #[allow(unused_must_use)]
+            //     if let Ok(Some(value)) = wtx.get(&self.partition, key.as_bytes()) {
+            //         dbg!(
+            //             &key,
+            //             V::try_from(value.as_bytes().into()).unwrap(),
+            //             &self.meta,
+            //             self.rtx.get(&self.partition, key.as_bytes())
+            //         );
+            //         unreachable!();
+            //     }
+            // }
+            wtx.insert(partition, ByteView::from(key), ByteView::from(value))
+        });
 
         wtx.commit()?;
 
@@ -200,72 +231,66 @@ where
 
         Ok(())
     }
+}
 
-    pub fn rotate_memtable(&self) {
-        let _ = self.partition.as_ref().unwrap().inner().rotate_memtable();
-    }
-
-    pub fn height(&self) -> Option<Height> {
-        self.meta.height()
-    }
-
-    pub fn len(&self) -> usize {
-        let len = self.meta.len() + self.puts.len() - self.dels.len();
-        if len > 18440000000000000000 {
-            dbg!((
-                len,
-                self.meta.path(),
-                self.meta.len(),
-                self.puts.len(),
-                &self.dels,
-            ));
-            unreachable!()
+impl<'a, K, V> AnyStore for Store<K, V>
+where
+    K: Debug + Clone + From<ByteView> + Ord + 'a,
+    V: Debug + Clone + From<ByteView>,
+    ByteView: From<K> + From<&'a K> + From<V>,
+{
+    fn commit(&mut self, height: Height) -> Result<()> {
+        if self.puts.is_empty() && self.dels.is_empty() {
+            self.meta.export(height)?;
+            return Ok(());
         }
-        len
-    }
-    pub fn is_empty(&self) -> bool {
-        self.len() == 0
+
+        let dels = mem::take(&mut self.dels);
+        let puts = mem::take(&mut self.puts);
+
+        self.commit_(height, dels.into_iter(), puts.into_iter())
     }
 
-    pub fn has(&self, height: Height) -> bool {
-        self.meta.has(height)
-    }
-    pub fn needs(&self, height: Height) -> bool {
-        self.meta.needs(height)
-    }
-
-    fn open_partition_handle(
-        keyspace: &TransactionalKeyspace,
-        name: &str,
-        bloom_filter_bits: Option<Option<u8>>,
-    ) -> Result<TransactionalPartitionHandle> {
-        keyspace
-            .open_partition(
-                name,
-                PartitionCreateOptions::default()
-                    .bloom_filter_bits(bloom_filter_bits.unwrap_or(DEFAULT_BLOOM_FILTER_BITS))
-                    .max_memtable_size(8 * 1024 * 1024)
-                    .manual_journal_persist(true),
-            )
+    fn persist(&self) -> Result<()> {
+        self.keyspace
+            .persist(PersistMode::SyncAll)
             .map_err(|e| e.into())
     }
 
-    pub fn reset_partition(&mut self) -> Result<()> {
+    fn name(&self) -> &'static str {
+        self.name
+    }
+
+    fn reset(&mut self) -> Result<()> {
+        info!("Resetting {}...", self.name);
+
         let partition: TransactionalPartitionHandle = self.partition.take().unwrap();
 
         self.keyspace.delete_partition(partition)?;
 
-        self.keyspace.persist(PersistMode::SyncAll)?;
-
         self.meta.reset();
 
-        let partition =
-            Self::open_partition_handle(&self.keyspace, &self.name, self.bloom_filter_bits)?;
+        let partition = Self::open_partition_handle(&self.keyspace, self.name, self.bloom_filters)?;
 
         self.partition.replace(partition);
 
         Ok(())
     }
+
+    fn height(&self) -> Option<Height> {
+        self.meta.height()
+    }
+
+    fn has(&self, height: Height) -> bool {
+        self.meta.has(height)
+    }
+    fn needs(&self, height: Height) -> bool {
+        self.meta.needs(height)
+    }
+
+    fn version(&self) -> Version {
+        self.meta.version()
+    }
 }
 
 impl<Key, Value> Clone for Store<Key, Value>
@@ -276,13 +301,13 @@ where
     fn clone(&self) -> Self {
         Self {
             meta: self.meta.clone(),
-            name: self.name.clone(),
+            name: self.name,
             keyspace: self.keyspace.clone(),
             partition: None,
             rtx: self.keyspace.read_tx(),
             puts: self.puts.clone(),
             dels: self.dels.clone(),
-            bloom_filter_bits: self.bloom_filter_bits,
+            bloom_filters: self.bloom_filters,
         }
     }
 }
diff --git a/crates/brk_store/src/meta.rs b/crates/brk_store/src/meta.rs
index bf052f9a4..5597afc14 100644
--- a/crates/brk_store/src/meta.rs
+++ b/crates/brk_store/src/meta.rs
@@ -3,8 +3,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use brk_core::{Result, Version, copy_first_8bytes};
-use fjall::{TransactionalKeyspace, TransactionalPartitionHandle};
+use brk_core::{Result, Version};
+use fjall::{PersistMode, TransactionalKeyspace, TransactionalPartitionHandle};
 
 use super::Height;
 
@@ -13,7 +13,6 @@ pub struct StoreMeta {
     pathbuf: PathBuf,
     version: Version,
     height: Option<Height>,
-    len: usize,
 }
 
 impl StoreMeta {
@@ -40,17 +39,14 @@ impl StoreMeta {
             fs::remove_dir_all(path)?;
             fs::create_dir(path)?;
             keyspace.delete_partition(partition)?;
-            keyspace.persist(fjall::PersistMode::SyncAll)?;
+            keyspace.persist(PersistMode::SyncAll)?;
             partition = open_partition_handle()?;
         }
 
-        let len = Self::read_length_(path);
-
         let slf = Self {
             pathbuf: path.to_owned(),
             version,
             height: Height::try_from(Self::path_height_(path).as_path()).ok(),
-            len,
         };
 
         slf.version.write(&slf.path_version())?;
@@ -58,28 +54,17 @@ impl StoreMeta {
         Ok((slf, partition))
     }
 
-    pub fn len(&self) -> usize {
-        self.len
+    pub fn version(&self) -> Version {
+        self.version
     }
 
-    // pub fn is_empty(&self) -> bool {
-    //     self.len() == 0
-    // }
-
-    // pub fn version(&self) -> Version {
-    //     self.version
-    // }
-
-    pub fn export(&mut self, len: usize, height: Height) -> io::Result<()> {
-        self.len = len;
-        self.write_length()?;
+    pub fn export(&mut self, height: Height) -> io::Result<()> {
         self.height = Some(height);
         height.write(&self.path_height())
     }
 
     pub fn reset(&mut self) {
         self.height.take();
-        self.len = 0
     }
 
     pub fn path(&self) -> &Path {
@@ -108,19 +93,4 @@ impl StoreMeta {
     fn path_height_(path: &Path) -> PathBuf {
         path.join("height")
     }
-
-    fn read_length_(path: &Path) -> usize {
-        fs::read(Self::path_length(path))
-            .map(|v| usize::from_ne_bytes(copy_first_8bytes(v.as_slice()).unwrap()))
-            .unwrap_or_default()
-    }
-    fn write_length(&self) -> io::Result<()> {
-        Self::write_length_(&self.pathbuf, self.len)
-    }
-    fn write_length_(path: &Path, len: usize) -> io::Result<()> {
-        fs::write(Self::path_length(path), len.to_ne_bytes())
-    }
-    fn path_length(path: &Path) -> PathBuf {
-        path.join("length")
-    }
 }
diff --git a/crates/brk_store/src/trait.rs b/crates/brk_store/src/trait.rs
new file mode 100644
index 000000000..5b6d06499
--- /dev/null
+++ b/crates/brk_store/src/trait.rs
@@ -0,0 +1,19 @@
+use brk_core::{Height, Result, Version};
+
+pub trait AnyStore {
+    fn commit(&mut self, height: Height) -> Result<()>;
+
+    fn persist(&self) -> Result<()>;
+
+    fn reset(&mut self) -> Result<()>;
+
+    fn name(&self) -> &'static str;
+
+    fn height(&self) -> Option<Height>;
+
+    fn has(&self, height: Height) -> bool;
+
+    fn needs(&self, height: Height) -> bool;
+
+    fn version(&self) -> Version;
+}
diff --git a/crates/brk_vec/Cargo.toml b/crates/brk_vec/Cargo.toml
index 8291a91e1..677712d17 100644
--- a/crates/brk_vec/Cargo.toml
+++ b/crates/brk_vec/Cargo.toml
@@ -16,7 +16,7 @@ brk_exit = { workspace = true }
 clap = { workspace = true }
 clap_derive = { workspace = true }
 log = { workspace = true }
-memmap2 = "0.9.5"
+memmap2 = "0.9.7"
 rayon = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/crates/brk_vec/examples/main.rs b/crates/brk_vec/examples/main.rs
index b82a6ba19..fc5500411 100644
--- a/crates/brk_vec/examples/main.rs
+++ b/crates/brk_vec/examples/main.rs
@@ -1,16 +1,18 @@
 use std::{fs, path::Path};
 
-use brk_core::{DateIndex, Height, Version};
+use brk_core::{DateIndex, Height, Printable, Version};
 use brk_vec::{AnyVec, CollectableVec, Format, GenericStoredVec, StoredVec, VecIterator};
 
+type I = DateIndex;
 #[allow(clippy::upper_case_acronyms)]
-type VEC = StoredVec<DateIndex, u32>;
+type VEC = StoredVec<I, u32>;
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let _ = fs::remove_dir_all("./vec");
+    let _ = fs::remove_file("./vec");
 
     let version = Version::TWO;
-    let format = Format::Compressed;
+    let format = Format::Raw;
 
     {
         let mut vec: VEC = StoredVec::forced_import(Path::new("."), "vec", version, format)?;
@@ -21,6 +23,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
         let mut iter = vec.into_iter();
         dbg!(iter.get(0.into()));
+        dbg!(iter.get(1.into()));
+        dbg!(iter.get(2.into()));
         dbg!(iter.get(20.into()));
         dbg!(iter.get(21.into()));
 
@@ -38,6 +42,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         dbg!(iter.get(0.into()));
         dbg!(iter.get(1.into()));
         dbg!(iter.get(2.into()));
+        dbg!(iter.get(3.into()));
+        dbg!(iter.get(4.into()));
+        dbg!(iter.get(5.into()));
         dbg!(iter.get(20.into()));
         dbg!(iter.get(20.into()));
         dbg!(iter.get(0.into()));
diff --git a/crates/brk_vec/src/structs/header.rs b/crates/brk_vec/src/structs/header.rs
index 7a66793aa..30bd0c936 100644
--- a/crates/brk_vec/src/structs/header.rs
+++ b/crates/brk_vec/src/structs/header.rs
@@ -7,7 +7,6 @@ use std::{
 
 use arc_swap::ArcSwap;
 use brk_core::{Error, Height, Result, Version};
-use memmap2::Mmap;
 use zerocopy::{FromBytes, IntoBytes};
 use zerocopy_derive::{FromBytes, Immutable, IntoBytes, KnownLayout};
 
@@ -31,8 +30,12 @@ impl Header {
         })
     }
 
-    pub fn import_and_verify(mmap: &Mmap, vec_version: Version, format: Format) -> Result<Self> {
-        let inner = HeaderInner::import_and_verify(mmap, vec_version, format)?;
+    pub fn import_and_verify(
+        file: &mut File,
+        vec_version: Version,
+        format: Format,
+    ) -> Result<Self> {
+        let inner = HeaderInner::import_and_verify(file, vec_version, format)?;
         Ok(Self {
             inner: Arc::new(ArcSwap::from_pointee(inner)),
             modified: false,
@@ -100,7 +103,6 @@ impl HeaderInner {
             compressed: ZeroCopyBool::from(format),
         };
         header.write(file)?;
-        // dbg!(file.bytes().map(|b| b.unwrap()).collect::<Vec<_>>());
         file.seek(SeekFrom::End(0))?;
         Ok(header)
     }
@@ -109,13 +111,22 @@ impl HeaderInner {
         file.write_all_at(self.as_bytes(), 0)
     }
 
-    pub fn import_and_verify(mmap: &Mmap, vec_version: Version, format: Format) -> Result<Self> {
-        if mmap.len() < HEADER_OFFSET {
+    pub fn import_and_verify(
+        file: &mut File,
+        vec_version: Version,
+        format: Format,
+    ) -> Result<Self> {
+        let len = file.metadata()?.len();
+
+        if len < HEADER_OFFSET as u64 {
             return Err(Error::WrongLength);
         }
-        // dbg!(mmap.len());
-        let header = HeaderInner::read_from_bytes(&mmap[..HEADER_OFFSET])?;
-        // dbg!(&header);
+
+        let mut buf = [0; HEADER_OFFSET];
+        file.read_exact_at(&mut buf, 0)?;
+
+        let header = HeaderInner::read_from_bytes(&buf)?;
+
         if header.header_version != HEADER_VERSION {
             return Err(Error::DifferentVersion {
                 found: header.header_version,
@@ -136,6 +147,7 @@ impl HeaderInner {
         {
             return Err(Error::DifferentCompressionMode);
         }
+
         Ok(header)
     }
 }
diff --git a/crates/brk_vec/src/traits/any.rs b/crates/brk_vec/src/traits/any.rs
index e9d35c1e2..84c516788 100644
--- a/crates/brk_vec/src/traits/any.rs
+++ b/crates/brk_vec/src/traits/any.rs
@@ -1,7 +1,16 @@
-use brk_core::Version;
+use brk_core::{Height, Version};
 
 use super::{BoxedVecIterator, StoredIndex, StoredType};
 
+pub fn i64_to_usize(i: i64, len: usize) -> usize {
+    if i >= 0 {
+        (i as usize).min(len)
+    } else {
+        let v = len as i64 + i;
+        if v < 0 { 0 } else { v as usize }
+    }
+}
+
 pub trait AnyVec: Send + Sync {
     fn version(&self) -> Version;
     fn name(&self) -> &str;
@@ -11,10 +20,10 @@ pub trait AnyVec: Send + Sync {
     }
     fn index_type_to_string(&self) -> &'static str;
     fn value_type_to_size_of(&self) -> usize;
-    fn etag(&self, to: Option<i64>) -> String {
+    fn etag(&self, height: Height, to: Option<i64>) -> String {
         let len = self.len();
         format!(
-            "{}-{:?}",
+            "{}-{}-{}",
             to.map_or(len, |to| {
                 if to.is_negative() {
                     len.checked_sub(to.unsigned_abs() as usize)
@@ -23,9 +32,16 @@ pub trait AnyVec: Send + Sync {
                     to as usize
                 }
             }),
-            self.version()
+            u64::from(self.version()),
+            u32::from(height),
         )
     }
+
+    #[inline]
+    fn i64_to_usize(&self, i: i64) -> usize {
+        let len = self.len();
+        i64_to_usize(i, len)
+    }
 }
 
 pub trait AnyIterableVec<I, T>: AnyVec {
diff --git a/crates/brk_vec/src/traits/collectable.rs b/crates/brk_vec/src/traits/collectable.rs
index c643a9d73..87d7b840b 100644
--- a/crates/brk_vec/src/traits/collectable.rs
+++ b/crates/brk_vec/src/traits/collectable.rs
@@ -1,5 +1,7 @@
 use brk_core::{Error, Result};
 
+use crate::i64_to_usize;
+
 use super::{AnyIterableVec, AnyVec, StoredIndex, StoredType};
 
 pub trait CollectableVec<I, T>: AnyVec + AnyIterableVec<I, T>
@@ -8,6 +10,10 @@ where
     I: StoredIndex,
     T: StoredType,
 {
+    fn collect(&self) -> Result<Vec<T>> {
+        self.collect_range(None, None)
+    }
+
     fn collect_range(&self, from: Option<usize>, to: Option<usize>) -> Result<Vec<T>> {
         let len = self.len();
         let from = from.unwrap_or_default();
@@ -20,12 +26,12 @@ where
         Ok(self
             .iter_at_(from)
             .take(to - from)
-            .map(|(_, v)| v.into_inner())
+            .map(|(_, v)| v.into_owned())
             .collect::<Vec<_>>())
     }
 
     #[inline]
-    fn i64_to_usize(i: i64, len: usize) -> usize {
+    fn i64_to_usize_(i: i64, len: usize) -> usize {
         if i >= 0 {
             (i as usize).min(len)
         } else {
@@ -34,27 +40,19 @@ where
         }
     }
 
-    fn range_count(from: Option<i64>, to: Option<i64>, len: usize) -> usize {
-        let from = from.map(|i| Self::i64_to_usize(i, len));
-        let to = to.map(|i| Self::i64_to_usize(i, len));
-        (from.unwrap_or_default()..to.unwrap_or(len)).count()
-    }
-
-    #[doc(hidden)]
     fn collect_signed_range(&self, from: Option<i64>, to: Option<i64>) -> Result<Vec<T>> {
-        let len = self.len();
-        let from = from.map(|i| Self::i64_to_usize(i, len));
-        let to = to.map(|i| Self::i64_to_usize(i, len));
+        let from = from.map(|i| self.i64_to_usize(i));
+        let to = to.map(|i| self.i64_to_usize(i));
         self.collect_range(from, to)
     }
 
     #[inline]
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
-        self.collect_signed_range(from, to)?
+        self.collect_range(from, to)?
             .into_iter()
             .map(|v| serde_json::to_value(v).map_err(Error::from))
             .collect::<Result<Vec<_>>>()
@@ -72,7 +70,18 @@ where
 pub trait AnyCollectableVec: AnyVec {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>>;
+
+    fn range_count(&self, from: Option<i64>, to: Option<i64>) -> usize {
+        let len = self.len();
+        let from = from.map(|i| i64_to_usize(i, len));
+        let to = to.map(|i| i64_to_usize(i, len));
+        (from.unwrap_or_default()..to.unwrap_or(len)).count()
+    }
+
+    fn range_weight(&self, from: Option<i64>, to: Option<i64>) -> usize {
+        self.range_count(from, to) * self.value_type_to_size_of()
+    }
 }
diff --git a/crates/brk_vec/src/traits/generic.rs b/crates/brk_vec/src/traits/generic.rs
index 38955e43a..4b0ffd2cf 100644
--- a/crates/brk_vec/src/traits/generic.rs
+++ b/crates/brk_vec/src/traits/generic.rs
@@ -1,12 +1,11 @@
 use std::{
+    borrow::Cow,
     fs::{File, OpenOptions},
     io::{self, Seek, SeekFrom, Write},
     path::{Path, PathBuf},
-    sync::Arc,
 };
 
-use arc_swap::ArcSwap;
-use brk_core::{Result, Value};
+use brk_core::Result;
 use memmap2::Mmap;
 
 use crate::{AnyVec, HEADER_OFFSET, Header};
@@ -21,6 +20,10 @@ where
 {
     const SIZE_OF_T: usize = size_of::<T>();
 
+    #[inline]
+    fn unwrap_read(&self, index: I, mmap: &Mmap) -> T {
+        self.read(index, mmap).unwrap().unwrap()
+    }
     #[inline]
     fn read(&self, index: I, mmap: &Mmap) -> Result<Option<T>> {
         self.read_(index.to_usize()?, mmap)
@@ -28,12 +31,12 @@ where
     fn read_(&self, index: usize, mmap: &Mmap) -> Result<Option<T>>;
 
     #[inline]
-    fn get_or_read(&self, index: I, mmap: &Mmap) -> Result<Option<Value<T>>> {
+    fn get_or_read(&self, index: I, mmap: &Mmap) -> Result<Option<Cow<T>>> {
         self.get_or_read_(index.to_usize()?, mmap)
     }
     #[inline]
-    fn get_or_read_(&self, index: usize, mmap: &Mmap) -> Result<Option<Value<T>>> {
-        let stored_len = self.stored_len_(mmap);
+    fn get_or_read_(&self, index: usize, mmap: &Mmap) -> Result<Option<Cow<T>>> {
+        let stored_len = self.stored_len();
 
         if index >= stored_len {
             let pushed = self.pushed();
@@ -41,9 +44,9 @@ where
             if j >= pushed.len() {
                 return Ok(None);
             }
-            Ok(pushed.get(j).map(Value::Ref))
+            Ok(pushed.get(j).map(Cow::Borrowed))
         } else {
-            Ok(self.read_(index, mmap)?.map(Value::Owned))
+            Ok(self.read_(index, mmap)?.map(Cow::Owned))
         }
     }
 
@@ -56,10 +59,7 @@ where
         format!("{}_to_{}", I::to_string(), self.name())
     }
 
-    fn mmap(&self) -> &ArcSwap<Mmap>;
-
     fn stored_len(&self) -> usize;
-    fn stored_len_(&self, mmap: &Mmap) -> usize;
 
     fn pushed(&self) -> &[T];
     #[inline]
@@ -111,7 +111,7 @@ where
 
     fn file_set_len(&mut self, file: &mut File, len: u64) -> Result<()> {
         Self::file_set_len_(file, len)?;
-        self.update_mmap(file)
+        Ok(())
     }
     fn file_set_len_(file: &mut File, len: u64) -> Result<()> {
         file.set_len(len)?;
@@ -121,13 +121,13 @@ where
 
     fn file_write_all(&mut self, file: &mut File, buf: &[u8]) -> Result<()> {
         file.write_all(buf)?;
-        self.update_mmap(file)
+        file.flush()?;
+        Ok(())
     }
 
     fn file_truncate_and_write_all(&mut self, file: &mut File, len: u64, buf: &[u8]) -> Result<()> {
         Self::file_set_len_(file, len)?;
-        file.write_all(buf)?;
-        self.update_mmap(file)
+        self.file_write_all(file, buf)
     }
 
     fn reset(&mut self) -> Result<()>;
@@ -138,14 +138,10 @@ where
         self.file_truncate_and_write_all(&mut file, HEADER_OFFSET as u64, &[])
     }
 
-    fn new_mmap(file: &File) -> Result<Arc<Mmap>> {
-        Ok(Arc::new(unsafe { Mmap::map(file)? }))
-    }
-
-    fn update_mmap(&mut self, file: &File) -> Result<()> {
-        let mmap = Self::new_mmap(file)?;
-        self.mmap().store(mmap);
-        Ok(())
+    #[inline]
+    fn create_mmap(&self) -> Result<Mmap> {
+        let file = self.open_file()?;
+        unsafe { Mmap::map(&file).map_err(|e| e.into()) }
     }
 
     #[inline]
diff --git a/crates/brk_vec/src/traits/iterator.rs b/crates/brk_vec/src/traits/iterator.rs
index 3e0d8ef06..097e513a7 100644
--- a/crates/brk_vec/src/traits/iterator.rs
+++ b/crates/brk_vec/src/traits/iterator.rs
@@ -1,6 +1,6 @@
-use std::iter::Skip;
+use std::{borrow::Cow, iter::Skip};
 
-use brk_core::{Printable, Value};
+use brk_core::Printable;
 
 use super::{StoredIndex, StoredType};
 
@@ -34,7 +34,7 @@ pub trait BaseVecIterator: Iterator {
     }
 }
 
-pub trait VecIterator<'a>: BaseVecIterator<Item = (Self::I, Value<'a, Self::T>)> {
+pub trait VecIterator<'a>: BaseVecIterator<Item = (Self::I, Cow<'a, Self::T>)> {
     type I: StoredIndex;
     type T: StoredType + 'a;
 
@@ -44,12 +44,12 @@ pub trait VecIterator<'a>: BaseVecIterator<Item = (Self::I, Value<'a, Self::T>)>
     }
 
     #[inline]
-    fn get_(&mut self, i: usize) -> Option<Value<'a, Self::T>> {
+    fn get_(&mut self, i: usize) -> Option<Cow<'a, Self::T>> {
         self.next_at(i).map(|(_, v)| v)
     }
 
     #[inline]
-    fn get(&mut self, i: Self::I) -> Option<Value<'a, Self::T>> {
+    fn get(&mut self, i: Self::I) -> Option<Cow<'a, Self::T>> {
         self.get_(i.unwrap_to_usize())
     }
 
@@ -62,15 +62,15 @@ pub trait VecIterator<'a>: BaseVecIterator<Item = (Self::I, Value<'a, Self::T>)>
     fn unwrap_get_inner_(&mut self, i: usize) -> Self::T {
         self.get_(i)
             .unwrap_or_else(|| {
-                dbg!(self.name(), i, self.len());
+                dbg!(self.name(), i, self.len(), Self::I::to_string());
                 panic!("unwrap_get_inner_")
             })
-            .into_inner()
+            .into_owned()
     }
 
     #[inline]
     fn get_inner(&mut self, i: Self::I) -> Option<Self::T> {
-        self.get_(i.unwrap_to_usize()).map(|v| v.into_inner())
+        self.get_(i.unwrap_to_usize()).map(|v| v.into_owned())
     }
 
     fn last(mut self) -> Option<Self::Item>
@@ -83,7 +83,7 @@ pub trait VecIterator<'a>: BaseVecIterator<Item = (Self::I, Value<'a, Self::T>)>
         }
         let i = len - 1;
         self.set_(i);
-        self.next().map(|(i, v)| (i, Value::Owned(v.into_inner())))
+        self.next()
     }
 
     fn index_type_to_string(&self) -> &'static str {
@@ -93,7 +93,7 @@ pub trait VecIterator<'a>: BaseVecIterator<Item = (Self::I, Value<'a, Self::T>)>
 
 impl<'a, I, T, Iter> VecIterator<'a> for Iter
 where
-    Iter: BaseVecIterator<Item = (I, Value<'a, T>)>,
+    Iter: BaseVecIterator<Item = (I, Cow<'a, T>)>,
     I: StoredIndex,
     T: StoredType + 'a,
 {
@@ -102,4 +102,4 @@ where
 }
 
 pub type BoxedVecIterator<'a, I, T> =
-    Box<dyn VecIterator<'a, I = I, T = T, Item = (I, Value<'a, T>)> + 'a>;
+    Box<dyn VecIterator<'a, I = I, T = T, Item = (I, Cow<'a, T>)> + 'a>;
diff --git a/crates/brk_vec/src/variants/compressed.rs b/crates/brk_vec/src/variants/compressed.rs
index 769e33bbb..d81485a0b 100644
--- a/crates/brk_vec/src/variants/compressed.rs
+++ b/crates/brk_vec/src/variants/compressed.rs
@@ -1,11 +1,12 @@
 use std::{
+    borrow::Cow,
     fs, mem,
     path::{Path, PathBuf},
     sync::Arc,
 };
 
 use arc_swap::{ArcSwap, Guard};
-use brk_core::{Error, Result, Value, Version};
+use brk_core::{Error, Result, Version};
 use memmap2::Mmap;
 use rayon::prelude::*;
 use zstd::DEFAULT_COMPRESSION_LEVEL;
@@ -56,7 +57,7 @@ where
     }
 
     pub fn import(parent: &Path, name: &str, version: Version) -> Result<Self> {
-        let inner = RawVec::import(parent, name, version)?;
+        let mut inner = RawVec::import(parent, name, version)?;
 
         let pages_meta = {
             let path = inner
@@ -65,12 +66,19 @@ where
             if inner.is_empty() {
                 let _ = fs::remove_file(&path);
             }
-            Arc::new(ArcSwap::new(Arc::new(CompressedPagesMetadata::read(
-                &path,
-            )?)))
+            CompressedPagesMetadata::read(&path)?
         };
 
-        Ok(Self { inner, pages_meta })
+        inner.set_stored_len(if let Some(last) = pages_meta.last() {
+            (pages_meta.len() - 1) * Self::PER_PAGE + last.values_len as usize
+        } else {
+            0
+        });
+
+        Ok(Self {
+            inner,
+            pages_meta: Arc::new(ArcSwap::new(Arc::new(pages_meta))),
+        })
     }
 
     fn decode_page(&self, page_index: usize, mmap: &Mmap) -> Result<Vec<T>> {
@@ -119,24 +127,16 @@ where
         zstd::encode_all(bytes.as_slice(), DEFAULT_COMPRESSION_LEVEL).unwrap()
     }
 
-    #[inline(always)]
+    #[inline]
     fn index_to_page_index(index: usize) -> usize {
         index / Self::PER_PAGE
     }
 
-    #[inline(always)]
+    #[inline]
     fn page_index_to_index(page_index: usize) -> usize {
         page_index * Self::PER_PAGE
     }
 
-    fn stored_len__(pages_meta: &Guard<Arc<CompressedPagesMetadata>>) -> usize {
-        if let Some(last) = pages_meta.last() {
-            (pages_meta.len() - 1) * Self::PER_PAGE + last.values_len as usize
-        } else {
-            0
-        }
-    }
-
     #[inline]
     pub fn iter(&self) -> CompressedVecIterator<'_, I, T> {
         self.into_iter()
@@ -179,22 +179,13 @@ where
         self.inner.mut_header()
     }
 
-    #[inline]
-    fn mmap(&self) -> &ArcSwap<Mmap> {
-        self.inner.mmap()
-    }
-
     fn parent(&self) -> &Path {
         self.inner.parent()
     }
 
     #[inline]
     fn stored_len(&self) -> usize {
-        Self::stored_len__(&self.pages_meta.load())
-    }
-    #[inline]
-    fn stored_len_(&self, _: &Mmap) -> usize {
-        self.stored_len()
+        self.inner.stored_len()
     }
 
     #[inline]
@@ -222,6 +213,8 @@ where
 
         let stored_len = self.stored_len();
 
+        let mut file = file_opt.unwrap_or(self.open_file()?);
+
         let mut pages_meta = (**self.pages_meta.load()).clone();
 
         let mut starting_page_index = pages_meta.len();
@@ -235,16 +228,13 @@ where
 
             let last_page_index = pages_meta.len() - 1;
 
-            values = Self::decode_page_(
-                stored_len,
-                last_page_index,
-                &self.mmap().load(),
-                &pages_meta,
-            )
-            .inspect_err(|_| {
-                dbg!(last_page_index, &pages_meta);
-            })
-            .unwrap();
+            let mmap = unsafe { Mmap::map(&file)? };
+
+            values = Self::decode_page_(stored_len, last_page_index, &mmap, &pages_meta)
+                .inspect_err(|_| {
+                    dbg!(last_page_index, &pages_meta);
+                })
+                .unwrap();
 
             truncate_at.replace(pages_meta.pop().unwrap().start);
             starting_page_index = last_page_index;
@@ -286,8 +276,6 @@ where
 
         pages_meta.write()?;
 
-        let mut file = file_opt.unwrap_or(self.open_file()?);
-
         if let Some(truncate_at) = truncate_at {
             self.file_set_len(&mut file, truncate_at)?;
         }
@@ -323,7 +311,11 @@ where
 
         let page_index = Self::index_to_page_index(index);
 
-        let values = self.decode_page(page_index, &self.mmap().load())?;
+        let mut file = self.open_file()?;
+
+        let mmap = unsafe { Mmap::map(&file)? };
+
+        let values = self.decode_page(page_index, &mmap)?;
         let mut buf = vec![];
 
         let mut page = pages_meta.truncate(page_index).unwrap();
@@ -347,8 +339,6 @@ where
 
         self.pages_meta.store(Arc::new(pages_meta));
 
-        let mut file = self.open_file()?;
-
         self.file_truncate_and_write_all(&mut file, len, &buf)?;
 
         Ok(())
@@ -398,7 +388,7 @@ impl<I, T> Clone for CompressedVec<I, T> {
 #[derive(Debug)]
 pub struct CompressedVecIterator<'a, I, T> {
     vec: &'a CompressedVec<I, T>,
-    guard: Guard<Arc<Mmap>>,
+    mmap: Mmap,
     decoded_page: Option<(usize, Vec<T>)>,
     // second_decoded_page?: Option<(usize, Vec<T>)>,
     pages_meta: Guard<Arc<CompressedPagesMetadata>>,
@@ -441,10 +431,10 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
 
     fn next(&mut self) -> Option<Self::Item> {
-        let mmap = &self.guard;
+        let mmap = &self.mmap;
         let i = self.index;
         let stored_len = self.stored_len;
 
@@ -456,7 +446,7 @@ where
             self.vec
                 .pushed()
                 .get(j)
-                .map(|v| (I::from(i), Value::Ref(v)))
+                .map(|v| (I::from(i), Cow::Borrowed(v)))
         } else {
             let page_index = i / Self::PER_PAGE;
 
@@ -476,7 +466,7 @@ where
                 .unwrap()
                 .1
                 .get(i % Self::PER_PAGE)
-                .map(|v| (I::from(i), Value::Owned(v.clone())))
+                .map(|v| (I::from(i), Cow::Owned(v.clone())))
         };
 
         self.index += 1;
@@ -490,19 +480,20 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = CompressedVecIterator<'a, I, T>;
 
     fn into_iter(self) -> Self::IntoIter {
         let pages_meta = self.pages_meta.load();
-        let stored_len = CompressedVec::<I, T>::stored_len__(&pages_meta);
+        let stored_len = self.stored_len();
+
         CompressedVecIterator {
             vec: self,
-            guard: self.mmap().load(),
+            mmap: self.create_mmap().unwrap(),
             decoded_page: None,
             pages_meta,
-            stored_len,
             index: 0,
+            stored_len,
         }
     }
 }
@@ -527,8 +518,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/computed.rs b/crates/brk_vec/src/variants/computed.rs
index aefca73b8..53cc45ff2 100644
--- a/crates/brk_vec/src/variants/computed.rs
+++ b/crates/brk_vec/src/variants/computed.rs
@@ -1,10 +1,10 @@
-use std::{fs, path::Path};
+use std::{borrow::Cow, fs, path::Path};
 
 use brk_exit::Exit;
 use clap_derive::ValueEnum;
 use serde::{Deserialize, Serialize};
 
-use brk_core::{Result, StoredPhantom, Value, Version};
+use brk_core::{Result, StoredPhantom, Version};
 
 use crate::{
     AnyCollectableVec, AnyIterableVec, AnyVec, BaseVecIterator, BoxedAnyIterableVec,
@@ -36,7 +36,12 @@ impl Computation {
 }
 
 #[derive(Clone)]
-pub enum Dependencies<I, T, S1I, S1T, S2I, S2T, S3I, S3T> {
+pub enum Dependencies<I, T, S1I, S1T, S2I, S2T, S3I, S3T>
+where
+    S1T: Clone,
+    S2T: Clone,
+    S3T: Clone,
+{
     From1(BoxedAnyIterableVec<S1I, S1T>, ComputeFrom1<I, T, S1I, S1T>),
     From2(
         (BoxedAnyIterableVec<S1I, S1T>, BoxedAnyIterableVec<S2I, S2T>),
@@ -60,7 +65,12 @@ pub type ComputedVecFrom3<I, T, S1I, S1T, S2I, S2T, S3I, S3T> =
     ComputedVec<I, T, S1I, S1T, S2I, S2T, S3I, S3T>;
 
 #[derive(Clone)]
-pub enum ComputedVec<I, T, S1I, S1T, S2I, S2T, S3I, S3T> {
+pub enum ComputedVec<I, T, S1I, S1T, S2I, S2T, S3I, S3T>
+where
+    S1T: Clone,
+    S2T: Clone,
+    S3T: Clone,
+{
     Eager {
         vec: EagerVec<I, T>,
         deps: Dependencies<I, T, S1I, S1T, S2I, S2T, S3I, S3T>,
@@ -82,7 +92,7 @@ where
     S3T: StoredType,
 {
     pub fn forced_import_or_init_from_1(
-        mode: Computation,
+        computation: Computation,
         path: &Path,
         name: &str,
         version: Version,
@@ -90,7 +100,7 @@ where
         source: BoxedAnyIterableVec<S1I, S1T>,
         compute: ComputeFrom1<I, T, S1I, S1T>,
     ) -> Result<Self> {
-        Ok(match mode {
+        Ok(match computation {
             Computation::Eager => Self::Eager {
                 vec: EagerVec::forced_import(path, name, version, format)?,
                 deps: Dependencies::From1(source, compute),
@@ -104,7 +114,7 @@ where
 
     #[allow(clippy::too_many_arguments)]
     pub fn forced_import_or_init_from_2(
-        mode: Computation,
+        computation: Computation,
         path: &Path,
         name: &str,
         version: Version,
@@ -113,7 +123,7 @@ where
         source2: BoxedAnyIterableVec<S2I, S2T>,
         compute: ComputeFrom2<I, T, S1I, S1T, S2I, S2T>,
     ) -> Result<Self> {
-        Ok(match mode {
+        Ok(match computation {
             Computation::Eager => Self::Eager {
                 vec: EagerVec::forced_import(path, name, version, format)?,
                 deps: Dependencies::From2((source1, source2), compute),
@@ -127,7 +137,7 @@ where
 
     #[allow(clippy::too_many_arguments)]
     pub fn forced_import_or_init_from_3(
-        mode: Computation,
+        computation: Computation,
         path: &Path,
         name: &str,
         version: Version,
@@ -137,7 +147,7 @@ where
         source3: BoxedAnyIterableVec<S3I, S3T>,
         compute: ComputeFrom3<I, T, S1I, S1T, S2I, S2T, S3I, S3T>,
     ) -> Result<Self> {
-        Ok(match mode {
+        Ok(match computation {
             Computation::Eager => Self::Eager {
                 vec: EagerVec::forced_import(path, name, version, format)?,
                 deps: Dependencies::From3((source1, source2, source3), compute),
@@ -251,7 +261,12 @@ where
     }
 }
 
-pub enum ComputedVecIterator<'a, I, T, S1I, S1T, S2I, S2T, S3I, S3T> {
+pub enum ComputedVecIterator<'a, I, T, S1I, S1T, S2I, S2T, S3I, S3T>
+where
+    S1T: Clone,
+    S2T: Clone,
+    S3T: Clone,
+{
     Eager(StoredVecIterator<'a, I, T>),
     LazyFrom1(LazyVecFrom1Iterator<'a, I, T, S1I, S1T>),
     LazyFrom2(LazyVecFrom2Iterator<'a, I, T, S1I, S1T, S2I, S2T>),
@@ -270,7 +285,7 @@ where
     S3I: StoredIndex,
     S3T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     fn next(&mut self) -> Option<Self::Item> {
         match self {
             Self::Eager(i) => i.next(),
@@ -335,7 +350,7 @@ where
     S3I: StoredIndex,
     S3T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = ComputedVecIterator<'a, I, T, S1I, S1T, S2I, S2T, S3I, S3T>;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -382,8 +397,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/eager.rs b/crates/brk_vec/src/variants/eager.rs
index d684403d7..7bd5d3a47 100644
--- a/crates/brk_vec/src/variants/eager.rs
+++ b/crates/brk_vec/src/variants/eager.rs
@@ -1,5 +1,6 @@
 use core::error;
 use std::{
+    borrow::Cow,
     cmp::Ordering,
     f32,
     fmt::Debug,
@@ -7,10 +8,9 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use arc_swap::ArcSwap;
 use brk_core::{
     Bitcoin, CheckedSub, Close, Date, DateIndex, Dollars, Error, Result, Sats, StoredF32,
-    StoredUsize, Value, Version,
+    StoredUsize, Version,
 };
 use brk_exit::Exit;
 use log::info;
@@ -23,7 +23,7 @@ use crate::{
 
 const ONE_KIB: usize = 1024;
 const ONE_MIB: usize = ONE_KIB * ONE_KIB;
-const MAX_CACHE_SIZE: usize = 210 * ONE_MIB;
+const MAX_CACHE_SIZE: usize = 256 * ONE_MIB;
 const DCA_AMOUNT: Dollars = Dollars::mint(100.0);
 
 #[derive(Debug, Clone)]
@@ -103,14 +103,10 @@ where
         self.0.path()
     }
 
-    pub fn get_or_read(&self, index: I, mmap: &Mmap) -> Result<Option<Value<T>>> {
+    pub fn get_or_read(&self, index: I, mmap: &Mmap) -> Result<Option<Cow<T>>> {
         self.0.get_or_read(index, mmap)
     }
 
-    pub fn mmap(&self) -> &ArcSwap<Mmap> {
-        self.0.mmap()
-    }
-
     pub fn inner_version(&self) -> Version {
         self.0.version()
     }
@@ -213,7 +209,7 @@ where
 
         let index = max_from.min(A::from(self.len()));
         other.iter_at(index).try_for_each(|(a, b)| {
-            let (i, v) = t((a, b.into_inner(), self));
+            let (i, v) = t((a, b.into_owned(), self));
             self.forced_push_at(i, v, exit)
         })?;
 
@@ -238,7 +234,7 @@ where
         let mut adder_iter = adder.iter();
 
         added.iter_at(index).try_for_each(|(i, v)| {
-            let v = v.into_inner() + adder_iter.unwrap_get_inner(i);
+            let v = v.into_owned() + adder_iter.unwrap_get_inner(i);
 
             self.forced_push_at(i, v, exit)
         })?;
@@ -265,7 +261,7 @@ where
 
         subtracted.iter_at(index).try_for_each(|(i, v)| {
             let v = v
-                .into_inner()
+                .into_owned()
                 .checked_sub(subtracter_iter.unwrap_get_inner(i))
                 .unwrap();
 
@@ -302,7 +298,7 @@ where
                     T::from(source.iter().unwrap_get_inner_(0))
                 });
             }
-            let max = prev.clone().unwrap().max(T::from(v.into_inner()));
+            let max = prev.clone().unwrap().max(T::from(v.into_owned()));
             prev.replace(max.clone());
 
             self.forced_push_at(i, max, exit)
@@ -332,7 +328,7 @@ where
         let mut multiplier_iter = multiplier.iter();
 
         multiplied.iter_at(index).try_for_each(|(i, v)| {
-            let v = v.into_inner() * multiplier_iter.unwrap_get_inner(i);
+            let v = v.into_owned() * multiplier_iter.unwrap_get_inner(i);
 
             self.forced_push_at(i, v.into(), exit)
         })?;
@@ -416,7 +412,7 @@ where
 
         let mut divider_iter = divider.iter();
         divided.iter_at(index).try_for_each(|(i, divided)| {
-            let divided = divided.into_inner();
+            let divided = divided.into_owned();
             let divider = divider_iter.unwrap_get_inner(i);
 
             let v = if as_percentage {
@@ -451,7 +447,7 @@ where
         let index = max_from.min(I::from(self.len()));
         let mut close_iter = close.iter();
         ath.iter_at(index).try_for_each(|(i, ath)| {
-            let ath = ath.into_inner();
+            let ath = ath.into_owned();
             if ath == Dollars::ZERO {
                 self.forced_push_at(i, T::from(StoredF32::default()), exit)
             } else {
@@ -479,11 +475,11 @@ where
         )?;
 
         let index = max_from.min(
-            VecIterator::last(self.0.into_iter()).map_or_else(T::default, |(_, v)| v.into_inner()),
+            VecIterator::last(self.0.into_iter()).map_or_else(T::default, |(_, v)| v.into_owned()),
         );
         let mut prev_i = None;
         other.iter_at(index).try_for_each(|(v, i)| -> Result<()> {
-            let i = i.into_inner();
+            let i = i.into_owned();
             if prev_i.is_some_and(|prev_i| prev_i == i) {
                 return Ok(());
             }
@@ -647,7 +643,7 @@ where
         self_to_other.iter_at(index).try_for_each(|(i, other)| {
             self.forced_push_at(
                 i,
-                T::from(other_to_self_iter.unwrap_get_inner(other.into_inner()) == i),
+                T::from(other_to_self_iter.unwrap_get_inner(other.into_owned()) == i),
                 exit,
             )
         })?;
@@ -715,7 +711,7 @@ where
             .unwrap()
             .iter_at(index)
             .try_for_each(|(i, v)| {
-                let mut sum = v.into_inner();
+                let mut sum = v.into_owned();
                 others_iter.iter_mut().for_each(|iter| {
                     sum = sum.clone() + iter.unwrap_get_inner(i);
                 });
@@ -750,7 +746,7 @@ where
             .unwrap()
             .iter_at(index)
             .try_for_each(|(i, v)| {
-                let min = v.into_inner();
+                let min = v.into_owned();
                 let min = others_iter
                     .iter_mut()
                     .map(|iter| iter.unwrap_get_inner(i))
@@ -787,7 +783,7 @@ where
             .unwrap()
             .iter_at(index)
             .try_for_each(|(i, v)| {
-                let max = v.into_inner();
+                let max = v.into_owned();
                 let max = others_iter
                     .iter_mut()
                     .map(|iter| iter.unwrap_get_inner(i))
@@ -836,7 +832,7 @@ where
         let min_prev_i = min_i.unwrap_or_default().unwrap_to_usize();
         let mut other_iter = source.iter();
         source.iter_at(index).try_for_each(|(i, value)| {
-            let value = value.into_inner();
+            let value = value.into_owned();
 
             if min_i.is_none() || min_i.is_some_and(|min_i| min_i <= i) {
                 if prev.is_none() {
@@ -924,7 +920,7 @@ where
         let index = max_from.min(I::from(self.len()));
         let mut source_iter = source.iter();
         source.iter_at(index).try_for_each(|(i, current)| {
-            let current = current.into_inner();
+            let current = current.into_owned();
 
             let prev = i
                 .checked_sub(I::from(len))
@@ -963,7 +959,7 @@ where
                     .unwrap_or_default(),
             );
 
-            let last_value = f32::from(b.into_inner());
+            let last_value = f32::from(b.into_owned());
 
             let percentage_change = ((last_value / previous_value) - 1.0) * 100.0;
 
@@ -999,7 +995,7 @@ where
         percentage_returns
             .iter_at(index)
             .try_for_each(|(i, percentage)| {
-                let percentage = percentage.into_inner();
+                let percentage = percentage.into_owned();
 
                 let cagr = (((f32::from(percentage) / 100.0 + 1.0).powf(1.0 / years as f32)) - 1.0)
                     * 100.0;
@@ -1054,7 +1050,7 @@ impl EagerVec<DateIndex, Sats> {
 
         let index = max_from.min(DateIndex::from(self.len()));
         closes.iter_at(index).try_for_each(|(i, closes)| {
-            let price = *closes.into_inner();
+            let price = *closes.into_owned();
             let i_usize = i.unwrap_to_usize();
             if prev.is_none() {
                 if i_usize == 0 {
@@ -1102,7 +1098,7 @@ impl EagerVec<DateIndex, Sats> {
 
         let index = max_from.min(DateIndex::from(self.len()));
         closes.iter_at(index).try_for_each(|(i, closes)| {
-            let price = *closes.into_inner();
+            let price = *closes.into_owned();
             let i_usize = i.unwrap_to_usize();
             if prev.is_none() {
                 if i_usize == 0 {
@@ -1144,7 +1140,7 @@ impl EagerVec<DateIndex, Dollars> {
         let first_price_date = DateIndex::try_from(Date::new(2010, 7, 12)).unwrap();
 
         stacks.iter_at(index).try_for_each(|(i, stack)| {
-            let stack = stack.into_inner();
+            let stack = stack.into_owned();
             let mut avg_price = Dollars::from(f64::NAN);
             if i > first_price_date {
                 avg_price = DCA_AMOUNT
@@ -1175,7 +1171,7 @@ impl EagerVec<DateIndex, Dollars> {
         let from_usize = from.unwrap_to_usize();
 
         stacks.iter_at(index).try_for_each(|(i, stack)| {
-            let stack = stack.into_inner();
+            let stack = stack.into_owned();
             let mut avg_price = Dollars::from(f64::NAN);
             if i >= from {
                 avg_price =
@@ -1204,7 +1200,7 @@ where
 
         let index = max_from.min(I::from(self.len()));
         sats.iter_at(index).try_for_each(|(i, sats)| {
-            let (i, v) = (i, Bitcoin::from(sats.into_inner()));
+            let (i, v) = (i, Bitcoin::from(sats.into_owned()));
             self.forced_push_at(i, v, exit)
         })?;
 
@@ -1231,7 +1227,7 @@ where
         let index = max_from.min(I::from(self.len()));
         bitcoin.iter_at(index).try_for_each(|(i, bitcoin)| {
             let dollars = price_iter.unwrap_get_inner(i);
-            let (i, v) = (i, *dollars * bitcoin.into_inner());
+            let (i, v) = (i, *dollars * bitcoin.into_owned());
             self.forced_push_at(i, v, exit)
         })?;
 
@@ -1262,7 +1258,7 @@ where
 //         bitcoin.iter_at(index).try_for_each(|(i, bitcoin, ..)| {
 //             let height = i_to_height_iter.unwrap_get_inner(i);
 //             let dollars = price_iter.unwrap_get_inner(height);
-//             let (i, v) = (i, *dollars * bitcoin.into_inner());
+//             let (i, v) = (i, *dollars * bitcoin.into_owned());
 //             self.forced_push_at(i, v, exit)
 //         })?;
 
@@ -1275,7 +1271,7 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = StoredVecIterator<'a, I, T>;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -1335,8 +1331,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/indexed.rs b/crates/brk_vec/src/variants/indexed.rs
index 460712b6b..6ab8c836b 100644
--- a/crates/brk_vec/src/variants/indexed.rs
+++ b/crates/brk_vec/src/variants/indexed.rs
@@ -1,7 +1,6 @@
-use std::{cmp::Ordering, fmt::Debug, path::Path};
+use std::{borrow::Cow, cmp::Ordering, fmt::Debug, path::Path};
 
-use arc_swap::ArcSwap;
-use brk_core::{Error, Height, Result, Value, Version};
+use brk_core::{Error, Height, Result, Version};
 
 use crate::{
     AnyCollectableVec, AnyIterableVec, AnyVec, BoxedVecIterator, CollectableVec, Format,
@@ -30,7 +29,12 @@ where
     }
 
     #[inline]
-    pub fn get_or_read(&self, index: I, mmap: &Mmap) -> Result<Option<Value<T>>> {
+    pub fn unwrap_read(&self, index: I, mmap: &Mmap) -> T {
+        self.0.unwrap_read(index, mmap)
+    }
+
+    #[inline]
+    pub fn get_or_read(&self, index: I, mmap: &Mmap) -> Result<Option<Cow<T>>> {
         self.0.get_or_read(index, mmap)
     }
 
@@ -73,8 +77,8 @@ where
         self.0.header()
     }
 
-    pub fn mmap(&self) -> &ArcSwap<Mmap> {
-        self.0.mmap()
+    pub fn create_mmap(&self) -> Result<Mmap> {
+        self.0.create_mmap()
     }
 
     #[inline]
@@ -138,7 +142,7 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = StoredVecIterator<'a, I, T>;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -166,8 +170,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/lazy1.rs b/crates/brk_vec/src/variants/lazy1.rs
index b55bef61c..2ceb0f693 100644
--- a/crates/brk_vec/src/variants/lazy1.rs
+++ b/crates/brk_vec/src/variants/lazy1.rs
@@ -1,6 +1,6 @@
-use std::marker::PhantomData;
+use std::{borrow::Cow, marker::PhantomData};
 
-use brk_core::{Result, Value, Version};
+use brk_core::{Result, Version};
 
 use crate::{
     AnyCollectableVec, AnyIterableVec, AnyVec, BaseVecIterator, BoxedAnyIterableVec,
@@ -8,10 +8,13 @@ use crate::{
 };
 
 pub type ComputeFrom1<I, T, S1I, S1T> =
-    for<'a> fn(I, &mut dyn BaseVecIterator<Item = (S1I, Value<'a, S1T>)>) -> Option<T>;
+    for<'a> fn(I, &mut dyn BaseVecIterator<Item = (S1I, Cow<'a, S1T>)>) -> Option<T>;
 
 #[derive(Clone)]
-pub struct LazyVecFrom1<I, T, S1I, S1T> {
+pub struct LazyVecFrom1<I, T, S1I, S1T>
+where
+    S1T: Clone,
+{
     name: String,
     version: Version,
     source: BoxedAnyIterableVec<S1I, S1T>,
@@ -32,8 +35,8 @@ where
         source: BoxedAnyIterableVec<S1I, S1T>,
         compute: ComputeFrom1<I, T, S1I, S1T>,
     ) -> Self {
-        if source.index_type_to_string() != I::to_string() {
-            panic!("Should have same index");
+        if I::to_string() != S1I::to_string() {
+            unreachable!()
         }
 
         Self {
@@ -50,7 +53,10 @@ where
     }
 }
 
-pub struct LazyVecFrom1Iterator<'a, I, T, S1I, S1T> {
+pub struct LazyVecFrom1Iterator<'a, I, T, S1I, S1T>
+where
+    S1T: Clone,
+{
     lazy: &'a LazyVecFrom1<I, T, S1I, S1T>,
     source: BoxedVecIterator<'a, S1I, S1T>,
     index: usize,
@@ -63,14 +69,14 @@ where
     S1I: StoredIndex,
     S1T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
 
     fn next(&mut self) -> Option<Self::Item> {
         if self.index >= self.len() {
             return None;
         }
         let index = I::from(self.index);
-        let opt = (self.lazy.compute)(index, &mut *self.source).map(|v| (index, Value::Owned(v)));
+        let opt = (self.lazy.compute)(index, &mut *self.source).map(|v| (index, Cow::Owned(v)));
         if opt.is_some() {
             self.index += 1;
         }
@@ -108,7 +114,7 @@ where
     S1I: StoredIndex,
     S1T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = LazyVecFrom1Iterator<'a, I, T, S1I, S1T>;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -173,8 +179,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/lazy2.rs b/crates/brk_vec/src/variants/lazy2.rs
index 2a244d061..2d5bb249b 100644
--- a/crates/brk_vec/src/variants/lazy2.rs
+++ b/crates/brk_vec/src/variants/lazy2.rs
@@ -1,6 +1,6 @@
-use std::marker::PhantomData;
+use std::{borrow::Cow, marker::PhantomData};
 
-use brk_core::{Result, Value, Version};
+use brk_core::{Result, Version};
 
 use crate::{
     AnyCollectableVec, AnyIterableVec, AnyVec, BaseVecIterator, BoxedAnyIterableVec,
@@ -9,12 +9,16 @@ use crate::{
 
 pub type ComputeFrom2<I, T, S1I, S1T, S2I, S2T> = for<'a> fn(
     I,
-    &mut dyn BaseVecIterator<Item = (S1I, Value<'a, S1T>)>,
-    &mut dyn BaseVecIterator<Item = (S2I, Value<'a, S2T>)>,
+    &mut dyn BaseVecIterator<Item = (S1I, Cow<'a, S1T>)>,
+    &mut dyn BaseVecIterator<Item = (S2I, Cow<'a, S2T>)>,
 ) -> Option<T>;
 
 #[derive(Clone)]
-pub struct LazyVecFrom2<I, T, S1I, S1T, S2I, S2T> {
+pub struct LazyVecFrom2<I, T, S1I, S1T, S2I, S2T>
+where
+    S1T: Clone,
+    S2T: Clone,
+{
     name: String,
     version: Version,
     source1: BoxedAnyIterableVec<S1I, S1T>,
@@ -66,7 +70,11 @@ where
     }
 }
 
-pub struct LazyVecFrom2Iterator<'a, I, T, S1I, S1T, S2I, S2T> {
+pub struct LazyVecFrom2Iterator<'a, I, T, S1I, S1T, S2I, S2T>
+where
+    S1T: Clone,
+    S2T: Clone,
+{
     lazy: &'a LazyVecFrom2<I, T, S1I, S1T, S2I, S2T>,
     source1: BoxedVecIterator<'a, S1I, S1T>,
     source2: BoxedVecIterator<'a, S2I, S2T>,
@@ -82,12 +90,12 @@ where
     S2I: StoredIndex,
     S2T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
 
     fn next(&mut self) -> Option<Self::Item> {
         let index = I::from(self.index);
         let opt = (self.lazy.compute)(index, &mut *self.source1, &mut *self.source2)
-            .map(|v| (index, Value::Owned(v)));
+            .map(|v| (index, Cow::Owned(v)));
         if opt.is_some() {
             self.index += 1;
         }
@@ -140,7 +148,7 @@ where
     S2I: StoredIndex,
     S2T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = LazyVecFrom2Iterator<'a, I, T, S1I, S1T, S2I, S2T>;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -222,8 +230,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/lazy3.rs b/crates/brk_vec/src/variants/lazy3.rs
index c9a351fa0..8bf3d8594 100644
--- a/crates/brk_vec/src/variants/lazy3.rs
+++ b/crates/brk_vec/src/variants/lazy3.rs
@@ -1,6 +1,6 @@
-use std::marker::PhantomData;
+use std::{borrow::Cow, marker::PhantomData};
 
-use brk_core::{Result, Value, Version};
+use brk_core::{Result, Version};
 
 use crate::{
     AnyCollectableVec, AnyIterableVec, AnyVec, BaseVecIterator, BoxedAnyIterableVec,
@@ -9,13 +9,18 @@ use crate::{
 
 pub type ComputeFrom3<I, T, S1I, S1T, S2I, S2T, S3I, S3T> = for<'a> fn(
     I,
-    &mut dyn BaseVecIterator<Item = (S1I, Value<'a, S1T>)>,
-    &mut dyn BaseVecIterator<Item = (S2I, Value<'a, S2T>)>,
-    &mut dyn BaseVecIterator<Item = (S3I, Value<'a, S3T>)>,
+    &mut dyn BaseVecIterator<Item = (S1I, Cow<'a, S1T>)>,
+    &mut dyn BaseVecIterator<Item = (S2I, Cow<'a, S2T>)>,
+    &mut dyn BaseVecIterator<Item = (S3I, Cow<'a, S3T>)>,
 ) -> Option<T>;
 
 #[derive(Clone)]
-pub struct LazyVecFrom3<I, T, S1I, S1T, S2I, S2T, S3I, S3T> {
+pub struct LazyVecFrom3<I, T, S1I, S1T, S2I, S2T, S3I, S3T>
+where
+    S1T: Clone,
+    S2T: Clone,
+    S3T: Clone,
+{
     name: String,
     version: Version,
     source1: BoxedAnyIterableVec<S1I, S1T>,
@@ -73,7 +78,12 @@ where
     }
 }
 
-pub struct LazyVecFrom3Iterator<'a, I, T, S1I, S1T, S2I, S2T, S3I, S3T> {
+pub struct LazyVecFrom3Iterator<'a, I, T, S1I, S1T, S2I, S2T, S3I, S3T>
+where
+    S1T: Clone,
+    S2T: Clone,
+    S3T: Clone,
+{
     lazy: &'a LazyVecFrom3<I, T, S1I, S1T, S2I, S2T, S3I, S3T>,
     source1: BoxedVecIterator<'a, S1I, S1T>,
     source2: BoxedVecIterator<'a, S2I, S2T>,
@@ -93,7 +103,7 @@ where
     S3I: StoredIndex,
     S3T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
 
     fn next(&mut self) -> Option<Self::Item> {
         let index = I::from(self.index);
@@ -103,7 +113,7 @@ where
             &mut *self.source2,
             &mut *self.source3,
         )
-        .map(|v| (index, Value::Owned(v)));
+        .map(|v| (index, Cow::Owned(v)));
         if opt.is_some() {
             self.index += 1;
         }
@@ -166,7 +176,7 @@ where
     S3I: StoredIndex,
     S3T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = LazyVecFrom3Iterator<'a, I, T, S1I, S1T, S2I, S2T, S3I, S3T>;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -262,8 +272,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/raw.rs b/crates/brk_vec/src/variants/raw.rs
index a9c98a7df..5847979a8 100644
--- a/crates/brk_vec/src/variants/raw.rs
+++ b/crates/brk_vec/src/variants/raw.rs
@@ -1,14 +1,17 @@
 use std::{
+    borrow::Cow,
     fs::{self, File},
     io,
     marker::PhantomData,
     mem,
     path::{Path, PathBuf},
-    sync::Arc,
+    sync::{
+        Arc,
+        atomic::{AtomicUsize, Ordering},
+    },
 };
 
-use arc_swap::{ArcSwap, Guard};
-use brk_core::{Error, Result, Value, Version};
+use brk_core::{Error, Result, Version};
 use memmap2::Mmap;
 use rayon::prelude::*;
 
@@ -23,10 +26,10 @@ const VERSION: Version = Version::ONE;
 pub struct RawVec<I, T> {
     header: Header,
     parent: PathBuf,
-    name: String,
-    // Consider  Arc<ArcSwap<Option<Mmap>>> for dataraces when reorg ?
-    mmap: Arc<ArcSwap<Mmap>>,
+    name: &'static str,
     pushed: Vec<T>,
+    local_stored_len: Option<usize>,
+    shared_stored_len: Arc<AtomicUsize>,
     phantom: PhantomData<I>,
 }
 
@@ -54,16 +57,18 @@ where
 
     pub fn import(parent: &Path, name: &str, version: Version) -> Result<Self> {
         let path = Self::path_(parent, name);
-        let (mmap, header) = match Self::open_file_(&path) {
+        let (header, file) = match Self::open_file_(&path) {
             Ok(mut file) => {
                 if file.metadata()?.len() == 0 {
-                    let header = Header::create_and_write(&mut file, version, Format::Raw)?;
-                    let mmap = Self::new_mmap(&file)?;
-                    (mmap, header)
+                    (
+                        Header::create_and_write(&mut file, version, Format::Raw)?,
+                        Some(file),
+                    )
                 } else {
-                    let mmap = Self::new_mmap(&file)?;
-                    let header = Header::import_and_verify(&mmap, version, Format::Raw)?;
-                    (mmap, header)
+                    (
+                        Header::import_and_verify(&mut file, version, Format::Raw)?,
+                        Some(file),
+                    )
                 }
             }
             Err(e) => match e.kind() {
@@ -71,25 +76,36 @@ where
                     fs::create_dir_all(Self::folder_(parent, name))?;
                     let mut file = Self::open_file_(&path)?;
                     let header = Header::create_and_write(&mut file, version, Format::Raw)?;
-                    let mmap = Self::new_mmap(&file)?;
-                    (mmap, header)
+                    (header, None)
+                }
+                _ => {
+                    return Err(e.into());
                 }
-                _ => return Err(e.into()),
             },
         };
 
-        let mmap = Arc::new(ArcSwap::new(mmap));
+        let stored_len = if let Some(file) = file {
+            (file.metadata()?.len() as usize - HEADER_OFFSET) / Self::SIZE_OF_T
+        } else {
+            0
+        };
 
         Ok(Self {
-            mmap,
             header,
-            name: name.to_string(),
+            name: Box::leak(Box::new(name.to_string())),
             parent: parent.to_owned(),
             pushed: vec![],
+            local_stored_len: Some(stored_len),
+            shared_stored_len: Arc::new(AtomicUsize::new(stored_len)),
             phantom: PhantomData,
         })
     }
 
+    pub fn set_stored_len(&mut self, len: usize) {
+        self.local_stored_len.replace(len);
+        self.shared_stored_len.store(len, Ordering::Relaxed);
+    }
+
     #[inline]
     pub fn iter(&self) -> RawVecIterator<'_, I, T> {
         self.into_iter()
@@ -140,18 +156,10 @@ where
         &mut self.header
     }
 
-    #[inline]
-    fn mmap(&self) -> &ArcSwap<Mmap> {
-        &self.mmap
-    }
-
     #[inline]
     fn stored_len(&self) -> usize {
-        self.stored_len_(&self.mmap.load())
-    }
-    #[inline]
-    fn stored_len_(&self, mmap: &Mmap) -> usize {
-        (mmap.len() - HEADER_OFFSET) / Self::SIZE_OF_T
+        self.local_stored_len
+            .unwrap_or_else(|| self.shared_stored_len.load(Ordering::Relaxed))
     }
 
     #[inline]
@@ -193,9 +201,14 @@ where
         };
 
         let mut file = file_opt.unwrap_or(self.open_file()?);
-
         self.file_write_all(&mut file, &bytes)?;
 
+        if let Some(local_stored_len) = self.local_stored_len.as_mut() {
+            *local_stored_len += pushed_len;
+        }
+        self.shared_stored_len
+            .fetch_add(pushed_len, Ordering::Relaxed);
+
         Ok(())
     }
 
@@ -211,6 +224,8 @@ where
             return Ok(());
         }
 
+        self.set_stored_len(index);
+
         let len = index * Self::SIZE_OF_T + HEADER_OFFSET;
 
         let mut file = self.open_file()?;
@@ -220,6 +235,7 @@ where
     }
 
     fn reset(&mut self) -> Result<()> {
+        self.set_stored_len(0);
         self.reset_()
     }
 }
@@ -236,7 +252,7 @@ where
 
     #[inline]
     fn name(&self) -> &str {
-        &self.name
+        self.name
     }
 
     #[inline]
@@ -260,10 +276,11 @@ impl<I, T> Clone for RawVec<I, T> {
         Self {
             header: self.header.clone(),
             parent: self.parent.clone(),
-            name: self.name.clone(),
-            mmap: self.mmap.clone(),
+            name: self.name,
             pushed: vec![],
             phantom: PhantomData,
+            local_stored_len: None,
+            shared_stored_len: self.shared_stored_len.clone(),
         }
     }
 }
@@ -271,7 +288,7 @@ impl<I, T> Clone for RawVec<I, T> {
 #[derive(Debug)]
 pub struct RawVecIterator<'a, I, T> {
     vec: &'a RawVec<I, T>,
-    guard: Guard<Arc<Mmap>>,
+    mmap: Mmap,
     index: usize,
 }
 
@@ -301,15 +318,14 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
 
     fn next(&mut self) -> Option<Self::Item> {
-        let mmap = &self.guard;
         let index = self.index;
 
         let opt = self
             .vec
-            .get_or_read_(index, mmap)
+            .get_or_read_(index, &self.mmap)
             .unwrap()
             .map(|v| (I::from(index), v));
 
@@ -326,13 +342,13 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = RawVecIterator<'a, I, T>;
 
     fn into_iter(self) -> Self::IntoIter {
         RawVecIterator {
             vec: self,
-            guard: self.mmap.load(),
+            mmap: self.create_mmap().unwrap(),
             index: 0,
         }
     }
@@ -358,8 +374,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/crates/brk_vec/src/variants/stored.rs b/crates/brk_vec/src/variants/stored.rs
index 7283577ff..20f81283f 100644
--- a/crates/brk_vec/src/variants/stored.rs
+++ b/crates/brk_vec/src/variants/stored.rs
@@ -1,7 +1,9 @@
-use std::path::{Path, PathBuf};
+use std::{
+    borrow::Cow,
+    path::{Path, PathBuf},
+};
 
-use arc_swap::ArcSwap;
-use brk_core::{Result, Value, Version};
+use brk_core::{Result, Version};
 use memmap2::Mmap;
 
 use crate::{
@@ -72,14 +74,6 @@ where
         }
     }
 
-    #[inline]
-    fn mmap(&self) -> &ArcSwap<Mmap> {
-        match self {
-            StoredVec::Raw(v) => v.mmap(),
-            StoredVec::Compressed(v) => v.mmap(),
-        }
-    }
-
     #[inline]
     fn parent(&self) -> &Path {
         match self {
@@ -95,13 +89,6 @@ where
             StoredVec::Compressed(v) => v.stored_len(),
         }
     }
-    #[inline]
-    fn stored_len_(&self, mmap: &Mmap) -> usize {
-        match self {
-            StoredVec::Raw(v) => v.stored_len_(mmap),
-            StoredVec::Compressed(v) => v.stored_len_(mmap),
-        }
-    }
 
     #[inline]
     fn pushed(&self) -> &[T] {
@@ -195,7 +182,7 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     fn next(&mut self) -> Option<Self::Item> {
         match self {
             Self::Compressed(i) => i.next(),
@@ -238,7 +225,7 @@ where
     I: StoredIndex,
     T: StoredType,
 {
-    type Item = (I, Value<'a, T>);
+    type Item = (I, Cow<'a, T>);
     type IntoIter = StoredVecIterator<'a, I, T>;
 
     fn into_iter(self) -> Self::IntoIter {
@@ -269,8 +256,8 @@ where
 {
     fn collect_range_serde_json(
         &self,
-        from: Option<i64>,
-        to: Option<i64>,
+        from: Option<usize>,
+        to: Option<usize>,
     ) -> Result<Vec<serde_json::Value>> {
         CollectableVec::collect_range_serde_json(self, from, to)
     }
diff --git a/websites/default/index.html b/websites/default/index.html
index 1d343a71d..666c1b12a 100644
--- a/websites/default/index.html
+++ b/websites/default/index.html
@@ -36,8 +36,9 @@
         line-height: 1.5;
         -webkit-text-size-adjust: 100%;
         tab-size: 4;
-        font-family: "Geist mono", ui-monospace, SFMono-Regular, Menlo, Monaco,
-          Consolas, "Liberation Mono", "Courier New", monospace;
+        font-family:
+          "Geist mono", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
+          "Liberation Mono", "Courier New", monospace;
         font-feature-settings: "ss03";
         -webkit-tap-highlight-color: transparent;
       }
@@ -80,9 +81,9 @@
       kbd,
       samp,
       pre {
-        font-family: var(--default-mono-font-family), ui-monospace,
-          SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
-          "Courier New", monospace;
+        font-family:
+          var(--default-mono-font-family), ui-monospace, SFMono-Regular, Menlo,
+          Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
         font-feature-settings: var(
           --default-mono-font-feature-settings,
           normal
@@ -1365,6 +1366,75 @@
           }
         }
       }
+
+      #explorer {
+        --cube: 4.5rem;
+
+        #chain {
+          display: flex;
+          flex-direction: column-reverse;
+          gap: calc(var(--cube) * 0.66);
+          padding: 2rem;
+
+          .cube {
+            width: var(--cube);
+            height: var(--cube);
+            overflow: hidden;
+            font-size: var(--font-size-sm);
+            line-height: var(--line-height-sm);
+            --face-color: var(--border-color);
+            color: var(--color);
+
+            .face {
+              transform-origin: 0 0;
+              position: absolute;
+              width: var(--cube);
+              height: var(--cube);
+              padding: 0.1rem;
+            }
+            .right {
+              background-color: oklch(
+                from var(--face-color) calc(l - 0.05) c h
+              );
+              transform: rotate(-30deg) skewX(-30deg)
+                translate(calc(var(--cube) * 1.3), calc(var(--cube) * 1.725))
+                scaleY(0.864);
+            }
+            .top {
+              background-color: oklch(
+                from var(--face-color) calc(l + 0.05) c h
+              );
+              transform: rotate(30deg) skew(-30deg)
+                translate(calc(var(--cube) * 0.99), calc(var(--cube) * -0.265))
+                scaleY(0.864);
+              justify-content: center;
+              align-items: center;
+              text-align: center;
+              display: flex;
+              font-weight: 900;
+              text-transform: uppercase;
+              font-size: var(--font-size-xs);
+              line-height: var(--line-height-xs);
+            }
+            .left {
+              font-size: var(--font-size-xs);
+              line-height: var(--line-height-xs);
+              background-color: var(--face-color);
+              /* background-color: var(--amber); */
+              transform: rotate(30deg) skewX(30deg)
+                translate(calc(var(--cube) * 0.3), calc(var(--cube) * 0.6))
+                scaleY(0.864);
+            }
+            .fees {
+              display: flex;
+              flex-direction: column;
+              height: 100%;
+              justify-content: center;
+              align-items: center;
+            }
+          }
+        }
+      }
     </style>
 
     <!-- ------- -->
@@ -1678,6 +1748,7 @@
       </footer>
     </main>
     <aside id="aside">
+      <div id="explorer" hidden></div>
       <div id="charts" hidden></div>
       <div id="table" hidden></div>
       <div id="simulation" hidden></div>
diff --git a/websites/default/packages/lightweight-charts/v5.0.8/script.js b/websites/default/packages/lightweight-charts/v5.0.8/script.js
new file mode 100644
index 000000000..c7fe00f12
--- /dev/null
+++ b/websites/default/packages/lightweight-charts/v5.0.8/script.js
@@ -0,0 +1,8 @@
+// @ts-nocheck
+/*!
+ * @license
+ * TradingView Lightweight Charts™ v5.0.8
+ * Copyright (c) 2025 TradingView, Inc.
+ * Licensed under Apache License 2.0 https://www.apache.org/licenses/LICENSE-2.0
+ */
+const t={title:"",visible:!0,lastValueVisible:!0,priceLineVisible:!0,priceLineSource:0,priceLineWidth:1,priceLineColor:"",priceLineStyle:2,baseLineVisible:!0,baseLineWidth:1,baseLineColor:"#B2B5BE",baseLineStyle:0,priceFormat:{type:"price",precision:2,minMove:.01}};var i,s;function n(t,i){const s={0:[],1:[t.lineWidth,t.lineWidth],2:[2*t.lineWidth,2*t.lineWidth],3:[6*t.lineWidth,6*t.lineWidth],4:[t.lineWidth,4*t.lineWidth]}[i];t.setLineDash(s)}function e(t,i,s,n){t.beginPath();const e=t.lineWidth%2?.5:0;t.moveTo(s,i+e),t.lineTo(n,i+e),t.stroke()}function r(t,i){if(!t)throw new Error("Assertion failed"+(i?": "+i:""))}function h(t){if(void 0===t)throw new Error("Value is undefined");return t}function a(t){if(null===t)throw new Error("Value is null");return t}function l(t){return a(h(t))}!function(t){t[t.Simple=0]="Simple",t[t.WithSteps=1]="WithSteps",t[t.Curved=2]="Curved"}(i||(i={})),function(t){t[t.Solid=0]="Solid",t[t.Dotted=1]="Dotted",t[t.Dashed=2]="Dashed",t[t.LargeDashed=3]="LargeDashed",t[t.SparseDotted=4]="SparseDotted"}(s||(s={}));class o{constructor(){this.t=[]}i(t,i,s){const n={h:t,l:i,o:!0===s};this.t.push(n)}_(t){const i=this.t.findIndex((i=>t===i.h));i>-1&&this.t.splice(i,1)}u(t){this.t=this.t.filter((i=>i.l!==t))}p(t,i,s){const n=[...this.t];this.t=this.t.filter((t=>!t.o)),n.forEach((n=>n.h(t,i,s)))}v(){return this.t.length>0}m(){this.t=[]}}function _(t,...i){for(const s of i)for(const i in s)void 0!==s[i]&&Object.prototype.hasOwnProperty.call(s,i)&&!["__proto__","constructor","prototype"].includes(i)&&("object"!=typeof s[i]||void 0===t[i]||Array.isArray(s[i])?t[i]=s[i]:_(t[i],s[i]));return t}function u(t){return"number"==typeof t&&isFinite(t)}function c(t){return"number"==typeof t&&t%1==0}function d(t){return"string"==typeof t}function f(t){return"boolean"==typeof t}function p(t){const i=t;if(!i||"object"!=typeof i)return i;let s,n,e;for(n in s=Array.isArray(i)?[]:{},i)i.hasOwnProperty(n)&&(e=i[n],s[n]=e&&"object"==typeof e?p(e):e);return s}function v(t){return null!==t}function m(t){return null===t?void 0:t}const w="-apple-system, BlinkMacSystemFont, 'Trebuchet MS', Roboto, Ubuntu, sans-serif";function g(t,i,s){return void 0===i&&(i=w),`${s=void 0!==s?`${s} `:""}${t}px ${i}`}class M{constructor(t){this.M={S:1,C:5,P:NaN,k:"",T:"",R:"",D:"",V:0,B:0,I:0,A:0,O:0},this.L=t}N(){const t=this.M,i=this.F(),s=this.W();return t.P===i&&t.T===s||(t.P=i,t.T=s,t.k=g(i,s),t.A=2.5/12*i,t.V=t.A,t.B=i/12*t.C,t.I=i/12*t.C,t.O=0),t.R=this.H(),t.D=this.U(),this.M}H(){return this.L.N().layout.textColor}U(){return this.L.$()}F(){return this.L.N().layout.fontSize}W(){return this.L.N().layout.fontFamily}}function b(t){return t<0?0:t>255?255:Math.round(t)||0}function x(t){return.199*t[0]+.687*t[1]+.114*t[2]}class S{constructor(t,i){this.j=new Map,this.q=t,i&&(this.j=i)}Y(t,i){if("transparent"===t)return t;const s=this.K(t),n=s[3];return`rgba(${s[0]}, ${s[1]}, ${s[2]}, ${i*n})`}X(t){const i=this.K(t);return{Z:`rgb(${i[0]}, ${i[1]}, ${i[2]})`,G:x(i)>160?"black":"white"}}J(t){return x(this.K(t))}tt(t,i,s){const[n,e,r,h]=this.K(t),[a,l,o,_]=this.K(i),u=[b(n+s*(a-n)),b(e+s*(l-e)),b(r+s*(o-r)),(c=h+s*(_-h),c<=0||c>1?Math.min(Math.max(c,0),1):Math.round(1e4*c)/1e4)];var c;return`rgba(${u[0]}, ${u[1]}, ${u[2]}, ${u[3]})`}K(t){const i=this.j.get(t);if(i)return i;const s=function(t){const i=document.createElement("div");i.style.display="none",document.body.appendChild(i),i.style.color=t;const s=window.getComputedStyle(i).color;return document.body.removeChild(i),s}(t),n=s.match(/^rgba?\s*\((\d+),\s*(\d+),\s*(\d+)(?:,\s*(\d*\.?\d+))?\)$/);if(!n){if(this.q.length)for(const i of this.q){const s=i(t);if(s)return this.j.set(t,s),s}throw new Error(`Failed to parse color: ${t}`)}const e=[parseInt(n[1],10),parseInt(n[2],10),parseInt(n[3],10),n[4]?parseFloat(n[4]):1];return this.j.set(t,e),e}}class C{constructor(){this.it=[]}st(t){this.it=t}nt(t,i,s){this.it.forEach((n=>{n.nt(t,i,s)}))}}class P{nt(t,i,s){t.useBitmapCoordinateSpace((t=>this.et(t,i,s)))}}class y extends P{constructor(){super(...arguments),this.rt=null}ht(t){this.rt=t}et({context:t,horizontalPixelRatio:i,verticalPixelRatio:s}){if(null===this.rt||null===this.rt.lt)return;const n=this.rt.lt,e=this.rt,r=Math.max(1,Math.floor(i))%2/2,h=h=>{t.beginPath();for(let a=n.to-1;a>=n.from;--a){const n=e.ot[a],l=Math.round(n._t*i)+r,o=n.ut*s,_=h*s+r;t.moveTo(l,o),t.arc(l,o,_,0,2*Math.PI)}t.fill()};e.ct>0&&(t.fillStyle=e.dt,h(e.ft+e.ct)),t.fillStyle=e.vt,h(e.ft)}}function k(){return{ot:[{_t:0,ut:0,wt:0,gt:0}],vt:"",dt:"",ft:0,ct:0,lt:null}}const T={from:0,to:1};class R{constructor(t,i,s){this.Mt=new C,this.bt=[],this.xt=[],this.St=!0,this.L=t,this.Ct=i,this.Pt=s,this.Mt.st(this.bt)}yt(t){this.kt(),this.St=!0}Tt(){return this.St&&(this.Rt(),this.St=!1),this.Mt}kt(){const t=this.Pt.Dt();t.length!==this.bt.length&&(this.xt=t.map(k),this.bt=this.xt.map((t=>{const i=new y;return i.ht(t),i})),this.Mt.st(this.bt))}Rt(){const t=2===this.Ct.N().mode||!this.Ct.Et(),i=this.Pt.Vt(),s=this.Ct.Bt(),n=this.L.It();this.kt(),i.forEach(((i,e)=>{const r=this.xt[e],h=i.At(s),a=i.zt();!t&&null!==h&&i.Et()&&null!==a?(r.vt=h.Ot,r.ft=h.ft,r.ct=h.Lt,r.ot[0].gt=h.gt,r.ot[0].ut=i.Ft().Nt(h.gt,a.Wt),r.dt=h.Ht??this.L.Ut(r.ot[0].ut/i.Ft().$t()),r.ot[0].wt=s,r.ot[0]._t=n.jt(s),r.lt=T):r.lt=null}))}}class D extends P{constructor(t){super(),this.qt=t}et({context:t,bitmapSize:i,horizontalPixelRatio:s,verticalPixelRatio:r}){if(null===this.qt)return;const h=this.qt.Yt.Et,a=this.qt.Kt.Et;if(!h&&!a)return;const l=Math.round(this.qt._t*s),o=Math.round(this.qt.ut*r);t.lineCap="butt",h&&l>=0&&(t.lineWidth=Math.floor(this.qt.Yt.ct*s),t.strokeStyle=this.qt.Yt.R,t.fillStyle=this.qt.Yt.R,n(t,this.qt.Yt.Xt),function(t,i,s,n){t.beginPath();const e=t.lineWidth%2?.5:0;t.moveTo(i+e,s),t.lineTo(i+e,n),t.stroke()}(t,l,0,i.height)),a&&o>=0&&(t.lineWidth=Math.floor(this.qt.Kt.ct*r),t.strokeStyle=this.qt.Kt.R,t.fillStyle=this.qt.Kt.R,n(t,this.qt.Kt.Xt),e(t,o,0,i.width))}}class E{constructor(t,i){this.St=!0,this.Zt={Yt:{ct:1,Xt:0,R:"",Et:!1},Kt:{ct:1,Xt:0,R:"",Et:!1},_t:0,ut:0},this.Gt=new D(this.Zt),this.Jt=t,this.Pt=i}yt(){this.St=!0}Tt(t){return this.St&&(this.Rt(),this.St=!1),this.Gt}Rt(){const t=this.Jt.Et(),i=this.Pt.Qt().N().crosshair,s=this.Zt;if(2===i.mode)return s.Kt.Et=!1,void(s.Yt.Et=!1);s.Kt.Et=t&&this.Jt.ti(this.Pt),s.Yt.Et=t&&this.Jt.ii(),s.Kt.ct=i.horzLine.width,s.Kt.Xt=i.horzLine.style,s.Kt.R=i.horzLine.color,s.Yt.ct=i.vertLine.width,s.Yt.Xt=i.vertLine.style,s.Yt.R=i.vertLine.color,s._t=this.Jt.si(),s.ut=this.Jt.ni()}}function V(t,i,s,n,e,r){t.fillRect(i+r,s,n-2*r,r),t.fillRect(i+r,s+e-r,n-2*r,r),t.fillRect(i,s,r,e),t.fillRect(i+n-r,s,r,e)}function B(t,i,s,n,e,r){t.save(),t.globalCompositeOperation="copy",t.fillStyle=r,t.fillRect(i,s,n,e),t.restore()}function I(t,i,s,n,e,r){t.beginPath(),t.roundRect?t.roundRect(i,s,n,e,r):(t.lineTo(i+n-r[1],s),0!==r[1]&&t.arcTo(i+n,s,i+n,s+r[1],r[1]),t.lineTo(i+n,s+e-r[2]),0!==r[2]&&t.arcTo(i+n,s+e,i+n-r[2],s+e,r[2]),t.lineTo(i+r[3],s+e),0!==r[3]&&t.arcTo(i,s+e,i,s+e-r[3],r[3]),t.lineTo(i,s+r[0]),0!==r[0]&&t.arcTo(i,s,i+r[0],s,r[0]))}function A(t,i,s,n,e,r,h=0,a=[0,0,0,0],l=""){if(t.save(),!h||!l||l===r)return I(t,i,s,n,e,a),t.fillStyle=r,t.fill(),void t.restore();const o=h/2;var _;I(t,i+o,s+o,n-h,e-h,(_=-o,a.map((t=>0===t?t:t+_)))),"transparent"!==r&&(t.fillStyle=r,t.fill()),"transparent"!==l&&(t.lineWidth=h,t.strokeStyle=l,t.closePath(),t.stroke()),t.restore()}function z(t,i,s,n,e,r,h){t.save(),t.globalCompositeOperation="copy";const a=t.createLinearGradient(0,0,0,e);a.addColorStop(0,r),a.addColorStop(1,h),t.fillStyle=a,t.fillRect(i,s,n,e),t.restore()}class O{constructor(t,i){this.ht(t,i)}ht(t,i){this.qt=t,this.ei=i}$t(t,i){return this.qt.Et?t.P+t.A+t.V:0}nt(t,i,s,n){if(!this.qt.Et||0===this.qt.ri.length)return;const e=this.qt.R,r=this.ei.Z,h=t.useBitmapCoordinateSpace((t=>{const h=t.context;h.font=i.k;const a=this.hi(t,i,s,n),l=a.ai;return a.li?A(h,l.oi,l._i,l.ui,l.ci,r,l.di,[l.ft,0,0,l.ft],r):A(h,l.fi,l._i,l.ui,l.ci,r,l.di,[0,l.ft,l.ft,0],r),this.qt.pi&&(h.fillStyle=e,h.fillRect(l.fi,l.mi,l.wi-l.fi,l.gi)),this.qt.Mi&&(h.fillStyle=i.D,h.fillRect(a.li?l.bi-l.di:0,l._i,l.di,l.xi-l._i)),a}));t.useMediaCoordinateSpace((({context:t})=>{const s=h.Si;t.font=i.k,t.textAlign=h.li?"right":"left",t.textBaseline="middle",t.fillStyle=e,t.fillText(this.qt.ri,s.Ci,(s._i+s.xi)/2+s.Pi)}))}hi(t,i,s,n){const{context:e,bitmapSize:r,mediaSize:h,horizontalPixelRatio:a,verticalPixelRatio:l}=t,o=this.qt.pi||!this.qt.yi?i.C:0,_=this.qt.ki?i.S:0,u=i.A+this.ei.Ti,c=i.V+this.ei.Ri,d=i.B,f=i.I,p=this.qt.ri,v=i.P,m=s.Di(e,p),w=Math.ceil(s.Ei(e,p)),g=v+u+c,M=i.S+d+f+w+o,b=Math.max(1,Math.floor(l));let x=Math.round(g*l);x%2!=b%2&&(x+=1);const S=_>0?Math.max(1,Math.floor(_*a)):0,C=Math.round(M*a),P=Math.round(o*a),y=this.ei.Vi??this.ei.Bi,k=Math.round(y*l)-Math.floor(.5*l),T=Math.floor(k+b/2-x/2),R=T+x,D="right"===n,E=D?h.width-_:_,V=D?r.width-S:S;let B,I,A;return D?(B=V-C,I=V-P,A=E-o-d-_):(B=V+C,I=V+P,A=E+o+d),{li:D,ai:{_i:T,mi:k,xi:R,ui:C,ci:x,ft:2*a,di:S,oi:B,fi:V,wi:I,gi:b,bi:r.width},Si:{_i:T/l,xi:R/l,Ci:A,Pi:m}}}}class L{constructor(t){this.Ii={Bi:0,Z:"#000",Ri:0,Ti:0},this.Ai={ri:"",Et:!1,pi:!0,yi:!1,Ht:"",R:"#FFF",Mi:!1,ki:!1},this.zi={ri:"",Et:!1,pi:!1,yi:!0,Ht:"",R:"#FFF",Mi:!0,ki:!0},this.St=!0,this.Oi=new(t||O)(this.Ai,this.Ii),this.Li=new(t||O)(this.zi,this.Ii)}ri(){return this.Ni(),this.Ai.ri}Bi(){return this.Ni(),this.Ii.Bi}yt(){this.St=!0}$t(t,i=!1){return Math.max(this.Oi.$t(t,i),this.Li.$t(t,i))}Fi(){return this.Ii.Vi||0}Wi(t){this.Ii.Vi=t}Hi(){return this.Ni(),this.Ai.Et||this.zi.Et}Ui(){return this.Ni(),this.Ai.Et}Tt(t){return this.Ni(),this.Ai.pi=this.Ai.pi&&t.N().ticksVisible,this.zi.pi=this.zi.pi&&t.N().ticksVisible,this.Oi.ht(this.Ai,this.Ii),this.Li.ht(this.zi,this.Ii),this.Oi}$i(){return this.Ni(),this.Oi.ht(this.Ai,this.Ii),this.Li.ht(this.zi,this.Ii),this.Li}Ni(){this.St&&(this.Ai.pi=!0,this.zi.pi=!1,this.ji(this.Ai,this.zi,this.Ii))}}class N extends L{constructor(t,i,s){super(),this.Jt=t,this.qi=i,this.Yi=s}ji(t,i,s){if(t.Et=!1,2===this.Jt.N().mode)return;const n=this.Jt.N().horzLine;if(!n.labelVisible)return;const e=this.qi.zt();if(!this.Jt.Et()||this.qi.Ki()||null===e)return;const r=this.qi.Xi().X(n.labelBackgroundColor);s.Z=r.Z,t.R=r.G;const h=2/12*this.qi.P();s.Ti=h,s.Ri=h;const a=this.Yi(this.qi);s.Bi=a.Bi,t.ri=this.qi.Zi(a.gt,e),t.Et=!0}}const F=/[1-9]/g;class W{constructor(){this.qt=null}ht(t){this.qt=t}nt(t,i){if(null===this.qt||!1===this.qt.Et||0===this.qt.ri.length)return;const s=t.useMediaCoordinateSpace((({context:t})=>(t.font=i.k,Math.round(i.Gi.Ei(t,a(this.qt).ri,F)))));if(s<=0)return;const n=i.Ji,e=s+2*n,r=e/2,h=this.qt.Qi;let l=this.qt.Bi,o=Math.floor(l-r)+.5;o<0?(l+=Math.abs(0-o),o=Math.floor(l-r)+.5):o+e>h&&(l-=Math.abs(h-(o+e)),o=Math.floor(l-r)+.5);const _=o+e,u=Math.ceil(0+i.S+i.C+i.A+i.P+i.V);t.useBitmapCoordinateSpace((({context:t,horizontalPixelRatio:s,verticalPixelRatio:n})=>{const e=a(this.qt);t.fillStyle=e.Z;const r=Math.round(o*s),h=Math.round(0*n),l=Math.round(_*s),c=Math.round(u*n),d=Math.round(2*s);if(t.beginPath(),t.moveTo(r,h),t.lineTo(r,c-d),t.arcTo(r,c,r+d,c,d),t.lineTo(l-d,c),t.arcTo(l,c,l,c-d,d),t.lineTo(l,h),t.fill(),e.pi){const r=Math.round(e.Bi*s),a=h,l=Math.round((a+i.C)*n);t.fillStyle=e.R;const o=Math.max(1,Math.floor(s)),_=Math.floor(.5*s);t.fillRect(r-_,a,o,l-a)}})),t.useMediaCoordinateSpace((({context:t})=>{const s=a(this.qt),e=0+i.S+i.C+i.A+i.P/2;t.font=i.k,t.textAlign="left",t.textBaseline="middle",t.fillStyle=s.R;const r=i.Gi.Di(t,"Apr0");t.translate(o+n,e+r),t.fillText(s.ri,0,0)}))}}class H{constructor(t,i,s){this.St=!0,this.Gt=new W,this.Zt={Et:!1,Z:"#4c525e",R:"white",ri:"",Qi:0,Bi:NaN,pi:!0},this.Ct=t,this.ts=i,this.Yi=s}yt(){this.St=!0}Tt(){return this.St&&(this.Rt(),this.St=!1),this.Gt.ht(this.Zt),this.Gt}Rt(){const t=this.Zt;if(t.Et=!1,2===this.Ct.N().mode)return;const i=this.Ct.N().vertLine;if(!i.labelVisible)return;const s=this.ts.It();if(s.Ki())return;t.Qi=s.Qi();const n=this.Yi();if(null===n)return;t.Bi=n.Bi;const e=s.ss(this.Ct.Bt());t.ri=s.ns(a(e)),t.Et=!0;const r=this.ts.Xi().X(i.labelBackgroundColor);t.Z=r.Z,t.R=r.G,t.pi=s.N().ticksVisible}}class U{constructor(){this.es=null,this.rs=0}hs(){return this.rs}ls(t){this.rs=t}Ft(){return this.es}_s(t){this.es=t}us(t){return[]}cs(){return[]}Et(){return!0}}var $;!function(t){t[t.Normal=0]="Normal",t[t.Magnet=1]="Magnet",t[t.Hidden=2]="Hidden",t[t.MagnetOHLC=3]="MagnetOHLC"}($||($={}));class j extends U{constructor(t,i){super(),this.Pt=null,this.ds=NaN,this.fs=0,this.ps=!1,this.vs=new Map,this.ws=!1,this.gs=new WeakMap,this.Ms=new WeakMap,this.bs=NaN,this.xs=NaN,this.Ss=NaN,this.Cs=NaN,this.ts=t,this.Ps=i;this.ys=((t,i)=>s=>{const n=i(),e=t();if(s===a(this.Pt).ks())return{gt:e,Bi:n};{const t=a(s.zt());return{gt:s.Ts(n,t),Bi:n}}})((()=>this.ds),(()=>this.xs));const s=((t,i)=>()=>{const s=this.ts.It().Rs(t()),n=i();return s&&Number.isFinite(n)?{wt:s,Bi:n}:null})((()=>this.fs),(()=>this.si()));this.Ds=new H(this,t,s)}N(){return this.Ps}Es(t,i){this.Ss=t,this.Cs=i}Vs(){this.Ss=NaN,this.Cs=NaN}Bs(){return this.Ss}Is(){return this.Cs}As(t,i,s){this.ws||(this.ws=!0),this.ps=!0,this.zs(t,i,s)}Bt(){return this.fs}si(){return this.bs}ni(){return this.xs}Et(){return this.ps}Os(){this.ps=!1,this.Ls(),this.ds=NaN,this.bs=NaN,this.xs=NaN,this.Pt=null,this.Vs(),this.Ns()}Fs(t){let i=this.gs.get(t);i||(i=new E(this,t),this.gs.set(t,i));let s=this.Ms.get(t);return s||(s=new R(this.ts,this,t),this.Ms.set(t,s)),[i,s]}ti(t){return t===this.Pt&&this.Ps.horzLine.visible}ii(){return this.Ps.vertLine.visible}Ws(t,i){this.ps&&this.Pt===t||this.vs.clear();const s=[];return this.Pt===t&&s.push(this.Hs(this.vs,i,this.ys)),s}cs(){return this.ps?[this.Ds]:[]}Us(){return this.Pt}Ns(){this.ts.$s().forEach((t=>{this.gs.get(t)?.yt(),this.Ms.get(t)?.yt()})),this.vs.forEach((t=>t.yt())),this.Ds.yt()}js(t){return t&&!t.ks().Ki()?t.ks():null}zs(t,i,s){this.qs(t,i,s)&&this.Ns()}qs(t,i,s){const n=this.bs,e=this.xs,r=this.ds,h=this.fs,a=this.Pt,l=this.js(s);this.fs=t,this.bs=isNaN(t)?NaN:this.ts.It().jt(t),this.Pt=s;const o=null!==l?l.zt():null;return null!==l&&null!==o?(this.ds=i,this.xs=l.Nt(i,o)):(this.ds=NaN,this.xs=NaN),n!==this.bs||e!==this.xs||h!==this.fs||r!==this.ds||a!==this.Pt}Ls(){const t=this.ts.Ys().map((t=>t.Xs().Ks())).filter(v),i=0===t.length?null:Math.max(...t);this.fs=null!==i?i:NaN}Hs(t,i,s){let n=t.get(i);return void 0===n&&(n=new N(this,i,s),t.set(i,n)),n}}function q(t){return"left"===t||"right"===t}class Y{constructor(t){this.Zs=new Map,this.Gs=[],this.Js=t}Qs(t,i){const s=function(t,i){return void 0===t?i:{tn:Math.max(t.tn,i.tn),sn:t.sn||i.sn}}(this.Zs.get(t),i);this.Zs.set(t,s)}nn(){return this.Js}en(t){const i=this.Zs.get(t);return void 0===i?{tn:this.Js}:{tn:Math.max(this.Js,i.tn),sn:i.sn}}rn(){this.hn(),this.Gs=[{an:0}]}ln(t){this.hn(),this.Gs=[{an:1,Wt:t}]}_n(t){this.un(),this.Gs.push({an:5,Wt:t})}hn(){this.un(),this.Gs.push({an:6})}cn(){this.hn(),this.Gs=[{an:4}]}dn(t){this.hn(),this.Gs.push({an:2,Wt:t})}fn(t){this.hn(),this.Gs.push({an:3,Wt:t})}pn(){return this.Gs}vn(t){for(const i of t.Gs)this.mn(i);this.Js=Math.max(this.Js,t.Js),t.Zs.forEach(((t,i)=>{this.Qs(i,t)}))}static wn(){return new Y(2)}static gn(){return new Y(3)}mn(t){switch(t.an){case 0:this.rn();break;case 1:this.ln(t.Wt);break;case 2:this.dn(t.Wt);break;case 3:this.fn(t.Wt);break;case 4:this.cn();break;case 5:this._n(t.Wt);break;case 6:this.un()}}un(){const t=this.Gs.findIndex((t=>5===t.an));-1!==t&&this.Gs.splice(t,1)}}class K{formatTickmarks(t){return t.map((t=>this.format(t)))}}const X=".";function Z(t,i){if(!u(t))return"n/a";if(!c(i))throw new TypeError("invalid length");if(i<0||i>16)throw new TypeError("invalid length");if(0===i)return t.toString();return("0000000000000000"+t.toString()).slice(-i)}class G extends K{constructor(t,i){if(super(),i||(i=1),u(t)&&c(t)||(t=100),t<0)throw new TypeError("invalid base");this.qi=t,this.Mn=i,this.bn()}format(t){const i=t<0?"−":"";return t=Math.abs(t),i+this.xn(t)}bn(){if(this.Sn=0,this.qi>0&&this.Mn>0){let t=this.qi;for(;t>1;)t/=10,this.Sn++}}xn(t){const i=this.qi/this.Mn;let s=Math.floor(t),n="";const e=void 0!==this.Sn?this.Sn:NaN;if(i>1){let r=+(Math.round(t*i)-s*i).toFixed(this.Sn);r>=i&&(r-=i,s+=1),n=X+Z(+r.toFixed(this.Sn)*this.Mn,e)}else s=Math.round(s*i)/i,e>0&&(n=X+Z(0,e));return s.toFixed(0)+n}}class J extends G{constructor(t=100){super(t)}format(t){return`${super.format(t)}%`}}class Q extends K{constructor(t){super(),this.Cn=t}format(t){let i="";return t<0&&(i="-",t=-t),t<995?i+this.Pn(t):t<999995?i+this.Pn(t/1e3)+"K":t<999999995?(t=1e3*Math.round(t/1e3),i+this.Pn(t/1e6)+"M"):(t=1e6*Math.round(t/1e6),i+this.Pn(t/1e9)+"B")}Pn(t){let i;const s=Math.pow(10,this.Cn);return i=(t=Math.round(t*s)/s)>=1e-15&&t<1?t.toFixed(this.Cn).replace(/\.?0+$/,""):String(t),i.replace(/(\.[1-9]*)0+$/,((t,i)=>i))}}const tt=/[2-9]/g;class it{constructor(t=50){this.yn=0,this.kn=1,this.Tn=1,this.Rn={},this.Dn=new Map,this.En=t}Vn(){this.yn=0,this.Dn.clear(),this.kn=1,this.Tn=1,this.Rn={}}Ei(t,i,s){return this.Bn(t,i,s).width}Di(t,i,s){const n=this.Bn(t,i,s);return((n.actualBoundingBoxAscent||0)-(n.actualBoundingBoxDescent||0))/2}Bn(t,i,s){const n=s||tt,e=String(i).replace(n,"0");if(this.Dn.has(e))return h(this.Dn.get(e)).In;if(this.yn===this.En){const t=this.Rn[this.Tn];delete this.Rn[this.Tn],this.Dn.delete(t),this.Tn++,this.yn--}t.save(),t.textBaseline="middle";const r=t.measureText(e);return t.restore(),0===r.width&&i.length||(this.Dn.set(e,{In:r,An:this.kn}),this.Rn[this.kn]=e,this.yn++,this.kn++),r}}class st{constructor(t){this.zn=null,this.M=null,this.On="right",this.Ln=t}Nn(t,i,s){this.zn=t,this.M=i,this.On=s}nt(t){null!==this.M&&null!==this.zn&&this.zn.nt(t,this.M,this.Ln,this.On)}}class nt{constructor(t,i,s){this.Fn=t,this.Ln=new it(50),this.Wn=i,this.L=s,this.F=-1,this.Gt=new st(this.Ln)}Tt(){const t=this.L.Hn(this.Wn);if(null===t)return null;const i=t.Un(this.Wn)?t.$n():this.Wn.Ft();if(null===i)return null;const s=t.jn(i);if("overlay"===s)return null;const n=this.L.qn();return n.P!==this.F&&(this.F=n.P,this.Ln.Vn()),this.Gt.Nn(this.Fn.$i(),n,s),this.Gt}}class et extends P{constructor(){super(...arguments),this.qt=null}ht(t){this.qt=t}Yn(t,i){if(!this.qt?.Et)return null;const{ut:s,ct:n,Kn:e}=this.qt;return i>=s-n-7&&i<=s+n+7?{Xn:this.qt,Kn:e}:null}et({context:t,bitmapSize:i,horizontalPixelRatio:s,verticalPixelRatio:r}){if(null===this.qt)return;if(!1===this.qt.Et)return;const h=Math.round(this.qt.ut*r);h<0||h>i.height||(t.lineCap="butt",t.strokeStyle=this.qt.R,t.lineWidth=Math.floor(this.qt.ct*s),n(t,this.qt.Xt),e(t,h,0,i.width))}}class rt{constructor(t){this.Zn={ut:0,R:"rgba(0, 0, 0, 0)",ct:1,Xt:0,Et:!1},this.Gn=new et,this.St=!0,this.Jn=t,this.Qn=t.Qt(),this.Gn.ht(this.Zn)}yt(){this.St=!0}Tt(){return this.Jn.Et()?(this.St&&(this.te(),this.St=!1),this.Gn):null}}class ht extends rt{constructor(t){super(t)}te(){this.Zn.Et=!1;const t=this.Jn.Ft(),i=t.ie().ie;if(2!==i&&3!==i)return;const s=this.Jn.N();if(!s.baseLineVisible||!this.Jn.Et())return;const n=this.Jn.zt();null!==n&&(this.Zn.Et=!0,this.Zn.ut=t.Nt(n.Wt,n.Wt),this.Zn.R=s.baseLineColor,this.Zn.ct=s.baseLineWidth,this.Zn.Xt=s.baseLineStyle)}}class at extends P{constructor(){super(...arguments),this.qt=null}ht(t){this.qt=t}se(){return this.qt}et({context:t,horizontalPixelRatio:i,verticalPixelRatio:s}){const n=this.qt;if(null===n)return;const e=Math.max(1,Math.floor(i)),r=e%2/2,h=Math.round(n.ne.x*i)+r,a=n.ne.y*s;t.fillStyle=n.ee,t.beginPath();const l=Math.max(2,1.5*n.re)*i;t.arc(h,a,l,0,2*Math.PI,!1),t.fill(),t.fillStyle=n.he,t.beginPath(),t.arc(h,a,n.ft*i,0,2*Math.PI,!1),t.fill(),t.lineWidth=e,t.strokeStyle=n.ae,t.beginPath(),t.arc(h,a,n.ft*i+e/2,0,2*Math.PI,!1),t.stroke()}}const lt=[{le:0,oe:.25,_e:4,ue:10,ce:.25,de:0,fe:.4,pe:.8},{le:.25,oe:.525,_e:10,ue:14,ce:0,de:0,fe:.8,pe:0},{le:.525,oe:1,_e:14,ue:14,ce:0,de:0,fe:0,pe:0}];class ot{constructor(t){this.Gt=new at,this.St=!0,this.ve=!0,this.me=performance.now(),this.we=this.me-1,this.ge=t}Me(){this.we=this.me-1,this.yt()}be(){if(this.yt(),2===this.ge.N().lastPriceAnimation){const t=performance.now(),i=this.we-t;if(i>0)return void(i<650&&(this.we+=2600));this.me=t,this.we=t+2600}}yt(){this.St=!0}xe(){this.ve=!0}Et(){return 0!==this.ge.N().lastPriceAnimation}Se(){switch(this.ge.N().lastPriceAnimation){case 0:return!1;case 1:return!0;case 2:return performance.now()<=this.we}}Tt(){return this.St?(this.Rt(),this.St=!1,this.ve=!1):this.ve&&(this.Ce(),this.ve=!1),this.Gt}Rt(){this.Gt.ht(null);const t=this.ge.Qt().It(),i=t.Pe(),s=this.ge.zt();if(null===i||null===s)return;const n=this.ge.ye(!0);if(n.ke||!i.Te(n.Re))return;const e={x:t.jt(n.Re),y:this.ge.Ft().Nt(n.gt,s.Wt)},r=n.R,h=this.ge.N().lineWidth,a=this.De(this.Ee(),r);this.Gt.ht({ee:r,re:h,he:a.he,ae:a.ae,ft:a.ft,ne:e})}Ce(){const t=this.Gt.se();if(null!==t){const i=this.De(this.Ee(),t.ee);t.he=i.he,t.ae=i.ae,t.ft=i.ft}}Ee(){return this.Se()?performance.now()-this.me:2599}Ve(t,i,s,n){const e=s+(n-s)*i;return this.ge.Qt().Xi().Y(t,e)}De(t,i){const s=t%2600/2600;let n;for(const t of lt)if(s>=t.le&&s<=t.oe){n=t;break}r(void 0!==n,"Last price animation internal logic error");const e=(s-n.le)/(n.oe-n.le);return{he:this.Ve(i,e,n.ce,n.de),ae:this.Ve(i,e,n.fe,n.pe),ft:(h=e,a=n._e,l=n.ue,a+(l-a)*h)};var h,a,l}}class _t extends rt{constructor(t){super(t)}te(){const t=this.Zn;t.Et=!1;const i=this.Jn.N();if(!i.priceLineVisible||!this.Jn.Et())return;const s=this.Jn.ye(0===i.priceLineSource);s.ke||(t.Et=!0,t.ut=s.Bi,t.R=this.Jn.Be(s.R),t.ct=i.priceLineWidth,t.Xt=i.priceLineStyle)}}class ut extends L{constructor(t){super(),this.Jt=t}ji(t,i,s){t.Et=!1,i.Et=!1;const n=this.Jt;if(!n.Et())return;const e=n.N(),r=e.lastValueVisible,h=""!==n.Ie(),a=0===e.seriesLastValueMode,l=n.ye(!1);if(l.ke)return;r&&(t.ri=this.Ae(l,r,a),t.Et=0!==t.ri.length),(h||a)&&(i.ri=this.ze(l,r,h,a),i.Et=i.ri.length>0);const o=n.Be(l.R),_=this.Jt.Qt().Xi().X(o);s.Z=_.Z,s.Bi=l.Bi,i.Ht=n.Qt().Ut(l.Bi/n.Ft().$t()),t.Ht=o,t.R=_.G,i.R=_.G}ze(t,i,s,n){let e="";const r=this.Jt.Ie();return s&&0!==r.length&&(e+=`${r} `),i&&n&&(e+=this.Jt.Ft().Oe()?t.Le:t.Ne),e.trim()}Ae(t,i,s){return i?s?this.Jt.Ft().Oe()?t.Ne:t.Le:t.ri:""}}function ct(t,i,s,n){const e=Number.isFinite(i),r=Number.isFinite(s);return e&&r?t(i,s):e||r?e?i:s:n}class dt{constructor(t,i){this.Fe=t,this.We=i}He(t){return null!==t&&(this.Fe===t.Fe&&this.We===t.We)}Ue(){return new dt(this.Fe,this.We)}$e(){return this.Fe}je(){return this.We}qe(){return this.We-this.Fe}Ki(){return this.We===this.Fe||Number.isNaN(this.We)||Number.isNaN(this.Fe)}vn(t){return null===t?this:new dt(ct(Math.min,this.$e(),t.$e(),-1/0),ct(Math.max,this.je(),t.je(),1/0))}Ye(t){if(!u(t))return;if(0===this.We-this.Fe)return;const i=.5*(this.We+this.Fe);let s=this.We-i,n=this.Fe-i;s*=t,n*=t,this.We=i+s,this.Fe=i+n}Ke(t){u(t)&&(this.We+=t,this.Fe+=t)}Xe(){return{minValue:this.Fe,maxValue:this.We}}static Ze(t){return null===t?null:new dt(t.minValue,t.maxValue)}}class ft{constructor(t,i){this.Ge=t,this.Je=i||null}Qe(){return this.Ge}tr(){return this.Je}Xe(){return{priceRange:null===this.Ge?null:this.Ge.Xe(),margins:this.Je||void 0}}static Ze(t){return null===t?null:new ft(dt.Ze(t.priceRange),t.margins)}}class pt extends rt{constructor(t,i){super(t),this.ir=i}te(){const t=this.Zn;t.Et=!1;const i=this.ir.N();if(!this.Jn.Et()||!i.lineVisible)return;const s=this.ir.sr();null!==s&&(t.Et=!0,t.ut=s,t.R=i.color,t.ct=i.lineWidth,t.Xt=i.lineStyle,t.Kn=this.ir.N().id)}}class vt extends L{constructor(t,i){super(),this.ge=t,this.ir=i}ji(t,i,s){t.Et=!1,i.Et=!1;const n=this.ir.N(),e=n.axisLabelVisible,r=""!==n.title,h=this.ge;if(!e||!h.Et())return;const a=this.ir.sr();if(null===a)return;r&&(i.ri=n.title,i.Et=!0),i.Ht=h.Qt().Ut(a/h.Ft().$t()),t.ri=this.nr(n.price),t.Et=!0;const l=this.ge.Qt().Xi().X(n.axisLabelColor||n.color);s.Z=l.Z;const o=n.axisLabelTextColor||l.G;t.R=o,i.R=o,s.Bi=a}nr(t){const i=this.ge.zt();return null===i?"":this.ge.Ft().Zi(t,i.Wt)}}class mt{constructor(t,i){this.ge=t,this.Ps=i,this.er=new pt(t,this),this.Fn=new vt(t,this),this.rr=new nt(this.Fn,t,t.Qt())}hr(t){_(this.Ps,t),this.yt(),this.ge.Qt().ar()}N(){return this.Ps}lr(){return this.er}_r(){return this.rr}ur(){return this.Fn}yt(){this.er.yt(),this.Fn.yt()}sr(){const t=this.ge,i=t.Ft();if(t.Qt().It().Ki()||i.Ki())return null;const s=t.zt();return null===s?null:i.Nt(this.Ps.price,s.Wt)}}class wt extends U{constructor(t){super(),this.ts=t}Qt(){return this.ts}}const gt={Bar:(t,i,s,n)=>{const e=i.upColor,r=i.downColor,h=a(t(s,n)),o=l(h.Wt[0])<=l(h.Wt[3]);return{cr:h.R??(o?e:r)}},Candlestick:(t,i,s,n)=>{const e=i.upColor,r=i.downColor,h=i.borderUpColor,o=i.borderDownColor,_=i.wickUpColor,u=i.wickDownColor,c=a(t(s,n)),d=l(c.Wt[0])<=l(c.Wt[3]);return{cr:c.R??(d?e:r),dr:c.Ht??(d?h:o),pr:c.vr??(d?_:u)}},Custom:(t,i,s,n)=>({cr:a(t(s,n)).R??i.color}),Area:(t,i,s,n)=>{const e=a(t(s,n));return{cr:e.vt??i.lineColor,vt:e.vt??i.lineColor,mr:e.mr??i.topColor,wr:e.wr??i.bottomColor}},Baseline:(t,i,s,n)=>{const e=a(t(s,n));return{cr:e.Wt[3]>=i.baseValue.price?i.topLineColor:i.bottomLineColor,gr:e.gr??i.topLineColor,Mr:e.Mr??i.bottomLineColor,br:e.br??i.topFillColor1,Sr:e.Sr??i.topFillColor2,Cr:e.Cr??i.bottomFillColor1,Pr:e.Pr??i.bottomFillColor2}},Line:(t,i,s,n)=>{const e=a(t(s,n));return{cr:e.R??i.color,vt:e.R??i.color}},Histogram:(t,i,s,n)=>({cr:a(t(s,n)).R??i.color})};class Mt{constructor(t){this.yr=(t,i)=>void 0!==i?i.Wt:this.ge.Xs().kr(t),this.ge=t,this.Tr=gt[t.Rr()]}Dr(t,i){return this.Tr(this.yr,this.ge.N(),t,i)}}function bt(t,i,s,n,e=0,r=i.length){let h=r-e;for(;0<h;){const r=h>>1,a=e+r;n(i[a],s)===t?(e=a+1,h-=r+1):h=r}return e}const xt=bt.bind(null,!0),St=bt.bind(null,!1);var Ct;!function(t){t[t.NearestLeft=-1]="NearestLeft",t[t.None=0]="None",t[t.NearestRight=1]="NearestRight"}(Ct||(Ct={}));const Pt=30;class yt{constructor(){this.Er=[],this.Vr=new Map,this.Br=new Map,this.Ir=[]}Ar(){return this.zr()>0?this.Er[this.Er.length-1]:null}Or(){return this.zr()>0?this.Lr(0):null}Ks(){return this.zr()>0?this.Lr(this.Er.length-1):null}zr(){return this.Er.length}Ki(){return 0===this.zr()}Te(t){return null!==this.Nr(t,0)}kr(t){return this.Fr(t)}Fr(t,i=0){const s=this.Nr(t,i);return null===s?null:{...this.Wr(s),Re:this.Lr(s)}}Hr(){return this.Er}Ur(t,i,s){if(this.Ki())return null;let n=null;for(const e of s){n=kt(n,this.$r(t,i,e))}return n}ht(t){this.Br.clear(),this.Vr.clear(),this.Er=t,this.Ir=t.map((t=>t.Re))}jr(){return this.Ir}Lr(t){return this.Er[t].Re}Wr(t){return this.Er[t]}Nr(t,i){const s=this.qr(t);if(null===s&&0!==i)switch(i){case-1:return this.Yr(t);case 1:return this.Kr(t);default:throw new TypeError("Unknown search mode")}return s}Yr(t){let i=this.Xr(t);return i>0&&(i-=1),i!==this.Er.length&&this.Lr(i)<t?i:null}Kr(t){const i=this.Zr(t);return i!==this.Er.length&&t<this.Lr(i)?i:null}qr(t){const i=this.Xr(t);return i===this.Er.length||t<this.Er[i].Re?null:i}Xr(t){return xt(this.Er,t,((t,i)=>t.Re<i))}Zr(t){return St(this.Er,t,((t,i)=>t.Re>i))}Gr(t,i,s){let n=null;for(let e=t;e<i;e++){const t=this.Er[e].Wt[s];Number.isNaN(t)||(null===n?n={Jr:t,Qr:t}:(t<n.Jr&&(n.Jr=t),t>n.Qr&&(n.Qr=t)))}return n}$r(t,i,s){if(this.Ki())return null;let n=null;const e=a(this.Or()),r=a(this.Ks()),h=Math.max(t,e),l=Math.min(i,r),o=Math.ceil(h/Pt)*Pt,_=Math.max(o,Math.floor(l/Pt)*Pt);{const t=this.Xr(h),e=this.Zr(Math.min(l,o,i));n=kt(n,this.Gr(t,e,s))}let u=this.Vr.get(s);void 0===u&&(u=new Map,this.Vr.set(s,u));for(let t=Math.max(o+1,h);t<_;t+=Pt){const i=Math.floor(t/Pt);let e=u.get(i);if(void 0===e){const t=this.Xr(i*Pt),n=this.Zr((i+1)*Pt-1);e=this.Gr(t,n,s),u.set(i,e)}n=kt(n,e)}{const t=this.Xr(_),i=this.Zr(l);n=kt(n,this.Gr(t,i,s))}return n}}function kt(t,i){if(null===t)return i;if(null===i)return t;return{Jr:Math.min(t.Jr,i.Jr),Qr:Math.max(t.Qr,i.Qr)}}class Tt{constructor(t){this.th=t}nt(t,i,s){this.th.draw(t)}ih(t,i,s){this.th.drawBackground?.(t)}}class Rt{constructor(t){this.Dn=null,this.sh=t}Tt(){const t=this.sh.renderer();if(null===t)return null;if(this.Dn?.nh===t)return this.Dn.eh;const i=new Tt(t);return this.Dn={nh:t,eh:i},i}rh(){return this.sh.zOrder?.()??"normal"}}class Dt{constructor(t){this.hh=null,this.ah=t}oh(){return this.ah}Ns(){this.ah.updateAllViews?.()}Fs(){const t=this.ah.paneViews?.()??[];if(this.hh?.nh===t)return this.hh.eh;const i=t.map((t=>new Rt(t)));return this.hh={nh:t,eh:i},i}Yn(t,i){return this.ah.hitTest?.(t,i)??null}}let Et=class extends Dt{us(){return[]}};class Vt{constructor(t){this.th=t}nt(t,i,s){this.th.draw(t)}ih(t,i,s){this.th.drawBackground?.(t)}}class Bt{constructor(t){this.Dn=null,this.sh=t}Tt(){const t=this.sh.renderer();if(null===t)return null;if(this.Dn?.nh===t)return this.Dn.eh;const i=new Vt(t);return this.Dn={nh:t,eh:i},i}rh(){return this.sh.zOrder?.()??"normal"}}function It(t){return{ri:t.text(),Bi:t.coordinate(),Vi:t.fixedCoordinate?.(),R:t.textColor(),Z:t.backColor(),Et:t.visible?.()??!0,pi:t.tickVisible?.()??!0}}class At{constructor(t,i){this.Gt=new W,this._h=t,this.uh=i}Tt(){return this.Gt.ht({Qi:this.uh.Qi(),...It(this._h)}),this.Gt}}class zt extends L{constructor(t,i){super(),this._h=t,this.qi=i}ji(t,i,s){const n=It(this._h);s.Z=n.Z,t.R=n.R;const e=2/12*this.qi.P();s.Ti=e,s.Ri=e,s.Bi=n.Bi,s.Vi=n.Vi,t.ri=n.ri,t.Et=n.Et,t.pi=n.pi}}class Ot extends Dt{constructor(t,i){super(t),this.dh=null,this.fh=null,this.ph=null,this.mh=null,this.ge=i}cs(){const t=this.ah.timeAxisViews?.()??[];if(this.dh?.nh===t)return this.dh.eh;const i=this.ge.Qt().It(),s=t.map((t=>new At(t,i)));return this.dh={nh:t,eh:s},s}Ws(){const t=this.ah.priceAxisViews?.()??[];if(this.fh?.nh===t)return this.fh.eh;const i=this.ge.Ft(),s=t.map((t=>new zt(t,i)));return this.fh={nh:t,eh:s},s}wh(){const t=this.ah.priceAxisPaneViews?.()??[];if(this.ph?.nh===t)return this.ph.eh;const i=t.map((t=>new Bt(t)));return this.ph={nh:t,eh:i},i}gh(){const t=this.ah.timeAxisPaneViews?.()??[];if(this.mh?.nh===t)return this.mh.eh;const i=t.map((t=>new Bt(t)));return this.mh={nh:t,eh:i},i}Mh(t,i){return this.ah.autoscaleInfo?.(t,i)??null}}function Lt(t,i,s,n){t.forEach((t=>{i(t).forEach((t=>{t.rh()===s&&n.push(t)}))}))}function Nt(t){return t.Fs()}function Ft(t){return t.wh()}function Wt(t){return t.gh()}const Ht=["Area","Line","Baseline"];class Ut extends wt{constructor(t,i,s,n,e){super(t),this.qt=new yt,this.er=new _t(this),this.bh=[],this.xh=new ht(this),this.Sh=null,this.Ch=null,this.Ph=null,this.yh=[],this.Ps=s,this.kh=i;const r=new ut(this);this.vs=[r],this.rr=new nt(r,this,t),Ht.includes(this.kh)&&(this.Sh=new ot(this)),this.Th(),this.sh=n(this,this.Qt(),e)}m(){null!==this.Ph&&clearTimeout(this.Ph)}Be(t){return this.Ps.priceLineColor||t}ye(t){const i={ke:!0},s=this.Ft();if(this.Qt().It().Ki()||s.Ki()||this.qt.Ki())return i;const n=this.Qt().It().Pe(),e=this.zt();if(null===n||null===e)return i;let r,h;if(t){const t=this.qt.Ar();if(null===t)return i;r=t,h=t.Re}else{const t=this.qt.Fr(n.bi(),-1);if(null===t)return i;if(r=this.qt.kr(t.Re),null===r)return i;h=t.Re}const a=r.Wt[3],l=this.Rh().Dr(h,{Wt:r}),o=s.Nt(a,e.Wt);return{ke:!1,gt:a,ri:s.Zi(a,e.Wt),Le:s.Dh(a),Ne:s.Eh(a,e.Wt),R:l.cr,Bi:o,Re:h}}Rh(){return null!==this.Ch||(this.Ch=new Mt(this)),this.Ch}N(){return this.Ps}hr(t){const i=t.priceScaleId;void 0!==i&&i!==this.Ps.priceScaleId&&this.Qt().Vh(this,i),_(this.Ps,t),void 0!==t.priceFormat&&(this.Th(),this.Qt().Bh()),this.Qt().Ih(this),this.Qt().Ah(),this.sh.yt("options")}ht(t,i){this.qt.ht(t),this.sh.yt("data"),null!==this.Sh&&(i&&i.zh?this.Sh.be():0===t.length&&this.Sh.Me());const s=this.Qt().Hn(this);this.Qt().Oh(s),this.Qt().Ih(this),this.Qt().Ah(),this.Qt().ar()}Lh(t){const i=new mt(this,t);return this.bh.push(i),this.Qt().Ih(this),i}Nh(t){const i=this.bh.indexOf(t);-1!==i&&this.bh.splice(i,1),this.Qt().Ih(this)}Fh(){return this.bh}Rr(){return this.kh}zt(){const t=this.Wh();return null===t?null:{Wt:t.Wt[3],Hh:t.wt}}Wh(){const t=this.Qt().It().Pe();if(null===t)return null;const i=t.Uh();return this.qt.Fr(i,1)}Xs(){return this.qt}$h(t){const i=this.qt.kr(t);return null===i?null:"Bar"===this.kh||"Candlestick"===this.kh||"Custom"===this.kh?{jh:i.Wt[0],qh:i.Wt[1],Yh:i.Wt[2],Kh:i.Wt[3]}:i.Wt[3]}Xh(t){const i=[];Lt(this.yh,Nt,"top",i);const s=this.Sh;return null!==s&&s.Et()?(null===this.Ph&&s.Se()&&(this.Ph=setTimeout((()=>{this.Ph=null,this.Qt().Zh()}),0)),s.xe(),i.unshift(s),i):i}Fs(){const t=[];this.Gh()||t.push(this.xh),t.push(this.sh,this.er);const i=this.bh.map((t=>t.lr()));return t.push(...i),Lt(this.yh,Nt,"normal",t),t}Jh(){return this.Qh(Nt,"bottom")}ta(t){return this.Qh(Ft,t)}ia(t){return this.Qh(Wt,t)}sa(t,i){return this.yh.map((s=>s.Yn(t,i))).filter((t=>null!==t))}us(){return[this.rr,...this.bh.map((t=>t._r()))]}Ws(t,i){if(i!==this.es&&!this.Gh())return[];const s=[...this.vs];for(const t of this.bh)s.push(t.ur());return this.yh.forEach((t=>{s.push(...t.Ws())})),s}cs(){const t=[];return this.yh.forEach((i=>{t.push(...i.cs())})),t}Mh(t,i){if(void 0!==this.Ps.autoscaleInfoProvider){const s=this.Ps.autoscaleInfoProvider((()=>{const s=this.na(t,i);return null===s?null:s.Xe()}));return ft.Ze(s)}return this.na(t,i)}ea(){return this.Ps.priceFormat.minMove}ra(){return this.ha}Ns(){this.sh.yt();for(const t of this.vs)t.yt();for(const t of this.bh)t.yt();this.er.yt(),this.xh.yt(),this.Sh?.yt(),this.yh.forEach((t=>t.Ns()))}Ft(){return a(super.Ft())}At(t){if(!(("Line"===this.kh||"Area"===this.kh||"Baseline"===this.kh)&&this.Ps.crosshairMarkerVisible))return null;const i=this.qt.kr(t);if(null===i)return null;return{gt:i.Wt[3],ft:this.aa(),Ht:this.la(),Lt:this.oa(),Ot:this._a(t)}}Ie(){return this.Ps.title}Et(){return this.Ps.visible}ua(t){this.yh.push(new Ot(t,this))}ca(t){this.yh=this.yh.filter((i=>i.oh()!==t))}da(){if("Custom"===this.kh)return t=>this.sh.fa(t)}pa(){if("Custom"===this.kh)return t=>this.sh.va(t)}ma(){return this.qt.jr()}Gh(){return!q(this.Ft().wa())}na(t,i){if(!c(t)||!c(i)||this.qt.Ki())return null;const s="Line"===this.kh||"Area"===this.kh||"Baseline"===this.kh||"Histogram"===this.kh?[3]:[2,1],n=this.qt.Ur(t,i,s);let e=null!==n?new dt(n.Jr,n.Qr):null,r=null;if("Histogram"===this.Rr()){const t=this.Ps.base,i=new dt(t,t);e=null!==e?e.vn(i):i}return this.yh.forEach((s=>{const n=s.Mh(t,i);if(n?.priceRange){const t=new dt(n.priceRange.minValue,n.priceRange.maxValue);e=null!==e?e.vn(t):t}n?.margins&&(r=n.margins)})),new ft(e,r)}aa(){switch(this.kh){case"Line":case"Area":case"Baseline":return this.Ps.crosshairMarkerRadius}return 0}la(){switch(this.kh){case"Line":case"Area":case"Baseline":{const t=this.Ps.crosshairMarkerBorderColor;if(0!==t.length)return t}}return null}oa(){switch(this.kh){case"Line":case"Area":case"Baseline":return this.Ps.crosshairMarkerBorderWidth}return 0}_a(t){switch(this.kh){case"Line":case"Area":case"Baseline":{const t=this.Ps.crosshairMarkerBackgroundColor;if(0!==t.length)return t}}return this.Rh().Dr(t).cr}Th(){switch(this.Ps.priceFormat.type){case"custom":{const t=this.Ps.priceFormat.formatter;this.ha={format:t,formatTickmarks:this.Ps.priceFormat.tickmarksFormatter??(i=>i.map(t))};break}case"volume":this.ha=new Q(this.Ps.priceFormat.precision);break;case"percent":this.ha=new J(this.Ps.priceFormat.precision);break;default:{const t=Math.pow(10,this.Ps.priceFormat.precision);this.ha=new G(t,this.Ps.priceFormat.minMove*t)}}null!==this.es&&this.es.ga()}Qh(t,i){const s=[];return Lt(this.yh,t,i,s),s}}const $t=[3],jt=[0,1,2,3];class qt{constructor(t){this.Ps=t}Ma(t,i,s){let n=t;if(0===this.Ps.mode)return n;const e=s.ks(),r=e.zt();if(null===r)return n;const h=e.Nt(t,r),a=s.ba().filter((t=>t instanceof Ut)).reduce(((t,n)=>{if(s.Un(n)||!n.Et())return t;const e=n.Ft(),r=n.Xs();if(e.Ki()||!r.Te(i))return t;const h=r.kr(i);if(null===h)return t;const a=l(n.zt()),o=3===this.Ps.mode?jt:$t;return t.concat(o.map((t=>e.Nt(h.Wt[t],a.Wt))))}),[]);if(0===a.length)return n;a.sort(((t,i)=>Math.abs(t-h)-Math.abs(i-h)));const o=a[0];return n=e.Ts(o,r),n}}function Yt(t,i,s){return Math.min(Math.max(t,i),s)}function Kt(t,i,s){return i-t<=s}function Xt(t){const i=Math.ceil(t);return i%2==0?i-1:i}class Zt extends P{constructor(){super(...arguments),this.qt=null}ht(t){this.qt=t}et({context:t,bitmapSize:i,horizontalPixelRatio:s,verticalPixelRatio:e}){if(null===this.qt)return;const r=Math.max(1,Math.floor(s));t.lineWidth=r,function(t,i){t.save(),t.lineWidth%2&&t.translate(.5,.5),i(),t.restore()}(t,(()=>{const h=a(this.qt);if(h.xa){t.strokeStyle=h.Sa,n(t,h.Ca),t.beginPath();for(const n of h.Pa){const e=Math.round(n.ya*s);t.moveTo(e,-r),t.lineTo(e,i.height+r)}t.stroke()}if(h.ka){t.strokeStyle=h.Ta,n(t,h.Ra),t.beginPath();for(const s of h.Da){const n=Math.round(s.ya*e);t.moveTo(-r,n),t.lineTo(i.width+r,n)}t.stroke()}}))}}class Gt{constructor(t){this.Gt=new Zt,this.St=!0,this.Pt=t}yt(){this.St=!0}Tt(){if(this.St){const t=this.Pt.Qt().N().grid,i={ka:t.horzLines.visible,xa:t.vertLines.visible,Ta:t.horzLines.color,Sa:t.vertLines.color,Ra:t.horzLines.style,Ca:t.vertLines.style,Da:this.Pt.ks().Ea(),Pa:(this.Pt.Qt().It().Ea()||[]).map((t=>({ya:t.coord})))};this.Gt.ht(i),this.St=!1}return this.Gt}}class Jt{constructor(t){this.sh=new Gt(t)}lr(){return this.sh}}const Qt={Va:4,Ba:1e-4};function ti(t,i){const s=100*(t-i)/i;return i<0?-s:s}function ii(t,i){const s=ti(t.$e(),i),n=ti(t.je(),i);return new dt(s,n)}function si(t,i){const s=100*(t-i)/i+100;return i<0?-s:s}function ni(t,i){const s=si(t.$e(),i),n=si(t.je(),i);return new dt(s,n)}function ei(t,i){const s=Math.abs(t);if(s<1e-15)return 0;const n=Math.log10(s+i.Ba)+i.Va;return t<0?-n:n}function ri(t,i){const s=Math.abs(t);if(s<1e-15)return 0;const n=Math.pow(10,s-i.Va)-i.Ba;return t<0?-n:n}function hi(t,i){if(null===t)return null;const s=ei(t.$e(),i),n=ei(t.je(),i);return new dt(s,n)}function ai(t,i){if(null===t)return null;const s=ri(t.$e(),i),n=ri(t.je(),i);return new dt(s,n)}function li(t){if(null===t)return Qt;const i=Math.abs(t.je()-t.$e());if(i>=1||i<1e-15)return Qt;const s=Math.ceil(Math.abs(Math.log10(i))),n=Qt.Va+s;return{Va:n,Ba:1/Math.pow(10,n)}}class oi{constructor(t,i){if(this.Ia=t,this.Aa=i,function(t){if(t<0)return!1;for(let i=t;i>1;i/=10)if(i%10!=0)return!1;return!0}(this.Ia))this.za=[2,2.5,2];else{this.za=[];for(let t=this.Ia;1!==t;){if(t%2==0)this.za.push(2),t/=2;else{if(t%5!=0)throw new Error("unexpected base");this.za.push(2,2.5),t/=5}if(this.za.length>100)throw new Error("something wrong with base")}}}Oa(t,i,s){const n=0===this.Ia?0:1/this.Ia;let e=Math.pow(10,Math.max(0,Math.ceil(Math.log10(t-i)))),r=0,h=this.Aa[0];for(;;){const t=Kt(e,n,1e-14)&&e>n+1e-14,i=Kt(e,s*h,1e-14),a=Kt(e,1,1e-14);if(!(t&&i&&a))break;e/=h,h=this.Aa[++r%this.Aa.length]}if(e<=n+1e-14&&(e=n),e=Math.max(1,e),this.za.length>0&&(a=e,l=1,o=1e-14,Math.abs(a-l)<o))for(r=0,h=this.za[0];Kt(e,s*h,1e-14)&&e>n+1e-14;)e/=h,h=this.za[++r%this.za.length];var a,l,o;return e}}class _i{constructor(t,i,s,n){this.La=[],this.qi=t,this.Ia=i,this.Na=s,this.Fa=n}Oa(t,i){if(t<i)throw new Error("high < low");const s=this.qi.$t(),n=(t-i)*this.Wa()/s,e=new oi(this.Ia,[2,2.5,2]),r=new oi(this.Ia,[2,2,2.5]),h=new oi(this.Ia,[2.5,2,2]),a=[];return a.push(e.Oa(t,i,n),r.Oa(t,i,n),h.Oa(t,i,n)),function(t){if(t.length<1)throw Error("array is empty");let i=t[0];for(let s=1;s<t.length;++s)t[s]<i&&(i=t[s]);return i}(a)}Ha(){const t=this.qi,i=t.zt();if(null===i)return void(this.La=[]);const s=t.$t(),n=this.Na(s-1,i),e=this.Na(0,i),r=this.qi.N().entireTextOnly?this.Ua()/2:0,h=r,a=s-1-r,l=Math.max(n,e),o=Math.min(n,e);if(l===o)return void(this.La=[]);const _=this.Oa(l,o);if(this.$a(i,_,l,o,h,a),t.ja()&&this.qa(_,o,l)){const t=this.qi.Ya();this.Ka(i,_,h,a,t,2*t)}const u=this.La.map((t=>t.Xa)),c=this.qi.Za(u);for(let t=0;t<this.La.length;t++)this.La[t].Ga=c[t]}Ea(){return this.La}Ua(){return this.qi.P()}Wa(){return Math.ceil(2.5*this.Ua())}$a(t,i,s,n,e,r){const h=this.La,a=this.qi;let l=s%i;l+=l<0?i:0;const o=s>=n?1:-1;let _=null,u=0;for(let c=s-l;c>n;c-=i){const s=this.Fa(c,t,!0);null!==_&&Math.abs(s-_)<this.Wa()||(s<e||s>r||(u<h.length?(h[u].ya=s,h[u].Ga=a.Ja(c),h[u].Xa=c):h.push({ya:s,Ga:a.Ja(c),Xa:c}),u++,_=s,a.Qa()&&(i=this.Oa(c*o,n))))}h.length=u}Ka(t,i,s,n,e,r){const h=this.La,a=this.tl(t,s,e,r),l=this.tl(t,n,-r,-e),o=this.Fa(0,t,!0)-this.Fa(i,t,!0);h.length>0&&h[0].ya-a.ya<o/2&&h.shift(),h.length>0&&l.ya-h[h.length-1].ya<o/2&&h.pop(),h.unshift(a),h.push(l)}tl(t,i,s,n){const e=(s+n)/2,r=this.Na(i+s,t),h=this.Na(i+n,t),a=Math.min(r,h),l=Math.max(r,h),o=Math.max(.1,this.Oa(l,a)),_=this.Na(i+e,t),u=_-_%o,c=this.Fa(u,t,!0);return{Ga:this.qi.Ja(u),ya:c,Xa:u}}qa(t,i,s){let n=l(this.qi.Qe());return this.qi.Qa()&&(n=ai(n,this.qi.il())),n.$e()-i<t&&s-n.je()<t}}function ui(t){return t.slice().sort(((t,i)=>a(t.hs())-a(i.hs())))}var ci;!function(t){t[t.Normal=0]="Normal",t[t.Logarithmic=1]="Logarithmic",t[t.Percentage=2]="Percentage",t[t.IndexedTo100=3]="IndexedTo100"}(ci||(ci={}));const di=new J,fi=new G(100,1);class pi{constructor(t,i,s,n,e){this.sl=0,this.nl=null,this.Ge=null,this.el=null,this.rl={hl:!1,al:null},this.ll=!1,this.ol=0,this._l=0,this.ul=new o,this.cl=new o,this.dl=[],this.fl=null,this.pl=null,this.vl=null,this.ml=null,this.wl=null,this.ha=fi,this.gl=li(null),this.Ml=t,this.Ps=i,this.bl=s,this.xl=n,this.Sl=e,this.Cl=new _i(this,100,this.Pl.bind(this),this.yl.bind(this))}wa(){return this.Ml}N(){return this.Ps}hr(t){if(_(this.Ps,t),this.ga(),void 0!==t.mode&&this.kl({ie:t.mode}),void 0!==t.scaleMargins){const i=h(t.scaleMargins.top),s=h(t.scaleMargins.bottom);if(i<0||i>1)throw new Error(`Invalid top margin - expect value between 0 and 1, given=${i}`);if(s<0||s>1)throw new Error(`Invalid bottom margin - expect value between 0 and 1, given=${s}`);if(i+s>1)throw new Error(`Invalid margins - sum of margins must be less than 1, given=${i+s}`);this.Tl(),this.vl=null}}Rl(){return this.Ps.autoScale}Dl(){return this.ll}Qa(){return 1===this.Ps.mode}Oe(){return 2===this.Ps.mode}El(){return 3===this.Ps.mode}il(){return this.gl}ie(){return{sn:this.Ps.autoScale,Vl:this.Ps.invertScale,ie:this.Ps.mode}}kl(t){const i=this.ie();let s=null;void 0!==t.sn&&(this.Ps.autoScale=t.sn),void 0!==t.ie&&(this.Ps.mode=t.ie,2!==t.ie&&3!==t.ie||(this.Ps.autoScale=!0),this.rl.hl=!1),1===i.ie&&t.ie!==i.ie&&(!function(t,i){if(null===t)return!1;const s=ri(t.$e(),i),n=ri(t.je(),i);return isFinite(s)&&isFinite(n)}(this.Ge,this.gl)?this.Ps.autoScale=!0:(s=ai(this.Ge,this.gl),null!==s&&this.Bl(s))),1===t.ie&&t.ie!==i.ie&&(s=hi(this.Ge,this.gl),null!==s&&this.Bl(s));const n=i.ie!==this.Ps.mode;n&&(2===i.ie||this.Oe())&&this.ga(),n&&(3===i.ie||this.El())&&this.ga(),void 0!==t.Vl&&i.Vl!==t.Vl&&(this.Ps.invertScale=t.Vl,this.Il()),this.cl.p(i,this.ie())}Al(){return this.cl}P(){return this.bl.fontSize}$t(){return this.sl}zl(t){this.sl!==t&&(this.sl=t,this.Tl(),this.vl=null)}Ol(){if(this.nl)return this.nl;const t=this.$t()-this.Ll()-this.Nl();return this.nl=t,t}Qe(){return this.Fl(),this.Ge}Bl(t,i){const s=this.Ge;(i||null===s&&null!==t||null!==s&&!s.He(t))&&(this.vl=null,this.Ge=t)}Wl(t){this.Bl(t),this.Hl(null!==t)}Ki(){return this.Fl(),0===this.sl||!this.Ge||this.Ge.Ki()}Ul(t){return this.Vl()?t:this.$t()-1-t}Nt(t,i){return this.Oe()?t=ti(t,i):this.El()&&(t=si(t,i)),this.yl(t,i)}$l(t,i,s){this.Fl();const n=this.Nl(),e=a(this.Qe()),r=e.$e(),h=e.je(),l=this.Ol()-1,o=this.Vl(),_=l/(h-r),u=void 0===s?0:s.from,c=void 0===s?t.length:s.to,d=this.jl();for(let s=u;s<c;s++){const e=t[s],h=e.gt;if(isNaN(h))continue;let a=h;null!==d&&(a=d(e.gt,i));const l=n+_*(a-r),u=o?l:this.sl-1-l;e.ut=u}}ql(t,i,s){this.Fl();const n=this.Nl(),e=a(this.Qe()),r=e.$e(),h=e.je(),l=this.Ol()-1,o=this.Vl(),_=l/(h-r),u=void 0===s?0:s.from,c=void 0===s?t.length:s.to,d=this.jl();for(let s=u;s<c;s++){const e=t[s];let h=e.jh,a=e.qh,l=e.Yh,u=e.Kh;null!==d&&(h=d(e.jh,i),a=d(e.qh,i),l=d(e.Yh,i),u=d(e.Kh,i));let c=n+_*(h-r),f=o?c:this.sl-1-c;e.Yl=f,c=n+_*(a-r),f=o?c:this.sl-1-c,e.Kl=f,c=n+_*(l-r),f=o?c:this.sl-1-c,e.Xl=f,c=n+_*(u-r),f=o?c:this.sl-1-c,e.Zl=f}}Ts(t,i){const s=this.Pl(t,i);return this.Gl(s,i)}Gl(t,i){let s=t;return this.Oe()?s=function(t,i){return i<0&&(t=-t),t/100*i+i}(s,i):this.El()&&(s=function(t,i){return t-=100,i<0&&(t=-t),t/100*i+i}(s,i)),s}ba(){return this.dl}Dt(){return this.pl||(this.pl=ui(this.dl)),this.pl}Jl(t){-1===this.dl.indexOf(t)&&(this.dl.push(t),this.ga(),this.Ql())}io(t){const i=this.dl.indexOf(t);if(-1===i)throw new Error("source is not attached to scale");this.dl.splice(i,1),0===this.dl.length&&(this.kl({sn:!0}),this.Bl(null)),this.ga(),this.Ql()}zt(){let t=null;for(const i of this.dl){const s=i.zt();null!==s&&((null===t||s.Hh<t.Hh)&&(t=s))}return null===t?null:t.Wt}Vl(){return this.Ps.invertScale}Ea(){const t=null===this.zt();if(null!==this.vl&&(t||this.vl.so===t))return this.vl.Ea;this.Cl.Ha();const i=this.Cl.Ea();return this.vl={Ea:i,so:t},this.ul.p(),i}no(){return this.ul}eo(t){this.Oe()||this.El()||null===this.ml&&null===this.el&&(this.Ki()||(this.ml=this.sl-t,this.el=a(this.Qe()).Ue()))}ro(t){if(this.Oe()||this.El())return;if(null===this.ml)return;this.kl({sn:!1}),(t=this.sl-t)<0&&(t=0);let i=(this.ml+.2*(this.sl-1))/(t+.2*(this.sl-1));const s=a(this.el).Ue();i=Math.max(i,.1),s.Ye(i),this.Bl(s)}ho(){this.Oe()||this.El()||(this.ml=null,this.el=null)}ao(t){this.Rl()||null===this.wl&&null===this.el&&(this.Ki()||(this.wl=t,this.el=a(this.Qe()).Ue()))}lo(t){if(this.Rl())return;if(null===this.wl)return;const i=a(this.Qe()).qe()/(this.Ol()-1);let s=t-this.wl;this.Vl()&&(s*=-1);const n=s*i,e=a(this.el).Ue();e.Ke(n),this.Bl(e,!0),this.vl=null}oo(){this.Rl()||null!==this.wl&&(this.wl=null,this.el=null)}ra(){return this.ha||this.ga(),this.ha}Zi(t,i){switch(this.Ps.mode){case 2:return this._o(ti(t,i));case 3:return this.ra().format(si(t,i));default:return this.nr(t)}}Ja(t){switch(this.Ps.mode){case 2:return this._o(t);case 3:return this.ra().format(t);default:return this.nr(t)}}Za(t){switch(this.Ps.mode){case 2:return this.uo(t);case 3:return this.ra().formatTickmarks(t);default:return this.co(t)}}Dh(t){return this.nr(t,a(this.fl).ra())}Eh(t,i){return t=ti(t,i),this._o(t,di)}do(){return this.dl}fo(t){this.rl={al:t,hl:!1}}Ns(){this.dl.forEach((t=>t.Ns()))}ja(){return this.Ps.ensureEdgeTickMarksVisible&&this.Rl()}Ya(){return this.P()/2}ga(){this.vl=null;let t=1/0;this.fl=null;for(const i of this.dl)i.hs()<t&&(t=i.hs(),this.fl=i);let i=100;null!==this.fl&&(i=Math.round(1/this.fl.ea())),this.ha=fi,this.Oe()?(this.ha=di,i=100):this.El()?(this.ha=new G(100,1),i=100):null!==this.fl&&(this.ha=this.fl.ra()),this.Cl=new _i(this,i,this.Pl.bind(this),this.yl.bind(this)),this.Cl.Ha()}Ql(){this.pl=null}Xi(){return this.Sl}Hl(t){this.ll=t}Ll(){return this.Vl()?this.Ps.scaleMargins.bottom*this.$t()+this._l:this.Ps.scaleMargins.top*this.$t()+this.ol}Nl(){return this.Vl()?this.Ps.scaleMargins.top*this.$t()+this.ol:this.Ps.scaleMargins.bottom*this.$t()+this._l}Fl(){this.rl.hl||(this.rl.hl=!0,this.po())}Tl(){this.nl=null}yl(t,i){if(this.Fl(),this.Ki())return 0;t=this.Qa()&&t?ei(t,this.gl):t;const s=a(this.Qe()),n=this.Nl()+(this.Ol()-1)*(t-s.$e())/s.qe();return this.Ul(n)}Pl(t,i){if(this.Fl(),this.Ki())return 0;const s=this.Ul(t),n=a(this.Qe()),e=n.$e()+n.qe()*((s-this.Nl())/(this.Ol()-1));return this.Qa()?ri(e,this.gl):e}Il(){this.vl=null,this.Cl.Ha()}po(){if(this.Dl()&&!this.Rl())return;const t=this.rl.al;if(null===t)return;let i=null;const s=this.do();let n=0,e=0;for(const r of s){if(!r.Et())continue;const s=r.zt();if(null===s)continue;const h=r.Mh(t.Uh(),t.bi());let l=h&&h.Qe();if(null!==l){switch(this.Ps.mode){case 1:l=hi(l,this.gl);break;case 2:l=ii(l,s.Wt);break;case 3:l=ni(l,s.Wt)}if(i=null===i?l:i.vn(a(l)),null!==h){const t=h.tr();null!==t&&(n=Math.max(n,t.above),e=Math.max(e,t.below))}}}if(this.ja()&&(n=Math.max(n,this.Ya()),e=Math.max(e,this.Ya())),n===this.ol&&e===this._l||(this.ol=n,this._l=e,this.vl=null,this.Tl()),null!==i){if(i.$e()===i.je()){const t=this.fl,s=5*(null===t||this.Oe()||this.El()?1:t.ea());this.Qa()&&(i=ai(i,this.gl)),i=new dt(i.$e()-s,i.je()+s),this.Qa()&&(i=hi(i,this.gl))}if(this.Qa()){const t=ai(i,this.gl),s=li(t);if(r=s,h=this.gl,r.Va!==h.Va||r.Ba!==h.Ba){const n=null!==this.el?ai(this.el,this.gl):null;this.gl=s,i=hi(t,s),null!==n&&(this.el=hi(n,s))}}this.Bl(i)}else null===this.Ge&&(this.Bl(new dt(-.5,.5)),this.gl=li(null));var r,h}jl(){return this.Oe()?ti:this.El()?si:this.Qa()?t=>ei(t,this.gl):null}vo(t,i,s){return void 0===i?(void 0===s&&(s=this.ra()),s.format(t)):i(t)}mo(t,i,s){return void 0===i?(void 0===s&&(s=this.ra()),s.formatTickmarks(t)):i(t)}nr(t,i){return this.vo(t,this.xl.priceFormatter,i)}co(t,i){const s=this.xl.priceFormatter;return this.mo(t,this.xl.tickmarksPriceFormatter??(s?t=>t.map(s):void 0),i)}_o(t,i){return this.vo(t,this.xl.percentageFormatter,i)}uo(t,i){const s=this.xl.percentageFormatter;return this.mo(t,this.xl.tickmarksPercentageFormatter??(s?t=>t.map(s):void 0),i)}}function vi(t){return t instanceof Ut}class mi{constructor(t,i){this.dl=[],this.wo=new Map,this.sl=0,this.Mo=0,this.bo=1,this.pl=null,this.xo=!1,this.So=new o,this.yh=[],this.uh=t,this.ts=i,this.Co=new Jt(this);const s=i.N();this.Po=this.yo("left",s.leftPriceScale),this.ko=this.yo("right",s.rightPriceScale),this.Po.Al().i(this.To.bind(this,this.Po),this),this.ko.Al().i(this.To.bind(this,this.ko),this),this.Ro(s)}Ro(t){if(t.leftPriceScale&&this.Po.hr(t.leftPriceScale),t.rightPriceScale&&this.ko.hr(t.rightPriceScale),t.localization&&(this.Po.ga(),this.ko.ga()),t.overlayPriceScales){const i=Array.from(this.wo.values());for(const s of i){const i=a(s[0].Ft());i.hr(t.overlayPriceScales),t.localization&&i.ga()}}}Do(t){switch(t){case"left":return this.Po;case"right":return this.ko}return this.wo.has(t)?h(this.wo.get(t))[0].Ft():null}m(){this.Qt().Eo().u(this),this.Po.Al().u(this),this.ko.Al().u(this),this.dl.forEach((t=>{t.m&&t.m()})),this.yh=this.yh.filter((t=>{const i=t.oh();return i.detached&&i.detached(),!1})),this.So.p()}Vo(){return this.bo}Bo(t){this.bo=t}Qt(){return this.ts}Qi(){return this.Mo}$t(){return this.sl}Io(t){this.Mo=t,this.Ao()}zl(t){this.sl=t,this.Po.zl(t),this.ko.zl(t),this.dl.forEach((i=>{if(this.Un(i)){const s=i.Ft();null!==s&&s.zl(t)}})),this.Ao()}zo(t){this.xo=t}Oo(){return this.xo}Lo(){return this.dl.filter(vi)}ba(){return this.dl}Un(t){const i=t.Ft();return null===i||this.Po!==i&&this.ko!==i}Jl(t,i,s){this.No(t,i,s?t.hs():this.dl.length)}io(t,i){const s=this.dl.indexOf(t);r(-1!==s,"removeDataSource: invalid data source"),this.dl.splice(s,1),i||this.dl.forEach(((t,i)=>t.ls(i)));const n=a(t.Ft()).wa();if(this.wo.has(n)){const i=h(this.wo.get(n)),s=i.indexOf(t);-1!==s&&(i.splice(s,1),0===i.length&&this.wo.delete(n))}const e=t.Ft();e&&e.ba().indexOf(t)>=0&&(e.io(t),this.Fo(e)),this.pl=null}jn(t){return t===this.Po?"left":t===this.ko?"right":"overlay"}Wo(){return this.Po}Ho(){return this.ko}Uo(t,i){t.eo(i)}$o(t,i){t.ro(i),this.Ao()}jo(t){t.ho()}qo(t,i){t.ao(i)}Yo(t,i){t.lo(i),this.Ao()}Ko(t){t.oo()}Ao(){this.dl.forEach((t=>{t.Ns()}))}ks(){let t=null;return this.ts.N().rightPriceScale.visible&&0!==this.ko.ba().length?t=this.ko:this.ts.N().leftPriceScale.visible&&0!==this.Po.ba().length?t=this.Po:0!==this.dl.length&&(t=this.dl[0].Ft()),null===t&&(t=this.ko),t}$n(){let t=null;return this.ts.N().rightPriceScale.visible?t=this.ko:this.ts.N().leftPriceScale.visible&&(t=this.Po),t}Fo(t){null!==t&&t.Rl()&&this.Xo(t)}Zo(t){const i=this.uh.Pe();t.kl({sn:!0}),null!==i&&t.fo(i),this.Ao()}Go(){this.Xo(this.Po),this.Xo(this.ko)}Jo(){this.Fo(this.Po),this.Fo(this.ko),this.dl.forEach((t=>{this.Un(t)&&this.Fo(t.Ft())})),this.Ao(),this.ts.ar()}Dt(){return null===this.pl&&(this.pl=ui(this.dl)),this.pl}Qo(t,i){i=Yt(i,0,this.dl.length-1);const s=this.dl.indexOf(t);r(-1!==s,"setSeriesOrder: invalid data source"),this.dl.splice(s,1),this.dl.splice(i,0,t),this.dl.forEach(((t,i)=>t.ls(i))),this.pl=null;for(const t of[this.Po,this.ko])t.Ql(),t.ga();this.ts.ar()}Vt(){return this.Dt().filter(vi)}t_(){return this.So}i_(){return this.Co}ua(t){this.yh.push(new Et(t))}ca(t){this.yh=this.yh.filter((i=>i.oh()!==t)),t.detached&&t.detached(),this.ts.ar()}s_(){return this.yh}sa(t,i){return this.yh.map((s=>s.Yn(t,i))).filter((t=>null!==t))}Xo(t){const i=t.do();if(i&&i.length>0&&!this.uh.Ki()){const i=this.uh.Pe();null!==i&&t.fo(i)}t.Ns()}No(t,i,s){let n=this.Do(i);if(null===n&&(n=this.yo(i,this.ts.N().overlayPriceScales)),this.dl.splice(s,0,t),!q(i)){const s=this.wo.get(i)||[];s.push(t),this.wo.set(i,s)}t.ls(s),n.Jl(t),t._s(n),this.Fo(n),this.pl=null}To(t,i,s){i.ie!==s.ie&&this.Xo(t)}yo(t,i){const s={visible:!0,autoScale:!0,...p(i)},n=new pi(t,s,this.ts.N().layout,this.ts.N().localization,this.ts.Xi());return n.zl(this.$t()),n}}function wi(t){return{n_:t.n_,e_:{Kn:t.r_.externalId},h_:t.r_.cursorStyle}}function gi(t,i,s,n){for(const e of t){const t=e.Tt(n);if(null!==t&&t.Yn){const n=t.Yn(i,s);if(null!==n)return{a_:e,e_:n}}}return null}function Mi(t){return void 0!==t.Fs}function bi(t,i,s){const n=[t,...t.Dt()],e=function(t,i,s){let n,e;for(const a of t){const t=a.sa?.(i,s)??[];for(const i of t)r=i.zOrder,h=n?.zOrder,(!h||"top"===r&&"top"!==h||"normal"===r&&"bottom"===h)&&(n=i,e=a)}var r,h;return n&&e?{r_:n,n_:e}:null}(n,i,s);if("top"===e?.r_.zOrder)return wi(e);for(const r of n){if(e&&e.n_===r&&"bottom"!==e.r_.zOrder&&!e.r_.isBackground)return wi(e);if(Mi(r)){const n=gi(r.Fs(t),i,s,t);if(null!==n)return{n_:r,a_:n.a_,e_:n.e_}}if(e&&e.n_===r&&"bottom"!==e.r_.zOrder&&e.r_.isBackground)return wi(e)}return e?.r_?wi(e):null}class xi{constructor(t,i,s=50){this.yn=0,this.kn=1,this.Tn=1,this.Dn=new Map,this.Rn=new Map,this.l_=t,this.o_=i,this.En=s}__(t){const i=t.time,s=this.o_.cacheKey(i),n=this.Dn.get(s);if(void 0!==n)return n.u_;if(this.yn===this.En){const t=this.Rn.get(this.Tn);this.Rn.delete(this.Tn),this.Dn.delete(h(t)),this.Tn++,this.yn--}const e=this.l_(t);return this.Dn.set(s,{u_:e,An:this.kn}),this.Rn.set(this.kn,s),this.yn++,this.kn++,e}}class Si{constructor(t,i){r(t<=i,"right should be >= left"),this.c_=t,this.d_=i}Uh(){return this.c_}bi(){return this.d_}f_(){return this.d_-this.c_+1}Te(t){return this.c_<=t&&t<=this.d_}He(t){return this.c_===t.Uh()&&this.d_===t.bi()}}function Ci(t,i){return null===t||null===i?t===i:t.He(i)}class Pi{constructor(){this.p_=new Map,this.Dn=null,this.v_=!1}m_(t){this.v_=t,this.Dn=null}w_(t,i){this.g_(i),this.Dn=null;for(let s=i;s<t.length;++s){const i=t[s];let n=this.p_.get(i.timeWeight);void 0===n&&(n=[],this.p_.set(i.timeWeight,n)),n.push({index:s,time:i.time,weight:i.timeWeight,originalTime:i.originalTime})}}M_(t,i,s,n,e){const r=Math.ceil(i/t);return null!==this.Dn&&this.Dn.b_===r&&e===this.Dn.x_&&s===this.Dn.S_||(this.Dn={x_:e,S_:s,Ea:this.C_(r,s,n),b_:r}),this.Dn.Ea}g_(t){if(0===t)return void this.p_.clear();const i=[];this.p_.forEach(((s,n)=>{t<=s[0].index?i.push(n):s.splice(xt(s,t,(i=>i.index<t)),1/0)}));for(const t of i)this.p_.delete(t)}C_(t,i,s){let n=[];const e=t=>!i||s.has(t.index);for(const i of Array.from(this.p_.keys()).sort(((t,i)=>i-t))){if(!this.p_.get(i))continue;const s=n;n=[];const r=s.length;let a=0;const l=h(this.p_.get(i)),o=l.length;let _=1/0,u=-1/0;for(let i=0;i<o;i++){const h=l[i],o=h.index;for(;a<r;){const t=s[a],i=t.index;if(!(i<o&&e(t))){_=i;break}a++,n.push(t),u=i,_=1/0}if(_-o>=t&&o-u>=t&&e(h))n.push(h),u=o;else if(this.v_)return s}for(;a<r;a++)e(s[a])&&n.push(s[a])}return n}}class yi{constructor(t){this.P_=t}y_(){return null===this.P_?null:new Si(Math.floor(this.P_.Uh()),Math.ceil(this.P_.bi()))}k_(){return this.P_}static T_(){return new yi(null)}}function ki(t,i){return t.weight>i.weight?t:i}class Ti{constructor(t,i,s,n){this.Mo=0,this.R_=null,this.D_=[],this.wl=null,this.ml=null,this.E_=new Pi,this.V_=new Map,this.B_=yi.T_(),this.I_=!0,this.A_=new o,this.z_=new o,this.O_=new o,this.L_=null,this.N_=null,this.F_=new Map,this.W_=-1,this.H_=[],this.Ps=i,this.xl=s,this.U_=i.rightOffset,this.j_=i.barSpacing,this.ts=t,this.o_=n,this.q_(),this.E_.m_(i.uniformDistribution),this.Y_()}N(){return this.Ps}K_(t){_(this.xl,t),this.X_(),this.q_()}hr(t,i){_(this.Ps,t),this.Ps.fixLeftEdge&&this.Z_(),this.Ps.fixRightEdge&&this.G_(),void 0!==t.barSpacing&&this.ts.dn(t.barSpacing),void 0!==t.rightOffset&&this.ts.fn(t.rightOffset),void 0===t.minBarSpacing&&void 0===t.maxBarSpacing||this.ts.dn(t.barSpacing??this.j_),void 0!==t.ignoreWhitespaceIndices&&t.ignoreWhitespaceIndices!==this.Ps.ignoreWhitespaceIndices&&this.Y_(),this.X_(),this.q_(),this.O_.p()}Rs(t){return this.D_[t]?.time??null}ss(t){return this.D_[t]??null}J_(t,i){if(this.D_.length<1)return null;if(this.o_.key(t)>this.o_.key(this.D_[this.D_.length-1].time))return i?this.D_.length-1:null;const s=xt(this.D_,this.o_.key(t),((t,i)=>this.o_.key(t.time)<i));return this.o_.key(t)<this.o_.key(this.D_[s].time)?i?s:null:s}Ki(){return 0===this.Mo||0===this.D_.length||null===this.R_}Q_(){return this.D_.length>0}Pe(){return this.tu(),this.B_.y_()}iu(){return this.tu(),this.B_.k_()}su(){const t=this.Pe();if(null===t)return null;const i={from:t.Uh(),to:t.bi()};return this.nu(i)}nu(t){const i=Math.round(t.from),s=Math.round(t.to),n=a(this.eu()),e=a(this.ru());return{from:a(this.ss(Math.max(n,i))),to:a(this.ss(Math.min(e,s)))}}hu(t){return{from:a(this.J_(t.from,!0)),to:a(this.J_(t.to,!0))}}Qi(){return this.Mo}Io(t){if(!isFinite(t)||t<=0)return;if(this.Mo===t)return;const i=this.iu(),s=this.Mo;if(this.Mo=t,this.I_=!0,this.Ps.lockVisibleTimeRangeOnResize&&0!==s){const i=this.j_*t/s;this.j_=i}if(this.Ps.fixLeftEdge&&null!==i&&i.Uh()<=0){const i=s-t;this.U_-=Math.round(i/this.j_)+1,this.I_=!0}this.au(),this.lu()}jt(t){if(this.Ki()||!c(t))return 0;const i=this.ou()+this.U_-t;return this.Mo-(i+.5)*this.j_-1}_u(t,i){const s=this.ou(),n=void 0===i?0:i.from,e=void 0===i?t.length:i.to;for(let i=n;i<e;i++){const n=t[i].wt,e=s+this.U_-n,r=this.Mo-(e+.5)*this.j_-1;t[i]._t=r}}uu(t,i){const s=Math.ceil(this.cu(t));return i&&this.Ps.ignoreWhitespaceIndices&&!this.du(s)?this.fu(s):s}fn(t){this.I_=!0,this.U_=t,this.lu(),this.ts.pu(),this.ts.ar()}vu(){return this.j_}dn(t){this.mu(t),this.lu(),this.ts.pu(),this.ts.ar()}wu(){return this.U_}Ea(){if(this.Ki())return null;if(null!==this.N_)return this.N_;const t=this.j_,i=5*(this.ts.N().layout.fontSize+4)/8*(this.Ps.tickMarkMaxCharacterLength||8),s=Math.round(i/t),n=a(this.Pe()),e=Math.max(n.Uh(),n.Uh()-s),r=Math.max(n.bi(),n.bi()-s),h=this.E_.M_(t,i,this.Ps.ignoreWhitespaceIndices,this.F_,this.W_),l=this.eu()+s,o=this.ru()-s,_=this.gu(),u=this.Ps.fixLeftEdge||_,c=this.Ps.fixRightEdge||_;let d=0;for(const t of h){if(!(e<=t.index&&t.index<=r))continue;let s;d<this.H_.length?(s=this.H_[d],s.coord=this.jt(t.index),s.label=this.Mu(t),s.weight=t.weight):(s={needAlignCoordinate:!1,coord:this.jt(t.index),label:this.Mu(t),weight:t.weight},this.H_.push(s)),this.j_>i/2&&!_?s.needAlignCoordinate=!1:s.needAlignCoordinate=u&&t.index<=l||c&&t.index>=o,d++}return this.H_.length=d,this.N_=this.H_,this.H_}bu(){this.I_=!0,this.dn(this.Ps.barSpacing),this.fn(this.Ps.rightOffset)}xu(t){this.I_=!0,this.R_=t,this.lu(),this.Z_()}Su(t,i){const s=this.cu(t),n=this.vu(),e=n+i*(n/10);this.dn(e),this.Ps.rightBarStaysOnScroll||this.fn(this.wu()+(s-this.cu(t)))}eo(t){this.wl&&this.oo(),null===this.ml&&null===this.L_&&(this.Ki()||(this.ml=t,this.Cu()))}ro(t){if(null===this.L_)return;const i=Yt(this.Mo-t,0,this.Mo),s=Yt(this.Mo-a(this.ml),0,this.Mo);0!==i&&0!==s&&this.dn(this.L_.vu*i/s)}ho(){null!==this.ml&&(this.ml=null,this.Pu())}ao(t){null===this.wl&&null===this.L_&&(this.Ki()||(this.wl=t,this.Cu()))}lo(t){if(null===this.wl)return;const i=(this.wl-t)/this.vu();this.U_=a(this.L_).wu+i,this.I_=!0,this.lu()}oo(){null!==this.wl&&(this.wl=null,this.Pu())}yu(){this.ku(this.Ps.rightOffset)}ku(t,i=400){if(!isFinite(t))throw new RangeError("offset is required and must be finite number");if(!isFinite(i)||i<=0)throw new RangeError("animationDuration (optional) must be finite positive number");const s=this.U_,n=performance.now();this.ts._n({Tu:t=>(t-n)/i>=1,Ru:e=>{const r=(e-n)/i;return r>=1?t:s+(t-s)*r}})}yt(t,i){this.I_=!0,this.D_=t,this.E_.w_(t,i),this.lu()}Du(){return this.A_}Eu(){return this.z_}Vu(){return this.O_}ou(){return this.R_||0}Bu(t){const i=t.f_();this.mu(this.Mo/i),this.U_=t.bi()-this.ou(),this.lu(),this.I_=!0,this.ts.pu(),this.ts.ar()}Iu(){const t=this.eu(),i=this.ru();null!==t&&null!==i&&this.Bu(new Si(t,i+this.Ps.rightOffset))}Au(t){const i=new Si(t.from,t.to);this.Bu(i)}ns(t){return void 0!==this.xl.timeFormatter?this.xl.timeFormatter(t.originalTime):this.o_.formatHorzItem(t.time)}Y_(){if(!this.Ps.ignoreWhitespaceIndices)return;this.F_.clear();const t=this.ts.Ys();for(const i of t)for(const t of i.ma())this.F_.set(t,!0);this.W_++}gu(){const t=this.ts.N().handleScroll,i=this.ts.N().handleScale;return!(t.horzTouchDrag||t.mouseWheel||t.pressedMouseMove||t.vertTouchDrag||i.axisDoubleClickReset.time||i.axisPressedMouseMove.time||i.mouseWheel||i.pinch)}eu(){return 0===this.D_.length?null:0}ru(){return 0===this.D_.length?null:this.D_.length-1}zu(t){return(this.Mo-1-t)/this.j_}cu(t){const i=this.zu(t),s=this.ou()+this.U_-i;return Math.round(1e6*s)/1e6}mu(t){const i=this.j_;this.j_=t,this.au(),i!==this.j_&&(this.I_=!0,this.Ou())}tu(){if(!this.I_)return;if(this.I_=!1,this.Ki())return void this.Lu(yi.T_());const t=this.ou(),i=this.Mo/this.j_,s=this.U_+t,n=new Si(s-i+1,s);this.Lu(new yi(n))}au(){const t=Yt(this.j_,this.Nu(),this.Fu());this.j_!==t&&(this.j_=t,this.I_=!0)}Fu(){return this.Ps.maxBarSpacing>0?this.Ps.maxBarSpacing:.5*this.Mo}Nu(){return this.Ps.fixLeftEdge&&this.Ps.fixRightEdge&&0!==this.D_.length?this.Mo/this.D_.length:this.Ps.minBarSpacing}lu(){const t=this.Wu();null!==t&&this.U_<t&&(this.U_=t,this.I_=!0);const i=this.Hu();this.U_>i&&(this.U_=i,this.I_=!0)}Wu(){const t=this.eu(),i=this.R_;if(null===t||null===i)return null;return t-i-1+(this.Ps.fixLeftEdge?this.Mo/this.j_:Math.min(2,this.D_.length))}Hu(){return this.Ps.fixRightEdge?0:this.Mo/this.j_-Math.min(2,this.D_.length)}Cu(){this.L_={vu:this.vu(),wu:this.wu()}}Pu(){this.L_=null}Mu(t){let i=this.V_.get(t.weight);return void 0===i&&(i=new xi((t=>this.Uu(t)),this.o_),this.V_.set(t.weight,i)),i.__(t)}Uu(t){return this.o_.formatTickmark(t,this.xl)}Lu(t){const i=this.B_;this.B_=t,Ci(i.y_(),this.B_.y_())||this.A_.p(),Ci(i.k_(),this.B_.k_())||this.z_.p(),this.Ou()}Ou(){this.N_=null}X_(){this.Ou(),this.V_.clear()}q_(){this.o_.updateFormatter(this.xl)}Z_(){if(!this.Ps.fixLeftEdge)return;const t=this.eu();if(null===t)return;const i=this.Pe();if(null===i)return;const s=i.Uh()-t;if(s<0){const t=this.U_-s-1;this.fn(t)}this.au()}G_(){this.lu(),this.au()}du(t){return!this.Ps.ignoreWhitespaceIndices||(this.F_.get(t)||!1)}fu(t){const i=function*(t){const i=Math.round(t),s=i<t;let n=1;for(;;)s?(yield i+n,yield i-n):(yield i-n,yield i+n),n++}(t),s=this.ru();for(;s;){const t=i.next().value;if(this.F_.get(t))return t;if(t<0||t>s)break}return t}}var Ri,Di,Ei,Vi,Bi;!function(t){t[t.OnTouchEnd=0]="OnTouchEnd",t[t.OnNextTap=1]="OnNextTap"}(Ri||(Ri={}));class Ii{constructor(t,i,s){this.$u=[],this.ju=[],this.Mo=0,this.qu=null,this.Yu=new o,this.Ku=new o,this.Xu=null,this.Zu=t,this.Ps=i,this.o_=s,this.Sl=new S(this.Ps.layout.colorParsers),this.Gu=new M(this),this.uh=new Ti(this,i.timeScale,this.Ps.localization,s),this.Ct=new j(this,i.crosshair),this.Ju=new qt(i.crosshair),i.addDefaultPane&&(this.Qu(0),this.$u[0].Bo(2)),this.tc=this.sc(0),this.nc=this.sc(1)}Bh(){this.ec(Y.gn())}ar(){this.ec(Y.wn())}Zh(){this.ec(new Y(1))}Ih(t){const i=this.rc(t);this.ec(i)}hc(){return this.qu}ac(t){if(this.qu?.n_===t?.n_&&this.qu?.e_?.Kn===t?.e_?.Kn)return;const i=this.qu;this.qu=t,null!==i&&this.Ih(i.n_),null!==t&&t.n_!==i?.n_&&this.Ih(t.n_)}N(){return this.Ps}hr(t){_(this.Ps,t),this.$u.forEach((i=>i.Ro(t))),void 0!==t.timeScale&&this.uh.hr(t.timeScale),void 0!==t.localization&&this.uh.K_(t.localization),(t.leftPriceScale||t.rightPriceScale)&&this.Yu.p(),this.tc=this.sc(0),this.nc=this.sc(1),this.Bh()}lc(t,i,s=0){const n=this.$u[s];if(void 0===n)return;if("left"===t)return _(this.Ps,{leftPriceScale:i}),n.Ro({leftPriceScale:i}),this.Yu.p(),void this.Bh();if("right"===t)return _(this.Ps,{rightPriceScale:i}),n.Ro({rightPriceScale:i}),this.Yu.p(),void this.Bh();const e=this.oc(t,s);null!==e&&(e.Ft.hr(i),this.Yu.p())}oc(t,i){const s=this.$u[i];if(void 0===s)return null;const n=s.Do(t);return null!==n?{Us:s,Ft:n}:null}It(){return this.uh}$s(){return this.$u}_c(){return this.Ct}uc(){return this.Ku}cc(t,i){t.zl(i),this.pu()}Io(t){this.Mo=t,this.uh.Io(this.Mo),this.$u.forEach((i=>i.Io(t))),this.pu()}dc(t){1!==this.$u.length&&(r(t>=0&&t<this.$u.length,"Invalid pane index"),this.$u.splice(t,1),this.Bh())}fc(t,i){if(this.$u.length<2)return;r(t>=0&&t<this.$u.length,"Invalid pane index");const s=this.$u[t],n=this.$u.reduce(((t,i)=>t+i.Vo()),0),e=this.$u.reduce(((t,i)=>t+i.$t()),0),h=e-30*(this.$u.length-1);i=Math.min(h,Math.max(30,i));const a=n/e,l=s.$t();s.Bo(i*a);let o=i-l,_=this.$u.length-1;for(const t of this.$u)if(t!==s){const i=Math.min(h,Math.max(30,t.$t()-o/_));o-=t.$t()-i,_-=1;const s=i*a;t.Bo(s)}this.Bh()}vc(t,i){r(t>=0&&t<this.$u.length&&i>=0&&i<this.$u.length,"Invalid pane index");const s=this.$u[t],n=this.$u[i];this.$u[t]=n,this.$u[i]=s,this.Bh()}mc(t,i){if(r(t>=0&&t<this.$u.length&&i>=0&&i<this.$u.length,"Invalid pane index"),t===i)return;const[s]=this.$u.splice(t,1);this.$u.splice(i,0,s),this.Bh()}Uo(t,i,s){t.Uo(i,s)}$o(t,i,s){t.$o(i,s),this.Ah(),this.ec(this.wc(t,2))}jo(t,i){t.jo(i),this.ec(this.wc(t,2))}qo(t,i,s){i.Rl()||t.qo(i,s)}Yo(t,i,s){i.Rl()||(t.Yo(i,s),this.Ah(),this.ec(this.wc(t,2)))}Ko(t,i){i.Rl()||(t.Ko(i),this.ec(this.wc(t,2)))}Zo(t,i){t.Zo(i),this.ec(this.wc(t,2))}gc(t){this.uh.eo(t)}Mc(t,i){const s=this.It();if(s.Ki()||0===i)return;const n=s.Qi();t=Math.max(1,Math.min(t,n)),s.Su(t,i),this.pu()}bc(t){this.xc(0),this.Sc(t),this.Cc()}Pc(t){this.uh.ro(t),this.pu()}yc(){this.uh.ho(),this.ar()}xc(t){this.uh.ao(t)}Sc(t){this.uh.lo(t),this.pu()}Cc(){this.uh.oo(),this.ar()}Ys(){return this.ju}kc(t,i,s,n,e){this.Ct.Es(t,i);let r=NaN,h=this.uh.uu(t,!0);const a=this.uh.Pe();null!==a&&(h=Math.min(Math.max(a.Uh(),h),a.bi()));const l=n.ks(),o=l.zt();if(null!==o&&(r=l.Ts(i,o)),r=this.Ju.Ma(r,h,n),this.Ct.As(h,r,n),this.Zh(),!e){const e=bi(n,t,i);this.ac(e&&{n_:e.n_,e_:e.e_,h_:e.h_||null}),this.Ku.p(this.Ct.Bt(),{x:t,y:i},s)}}Tc(t,i,s){const n=s.ks(),e=n.zt(),r=n.Nt(t,a(e)),h=this.uh.J_(i,!0),l=this.uh.jt(a(h));this.kc(l,r,null,s,!0)}Rc(t){this._c().Os(),this.Zh(),t||this.Ku.p(null,null,null)}Ah(){const t=this.Ct.Us();if(null!==t){const i=this.Ct.Bs(),s=this.Ct.Is();this.kc(i,s,null,t)}this.Ct.Ns()}Dc(t,i,s){const n=this.uh.Rs(0);void 0!==i&&void 0!==s&&this.uh.yt(i,s);const e=this.uh.Rs(0),r=this.uh.ou(),h=this.uh.Pe();if(null!==h&&null!==n&&null!==e){const i=h.Te(r),a=this.o_.key(n)>this.o_.key(e),l=null!==t&&t>r&&!a,o=this.uh.N().allowShiftVisibleRangeOnWhitespaceReplacement,_=i&&(!(void 0===s)||o)&&this.uh.N().shiftVisibleRangeOnNewBar;if(l&&!_){const i=t-r;this.uh.fn(this.uh.wu()-i)}}this.uh.xu(t)}Oh(t){null!==t&&t.Jo()}Hn(t){if(function(t){return t instanceof mi}(t))return t;const i=this.$u.find((i=>i.Dt().includes(t)));return void 0===i?null:i}pu(){this.$u.forEach((t=>t.Jo())),this.Ah()}m(){this.$u.forEach((t=>t.m())),this.$u.length=0,this.Ps.localization.priceFormatter=void 0,this.Ps.localization.percentageFormatter=void 0,this.Ps.localization.timeFormatter=void 0}Ec(){return this.Gu}qn(){return this.Gu.N()}Eo(){return this.Yu}Vc(t,i){const s=this.Qu(i);this.Bc(t,s),this.ju.push(t),1===this.ju.length?this.Bh():this.ar()}Ic(t){const i=this.Hn(t),s=this.ju.indexOf(t);r(-1!==s,"Series not found");const n=a(i);this.ju.splice(s,1),n.io(t),t.m&&t.m(),this.uh.Y_(),this.Ac(n)}Vh(t,i){const s=a(this.Hn(t));s.io(t,!0),s.Jl(t,i,!0)}Iu(){const t=Y.wn();t.rn(),this.ec(t)}zc(t){const i=Y.wn();i.ln(t),this.ec(i)}cn(){const t=Y.wn();t.cn(),this.ec(t)}dn(t){const i=Y.wn();i.dn(t),this.ec(i)}fn(t){const i=Y.wn();i.fn(t),this.ec(i)}_n(t){const i=Y.wn();i._n(t),this.ec(i)}hn(){const t=Y.wn();t.hn(),this.ec(t)}Oc(){return this.Ps.rightPriceScale.visible?"right":"left"}Lc(t,i){r(i>=0,"Index should be greater or equal to 0");if(i===this.Nc(t))return;const s=a(this.Hn(t));s.io(t);const n=this.Qu(i);this.Bc(t,n),0===s.ba().length&&this.Ac(s),this.Bh()}Fc(){return this.nc}$(){return this.tc}Ut(t){const i=this.nc,s=this.tc;if(i===s)return i;if(t=Math.max(0,Math.min(100,Math.round(100*t))),null===this.Xu||this.Xu.mr!==s||this.Xu.wr!==i)this.Xu={mr:s,wr:i,Wc:new Map};else{const i=this.Xu.Wc.get(t);if(void 0!==i)return i}const n=this.Sl.tt(s,i,t/100);return this.Xu.Wc.set(t,n),n}Hc(t){return this.$u.indexOf(t)}Xi(){return this.Sl}Uc(){return this.$c()}$c(t){const i=new mi(this.uh,this);this.$u.push(i);const s=t??this.$u.length-1,n=Y.gn();return n.Qs(s,{tn:0,sn:!0}),this.ec(n),i}Qu(t){return r(t>=0,"Index should be greater or equal to 0"),(t=Math.min(this.$u.length,t))<this.$u.length?this.$u[t]:this.$c(t)}Nc(t){return this.$u.findIndex((i=>i.Lo().includes(t)))}wc(t,i){const s=new Y(i);if(null!==t){const n=this.$u.indexOf(t);s.Qs(n,{tn:i})}return s}rc(t,i){return void 0===i&&(i=2),this.wc(this.Hn(t),i)}ec(t){this.Zu&&this.Zu(t),this.$u.forEach((t=>t.i_().lr().yt()))}Bc(t,i){const s=t.N().priceScaleId,n=void 0!==s?s:this.Oc();i.Jl(t,n),q(n)||t.hr(t.N())}sc(t){const i=this.Ps.layout;return"gradient"===i.background.type?0===t?i.background.topColor:i.background.bottomColor:i.background.color}Ac(t){!t.Oo()&&0===t.ba().length&&this.$u.length>1&&this.$u.splice(this.Hc(t),1)}}function Ai(t){return!u(t)&&!d(t)}function zi(t){return u(t)}!function(t){t[t.Disabled=0]="Disabled",t[t.Continuous=1]="Continuous",t[t.OnDataUpdate=2]="OnDataUpdate"}(Di||(Di={})),function(t){t[t.LastBar=0]="LastBar",t[t.LastVisible=1]="LastVisible"}(Ei||(Ei={})),function(t){t.Solid="solid",t.VerticalGradient="gradient"}(Vi||(Vi={})),function(t){t[t.Year=0]="Year",t[t.Month=1]="Month",t[t.DayOfMonth=2]="DayOfMonth",t[t.Time=3]="Time",t[t.TimeWithSeconds=4]="TimeWithSeconds"}(Bi||(Bi={}));const Oi=t=>t.getUTCFullYear();function Li(t,i,s){return i.replace(/yyyy/g,(t=>Z(Oi(t),4))(t)).replace(/yy/g,(t=>Z(Oi(t)%100,2))(t)).replace(/MMMM/g,((t,i)=>new Date(t.getUTCFullYear(),t.getUTCMonth(),1).toLocaleString(i,{month:"long"}))(t,s)).replace(/MMM/g,((t,i)=>new Date(t.getUTCFullYear(),t.getUTCMonth(),1).toLocaleString(i,{month:"short"}))(t,s)).replace(/MM/g,(t=>Z((t=>t.getUTCMonth()+1)(t),2))(t)).replace(/dd/g,(t=>Z((t=>t.getUTCDate())(t),2))(t))}class Ni{constructor(t="yyyy-MM-dd",i="default"){this.jc=t,this.qc=i}__(t){return Li(t,this.jc,this.qc)}}class Fi{constructor(t){this.Yc=t||"%h:%m:%s"}__(t){return this.Yc.replace("%h",Z(t.getUTCHours(),2)).replace("%m",Z(t.getUTCMinutes(),2)).replace("%s",Z(t.getUTCSeconds(),2))}}const Wi={Kc:"yyyy-MM-dd",Xc:"%h:%m:%s",Zc:" ",Gc:"default"};class Hi{constructor(t={}){const i={...Wi,...t};this.Jc=new Ni(i.Kc,i.Gc),this.Qc=new Fi(i.Xc),this.td=i.Zc}__(t){return`${this.Jc.__(t)}${this.td}${this.Qc.__(t)}`}}function Ui(t){return 60*t*60*1e3}function $i(t){return 60*t*1e3}const ji=[{sd:(qi=1,1e3*qi),nd:10},{sd:$i(1),nd:20},{sd:$i(5),nd:21},{sd:$i(30),nd:22},{sd:Ui(1),nd:30},{sd:Ui(3),nd:31},{sd:Ui(6),nd:32},{sd:Ui(12),nd:33}];var qi;function Yi(t,i){if(t.getUTCFullYear()!==i.getUTCFullYear())return 70;if(t.getUTCMonth()!==i.getUTCMonth())return 60;if(t.getUTCDate()!==i.getUTCDate())return 50;for(let s=ji.length-1;s>=0;--s)if(Math.floor(i.getTime()/ji[s].sd)!==Math.floor(t.getTime()/ji[s].sd))return ji[s].nd;return 0}function Ki(t){let i=t;if(d(t)&&(i=Zi(t)),!Ai(i))throw new Error("time must be of type BusinessDay");const s=new Date(Date.UTC(i.year,i.month-1,i.day,0,0,0,0));return{ed:Math.round(s.getTime()/1e3),rd:i}}function Xi(t){if(!zi(t))throw new Error("time must be of type isUTCTimestamp");return{ed:t}}function Zi(t){const i=new Date(t);if(isNaN(i.getTime()))throw new Error(`Invalid date string=${t}, expected format=yyyy-mm-dd`);return{day:i.getUTCDate(),month:i.getUTCMonth()+1,year:i.getUTCFullYear()}}function Gi(t){d(t.time)&&(t.time=Zi(t.time))}class Ji{options(){return this.Ps}setOptions(t){this.Ps=t,this.updateFormatter(t.localization)}preprocessData(t){Array.isArray(t)?function(t){t.forEach(Gi)}(t):Gi(t)}createConverterToInternalObj(t){return a(function(t){return 0===t.length?null:Ai(t[0].time)||d(t[0].time)?Ki:Xi}(t))}key(t){return"object"==typeof t&&"ed"in t?t.ed:this.key(this.convertHorzItemToInternal(t))}cacheKey(t){const i=t;return void 0===i.rd?new Date(1e3*i.ed).getTime():new Date(Date.UTC(i.rd.year,i.rd.month-1,i.rd.day)).getTime()}convertHorzItemToInternal(t){return zi(i=t)?Xi(i):Ai(i)?Ki(i):Ki(Zi(i));var i}updateFormatter(t){if(!this.Ps)return;const i=t.dateFormat;this.Ps.timeScale.timeVisible?this.hd=new Hi({Kc:i,Xc:this.Ps.timeScale.secondsVisible?"%h:%m:%s":"%h:%m",Zc:"   ",Gc:t.locale}):this.hd=new Ni(i,t.locale)}formatHorzItem(t){const i=t;return this.hd.__(new Date(1e3*i.ed))}formatTickmark(t,i){const s=function(t,i,s){switch(t){case 0:case 10:return i?s?4:3:2;case 20:case 21:case 22:case 30:case 31:case 32:case 33:return i?3:2;case 50:return 2;case 60:return 1;case 70:return 0}}(t.weight,this.Ps.timeScale.timeVisible,this.Ps.timeScale.secondsVisible),n=this.Ps.timeScale;if(void 0!==n.tickMarkFormatter){const e=n.tickMarkFormatter(t.originalTime,s,i.locale);if(null!==e)return e}return function(t,i,s){const n={};switch(i){case 0:n.year="numeric";break;case 1:n.month="short";break;case 2:n.day="numeric";break;case 3:n.hour12=!1,n.hour="2-digit",n.minute="2-digit";break;case 4:n.hour12=!1,n.hour="2-digit",n.minute="2-digit",n.second="2-digit"}const e=void 0===t.rd?new Date(1e3*t.ed):new Date(Date.UTC(t.rd.year,t.rd.month-1,t.rd.day));return new Date(e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate(),e.getUTCHours(),e.getUTCMinutes(),e.getUTCSeconds(),e.getUTCMilliseconds()).toLocaleString(s,n)}(t.time,s,i.locale)}maxTickMarkWeight(t){let i=t.reduce(ki,t[0]).weight;return i>30&&i<50&&(i=30),i}fillWeightsForPoints(t,i){!function(t,i=0){if(0===t.length)return;let s=0===i?null:t[i-1].time.ed,n=null!==s?new Date(1e3*s):null,e=0;for(let r=i;r<t.length;++r){const i=t[r],h=new Date(1e3*i.time.ed);null!==n&&(i.timeWeight=Yi(h,n)),e+=i.time.ed-(s||i.time.ed),s=i.time.ed,n=h}if(0===i&&t.length>1){const i=Math.ceil(e/(t.length-1)),s=new Date(1e3*(t[0].time.ed-i));t[0].timeWeight=Yi(new Date(1e3*t[0].time.ed),s)}}(t,i)}static ad(t){return _({localization:{dateFormat:"dd MMM 'yy"}},t??{})}}function Qi(t){var i=t.width,s=t.height;if(i<0)throw new Error("Negative width is not allowed for Size");if(s<0)throw new Error("Negative height is not allowed for Size");return{width:i,height:s}}function ts(t,i){return t.width===i.width&&t.height===i.height}var is=function(){function t(t){var i=this;this._resolutionListener=function(){return i._onResolutionChanged()},this._resolutionMediaQueryList=null,this._observers=[],this._window=t,this._installResolutionListener()}return t.prototype.dispose=function(){this._uninstallResolutionListener(),this._window=null},Object.defineProperty(t.prototype,"value",{get:function(){return this._window.devicePixelRatio},enumerable:!1,configurable:!0}),t.prototype.subscribe=function(t){var i=this,s={next:t};return this._observers.push(s),{unsubscribe:function(){i._observers=i._observers.filter((function(t){return t!==s}))}}},t.prototype._installResolutionListener=function(){if(null!==this._resolutionMediaQueryList)throw new Error("Resolution listener is already installed");var t=this._window.devicePixelRatio;this._resolutionMediaQueryList=this._window.matchMedia("all and (resolution: ".concat(t,"dppx)")),this._resolutionMediaQueryList.addListener(this._resolutionListener)},t.prototype._uninstallResolutionListener=function(){null!==this._resolutionMediaQueryList&&(this._resolutionMediaQueryList.removeListener(this._resolutionListener),this._resolutionMediaQueryList=null)},t.prototype._reinstallResolutionListener=function(){this._uninstallResolutionListener(),this._installResolutionListener()},t.prototype._onResolutionChanged=function(){var t=this;this._observers.forEach((function(i){return i.next(t._window.devicePixelRatio)})),this._reinstallResolutionListener()},t}();var ss=function(){function t(t,i,s){var n;this._canvasElement=null,this._bitmapSizeChangedListeners=[],this._suggestedBitmapSize=null,this._suggestedBitmapSizeChangedListeners=[],this._devicePixelRatioObservable=null,this._canvasElementResizeObserver=null,this._canvasElement=t,this._canvasElementClientSize=Qi({width:this._canvasElement.clientWidth,height:this._canvasElement.clientHeight}),this._transformBitmapSize=null!=i?i:function(t){return t},this._allowResizeObserver=null===(n=null==s?void 0:s.allowResizeObserver)||void 0===n||n,this._chooseAndInitObserver()}return t.prototype.dispose=function(){var t,i;if(null===this._canvasElement)throw new Error("Object is disposed");null===(t=this._canvasElementResizeObserver)||void 0===t||t.disconnect(),this._canvasElementResizeObserver=null,null===(i=this._devicePixelRatioObservable)||void 0===i||i.dispose(),this._devicePixelRatioObservable=null,this._suggestedBitmapSizeChangedListeners.length=0,this._bitmapSizeChangedListeners.length=0,this._canvasElement=null},Object.defineProperty(t.prototype,"canvasElement",{get:function(){if(null===this._canvasElement)throw new Error("Object is disposed");return this._canvasElement},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"canvasElementClientSize",{get:function(){return this._canvasElementClientSize},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"bitmapSize",{get:function(){return Qi({width:this.canvasElement.width,height:this.canvasElement.height})},enumerable:!1,configurable:!0}),t.prototype.resizeCanvasElement=function(t){this._canvasElementClientSize=Qi(t),this.canvasElement.style.width="".concat(this._canvasElementClientSize.width,"px"),this.canvasElement.style.height="".concat(this._canvasElementClientSize.height,"px"),this._invalidateBitmapSize()},t.prototype.subscribeBitmapSizeChanged=function(t){this._bitmapSizeChangedListeners.push(t)},t.prototype.unsubscribeBitmapSizeChanged=function(t){this._bitmapSizeChangedListeners=this._bitmapSizeChangedListeners.filter((function(i){return i!==t}))},Object.defineProperty(t.prototype,"suggestedBitmapSize",{get:function(){return this._suggestedBitmapSize},enumerable:!1,configurable:!0}),t.prototype.subscribeSuggestedBitmapSizeChanged=function(t){this._suggestedBitmapSizeChangedListeners.push(t)},t.prototype.unsubscribeSuggestedBitmapSizeChanged=function(t){this._suggestedBitmapSizeChangedListeners=this._suggestedBitmapSizeChangedListeners.filter((function(i){return i!==t}))},t.prototype.applySuggestedBitmapSize=function(){if(null!==this._suggestedBitmapSize){var t=this._suggestedBitmapSize;this._suggestedBitmapSize=null,this._resizeBitmap(t),this._emitSuggestedBitmapSizeChanged(t,this._suggestedBitmapSize)}},t.prototype._resizeBitmap=function(t){var i=this.bitmapSize;ts(i,t)||(this.canvasElement.width=t.width,this.canvasElement.height=t.height,this._emitBitmapSizeChanged(i,t))},t.prototype._emitBitmapSizeChanged=function(t,i){var s=this;this._bitmapSizeChangedListeners.forEach((function(n){return n.call(s,t,i)}))},t.prototype._suggestNewBitmapSize=function(t){var i=this._suggestedBitmapSize,s=Qi(this._transformBitmapSize(t,this._canvasElementClientSize)),n=ts(this.bitmapSize,s)?null:s;null===i&&null===n||null!==i&&null!==n&&ts(i,n)||(this._suggestedBitmapSize=n,this._emitSuggestedBitmapSizeChanged(i,n))},t.prototype._emitSuggestedBitmapSizeChanged=function(t,i){var s=this;this._suggestedBitmapSizeChangedListeners.forEach((function(n){return n.call(s,t,i)}))},t.prototype._chooseAndInitObserver=function(){var t=this;this._allowResizeObserver?new Promise((function(t){var i=new ResizeObserver((function(s){t(s.every((function(t){return"devicePixelContentBoxSize"in t}))),i.disconnect()}));i.observe(document.body,{box:"device-pixel-content-box"})})).catch((function(){return!1})).then((function(i){return i?t._initResizeObserver():t._initDevicePixelRatioObservable()})):this._initDevicePixelRatioObservable()},t.prototype._initDevicePixelRatioObservable=function(){var t=this;if(null!==this._canvasElement){var i=ns(this._canvasElement);if(null===i)throw new Error("No window is associated with the canvas");this._devicePixelRatioObservable=function(t){return new is(t)}(i),this._devicePixelRatioObservable.subscribe((function(){return t._invalidateBitmapSize()})),this._invalidateBitmapSize()}},t.prototype._invalidateBitmapSize=function(){var t,i;if(null!==this._canvasElement){var s=ns(this._canvasElement);if(null!==s){var n=null!==(i=null===(t=this._devicePixelRatioObservable)||void 0===t?void 0:t.value)&&void 0!==i?i:s.devicePixelRatio,e=this._canvasElement.getClientRects(),r=void 0!==e[0]?function(t,i){return Qi({width:Math.round(t.left*i+t.width*i)-Math.round(t.left*i),height:Math.round(t.top*i+t.height*i)-Math.round(t.top*i)})}(e[0],n):Qi({width:this._canvasElementClientSize.width*n,height:this._canvasElementClientSize.height*n});this._suggestNewBitmapSize(r)}}},t.prototype._initResizeObserver=function(){var t=this;null!==this._canvasElement&&(this._canvasElementResizeObserver=new ResizeObserver((function(i){var s=i.find((function(i){return i.target===t._canvasElement}));if(s&&s.devicePixelContentBoxSize&&s.devicePixelContentBoxSize[0]){var n=s.devicePixelContentBoxSize[0],e=Qi({width:n.inlineSize,height:n.blockSize});t._suggestNewBitmapSize(e)}})),this._canvasElementResizeObserver.observe(this._canvasElement,{box:"device-pixel-content-box"}))},t}();function ns(t){return t.ownerDocument.defaultView}var es=function(){function t(t,i,s){if(0===i.width||0===i.height)throw new TypeError("Rendering target could only be created on a media with positive width and height");if(this._mediaSize=i,0===s.width||0===s.height)throw new TypeError("Rendering target could only be created using a bitmap with positive integer width and height");this._bitmapSize=s,this._context=t}return t.prototype.useMediaCoordinateSpace=function(t){try{return this._context.save(),this._context.setTransform(1,0,0,1,0,0),this._context.scale(this._horizontalPixelRatio,this._verticalPixelRatio),t({context:this._context,mediaSize:this._mediaSize})}finally{this._context.restore()}},t.prototype.useBitmapCoordinateSpace=function(t){try{return this._context.save(),this._context.setTransform(1,0,0,1,0,0),t({context:this._context,mediaSize:this._mediaSize,bitmapSize:this._bitmapSize,horizontalPixelRatio:this._horizontalPixelRatio,verticalPixelRatio:this._verticalPixelRatio})}finally{this._context.restore()}},Object.defineProperty(t.prototype,"_horizontalPixelRatio",{get:function(){return this._bitmapSize.width/this._mediaSize.width},enumerable:!1,configurable:!0}),Object.defineProperty(t.prototype,"_verticalPixelRatio",{get:function(){return this._bitmapSize.height/this._mediaSize.height},enumerable:!1,configurable:!0}),t}();function rs(t,i){var s=t.canvasElementClientSize;if(0===s.width||0===s.height)return null;var n=t.bitmapSize;if(0===n.width||0===n.height)return null;var e=t.canvasElement.getContext("2d",i);return null===e?null:new es(e,s,n)}const hs="undefined"!=typeof window;function as(){return!!hs&&window.navigator.userAgent.toLowerCase().indexOf("firefox")>-1}function ls(){return!!hs&&/iPhone|iPad|iPod/.test(window.navigator.platform)}function os(t){return t+t%2}function _s(t){hs&&void 0!==window.chrome&&t.addEventListener("mousedown",(t=>{if(1===t.button)return t.preventDefault(),!1}))}class us{constructor(t,i,s){this.ld=0,this.od=null,this._d={_t:Number.NEGATIVE_INFINITY,ut:Number.POSITIVE_INFINITY},this.ud=0,this.dd=null,this.fd={_t:Number.NEGATIVE_INFINITY,ut:Number.POSITIVE_INFINITY},this.pd=null,this.vd=!1,this.md=null,this.wd=null,this.gd=!1,this.Md=!1,this.bd=!1,this.xd=null,this.Sd=null,this.Cd=null,this.Pd=null,this.yd=null,this.kd=null,this.Td=null,this.Rd=0,this.Dd=!1,this.Ed=!1,this.Vd=!1,this.Bd=0,this.Id=null,this.Ad=!ls(),this.zd=t=>{this.Od(t)},this.Ld=t=>{if(this.Nd(t)){const i=this.Fd(t);if(++this.ud,this.dd&&this.ud>1){const{Wd:s}=this.Hd(fs(t),this.fd);s<30&&!this.bd&&this.Ud(i,this.jd.$d),this.qd()}}else{const i=this.Fd(t);if(++this.ld,this.od&&this.ld>1){const{Wd:s}=this.Hd(fs(t),this._d);s<5&&!this.Md&&this.Yd(i,this.jd.Kd),this.Xd()}}},this.Zd=t,this.jd=i,this.Ps=s,this.Gd()}m(){null!==this.xd&&(this.xd(),this.xd=null),null!==this.Sd&&(this.Sd(),this.Sd=null),null!==this.Pd&&(this.Pd(),this.Pd=null),null!==this.yd&&(this.yd(),this.yd=null),null!==this.kd&&(this.kd(),this.kd=null),null!==this.Cd&&(this.Cd(),this.Cd=null),this.Jd(),this.Xd()}Qd(t){this.Pd&&this.Pd();const i=this.tf.bind(this);if(this.Pd=()=>{this.Zd.removeEventListener("mousemove",i)},this.Zd.addEventListener("mousemove",i),this.Nd(t))return;const s=this.Fd(t);this.Yd(s,this.jd.if),this.Ad=!0}Xd(){null!==this.od&&clearTimeout(this.od),this.ld=0,this.od=null,this._d={_t:Number.NEGATIVE_INFINITY,ut:Number.POSITIVE_INFINITY}}qd(){null!==this.dd&&clearTimeout(this.dd),this.ud=0,this.dd=null,this.fd={_t:Number.NEGATIVE_INFINITY,ut:Number.POSITIVE_INFINITY}}tf(t){if(this.Vd||null!==this.wd)return;if(this.Nd(t))return;const i=this.Fd(t);this.Yd(i,this.jd.sf),this.Ad=!0}nf(t){const i=vs(t.changedTouches,a(this.Id));if(null===i)return;if(this.Bd=ps(t),null!==this.Td)return;if(this.Ed)return;this.Dd=!0;const s=this.Hd(fs(i),a(this.wd)),{ef:n,rf:e,Wd:r}=s;if(this.gd||!(r<5)){if(!this.gd){const t=.5*n,i=e>=t&&!this.Ps.hf(),s=t>e&&!this.Ps.af();i||s||(this.Ed=!0),this.gd=!0,this.bd=!0,this.Jd(),this.qd()}if(!this.Ed){const s=this.Fd(t,i);this.Ud(s,this.jd.lf),ds(t)}}}_f(t){if(0!==t.button)return;const i=this.Hd(fs(t),a(this.md)),{Wd:s}=i;if(s>=5&&(this.Md=!0,this.Xd()),this.Md){const i=this.Fd(t);this.Yd(i,this.jd.uf)}}Hd(t,i){const s=Math.abs(i._t-t._t),n=Math.abs(i.ut-t.ut);return{ef:s,rf:n,Wd:s+n}}cf(t){let i=vs(t.changedTouches,a(this.Id));if(null===i&&0===t.touches.length&&(i=t.changedTouches[0]),null===i)return;this.Id=null,this.Bd=ps(t),this.Jd(),this.wd=null,this.kd&&(this.kd(),this.kd=null);const s=this.Fd(t,i);if(this.Ud(s,this.jd.df),++this.ud,this.dd&&this.ud>1){const{Wd:t}=this.Hd(fs(i),this.fd);t<30&&!this.bd&&this.Ud(s,this.jd.$d),this.qd()}else this.bd||(this.Ud(s,this.jd.ff),this.jd.ff&&ds(t));0===this.ud&&ds(t),0===t.touches.length&&this.vd&&(this.vd=!1,ds(t))}Od(t){if(0!==t.button)return;const i=this.Fd(t);if(this.md=null,this.Vd=!1,this.yd&&(this.yd(),this.yd=null),as()){this.Zd.ownerDocument.documentElement.removeEventListener("mouseleave",this.zd)}if(!this.Nd(t))if(this.Yd(i,this.jd.pf),++this.ld,this.od&&this.ld>1){const{Wd:s}=this.Hd(fs(t),this._d);s<5&&!this.Md&&this.Yd(i,this.jd.Kd),this.Xd()}else this.Md||this.Yd(i,this.jd.vf)}Jd(){null!==this.pd&&(clearTimeout(this.pd),this.pd=null)}mf(t){if(null!==this.Id)return;const i=t.changedTouches[0];this.Id=i.identifier,this.Bd=ps(t);const s=this.Zd.ownerDocument.documentElement;this.bd=!1,this.gd=!1,this.Ed=!1,this.wd=fs(i),this.kd&&(this.kd(),this.kd=null);{const i=this.nf.bind(this),n=this.cf.bind(this);this.kd=()=>{s.removeEventListener("touchmove",i),s.removeEventListener("touchend",n)},s.addEventListener("touchmove",i,{passive:!1}),s.addEventListener("touchend",n,{passive:!1}),this.Jd(),this.pd=setTimeout(this.wf.bind(this,t),240)}const n=this.Fd(t,i);this.Ud(n,this.jd.gf),this.dd||(this.ud=0,this.dd=setTimeout(this.qd.bind(this),500),this.fd=fs(i))}Mf(t){if(0!==t.button)return;const i=this.Zd.ownerDocument.documentElement;as()&&i.addEventListener("mouseleave",this.zd),this.Md=!1,this.md=fs(t),this.yd&&(this.yd(),this.yd=null);{const t=this._f.bind(this),s=this.Od.bind(this);this.yd=()=>{i.removeEventListener("mousemove",t),i.removeEventListener("mouseup",s)},i.addEventListener("mousemove",t),i.addEventListener("mouseup",s)}if(this.Vd=!0,this.Nd(t))return;const s=this.Fd(t);this.Yd(s,this.jd.bf),this.od||(this.ld=0,this.od=setTimeout(this.Xd.bind(this),500),this._d=fs(t))}Gd(){this.Zd.addEventListener("mouseenter",this.Qd.bind(this)),this.Zd.addEventListener("touchcancel",this.Jd.bind(this));{const t=this.Zd.ownerDocument,i=t=>{this.jd.xf&&(t.composed&&this.Zd.contains(t.composedPath()[0])||t.target&&this.Zd.contains(t.target)||this.jd.xf())};this.Sd=()=>{t.removeEventListener("touchstart",i)},this.xd=()=>{t.removeEventListener("mousedown",i)},t.addEventListener("mousedown",i),t.addEventListener("touchstart",i,{passive:!0})}ls()&&(this.Cd=()=>{this.Zd.removeEventListener("dblclick",this.Ld)},this.Zd.addEventListener("dblclick",this.Ld)),this.Zd.addEventListener("mouseleave",this.Sf.bind(this)),this.Zd.addEventListener("touchstart",this.mf.bind(this),{passive:!0}),_s(this.Zd),this.Zd.addEventListener("mousedown",this.Mf.bind(this)),this.Cf(),this.Zd.addEventListener("touchmove",(()=>{}),{passive:!1})}Cf(){void 0===this.jd.Pf&&void 0===this.jd.yf&&void 0===this.jd.kf||(this.Zd.addEventListener("touchstart",(t=>this.Tf(t.touches)),{passive:!0}),this.Zd.addEventListener("touchmove",(t=>{if(2===t.touches.length&&null!==this.Td&&void 0!==this.jd.yf){const i=cs(t.touches[0],t.touches[1])/this.Rd;this.jd.yf(this.Td,i),ds(t)}}),{passive:!1}),this.Zd.addEventListener("touchend",(t=>{this.Tf(t.touches)})))}Tf(t){1===t.length&&(this.Dd=!1),2!==t.length||this.Dd||this.vd?this.Rf():this.Df(t)}Df(t){const i=this.Zd.getBoundingClientRect()||{left:0,top:0};this.Td={_t:(t[0].clientX-i.left+(t[1].clientX-i.left))/2,ut:(t[0].clientY-i.top+(t[1].clientY-i.top))/2},this.Rd=cs(t[0],t[1]),void 0!==this.jd.Pf&&this.jd.Pf(),this.Jd()}Rf(){null!==this.Td&&(this.Td=null,void 0!==this.jd.kf&&this.jd.kf())}Sf(t){if(this.Pd&&this.Pd(),this.Nd(t))return;if(!this.Ad)return;const i=this.Fd(t);this.Yd(i,this.jd.Ef),this.Ad=!ls()}wf(t){const i=vs(t.touches,a(this.Id));if(null===i)return;const s=this.Fd(t,i);this.Ud(s,this.jd.Vf),this.bd=!0,this.vd=!0}Nd(t){return t.sourceCapabilities&&void 0!==t.sourceCapabilities.firesTouchEvents?t.sourceCapabilities.firesTouchEvents:ps(t)<this.Bd+500}Ud(t,i){i&&i.call(this.jd,t)}Yd(t,i){i&&i.call(this.jd,t)}Fd(t,i){const s=i||t,n=this.Zd.getBoundingClientRect()||{left:0,top:0};return{clientX:s.clientX,clientY:s.clientY,pageX:s.pageX,pageY:s.pageY,screenX:s.screenX,screenY:s.screenY,localX:s.clientX-n.left,localY:s.clientY-n.top,ctrlKey:t.ctrlKey,altKey:t.altKey,shiftKey:t.shiftKey,metaKey:t.metaKey,Bf:!t.type.startsWith("mouse")&&"contextmenu"!==t.type&&"click"!==t.type,If:t.type,Af:s.target,a_:t.view,zf:()=>{"touchstart"!==t.type&&ds(t)}}}}function cs(t,i){const s=t.clientX-i.clientX,n=t.clientY-i.clientY;return Math.sqrt(s*s+n*n)}function ds(t){t.cancelable&&t.preventDefault()}function fs(t){return{_t:t.pageX,ut:t.pageY}}function ps(t){return t.timeStamp||performance.now()}function vs(t,i){for(let s=0;s<t.length;++s)if(t[s].identifier===i)return t[s];return null}class ms{constructor(t,i,s){this.Of=null,this.Lf=null,this.Nf=!0,this.Ff=null,this.Wf=t,this.Hf=t.Uf()[i],this.$f=t.Uf()[s],this.jf=document.createElement("tr"),this.jf.style.height="1px",this.qf=document.createElement("td"),this.qf.style.position="relative",this.qf.style.padding="0",this.qf.style.margin="0",this.qf.setAttribute("colspan","3"),this.Yf(),this.jf.appendChild(this.qf),this.Nf=this.Wf.N().layout.panes.enableResize,this.Nf?this.Kf():(this.Of=null,this.Lf=null)}m(){null!==this.Lf&&this.Lf.m()}Xf(){return this.jf}Zf(){return Qi({width:this.Hf.Zf().width,height:1})}Gf(){return Qi({width:this.Hf.Gf().width,height:1*window.devicePixelRatio})}Jf(t,i,s){const n=this.Gf();t.fillStyle=this.Wf.N().layout.panes.separatorColor,t.fillRect(i,s,n.width,n.height)}yt(){this.Yf(),this.Wf.N().layout.panes.enableResize!==this.Nf&&(this.Nf=this.Wf.N().layout.panes.enableResize,this.Nf?this.Kf():(null!==this.Of&&(this.qf.removeChild(this.Of.Qf),this.qf.removeChild(this.Of.tp),this.Of=null),null!==this.Lf&&(this.Lf.m(),this.Lf=null)))}Kf(){const t=document.createElement("div"),i=t.style;i.position="fixed",i.display="none",i.zIndex="49",i.top="0",i.left="0",i.width="100%",i.height="100%",i.cursor="row-resize",this.qf.appendChild(t);const s=document.createElement("div"),n=s.style;n.position="absolute",n.zIndex="50",n.top="-4px",n.height="9px",n.width="100%",n.backgroundColor="",n.cursor="row-resize",this.qf.appendChild(s);const e={if:this.ip.bind(this),Ef:this.sp.bind(this),bf:this.np.bind(this),gf:this.np.bind(this),uf:this.ep.bind(this),lf:this.ep.bind(this),pf:this.rp.bind(this),df:this.rp.bind(this)};this.Lf=new us(s,e,{hf:()=>!1,af:()=>!0}),this.Of={tp:s,Qf:t}}Yf(){this.qf.style.background=this.Wf.N().layout.panes.separatorColor}ip(t){null!==this.Of&&(this.Of.tp.style.backgroundColor=this.Wf.N().layout.panes.separatorHoverColor)}sp(t){null!==this.Of&&null===this.Ff&&(this.Of.tp.style.backgroundColor="")}np(t){if(null===this.Of)return;const i=this.Hf.hp().Vo()+this.$f.hp().Vo(),s=i/(this.Hf.Zf().height+this.$f.Zf().height),n=30*s;i<=2*n||(this.Ff={ap:t.pageY,lp:this.Hf.hp().Vo(),op:i-n,_p:i,up:s,cp:n},this.Of.Qf.style.display="block")}ep(t){const i=this.Ff;if(null===i)return;const s=(t.pageY-i.ap)*i.up,n=Yt(i.lp+s,i.cp,i.op);this.Hf.hp().Bo(n),this.$f.hp().Bo(i._p-n),this.Wf.Qt().Bh()}rp(t){null!==this.Ff&&null!==this.Of&&(this.Ff=null,this.Of.Qf.style.display="none")}}function ws(t,i){return t.dp-i.dp}function gs(t,i,s){const n=(t.dp-i.dp)/(t.wt-i.wt);return Math.sign(n)*Math.min(Math.abs(n),s)}class Ms{constructor(t,i,s,n){this.fp=null,this.pp=null,this.vp=null,this.mp=null,this.wp=null,this.gp=0,this.Mp=0,this.bp=t,this.xp=i,this.Sp=s,this.Mn=n}Cp(t,i){if(null!==this.fp){if(this.fp.wt===i)return void(this.fp.dp=t);if(Math.abs(this.fp.dp-t)<this.Mn)return}this.mp=this.vp,this.vp=this.pp,this.pp=this.fp,this.fp={wt:i,dp:t}}le(t,i){if(null===this.fp||null===this.pp)return;if(i-this.fp.wt>50)return;let s=0;const n=gs(this.fp,this.pp,this.xp),e=ws(this.fp,this.pp),r=[n],h=[e];if(s+=e,null!==this.vp){const t=gs(this.pp,this.vp,this.xp);if(Math.sign(t)===Math.sign(n)){const i=ws(this.pp,this.vp);if(r.push(t),h.push(i),s+=i,null!==this.mp){const t=gs(this.vp,this.mp,this.xp);if(Math.sign(t)===Math.sign(n)){const i=ws(this.vp,this.mp);r.push(t),h.push(i),s+=i}}}}let a=0;for(let t=0;t<r.length;++t)a+=h[t]/s*r[t];Math.abs(a)<this.bp||(this.wp={dp:t,wt:i},this.Mp=a,this.gp=function(t,i){const s=Math.log(i);return Math.log(1*s/-t)/s}(Math.abs(a),this.Sp))}Ru(t){const i=a(this.wp),s=t-i.wt;return i.dp+this.Mp*(Math.pow(this.Sp,s)-1)/Math.log(this.Sp)}Tu(t){return null===this.wp||this.Pp(t)===this.gp}Pp(t){const i=t-a(this.wp).wt;return Math.min(i,this.gp)}}class bs{constructor(t,i){this.yp=void 0,this.kp=void 0,this.Tp=void 0,this.ps=!1,this.Rp=t,this.Dp=i,this.Ep()}yt(){this.Ep()}Vp(){this.yp&&this.Rp.removeChild(this.yp),this.kp&&this.Rp.removeChild(this.kp),this.yp=void 0,this.kp=void 0}Bp(){return this.ps!==this.Ip()||this.Tp!==this.Ap()}Ap(){return this.Dp.Qt().Xi().J(this.Dp.N().layout.textColor)>160?"dark":"light"}Ip(){return this.Dp.N().layout.attributionLogo}zp(){const t=new URL(location.href);return t.hostname?"&utm_source="+t.hostname+t.pathname:""}Ep(){this.Bp()&&(this.Vp(),this.ps=this.Ip(),this.ps&&(this.Tp=this.Ap(),this.kp=document.createElement("style"),this.kp.innerText="a#tv-attr-logo{--fill:#131722;--stroke:#fff;position:absolute;left:10px;bottom:10px;height:19px;width:35px;margin:0;padding:0;border:0;z-index:3;}a#tv-attr-logo[data-dark]{--fill:#D1D4DC;--stroke:#131722;}",this.yp=document.createElement("a"),this.yp.href=`https://www.tradingview.com/?utm_medium=lwc-link&utm_campaign=lwc-chart${this.zp()}`,this.yp.title="Charting by TradingView",this.yp.id="tv-attr-logo",this.yp.target="_blank",this.yp.innerHTML='<svg xmlns="http://www.w3.org/2000/svg" width="35" height="19" fill="none"><g fill-rule="evenodd" clip-path="url(#a)" clip-rule="evenodd"><path fill="var(--stroke)" d="M2 0H0v10h6v9h21.4l.5-1.3 6-15 1-2.7H23.7l-.5 1.3-.2.6a5 5 0 0 0-7-.9V0H2Zm20 17h4l5.2-13 .8-2h-7l-1 2.5-.2.5-1.5 3.8-.3.7V17Zm-.8-10a3 3 0 0 0 .7-2.7A3 3 0 1 0 16.8 7h4.4ZM14 7V2H2v6h6v9h4V7h2Z"/><path fill="var(--fill)" d="M14 2H2v6h6v9h6V2Zm12 15h-7l6-15h7l-6 15Zm-7-9a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"/></g><defs><clipPath id="a"><path fill="var(--stroke)" d="M0 0h35v19H0z"/></clipPath></defs></svg>',this.yp.toggleAttribute("data-dark","dark"===this.Tp),this.Rp.appendChild(this.kp),this.Rp.appendChild(this.yp)))}}function xs(t,i){const s=a(t.ownerDocument).createElement("canvas");t.appendChild(s);const n=new ss(s,(e={options:{allowResizeObserver:!0},transform:(t,i)=>({width:Math.max(t.width,i.width),height:Math.max(t.height,i.height)})}).transform,e.options);var e;return n.resizeCanvasElement(i),n}function Ss(t){t.width=1,t.height=1,t.getContext("2d")?.clearRect(0,0,1,1)}function Cs(t,i,s,n){t.ih&&t.ih(i,s,n)}function Ps(t,i,s,n){t.nt(i,s,n)}function ys(t,i,s,n){const e=t(s,n);for(const t of e){const s=t.Tt(n);null!==s&&i(s)}}function ks(t,i){return s=>{if(!function(t){return void 0!==t.Ft}(s))return[];return(s.Ft()?.wa()??"")!==i?[]:s.ta?.(t)??[]}}function Ts(t,i,s,n){if(!t.length)return;let e=0;const r=t[0].$t(n,!0);let h=1===i?s/2-(t[0].Fi()-r/2):t[0].Fi()-r/2-s/2;h=Math.max(0,h);for(let r=1;r<t.length;r++){const a=t[r],l=t[r-1],o=l.$t(n,!1),_=a.Fi(),u=l.Fi();if(1===i?_>u-o:_<u+o){const n=u-o*i;a.Wi(n);const r=n-i*o/2;if((1===i?r<0:r>s)&&h>0){const n=1===i?-1-r:r-s,a=Math.min(n,h);for(let s=e;s<t.length;s++)t[s].Wi(t[s].Fi()+i*a);h-=a}}else e=r,h=1===i?u-o-_:_-(u+o)}}class Rs{constructor(t,i,s,n){this.qi=null,this.Op=null,this.Lp=!1,this.Np=new it(200),this.Fp=null,this.Wp=0,this.Hp=!1,this.Up=()=>{this.Hp||this.Pt.$p().Qt().ar()},this.jp=()=>{this.Hp||this.Pt.$p().Qt().ar()},this.Pt=t,this.Ps=i,this.bl=i.layout,this.Gu=s,this.qp="left"===n,this.Yp=ks("normal",n),this.Kp=ks("top",n),this.Xp=ks("bottom",n),this.qf=document.createElement("div"),this.qf.style.height="100%",this.qf.style.overflow="hidden",this.qf.style.width="25px",this.qf.style.left="0",this.qf.style.position="relative",this.Zp=xs(this.qf,Qi({width:16,height:16})),this.Zp.subscribeSuggestedBitmapSizeChanged(this.Up);const e=this.Zp.canvasElement;e.style.position="absolute",e.style.zIndex="1",e.style.left="0",e.style.top="0",this.Gp=xs(this.qf,Qi({width:16,height:16})),this.Gp.subscribeSuggestedBitmapSizeChanged(this.jp);const r=this.Gp.canvasElement;r.style.position="absolute",r.style.zIndex="2",r.style.left="0",r.style.top="0";const h={bf:this.np.bind(this),gf:this.np.bind(this),uf:this.ep.bind(this),lf:this.ep.bind(this),xf:this.Jp.bind(this),pf:this.rp.bind(this),df:this.rp.bind(this),Kd:this.Qp.bind(this),$d:this.Qp.bind(this),if:this.tv.bind(this),Ef:this.sp.bind(this)};this.Lf=new us(this.Gp.canvasElement,h,{hf:()=>!this.Ps.handleScroll.vertTouchDrag,af:()=>!0})}m(){this.Lf.m(),this.Gp.unsubscribeSuggestedBitmapSizeChanged(this.jp),Ss(this.Gp.canvasElement),this.Gp.dispose(),this.Zp.unsubscribeSuggestedBitmapSizeChanged(this.Up),Ss(this.Zp.canvasElement),this.Zp.dispose(),null!==this.qi&&this.qi.no().u(this),this.qi=null}Xf(){return this.qf}P(){return this.bl.fontSize}iv(){const t=this.Gu.N();return this.Fp!==t.k&&(this.Np.Vn(),this.Fp=t.k),t}sv(){if(null===this.qi)return 0;let t=0;const i=this.iv(),s=a(this.Zp.canvasElement.getContext("2d",{colorSpace:this.Pt.$p().N().layout.colorSpace}));s.save();const n=this.qi.Ea();s.font=this.nv(),n.length>0&&(t=Math.max(this.Np.Ei(s,n[0].Ga),this.Np.Ei(s,n[n.length-1].Ga)));const e=this.ev();for(let i=e.length;i--;){const n=this.Np.Ei(s,e[i].ri());n>t&&(t=n)}const r=this.qi.zt();if(null!==r&&null!==this.Op&&(2!==(h=this.Ps.crosshair).mode&&h.horzLine.visible&&h.horzLine.labelVisible)){const i=this.qi.Ts(1,r),n=this.qi.Ts(this.Op.height-2,r);t=Math.max(t,this.Np.Ei(s,this.qi.Zi(Math.floor(Math.min(i,n))+.11111111111111,r)),this.Np.Ei(s,this.qi.Zi(Math.ceil(Math.max(i,n))-.11111111111111,r)))}var h;s.restore();const l=t||34;return os(Math.ceil(i.S+i.C+i.B+i.I+5+l))}rv(t){null!==this.Op&&ts(this.Op,t)||(this.Op=t,this.Hp=!0,this.Zp.resizeCanvasElement(t),this.Gp.resizeCanvasElement(t),this.Hp=!1,this.qf.style.width=`${t.width}px`,this.qf.style.height=`${t.height}px`)}hv(){return a(this.Op).width}_s(t){this.qi!==t&&(null!==this.qi&&this.qi.no().u(this),this.qi=t,t.no().i(this.ul.bind(this),this))}Ft(){return this.qi}Vn(){const t=this.Pt.hp();this.Pt.$p().Qt().Zo(t,a(this.Ft()))}av(t){if(null===this.Op)return;const i={colorSpace:this.Pt.$p().N().layout.colorSpace};if(1!==t){this.lv(),this.Zp.applySuggestedBitmapSize();const t=rs(this.Zp,i);null!==t&&(t.useBitmapCoordinateSpace((t=>{this.ov(t),this._v(t)})),this.Pt.uv(t,this.Xp),this.cv(t),this.Pt.uv(t,this.Yp),this.dv(t))}this.Gp.applySuggestedBitmapSize();const s=rs(this.Gp,i);null!==s&&(s.useBitmapCoordinateSpace((({context:t,bitmapSize:i})=>{t.clearRect(0,0,i.width,i.height)})),this.fv(s),this.Pt.uv(s,this.Kp))}Gf(){return this.Zp.bitmapSize}Jf(t,i,s){const n=this.Gf();n.width>0&&n.height>0&&t.drawImage(this.Zp.canvasElement,i,s)}yt(){this.qi?.Ea()}np(t){if(null===this.qi||this.qi.Ki()||!this.Ps.handleScale.axisPressedMouseMove.price)return;const i=this.Pt.$p().Qt(),s=this.Pt.hp();this.Lp=!0,i.Uo(s,this.qi,t.localY)}ep(t){if(null===this.qi||!this.Ps.handleScale.axisPressedMouseMove.price)return;const i=this.Pt.$p().Qt(),s=this.Pt.hp(),n=this.qi;i.$o(s,n,t.localY)}Jp(){if(null===this.qi||!this.Ps.handleScale.axisPressedMouseMove.price)return;const t=this.Pt.$p().Qt(),i=this.Pt.hp(),s=this.qi;this.Lp&&(this.Lp=!1,t.jo(i,s))}rp(t){if(null===this.qi||!this.Ps.handleScale.axisPressedMouseMove.price)return;const i=this.Pt.$p().Qt(),s=this.Pt.hp();this.Lp=!1,i.jo(s,this.qi)}Qp(t){this.Ps.handleScale.axisDoubleClickReset.price&&this.Vn()}tv(t){if(null===this.qi)return;!this.Pt.$p().Qt().N().handleScale.axisPressedMouseMove.price||this.qi.Oe()||this.qi.El()||this.pv(1)}sp(t){this.pv(0)}ev(){const t=[],i=null===this.qi?void 0:this.qi;return(s=>{for(let n=0;n<s.length;++n){const e=s[n].Ws(this.Pt.hp(),i);for(let i=0;i<e.length;i++)t.push(e[i])}})(this.Pt.hp().Dt()),t}ov({context:t,bitmapSize:i}){const{width:s,height:n}=i,e=this.Pt.hp().Qt(),r=e.$(),h=e.Fc();r===h?B(t,0,0,s,n,r):z(t,0,0,s,n,r,h)}_v({context:t,bitmapSize:i,horizontalPixelRatio:s}){if(null===this.Op||null===this.qi||!this.qi.N().borderVisible)return;t.fillStyle=this.qi.N().borderColor;const n=Math.max(1,Math.floor(this.iv().S*s));let e;e=this.qp?i.width-n:0,t.fillRect(e,0,n,i.height)}cv(t){if(null===this.Op||null===this.qi)return;const i=this.qi.Ea(),s=this.qi.N(),n=this.iv(),e=this.qp?this.Op.width-n.C:0;s.borderVisible&&s.ticksVisible&&t.useBitmapCoordinateSpace((({context:t,horizontalPixelRatio:r,verticalPixelRatio:h})=>{t.fillStyle=s.borderColor;const a=Math.max(1,Math.floor(h)),l=Math.floor(.5*h),o=Math.round(n.C*r);t.beginPath();for(const s of i)t.rect(Math.floor(e*r),Math.round(s.ya*h)-l,o,a);t.fill()})),t.useMediaCoordinateSpace((({context:t})=>{t.font=this.nv(),t.fillStyle=s.textColor??this.bl.textColor,t.textAlign=this.qp?"right":"left",t.textBaseline="middle";const r=this.qp?Math.round(e-n.B):Math.round(e+n.C+n.B),h=i.map((i=>this.Np.Di(t,i.Ga)));for(let s=i.length;s--;){const n=i[s];t.fillText(n.Ga,r,n.ya+h[s])}}))}lv(){if(null===this.Op||null===this.qi)return;let t=this.Op.height/2;const i=[],s=this.qi.Dt().slice(),n=this.Pt.hp(),e=this.iv();this.qi===n.$n()&&this.Pt.hp().Dt().forEach((t=>{n.Un(t)&&s.push(t)}));const r=this.qi.ba()[0],h=this.qi;s.forEach((s=>{const e=s.Ws(n,h);e.forEach((t=>{t.Wi(null),t.Hi()&&i.push(t)})),r===s&&e.length>0&&(t=e[0].Bi())})),i.forEach((t=>t.Wi(t.Bi())));this.qi.N().alignLabels&&this.vv(i,e,t)}vv(t,i,s){if(null===this.Op)return;const n=t.filter((t=>t.Bi()<=s)),e=t.filter((t=>t.Bi()>s));n.sort(((t,i)=>i.Bi()-t.Bi())),n.length&&e.length&&e.push(n[0]),e.sort(((t,i)=>t.Bi()-i.Bi()));for(const s of t){const t=Math.floor(s.$t(i)/2),n=s.Bi();n>-t&&n<t&&s.Wi(t),n>this.Op.height-t&&n<this.Op.height+t&&s.Wi(this.Op.height-t)}Ts(n,1,this.Op.height,i),Ts(e,-1,this.Op.height,i)}dv(t){if(null===this.Op)return;const i=this.ev(),s=this.iv(),n=this.qp?"right":"left";i.forEach((i=>{if(i.Ui()){i.Tt(a(this.qi)).nt(t,s,this.Np,n)}}))}fv(t){if(null===this.Op||null===this.qi)return;const i=this.Pt.$p().Qt(),s=[],n=this.Pt.hp(),e=i._c().Ws(n,this.qi);e.length&&s.push(e);const r=this.iv(),h=this.qp?"right":"left";s.forEach((i=>{i.forEach((i=>{i.Tt(a(this.qi)).nt(t,r,this.Np,h)}))}))}pv(t){this.qf.style.cursor=1===t?"ns-resize":"default"}ul(){const t=this.sv();this.Wp<t&&this.Pt.$p().Qt().Bh(),this.Wp=t}nv(){return g(this.bl.fontSize,this.bl.fontFamily)}}function Ds(t,i){return t.Jh?.(i)??[]}function Es(t,i){return t.Fs?.(i)??[]}function Vs(t,i){return t.us?.(i)??[]}function Bs(t,i){return t.Xh?.(i)??[]}class Is{constructor(t,i){this.Op=Qi({width:0,height:0}),this.mv=null,this.wv=null,this.gv=null,this.Mv=null,this.bv=!1,this.xv=new o,this.Sv=new o,this.Cv=0,this.Pv=!1,this.yv=null,this.kv=!1,this.Tv=null,this.Rv=null,this.Hp=!1,this.Up=()=>{this.Hp||null===this.Dv||this.ts().ar()},this.jp=()=>{this.Hp||null===this.Dv||this.ts().ar()},this.Dp=t,this.Dv=i,this.Dv.t_().i(this.Ev.bind(this),this,!0),this.Vv=document.createElement("td"),this.Vv.style.padding="0",this.Vv.style.position="relative";const s=document.createElement("div");s.style.width="100%",s.style.height="100%",s.style.position="relative",s.style.overflow="hidden",this.Bv=document.createElement("td"),this.Bv.style.padding="0",this.Iv=document.createElement("td"),this.Iv.style.padding="0",this.Vv.appendChild(s),this.Zp=xs(s,Qi({width:16,height:16})),this.Zp.subscribeSuggestedBitmapSizeChanged(this.Up);const n=this.Zp.canvasElement;n.style.position="absolute",n.style.zIndex="1",n.style.left="0",n.style.top="0",this.Gp=xs(s,Qi({width:16,height:16})),this.Gp.subscribeSuggestedBitmapSizeChanged(this.jp);const e=this.Gp.canvasElement;e.style.position="absolute",e.style.zIndex="2",e.style.left="0",e.style.top="0",this.jf=document.createElement("tr"),this.jf.appendChild(this.Bv),this.jf.appendChild(this.Vv),this.jf.appendChild(this.Iv),this.Av(),this.Lf=new us(this.Gp.canvasElement,this,{hf:()=>null===this.yv&&!this.Dp.N().handleScroll.vertTouchDrag,af:()=>null===this.yv&&!this.Dp.N().handleScroll.horzTouchDrag})}m(){null!==this.mv&&this.mv.m(),null!==this.wv&&this.wv.m(),this.gv=null,this.Gp.unsubscribeSuggestedBitmapSizeChanged(this.jp),Ss(this.Gp.canvasElement),this.Gp.dispose(),this.Zp.unsubscribeSuggestedBitmapSizeChanged(this.Up),Ss(this.Zp.canvasElement),this.Zp.dispose(),null!==this.Dv&&(this.Dv.t_().u(this),this.Dv.m()),this.Lf.m()}hp(){return a(this.Dv)}zv(t){null!==this.Dv&&this.Dv.t_().u(this),this.Dv=t,null!==this.Dv&&this.Dv.t_().i(Is.prototype.Ev.bind(this),this,!0),this.Av(),this.Dp.Uf().indexOf(this)===this.Dp.Uf().length-1?(this.gv=this.gv??new bs(this.Vv,this.Dp),this.gv.yt()):(this.gv?.Vp(),this.gv=null)}$p(){return this.Dp}Xf(){return this.jf}Av(){if(null!==this.Dv&&(this.Ov(),0!==this.ts().Ys().length)){if(null!==this.mv){const t=this.Dv.Wo();this.mv._s(a(t))}if(null!==this.wv){const t=this.Dv.Ho();this.wv._s(a(t))}}}Lv(){null!==this.mv&&this.mv.yt(),null!==this.wv&&this.wv.yt()}Vo(){return null!==this.Dv?this.Dv.Vo():0}Bo(t){this.Dv&&this.Dv.Bo(t)}if(t){if(!this.Dv)return;this.Nv();const i=t.localX,s=t.localY;this.Fv(i,s,t)}bf(t){this.Nv(),this.Wv(),this.Fv(t.localX,t.localY,t)}sf(t){if(!this.Dv)return;this.Nv();const i=t.localX,s=t.localY;this.Fv(i,s,t)}vf(t){null!==this.Dv&&(this.Nv(),this.Hv(t))}Kd(t){null!==this.Dv&&this.Uv(this.Sv,t)}$d(t){this.Kd(t)}uf(t){this.Nv(),this.$v(t),this.Fv(t.localX,t.localY,t)}pf(t){null!==this.Dv&&(this.Nv(),this.Pv=!1,this.jv(t))}ff(t){null!==this.Dv&&this.Hv(t)}Vf(t){if(this.Pv=!0,null===this.yv){const i={x:t.localX,y:t.localY};this.qv(i,i,t)}}Ef(t){null!==this.Dv&&(this.Nv(),this.Dv.Qt().ac(null),this.Yv())}Kv(){return this.xv}Xv(){return this.Sv}Pf(){this.Cv=1,this.ts().hn()}yf(t,i){if(!this.Dp.N().handleScale.pinch)return;const s=5*(i-this.Cv);this.Cv=i,this.ts().Mc(t._t,s)}gf(t){this.Pv=!1,this.kv=null!==this.yv,this.Wv();const i=this.ts()._c();null!==this.yv&&i.Et()&&(this.Tv={x:i.si(),y:i.ni()},this.yv={x:t.localX,y:t.localY})}lf(t){if(null===this.Dv)return;const i=t.localX,s=t.localY;if(null===this.yv)this.$v(t);else{this.kv=!1;const n=a(this.Tv),e=n.x+(i-this.yv.x),r=n.y+(s-this.yv.y);this.Fv(e,r,t)}}df(t){0===this.$p().N().trackingMode.exitMode&&(this.kv=!0),this.Zv(),this.jv(t)}Yn(t,i){const s=this.Dv;return null===s?null:bi(s,t,i)}Gv(t,i){a("left"===i?this.mv:this.wv).rv(Qi({width:t,height:this.Op.height}))}Zf(){return this.Op}rv(t){ts(this.Op,t)||(this.Op=t,this.Hp=!0,this.Zp.resizeCanvasElement(t),this.Gp.resizeCanvasElement(t),this.Hp=!1,this.Vv.style.width=t.width+"px",this.Vv.style.height=t.height+"px")}Jv(){const t=a(this.Dv);t.Fo(t.Wo()),t.Fo(t.Ho());for(const i of t.ba())if(t.Un(i)){const s=i.Ft();null!==s&&t.Fo(s),i.Ns()}for(const i of t.s_())i.Ns()}Gf(){return this.Zp.bitmapSize}Jf(t,i,s){const n=this.Gf();n.width>0&&n.height>0&&t.drawImage(this.Zp.canvasElement,i,s)}av(t){if(0===t)return;if(null===this.Dv)return;t>1&&this.Jv(),null!==this.mv&&this.mv.av(t),null!==this.wv&&this.wv.av(t);const i={colorSpace:this.Dp.N().layout.colorSpace};if(1!==t){this.Zp.applySuggestedBitmapSize();const t=rs(this.Zp,i);null!==t&&(t.useBitmapCoordinateSpace((t=>{this.ov(t)})),this.Dv&&(this.Qv(t,Ds),this.tm(t),this.Qv(t,Es),this.Qv(t,Vs)))}this.Gp.applySuggestedBitmapSize();const s=rs(this.Gp,i);null!==s&&(s.useBitmapCoordinateSpace((({context:t,bitmapSize:i})=>{t.clearRect(0,0,i.width,i.height)})),this.im(s),this.Qv(s,Bs),this.Qv(s,Vs))}sm(){return this.mv}nm(){return this.wv}uv(t,i){this.Qv(t,i)}Ev(){null!==this.Dv&&this.Dv.t_().u(this),this.Dv=null}Hv(t){this.Uv(this.xv,t)}Uv(t,i){const s=i.localX,n=i.localY;t.v()&&t.p(this.ts().It().uu(s),{x:s,y:n},i)}ov({context:t,bitmapSize:i}){const{width:s,height:n}=i,e=this.ts(),r=e.$(),h=e.Fc();r===h?B(t,0,0,s,n,h):z(t,0,0,s,n,r,h)}tm(t){const i=a(this.Dv),s=i.i_().lr().Tt(i);null!==s&&s.nt(t,!1)}im(t){this.rm(t,Es,Ps,this.ts()._c())}Qv(t,i){const s=a(this.Dv),n=s.Dt(),e=s.s_();for(const s of e)this.rm(t,i,Cs,s);for(const s of n)this.rm(t,i,Cs,s);for(const s of e)this.rm(t,i,Ps,s);for(const s of n)this.rm(t,i,Ps,s)}rm(t,i,s,n){const e=a(this.Dv),r=e.Qt().hc(),h=null!==r&&r.n_===n,l=null!==r&&h&&void 0!==r.e_?r.e_.Xn:void 0;ys(i,(i=>s(i,t,h,l)),n,e)}Ov(){if(null===this.Dv)return;const t=this.Dp,i=this.Dv.Wo().N().visible,s=this.Dv.Ho().N().visible;i||null===this.mv||(this.Bv.removeChild(this.mv.Xf()),this.mv.m(),this.mv=null),s||null===this.wv||(this.Iv.removeChild(this.wv.Xf()),this.wv.m(),this.wv=null);const n=t.Qt().Ec();i&&null===this.mv&&(this.mv=new Rs(this,t.N(),n,"left"),this.Bv.appendChild(this.mv.Xf())),s&&null===this.wv&&(this.wv=new Rs(this,t.N(),n,"right"),this.Iv.appendChild(this.wv.Xf()))}hm(t){return t.Bf&&this.Pv||null!==this.yv}am(t){return Math.max(0,Math.min(t,this.Op.width-1))}lm(t){return Math.max(0,Math.min(t,this.Op.height-1))}Fv(t,i,s){this.ts().kc(this.am(t),this.lm(i),s,a(this.Dv))}Yv(){this.ts().Rc()}Zv(){this.kv&&(this.yv=null,this.Yv())}qv(t,i,s){this.yv=t,this.kv=!1,this.Fv(i.x,i.y,s);const n=this.ts()._c();this.Tv={x:n.si(),y:n.ni()}}ts(){return this.Dp.Qt()}jv(t){if(!this.bv)return;const i=this.ts(),s=this.hp();if(i.Ko(s,s.ks()),this.Mv=null,this.bv=!1,i.Cc(),null!==this.Rv){const t=performance.now(),s=i.It();this.Rv.le(s.wu(),t),this.Rv.Tu(t)||i._n(this.Rv)}}Nv(){this.yv=null}Wv(){if(!this.Dv)return;if(this.ts().hn(),document.activeElement!==document.body&&document.activeElement!==document.documentElement)a(document.activeElement).blur();else{const t=document.getSelection();null!==t&&t.removeAllRanges()}!this.Dv.ks().Ki()&&this.ts().It().Ki()}$v(t){if(null===this.Dv)return;const i=this.ts(),s=i.It();if(s.Ki())return;const n=this.Dp.N(),e=n.handleScroll,r=n.kineticScroll;if((!e.pressedMouseMove||t.Bf)&&(!e.horzTouchDrag&&!e.vertTouchDrag||!t.Bf))return;const h=this.Dv.ks(),a=performance.now();if(null!==this.Mv||this.hm(t)||(this.Mv={x:t.clientX,y:t.clientY,ed:a,om:t.localX,_m:t.localY}),null!==this.Mv&&!this.bv&&(this.Mv.x!==t.clientX||this.Mv.y!==t.clientY)){if(t.Bf&&r.touch||!t.Bf&&r.mouse){const t=s.vu();this.Rv=new Ms(.2/t,7/t,.997,15/t),this.Rv.Cp(s.wu(),this.Mv.ed)}else this.Rv=null;h.Ki()||i.qo(this.Dv,h,t.localY),i.xc(t.localX),this.bv=!0}this.bv&&(h.Ki()||i.Yo(this.Dv,h,t.localY),i.Sc(t.localX),null!==this.Rv&&this.Rv.Cp(s.wu(),a))}}class As{constructor(t,i,s,n,e){this.St=!0,this.Op=Qi({width:0,height:0}),this.Up=()=>this.av(3),this.qp="left"===t,this.Gu=s.Ec,this.Ps=i,this.um=n,this.dm=e,this.qf=document.createElement("div"),this.qf.style.width="25px",this.qf.style.height="100%",this.qf.style.overflow="hidden",this.Zp=xs(this.qf,Qi({width:16,height:16})),this.Zp.subscribeSuggestedBitmapSizeChanged(this.Up)}m(){this.Zp.unsubscribeSuggestedBitmapSizeChanged(this.Up),Ss(this.Zp.canvasElement),this.Zp.dispose()}Xf(){return this.qf}Zf(){return this.Op}rv(t){ts(this.Op,t)||(this.Op=t,this.Zp.resizeCanvasElement(t),this.qf.style.width=`${t.width}px`,this.qf.style.height=`${t.height}px`,this.St=!0)}av(t){if(t<3&&!this.St)return;if(0===this.Op.width||0===this.Op.height)return;this.St=!1,this.Zp.applySuggestedBitmapSize();const i=rs(this.Zp,{colorSpace:this.Ps.layout.colorSpace});null!==i&&i.useBitmapCoordinateSpace((t=>{this.ov(t),this._v(t)}))}Gf(){return this.Zp.bitmapSize}Jf(t,i,s){const n=this.Gf();n.width>0&&n.height>0&&t.drawImage(this.Zp.canvasElement,i,s)}_v({context:t,bitmapSize:i,horizontalPixelRatio:s,verticalPixelRatio:n}){if(!this.um())return;t.fillStyle=this.Ps.timeScale.borderColor;const e=Math.floor(this.Gu.N().S*s),r=Math.floor(this.Gu.N().S*n),h=this.qp?i.width-e:0;t.fillRect(h,0,e,r)}ov({context:t,bitmapSize:i}){B(t,0,0,i.width,i.height,this.dm())}}function zs(t){return i=>i.ia?.(t)??[]}const Os=zs("normal"),Ls=zs("top"),Ns=zs("bottom");class Fs{constructor(t,i){this.fm=null,this.pm=null,this.M=null,this.vm=!1,this.Op=Qi({width:0,height:0}),this.wm=new o,this.Np=new it(5),this.Hp=!1,this.Up=()=>{this.Hp||this.Dp.Qt().ar()},this.jp=()=>{this.Hp||this.Dp.Qt().ar()},this.Dp=t,this.o_=i,this.Ps=t.N().layout,this.yp=document.createElement("tr"),this.gm=document.createElement("td"),this.gm.style.padding="0",this.Mm=document.createElement("td"),this.Mm.style.padding="0",this.qf=document.createElement("td"),this.qf.style.height="25px",this.qf.style.padding="0",this.bm=document.createElement("div"),this.bm.style.width="100%",this.bm.style.height="100%",this.bm.style.position="relative",this.bm.style.overflow="hidden",this.qf.appendChild(this.bm),this.Zp=xs(this.bm,Qi({width:16,height:16})),this.Zp.subscribeSuggestedBitmapSizeChanged(this.Up);const s=this.Zp.canvasElement;s.style.position="absolute",s.style.zIndex="1",s.style.left="0",s.style.top="0",this.Gp=xs(this.bm,Qi({width:16,height:16})),this.Gp.subscribeSuggestedBitmapSizeChanged(this.jp);const n=this.Gp.canvasElement;n.style.position="absolute",n.style.zIndex="2",n.style.left="0",n.style.top="0",this.yp.appendChild(this.gm),this.yp.appendChild(this.qf),this.yp.appendChild(this.Mm),this.xm(),this.Dp.Qt().Eo().i(this.xm.bind(this),this),this.Lf=new us(this.Gp.canvasElement,this,{hf:()=>!0,af:()=>!this.Dp.N().handleScroll.horzTouchDrag})}m(){this.Lf.m(),null!==this.fm&&this.fm.m(),null!==this.pm&&this.pm.m(),this.Gp.unsubscribeSuggestedBitmapSizeChanged(this.jp),Ss(this.Gp.canvasElement),this.Gp.dispose(),this.Zp.unsubscribeSuggestedBitmapSizeChanged(this.Up),Ss(this.Zp.canvasElement),this.Zp.dispose()}Xf(){return this.yp}Sm(){return this.fm}Cm(){return this.pm}bf(t){if(this.vm)return;this.vm=!0;const i=this.Dp.Qt();!i.It().Ki()&&this.Dp.N().handleScale.axisPressedMouseMove.time&&i.gc(t.localX)}gf(t){this.bf(t)}xf(){const t=this.Dp.Qt();!t.It().Ki()&&this.vm&&(this.vm=!1,this.Dp.N().handleScale.axisPressedMouseMove.time&&t.yc())}uf(t){const i=this.Dp.Qt();!i.It().Ki()&&this.Dp.N().handleScale.axisPressedMouseMove.time&&i.Pc(t.localX)}lf(t){this.uf(t)}pf(){this.vm=!1;const t=this.Dp.Qt();t.It().Ki()&&!this.Dp.N().handleScale.axisPressedMouseMove.time||t.yc()}df(){this.pf()}Kd(){this.Dp.N().handleScale.axisDoubleClickReset.time&&this.Dp.Qt().cn()}$d(){this.Kd()}if(){this.Dp.Qt().N().handleScale.axisPressedMouseMove.time&&this.pv(1)}Ef(){this.pv(0)}Zf(){return this.Op}Pm(){return this.wm}ym(t,i,s){ts(this.Op,t)||(this.Op=t,this.Hp=!0,this.Zp.resizeCanvasElement(t),this.Gp.resizeCanvasElement(t),this.Hp=!1,this.qf.style.width=`${t.width}px`,this.qf.style.height=`${t.height}px`,this.wm.p(t)),null!==this.fm&&this.fm.rv(Qi({width:i,height:t.height})),null!==this.pm&&this.pm.rv(Qi({width:s,height:t.height}))}km(){const t=this.Tm();return Math.ceil(t.S+t.C+t.P+t.A+t.V+t.Rm)}yt(){this.Dp.Qt().It().Ea()}Gf(){return this.Zp.bitmapSize}Jf(t,i,s){const n=this.Gf();n.width>0&&n.height>0&&t.drawImage(this.Zp.canvasElement,i,s)}av(t){if(0===t)return;const i={colorSpace:this.Ps.colorSpace};if(1!==t){this.Zp.applySuggestedBitmapSize();const s=rs(this.Zp,i);null!==s&&(s.useBitmapCoordinateSpace((t=>{this.ov(t),this._v(t),this.Dm(s,Ns)})),this.cv(s),this.Dm(s,Os)),null!==this.fm&&this.fm.av(t),null!==this.pm&&this.pm.av(t)}this.Gp.applySuggestedBitmapSize();const s=rs(this.Gp,i);null!==s&&(s.useBitmapCoordinateSpace((({context:t,bitmapSize:i})=>{t.clearRect(0,0,i.width,i.height)})),this.Em([...this.Dp.Qt().Ys(),this.Dp.Qt()._c()],s),this.Dm(s,Ls))}Dm(t,i){const s=this.Dp.Qt().Ys();for(const n of s)ys(i,(i=>Cs(i,t,!1,void 0)),n,void 0);for(const n of s)ys(i,(i=>Ps(i,t,!1,void 0)),n,void 0)}ov({context:t,bitmapSize:i}){B(t,0,0,i.width,i.height,this.Dp.Qt().Fc())}_v({context:t,bitmapSize:i,verticalPixelRatio:s}){if(this.Dp.N().timeScale.borderVisible){t.fillStyle=this.Vm();const n=Math.max(1,Math.floor(this.Tm().S*s));t.fillRect(0,0,i.width,n)}}cv(t){const i=this.Dp.Qt().It(),s=i.Ea();if(!s||0===s.length)return;const n=this.o_.maxTickMarkWeight(s),e=this.Tm(),r=i.N();r.borderVisible&&r.ticksVisible&&t.useBitmapCoordinateSpace((({context:t,horizontalPixelRatio:i,verticalPixelRatio:n})=>{t.strokeStyle=this.Vm(),t.fillStyle=this.Vm();const r=Math.max(1,Math.floor(i)),h=Math.floor(.5*i);t.beginPath();const a=Math.round(e.C*n);for(let n=s.length;n--;){const e=Math.round(s[n].coord*i);t.rect(e-h,0,r,a)}t.fill()})),t.useMediaCoordinateSpace((({context:t})=>{const i=e.S+e.C+e.A+e.P/2;t.textAlign="center",t.textBaseline="middle",t.fillStyle=this.H(),t.font=this.nv();for(const e of s)if(e.weight<n){const s=e.needAlignCoordinate?this.Bm(t,e.coord,e.label):e.coord;t.fillText(e.label,s,i)}this.Dp.N().timeScale.allowBoldLabels&&(t.font=this.Im());for(const e of s)if(e.weight>=n){const s=e.needAlignCoordinate?this.Bm(t,e.coord,e.label):e.coord;t.fillText(e.label,s,i)}}))}Bm(t,i,s){const n=this.Np.Ei(t,s),e=n/2,r=Math.floor(i-e)+.5;return r<0?i+=Math.abs(0-r):r+n>this.Op.width&&(i-=Math.abs(this.Op.width-(r+n))),i}Em(t,i){const s=this.Tm();for(const n of t)for(const t of n.cs())t.Tt().nt(i,s)}Vm(){return this.Dp.N().timeScale.borderColor}H(){return this.Ps.textColor}F(){return this.Ps.fontSize}nv(){return g(this.F(),this.Ps.fontFamily)}Im(){return g(this.F(),this.Ps.fontFamily,"bold")}Tm(){null===this.M&&(this.M={S:1,O:NaN,A:NaN,V:NaN,Ji:NaN,C:5,P:NaN,k:"",Gi:new it,Rm:0});const t=this.M,i=this.nv();if(t.k!==i){const s=this.F();t.P=s,t.k=i,t.A=3*s/12,t.V=3*s/12,t.Ji=9*s/12,t.O=0,t.Rm=4*s/12,t.Gi.Vn()}return this.M}pv(t){this.qf.style.cursor=1===t?"ew-resize":"default"}xm(){const t=this.Dp.Qt(),i=t.N();i.leftPriceScale.visible||null===this.fm||(this.gm.removeChild(this.fm.Xf()),this.fm.m(),this.fm=null),i.rightPriceScale.visible||null===this.pm||(this.Mm.removeChild(this.pm.Xf()),this.pm.m(),this.pm=null);const s={Ec:this.Dp.Qt().Ec()},n=()=>i.leftPriceScale.borderVisible&&t.It().N().borderVisible,e=()=>t.Fc();i.leftPriceScale.visible&&null===this.fm&&(this.fm=new As("left",i,s,n,e),this.gm.appendChild(this.fm.Xf())),i.rightPriceScale.visible&&null===this.pm&&(this.pm=new As("right",i,s,n,e),this.Mm.appendChild(this.pm.Xf()))}}const Ws=!!hs&&!!navigator.userAgentData&&navigator.userAgentData.brands.some((t=>t.brand.includes("Chromium")))&&!!hs&&(navigator?.userAgentData?.platform?"Windows"===navigator.userAgentData.platform:navigator.userAgent.toLowerCase().indexOf("win")>=0);class Hs{constructor(t,i,s){var n;this.Am=[],this.zm=[],this.Om=0,this.sl=0,this.Mo=0,this.Lm=0,this.Nm=0,this.Fm=null,this.Wm=!1,this.xv=new o,this.Sv=new o,this.Ku=new o,this.Hm=null,this.Um=null,this.Rp=t,this.Ps=i,this.o_=s,this.yp=document.createElement("div"),this.yp.classList.add("tv-lightweight-charts"),this.yp.style.overflow="hidden",this.yp.style.direction="ltr",this.yp.style.width="100%",this.yp.style.height="100%",(n=this.yp).style.userSelect="none",n.style.webkitUserSelect="none",n.style.msUserSelect="none",n.style.MozUserSelect="none",n.style.webkitTapHighlightColor="transparent",this.$m=document.createElement("table"),this.$m.setAttribute("cellspacing","0"),this.yp.appendChild(this.$m),this.jm=this.qm.bind(this),Us(this.Ps)&&this.Ym(!0),this.ts=new Ii(this.Zu.bind(this),this.Ps,s),this.Qt().uc().i(this.Km.bind(this),this),this.Xm=new Fs(this,this.o_),this.$m.appendChild(this.Xm.Xf());const e=i.autoSize&&this.Zm();let r=this.Ps.width,h=this.Ps.height;if(e||0===r||0===h){const i=t.getBoundingClientRect();r=r||i.width,h=h||i.height}this.Gm(r,h),this.Jm(),t.appendChild(this.yp),this.Qm(),this.ts.It().Vu().i(this.ts.Bh.bind(this.ts),this),this.ts.Eo().i(this.ts.Bh.bind(this.ts),this)}Qt(){return this.ts}N(){return this.Ps}Uf(){return this.Am}tw(){return this.Xm}m(){this.Ym(!1),0!==this.Om&&window.cancelAnimationFrame(this.Om),this.ts.uc().u(this),this.ts.It().Vu().u(this),this.ts.Eo().u(this),this.ts.m();for(const t of this.Am)this.$m.removeChild(t.Xf()),t.Kv().u(this),t.Xv().u(this),t.m();this.Am=[];for(const t of this.zm)this.iw(t);this.zm=[],a(this.Xm).m(),null!==this.yp.parentElement&&this.yp.parentElement.removeChild(this.yp),this.Ku.m(),this.xv.m(),this.Sv.m(),this.sw()}Gm(t,i,s=!1){if(this.sl===i&&this.Mo===t)return;const n=function(t){const i=Math.floor(t.width),s=Math.floor(t.height);return Qi({width:i-i%2,height:s-s%2})}(Qi({width:t,height:i}));this.sl=n.height,this.Mo=n.width;const e=this.sl+"px",r=this.Mo+"px";a(this.yp).style.height=e,a(this.yp).style.width=r,this.$m.style.height=e,this.$m.style.width=r,s?this.nw(Y.gn(),performance.now()):this.ts.Bh()}av(t){void 0===t&&(t=Y.gn());for(let i=0;i<this.Am.length;i++)this.Am[i].av(t.en(i).tn);this.Ps.timeScale.visible&&this.Xm.av(t.nn())}hr(t){const i=Us(this.Ps);this.ts.hr(t);const s=Us(this.Ps);s!==i&&this.Ym(s),t.layout?.panes&&this.ew(),this.Qm(),this.rw(t)}Kv(){return this.xv}Xv(){return this.Sv}uc(){return this.Ku}hw(){null!==this.Fm&&(this.nw(this.Fm,performance.now()),this.Fm=null);const t=this.aw(null),i=document.createElement("canvas");i.width=t.width,i.height=t.height;const s=a(i.getContext("2d"));return this.aw(s),i}lw(t){if("left"===t&&!this.ow())return 0;if("right"===t&&!this._w())return 0;if(0===this.Am.length)return 0;return a("left"===t?this.Am[0].sm():this.Am[0].nm()).hv()}uw(){return this.Ps.autoSize&&null!==this.Hm}tp(){return this.yp}cw(t){this.Um=t,this.Um?this.tp().style.setProperty("cursor",t):this.tp().style.removeProperty("cursor")}dw(){return this.Um}fw(t){return h(this.Am[t]).Zf()}ew(){this.zm.forEach((t=>{t.yt()}))}rw(t){(void 0!==t.autoSize||!this.Hm||void 0===t.width&&void 0===t.height)&&(t.autoSize&&!this.Hm&&this.Zm(),!1===t.autoSize&&null!==this.Hm&&this.sw(),t.autoSize||void 0===t.width&&void 0===t.height||this.Gm(t.width||this.Mo,t.height||this.sl))}aw(t){let i=0,s=0;const n=this.Am[0],e=(i,s)=>{let n=0;for(let e=0;e<this.Am.length;e++){const r=this.Am[e],h=a("left"===i?r.sm():r.nm()),l=h.Gf();if(null!==t&&h.Jf(t,s,n),n+=l.height,e<this.Am.length-1){const i=this.zm[e],r=i.Gf();null!==t&&i.Jf(t,s,n),n+=r.height}}};if(this.ow()){e("left",0);i+=a(n.sm()).Gf().width}for(let n=0;n<this.Am.length;n++){const e=this.Am[n],r=e.Gf();if(null!==t&&e.Jf(t,i,s),s+=r.height,n<this.Am.length-1){const e=this.zm[n],r=e.Gf();null!==t&&e.Jf(t,i,s),s+=r.height}}if(i+=n.Gf().width,this._w()){e("right",i);i+=a(n.nm()).Gf().width}const r=(i,s,n)=>{a("left"===i?this.Xm.Sm():this.Xm.Cm()).Jf(a(t),s,n)};if(this.Ps.timeScale.visible){const i=this.Xm.Gf();if(null!==t){let e=0;this.ow()&&(r("left",e,s),e=a(n.sm()).Gf().width),this.Xm.Jf(t,e,s),e+=i.width,this._w()&&r("right",e,s)}s+=i.height}return Qi({width:i,height:s})}pw(){let t=0,i=0,s=0;for(const n of this.Am)this.ow()&&(i=Math.max(i,a(n.sm()).sv(),this.Ps.leftPriceScale.minimumWidth)),this._w()&&(s=Math.max(s,a(n.nm()).sv(),this.Ps.rightPriceScale.minimumWidth)),t+=n.Vo();i=os(i),s=os(s);const n=this.Mo,e=this.sl,r=Math.max(n-i-s,0),h=1*this.zm.length,l=this.Ps.timeScale.visible;let o=l?Math.max(this.Xm.km(),this.Ps.timeScale.minimumHeight):0;var _;o=(_=o)+_%2;const u=h+o,c=e<u?0:e-u,d=c/t;let f=0;const p=window.devicePixelRatio||1;for(let t=0;t<this.Am.length;++t){const n=this.Am[t];n.zv(this.ts.$s()[t]);let e=0,h=0;h=t===this.Am.length-1?Math.ceil((c-f)*p)/p:Math.round(n.Vo()*d*p)/p,e=Math.max(h,2),f+=e,n.rv(Qi({width:r,height:e})),this.ow()&&n.Gv(i,"left"),this._w()&&n.Gv(s,"right"),n.hp()&&this.ts.cc(n.hp(),e)}this.Xm.ym(Qi({width:l?r:0,height:o}),l?i:0,l?s:0),this.ts.Io(r),this.Lm!==i&&(this.Lm=i),this.Nm!==s&&(this.Nm=s)}Ym(t){t?this.yp.addEventListener("wheel",this.jm,{passive:!1}):this.yp.removeEventListener("wheel",this.jm)}mw(t){switch(t.deltaMode){case t.DOM_DELTA_PAGE:return 120;case t.DOM_DELTA_LINE:return 32}return Ws?1/window.devicePixelRatio:1}qm(t){if(!(0!==t.deltaX&&this.Ps.handleScroll.mouseWheel||0!==t.deltaY&&this.Ps.handleScale.mouseWheel))return;const i=this.mw(t),s=i*t.deltaX/100,n=-i*t.deltaY/100;if(t.cancelable&&t.preventDefault(),0!==n&&this.Ps.handleScale.mouseWheel){const i=Math.sign(n)*Math.min(1,Math.abs(n)),s=t.clientX-this.yp.getBoundingClientRect().left;this.Qt().Mc(s,i)}0!==s&&this.Ps.handleScroll.mouseWheel&&this.Qt().bc(-80*s)}nw(t,i){const s=t.nn();3===s&&this.ww(),3!==s&&2!==s||(this.gw(t),this.Mw(t,i),this.Xm.yt(),this.Am.forEach((t=>{t.Lv()})),3===this.Fm?.nn()&&(this.Fm.vn(t),this.ww(),this.gw(this.Fm),this.Mw(this.Fm,i),t=this.Fm,this.Fm=null)),this.av(t)}Mw(t,i){for(const s of t.pn())this.mn(s,i)}gw(t){const i=this.ts.$s();for(let s=0;s<i.length;s++)t.en(s).sn&&i[s].Go()}mn(t,i){const s=this.ts.It();switch(t.an){case 0:s.Iu();break;case 1:s.Au(t.Wt);break;case 2:s.dn(t.Wt);break;case 3:s.fn(t.Wt);break;case 4:s.bu();break;case 5:t.Wt.Tu(i)||s.fn(t.Wt.Ru(i))}}Zu(t){null!==this.Fm?this.Fm.vn(t):this.Fm=t,this.Wm||(this.Wm=!0,this.Om=window.requestAnimationFrame((t=>{if(this.Wm=!1,this.Om=0,null!==this.Fm){const i=this.Fm;this.Fm=null,this.nw(i,t);for(const s of i.pn())if(5===s.an&&!s.Wt.Tu(t)){this.Qt()._n(s.Wt);break}}})))}ww(){this.Jm()}iw(t){this.$m.removeChild(t.Xf()),t.m()}Jm(){const t=this.ts.$s(),i=t.length,s=this.Am.length;for(let t=i;t<s;t++){const t=h(this.Am.pop());this.$m.removeChild(t.Xf()),t.Kv().u(this),t.Xv().u(this),t.m();const i=this.zm.pop();void 0!==i&&this.iw(i)}for(let n=s;n<i;n++){const i=new Is(this,t[n]);if(i.Kv().i(this.bw.bind(this,i),this),i.Xv().i(this.xw.bind(this,i),this),this.Am.push(i),n>0){const t=new ms(this,n-1,n);this.zm.push(t),this.$m.insertBefore(t.Xf(),this.Xm.Xf())}this.$m.insertBefore(i.Xf(),this.Xm.Xf())}for(let s=0;s<i;s++){const i=t[s],n=this.Am[s];n.hp()!==i?n.zv(i):n.Av()}this.Qm(),this.pw()}Sw(t,i,s,n){const e=new Map;if(null!==t){this.ts.Ys().forEach((i=>{const s=i.Xs().Fr(t);null!==s&&e.set(i,s)}))}let r;if(null!==t){const i=this.ts.It().ss(t)?.originalTime;void 0!==i&&(r=i)}const h=this.Qt().hc(),a=null!==h&&h.n_ instanceof Ut?h.n_:void 0,l=null!==h&&void 0!==h.e_?h.e_.Kn:void 0,o=this.Cw(n);return{Pw:r,Re:t??void 0,yw:i??void 0,kw:-1!==o?o:void 0,Tw:a,Rw:e,Dw:l,Ew:s??void 0}}Cw(t){let i=-1;if(t)i=this.Am.indexOf(t);else{const t=this.Qt()._c().Us();null!==t&&(i=this.Qt().$s().indexOf(t))}return i}bw(t,i,s,n){this.xv.p((()=>this.Sw(i,s,n,t)))}xw(t,i,s,n){this.Sv.p((()=>this.Sw(i,s,n,t)))}Km(t,i,s){this.cw(this.Qt().hc()?.h_??null),this.Ku.p((()=>this.Sw(t,i,s)))}Qm(){const t=this.Ps.timeScale.visible?"":"none";this.Xm.Xf().style.display=t}ow(){return this.Am[0].hp().Wo().N().visible}_w(){return this.Am[0].hp().Ho().N().visible}Zm(){return"ResizeObserver"in window&&(this.Hm=new ResizeObserver((t=>{const i=t[t.length-1];i&&this.Gm(i.contentRect.width,i.contentRect.height)})),this.Hm.observe(this.Rp,{box:"border-box"}),!0)}sw(){null!==this.Hm&&this.Hm.disconnect(),this.Hm=null}}function Us(t){return Boolean(t.handleScroll.mouseWheel||t.handleScale.mouseWheel)}function $s(t){return void 0===t.open&&void 0===t.value}function js(t){return function(t){return void 0!==t.open}(t)||function(t){return void 0!==t.value}(t)}function qs(t,i,s,n){const e=s.value,r={Re:i,wt:t,Wt:[e,e,e,e],Pw:n};return void 0!==s.color&&(r.R=s.color),r}function Ys(t,i,s,n){const e=s.value,r={Re:i,wt:t,Wt:[e,e,e,e],Pw:n};return void 0!==s.lineColor&&(r.vt=s.lineColor),void 0!==s.topColor&&(r.mr=s.topColor),void 0!==s.bottomColor&&(r.wr=s.bottomColor),r}function Ks(t,i,s,n){const e=s.value,r={Re:i,wt:t,Wt:[e,e,e,e],Pw:n};return void 0!==s.topLineColor&&(r.gr=s.topLineColor),void 0!==s.bottomLineColor&&(r.Mr=s.bottomLineColor),void 0!==s.topFillColor1&&(r.br=s.topFillColor1),void 0!==s.topFillColor2&&(r.Sr=s.topFillColor2),void 0!==s.bottomFillColor1&&(r.Cr=s.bottomFillColor1),void 0!==s.bottomFillColor2&&(r.Pr=s.bottomFillColor2),r}function Xs(t,i,s,n){const e={Re:i,wt:t,Wt:[s.open,s.high,s.low,s.close],Pw:n};return void 0!==s.color&&(e.R=s.color),e}function Zs(t,i,s,n){const e={Re:i,wt:t,Wt:[s.open,s.high,s.low,s.close],Pw:n};return void 0!==s.color&&(e.R=s.color),void 0!==s.borderColor&&(e.Ht=s.borderColor),void 0!==s.wickColor&&(e.vr=s.wickColor),e}function Gs(t,i,s,n,e){const r=h(e)(s),a=Math.max(...r),l=Math.min(...r),o=r[r.length-1],_=[o,a,l,o],{time:u,color:c,...d}=s;return{Re:i,wt:t,Wt:_,Pw:n,se:d,R:c}}function Js(t){return void 0!==t.Wt}function Qs(t,i){return void 0!==i.customValues&&(t.Vw=i.customValues),t}function tn(t){return(i,s,n,e,r,h)=>function(t,i){return i?i(t):$s(t)}(n,h)?Qs({wt:i,Re:s,Pw:e},n):Qs(t(i,s,n,e,r),n)}function sn(t){return{Candlestick:tn(Zs),Bar:tn(Xs),Area:tn(Ys),Baseline:tn(Ks),Histogram:tn(qs),Line:tn(qs),Custom:tn(Gs)}[t]}function nn(t){return{Re:0,Bw:new Map,Hh:t}}function en(t,i){if(void 0!==t&&0!==t.length)return{Iw:i.key(t[0].wt),Aw:i.key(t[t.length-1].wt)}}function rn(t){let i;return t.forEach((t=>{void 0===i&&(i=t.Pw)})),h(i)}class hn{constructor(t){this.zw=new Map,this.Ow=new Map,this.Lw=new Map,this.Nw=[],this.o_=t}m(){this.zw.clear(),this.Ow.clear(),this.Lw.clear(),this.Nw=[]}Fw(t,i){let s=0!==this.zw.size,n=!1;const e=this.Ow.get(t);if(void 0!==e)if(1===this.Ow.size)s=!1,n=!0,this.zw.clear();else for(const i of this.Nw)i.pointData.Bw.delete(t)&&(n=!0);let r=[];if(0!==i.length){const s=i.map((t=>t.time)),e=this.o_.createConverterToInternalObj(i),h=sn(t.Rr()),a=t.da(),l=t.pa();r=i.map(((i,r)=>{const o=e(i.time),_=this.o_.key(o);let u=this.zw.get(_);void 0===u&&(u=nn(o),this.zw.set(_,u),n=!0);const c=h(o,u.Re,i,s[r],a,l);return u.Bw.set(t,c),c}))}s&&this.Ww(),this.Hw(t,r);let h=-1;if(n){const t=[];this.zw.forEach((i=>{t.push({timeWeight:0,time:i.Hh,pointData:i,originalTime:rn(i.Bw)})})),t.sort(((t,i)=>this.o_.key(t.time)-this.o_.key(i.time))),h=this.Uw(t)}return this.$w(t,h,function(t,i,s){const n=en(t,s),e=en(i,s);if(void 0!==n&&void 0!==e)return{jw:!1,zh:n.Aw>=e.Aw&&n.Iw>=e.Iw}}(this.Ow.get(t),e,this.o_))}Ic(t){return this.Fw(t,[])}qw(t,i,s){const n=i;!function(t){void 0===t.Pw&&(t.Pw=t.time)}(n),this.o_.preprocessData(i);const e=this.o_.createConverterToInternalObj([i])(i.time),r=this.Lw.get(t);if(!s&&void 0!==r&&this.o_.key(e)<this.o_.key(r))throw new Error(`Cannot update oldest data, last time=${r}, new time=${e}`);let h=this.zw.get(this.o_.key(e));if(s&&void 0===h)throw new Error("Cannot update non-existing data point when historicalUpdate is true");const a=void 0===h;void 0===h&&(h=nn(e),this.zw.set(this.o_.key(e),h));const l=sn(t.Rr()),o=t.da(),_=t.pa(),u=l(e,h.Re,i,n.Pw,o,_);h.Bw.set(t,u),s?this.Yw(t,u,h.Re):this.Kw(t,u);const c={zh:Js(u),jw:s};if(!a)return this.$w(t,-1,c);const d={timeWeight:0,time:h.Hh,pointData:h,originalTime:rn(h.Bw)},f=xt(this.Nw,this.o_.key(d.time),((t,i)=>this.o_.key(t.time)<i));this.Nw.splice(f,0,d);for(let t=f;t<this.Nw.length;++t)an(this.Nw[t].pointData,t);return this.o_.fillWeightsForPoints(this.Nw,f),this.$w(t,f,c)}Kw(t,i){let s=this.Ow.get(t);void 0===s&&(s=[],this.Ow.set(t,s));const n=0!==s.length?s[s.length-1]:null;null===n||this.o_.key(i.wt)>this.o_.key(n.wt)?Js(i)&&s.push(i):Js(i)?s[s.length-1]=i:s.splice(-1,1),this.Lw.set(t,i.wt)}Yw(t,i,s){const n=this.Ow.get(t);if(void 0===n)return;const e=xt(n,s,((t,i)=>t.Re<i));Js(i)?n[e]=i:n.splice(e,1)}Hw(t,i){0!==i.length?(this.Ow.set(t,i.filter(Js)),this.Lw.set(t,i[i.length-1].wt)):(this.Ow.delete(t),this.Lw.delete(t))}Ww(){for(const t of this.Nw)0===t.pointData.Bw.size&&this.zw.delete(this.o_.key(t.time))}Uw(t){let i=-1;for(let s=0;s<this.Nw.length&&s<t.length;++s){const n=this.Nw[s],e=t[s];if(this.o_.key(n.time)!==this.o_.key(e.time)){i=s;break}e.timeWeight=n.timeWeight,an(e.pointData,s)}if(-1===i&&this.Nw.length!==t.length&&(i=Math.min(this.Nw.length,t.length)),-1===i)return-1;for(let s=i;s<t.length;++s)an(t[s].pointData,s);return this.o_.fillWeightsForPoints(t,i),this.Nw=t,i}Xw(){if(0===this.Ow.size)return null;let t=0;return this.Ow.forEach((i=>{0!==i.length&&(t=Math.max(t,i[i.length-1].Re))})),t}$w(t,i,s){const n={Lo:new Map,It:{ou:this.Xw()}};if(-1!==i)this.Ow.forEach(((i,e)=>{n.Lo.set(e,{se:i,Zw:e===t?s:void 0})})),this.Ow.has(t)||n.Lo.set(t,{se:[],Zw:s}),n.It.Gw=this.Nw,n.It.Jw=i;else{const i=this.Ow.get(t);n.Lo.set(t,{se:i||[],Zw:s})}return n}}function an(t,i){t.Re=i,t.Bw.forEach((t=>{t.Re=i}))}function ln(t,i){return t.wt<i}function on(t,i){return i<t.wt}function _n(t,i,s){const n=i.Uh(),e=i.bi(),r=xt(t,n,ln),h=St(t,e,on);if(!s)return{from:r,to:h};let a=r,l=h;return r>0&&r<t.length&&t[r].wt>=n&&(a=r-1),h>0&&h<t.length&&t[h-1].wt<=e&&(l=h+1),{from:a,to:l}}class un{constructor(t,i,s){this.Qw=!0,this.tg=!0,this.ig=!0,this.sg=[],this.ng=null,this.Jn=t,this.Qn=i,this.eg=s}yt(t){this.Qw=!0,"data"===t&&(this.tg=!0),"options"===t&&(this.ig=!0)}Tt(){return this.Jn.Et()?(this.rg(),null===this.ng?null:this.hg):null}ag(){this.sg=this.sg.map((t=>({...t,...this.Jn.Rh().Dr(t.wt)})))}lg(){this.ng=null}rg(){this.tg&&(this.og(),this.tg=!1),this.ig&&(this.ag(),this.ig=!1),this.Qw&&(this._g(),this.Qw=!1)}_g(){const t=this.Jn.Ft(),i=this.Qn.It();if(this.lg(),i.Ki()||t.Ki())return;const s=i.Pe();if(null===s)return;if(0===this.Jn.Xs().zr())return;const n=this.Jn.zt();null!==n&&(this.ng=_n(this.sg,s,this.eg),this.ug(t,i,n.Wt),this.cg())}}class cn{constructor(t,i){this.dg=t,this.qi=i}nt(t,i,s){this.dg.draw(t,this.qi,i,s)}}class dn extends un{constructor(t,i,s){super(t,i,!1),this.sh=s,this.hg=new cn(this.sh.renderer(),(i=>{const s=t.zt();return null===s?null:t.Ft().Nt(i,s.Wt)}))}fa(t){return this.sh.priceValueBuilder(t)}va(t){return this.sh.isWhitespace(t)}og(){const t=this.Jn.Rh();this.sg=this.Jn.Xs().Hr().map((i=>({wt:i.Re,_t:NaN,...t.Dr(i.Re),fg:i.se})))}ug(t,i){i._u(this.sg,m(this.ng))}cg(){this.sh.update({bars:this.sg.map(fn),barSpacing:this.Qn.It().vu(),visibleRange:this.ng},this.Jn.N())}}function fn(t){return{x:t._t,time:t.wt,originalData:t.fg,barColor:t.cr}}const pn={color:"#2196f3"},vn=(t,i,s)=>{const n=l(s);return new dn(t,i,n)};function mn(t){const i={value:t.Wt[3],time:t.Pw};return void 0!==t.Vw&&(i.customValues=t.Vw),i}function wn(t){const i=mn(t);return void 0!==t.R&&(i.color=t.R),i}function gn(t){const i=mn(t);return void 0!==t.vt&&(i.lineColor=t.vt),void 0!==t.mr&&(i.topColor=t.mr),void 0!==t.wr&&(i.bottomColor=t.wr),i}function Mn(t){const i=mn(t);return void 0!==t.gr&&(i.topLineColor=t.gr),void 0!==t.Mr&&(i.bottomLineColor=t.Mr),void 0!==t.br&&(i.topFillColor1=t.br),void 0!==t.Sr&&(i.topFillColor2=t.Sr),void 0!==t.Cr&&(i.bottomFillColor1=t.Cr),void 0!==t.Pr&&(i.bottomFillColor2=t.Pr),i}function bn(t){const i={open:t.Wt[0],high:t.Wt[1],low:t.Wt[2],close:t.Wt[3],time:t.Pw};return void 0!==t.Vw&&(i.customValues=t.Vw),i}function xn(t){const i=bn(t);return void 0!==t.R&&(i.color=t.R),i}function Sn(t){const i=bn(t),{R:s,Ht:n,vr:e}=t;return void 0!==s&&(i.color=s),void 0!==n&&(i.borderColor=n),void 0!==e&&(i.wickColor=e),i}function Cn(t){return{Area:gn,Line:wn,Baseline:Mn,Histogram:wn,Bar:xn,Candlestick:Sn,Custom:Pn}[t]}function Pn(t){const i=t.Pw;return{...t.se,time:i}}const yn={vertLine:{color:"#9598A1",width:1,style:3,visible:!0,labelVisible:!0,labelBackgroundColor:"#131722"},horzLine:{color:"#9598A1",width:1,style:3,visible:!0,labelVisible:!0,labelBackgroundColor:"#131722"},mode:1},kn={vertLines:{color:"#D6DCDE",style:0,visible:!0},horzLines:{color:"#D6DCDE",style:0,visible:!0}},Tn={background:{type:"solid",color:"#FFFFFF"},textColor:"#191919",fontSize:12,fontFamily:w,panes:{enableResize:!0,separatorColor:"#E0E3EB",separatorHoverColor:"rgba(178, 181, 189, 0.2)"},attributionLogo:!0,colorSpace:"srgb",colorParsers:[]},Rn={autoScale:!0,mode:0,invertScale:!1,alignLabels:!0,borderVisible:!0,borderColor:"#2B2B43",entireTextOnly:!1,visible:!1,ticksVisible:!1,scaleMargins:{bottom:.1,top:.2},minimumWidth:0,ensureEdgeTickMarksVisible:!1},Dn={rightOffset:0,barSpacing:6,minBarSpacing:.5,maxBarSpacing:0,fixLeftEdge:!1,fixRightEdge:!1,lockVisibleTimeRangeOnResize:!1,rightBarStaysOnScroll:!1,borderVisible:!0,borderColor:"#2B2B43",visible:!0,timeVisible:!1,secondsVisible:!0,shiftVisibleRangeOnNewBar:!0,allowShiftVisibleRangeOnWhitespaceReplacement:!1,ticksVisible:!1,uniformDistribution:!1,minimumHeight:0,allowBoldLabels:!0,ignoreWhitespaceIndices:!1};function En(){return{addDefaultPane:!0,width:0,height:0,autoSize:!1,layout:Tn,crosshair:yn,grid:kn,overlayPriceScales:{...Rn},leftPriceScale:{...Rn,visible:!1},rightPriceScale:{...Rn,visible:!0},timeScale:Dn,localization:{locale:hs?navigator.language:"",dateFormat:"dd MMM 'yy"},handleScroll:{mouseWheel:!0,pressedMouseMove:!0,horzTouchDrag:!0,vertTouchDrag:!0},handleScale:{axisPressedMouseMove:{time:!0,price:!0},axisDoubleClickReset:{time:!0,price:!0},mouseWheel:!0,pinch:!0},kineticScroll:{mouse:!1,touch:!0},trackingMode:{exitMode:1}}}class Vn{constructor(t,i,s){this.Wf=t,this.pg=i,this.vg=s??0}applyOptions(t){this.Wf.Qt().lc(this.pg,t,this.vg)}options(){return this.qi().N()}width(){return q(this.pg)?this.Wf.lw(this.pg):0}setVisibleRange(t){this.setAutoScale(!1),this.qi().Wl(new dt(t.from,t.to))}getVisibleRange(){const t=this.qi().Qe();return null===t?null:{from:t.$e(),to:t.je()}}setAutoScale(t){this.applyOptions({autoScale:t})}qi(){return a(this.Wf.Qt().oc(this.pg,this.vg)).Ft}}class Bn{constructor(t,i,s,n){this.Wf=t,this.Pt=s,this.mg=i,this.wg=n}getHeight(){return this.Pt.$t()}setHeight(t){const i=this.Wf.Qt(),s=i.Hc(this.Pt);i.fc(s,t)}getStretchFactor(){return this.Pt.Vo()}setStretchFactor(t){this.Pt.Bo(t),this.Wf.Qt().Bh()}paneIndex(){return this.Wf.Qt().Hc(this.Pt)}moveTo(t){const i=this.paneIndex();i!==t&&(r(t>=0&&t<this.Wf.Uf().length,"Invalid pane index"),this.Wf.Qt().mc(i,t))}getSeries(){return this.Pt.Lo().map((t=>this.mg(t)))??[]}getHTMLElement(){const t=this.Wf.Uf();return t&&0!==t.length&&t[this.paneIndex()]?t[this.paneIndex()].Xf():null}attachPrimitive(t){this.Pt.ua(t),t.attached&&t.attached({chart:this.wg,requestUpdate:()=>this.Pt.Qt().Bh()})}detachPrimitive(t){this.Pt.ca(t)}priceScale(t){if(null===this.Pt.Do(t))throw new Error(`Cannot find price scale with id: ${t}`);return new Vn(this.Wf,t,this.paneIndex())}setPreserveEmptyPane(t){this.Pt.zo(t)}preserveEmptyPane(){return this.Pt.Oo()}addCustomSeries(t,i={},s=0){return this.wg.addCustomSeries(t,i,s)}addSeries(t,i={}){return this.wg.addSeries(t,i,this.paneIndex())}}const In={color:"#FF0000",price:0,lineStyle:2,lineWidth:1,lineVisible:!0,axisLabelVisible:!0,title:"",axisLabelColor:"",axisLabelTextColor:""};class An{constructor(t){this.ir=t}applyOptions(t){this.ir.hr(t)}options(){return this.ir.N()}gg(){return this.ir}}class zn{constructor(t,i,s,n,e,r){this.Mg=new o,this.Jn=t,this.bg=i,this.xg=s,this.o_=e,this.wg=n,this.Sg=r}m(){this.Mg.m()}priceFormatter(){return this.Jn.ra()}priceToCoordinate(t){const i=this.Jn.zt();return null===i?null:this.Jn.Ft().Nt(t,i.Wt)}coordinateToPrice(t){const i=this.Jn.zt();return null===i?null:this.Jn.Ft().Ts(t,i.Wt)}barsInLogicalRange(t){if(null===t)return null;const i=new yi(new Si(t.from,t.to)).y_(),s=this.Jn.Xs();if(s.Ki())return null;const n=s.Fr(i.Uh(),1),e=s.Fr(i.bi(),-1),r=a(s.Or()),h=a(s.Ks());if(null!==n&&null!==e&&n.Re>e.Re)return{barsBefore:t.from-r,barsAfter:h-t.to};const l={barsBefore:null===n||n.Re===r?t.from-r:n.Re-r,barsAfter:null===e||e.Re===h?h-t.to:h-e.Re};return null!==n&&null!==e&&(l.from=n.Pw,l.to=e.Pw),l}setData(t){this.o_,this.Jn.Rr(),this.bg.Cg(this.Jn,t),this.Pg("full")}update(t,i=!1){this.Jn.Rr(),this.bg.yg(this.Jn,t,i),this.Pg("update")}dataByIndex(t,i){const s=this.Jn.Xs().Fr(t,i);if(null===s)return null;return Cn(this.seriesType())(s)}data(){const t=Cn(this.seriesType());return this.Jn.Xs().Hr().map((i=>t(i)))}subscribeDataChanged(t){this.Mg.i(t)}unsubscribeDataChanged(t){this.Mg._(t)}applyOptions(t){this.Jn.hr(t)}options(){return p(this.Jn.N())}priceScale(){return this.xg.priceScale(this.Jn.Ft().wa(),this.getPane().paneIndex())}createPriceLine(t){const i=_(p(In),t),s=this.Jn.Lh(i);return new An(s)}removePriceLine(t){this.Jn.Nh(t.gg())}priceLines(){return this.Jn.Fh().map((t=>new An(t)))}seriesType(){return this.Jn.Rr()}attachPrimitive(t){this.Jn.ua(t),t.attached&&t.attached({chart:this.wg,series:this,requestUpdate:()=>this.Jn.Qt().Bh(),horzScaleBehavior:this.o_})}detachPrimitive(t){this.Jn.ca(t),t.detached&&t.detached(),this.Jn.Qt().Bh()}getPane(){const t=this.Jn,i=a(this.Jn.Qt().Hn(t));return this.Sg(i)}moveToPane(t){this.Jn.Qt().Lc(this.Jn,t)}seriesOrder(){const t=this.Jn.Qt().Hn(this.Jn);return null===t?-1:t.Lo().indexOf(this.Jn)}setSeriesOrder(t){const i=this.Jn.Qt().Hn(this.Jn);null!==i&&i.Qo(this.Jn,t)}Pg(t){this.Mg.v()&&this.Mg.p(t)}}class On{constructor(t,i,s){this.kg=new o,this.z_=new o,this.wm=new o,this.ts=t,this.uh=t.It(),this.Xm=i,this.uh.Du().i(this.Tg.bind(this)),this.uh.Eu().i(this.Rg.bind(this)),this.Xm.Pm().i(this.Dg.bind(this)),this.o_=s}m(){this.uh.Du().u(this),this.uh.Eu().u(this),this.Xm.Pm().u(this),this.kg.m(),this.z_.m(),this.wm.m()}scrollPosition(){return this.uh.wu()}scrollToPosition(t,i){i?this.uh.ku(t,1e3):this.ts.fn(t)}scrollToRealTime(){this.uh.yu()}getVisibleRange(){const t=this.uh.su();return null===t?null:{from:t.from.originalTime,to:t.to.originalTime}}setVisibleRange(t){const i={from:this.o_.convertHorzItemToInternal(t.from),to:this.o_.convertHorzItemToInternal(t.to)},s=this.uh.hu(i);this.ts.zc(s)}getVisibleLogicalRange(){const t=this.uh.iu();return null===t?null:{from:t.Uh(),to:t.bi()}}setVisibleLogicalRange(t){r(t.from<=t.to,"The from index cannot be after the to index."),this.ts.zc(t)}resetTimeScale(){this.ts.cn()}fitContent(){this.ts.Iu()}logicalToCoordinate(t){const i=this.ts.It();return i.Ki()?null:i.jt(t)}coordinateToLogical(t){return this.uh.Ki()?null:this.uh.uu(t)}timeToIndex(t,i){const s=this.o_.convertHorzItemToInternal(t);return this.uh.J_(s,i)}timeToCoordinate(t){const i=this.timeToIndex(t,!1);return null===i?null:this.uh.jt(i)}coordinateToTime(t){const i=this.ts.It(),s=i.uu(t),n=i.ss(s);return null===n?null:n.originalTime}width(){return this.Xm.Zf().width}height(){return this.Xm.Zf().height}subscribeVisibleTimeRangeChange(t){this.kg.i(t)}unsubscribeVisibleTimeRangeChange(t){this.kg._(t)}subscribeVisibleLogicalRangeChange(t){this.z_.i(t)}unsubscribeVisibleLogicalRangeChange(t){this.z_._(t)}subscribeSizeChange(t){this.wm.i(t)}unsubscribeSizeChange(t){this.wm._(t)}applyOptions(t){this.uh.hr(t)}options(){return{...p(this.uh.N()),barSpacing:this.uh.vu()}}Tg(){this.kg.v()&&this.kg.p(this.getVisibleRange())}Rg(){this.z_.v()&&this.z_.p(this.getVisibleLogicalRange())}Dg(t){this.wm.p(t.width,t.height)}}function Ln(t){if(void 0===t||"custom"===t.type)return;const i=t;void 0!==i.minMove&&void 0===i.precision&&(i.precision=function(t){if(t>=1)return 0;let i=0;for(;i<8;i++){const s=Math.round(t);if(Math.abs(s-t)<1e-8)return i;t*=10}return i}(i.minMove))}function Nn(t){return function(t){if(f(t.handleScale)){const i=t.handleScale;t.handleScale={axisDoubleClickReset:{time:i,price:i},axisPressedMouseMove:{time:i,price:i},mouseWheel:i,pinch:i}}else if(void 0!==t.handleScale){const{axisPressedMouseMove:i,axisDoubleClickReset:s}=t.handleScale;f(i)&&(t.handleScale.axisPressedMouseMove={time:i,price:i}),f(s)&&(t.handleScale.axisDoubleClickReset={time:s,price:s})}const i=t.handleScroll;f(i)&&(t.handleScroll={horzTouchDrag:i,vertTouchDrag:i,mouseWheel:i,pressedMouseMove:i})}(t),t}class Fn{constructor(t,i,s){this.Eg=new Map,this.Vg=new Map,this.Bg=new o,this.Ig=new o,this.Ag=new o,this.$u=new WeakMap,this.zg=new hn(i);const n=void 0===s?p(En()):_(p(En()),Nn(s));this.Og=i,this.Wf=new Hs(t,n,i),this.Wf.Kv().i((t=>{this.Bg.v()&&this.Bg.p(this.Lg(t()))}),this),this.Wf.Xv().i((t=>{this.Ig.v()&&this.Ig.p(this.Lg(t()))}),this),this.Wf.uc().i((t=>{this.Ag.v()&&this.Ag.p(this.Lg(t()))}),this);const e=this.Wf.Qt();this.Ng=new On(e,this.Wf.tw(),this.Og)}remove(){this.Wf.Kv().u(this),this.Wf.Xv().u(this),this.Wf.uc().u(this),this.Ng.m(),this.Wf.m(),this.Eg.clear(),this.Vg.clear(),this.Bg.m(),this.Ig.m(),this.Ag.m(),this.zg.m()}resize(t,i,s){this.autoSizeActive()||this.Wf.Gm(t,i,s)}addCustomSeries(t,i={},s=0){const n=(t=>({type:"Custom",isBuiltIn:!1,defaultOptions:{...pn,...t.defaultOptions()},Fg:vn,Wg:t}))(l(t));return this.Hg(n,i,s)}addSeries(t,i={},s=0){return this.Hg(t,i,s)}removeSeries(t){const i=h(this.Eg.get(t)),s=this.zg.Ic(i);this.Wf.Qt().Ic(i),this.Ug(s),this.Eg.delete(t),this.Vg.delete(i)}Cg(t,i){this.Ug(this.zg.Fw(t,i))}yg(t,i,s){this.Ug(this.zg.qw(t,i,s))}subscribeClick(t){this.Bg.i(t)}unsubscribeClick(t){this.Bg._(t)}subscribeCrosshairMove(t){this.Ag.i(t)}unsubscribeCrosshairMove(t){this.Ag._(t)}subscribeDblClick(t){this.Ig.i(t)}unsubscribeDblClick(t){this.Ig._(t)}priceScale(t,i=0){return new Vn(this.Wf,t,i)}timeScale(){return this.Ng}applyOptions(t){this.Wf.hr(Nn(t))}options(){return this.Wf.N()}takeScreenshot(){return this.Wf.hw()}addPane(t=!1){const i=this.Wf.Qt().Uc();return i.zo(t),this.$g(i)}removePane(t){this.Wf.Qt().dc(t)}swapPanes(t,i){this.Wf.Qt().vc(t,i)}autoSizeActive(){return this.Wf.uw()}chartElement(){return this.Wf.tp()}panes(){return this.Wf.Qt().$s().map((t=>this.$g(t)))}paneSize(t=0){const i=this.Wf.fw(t);return{height:i.height,width:i.width}}setCrosshairPosition(t,i,s){const n=this.Eg.get(s);if(void 0===n)return;const e=this.Wf.Qt().Hn(n);null!==e&&this.Wf.Qt().Tc(t,i,e)}clearCrosshairPosition(){this.Wf.Qt().Rc(!0)}horzBehaviour(){return this.Og}Hg(i,s={},n=0){r(void 0!==i.Fg),Ln(s.priceFormat),"Candlestick"===i.type&&function(t){void 0!==t.borderColor&&(t.borderUpColor=t.borderColor,t.borderDownColor=t.borderColor),void 0!==t.wickColor&&(t.wickUpColor=t.wickColor,t.wickDownColor=t.wickColor)}(s);const e=_(p(t),p(i.defaultOptions),s),h=i.Fg,a=new Ut(this.Wf.Qt(),i.type,e,h,i.Wg);this.Wf.Qt().Vc(a,n);const l=new zn(a,this,this,this,this.Og,(t=>this.$g(t)));return this.Eg.set(l,a),this.Vg.set(a,l),l}Ug(t){const i=this.Wf.Qt();i.Dc(t.It.ou,t.It.Gw,t.It.Jw),t.Lo.forEach(((t,i)=>i.ht(t.se,t.Zw))),i.It().Y_(),i.pu()}jg(t){return h(this.Vg.get(t))}Lg(t){const i=new Map;t.Rw.forEach(((t,s)=>{const n=s.Rr(),e=Cn(n)(t);if("Custom"!==n)r(js(e));else{const t=s.pa();r(!t||!1===t(e))}i.set(this.jg(s),e)}));const s=void 0!==t.Tw&&this.Vg.has(t.Tw)?this.jg(t.Tw):void 0;return{time:t.Pw,logical:t.Re,point:t.yw,paneIndex:t.kw,hoveredSeries:s,hoveredObjectId:t.Dw,seriesData:i,sourceEvent:t.Ew}}$g(t){let i=this.$u.get(t);return i||(i=new Bn(this.Wf,(t=>this.jg(t)),t,this),this.$u.set(t,i)),i}}function Wn(t){if(d(t)){const i=document.getElementById(t);return r(null!==i,`Cannot find element in DOM with id=${t}`),i}return t}function Hn(t,i,s){const n=Wn(t),e=new Fn(n,i,s);return i.setOptions(e.options()),e}function Un(t,i){return Hn(t,new Ji,Ji.ad(i))}function $n(){return Ji}class jn extends un{constructor(t,i){super(t,i,!0)}ug(t,i,s){i._u(this.sg,m(this.ng)),t.$l(this.sg,s,m(this.ng))}qg(t,i){return{wt:t,gt:i,_t:NaN,ut:NaN}}og(){const t=this.Jn.Rh();this.sg=this.Jn.Xs().Hr().map((i=>{const s=i.Wt[3];return this.Yg(i.Re,s,t)}))}}function qn(t,i,s,n,e,r,h){if(0===i.length||n.from>=i.length||n.to<=0)return;const{context:a,horizontalPixelRatio:l,verticalPixelRatio:o}=t,_=i[n.from];let u=r(t,_),c=_;if(n.to-n.from<2){const i=e/2;a.beginPath();const s={_t:_._t-i,ut:_.ut},n={_t:_._t+i,ut:_.ut};a.moveTo(s._t*l,s.ut*o),a.lineTo(n._t*l,n.ut*o),h(t,u,s,n)}else{const e=(i,s)=>{h(t,u,c,s),a.beginPath(),u=i,c=s};let d=c;a.beginPath(),a.moveTo(_._t*l,_.ut*o);for(let h=n.from+1;h<n.to;++h){d=i[h];const n=r(t,d);switch(s){case 0:a.lineTo(d._t*l,d.ut*o);break;case 1:a.lineTo(d._t*l,i[h-1].ut*o),n!==u&&(e(n,d),a.lineTo(d._t*l,i[h-1].ut*o)),a.lineTo(d._t*l,d.ut*o);break;case 2:{const[t,s]=Zn(i,h-1,h);a.bezierCurveTo(t._t*l,t.ut*o,s._t*l,s.ut*o,d._t*l,d.ut*o);break}}1!==s&&n!==u&&(e(n,d),a.moveTo(d._t*l,d.ut*o))}(c!==d||c===d&&1===s)&&h(t,u,c,d)}}const Yn=6;function Kn(t,i){return{_t:t._t-i._t,ut:t.ut-i.ut}}function Xn(t,i){return{_t:t._t/i,ut:t.ut/i}}function Zn(t,i,s){const n=Math.max(0,i-1),e=Math.min(t.length-1,s+1);var r,h;return[(r=t[i],h=Xn(Kn(t[s],t[n]),Yn),{_t:r._t+h._t,ut:r.ut+h.ut}),Kn(t[s],Xn(Kn(t[e],t[i]),Yn))]}function Gn(t,i){const s=t.context;s.strokeStyle=i,s.stroke()}class Jn extends P{constructor(){super(...arguments),this.rt=null}ht(t){this.rt=t}et(t){if(null===this.rt)return;const{ot:i,lt:s,Kg:e,Xg:r,ct:h,Xt:a,Zg:l}=this.rt;if(null===s)return;const o=t.context;o.lineCap="butt",o.lineWidth=h*t.verticalPixelRatio,n(o,a),o.lineJoin="round";const _=this.Gg.bind(this);void 0!==r&&qn(t,i,r,s,e,_,Gn),l&&function(t,i,s,n,e){if(n.to-n.from<=0)return;const{horizontalPixelRatio:r,verticalPixelRatio:h,context:a}=t;let l=null;const o=Math.max(1,Math.floor(r))%2/2,_=s*h+o;for(let s=n.to-1;s>=n.from;--s){const n=i[s];if(n){const i=e(t,n);i!==l&&(a.beginPath(),null!==l&&a.fill(),a.fillStyle=i,l=i);const s=Math.round(n._t*r)+o,u=n.ut*h;a.moveTo(s,u),a.arc(s,u,_,0,2*Math.PI)}}a.fill()}(t,i,l,s,_)}}class Qn extends Jn{Gg(t,i){return i.vt}}class te extends jn{constructor(){super(...arguments),this.hg=new Qn}Yg(t,i,s){return{...this.qg(t,i),...s.Dr(t)}}cg(){const t=this.Jn.N(),i={ot:this.sg,Xt:t.lineStyle,Xg:t.lineVisible?t.lineType:void 0,ct:t.lineWidth,Zg:t.pointMarkersVisible?t.pointMarkersRadius||t.lineWidth/2+2:void 0,lt:this.ng,Kg:this.Qn.It().vu()};this.hg.ht(i)}}const ie={type:"Line",isBuiltIn:!0,defaultOptions:{color:"#2196f3",lineStyle:0,lineWidth:3,lineType:0,lineVisible:!0,crosshairMarkerVisible:!0,crosshairMarkerRadius:4,crosshairMarkerBorderColor:"",crosshairMarkerBorderWidth:2,crosshairMarkerBackgroundColor:"",lastPriceAnimation:0,pointMarkersVisible:!1},Fg:(t,i)=>new te(t,i)};function se(t,i){return t.weight>i.weight?t:i}class ne{constructor(){this.Jg=new o,this.Qg=function(t){let i=!1;return function(...s){i||(i=!0,queueMicrotask((()=>{t(...s),i=!1})))}}((()=>this.Jg.p(this.tM))),this.tM=0}iM(){return this.Jg}m(){this.Jg.m()}options(){return this.Ps}setOptions(t){this.Ps=t}preprocessData(t){}updateFormatter(t){this.Ps&&(this.Ps.localization=t)}createConverterToInternalObj(t){return this.Qg(),t=>(t>this.tM&&(this.tM=t),t)}key(t){return t}cacheKey(t){return t}convertHorzItemToInternal(t){return t}formatHorzItem(t){return this.sM(t)}formatTickmark(t){return this.sM(t.time)}maxTickMarkWeight(t){return t.reduce(se,t[0]).weight}fillWeightsForPoints(t,i){for(let n=i;n<t.length;++n)t[n].timeWeight=(s=t[n].time)%120==0?10:s%60==0?9:s%36==0?8:s%12==0?7:s%6==0?6:s%3==0?5:s%1==0?4:0;var s;this.tM=t[t.length-1].time,this.Qg()}sM(t){if(this.Ps.localization?.timeFormatter)return this.Ps.localization.timeFormatter(t);if(t<12)return`${t}M`;const i=Math.floor(t/12),s=t%12;return 0===s?`${i}Y`:`${i}Y${s}M`}}const ee={yieldCurve:{baseResolution:1,minimumTimeRange:120,startTimeRange:0},timeScale:{ignoreWhitespaceIndices:!0},leftPriceScale:{visible:!0},rightPriceScale:{visible:!1},localization:{priceFormatter:t=>t.toFixed(3)+"%"}},re={lastValueVisible:!1,priceLineVisible:!1};class he extends Fn{constructor(t,i){const s=_(ee,i||{}),n=new ne;super(t,n,s),n.setOptions(this.options()),this._initWhitespaceSeries()}addSeries(t,i={},s=0){if(t.isBuiltIn&&!1===["Area","Line"].includes(t.type))throw new Error("Yield curve only support Area and Line series");const n={...re,...i};return super.addSeries(t,n,s)}_initWhitespaceSeries(){const t=this.horzBehaviour(),i=this.addSeries(ie);let s;function n(n){const e=function(t,i){return{le:Math.max(0,t.startTimeRange),oe:Math.max(0,t.minimumTimeRange,i||0),nM:Math.max(1,t.baseResolution)}}(t.options().yieldCurve,n),r=(({le:t,oe:i,nM:s})=>`${t}~${i}~${s}`)(e);r!==s&&(s=r,i.setData(function({le:t,oe:i,nM:s}){return Array.from({length:Math.floor((i-t)/s)+1},((i,n)=>({time:t+n*s})))}(e)))}n(0),t.iM().i(n)}}function ae(t,i){const s=Wn(t);return new he(s,i)}function le(t,i){return t.weight>i.weight?t:i}class oe{options(){return this.Ps}setOptions(t){this.Ps=t}preprocessData(t){}updateFormatter(t){this.Ps&&(this.Ps.localization=t)}createConverterToInternalObj(t){return t=>t}key(t){return t}cacheKey(t){return t}convertHorzItemToInternal(t){return t}formatHorzItem(t){return t.toFixed(this.Cn())}formatTickmark(t,i){return t.time.toFixed(this.Cn())}maxTickMarkWeight(t){return t.reduce(le,t[0]).weight}fillWeightsForPoints(t,i){for(let n=i;n<t.length;++n)t[n].timeWeight=(s=t[n].time)===100*Math.ceil(s/100)?8:s===50*Math.ceil(s/50)?7:s===25*Math.ceil(s/25)?6:s===10*Math.ceil(s/10)?5:s===5*Math.ceil(s/5)?4:s===Math.ceil(s)?3:2*s===Math.ceil(2*s)?1:0;var s}Cn(){return this.Ps.localization.precision}}function _e(t,i){return Hn(t,new oe,i)}function ue(t,i,s,n,e){const{context:r,horizontalPixelRatio:h,verticalPixelRatio:a}=i;r.lineTo(e._t*h,t*a),r.lineTo(n._t*h,t*a),r.closePath(),r.fillStyle=s,r.fill()}class ce extends P{constructor(){super(...arguments),this.rt=null}ht(t){this.rt=t}et(t){if(null===this.rt)return;const{ot:i,lt:s,Kg:e,ct:r,Xt:h,Xg:a}=this.rt,l=this.rt.eM??(this.rt.rM?0:t.mediaSize.height);if(null===s)return;const o=t.context;o.lineCap="butt",o.lineJoin="round",o.lineWidth=r,n(o,h),o.lineWidth=1,qn(t,i,a,s,e,this.hM.bind(this),ue.bind(null,l))}}class de{aM(t,i){const s=this.lM,{oM:n,_M:e,uM:r,cM:h,eM:a,dM:l,fM:o}=i;if(void 0===this.pM||void 0===s||s.oM!==n||s._M!==e||s.uM!==r||s.cM!==h||s.eM!==a||s.dM!==l||s.fM!==o){const{verticalPixelRatio:s}=t,_=a||l>0?s:1,u=l*_,c=o===t.bitmapSize.height?o:o*_,d=(a??0)*_,f=t.context.createLinearGradient(0,u,0,c);if(f.addColorStop(0,n),null!=a){const t=Yt((d-u)/(c-u),0,1);f.addColorStop(t,e),f.addColorStop(t,r)}f.addColorStop(1,h),this.pM=f,this.lM=i}return this.pM}}class fe extends ce{constructor(){super(...arguments),this.vM=new de}hM(t,i){const s=this.rt;return this.vM.aM(t,{oM:i.br,_M:i.Sr,uM:i.Cr,cM:i.Pr,eM:s.eM,dM:s.dM??0,fM:s.fM??t.bitmapSize.height})}}class pe extends Jn{constructor(){super(...arguments),this.mM=new de}Gg(t,i){const s=this.rt;return this.mM.aM(t,{oM:i.gr,_M:i.gr,uM:i.Mr,cM:i.Mr,eM:s.eM,dM:s.dM??0,fM:s.fM??t.bitmapSize.height})}}class ve extends jn{constructor(t,i){super(t,i),this.hg=new C,this.wM=new fe,this.gM=new pe,this.hg.st([this.wM,this.gM])}Yg(t,i,s){return{...this.qg(t,i),...s.Dr(t)}}cg(){const t=this.Jn.zt();if(null===t)return;const i=this.Jn.N(),s=this.Jn.Ft().Nt(i.baseValue.price,t.Wt),n=this.Qn.It().vu();if(null===this.ng||0===this.sg.length)return;let e,r;if(i.relativeGradient){e=this.sg[this.ng.from].ut,r=this.sg[this.ng.from].ut;for(let t=this.ng.from;t<this.ng.to;t++){const i=this.sg[t];i.ut<e&&(e=i.ut),i.ut>r&&(r=i.ut)}}this.wM.ht({ot:this.sg,ct:i.lineWidth,Xt:i.lineStyle,Xg:i.lineType,eM:s,dM:e,fM:r,rM:!1,lt:this.ng,Kg:n}),this.gM.ht({ot:this.sg,ct:i.lineWidth,Xt:i.lineStyle,Xg:i.lineVisible?i.lineType:void 0,Zg:i.pointMarkersVisible?i.pointMarkersRadius||i.lineWidth/2+2:void 0,eM:s,dM:e,fM:r,lt:this.ng,Kg:n})}}const me={type:"Baseline",isBuiltIn:!0,defaultOptions:{baseValue:{type:"price",price:0},relativeGradient:!1,topFillColor1:"rgba(38, 166, 154, 0.28)",topFillColor2:"rgba(38, 166, 154, 0.05)",topLineColor:"rgba(38, 166, 154, 1)",bottomFillColor1:"rgba(239, 83, 80, 0.05)",bottomFillColor2:"rgba(239, 83, 80, 0.28)",bottomLineColor:"rgba(239, 83, 80, 1)",lineWidth:3,lineStyle:0,lineType:0,lineVisible:!0,crosshairMarkerVisible:!0,crosshairMarkerRadius:4,crosshairMarkerBorderColor:"",crosshairMarkerBorderWidth:2,crosshairMarkerBackgroundColor:"",lastPriceAnimation:0,pointMarkersVisible:!1},Fg:(t,i)=>new ve(t,i)};class we extends ce{constructor(){super(...arguments),this.vM=new de}hM(t,i){return this.vM.aM(t,{oM:i.mr,_M:"",uM:"",cM:i.wr,dM:this.rt?.dM??0,fM:t.bitmapSize.height})}}class ge extends jn{constructor(t,i){super(t,i),this.hg=new C,this.MM=new we,this.bM=new Qn,this.hg.st([this.MM,this.bM])}Yg(t,i,s){return{...this.qg(t,i),...s.Dr(t)}}cg(){const t=this.Jn.N();if(null===this.ng||0===this.sg.length)return;let i;if(t.relativeGradient){i=this.sg[this.ng.from].ut;for(let t=this.ng.from;t<this.ng.to;t++){const s=this.sg[t];s.ut<i&&(i=s.ut)}}this.MM.ht({Xg:t.lineType,ot:this.sg,Xt:t.lineStyle,ct:t.lineWidth,eM:null,dM:i,rM:t.invertFilledArea,lt:this.ng,Kg:this.Qn.It().vu()}),this.bM.ht({Xg:t.lineVisible?t.lineType:void 0,ot:this.sg,Xt:t.lineStyle,ct:t.lineWidth,lt:this.ng,Kg:this.Qn.It().vu(),Zg:t.pointMarkersVisible?t.pointMarkersRadius||t.lineWidth/2+2:void 0})}}const Me={type:"Area",isBuiltIn:!0,defaultOptions:{topColor:"rgba( 46, 220, 135, 0.4)",bottomColor:"rgba( 40, 221, 100, 0)",invertFilledArea:!1,relativeGradient:!1,lineColor:"#33D778",lineStyle:0,lineWidth:3,lineType:0,lineVisible:!0,crosshairMarkerVisible:!0,crosshairMarkerRadius:4,crosshairMarkerBorderColor:"",crosshairMarkerBorderWidth:2,crosshairMarkerBackgroundColor:"",lastPriceAnimation:0,pointMarkersVisible:!1},Fg:(t,i)=>new ge(t,i)};class be extends P{constructor(){super(...arguments),this.qt=null,this.xM=0,this.SM=0}ht(t){this.qt=t}et({context:t,horizontalPixelRatio:i,verticalPixelRatio:s}){if(null===this.qt||0===this.qt.Xs.length||null===this.qt.lt)return;if(this.xM=this.CM(i),this.xM>=2){Math.max(1,Math.floor(i))%2!=this.xM%2&&this.xM--}this.SM=this.qt.PM?Math.min(this.xM,Math.floor(i)):this.xM;let n=null;const e=this.SM<=this.xM&&this.qt.vu>=Math.floor(1.5*i);for(let r=this.qt.lt.from;r<this.qt.lt.to;++r){const h=this.qt.Xs[r];n!==h.cr&&(t.fillStyle=h.cr,n=h.cr);const a=Math.floor(.5*this.SM),l=Math.round(h._t*i),o=l-a,_=this.SM,u=o+_-1,c=Math.min(h.Kl,h.Xl),d=Math.max(h.Kl,h.Xl),f=Math.round(c*s)-a,p=Math.round(d*s)+a,v=Math.max(p-f,this.SM);t.fillRect(o,f,_,v);const m=Math.ceil(1.5*this.xM);if(e){if(this.qt.yM){const i=l-m;let n=Math.max(f,Math.round(h.Yl*s)-a),e=n+_-1;e>f+v-1&&(e=f+v-1,n=e-_+1),t.fillRect(i,n,o-i,e-n+1)}const i=l+m;let n=Math.max(f,Math.round(h.Zl*s)-a),e=n+_-1;e>f+v-1&&(e=f+v-1,n=e-_+1),t.fillRect(u+1,n,i-u,e-n+1)}}}CM(t){const i=Math.floor(t);return Math.max(i,Math.floor(function(t,i){return Math.floor(.3*t*i)}(a(this.qt).vu,t)))}}class xe extends un{constructor(t,i){super(t,i,!1)}ug(t,i,s){i._u(this.sg,m(this.ng)),t.ql(this.sg,s,m(this.ng))}kM(t,i,s){return{wt:t,jh:i.Wt[0],qh:i.Wt[1],Yh:i.Wt[2],Kh:i.Wt[3],_t:NaN,Yl:NaN,Kl:NaN,Xl:NaN,Zl:NaN}}og(){const t=this.Jn.Rh();this.sg=this.Jn.Xs().Hr().map((i=>this.Yg(i.Re,i,t)))}}class Se extends xe{constructor(){super(...arguments),this.hg=new be}Yg(t,i,s){return{...this.kM(t,i,s),...s.Dr(t)}}cg(){const t=this.Jn.N();this.hg.ht({Xs:this.sg,vu:this.Qn.It().vu(),yM:t.openVisible,PM:t.thinBars,lt:this.ng})}}const Ce={type:"Bar",isBuiltIn:!0,defaultOptions:{upColor:"#26a69a",downColor:"#ef5350",openVisible:!0,thinBars:!0},Fg:(t,i)=>new Se(t,i)};class Pe extends P{constructor(){super(...arguments),this.qt=null,this.xM=0}ht(t){this.qt=t}et(t){if(null===this.qt||0===this.qt.Xs.length||null===this.qt.lt)return;const{horizontalPixelRatio:i}=t;if(this.xM=function(t,i){if(t>=2.5&&t<=4)return Math.floor(3*i);const s=1-.2*Math.atan(Math.max(4,t)-4)/(.5*Math.PI),n=Math.floor(t*s*i),e=Math.floor(t*i),r=Math.min(n,e);return Math.max(Math.floor(i),r)}(this.qt.vu,i),this.xM>=2){Math.floor(i)%2!=this.xM%2&&this.xM--}const s=this.qt.Xs;this.qt.TM&&this.RM(t,s,this.qt.lt),this.qt.Mi&&this._v(t,s,this.qt.lt);const n=this.DM(i);(!this.qt.Mi||this.xM>2*n)&&this.EM(t,s,this.qt.lt)}RM(t,i,s){if(null===this.qt)return;const{context:n,horizontalPixelRatio:e,verticalPixelRatio:r}=t;let h="",a=Math.min(Math.floor(e),Math.floor(this.qt.vu*e));a=Math.max(Math.floor(e),Math.min(a,this.xM));const l=Math.floor(.5*a);let o=null;for(let t=s.from;t<s.to;t++){const s=i[t];s.pr!==h&&(n.fillStyle=s.pr,h=s.pr);const _=Math.round(Math.min(s.Yl,s.Zl)*r),u=Math.round(Math.max(s.Yl,s.Zl)*r),c=Math.round(s.Kl*r),d=Math.round(s.Xl*r);let f=Math.round(e*s._t)-l;const p=f+a-1;null!==o&&(f=Math.max(o+1,f),f=Math.min(f,p));const v=p-f+1;n.fillRect(f,c,v,_-c),n.fillRect(f,u+1,v,d-u),o=p}}DM(t){let i=Math.floor(1*t);this.xM<=2*i&&(i=Math.floor(.5*(this.xM-1)));const s=Math.max(Math.floor(t),i);return this.xM<=2*s?Math.max(Math.floor(t),Math.floor(1*t)):s}_v(t,i,s){if(null===this.qt)return;const{context:n,horizontalPixelRatio:e,verticalPixelRatio:r}=t;let h="";const a=this.DM(e);let l=null;for(let t=s.from;t<s.to;t++){const s=i[t];s.dr!==h&&(n.fillStyle=s.dr,h=s.dr);let o=Math.round(s._t*e)-Math.floor(.5*this.xM);const _=o+this.xM-1,u=Math.round(Math.min(s.Yl,s.Zl)*r),c=Math.round(Math.max(s.Yl,s.Zl)*r);if(null!==l&&(o=Math.max(l+1,o),o=Math.min(o,_)),this.qt.vu*e>2*a)V(n,o,u,_-o+1,c-u+1,a);else{const t=_-o+1;n.fillRect(o,u,t,c-u+1)}l=_}}EM(t,i,s){if(null===this.qt)return;const{context:n,horizontalPixelRatio:e,verticalPixelRatio:r}=t;let h="";const a=this.DM(e);for(let t=s.from;t<s.to;t++){const s=i[t];let l=Math.round(Math.min(s.Yl,s.Zl)*r),o=Math.round(Math.max(s.Yl,s.Zl)*r),_=Math.round(s._t*e)-Math.floor(.5*this.xM),u=_+this.xM-1;if(s.cr!==h){const t=s.cr;n.fillStyle=t,h=t}this.qt.Mi&&(_+=a,l+=a,u-=a,o-=a),l>o||n.fillRect(_,l,u-_+1,o-l+1)}}}class ye extends xe{constructor(){super(...arguments),this.hg=new Pe}Yg(t,i,s){return{...this.kM(t,i,s),...s.Dr(t)}}cg(){const t=this.Jn.N();this.hg.ht({Xs:this.sg,vu:this.Qn.It().vu(),TM:t.wickVisible,Mi:t.borderVisible,lt:this.ng})}}const ke={type:"Candlestick",isBuiltIn:!0,defaultOptions:{upColor:"#26a69a",downColor:"#ef5350",wickVisible:!0,borderVisible:!0,borderColor:"#378658",borderUpColor:"#26a69a",borderDownColor:"#ef5350",wickColor:"#737375",wickUpColor:"#26a69a",wickDownColor:"#ef5350"},Fg:(t,i)=>new ye(t,i)};class Te extends P{constructor(){super(...arguments),this.qt=null,this.VM=[]}ht(t){this.qt=t,this.VM=[]}et({context:t,horizontalPixelRatio:i,verticalPixelRatio:s}){if(null===this.qt||0===this.qt.ot.length||null===this.qt.lt)return;this.VM.length||this.BM(i);const n=Math.max(1,Math.floor(s)),e=Math.round(this.qt.IM*s)-Math.floor(n/2),r=e+n;for(let i=this.qt.lt.from;i<this.qt.lt.to;i++){const h=this.qt.ot[i],a=this.VM[i-this.qt.lt.from],l=Math.round(h.ut*s);let o,_;t.fillStyle=h.cr,l<=e?(o=l,_=r):(o=e,_=l-Math.floor(n/2)+n),t.fillRect(a.Uh,o,a.bi-a.Uh+1,_-o)}}BM(t){if(null===this.qt||0===this.qt.ot.length||null===this.qt.lt)return void(this.VM=[]);const i=Math.ceil(this.qt.vu*t)<=1?0:Math.max(1,Math.floor(t)),s=Math.round(this.qt.vu*t)-i;this.VM=new Array(this.qt.lt.to-this.qt.lt.from);for(let i=this.qt.lt.from;i<this.qt.lt.to;i++){const n=this.qt.ot[i],e=Math.round(n._t*t);let r,h;if(s%2){const t=(s-1)/2;r=e-t,h=e+t}else{const t=s/2;r=e-t,h=e+t-1}this.VM[i-this.qt.lt.from]={Uh:r,bi:h,AM:e,ne:n._t*t,wt:n.wt}}for(let t=this.qt.lt.from+1;t<this.qt.lt.to;t++){const s=this.VM[t-this.qt.lt.from],n=this.VM[t-this.qt.lt.from-1];s.wt===n.wt+1&&(s.Uh-n.bi!==i+1&&(n.AM>n.ne?n.bi=s.Uh-i-1:s.Uh=n.bi+i+1))}let n=Math.ceil(this.qt.vu*t);for(let t=this.qt.lt.from;t<this.qt.lt.to;t++){const i=this.VM[t-this.qt.lt.from];i.bi<i.Uh&&(i.bi=i.Uh);const s=i.bi-i.Uh+1;n=Math.min(s,n)}if(i>0&&n<4)for(let t=this.qt.lt.from;t<this.qt.lt.to;t++){const i=this.VM[t-this.qt.lt.from];i.bi-i.Uh+1>n&&(i.AM>i.ne?i.bi-=1:i.Uh+=1)}}}class Re extends jn{constructor(){super(...arguments),this.hg=new Te}Yg(t,i,s){return{...this.qg(t,i),...s.Dr(t)}}cg(){const t={ot:this.sg,vu:this.Qn.It().vu(),lt:this.ng,IM:this.Jn.Ft().Nt(this.Jn.N().base,a(this.Jn.zt()).Wt)};this.hg.ht(t)}}const De={type:"Histogram",isBuiltIn:!0,defaultOptions:{color:"#26a69a",base:0},Fg:(t,i)=>new Re(t,i)};class Ee{constructor(t,i){this.Pt=t,this.zM=i,this.OM()}detach(){this.Pt.detachPrimitive(this.zM)}getPane(){return this.Pt}applyOptions(t){this.zM.hr?.(t)}OM(){this.Pt.attachPrimitive(this.zM)}}const Ve={visible:!0,horzAlign:"center",vertAlign:"center",lines:[]},Be={color:"rgba(0, 0, 0, 0.5)",fontSize:48,fontFamily:w,fontStyle:"",text:""};class Ie{constructor(t){this.LM=new Map,this.qt=t}draw(t){t.useMediaCoordinateSpace((t=>{if(!this.qt.visible)return;const{context:i,mediaSize:s}=t;let n=0;for(const t of this.qt.lines){if(0===t.text.length)continue;i.font=t.k;const e=this.NM(i,t.text);e>s.width?t.Su=s.width/e:t.Su=1,n+=t.lineHeight*t.Su}let e=0;switch(this.qt.vertAlign){case"top":e=0;break;case"center":e=Math.max((s.height-n)/2,0);break;case"bottom":e=Math.max(s.height-n,0)}for(const t of this.qt.lines){i.save(),i.fillStyle=t.color;let n=0;switch(this.qt.horzAlign){case"left":i.textAlign="left",n=t.lineHeight/2;break;case"center":i.textAlign="center",n=s.width/2;break;case"right":i.textAlign="right",n=s.width-1-t.lineHeight/2}i.translate(n,e),i.textBaseline="top",i.font=t.k,i.scale(t.Su,t.Su),i.fillText(t.text,0,t.FM),i.restore(),e+=t.lineHeight*t.Su}}))}NM(t,i){const s=this.WM(t.font);let n=s.get(i);return void 0===n&&(n=t.measureText(i).width,s.set(i,n)),n}WM(t){let i=this.LM.get(t);return void 0===i&&(i=new Map,this.LM.set(t,i)),i}}class Ae{constructor(t){this.Ps=Oe(t)}yt(t){this.Ps=Oe(t)}renderer(){return new Ie(this.Ps)}}function ze(t){return{...t,k:g(t.fontSize,t.fontFamily,t.fontStyle),lineHeight:t.lineHeight||1.2*t.fontSize,FM:0,Su:0}}function Oe(t){return{...t,lines:t.lines.map(ze)}}function Le(t){return{...Be,...t}}function Ne(t){return{...Ve,...t,lines:t.lines?.map(Le)??[]}}class Fe{constructor(t){this.Ps=Ne(t),this.HM=[new Ae(this.Ps)]}updateAllViews(){this.HM.forEach((t=>t.yt(this.Ps)))}paneViews(){return this.HM}attached({requestUpdate:t}){this.UM=t}detached(){this.UM=void 0}hr(t){this.Ps=Ne({...this.Ps,...t}),this.UM&&this.UM()}}function We(t,i){return new Ee(t,new Fe(i))}const He={alpha:1,padding:0};class Ue{constructor(t){this.qt=t}draw(t){t.useMediaCoordinateSpace((t=>{const i=t.context,s=this.$M(this.qt,t.mediaSize);s&&this.qt.jM&&(i.globalAlpha=this.qt.alpha??1,i.drawImage(this.qt.jM,s._t,s.ut,s.Qi,s.$t))}))}$M(t,i){const{maxHeight:s,maxWidth:n,qM:e,YM:r,padding:h}=t,a=Math.round(i.width/2),l=Math.round(i.height/2),o=h??0;let _=i.width-2*o,u=i.height-2*o;s&&(u=Math.min(u,s)),n&&(_=Math.min(_,n));const c=_/r,d=u/e,f=Math.min(c,d),p=r*f,v=e*f;return{_t:a-.5*p,ut:l-.5*v,$t:v,Qi:p}}}class $e{constructor(t){this.KM=null,this.XM=0,this.ZM=0,this.Ps=t,this.M=je(this.Ps,this.KM,this.XM,this.ZM)}GM(t){void 0!==t.JM&&(this.XM=t.JM),void 0!==t.QM&&(this.ZM=t.QM),void 0!==t.tb&&(this.KM=t.tb),this.yt()}ib(t){this.Ps=t,this.yt()}zOrder(){return"bottom"}yt(){this.M=je(this.Ps,this.KM,this.XM,this.ZM)}renderer(){return new Ue(this.M)}}function je(t,i,s,n){return{...t,jM:i,YM:s,qM:n}}function qe(t){return{...He,...t}}class Ye{constructor(t,i){this.sb=null,this.nb=t,this.Ps=qe(i),this.HM=[new $e(this.Ps)]}updateAllViews(){this.HM.forEach((t=>t.yt()))}paneViews(){return this.HM}attached(t){const{requestUpdate:i}=t;this.eb=i,this.sb=new Image,this.sb.onload=()=>{const t=this.sb?.naturalHeight??1,i=this.sb?.naturalWidth??1;this.HM.forEach((s=>s.GM({QM:t,JM:i,tb:this.sb}))),this.eb&&this.eb()},this.sb.src=this.nb}detached(){this.eb=void 0,this.sb=null}hr(t){this.Ps=qe({...this.Ps,...t}),this.rb(),this.UM&&this.UM()}UM(){this.eb&&this.eb()}rb(){this.HM.forEach((t=>t.ib(this.Ps)))}}function Ke(t,i,s){return new Ee(t,new Ye(i,s))}class Xe{constructor(t,i){this.Jn=t,this.ah=i,this.OM()}detach(){this.Jn.detachPrimitive(this.ah)}getSeries(){return this.Jn}applyOptions(t){this.ah&&this.ah.hr&&this.ah.hr(t)}OM(){this.Jn.attachPrimitive(this.ah)}}const Ze={zOrder:"normal"};function Ge(t,i){return Xt(Math.min(Math.max(t,12),30)*i)}function Je(t,i){switch(t){case"arrowDown":case"arrowUp":return Ge(i,1);case"circle":return Ge(i,.8);case"square":return Ge(i,.7)}}function Qe(t){return function(t){const i=Math.ceil(t);return i%2!=0?i-1:i}(Ge(t,1))}function tr(t){return Math.max(Ge(t,.1),3)}function ir(t,i,s){return i?t:s?Math.ceil(t/2):0}function sr(t,i,s,n){const e=(Je("arrowUp",n)-1)/2*s.hb,r=(Xt(n/2)-1)/2*s.hb;i.beginPath(),t?(i.moveTo(s._t-e,s.ut),i.lineTo(s._t,s.ut-e),i.lineTo(s._t+e,s.ut),i.lineTo(s._t+r,s.ut),i.lineTo(s._t+r,s.ut+e),i.lineTo(s._t-r,s.ut+e),i.lineTo(s._t-r,s.ut)):(i.moveTo(s._t-e,s.ut),i.lineTo(s._t,s.ut+e),i.lineTo(s._t+e,s.ut),i.lineTo(s._t+r,s.ut),i.lineTo(s._t+r,s.ut-e),i.lineTo(s._t-r,s.ut-e),i.lineTo(s._t-r,s.ut)),i.fill()}function nr(t,i,s,n,e,r){const h=(Je("arrowUp",n)-1)/2,a=(Xt(n/2)-1)/2;if(e>=i-a-2&&e<=i+a+2&&r>=(t?s:s-h)-2&&r<=(t?s+h:s)+2)return!0;return(()=>{if(e<i-h-3||e>i+h+3||r<(t?s-h-3:s)||r>(t?s:s+h+3))return!1;const n=Math.abs(e-i);return Math.abs(r-s)+3>=n/2})()}class er{constructor(){this.qt=null,this.Ln=new it,this.F=-1,this.W="",this.Fp="",this.ab="normal"}ht(t){this.qt=t}Nn(t,i,s){this.F===t&&this.W===i||(this.F=t,this.W=i,this.Fp=g(t,i),this.Ln.Vn()),this.ab=s}Yn(t,i){if(null===this.qt||null===this.qt.lt)return null;for(let s=this.qt.lt.from;s<this.qt.lt.to;s++){const n=this.qt.ot[s];if(n&&hr(n,t,i))return{zOrder:"normal",externalId:n.Kn??""}}return null}draw(t){"aboveSeries"!==this.ab&&t.useBitmapCoordinateSpace((t=>{this.et(t)}))}drawBackground(t){"aboveSeries"===this.ab&&t.useBitmapCoordinateSpace((t=>{this.et(t)}))}et({context:t,horizontalPixelRatio:i,verticalPixelRatio:s}){if(null!==this.qt&&null!==this.qt.lt){t.textBaseline="middle",t.font=this.Fp;for(let n=this.qt.lt.from;n<this.qt.lt.to;n++){const e=this.qt.ot[n];void 0!==e.ri&&(e.ri.Qi=this.Ln.Ei(t,e.ri.lb),e.ri.$t=this.F,e.ri._t=e._t-e.ri.Qi/2),rr(e,t,i,s)}}}}function rr(t,i,s,n){i.fillStyle=t.R,void 0!==t.ri&&function(t,i,s,n,e,r){t.save(),t.scale(e,r),t.fillText(i,s,n),t.restore()}(i,t.ri.lb,t.ri._t,t.ri.ut,s,n),function(t,i,s){if(0===t.zr)return;switch(t.ob){case"arrowDown":return void sr(!1,i,s,t.zr);case"arrowUp":return void sr(!0,i,s,t.zr);case"circle":return void function(t,i,s){const n=(Je("circle",s)-1)/2;t.beginPath(),t.arc(i._t,i.ut,n*i.hb,0,2*Math.PI,!1),t.fill()}(i,s,t.zr);case"square":return void function(t,i,s){const n=Je("square",s),e=(n-1)*i.hb/2,r=i._t-e,h=i.ut-e;t.fillRect(r,h,n*i.hb,n*i.hb)}(i,s,t.zr)}t.ob}(t,i,function(t,i,s){const n=Math.max(1,Math.floor(i))%2/2;return{_t:Math.round(t._t*i)+n,ut:t.ut*s,hb:i}}(t,s,n))}function hr(t,i,s){return!(void 0===t.ri||!function(t,i,s,n,e,r){const h=n/2;return e>=t&&e<=t+s&&r>=i-h&&r<=i+h}(t.ri._t,t.ri.ut,t.ri.Qi,t.ri.$t,i,s))||function(t,i,s){if(0===t.zr)return!1;switch(t.ob){case"arrowDown":return nr(!0,t._t,t.ut,t.zr,i,s);case"arrowUp":return nr(!1,t._t,t.ut,t.zr,i,s);case"circle":return function(t,i,s,n,e){const r=2+Je("circle",s)/2,h=t-n,a=i-e;return Math.sqrt(h*h+a*a)<=r}(t._t,t.ut,t.zr,i,s);case"square":return function(t,i,s,n,e){const r=Je("square",s),h=(r-1)/2,a=t-h,l=i-h;return n>=a&&n<=a+r&&e>=l&&e<=l+r}(t._t,t.ut,t.zr,i,s)}}(t,i,s)}function ar(t){return"atPriceTop"===t||"atPriceBottom"===t||"atPriceMiddle"===t}function lr(t,i,s,n,e,r,h,l){const o=function(t,i){if(ar(i.position)&&void 0!==i.price)return i.price;if("value"in(s=t)&&"number"==typeof s.value)return t.value;var s;if(function(t){return"open"in t&&"high"in t&&"low"in t&&"close"in t}(t)){if("inBar"===i.position)return t.close;if("aboveBar"===i.position)return t.high;if("belowBar"===i.position)return t.low}}(s,i);if(void 0===o)return;const _=ar(i.position),c=l.timeScale(),d=u(i.size)?Math.max(i.size,0):1,f=Qe(c.options().barSpacing)*d,p=f/2;t.zr=f;switch(i.position){case"inBar":case"atPriceMiddle":return t.ut=a(h.priceToCoordinate(o)),void(void 0!==t.ri&&(t.ri.ut=t.ut+p+r+.6*e));case"aboveBar":case"atPriceTop":{const i=_?0:n._b;return t.ut=a(h.priceToCoordinate(o))-p-i,void 0!==t.ri&&(t.ri.ut=t.ut-p-.6*e,n._b+=1.2*e),void(_||(n._b+=f+r))}case"belowBar":case"atPriceBottom":{const i=_?0:n.ub;return t.ut=a(h.priceToCoordinate(o))+p+i,void 0!==t.ri&&(t.ri.ut=t.ut+p+r+.6*e,n.ub+=1.2*e),void(_||(n.ub+=f+r))}}}class or{constructor(t,i,s){this.cb=[],this.St=!0,this.fb=!0,this.Gt=new er,this.ge=t,this.Dp=i,this.qt={ot:[],lt:null},this.Ps=s}renderer(){if(!this.ge.options().visible)return null;this.St&&this.pb();const t=this.Dp.options().layout;return this.Gt.Nn(t.fontSize,t.fontFamily,this.Ps.zOrder),this.Gt.ht(this.qt),this.Gt}mb(t){this.cb=t,this.yt("data")}yt(t){this.St=!0,"data"===t&&(this.fb=!0)}wb(t){this.St=!0,this.Ps=t}zOrder(){return"aboveSeries"===this.Ps.zOrder?"top":this.Ps.zOrder}pb(){const t=this.Dp.timeScale(),i=this.cb;this.fb&&(this.qt.ot=i.map((t=>({wt:t.time,_t:0,ut:0,zr:0,ob:t.shape,R:t.color,Kn:t.id,gb:t.gb,ri:void 0}))),this.fb=!1);const s=this.Dp.options().layout;this.qt.lt=null;const n=t.getVisibleLogicalRange();if(null===n)return;const e=new Si(Math.floor(n.from),Math.ceil(n.to));if(null===this.ge.data()[0])return;if(0===this.qt.ot.length)return;let r=NaN;const h=tr(t.options().barSpacing),l={_b:h,ub:h};this.qt.lt=_n(this.qt.ot,e,!0);for(let n=this.qt.lt.from;n<this.qt.lt.to;n++){const e=i[n];e.time!==r&&(l._b=h,l.ub=h,r=e.time);const o=this.qt.ot[n];o._t=a(t.logicalToCoordinate(e.time)),void 0!==e.text&&e.text.length>0&&(o.ri={lb:e.text,_t:0,ut:0,Qi:0,$t:0});const _=this.ge.dataByIndex(e.time,0);null!==_&&lr(o,e,_,l,s.fontSize,h,this.ge,this.Dp)}this.St=!1}}function _r(t){return{...Ze,...t}}class ur{constructor(t){this.sh=null,this.cb=[],this.Mb=[],this.bb=null,this.ge=null,this.Dp=null,this.xb=!0,this.Sb=null,this.Cb=null,this.Pb=null,this.yb=!0,this.Ps=_r(t)}attached(t){this.kb(),this.Dp=t.chart,this.ge=t.series,this.sh=new or(this.ge,a(this.Dp),this.Ps),this.eb=t.requestUpdate,this.ge.subscribeDataChanged((t=>this.Pg(t))),this.yb=!0,this.UM()}UM(){this.eb&&this.eb()}detached(){this.ge&&this.bb&&this.ge.unsubscribeDataChanged(this.bb),this.Dp=null,this.ge=null,this.sh=null,this.bb=null}mb(t){this.yb=!0,this.cb=t,this.kb(),this.xb=!0,this.Cb=null,this.UM()}Tb(){return this.cb}paneViews(){return this.sh?[this.sh]:[]}updateAllViews(){this.Rb()}hitTest(t,i){return this.sh?this.sh.renderer()?.Yn(t,i)??null:null}autoscaleInfo(t,i){if(this.sh){const t=this.Db();if(t)return{priceRange:null,margins:t}}return null}hr(t){this.Ps=_r({...this.Ps,...t}),this.UM&&this.UM()}Db(){const t=a(this.Dp).timeScale().options().barSpacing;if(this.xb||t!==this.Pb){if(this.Pb=t,this.cb.length>0){const i=tr(t),s=1.5*Qe(t)+2*i,n=this.Eb();this.Sb={above:ir(s,n.aboveBar,n.inBar),below:ir(s,n.belowBar,n.inBar)}}else this.Sb=null;this.xb=!1}return this.Sb}Eb(){return null===this.Cb&&(this.Cb=this.cb.reduce(((t,i)=>(t[i.position]||(t[i.position]=!0),t)),{inBar:!1,aboveBar:!1,belowBar:!1,atPriceTop:!1,atPriceBottom:!1,atPriceMiddle:!1})),this.Cb}kb(){if(!this.yb||!this.Dp||!this.ge)return;const t=this.Dp.timeScale(),i=this.ge?.data();if(null==t.getVisibleLogicalRange()||!this.ge||0===i.length)return void(this.Mb=[]);const s=t.timeToIndex(a(i[0].time),!0);this.Mb=this.cb.map(((i,n)=>{const e=t.timeToIndex(i.time,!0),r=e<s?1:-1,h=a(this.ge).dataByIndex(e,r),l={time:t.timeToIndex(a(h).time,!1),position:i.position,shape:i.shape,color:i.color,id:i.id,gb:n,text:i.text,size:i.size,price:i.price,Pw:i.time};if("atPriceTop"===i.position||"atPriceBottom"===i.position||"atPriceMiddle"===i.position){if(void 0===i.price)throw new Error(`Price is required for position ${i.position}`);return{...l,position:i.position,price:i.price}}return{...l,position:i.position,price:i.price}})),this.yb=!1}Rb(t){this.sh&&(this.kb(),this.sh.mb(this.Mb),this.sh.wb(this.Ps),this.sh.yt(t))}Pg(t){this.yb=!0,this.UM()}}class cr extends Xe{constructor(t,i,s){super(t,i),s&&this.setMarkers(s)}setMarkers(t){this.ah.mb(t)}markers(){return this.ah.Tb()}}function dr(t,i,s){const n=new cr(t,new ur(s??{}));return i&&n.setMarkers(i),n}class fr{constructor(t){this.cb=new Map,this.Vb=t}Bb(t,i,s){if(this.Ib(i),void 0!==s){const n=window.setTimeout((()=>{this.cb.delete(i),this.Ab()}),s),e={...t,zb:n,Ob:Date.now()+s};this.cb.set(i,e)}else this.cb.set(i,{...t,zb:void 0,Ob:void 0});this.Ab()}Ib(t){const i=this.cb.get(t);i&&void 0!==i.zb&&window.clearTimeout(i.zb),this.cb.delete(t),this.Ab()}Lb(){for(const[t]of this.cb)this.Ib(t)}Nb(){const t=Date.now(),i=[];for(const[s,n]of this.cb)!n.Ob||n.Ob>t?i.push({time:n.time,sign:n.sign,value:n.value}):this.Ib(s);return i}Fb(t){this.Vb=t}Ab(){this.Vb&&this.Vb()}}const pr={positiveColor:"#22AB94",negativeColor:"#F7525F",updateVisibilityDuration:5e3};class vr{constructor(t,i,s,n){this.qt=t,this.Wb=i,this.Hb=s,this.Ub=n}draw(t){t.useBitmapCoordinateSpace((t=>{const i=t.context,s=Math.max(1,Math.floor(t.horizontalPixelRatio))%2/2,n=4*t.verticalPixelRatio+s;this.qt.forEach((e=>{const r=Math.round(e._t*t.horizontalPixelRatio)+s;i.beginPath();const h=this.$b(e.jb);i.fillStyle=h,i.arc(r,e.ut*t.verticalPixelRatio,n,0,2*Math.PI,!1),i.fill(),e.jb&&(i.strokeStyle=h,i.lineWidth=Math.floor(2*t.horizontalPixelRatio),i.beginPath(),i.moveTo((e._t-4.7)*t.horizontalPixelRatio+s,(e.ut-7*e.jb)*t.verticalPixelRatio),i.lineTo(e._t*t.horizontalPixelRatio+s,(e.ut-7*e.jb-7*e.jb*.5)*t.verticalPixelRatio),i.lineTo((e._t+4.7)*t.horizontalPixelRatio+s,(e.ut-7*e.jb)*t.verticalPixelRatio),i.stroke())}))}))}$b(t){return 0===t?this.Wb:t>0?this.Ub:this.Hb}}class mr{constructor(t,i,s){this.qt=[],this.ge=t,this.uh=i,this.Ps=s}yt(t){this.qt=t.map((t=>{const i=this.ge.priceToCoordinate(t.value);if(null===i)return null;return{_t:a(this.uh.timeToCoordinate(t.time)),ut:i,jb:t.sign}})).filter(v)}renderer(){const t=function(t,i){return function(t,i){return"Area"===i}(0,i)?t.lineColor:t.color}(this.ge.options(),this.ge.seriesType());return new vr(this.qt,t,this.Ps.negativeColor,this.Ps.positiveColor)}}function wr(t,i){return"Line"===i||"Area"===i}class gr{constructor(t){this.Dp=void 0,this.ge=void 0,this.HM=[],this.o_=null,this.qb=new Map,this.Yb=new fr((()=>this.UM())),this.Ps={...pr,...t}}hr(t){this.Ps={...this.Ps,...t},this.UM()}mb(t){this.Yb.Lb();const i=this.o_;i&&t.forEach((t=>{this.Yb.Bb(t,i.key(t.time))}))}Tb(){return this.Yb.Nb()}UM(){this.eb?.()}attached(t){const{chart:i,series:s,requestUpdate:n,horzScaleBehavior:e}=t;this.Dp=i,this.ge=s,this.o_=e;const r=this.ge.seriesType();if("Area"!==r&&"Line"!==r)throw new Error("UpDownMarkersPrimitive is only supported for Area and Line series types");this.HM=[new mr(this.ge,this.Dp.timeScale(),this.Ps)],this.eb=n,this.UM()}detached(){this.Dp=void 0,this.ge=void 0,this.eb=void 0}$p(){return h(this.Dp)}Lo(){return h(this.ge)}updateAllViews(){this.HM.forEach((t=>t.yt(this.Tb())))}paneViews(){return this.HM}ht(t){if(!this.ge)throw new Error("Primitive not attached to series");const i=this.ge.seriesType();this.qb.clear();const s=this.o_;s&&t.forEach((t=>{js(t)&&wr(0,i)&&this.qb.set(s.key(t.time),t.value)})),h(this.ge).setData(t)}yt(t,i){if(!this.ge||!this.o_)throw new Error("Primitive not attached to series");const s=this.ge.seriesType(),n=this.o_.key(t.time);if($s(t)&&this.qb.delete(n),js(t)&&wr(0,s)){const i=this.qb.get(n);i&&this.Yb.Bb({time:t.time,value:t.value,sign:Mr(t.value,i)},n,this.Ps.updateVisibilityDuration)}h(this.ge).update(t,i)}Kb(){this.Yb.Lb()}}function Mr(t,i){return t===i?0:t-i>0?1:-1}class br extends Xe{setData(t){return this.ah.ht(t)}update(t,i){return this.ah.yt(t,i)}markers(){return this.ah.Tb()}setMarkers(t){return this.ah.mb(t)}clearMarkers(){return this.ah.Kb()}}function xr(t,i={}){return new br(t,new gr(i))}const Sr={...t,color:"#2196f3"};function Cr(){return"5.0.8"}export{Me as AreaSeries,Ce as BarSeries,me as BaselineSeries,ke as CandlestickSeries,Vi as ColorType,$ as CrosshairMode,De as HistogramSeries,Di as LastPriceAnimationMode,ie as LineSeries,s as LineStyle,i as LineType,Ct as MismatchDirection,Ei as PriceLineSource,ci as PriceScaleMode,Bi as TickMarkType,Ri as TrackingModeExitMode,Un as createChart,Hn as createChartEx,Ke as createImageWatermark,_e as createOptionsChart,dr as createSeriesMarkers,We as createTextWatermark,xr as createUpDownMarkers,ae as createYieldCurveChart,Sr as customSeriesDefaultOptions,$n as defaultHorzScaleBehavior,Ai as isBusinessDay,zi as isUTCTimestamp,Cr as version};
diff --git a/websites/default/packages/lightweight-charts/v5.0.8/types.d.ts b/websites/default/packages/lightweight-charts/v5.0.8/types.d.ts
new file mode 100644
index 000000000..43b30244a
--- /dev/null
+++ b/websites/default/packages/lightweight-charts/v5.0.8/types.d.ts
@@ -0,0 +1,4893 @@
+// Generated by dts-bundle-generator v9.5.1
+
+type CanvasRenderingTarget2D = any;
+// import { CanvasRenderingTarget2D } from 'fancy-canvas';
+
+declare const areaSeries: SeriesDefinition<"Area">;
+declare const barSeries: SeriesDefinition<"Bar">;
+declare const baselineSeries: SeriesDefinition<"Baseline">;
+declare const candlestickSeries: SeriesDefinition<"Candlestick">;
+declare const histogramSeries: SeriesDefinition<"Histogram">;
+declare const lineSeries: SeriesDefinition<"Line">;
+export declare const customSeriesDefaultOptions: CustomSeriesOptions;
+/**
+ * Enumeration representing the sign of a marker.
+ */
+export declare const enum MarkerSign {
+  /** Represents a negative change (-1) */
+  Negative = -1,
+  /** Represents no change (0) */
+  Neutral = 0,
+  /** Represents a positive change (1) */
+  Positive = 1,
+}
+/**
+ * Represents a type of color.
+ */
+export declare enum ColorType {
+  /** Solid color */
+  Solid = "solid",
+  /** Vertical gradient color */
+  VerticalGradient = "gradient",
+}
+/**
+ * Represents the crosshair mode.
+ */
+export declare enum CrosshairMode {
+  /**
+   * This mode allows crosshair to move freely on the chart.
+   */
+  Normal = 0,
+  /**
+   * This mode sticks crosshair's horizontal line to the price value of a single-value series or to the close price of OHLC-based series.
+   */
+  Magnet = 1,
+  /**
+   * This mode disables rendering of the crosshair.
+   */
+  Hidden = 2,
+  /**
+   * This mode sticks crosshair's horizontal line to the price value of a single-value series or to the open/high/low/close price of OHLC-based series.
+   */
+  MagnetOHLC = 3,
+}
+/**
+ * Represents the type of the last price animation for series such as area or line.
+ */
+export declare enum LastPriceAnimationMode {
+  /**
+   * Animation is always disabled
+   */
+  Disabled = 0,
+  /**
+   * Animation is always enabled.
+   */
+  Continuous = 1,
+  /**
+   * Animation is active after new data.
+   */
+  OnDataUpdate = 2,
+}
+/**
+ * Represents the possible line styles.
+ */
+export declare enum LineStyle {
+  /**
+   * A solid line.
+   */
+  Solid = 0,
+  /**
+   * A dotted line.
+   */
+  Dotted = 1,
+  /**
+   * A dashed line.
+   */
+  Dashed = 2,
+  /**
+   * A dashed line with bigger dashes.
+   */
+  LargeDashed = 3,
+  /**
+   * A dotted line with more space between dots.
+   */
+  SparseDotted = 4,
+}
+/**
+ * Represents the possible line types.
+ */
+export declare enum LineType {
+  /**
+   * A line.
+   */
+  Simple = 0,
+  /**
+   * A stepped line.
+   */
+  WithSteps = 1,
+  /**
+   * A curved line.
+   */
+  Curved = 2,
+}
+/**
+ * Search direction if no data found at provided index
+ */
+export declare enum MismatchDirection {
+  /**
+   * Search the nearest left item
+   */
+  NearestLeft = -1,
+  /**
+   * Do not search
+   */
+  None = 0,
+  /**
+   * Search the nearest right item
+   */
+  NearestRight = 1,
+}
+/**
+ * Represents the source of data to be used for the horizontal price line.
+ */
+export declare enum PriceLineSource {
+  /**
+   * Use the last bar data.
+   */
+  LastBar = 0,
+  /**
+   * Use the last visible data of the chart viewport.
+   */
+  LastVisible = 1,
+}
+/**
+ * Represents the price scale mode.
+ */
+export declare enum PriceScaleMode {
+  /**
+   * Price scale shows prices. Price range changes linearly.
+   */
+  Normal = 0,
+  /**
+   * Price scale shows prices. Price range changes logarithmically.
+   */
+  Logarithmic = 1,
+  /**
+   * Price scale shows percentage values according the first visible value of the price scale.
+   * The first visible value is 0% in this mode.
+   */
+  Percentage = 2,
+  /**
+   * The same as percentage mode, but the first value is moved to 100.
+   */
+  IndexedTo100 = 3,
+}
+/**
+ * Represents the type of a tick mark on the time axis.
+ */
+export declare enum TickMarkType {
+  /**
+   * The start of the year (e.g. it's the first tick mark in a year).
+   */
+  Year = 0,
+  /**
+   * The start of the month (e.g. it's the first tick mark in a month).
+   */
+  Month = 1,
+  /**
+   * A day of the month.
+   */
+  DayOfMonth = 2,
+  /**
+   * A time without seconds.
+   */
+  Time = 3,
+  /**
+   * A time with seconds.
+   */
+  TimeWithSeconds = 4,
+}
+/**
+ * Determine how to exit the tracking mode.
+ *
+ * By default, mobile users will long press to deactivate the scroll and have the ability to check values and dates.
+ * Another press is required to activate the scroll, be able to move left/right, zoom, etc.
+ */
+export declare enum TrackingModeExitMode {
+  /**
+   * Tracking Mode will be deactivated on touch end event.
+   */
+  OnTouchEnd = 0,
+  /**
+   * Tracking Mode will be deactivated on the next tap event.
+   */
+  OnNextTap = 1,
+}
+/**
+ * This function is the simplified main entry point of the Lightweight Charting Library with time points for the horizontal scale.
+ *
+ * @param container - ID of HTML element or element itself
+ * @param options - Any subset of options to be applied at start.
+ * @returns An interface to the created chart
+ */
+export declare function createChart(
+  container: string | HTMLElement,
+  options?: DeepPartial<ChartOptions>,
+): IChartApi;
+/**
+ * This function is the main entry point of the Lightweight Charting Library. If you are using time values
+ * for the horizontal scale then it is recommended that you rather use the {@link createChart} function.
+ *
+ * @template HorzScaleItem - type of points on the horizontal scale
+ * @template THorzScaleBehavior - type of horizontal axis strategy that encapsulate all the specific behaviors of the horizontal scale type
+ *
+ * @param container - ID of HTML element or element itself
+ * @param horzScaleBehavior - Horizontal scale behavior
+ * @param options - Any subset of options to be applied at start.
+ * @returns An interface to the created chart
+ */
+export declare function createChartEx<
+  HorzScaleItem,
+  THorzScaleBehavior extends IHorzScaleBehavior<HorzScaleItem>,
+>(
+  container: string | HTMLElement,
+  horzScaleBehavior: THorzScaleBehavior,
+  options?: DeepPartial<ReturnType<THorzScaleBehavior["options"]>>,
+): IChartApiBase<HorzScaleItem>;
+/**
+ * Creates an image watermark.
+ *
+ * @param pane - Target pane.
+ * @param imageUrl - Image URL.
+ * @param options - Watermark options.
+ *
+ * @returns Image watermark wrapper.
+ *
+ * @example
+ * ```js
+ * import { createImageWatermark } from 'lightweight-charts';
+ *
+ * const firstPane = chart.panes()[0];
+ * const imageWatermark = createImageWatermark(firstPane, '/images/my-image.png', {
+ *   alpha: 0.5,
+ *   padding: 20,
+ * });
+ * // to change options
+ * imageWatermark.applyOptions({ padding: 10 });
+ * // to remove watermark from the pane
+ * imageWatermark.detach();
+ * ```
+ */
+export declare function createImageWatermark<T>(
+  pane: IPaneApi<T>,
+  imageUrl: string,
+  options: DeepPartial<ImageWatermarkOptions>,
+): IImageWatermarkPluginApi<T>;
+/**
+ * Creates an 'options' chart with price values on the horizontal scale.
+ *
+ * This function is used to create a specialized chart type where the horizontal scale
+ * represents price values instead of time. It's particularly useful for visualizing
+ * option chains, price distributions, or any data where price is the primary x-axis metric.
+ *
+ * @param container - The DOM element or its id where the chart will be rendered.
+ * @param options - Optional configuration options for the price chart.
+ * @returns An instance of IChartApiBase configured for price-based horizontal scaling.
+ */
+export declare function createOptionsChart(
+  container: string | HTMLElement,
+  options?: DeepPartial<PriceChartOptions>,
+): IChartApiBase<number>;
+/**
+ * A function to create a series markers primitive.
+ *
+ * @param series - The series to which the primitive will be attached.
+ *
+ * @param markers - An array of markers to be displayed on the series.
+ *
+ * @param options - Options for the series markers plugin.
+ *
+ * @example
+ * ```js
+ * import { createSeriesMarkers } from 'lightweight-charts';
+ *
+ *	const seriesMarkers = createSeriesMarkers(
+ *		series,
+ *		[
+ *			{
+ *				color: 'green',
+ *				position: 'inBar',
+ * 				shape: 'arrowDown',
+ *				time: 1556880900,
+ *			},
+ *		]
+ *	);
+ *  // and then you can modify the markers
+ *  // set it to empty array to remove all markers
+ *  seriesMarkers.setMarkers([]);
+ *
+ *  // `seriesMarkers.markers()` returns current markers
+ * ```
+ */
+export declare function createSeriesMarkers<HorzScaleItem>(
+  series: ISeriesApi<SeriesType, HorzScaleItem>,
+  markers?: SeriesMarker<HorzScaleItem>[],
+  options?: DeepPartial<SeriesMarkersOptions>,
+): ISeriesMarkersPluginApi<HorzScaleItem>;
+/**
+ * Creates an image watermark.
+ *
+ * @param pane - Target pane.
+ * @param options - Watermark options.
+ *
+ * @returns Image watermark wrapper.
+ *
+ * @example
+ * ```js
+ * import { createTextWatermark } from 'lightweight-charts';
+ *
+ * const firstPane = chart.panes()[0];
+ * const textWatermark = createTextWatermark(firstPane, {
+ * 	  horzAlign: 'center',
+ * 	  vertAlign: 'center',
+ * 	  lines: [
+ * 	    {
+ * 	      text: 'Hello',
+ * 	      color: 'rgba(255,0,0,0.5)',
+ * 	      fontSize: 100,
+ * 	      fontStyle: 'bold',
+ * 	    },
+ * 	    {
+ * 	      text: 'This is a text watermark',
+ * 	      color: 'rgba(0,0,255,0.5)',
+ * 	      fontSize: 50,
+ * 	      fontStyle: 'italic',
+ * 	      fontFamily: 'monospace',
+ * 	    },
+ * 	  ],
+ * });
+ * // to change options
+ * textWatermark.applyOptions({ horzAlign: 'left' });
+ * // to remove watermark from the pane
+ * textWatermark.detach();
+ * ```
+ */
+export declare function createTextWatermark<T>(
+  pane: IPaneApi<T>,
+  options: DeepPartial<TextWatermarkOptions>,
+): ITextWatermarkPluginApi<T>;
+/**
+ * Creates and attaches the Series Up Down Markers Plugin.
+ *
+ * @param series - Series to which attach the Up Down Markers Plugin
+ * @param options - options for the Up Down Markers Plugin
+ *
+ * @returns Api for Series Up Down Marker Plugin. {@link ISeriesUpDownMarkerPluginApi}
+ *
+ * @example
+ * ```js
+ * import { createUpDownMarkers, createChart, LineSeries } from 'lightweight-charts';
+ *
+ * const chart = createChart('container');
+ * const lineSeries = chart.addSeries(LineSeries);
+ * const upDownMarkers = createUpDownMarkers(lineSeries, {
+ *     positiveColor: '#22AB94',
+ *     negativeColor: '#F7525F',
+ *     updateVisibilityDuration: 5000,
+ * });
+ * // to add some data
+ * upDownMarkers.setData(
+ *     [
+ *         { time: '2020-02-02', value: 12.34 },
+ *         //... more line series data
+ *     ]
+ * );
+ * // ... Update some values
+ * upDownMarkers.update({ time: '2020-02-02', value: 13.54 }, true);
+ * // to remove plugin from the series
+ * upDownMarkers.detach();
+ * ```
+ */
+export declare function createUpDownMarkers<T>(
+  series: ISeriesApi<SeriesType, T>,
+  options?: Partial<UpDownMarkersPluginOptions>,
+): ISeriesUpDownMarkerPluginApi<T>;
+/**
+ * Creates a yield curve chart with the specified options.
+ *
+ * A yield curve chart differs from the default chart type
+ * in the following ways:
+ * - Horizontal scale is linearly spaced, and defined in monthly
+ * time duration units
+ * - Whitespace is ignored for the crosshair and grid lines
+ *
+ * @param container - ID of HTML element or element itself
+ * @param options - The yield chart options.
+ * @returns An interface to the created chart
+ */
+export declare function createYieldCurveChart(
+  container: string | HTMLElement,
+  options?: DeepPartial<YieldCurveChartOptions>,
+): IYieldCurveChartApi;
+/**
+ * Provides the default implementation of the horizontal scale (time-based) that can be used as a base for extending the horizontal scale with custom behavior.
+ * This allows for the introduction of custom functionality without re-implementing the entire {@link IHorzScaleBehavior}&lt;{@link Time}&gt; interface.
+ *
+ * For further details, refer to the {@link createChartEx} chart constructor method.
+ *
+ * @returns An uninitialized class implementing the {@link IHorzScaleBehavior}&lt;{@link Time}&gt; interface
+ */
+export declare function defaultHorzScaleBehavior(): new () => IHorzScaleBehavior<Time>;
+/**
+ * Check if a time value is a business day object.
+ *
+ * @param time - The time to check.
+ * @returns `true` if `time` is a {@link BusinessDay} object, false otherwise.
+ */
+export declare function isBusinessDay(time: Time): time is BusinessDay;
+/**
+ * Check if a time value is a UTC timestamp number.
+ *
+ * @param time - The time to check.
+ * @returns `true` if `time` is a {@link UTCTimestamp} number, false otherwise.
+ */
+export declare function isUTCTimestamp(time: Time): time is UTCTimestamp;
+/**
+ * Returns the current version as a string. For example `'3.3.0'`.
+ */
+export declare function version(): string;
+/**
+ * Structure describing a single item of data for area series
+ */
+export interface AreaData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional line color value for certain data item. If missed, color from options is used
+   */
+  lineColor?: string;
+  /**
+   * Optional top color value for certain data item. If missed, color from options is used
+   */
+  topColor?: string;
+  /**
+   * Optional bottom color value for certain data item. If missed, color from options is used
+   */
+  bottomColor?: string;
+}
+/**
+ * Represents style options for an area series.
+ */
+export interface AreaStyleOptions {
+  /**
+   * Color of the top part of the area.
+   *
+   * @defaultValue `'rgba( 46, 220, 135, 0.4)'`
+   */
+  topColor: string;
+  /**
+   * Color of the bottom part of the area.
+   *
+   * @defaultValue `'rgba( 40, 221, 100, 0)'`
+   */
+  bottomColor: string;
+  /**
+   * Gradient is relative to the base value and the currently visible range.
+   * If it is false, the gradient is relative to the top and bottom of the chart.
+   *
+   * @defaultValue `false`
+   */
+  relativeGradient: boolean;
+  /**
+   * Invert the filled area. Fills the area above the line if set to true.
+   *
+   * @defaultValue `false`
+   */
+  invertFilledArea: boolean;
+  /**
+   * Line color.
+   *
+   * @defaultValue `'#33D778'`
+   */
+  lineColor: string;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Line width in pixels.
+   *
+   * @defaultValue `3`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Line type.
+   *
+   * @defaultValue {@link LineType.Simple}
+   */
+  lineType: LineType;
+  /**
+   * Show series line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Show circle markers on each point.
+   *
+   * @defaultValue `false`
+   */
+  pointMarkersVisible: boolean;
+  /**
+   * Circle markers radius in pixels.
+   *
+   * @defaultValue `undefined`
+   */
+  pointMarkersRadius?: number;
+  /**
+   * Show the crosshair marker.
+   *
+   * @defaultValue `true`
+   */
+  crosshairMarkerVisible: boolean;
+  /**
+   * Crosshair marker radius in pixels.
+   *
+   * @defaultValue `4`
+   */
+  crosshairMarkerRadius: number;
+  /**
+   * Crosshair marker border color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBorderColor: string;
+  /**
+   * The crosshair marker background color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBackgroundColor: string;
+  /**
+   * Crosshair marker border width in pixels.
+   *
+   * @defaultValue `2`
+   */
+  crosshairMarkerBorderWidth: number;
+  /**
+   * Last price animation mode.
+   *
+   * @defaultValue {@link LastPriceAnimationMode.Disabled}
+   */
+  lastPriceAnimation: LastPriceAnimationMode;
+}
+/**
+ * Represents the margin used when updating a price scale.
+ */
+export interface AutoScaleMargins {
+  /** The number of pixels for bottom margin */
+  below: number;
+  /** The number of pixels for top margin */
+  above: number;
+}
+/**
+ * Represents information used to update a price scale.
+ */
+export interface AutoscaleInfo {
+  /**
+   * Price range.
+   */
+  priceRange: PriceRange | null;
+  /**
+   * Scale margins.
+   */
+  margins?: AutoScaleMargins;
+}
+/**
+ * Represents options for how the time and price axes react to mouse double click.
+ */
+export interface AxisDoubleClickOptions {
+  /**
+   * Enable resetting scaling the time axis by double-clicking the left mouse button.
+   *
+   * @defaultValue `true`
+   */
+  time: boolean;
+  /**
+   * Enable reseting scaling the price axis by by double-clicking the left mouse button.
+   *
+   * @defaultValue `true`
+   */
+  price: boolean;
+}
+/**
+ * Represents options for how the time and price axes react to mouse movements.
+ */
+export interface AxisPressedMouseMoveOptions {
+  /**
+   * Enable scaling the time axis by holding down the left mouse button and moving the mouse.
+   *
+   * @defaultValue `true`
+   */
+  time: boolean;
+  /**
+   * Enable scaling the price axis by holding down the left mouse button and moving the mouse.
+   *
+   * @defaultValue `true`
+   */
+  price: boolean;
+}
+/**
+ * Structure describing a single item of data for bar series
+ */
+export interface BarData<HorzScaleItem = Time> extends OhlcData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+}
+/**
+ * Represents style options for a bar series.
+ */
+export interface BarStyleOptions {
+  /**
+   * Color of rising bars.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  upColor: string;
+  /**
+   * Color of falling bars.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  downColor: string;
+  /**
+   * Show open lines on bars.
+   *
+   * @defaultValue `true`
+   */
+  openVisible: boolean;
+  /**
+   * Show bars as sticks.
+   *
+   * @defaultValue `true`
+   */
+  thinBars: boolean;
+}
+/**
+ * Represents a range of bars and the number of bars outside the range.
+ */
+export interface BarsInfo<HorzScaleItem>
+  extends Partial<IRange<HorzScaleItem>> {
+  /**
+   * The number of bars before the start of the range.
+   * Positive value means that there are some bars before (out of logical range from the left) the {@link IRange.from} logical index in the series.
+   * Negative value means that the first series' bar is inside the passed logical range, and between the first series' bar and the {@link IRange.from} logical index are some bars.
+   */
+  barsBefore: number;
+  /**
+   * The number of bars after the end of the range.
+   * Positive value in the `barsAfter` field means that there are some bars after (out of logical range from the right) the {@link IRange.to} logical index in the series.
+   * Negative value means that the last series' bar is inside the passed logical range, and between the last series' bar and the {@link IRange.to} logical index are some bars.
+   */
+  barsAfter: number;
+}
+/**
+ * Represents a type of priced base value of baseline series type.
+ */
+export interface BaseValuePrice {
+  /**
+   * Distinguished type value.
+   */
+  type: "price";
+  /**
+   * Price value.
+   */
+  price: number;
+}
+/**
+ * Structure describing a single item of data for baseline series
+ */
+export interface BaselineData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional top area top fill color value for certain data item. If missed, color from options is used
+   */
+  topFillColor1?: string;
+  /**
+   * Optional top area bottom fill color value for certain data item. If missed, color from options is used
+   */
+  topFillColor2?: string;
+  /**
+   * Optional top area line color value for certain data item. If missed, color from options is used
+   */
+  topLineColor?: string;
+  /**
+   * Optional bottom area top fill color value for certain data item. If missed, color from options is used
+   */
+  bottomFillColor1?: string;
+  /**
+   * Optional bottom area bottom fill color value for certain data item. If missed, color from options is used
+   */
+  bottomFillColor2?: string;
+  /**
+   * Optional bottom area line color value for certain data item. If missed, color from options is used
+   */
+  bottomLineColor?: string;
+}
+/**
+ * Represents style options for a baseline series.
+ */
+export interface BaselineStyleOptions {
+  /**
+   * Base value of the series.
+   *
+   * @defaultValue `{ type: 'price', price: 0 }`
+   */
+  baseValue: BaseValueType;
+  /**
+   * Gradient is relative to the base value and the currently visible range.
+   * If it is false, the gradient is relative to the top and bottom of the chart.
+   *
+   * @defaultValue `false`
+   */
+  relativeGradient: boolean;
+  /**
+   * The first color of the top area.
+   *
+   * @defaultValue `'rgba(38, 166, 154, 0.28)'`
+   */
+  topFillColor1: string;
+  /**
+   * The second color of the top area.
+   *
+   * @defaultValue `'rgba(38, 166, 154, 0.05)'`
+   */
+  topFillColor2: string;
+  /**
+   * The line color of the top area.
+   *
+   * @defaultValue `'rgba(38, 166, 154, 1)'`
+   */
+  topLineColor: string;
+  /**
+   * The first color of the bottom area.
+   *
+   * @defaultValue `'rgba(239, 83, 80, 0.05)'`
+   */
+  bottomFillColor1: string;
+  /**
+   * The second color of the bottom area.
+   *
+   * @defaultValue `'rgba(239, 83, 80, 0.28)'`
+   */
+  bottomFillColor2: string;
+  /**
+   * The line color of the bottom area.
+   *
+   * @defaultValue `'rgba(239, 83, 80, 1)'`
+   */
+  bottomLineColor: string;
+  /**
+   * Line width.
+   *
+   * @defaultValue `3`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Line type.
+   *
+   * @defaultValue {@link LineType.Simple}
+   */
+  lineType: LineType;
+  /**
+   * Show series line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Show circle markers on each point.
+   *
+   * @defaultValue `false`
+   */
+  pointMarkersVisible: boolean;
+  /**
+   * Circle markers radius in pixels.
+   *
+   * @defaultValue `undefined`
+   */
+  pointMarkersRadius?: number;
+  /**
+   * Show the crosshair marker.
+   *
+   * @defaultValue `true`
+   */
+  crosshairMarkerVisible: boolean;
+  /**
+   * Crosshair marker radius in pixels.
+   *
+   * @defaultValue `4`
+   */
+  crosshairMarkerRadius: number;
+  /**
+   * Crosshair marker border color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBorderColor: string;
+  /**
+   * The crosshair marker background color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBackgroundColor: string;
+  /**
+   * Crosshair marker border width in pixels.
+   *
+   * @defaultValue `2`
+   */
+  crosshairMarkerBorderWidth: number;
+  /**
+   * Last price animation mode.
+   *
+   * @defaultValue {@link LastPriceAnimationMode.Disabled}
+   */
+  lastPriceAnimation: LastPriceAnimationMode;
+}
+/**
+ * Represents a time as a day/month/year.
+ *
+ * @example
+ * ```js
+ * const day = { year: 2019, month: 6, day: 1 }; // June 1, 2019
+ * ```
+ */
+export interface BusinessDay {
+  /**
+   * The year.
+   */
+  year: number;
+  /**
+   * The month.
+   */
+  month: number;
+  /**
+   * The day.
+   */
+  day: number;
+}
+/**
+ * Structure describing a single item of data for candlestick series
+ */
+export interface CandlestickData<HorzScaleItem = Time>
+  extends OhlcData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+  /**
+   * Optional border color value for certain data item. If missed, color from options is used
+   */
+  borderColor?: string;
+  /**
+   * Optional wick color value for certain data item. If missed, color from options is used
+   */
+  wickColor?: string;
+}
+/**
+ * Represents style options for a candlestick series.
+ */
+export interface CandlestickStyleOptions {
+  /**
+   * Color of rising candles.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  upColor: string;
+  /**
+   * Color of falling candles.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  downColor: string;
+  /**
+   * Enable high and low prices candle wicks.
+   *
+   * @defaultValue `true`
+   */
+  wickVisible: boolean;
+  /**
+   * Enable candle borders.
+   *
+   * @defaultValue `true`
+   */
+  borderVisible: boolean;
+  /**
+   * Border color.
+   *
+   * @defaultValue `'#378658'`
+   */
+  borderColor: string;
+  /**
+   * Border color of rising candles.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  borderUpColor: string;
+  /**
+   * Border color of falling candles.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  borderDownColor: string;
+  /**
+   * Wick color.
+   *
+   * @defaultValue `'#737375'`
+   */
+  wickColor: string;
+  /**
+   * Wick color of rising candles.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  wickUpColor: string;
+  /**
+   * Wick color of falling candles.
+   *
+   * @defaultValue `'#ef5350'`
+   */
+  wickDownColor: string;
+}
+/**
+ * Represents common chart options
+ */
+export interface ChartOptionsBase {
+  /**
+   * Width of the chart in pixels
+   *
+   * @defaultValue If `0` (default) or none value provided, then a size of the widget will be calculated based its container's size.
+   */
+  width: number;
+  /**
+   * Height of the chart in pixels
+   *
+   * @defaultValue If `0` (default) or none value provided, then a size of the widget will be calculated based its container's size.
+   */
+  height: number;
+  /**
+   * Setting this flag to `true` will make the chart watch the chart container's size and automatically resize the chart to fit its container whenever the size changes.
+   *
+   * This feature requires [`ResizeObserver`](https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver) class to be available in the global scope.
+   * Note that calling code is responsible for providing a polyfill if required. If the global scope does not have `ResizeObserver`, a warning will appear and the flag will be ignored.
+   *
+   * Please pay attention that `autoSize` option and explicit sizes options `width` and `height` don't conflict with one another.
+   * If you specify `autoSize` flag, then `width` and `height` options will be ignored unless `ResizeObserver` has failed. If it fails then the values will be used as fallback.
+   *
+   * The flag `autoSize` could also be set with and unset with `applyOptions` function.
+   * ```js
+   * const chart = LightweightCharts.createChart(document.body, {
+   *     autoSize: true,
+   * });
+   * ```
+   */
+  autoSize: boolean;
+  /**
+   * Layout options
+   */
+  layout: LayoutOptions;
+  /**
+   * Left price scale options
+   */
+  leftPriceScale: VisiblePriceScaleOptions;
+  /**
+   * Right price scale options
+   */
+  rightPriceScale: VisiblePriceScaleOptions;
+  /**
+   * Overlay price scale options
+   */
+  overlayPriceScales: OverlayPriceScaleOptions;
+  /**
+   * Time scale options
+   */
+  timeScale: HorzScaleOptions;
+  /**
+   * The crosshair shows the intersection of the price and time scale values at any point on the chart.
+   *
+   */
+  crosshair: CrosshairOptions;
+  /**
+   * A grid is represented in the chart background as a vertical and horizontal lines drawn at the levels of visible marks of price and the time scales.
+   */
+  grid: GridOptions;
+  /**
+   * Scroll options, or a boolean flag that enables/disables scrolling
+   */
+  handleScroll: HandleScrollOptions | boolean;
+  /**
+   * Scale options, or a boolean flag that enables/disables scaling
+   */
+  handleScale: HandleScaleOptions | boolean;
+  /**
+   * Kinetic scroll options
+   */
+  kineticScroll: KineticScrollOptions;
+  /** @inheritDoc TrackingModeOptions
+   */
+  trackingMode: TrackingModeOptions;
+  /**
+   * Basic localization options
+   */
+  localization: LocalizationOptionsBase;
+  /**
+   * Whether to add a default pane to the chart
+   * Disable this option when you want to create a chart with no panes and add them manually
+   * @defaultValue `true`
+   */
+  addDefaultPane: boolean;
+}
+/**
+ * Structure describing options of the chart. Series options are to be set separately
+ */
+export interface ChartOptionsImpl<HorzScaleItem> extends ChartOptionsBase {
+  /**
+   * Localization options.
+   */
+  localization: LocalizationOptions<HorzScaleItem>;
+}
+/** Structure describing a crosshair line (vertical or horizontal) */
+export interface CrosshairLineOptions {
+  /**
+   * Crosshair line color.
+   *
+   * @defaultValue `'#758696'`
+   */
+  color: string;
+  /**
+   * Crosshair line width.
+   *
+   * @defaultValue `1`
+   */
+  width: LineWidth;
+  /**
+   * Crosshair line style.
+   *
+   * @defaultValue {@link LineStyle.LargeDashed}
+   */
+  style: LineStyle;
+  /**
+   * Display the crosshair line.
+   *
+   * Note that disabling crosshair lines does not disable crosshair marker on Line and Area series.
+   * It can be disabled by using `crosshairMarkerVisible` option of a relevant series.
+   *
+   * @see {@link LineStyleOptions.crosshairMarkerVisible}
+   * @see {@link AreaStyleOptions.crosshairMarkerVisible}
+   * @see {@link BaselineStyleOptions.crosshairMarkerVisible}
+   * @defaultValue `true`
+   */
+  visible: boolean;
+  /**
+   * Display the crosshair label on the relevant scale.
+   *
+   * @defaultValue `true`
+   */
+  labelVisible: boolean;
+  /**
+   * Crosshair label background color.
+   *
+   * @defaultValue `'#4c525e'`
+   */
+  labelBackgroundColor: string;
+}
+/** Structure describing crosshair options  */
+export interface CrosshairOptions {
+  /**
+   * Crosshair mode
+   *
+   * @defaultValue {@link CrosshairMode.Magnet}
+   */
+  mode: CrosshairMode;
+  /**
+   * Vertical line options.
+   */
+  vertLine: CrosshairLineOptions;
+  /**
+   * Horizontal line options.
+   */
+  horzLine: CrosshairLineOptions;
+}
+/**
+ * Renderer data for an item within the custom series.
+ */
+export interface CustomBarItemData<
+  HorzScaleItem,
+  TData extends CustomData<HorzScaleItem> = CustomData<HorzScaleItem>,
+> {
+  /**
+   * Horizontal coordinate for the item. Measured from the left edge of the pane in pixels.
+   */
+  x: number;
+  /**
+   * Time scale index for the item. This isn't the timestamp but rather the logical index.
+   */
+  time: number;
+  /**
+   * Original data for the item.
+   */
+  originalData: TData;
+  /**
+   * Color assigned for the item, typically used for price line and price scale label.
+   */
+  barColor: string;
+}
+/**
+ * Base structure describing a single item of data for a custom series.
+ *
+ * This type allows for any properties to be defined
+ * within the interface. It is recommended that you extend this interface with
+ * the required data structure.
+ */
+export interface CustomData<HorzScaleItem = Time>
+  extends CustomSeriesWhitespaceData<HorzScaleItem> {
+  /**
+   * If defined then this color will be used for the price line and price scale line
+   * for this specific data item of the custom series.
+   */
+  color?: string;
+}
+/**
+ * Represents a whitespace data item, which is a data point without a value.
+ */
+export interface CustomSeriesWhitespaceData<HorzScaleItem> {
+  /**
+   * The time of the data.
+   */
+  time: HorzScaleItem;
+  /**
+   * Additional custom values which will be ignored by the library, but
+   * could be used by plugins.
+   */
+  customValues?: Record<string, unknown>;
+}
+/**
+ * Represents style options for a custom series.
+ */
+export interface CustomStyleOptions {
+  /**
+   * Color used for the price line and price scale label.
+   */
+  color: string;
+}
+/** Grid line options. */
+export interface GridLineOptions {
+  /**
+   * Line color.
+   *
+   * @defaultValue `'#D6DCDE'`
+   */
+  color: string;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  style: LineStyle;
+  /**
+   * Display the lines.
+   *
+   * @defaultValue `true`
+   */
+  visible: boolean;
+}
+/** Structure describing grid options. */
+export interface GridOptions {
+  /**
+   * Vertical grid line options.
+   */
+  vertLines: GridLineOptions;
+  /**
+   * Horizontal grid line options.
+   */
+  horzLines: GridLineOptions;
+}
+/**
+ * Represents options for how the chart is scaled by the mouse and touch gestures.
+ */
+export interface HandleScaleOptions {
+  /**
+   * Enable scaling with the mouse wheel.
+   *
+   * @defaultValue `true`
+   */
+  mouseWheel: boolean;
+  /**
+   * Enable scaling with pinch/zoom gestures.
+   *
+   * @defaultValue `true`
+   */
+  pinch: boolean;
+  /**
+   * Enable scaling the price and/or time scales by holding down the left mouse button and moving the mouse.
+   */
+  axisPressedMouseMove: AxisPressedMouseMoveOptions | boolean;
+  /**
+   * Enable resetting scaling by double-clicking the left mouse button.
+   */
+  axisDoubleClickReset: AxisDoubleClickOptions | boolean;
+}
+/**
+ * Represents options for how the chart is scrolled by the mouse and touch gestures.
+ */
+export interface HandleScrollOptions {
+  /**
+   * Enable scrolling with the mouse wheel.
+   *
+   * @defaultValue `true`
+   */
+  mouseWheel: boolean;
+  /**
+   * Enable scrolling by holding down the left mouse button and moving the mouse.
+   *
+   * @defaultValue `true`
+   */
+  pressedMouseMove: boolean;
+  /**
+   * Enable horizontal touch scrolling.
+   *
+   * When enabled the chart handles touch gestures that would normally scroll the webpage horizontally.
+   *
+   * @defaultValue `true`
+   */
+  horzTouchDrag: boolean;
+  /**
+   * Enable vertical touch scrolling.
+   *
+   * When enabled the chart handles touch gestures that would normally scroll the webpage vertically.
+   *
+   * @defaultValue `true`
+   */
+  vertTouchDrag: boolean;
+}
+/**
+ * Structure describing a single item of data for histogram series
+ */
+export interface HistogramData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+}
+/**
+ * Represents style options for a histogram series.
+ */
+export interface HistogramStyleOptions {
+  /**
+   * Column color.
+   *
+   * @defaultValue `'#26a69a'`
+   */
+  color: string;
+  /**
+   * Initial level of histogram columns.
+   *
+   * @defaultValue `0`
+   */
+  base: number;
+}
+/**
+ * Options for the time scale; the horizontal scale at the bottom of the chart that displays the time of data.
+ */
+export interface HorzScaleOptions {
+  /**
+   * The margin space in bars from the right side of the chart.
+   *
+   * @defaultValue `0`
+   */
+  rightOffset: number;
+  /**
+   * The space between bars in pixels.
+   *
+   * @defaultValue `6`
+   */
+  barSpacing: number;
+  /**
+   * The minimum space between bars in pixels.
+   *
+   * @defaultValue `0.5`
+   */
+  minBarSpacing: number;
+  /**
+   * The maximum space between bars in pixels.
+   *
+   * Has no effect if value is set to `0`.
+   *
+   * @defaultValue `0`
+   */
+  maxBarSpacing: number;
+  /**
+   * Prevent scrolling to the left of the first bar.
+   *
+   * @defaultValue `false`
+   */
+  fixLeftEdge: boolean;
+  /**
+   * Prevent scrolling to the right of the most recent bar.
+   *
+   * @defaultValue `false`
+   */
+  fixRightEdge: boolean;
+  /**
+   * Prevent changing the visible time range during chart resizing.
+   *
+   * @defaultValue `false`
+   */
+  lockVisibleTimeRangeOnResize: boolean;
+  /**
+   * Prevent the hovered bar from moving when scrolling.
+   *
+   * @defaultValue `false`
+   */
+  rightBarStaysOnScroll: boolean;
+  /**
+   * Show the time scale border.
+   *
+   * @defaultValue `true`
+   */
+  borderVisible: boolean;
+  /**
+   * The time scale border color.
+   *
+   * @defaultValue `'#2B2B43'`
+   */
+  borderColor: string;
+  /**
+   * Show the time scale.
+   *
+   * @defaultValue `true`
+   */
+  visible: boolean;
+  /**
+   * Show the time, not just the date, in the time scale and vertical crosshair label.
+   *
+   * @defaultValue `false`
+   */
+  timeVisible: boolean;
+  /**
+   * Show seconds in the time scale and vertical crosshair label in `hh:mm:ss` format for intraday data.
+   *
+   * @defaultValue `true`
+   */
+  secondsVisible: boolean;
+  /**
+   * Shift the visible range to the right (into the future) by the number of new bars when new data is added.
+   *
+   * Note that this only applies when the last bar is visible.
+   *
+   * @defaultValue `true`
+   */
+  shiftVisibleRangeOnNewBar: boolean;
+  /**
+   * Allow the visible range to be shifted to the right when a new bar is added which
+   * is replacing an existing whitespace time point on the chart.
+   *
+   * Note that this only applies when the last bar is visible & `shiftVisibleRangeOnNewBar` is enabled.
+   *
+   * @defaultValue `false`
+   */
+  allowShiftVisibleRangeOnWhitespaceReplacement: boolean;
+  /**
+   * Draw small vertical line on time axis labels.
+   *
+   * @defaultValue `false`
+   */
+  ticksVisible: boolean;
+  /**
+   * Maximum tick mark label length. Used to override the default 8 character maximum length.
+   *
+   * @defaultValue `undefined`
+   */
+  tickMarkMaxCharacterLength?: number;
+  /**
+   * Changes horizontal scale marks generation.
+   * With this flag equal to `true`, marks of the same weight are either all drawn or none are drawn at all.
+   */
+  uniformDistribution: boolean;
+  /**
+   * Define a minimum height for the time scale.
+   * Note: This value will be exceeded if the
+   * time scale needs more space to display it's contents.
+   *
+   * Setting a minimum height could be useful for ensuring that
+   * multiple charts positioned in a horizontal stack each have
+   * an identical time scale height, or for plugins which
+   * require a bit more space within the time scale pane.
+   *
+   * @defaultValue 0
+   */
+  minimumHeight: number;
+  /**
+   * Allow major time scale labels to be rendered in a bolder font weight.
+   *
+   * @defaultValue true
+   */
+  allowBoldLabels: boolean;
+  /**
+   * Ignore time scale points containing only whitespace (for all series) when
+   * drawing grid lines, tick marks, and snapping the crosshair to time scale points.
+   *
+   * For the yield curve chart type it defaults to `true`.
+   *
+   * @defaultValue false
+   */
+  ignoreWhitespaceIndices: boolean;
+}
+/**
+ * The main interface of a single chart using time for horizontal scale.
+ */
+export interface IChartApi extends IChartApiBase<Time> {
+  /**
+   * Applies new options to the chart
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<ChartOptions>): void;
+}
+/**
+ * The main interface of a single chart.
+ */
+export interface IChartApiBase<HorzScaleItem = Time> {
+  /**
+   * Removes the chart object including all DOM elements. This is an irreversible operation, you cannot do anything with the chart after removing it.
+   */
+  remove(): void;
+  /**
+   * Sets fixed size of the chart. By default chart takes up 100% of its container.
+   *
+   * If chart has the `autoSize` option enabled, and the ResizeObserver is available then
+   * the width and height values will be ignored.
+   *
+   * @param width - Target width of the chart.
+   * @param height - Target height of the chart.
+   * @param forceRepaint - True to initiate resize immediately. One could need this to get screenshot immediately after resize.
+   */
+  resize(width: number, height: number, forceRepaint?: boolean): void;
+  /**
+   * Creates a custom series with specified parameters.
+   *
+   * A custom series is a generic series which can be extended with a custom renderer to
+   * implement chart types which the library doesn't support by default.
+   *
+   * @param customPaneView - A custom series pane view which implements the custom renderer.
+   * @param customOptions - Customization parameters of the series being created.
+   * ```js
+   * const series = chart.addCustomSeries(myCustomPaneView);
+   * ```
+   */
+  addCustomSeries<
+    TData extends CustomData<HorzScaleItem>,
+    TOptions extends CustomSeriesOptions,
+    TPartialOptions extends
+      SeriesPartialOptions<TOptions> = SeriesPartialOptions<TOptions>,
+  >(
+    customPaneView: ICustomSeriesPaneView<HorzScaleItem, TData, TOptions>,
+    customOptions?: SeriesPartialOptions<TOptions>,
+    paneIndex?: number,
+  ): ISeriesApi<
+    "Custom",
+    HorzScaleItem,
+    TData | WhitespaceData<HorzScaleItem>,
+    TOptions,
+    TPartialOptions
+  >;
+  /**
+   * Creates a series with specified parameters.
+   *
+   * @param definition - A series definition.
+   * @param options - Customization parameters of the series being created.
+   * @param paneIndex - An index of the pane where the series should be created.
+   * ```js
+   * const series = chart.addSeries(LineSeries, { lineWidth: 2 });
+   * ```
+   */
+  addSeries<T extends SeriesType>(
+    definition: SeriesDefinition<T>,
+    options?: SeriesPartialOptionsMap[T],
+    paneIndex?: number,
+  ): ISeriesApi<T, HorzScaleItem>;
+  /**
+   * Removes a series of any type. This is an irreversible operation, you cannot do anything with the series after removing it.
+   *
+   * @example
+   * ```js
+   * chart.removeSeries(series);
+   * ```
+   */
+  removeSeries(seriesApi: ISeriesApi<SeriesType, HorzScaleItem>): void;
+  /**
+   * Subscribe to the chart click event.
+   *
+   * @param handler - Handler to be called on mouse click.
+   * @example
+   * ```js
+   * function myClickHandler(param) {
+   *     if (!param.point) {
+   *         return;
+   *     }
+   *
+   *     console.log(`Click at ${param.point.x}, ${param.point.y}. The time is ${param.time}.`);
+   * }
+   *
+   * chart.subscribeClick(myClickHandler);
+   * ```
+   */
+  subscribeClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeClick}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeClick(myClickHandler);
+   * ```
+   */
+  unsubscribeClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Subscribe to the chart double-click event.
+   *
+   * @param handler - Handler to be called on mouse double-click.
+   * @example
+   * ```js
+   * function myDblClickHandler(param) {
+   *     if (!param.point) {
+   *         return;
+   *     }
+   *
+   *     console.log(`Double Click at ${param.point.x}, ${param.point.y}. The time is ${param.time}.`);
+   * }
+   *
+   * chart.subscribeDblClick(myDblClickHandler);
+   * ```
+   */
+  subscribeDblClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeDblClick}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeDblClick(myDblClickHandler);
+   * ```
+   */
+  unsubscribeDblClick(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Subscribe to the crosshair move event.
+   *
+   * @param handler - Handler to be called on crosshair move.
+   * @example
+   * ```js
+   * function myCrosshairMoveHandler(param) {
+   *     if (!param.point) {
+   *         return;
+   *     }
+   *
+   *     console.log(`Crosshair moved to ${param.point.x}, ${param.point.y}. The time is ${param.time}.`);
+   * }
+   *
+   * chart.subscribeCrosshairMove(myCrosshairMoveHandler);
+   * ```
+   */
+  subscribeCrosshairMove(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeCrosshairMove}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeCrosshairMove(myCrosshairMoveHandler);
+   * ```
+   */
+  unsubscribeCrosshairMove(handler: MouseEventHandler<HorzScaleItem>): void;
+  /**
+   * Returns API to manipulate a price scale.
+   *
+   * @param priceScaleId - ID of the price scale.
+   * @param paneIndex - Index of the pane (default: 0)
+   * @returns Price scale API.
+   */
+  priceScale(priceScaleId: string, paneIndex?: number): IPriceScaleApi;
+  /**
+   * Returns API to manipulate the time scale
+   *
+   * @returns Target API
+   */
+  timeScale(): ITimeScaleApi<HorzScaleItem>;
+  /**
+   * Applies new options to the chart
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<ChartOptionsImpl<HorzScaleItem>>): void;
+  /**
+   * Returns currently applied options
+   *
+   * @returns Full set of currently applied options, including defaults
+   */
+  options(): Readonly<ChartOptionsImpl<HorzScaleItem>>;
+  /**
+   * Make a screenshot of the chart with all the elements excluding crosshair.
+   *
+   * @returns A canvas with the chart drawn on. Any `Canvas` methods like `toDataURL()` or `toBlob()` can be used to serialize the result.
+   */
+  takeScreenshot(): HTMLCanvasElement;
+  /**
+   * Add a pane to the chart
+   * @param preserveEmptyPane - Whether to preserve the empty pane
+   * @returns The pane API
+   */
+  addPane(preserveEmptyPane?: boolean): IPaneApi<HorzScaleItem>;
+  /**
+   * Returns array of panes' API
+   *
+   * @returns array of pane's Api
+   */
+  panes(): IPaneApi<HorzScaleItem>[];
+  /**
+   * Removes a pane with index
+   *
+   * @param index - the pane to be removed
+   */
+  removePane(index: number): void;
+  /**
+   * swap the position of two panes.
+   *
+   * @param first - the first index
+   * @param second - the second index
+   */
+  swapPanes(first: number, second: number): void;
+  /**
+   * Returns the active state of the `autoSize` option. This can be used to check
+   * whether the chart is handling resizing automatically with a `ResizeObserver`.
+   *
+   * @returns Whether the `autoSize` option is enabled and the active.
+   */
+  autoSizeActive(): boolean;
+  /**
+   * Returns the generated div element containing the chart. This can be used for adding your own additional event listeners, or for measuring the
+   * elements dimensions and position within the document.
+   *
+   * @returns generated div element containing the chart.
+   */
+  chartElement(): HTMLDivElement;
+  /**
+   * Set the crosshair position within the chart.
+   *
+   * Usually the crosshair position is set automatically by the user's actions. However in some cases you may want to set it explicitly.
+   *
+   * For example if you want to synchronise the crosshairs of two separate charts.
+   *
+   * @param price - The price (vertical coordinate) of the new crosshair position.
+   * @param horizontalPosition - The horizontal coordinate (time by default) of the new crosshair position.
+   */
+  setCrosshairPosition(
+    price: number,
+    horizontalPosition: HorzScaleItem,
+    seriesApi: ISeriesApi<SeriesType, HorzScaleItem>,
+  ): void;
+  /**
+   * Clear the crosshair position within the chart.
+   */
+  clearCrosshairPosition(): void;
+  /**
+   * Returns the dimensions of the chart pane (the plot surface which excludes time and price scales).
+   * This would typically only be useful for plugin development.
+   *
+   * @param paneIndex - The index of the pane
+   * @defaultValue `0`
+   * @returns Dimensions of the chart pane
+   */
+  paneSize(paneIndex?: number): PaneSize;
+  /**
+   * Returns the horizontal scale behaviour.
+   */
+  horzBehaviour(): IHorzScaleBehavior<HorzScaleItem>;
+}
+/**
+ * Renderer for the custom series. This paints on the main chart pane.
+ */
+export interface ICustomSeriesPaneRenderer {
+  /**
+   * Draw function for the renderer.
+   *
+   * @param target - canvas context to draw on, refer to FancyCanvas library for more details about this class.
+   * @param priceConverter - converter function for changing prices into vertical coordinate values.
+   * @param isHovered - Whether the series is hovered.
+   * @param hitTestData - Optional hit test data for the series.
+   */
+  draw(
+    target: CanvasRenderingTarget2D,
+    priceConverter: PriceToCoordinateConverter,
+    isHovered: boolean,
+    hitTestData?: unknown,
+  ): void;
+}
+/**
+ * This interface represents the view for the custom series
+ */
+export interface ICustomSeriesPaneView<
+  HorzScaleItem = Time,
+  TData extends CustomData<HorzScaleItem> = CustomData<HorzScaleItem>,
+  TSeriesOptions extends CustomSeriesOptions = CustomSeriesOptions,
+> {
+  /**
+   * This method returns a renderer - special object to draw data for the series
+   * on the main chart pane.
+   *
+   * @returns an renderer object to be used for drawing.
+   */
+  renderer(): ICustomSeriesPaneRenderer;
+  /**
+   * This method will be called with the latest data for the renderer to use
+   * during the next paint.
+   */
+  update(
+    data: PaneRendererCustomData<HorzScaleItem, TData>,
+    seriesOptions: TSeriesOptions,
+  ): void;
+  /**
+   * A function for interpreting the custom series data and returning an array of numbers
+   * representing the price values for the item. These price values are used
+   * by the chart to determine the auto-scaling (to ensure the items are in view) and the crosshair
+   * and price line positions. The last value in the array will be used as the current value. You shouldn't need to
+   * have more than 3 values in this array since the library only needs a largest, smallest, and current value.
+   */
+  priceValueBuilder(plotRow: TData): CustomSeriesPricePlotValues;
+  /**
+   * A function for testing whether a data point should be considered fully specified, or if it should
+   * be considered as whitespace. Should return `true` if is whitespace.
+   *
+   * @param data - data point to be tested
+   */
+  isWhitespace(
+    data: TData | CustomSeriesWhitespaceData<HorzScaleItem>,
+  ): data is CustomSeriesWhitespaceData<HorzScaleItem>;
+  /**
+   * Default options
+   */
+  defaultOptions(): TSeriesOptions;
+  /**
+   * This method will be evoked when the series has been removed from the chart. This method should be used to
+   * clean up any objects, references, and other items that could potentially cause memory leaks.
+   *
+   * This method should contain all the necessary code to clean up the object before it is removed from memory.
+   * This includes removing any event listeners or timers that are attached to the object, removing any references
+   * to other objects, and resetting any values or properties that were modified during the lifetime of the object.
+   */
+  destroy?(): void;
+}
+/**
+ * Class interface for Horizontal scale behavior
+ */
+export interface IHorzScaleBehavior<HorzScaleItem> {
+  /**
+   * Structure describing options of the chart.
+   *
+   * @returns ChartOptionsBase
+   */
+  options(): ChartOptionsImpl<HorzScaleItem>;
+  /**
+   * Set the chart options. Note that this is different to `applyOptions` since the provided options will overwrite the current options
+   * instead of merging with the current options.
+   *
+   * @param options - Chart options to be set
+   * @returns void
+   */
+  setOptions(options: ChartOptionsImpl<HorzScaleItem>): void;
+  /**
+   * Method to preprocess the data.
+   *
+   * @param data - Data items for the series
+   * @returns void
+   */
+  preprocessData(
+    data: DataItem<HorzScaleItem> | DataItem<HorzScaleItem>[],
+  ): void;
+  /**
+   * Convert horizontal scale item into an internal horizontal scale item.
+   *
+   * @param item - item to be converted
+   * @returns InternalHorzScaleItem
+   */
+  convertHorzItemToInternal(item: HorzScaleItem): InternalHorzScaleItem;
+  /**
+   * Creates and returns a converter for changing series data into internal horizontal scale items.
+   *
+   * @param data - series data
+   * @returns HorzScaleItemConverterToInternalObj
+   */
+  createConverterToInternalObj(
+    data: SeriesDataItemTypeMap<HorzScaleItem>[SeriesType][],
+  ): HorzScaleItemConverterToInternalObj<HorzScaleItem>;
+  /**
+   * Returns the key for the specified horizontal scale item.
+   *
+   * @param internalItem - horizontal scale item for which the key should be returned
+   * @returns InternalHorzScaleItemKey
+   */
+  key(
+    internalItem: InternalHorzScaleItem | HorzScaleItem,
+  ): InternalHorzScaleItemKey;
+  /**
+   * Returns the cache key for the specified horizontal scale item.
+   *
+   * @param internalItem - horizontal scale item for which the cache key should be returned
+   * @returns number
+   */
+  cacheKey(internalItem: InternalHorzScaleItem): number;
+  /**
+   * Update the formatter with the localization options.
+   *
+   * @param options - Localization options
+   * @returns void
+   */
+  updateFormatter(options: LocalizationOptions<HorzScaleItem>): void;
+  /**
+   * Format the horizontal scale item into a display string.
+   *
+   * @param item - horizontal scale item to be formatted as a string
+   * @returns string
+   */
+  formatHorzItem(item: InternalHorzScaleItem): string;
+  /**
+   * Format the horizontal scale tickmark into a display string.
+   *
+   * @param item - tickmark item
+   * @param localizationOptions - Localization options
+   * @returns string
+   */
+  formatTickmark(
+    item: TickMark,
+    localizationOptions: LocalizationOptions<HorzScaleItem>,
+  ): string;
+  /**
+   * Returns the maximum tickmark weight value for the specified tickmarks on the time scale.
+   *
+   * @param marks - Timescale tick marks
+   * @returns TickMarkWeightValue
+   */
+  maxTickMarkWeight(marks: TimeMark[]): TickMarkWeightValue;
+  /**
+   * Fill the weights for the sorted time scale points.
+   *
+   * @param sortedTimePoints - sorted time scale points
+   * @param startIndex - starting index
+   * @returns void
+   */
+  fillWeightsForPoints(
+    sortedTimePoints: readonly Mutable<TimeScalePoint>[],
+    startIndex: number,
+  ): void;
+  /**
+   * If returns true, then the tick mark formatter will be called for all the visible
+   * tick marks even if the formatter has previously been called for a specific tick mark.
+   * This allows you to change the formatting on all the tick marks.
+   *
+   * @param tickMarks - array of tick marks
+   * @returns boolean
+   */
+  shouldResetTickmarkLabels?(tickMarks: readonly TickMark[]): boolean;
+}
+/**
+ * Represents the interface for interacting with a pane in a lightweight chart.
+ */
+export interface IPaneApi<HorzScaleItem> {
+  /**
+   * Retrieves the height of the pane in pixels.
+   *
+   * @returns The height of the pane in pixels.
+   */
+  getHeight(): number;
+  /**
+   * Sets the height of the pane.
+   *
+   * @param height - The number of pixels to set as the height of the pane.
+   */
+  setHeight(height: number): void;
+  /**
+   * Moves the pane to a new position.
+   *
+   * @param paneIndex - The target index of the pane. Should be a number between 0 and the total number of panes - 1.
+   */
+  moveTo(paneIndex: number): void;
+  /**
+   * Retrieves the index of the pane.
+   *
+   * @returns The index of the pane. It is a number between 0 and the total number of panes - 1.
+   */
+  paneIndex(): number;
+  /**
+   * Retrieves the array of series for the current pane.
+   *
+   * @returns An array of series.
+   */
+  getSeries(): ISeriesApi<SeriesType, HorzScaleItem>[];
+  /**
+   * Retrieves the HTML element of the pane.
+   *
+   * @returns The HTML element of the pane or null if pane wasn't created yet.
+   */
+  getHTMLElement(): HTMLElement | null;
+  /**
+   * Attaches additional drawing primitive to the pane
+   *
+   * @param primitive - any implementation of IPanePrimitive interface
+   */
+  attachPrimitive(primitive: IPanePrimitive<HorzScaleItem>): void;
+  /**
+   * Detaches additional drawing primitive from the pane
+   *
+   * @param primitive - implementation of IPanePrimitive interface attached before
+   * Does nothing if specified primitive was not attached
+   */
+  detachPrimitive(primitive: IPanePrimitive<HorzScaleItem>): void;
+  /**
+   * Returns the price scale with the given id.
+   *
+   * @param priceScaleId - ID of the price scale to find
+   * @throws If the price scale with the given id is not found in this pane
+   */
+  priceScale(priceScaleId: string): IPriceScaleApi;
+  /**
+   * Sets whether to preserve the empty pane
+   *
+   * @param preserve - Whether to preserve the empty pane
+   */
+  setPreserveEmptyPane(preserve: boolean): void;
+  /**
+   * Returns whether to preserve the empty pane
+   *
+   * @returns Whether to preserve the empty pane
+   */
+  preserveEmptyPane(): boolean;
+  /**
+   * Returns the stretch factor of the pane.
+   * Stretch factor determines the relative size of the pane compared to other panes.
+   *
+   * @returns The stretch factor of the pane. Default is 1
+   */
+  getStretchFactor(): number;
+  /**
+   * Sets the stretch factor of the pane.
+   * When you creating a pane, the stretch factor is 1 by default.
+   * So if you have three panes, and you want to make the first pane twice as big as the second and third panes, you can set the stretch factor of the first pane to 2000.
+   * Example:
+   * ```js
+   * const pane1 = chart.addPane();
+   * const pane2 = chart.addPane();
+   * const pane3 = chart.addPane();
+   * pane1.setStretchFactor(0.2);
+   * pane2.setStretchFactor(0.3);
+   * pane3.setStretchFactor(0.5);
+   * // Now the first pane will be 20% of the total height, the second pane will be 30% of the total height, and the third pane will be 50% of the total height.
+   * // Note: if you have one pane with default stretch factor of 1 and set other pane's stretch factor to 50,
+   * // library will try to make second pane 50 times smaller than the first pane
+   * ```
+   * @param stretchFactor - The stretch factor of the pane.
+   */
+  setStretchFactor(stretchFactor: number): void;
+  /**
+   * Creates a custom series with specified parameters.
+   *
+   * A custom series is a generic series which can be extended with a custom renderer to
+   * implement chart types which the library doesn't support by default.
+   *
+   * @param customPaneView - A custom series pane view which implements the custom renderer.
+   * @param customOptions - Customization parameters of the series being created.
+   * ```js
+   * const series = pane.addCustomSeries(myCustomPaneView);
+   * ```
+   */
+  addCustomSeries<
+    TData extends CustomData<HorzScaleItem>,
+    TOptions extends CustomSeriesOptions,
+    TPartialOptions extends
+      SeriesPartialOptions<TOptions> = SeriesPartialOptions<TOptions>,
+  >(
+    customPaneView: ICustomSeriesPaneView<HorzScaleItem, TData, TOptions>,
+    customOptions?: SeriesPartialOptions<TOptions>,
+  ): ISeriesApi<
+    "Custom",
+    HorzScaleItem,
+    TData | WhitespaceData<HorzScaleItem>,
+    TOptions,
+    TPartialOptions
+  >;
+  /**
+   * Creates a series with specified parameters.
+   *
+   * @param definition - A series definition.
+   * @param options - Customization parameters of the series being created.
+   * ```js
+   * const series = pane.addSeries(LineSeries, { lineWidth: 2 });
+   * ```
+   */
+  addSeries<T extends SeriesType>(
+    definition: SeriesDefinition<T>,
+    options?: SeriesPartialOptionsMap[T],
+  ): ISeriesApi<T, HorzScaleItem>;
+}
+/**
+ * Base interface for series primitives. It must be implemented to add some external graphics to series
+ */
+export interface IPanePrimitiveBase<TPaneAttachedParameters = unknown> {
+  /**
+   * This method is called when viewport has been changed, so primitive have to recalculate / invalidate its data
+   */
+  updateAllViews?(): void;
+  /**
+   * Returns array of objects representing primitive in the main area of the chart
+   *
+   * @returns array of objects; each of then must implement IPrimitivePaneView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  paneViews?(): readonly IPanePrimitivePaneView[];
+  /**
+   * Attached Lifecycle hook.
+   *
+   * @param param - An object containing useful references for the attached primitive to use.
+   * @returns void
+   */
+  attached?(param: TPaneAttachedParameters): void;
+  /**
+   * Detached Lifecycle hook.
+   *
+   * @returns void
+   */
+  detached?(): void;
+  /**
+   * Hit test method which will be called by the library when the cursor is moved.
+   * Use this to register object ids being hovered for use within the crosshairMoved
+   * and click events emitted by the chart. Additionally, the hit test result can
+   * specify a preferred cursor type to display for the main chart pane. This method
+   * should return the top most hit for this primitive if more than one object is
+   * being intersected.
+   *
+   * @param x - x Coordinate of mouse event
+   * @param y - y Coordinate of mouse event
+   */
+  hitTest?(x: number, y: number): PrimitiveHoveredItem | null;
+}
+/**
+ * This interface represents the primitive for one of the pane of the chart (main chart area, time scale, price scale).
+ */
+export interface IPanePrimitivePaneView {
+  /**
+   * Defines where in the visual layer stack the renderer should be executed. Default is `'normal'`.
+   *
+   * @returns the desired position in the visual layer stack. @see {@link PrimitivePaneViewZOrder}
+   */
+  zOrder?(): PrimitivePaneViewZOrder;
+  /**
+   * This method returns a renderer - special object to draw data
+   *
+   * @returns an renderer object to be used for drawing, or `null` if we have nothing to draw.
+   */
+  renderer(): IPrimitivePaneRenderer | null;
+}
+/**
+ * Interface for a pane primitive.
+ */
+export interface IPanePrimitiveWrapper<T, Options> {
+  /**
+   * Detaches the plugin from the pane.
+   */
+  detach: () => void;
+  /**
+   * Returns the current pane.
+   */
+  getPane: () => IPaneApi<T>;
+  /**
+   * Applies options to the primitive.
+   * @param options - Options to apply. The options are deeply merged with the current options.
+   */
+  applyOptions?: (options: DeepPartial<Options>) => void;
+}
+/** Interface to be implemented by the object in order to be used as a price formatter */
+export interface IPriceFormatter {
+  /**
+   * Formatting function
+   *
+   * @param price - Original price to be formatted
+   * @returns Formatted price
+   */
+  format(price: number): string;
+  /**
+   * A formatting function for price scale tick marks. Use this function to define formatting rules based on all provided price values.
+   * @param prices - Prices to be formatted
+   * @returns Formatted prices
+   */
+  formatTickmarks(prices: readonly number[]): string[];
+}
+/**
+ * Represents the interface for interacting with price lines.
+ */
+export interface IPriceLine {
+  /**
+   * Apply options to the price line.
+   *
+   * @param options - Any subset of options.
+   * @example
+   * ```js
+   * priceLine.applyOptions({
+   *     price: 90.0,
+   *     color: 'red',
+   *     lineWidth: 3,
+   *     lineStyle: LightweightCharts.LineStyle.Dashed,
+   *     axisLabelVisible: false,
+   *     title: 'P/L 600',
+   * });
+   * ```
+   */
+  applyOptions(options: Partial<PriceLineOptions>): void;
+  /**
+   * Get the currently applied options.
+   */
+  options(): Readonly<PriceLineOptions>;
+}
+/** Interface to control chart's price scale */
+export interface IPriceScaleApi {
+  /**
+   * Applies new options to the price scale
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<PriceScaleOptions>): void;
+  /**
+   * Returns currently applied options of the price scale
+   *
+   * @returns Full set of currently applied options, including defaults
+   */
+  options(): Readonly<PriceScaleOptions>;
+  /**
+   * Returns a width of the price scale if it's visible or 0 if invisible.
+   */
+  width(): number;
+  /**
+   * Sets the visible range of the price scale.
+   *
+   * @param range - The visible range to set, with `from` and `to` properties.
+   */
+  setVisibleRange(range: IRange<number>): void;
+  /**
+   * Returns the visible range of the price scale.
+   *
+   * @returns The visible range of the price scale, or null if the range is not set.
+   */
+  getVisibleRange(): IRange<number> | null;
+  /**
+   * Sets the auto scale mode of the price scale.
+   *
+   * @param on - If true, enables auto scaling; if false, disables it.
+   */
+  setAutoScale(on: boolean): void;
+}
+/**
+ * This interface represents rendering some element on the canvas
+ */
+export interface IPrimitivePaneRenderer {
+  /**
+   * Method to draw main content of the element
+   *
+   * @param target - canvas context to draw on, refer to FancyCanvas library for more details about this class
+   *
+   */
+  draw(target: CanvasRenderingTarget2D): void;
+  /**
+   * Optional method to draw the background.
+   * Some elements could implement this method to draw on the background of the chart.
+   * Usually this is some kind of watermarks or time areas highlighting.
+   *
+   * @param target - canvas context to draw on, refer FancyCanvas library for more details about this class
+   */
+  drawBackground?(target: CanvasRenderingTarget2D): void;
+}
+/**
+ * This interface represents the primitive for one of the pane of the chart (main chart area, time scale, price scale).
+ */
+export interface IPrimitivePaneView {
+  /**
+   * Defines where in the visual layer stack the renderer should be executed. Default is `'normal'`.
+   *
+   * @returns the desired position in the visual layer stack. @see {@link PrimitivePaneViewZOrder}
+   */
+  zOrder?(): PrimitivePaneViewZOrder;
+  /**
+   * This method returns a renderer - special object to draw data
+   *
+   * @returns an renderer object to be used for drawing, or `null` if we have nothing to draw.
+   */
+  renderer(): IPrimitivePaneRenderer | null;
+}
+/**
+ * Represents a generic range `from` one value `to` another.
+ */
+export interface IRange<T> {
+  /**
+   * The from value. The start of the range.
+   */
+  from: T;
+  /**
+   * The to value. The end of the range.
+   */
+  to: T;
+}
+/**
+ * Represents the interface for interacting with series.
+ */
+export interface ISeriesApi<
+  TSeriesType extends SeriesType,
+  HorzScaleItem = Time,
+  TData = SeriesDataItemTypeMap<HorzScaleItem>[TSeriesType],
+  TOptions = SeriesOptionsMap[TSeriesType],
+  TPartialOptions = SeriesPartialOptionsMap[TSeriesType],
+> {
+  /**
+   * Returns current price formatter
+   *
+   * @returns Interface to the price formatter object that can be used to format prices in the same way as the chart does
+   */
+  priceFormatter(): IPriceFormatter;
+  /**
+   * Converts specified series price to pixel coordinate according to the series price scale
+   *
+   * @param price - Input price to be converted
+   * @returns Pixel coordinate of the price level on the chart
+   */
+  priceToCoordinate(price: number): Coordinate | null;
+  /**
+   * Converts specified coordinate to price value according to the series price scale
+   *
+   * @param coordinate - Input coordinate to be converted
+   * @returns Price value of the coordinate on the chart
+   */
+  coordinateToPrice(coordinate: number): BarPrice | null;
+  /**
+   * Returns bars information for the series in the provided [logical range](/time-scale.md#logical-range) or `null`, if no series data has been found in the requested range.
+   * This method can be used, for instance, to implement downloading historical data while scrolling to prevent a user from seeing empty space.
+   *
+   * @param range - The [logical range](/time-scale.md#logical-range) to retrieve info for.
+   * @returns The bars info for the given logical range.
+   * @example Getting bars info for current visible range
+   * ```js
+   * const barsInfo = series.barsInLogicalRange(chart.timeScale().getVisibleLogicalRange());
+   * console.log(barsInfo);
+   * ```
+   * @example Implementing downloading historical data while scrolling
+   * ```js
+   * function onVisibleLogicalRangeChanged(newVisibleLogicalRange) {
+   *     const barsInfo = series.barsInLogicalRange(newVisibleLogicalRange);
+   *     // if there less than 50 bars to the left of the visible area
+   *     if (barsInfo !== null && barsInfo.barsBefore < 50) {
+   *         // try to load additional historical data and prepend it to the series data
+   *     }
+   * }
+   *
+   * chart.timeScale().subscribeVisibleLogicalRangeChange(onVisibleLogicalRangeChanged);
+   * ```
+   */
+  barsInLogicalRange(range: IRange<number>): BarsInfo<HorzScaleItem> | null;
+  /**
+   * Applies new options to the existing series
+   * You can set options initially when you create series or use the `applyOptions` method of the series to change the existing options.
+   * Note that you can only pass options you want to change.
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: TPartialOptions): void;
+  /**
+   * Returns currently applied options
+   *
+   * @returns Full set of currently applied options, including defaults
+   */
+  options(): Readonly<TOptions>;
+  /**
+   * Returns the API interface for controlling the price scale that this series is currently attached to.
+   *
+   * @returns IPriceScaleApi An interface for controlling the price scale (axis component) currently used by this series
+   *
+   * @remarks
+   * Important: The returned PriceScaleApi is bound to the specific price scale (by ID and pane) that the series
+   * is using at the time this method is called. If you later move the series to a different pane or attach it
+   * to a different price scale (e.g., from 'right' to 'left'), the previously returned PriceScaleApi will NOT
+   * follow the series. It will continue to control the original price scale it was created for.
+   *
+   * To control the new price scale after moving a series, you must call this method again to get a fresh
+   * PriceScaleApi instance for the current price scale.
+   */
+  priceScale(): IPriceScaleApi;
+  /**
+   * Sets or replaces series data.
+   *
+   * @param data - Ordered (earlier time point goes first) array of data items. Old data is fully replaced with the new one.
+   * @example Setting data to a line series
+   * ```js
+   * lineSeries.setData([
+   *     { time: '2018-12-12', value: 24.11 },
+   *     { time: '2018-12-13', value: 31.74 },
+   * ]);
+   * ```
+   * @example Setting data to a bars (or candlestick) series
+   * ```js
+   * barSeries.setData([
+   *     { time: '2018-12-19', open: 141.77, high: 170.39, low: 120.25, close: 145.72 },
+   *     { time: '2018-12-20', open: 145.72, high: 147.99, low: 100.11, close: 108.19 },
+   * ]);
+   * ```
+   */
+  setData(data: TData[]): void;
+  /**
+   * Adds new data item to the existing set (or updates the latest item if times of the passed/latest items are equal).
+   *
+   * @param bar - A single data item to be added. Time of the new item must be greater or equal to the latest existing time point.
+   * If the new item's time is equal to the last existing item's time, then the existing item is replaced with the new one.
+   * @param historicalUpdate - If true, allows updating an existing data point that is not the latest bar. Default is false.
+   * Updating older data using `historicalUpdate` will be slower than updating the most recent data point.
+   * @example Updating line series data
+   * ```js
+   * lineSeries.update({
+   *     time: '2018-12-12',
+   *     value: 24.11,
+   * });
+   * ```
+   * @example Updating bar (or candlestick) series data
+   * ```js
+   * barSeries.update({
+   *     time: '2018-12-19',
+   *     open: 141.77,
+   *     high: 170.39,
+   *     low: 120.25,
+   *     close: 145.72,
+   * });
+   * ```
+   */
+  update(bar: TData, historicalUpdate?: boolean): void;
+  /**
+   * Returns a bar data by provided logical index.
+   *
+   * @param logicalIndex - Logical index
+   * @param mismatchDirection - Search direction if no data found at provided logical index.
+   * @returns Original data item provided via setData or update methods.
+   * @example
+   * ```js
+   * const originalData = series.dataByIndex(10, LightweightCharts.MismatchDirection.NearestLeft);
+   * ```
+   */
+  dataByIndex(
+    logicalIndex: number,
+    mismatchDirection?: MismatchDirection,
+  ): TData | null;
+  /**
+   * Returns all the bar data for the series.
+   *
+   * @returns Original data items provided via setData or update methods.
+   * @example
+   * ```js
+   * const originalData = series.data();
+   * ```
+   */
+  data(): readonly TData[];
+  /**
+   * Subscribe to the data changed event. This event is fired whenever the `update` or `setData` method is evoked
+   * on the series.
+   *
+   * @param handler - Handler to be called on a data changed event.
+   * @example
+   * ```js
+   * function myHandler() {
+   *     const data = series.data();
+   *     console.log(`The data has changed. New Data length: ${data.length}`);
+   * }
+   *
+   * series.subscribeDataChanged(myHandler);
+   * ```
+   */
+  subscribeDataChanged(handler: DataChangedHandler): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeDataChanged}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.unsubscribeDataChanged(myHandler);
+   * ```
+   */
+  unsubscribeDataChanged(handler: DataChangedHandler): void;
+  /**
+   * Creates a new price line
+   *
+   * @param options - Any subset of options, however `price` is required.
+   * @example
+   * ```js
+   * const priceLine = series.createPriceLine({
+   *     price: 80.0,
+   *     color: 'green',
+   *     lineWidth: 2,
+   *     lineStyle: LightweightCharts.LineStyle.Dotted,
+   *     axisLabelVisible: true,
+   *     title: 'P/L 500',
+   * });
+   * ```
+   */
+  createPriceLine(options: CreatePriceLineOptions): IPriceLine;
+  /**
+   * Removes the price line that was created before.
+   *
+   * @param line - A line to remove.
+   * @example
+   * ```js
+   * const priceLine = series.createPriceLine({ price: 80.0 });
+   * series.removePriceLine(priceLine);
+   * ```
+   */
+  removePriceLine(line: IPriceLine): void;
+  /**
+   * Returns an array of price lines.
+   */
+  priceLines(): IPriceLine[];
+  /**
+   * Return current series type.
+   *
+   * @returns Type of the series.
+   * @example
+   * ```js
+   * const lineSeries = chart.addSeries(LineSeries);
+   * console.log(lineSeries.seriesType()); // "Line"
+   *
+   * const candlestickSeries = chart.addCandlestickSeries();
+   * console.log(candlestickSeries.seriesType()); // "Candlestick"
+   * ```
+   */
+  seriesType(): TSeriesType;
+  /**
+   * Attaches additional drawing primitive to the series
+   *
+   * @param primitive - any implementation of ISeriesPrimitive interface
+   */
+  attachPrimitive(primitive: ISeriesPrimitive<HorzScaleItem>): void;
+  /**
+   * Detaches additional drawing primitive from the series
+   *
+   * @param primitive - implementation of ISeriesPrimitive interface attached before
+   * Does nothing if specified primitive was not attached
+   */
+  detachPrimitive(primitive: ISeriesPrimitive<HorzScaleItem>): void;
+  /**
+   * Move the series to another pane.
+   *
+   * If the pane with the specified index does not exist, the pane will be created.
+   *
+   * @param paneIndex - The index of the pane. Should be a number between 0 and the total number of panes.
+   */
+  moveToPane(paneIndex: number): void;
+  /**
+   * Gets the zero-based index of this series within the list of all series on the current pane.
+   *
+   * @returns The current index of the series in the pane's series collection.
+   */
+  seriesOrder(): number;
+  /**
+   * Sets the zero-based index of this series within the pane's series collection, thereby adjusting its rendering order.
+   *
+   * Note:
+   * - The chart may automatically recalculate this index after operations such as removing other series or moving this series to a different pane.
+   * - If the provided index is less than 0, equal to, or greater than the number of series, it will be clamped to a valid range.
+   * - Price scales derive their formatters from the series with the lowest index; changing the order may affect the price scale's formatting
+   *
+   * @param order - The desired zero-based index to set for this series within the pane.
+   */
+  setSeriesOrder(order: number): void;
+  /**
+   * Returns the pane to which the series is currently attached.
+   *
+   * @returns Pane API object to control the pane
+   */
+  getPane(): IPaneApi<HorzScaleItem>;
+}
+/**
+ * Interface for a series markers plugin
+ */
+export interface ISeriesMarkersPluginApi<HorzScaleItem>
+  extends ISeriesPrimitiveWrapper<HorzScaleItem> {
+  /**
+   * Set markers to the series.
+   * @param markers - An array of markers to be displayed on the series.
+   */
+  setMarkers: (markers: SeriesMarker<HorzScaleItem>[]) => void;
+  /**
+   * Returns current markers.
+   */
+  markers: () => readonly SeriesMarker<HorzScaleItem>[];
+  /**
+   * Detaches the plugin from the series.
+   */
+  detach: () => void;
+}
+/**
+ * This interface represents a label on the price or time axis
+ */
+export interface ISeriesPrimitiveAxisView {
+  /**
+   * The desired coordinate for the label. Note that the label will be automatically moved to prevent overlapping with other labels. If you would like the label to be drawn at the
+   * exact coordinate under all circumstances then rather use `fixedCoordinate`.
+   * For a price axis the value returned will represent the vertical distance (pixels) from the top. For a time axis the value will represent the horizontal distance from the left.
+   *
+   * @returns coordinate. distance from top for price axis, or distance from left for time axis.
+   */
+  coordinate(): number;
+  /**
+   * fixed coordinate of the label. A label with a fixed coordinate value will always be drawn at the specified coordinate and will appear above any 'unfixed' labels. If you supply
+   * a fixed coordinate then you should return a large negative number for `coordinate` so that the automatic placement of unfixed labels doesn't leave a blank space for this label.
+   * For a price axis the value returned will represent the vertical distance (pixels) from the top. For a time axis the value will represent the horizontal distance from the left.
+   *
+   * @returns coordinate. distance from top for price axis, or distance from left for time axis.
+   */
+  fixedCoordinate?(): number | undefined;
+  /**
+   * @returns text of the label
+   */
+  text(): string;
+  /**
+   * @returns text color of the label
+   */
+  textColor(): string;
+  /**
+   * @returns background color of the label
+   */
+  backColor(): string;
+  /**
+   * @returns whether the label should be visible (default: `true`)
+   */
+  visible?(): boolean;
+  /**
+   * @returns whether the tick mark line should be visible (default: `true`)
+   */
+  tickVisible?(): boolean;
+}
+/**
+ * Base interface for series primitives. It must be implemented to add some external graphics to series
+ */
+export interface ISeriesPrimitiveBase<TSeriesAttachedParameters = unknown> {
+  /**
+   * This method is called when viewport has been changed, so primitive have to recalculate / invalidate its data
+   */
+  updateAllViews?(): void;
+  /**
+   * Returns array of labels to be drawn on the price axis used by the series
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitiveAxisView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  priceAxisViews?(): readonly ISeriesPrimitiveAxisView[];
+  /**
+   * Returns array of labels to be drawn on the time axis
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitiveAxisView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  timeAxisViews?(): readonly ISeriesPrimitiveAxisView[];
+  /**
+   * Returns array of objects representing primitive in the main area of the chart
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitivePaneView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  paneViews?(): readonly IPrimitivePaneView[];
+  /**
+   * Returns array of objects representing primitive in the price axis area of the chart
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitivePaneView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  priceAxisPaneViews?(): readonly IPrimitivePaneView[];
+  /**
+   * Returns array of objects representing primitive in the time axis area of the chart
+   *
+   * @returns array of objects; each of then must implement ISeriesPrimitivePaneView interface
+   *
+   * For performance reasons, the lightweight library uses internal caches based on references to arrays
+   * So, this method must return new array if set of views has changed and should try to return the same array if nothing changed
+   */
+  timeAxisPaneViews?(): readonly IPrimitivePaneView[];
+  /**
+   * Return autoscaleInfo which will be merged with the series base autoscaleInfo. You can use this to expand the autoscale range
+   * to include visual elements drawn outside of the series' current visible price range.
+   *
+   * **Important**: Please note that this method will be evoked very often during scrolling and zooming of the chart, thus it
+   * is recommended that this method is either simple to execute, or makes use of optimisations such as caching to ensure that
+   * the chart remains responsive.
+   *
+   * @param startTimePoint - start time point for the current visible range
+   * @param endTimePoint - end time point for the current visible range
+   * @returns AutoscaleInfo
+   */
+  autoscaleInfo?(
+    startTimePoint: Logical,
+    endTimePoint: Logical,
+  ): AutoscaleInfo | null;
+  /**
+   * Attached Lifecycle hook.
+   *
+   * @param param - An object containing useful references for the attached primitive to use.
+   * @returns void
+   */
+  attached?(param: TSeriesAttachedParameters): void;
+  /**
+   * Detached Lifecycle hook.
+   *
+   * @returns void
+   */
+  detached?(): void;
+  /**
+   * Hit test method which will be called by the library when the cursor is moved.
+   * Use this to register object ids being hovered for use within the crosshairMoved
+   * and click events emitted by the chart. Additionally, the hit test result can
+   * specify a preferred cursor type to display for the main chart pane. This method
+   * should return the top most hit for this primitive if more than one object is
+   * being intersected.
+   *
+   * @param x - x Coordinate of mouse event
+   * @param y - y Coordinate of mouse event
+   */
+  hitTest?(x: number, y: number): PrimitiveHoveredItem | null;
+}
+/**
+ * Interface for a series primitive.
+ */
+export interface ISeriesPrimitiveWrapper<T, Options = unknown> {
+  /**
+   * Detaches the plugin from the series.
+   */
+  detach: () => void;
+  /**
+   * Returns the current series.
+   */
+  getSeries: () => ISeriesApi<SeriesType, T>;
+  /**
+   * Applies options to the primitive.
+   * @param options - Options to apply. The options are deeply merged with the current options.
+   */
+  applyOptions?: (options: DeepPartial<Options>) => void;
+}
+/**
+ * UpDownMarkersPrimitive Plugin for showing the direction of price changes on the chart.
+ * This plugin can only be used with Line and Area series types.
+ * 1. Manual control:
+ *
+ * - Use the `setMarkers` method to manually add markers to the chart.
+ * This will replace any existing markers.
+ * - Use `clearMarkers` to remove all markers.
+ *
+ * 2. Automatic updates:
+ *
+ * Use `setData` and `update` from this primitive instead of the those on the series to let the
+ * primitive handle the creation of price change markers automatically.
+ *
+ * - Use `setData` to initialize or replace all data points.
+ * - Use `update` to modify individual data points. This will automatically
+ * create markers for price changes on existing data points.
+ * - The `updateVisibilityDuration` option controls how long markers remain visible.
+ */
+export interface ISeriesUpDownMarkerPluginApi<
+  HorzScaleItem,
+  TData extends
+    SeriesDataItemTypeMap<HorzScaleItem>[UpDownMarkersSupportedSeriesTypes] = SeriesDataItemTypeMap<HorzScaleItem>["Line"],
+> extends ISeriesPrimitiveWrapper<HorzScaleItem> {
+  /**
+   * Applies new options to the plugin.
+   * @param options - Partial options to apply.
+   */
+  applyOptions: (options: Partial<UpDownMarkersPluginOptions>) => void;
+  /**
+   * Sets the data for the series and manages data points for marker updates.
+   * @param data - Array of data points to set.
+   */
+  setData: (data: TData[]) => void;
+  /**
+   * Updates a single data point and manages marker updates for existing data points.
+   * @param data - The data point to update.
+   * @param historicalUpdate - Optional flag for historical updates.
+   */
+  update: (data: TData, historicalUpdate?: boolean) => void;
+  /**
+   * Retrieves the current markers on the chart.
+   * @returns An array of SeriesUpDownMarker.
+   */
+  markers: () => readonly SeriesUpDownMarker<HorzScaleItem>[];
+  /**
+   * Manually sets markers on the chart.
+   * @param markers - Array of SeriesUpDownMarker to set.
+   */
+  setMarkers: (markers: SeriesUpDownMarker<HorzScaleItem>[]) => void;
+  /**
+   * Clears all markers from the chart.
+   */
+  clearMarkers: () => void;
+}
+/** Interface to chart time scale */
+export interface ITimeScaleApi<HorzScaleItem> {
+  /**
+   * Return the distance from the right edge of the time scale to the lastest bar of the series measured in bars.
+   */
+  scrollPosition(): number;
+  /**
+   * Scrolls the chart to the specified position.
+   *
+   * @param position - Target data position
+   * @param animated - Setting this to true makes the chart scrolling smooth and adds animation
+   */
+  scrollToPosition(position: number, animated: boolean): void;
+  /**
+   * Restores default scroll position of the chart. This process is always animated.
+   */
+  scrollToRealTime(): void;
+  /**
+   * Returns current visible time range of the chart.
+   *
+   * Note that this method cannot extrapolate time and will use the only currently existent data.
+   * To get complete information about current visible range, please use {@link getVisibleLogicalRange} and {@link ISeriesApi.barsInLogicalRange}.
+   *
+   * @returns Visible range or null if the chart has no data at all.
+   */
+  getVisibleRange(): IRange<HorzScaleItem> | null;
+  /**
+   * Sets visible range of data.
+   *
+   * Note that this method cannot extrapolate time and will use the only currently existent data.
+   * Thus, for example, if currently a chart doesn't have data prior `2018-01-01` date and you set visible range with `from` date `2016-01-01`, it will be automatically adjusted to `2018-01-01` (and the same for `to` date).
+   *
+   * But if you can approximate indexes on your own - you could use {@link setVisibleLogicalRange} instead.
+   *
+   * @param range - Target visible range of data.
+   * @example
+   * ```js
+   * chart.timeScale().setVisibleRange({
+   *     from: (new Date(Date.UTC(2018, 0, 1, 0, 0, 0, 0))).getTime() / 1000,
+   *     to: (new Date(Date.UTC(2018, 1, 1, 0, 0, 0, 0))).getTime() / 1000,
+   * });
+   * ```
+   */
+  setVisibleRange(range: IRange<HorzScaleItem>): void;
+  /**
+   * Returns the current visible [logical range](/time-scale.md#logical-range) of the chart as an object with the first and last time points of the logical range, or returns `null` if the chart has no data.
+   *
+   * @returns Visible range or null if the chart has no data at all.
+   */
+  getVisibleLogicalRange(): LogicalRange | null;
+  /**
+   * Sets visible [logical range](/time-scale.md#logical-range) of data.
+   *
+   * @param range - Target visible logical range of data.
+   * @example
+   * ```js
+   * chart.timeScale().setVisibleLogicalRange({ from: 0, to: 10 });
+   * ```
+   */
+  setVisibleLogicalRange(range: IRange<number>): void;
+  /**
+   * Restores default zoom level and scroll position of the time scale.
+   */
+  resetTimeScale(): void;
+  /**
+   * Automatically calculates the visible range to fit all data from all series.
+   */
+  fitContent(): void;
+  /**
+   * Converts a logical index to local x coordinate.
+   *
+   * @param logical - Logical index needs to be converted
+   * @returns x coordinate of that time or `null` if the chart doesn't have data
+   */
+  logicalToCoordinate(logical: Logical): Coordinate | null;
+  /**
+   * Converts a coordinate to logical index.
+   *
+   * @param x - Coordinate needs to be converted
+   * @returns Logical index that is located on that coordinate or `null` if the chart doesn't have data
+   */
+  coordinateToLogical(x: number): Logical | null;
+  /**
+   * Converts a time to local x coordinate.
+   *
+   * @param time - Time needs to be converted
+   * @returns X coordinate of that time or `null` if no time found on time scale
+   */
+  timeToIndex(
+    time: HorzScaleItem,
+    findNearest?: boolean,
+  ): TimePointIndex | null;
+  /**
+   * Converts a time to local x coordinate.
+   *
+   * @param time - Time needs to be converted
+   * @returns X coordinate of that time or `null` if no time found on time scale
+   */
+  timeToCoordinate(time: HorzScaleItem): Coordinate | null;
+  /**
+   * Converts a coordinate to time.
+   *
+   * @param x - Coordinate needs to be converted.
+   * @returns Time of a bar that is located on that coordinate or `null` if there are no bars found on that coordinate.
+   */
+  coordinateToTime(x: number): HorzScaleItem | null;
+  /**
+   * Returns a width of the time scale.
+   */
+  width(): number;
+  /**
+   * Returns a height of the time scale.
+   */
+  height(): number;
+  /**
+   * Subscribe to the visible time range change events.
+   *
+   * The argument passed to the handler function is an object with `from` and `to` properties of type {@link Time}, or `null` if there is no visible data.
+   *
+   * @param handler - Handler (function) to be called when the visible indexes change.
+   * @example
+   * ```js
+   * function myVisibleTimeRangeChangeHandler(newVisibleTimeRange) {
+   *     if (newVisibleTimeRange === null) {
+   *         // handle null
+   *     }
+   *
+   *     // handle new logical range
+   * }
+   *
+   * chart.timeScale().subscribeVisibleTimeRangeChange(myVisibleTimeRangeChangeHandler);
+   * ```
+   */
+  subscribeVisibleTimeRangeChange(
+    handler: TimeRangeChangeEventHandler<HorzScaleItem>,
+  ): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeVisibleTimeRangeChange}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.timeScale().unsubscribeVisibleTimeRangeChange(myVisibleTimeRangeChangeHandler);
+   * ```
+   */
+  unsubscribeVisibleTimeRangeChange(
+    handler: TimeRangeChangeEventHandler<HorzScaleItem>,
+  ): void;
+  /**
+   * Subscribe to the visible logical range change events.
+   *
+   * The argument passed to the handler function is an object with `from` and `to` properties of type `number`, or `null` if there is no visible data.
+   *
+   * @param handler - Handler (function) to be called when the visible indexes change.
+   * @example
+   * ```js
+   * function myVisibleLogicalRangeChangeHandler(newVisibleLogicalRange) {
+   *     if (newVisibleLogicalRange === null) {
+   *         // handle null
+   *     }
+   *
+   *     // handle new logical range
+   * }
+   *
+   * chart.timeScale().subscribeVisibleLogicalRangeChange(myVisibleLogicalRangeChangeHandler);
+   * ```
+   */
+  subscribeVisibleLogicalRangeChange(
+    handler: LogicalRangeChangeEventHandler,
+  ): void;
+  /**
+   * Unsubscribe a handler that was previously subscribed using {@link subscribeVisibleLogicalRangeChange}.
+   *
+   * @param handler - Previously subscribed handler
+   * @example
+   * ```js
+   * chart.timeScale().unsubscribeVisibleLogicalRangeChange(myVisibleLogicalRangeChangeHandler);
+   * ```
+   */
+  unsubscribeVisibleLogicalRangeChange(
+    handler: LogicalRangeChangeEventHandler,
+  ): void;
+  /**
+   * Adds a subscription to time scale size changes
+   *
+   * @param handler - Handler (function) to be called when the time scale size changes
+   */
+  subscribeSizeChange(handler: SizeChangeEventHandler): void;
+  /**
+   * Removes a subscription to time scale size changes
+   *
+   * @param handler - Previously subscribed handler
+   */
+  unsubscribeSizeChange(handler: SizeChangeEventHandler): void;
+  /**
+   * Applies new options to the time scale.
+   *
+   * @param options - Any subset of options.
+   */
+  applyOptions(options: DeepPartial<HorzScaleOptions>): void;
+  /**
+   * Returns current options
+   *
+   * @returns Currently applied options
+   */
+  options(): Readonly<HorzScaleOptions>;
+}
+/**
+ * The main interface of a single yield curve chart.
+ */
+export interface IYieldCurveChartApi
+  extends Omit<IChartApiBase<number>, "addSeries"> {
+  /**
+   * Creates a series with specified parameters.
+   *
+   * Note that the Yield Curve chart only supports the Area and Line series types.
+   *
+   * @param definition - A series definition for either AreaSeries or LineSeries.
+   * @param options - Customization parameters of the series being created.
+   * @param paneIndex - An index of the pane where the series should be created.
+   * ```js
+   * const series = chart.addSeries(LineSeries, { lineWidth: 2 });
+   * ```
+   */
+  addSeries<T extends YieldCurveSeriesType>(
+    definition: SeriesDefinition<T>,
+    options?: SeriesPartialOptionsMap[T],
+    paneIndex?: number,
+  ): ISeriesApi<T, number, WhitespaceData<number> | LineData<number>>;
+}
+export interface ImageWatermarkOptions {
+  /**
+   * Maximum width for the image watermark.
+   *
+   * @defaultValue undefined
+   */
+  maxWidth?: number;
+  /**
+   * Maximum height for the image watermark.
+   *
+   * @defaultValue undefined
+   */
+  maxHeight?: number;
+  /**
+   * Padding to maintain around the image watermark relative
+   * to the chart pane edges.
+   *
+   * @defaultValue 0
+   */
+  padding: number;
+  /**
+   * The alpha (opacity) for the image watermark. Where `1` is fully
+   * opaque (visible) and `0` is fully transparent.
+   *
+   * @defaultValue 1
+   */
+  alpha: number;
+}
+/**
+ * Represents options for enabling or disabling kinetic scrolling with mouse and touch gestures.
+ */
+export interface KineticScrollOptions {
+  /**
+   * Enable kinetic scroll with touch gestures.
+   *
+   * @defaultValue `true`
+   */
+  touch: boolean;
+  /**
+   * Enable kinetic scroll with the mouse.
+   *
+   * @defaultValue `false`
+   */
+  mouse: boolean;
+}
+/** Represents layout options */
+export interface LayoutOptions {
+  /**
+   * Chart and scales background color.
+   *
+   * @defaultValue `{ type: ColorType.Solid, color: '#FFFFFF' }`
+   */
+  background: Background;
+  /**
+   * Color of text on the scales.
+   *
+   * @defaultValue `'#191919'`
+   */
+  textColor: string;
+  /**
+   * Font size of text on scales in pixels.
+   *
+   * @defaultValue `12`
+   */
+  fontSize: number;
+  /**
+   * Font family of text on the scales.
+   *
+   * @defaultValue `-apple-system, BlinkMacSystemFont, 'Trebuchet MS', Roboto, Ubuntu, sans-serif`
+   */
+  fontFamily: string;
+  /**
+   * Panes options.
+   *
+   * @defaultValue `{ enableResize: true, separatorColor: '#2B2B43', separatorHoverColor: 'rgba(178, 181, 189, 0.2)'}`
+   */
+  panes: LayoutPanesOptions;
+  /**
+   * Display the TradingView attribution logo on the main chart pane.
+   *
+   * The licence for library specifies that you add the "attribution notice"
+   * from the NOTICE file to your code and a link to https://www.tradingview.com/ to
+   * the page of your website or mobile application that is available to your users.
+   * Using this attribution logo is sufficient for meeting this linking requirement.
+   * However, if you already fulfill this requirement then you can disable this
+   * attribution logo.
+   *
+   * @defaultValue true
+   */
+  attributionLogo: boolean;
+  /**
+   * Specifies the color space of the rendering context for the internal
+   * canvas elements.
+   *
+   * Note: this option should only be specified during the chart creation
+   * and not changed at a later stage by using `applyOptions`.
+   *
+   * @defaultValue `srgb`
+   *
+   * See [HTMLCanvasElement: getContext() method - Web APIs | MDN](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/getContext#colorspace) for more info
+   */
+  colorSpace: ColorSpace;
+  /**
+   * Array of custom color parser functions to handle color formats outside of standard sRGB values.
+   * Each parser function takes a string input and should return either:
+   * - An {@link Rgba} array [r,g,b,a] for valid colors (with values 0-255 for rgb and 0-1 for a)
+   * - null if the parser cannot handle that color string, allowing the next parser to attempt it
+   *
+   * Parsers are tried in order until one returns a non-null result. This allows chaining multiple
+   * parsers to handle different color space formats.
+   *
+   * Note: this option should only be specified during the chart creation
+   * and not changed at a later stage by using `applyOptions`.
+   *
+   * The library already supports these color formats by default:
+   * - Hex colors (#RGB, #RGBA, #RRGGBB, #RRGGBBAA)
+   * - RGB/RGBA functions (rgb(), rgba())
+   * - HSL/HSLA functions (hsl(), hsla())
+   * - HWB function (hwb())
+   * - Named colors (red, blue, etc.)
+   * - 'transparent' keyword
+   *
+   * Custom parsers are only needed for other color spaces like:
+   * - Display P3: color(display-p3 r g b)
+   * - CIE Lab: lab(l a b)
+   * - LCH: lch(l c h)
+   * - Oklab: oklab(l a b)
+   * - Oklch: oklch(l c h)
+   * - ...
+   */
+  colorParsers: CustomColorParser[];
+}
+/**
+ * Represents panes customizations.
+ */
+export interface LayoutPanesOptions {
+  /**
+   * Enable panes resizing
+   *
+   * @defaultValue `true`
+   */
+  enableResize: boolean;
+  /**
+   * Color of pane separator
+   *
+   * @defaultValue `#2B2B43`
+   */
+  separatorColor: string;
+  /**
+   * Color of pane separator background applied on hover
+   *
+   * @defaultValue `rgba(178, 181, 189, 0.2)`
+   */
+  separatorHoverColor: string;
+}
+/**
+ * Structure describing a single item of data for line series
+ */
+export interface LineData<HorzScaleItem = Time>
+  extends SingleValueData<HorzScaleItem> {
+  /**
+   * Optional color value for certain data item. If missed, color from options is used
+   */
+  color?: string;
+}
+/**
+ * Represents style options for a line series.
+ */
+export interface LineStyleOptions {
+  /**
+   * Line color.
+   *
+   * @defaultValue `'#2196f3'`
+   */
+  color: string;
+  /**
+   * Line style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Line width in pixels.
+   *
+   * @defaultValue `3`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Line type.
+   *
+   * @defaultValue {@link LineType.Simple}
+   */
+  lineType: LineType;
+  /**
+   * Show series line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Show circle markers on each point.
+   *
+   * @defaultValue `false`
+   */
+  pointMarkersVisible: boolean;
+  /**
+   * Circle markers radius in pixels.
+   *
+   * @defaultValue `undefined`
+   */
+  pointMarkersRadius?: number;
+  /**
+   * Show the crosshair marker.
+   *
+   * @defaultValue `true`
+   */
+  crosshairMarkerVisible: boolean;
+  /**
+   * Crosshair marker radius in pixels.
+   *
+   * @defaultValue `4`
+   */
+  crosshairMarkerRadius: number;
+  /**
+   * Crosshair marker border color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBorderColor: string;
+  /**
+   * The crosshair marker background color. An empty string falls back to the color of the series under the crosshair.
+   *
+   * @defaultValue `''`
+   */
+  crosshairMarkerBackgroundColor: string;
+  /**
+   * Crosshair marker border width in pixels.
+   *
+   * @defaultValue `2`
+   */
+  crosshairMarkerBorderWidth: number;
+  /**
+   * Last price animation mode.
+   *
+   * @defaultValue {@link LastPriceAnimationMode.Disabled}
+   */
+  lastPriceAnimation: LastPriceAnimationMode;
+}
+/**
+ * Represents options for formatting dates, times, and prices according to a locale.
+ */
+export interface LocalizationOptions<HorzScaleItem>
+  extends LocalizationOptionsBase {
+  /**
+   * Override formatting of the time scale crosshair label.
+   *
+   * @defaultValue `undefined`
+   */
+  timeFormatter?: TimeFormatterFn<HorzScaleItem>;
+  /**
+   * Date formatting string.
+   *
+   * Can contain `yyyy`, `yy`, `MMMM`, `MMM`, `MM` and `dd` literals which will be replaced with corresponding date's value.
+   *
+   * Ignored if {@link timeFormatter} has been specified.
+   *
+   * @defaultValue `'dd MMM \'yy'`
+   */
+  dateFormat: string;
+}
+/**
+ * Represents basic localization options
+ */
+export interface LocalizationOptionsBase {
+  /**
+   * Current locale used to format dates. Uses the browser's language settings by default.
+   *
+   * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl#Locale_identification_and_negotiation
+   * @defaultValue `navigator.language`
+   */
+  locale: string;
+  /**
+   * Override formatting of the price scale tick marks, labels and crosshair labels. Can be used for cases that can't be covered with built-in price formats.
+   *
+   * @see {@link PriceFormatCustom}
+   * @defaultValue `undefined`
+   */
+  priceFormatter?: PriceFormatterFn;
+  /**
+   * Overrides the formatting of price scale tick marks. Use this to define formatting rules based on all provided price values.
+   *
+   * @defaultValue `undefined`
+   */
+  tickmarksPriceFormatter?: TickmarksPriceFormatterFn;
+  /**
+   * Overrides the formatting of percentage scale tick marks.
+   *
+   * @defaultValue `undefined`
+   */
+  percentageFormatter?: PercentageFormatterFn;
+  /**
+   * Override formatting of the percentage scale tick marks. Can be used if formatting should be adjusted based on all the values being formatted
+   *
+   * @defaultValue `undefined`
+   */
+  tickmarksPercentageFormatter?: TickmarksPercentageFormatterFn;
+}
+/**
+ * Represents a mouse event.
+ */
+export interface MouseEventParams<HorzScaleItem = Time> {
+  /**
+   * Time of the data at the location of the mouse event.
+   *
+   * The value will be `undefined` if the location of the event in the chart is outside the range of available data.
+   */
+  time?: HorzScaleItem;
+  /**
+   * Logical index
+   */
+  logical?: Logical;
+  /**
+   * Location of the event in the chart.
+   *
+   * The value will be `undefined` if the event is fired outside the chart, for example a mouse leave event.
+   */
+  point?: Point;
+  /**
+   * The index of the Pane
+   */
+  paneIndex?: number;
+  /**
+   * Data of all series at the location of the event in the chart.
+   *
+   * Keys of the map are {@link ISeriesApi} instances. Values are prices.
+   * Values of the map are original data items
+   */
+  seriesData: Map<
+    ISeriesApi<SeriesType, HorzScaleItem>,
+    | BarData<HorzScaleItem>
+    | LineData<HorzScaleItem>
+    | HistogramData<HorzScaleItem>
+    | CustomData<HorzScaleItem>
+  >;
+  /**
+   * The {@link ISeriesApi} for the series at the point of the mouse event.
+   */
+  hoveredSeries?: ISeriesApi<SeriesType, HorzScaleItem>;
+  /**
+   * The ID of the object at the point of the mouse event.
+   */
+  hoveredObjectId?: unknown;
+  /**
+   * The underlying source mouse or touch event data, if available
+   */
+  sourceEvent?: TouchMouseEventData;
+}
+/**
+ * Represents a bar with a {@link Time} and open, high, low, and close prices.
+ */
+export interface OhlcData<HorzScaleItem = Time>
+  extends WhitespaceData<HorzScaleItem> {
+  /**
+   * The bar time.
+   */
+  time: HorzScaleItem;
+  /**
+   * The open price.
+   */
+  open: number;
+  /**
+   * The high price.
+   */
+  high: number;
+  /**
+   * The low price.
+   */
+  low: number;
+  /**
+   * The close price.
+   */
+  close: number;
+}
+/**
+ * Object containing references to the chart instance, and a requestUpdate method for triggering
+ * a refresh of the chart.
+ */
+export interface PaneAttachedParameter<HorzScaleItem = Time> {
+  /**
+   * Chart instance.
+   */
+  chart: IChartApiBase<HorzScaleItem>;
+  /**
+   * Request an update (redraw the chart)
+   */
+  requestUpdate: () => void;
+}
+/**
+ * Data provide to the custom series pane view which can be used within the renderer
+ * for drawing the series data.
+ */
+export interface PaneRendererCustomData<
+  HorzScaleItem,
+  TData extends CustomData<HorzScaleItem>,
+> {
+  /**
+   * List of all the series' items and their x coordinates.
+   */
+  bars: readonly CustomBarItemData<HorzScaleItem, TData>[];
+  /**
+   * Spacing between consecutive bars.
+   */
+  barSpacing: number;
+  /**
+   * The current visible range of items on the chart.
+   */
+  visibleRange: IRange<number> | null;
+}
+/**
+ * Dimensions of the Chart Pane
+ * (the main chart area which excludes the time and price scales).
+ */
+export interface PaneSize {
+  /** Height of the Chart Pane (pixels) */
+  height: number;
+  /** Width of the Chart Pane (pixels) */
+  width: number;
+}
+/**
+ * Represents a point on the chart.
+ */
+export interface Point {
+  /**
+   * The x coordinate.
+   */
+  readonly x: Coordinate;
+  /**
+   * The y coordinate.
+   */
+  readonly y: Coordinate;
+}
+/**
+ * Extends LocalizationOptions for price-based charts.
+ * Includes settings specific to formatting price values on the horizontal scale.
+ */
+export interface PriceChartLocalizationOptions
+  extends LocalizationOptions<HorzScalePriceItem> {
+  /**
+   * The number of decimal places to display for price values on the horizontal scale.
+   */
+  precision: number;
+}
+/**
+ * Configuration options specific to price-based charts.
+ * Extends the base chart options and includes localization settings for price formatting.
+ */
+export interface PriceChartOptions extends ChartOptionsImpl<number> {
+  /**
+   * Localization options for formatting price values and other chart elements.
+   */
+  localization: PriceChartLocalizationOptions;
+}
+/**
+ * Represents series value formatting options.
+ * The precision and minMove properties allow wide customization of formatting.
+ *
+ * @example
+ * `minMove=0.01`, `precision` is not specified - prices will change like 1.13, 1.14, 1.15 etc.
+ * @example
+ * `minMove=0.01`, `precision=3` - prices will change like 1.130, 1.140, 1.150 etc.
+ * @example
+ * `minMove=0.05`, `precision` is not specified - prices will change like 1.10, 1.15, 1.20 etc.
+ */
+export interface PriceFormatBuiltIn {
+  /**
+   * Built-in price formats:
+   * - `'price'` is the most common choice; it allows customization of precision and rounding of prices.
+   * - `'volume'` uses abbreviation for formatting prices like `1.2K` or `12.67M`.
+   * - `'percent'` uses `%` sign at the end of prices.
+   */
+  type: "price" | "volume" | "percent";
+  /**
+   * Number of digits after the decimal point.
+   * If it is not set, then its value is calculated automatically based on minMove.
+   *
+   * @defaultValue `2` if both {@link minMove} and {@link precision} are not provided, calculated automatically based on {@link minMove} otherwise.
+   */
+  precision: number;
+  /**
+   * The minimum possible step size for price value movement. This value shouldn't have more decimal digits than the precision.
+   *
+   * @defaultValue `0.01`
+   */
+  minMove: number;
+}
+/**
+ * Represents series value formatting options.
+ */
+export interface PriceFormatCustom {
+  /**
+   * The custom price format.
+   */
+  type: "custom";
+  /**
+   * Override price formatting behaviour. Can be used for cases that can't be covered with built-in price formats.
+   */
+  formatter: PriceFormatterFn;
+  /**
+   * Override price formatting for multiple prices. Can be used if formatter should be adjusted based of all values being formatted.
+   */
+  tickmarksFormatter?: TickmarksPriceFormatterFn;
+  /**
+   * The minimum possible step size for price value movement.
+   *
+   * @defaultValue `0.01`
+   */
+  minMove: number;
+}
+/**
+ * Represents a price line options.
+ */
+export interface PriceLineOptions {
+  /**
+   * The optional ID of this price line.
+   */
+  id?: string;
+  /**
+   * Price line's value.
+   *
+   * @defaultValue `0`
+   */
+  price: number;
+  /**
+   * Price line's color.
+   *
+   * @defaultValue `''`
+   */
+  color: string;
+  /**
+   * Price line's width in pixels.
+   *
+   * @defaultValue `1`
+   */
+  lineWidth: LineWidth;
+  /**
+   * Price line's style.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  lineStyle: LineStyle;
+  /**
+   * Display line.
+   *
+   * @defaultValue `true`
+   */
+  lineVisible: boolean;
+  /**
+   * Display the current price value in on the price scale.
+   *
+   * @defaultValue `true`
+   */
+  axisLabelVisible: boolean;
+  /**
+   * Price line's on the chart pane.
+   *
+   * @defaultValue `''`
+   */
+  title: string;
+  /**
+   * Background color for the axis label.
+   * Will default to the price line color if unspecified.
+   *
+   * @defaultValue `''`
+   */
+  axisLabelColor: string;
+  /**
+   * Text color for the axis label.
+   *
+   * @defaultValue `''`
+   */
+  axisLabelTextColor: string;
+}
+/**
+ * Represents a price range.
+ */
+export interface PriceRange {
+  /**
+   * Maximum value in the range.
+   */
+  minValue: number;
+  /**
+   * Minimum value in the range.
+   */
+  maxValue: number;
+}
+/** Defines margins of the price scale. */
+export interface PriceScaleMargins {
+  /**
+   * Top margin in percentages. Must be greater or equal to 0 and less than 1.
+   */
+  top: number;
+  /**
+   * Bottom margin in percentages. Must be greater or equal to 0 and less than 1.
+   */
+  bottom: number;
+}
+/** Structure that describes price scale options */
+export interface PriceScaleOptions {
+  /**
+   * Autoscaling is a feature that automatically adjusts a price scale to fit the visible range of data.
+   * Note that overlay price scales are always auto-scaled.
+   *
+   * @defaultValue `true`
+   */
+  autoScale: boolean;
+  /**
+   * Price scale mode.
+   *
+   * @defaultValue {@link PriceScaleMode.Normal}
+   */
+  mode: PriceScaleMode;
+  /**
+   * Invert the price scale, so that a upwards trend is shown as a downwards trend and vice versa.
+   * Affects both the price scale and the data on the chart.
+   *
+   * @defaultValue `false`
+   */
+  invertScale: boolean;
+  /**
+   * Align price scale labels to prevent them from overlapping.
+   *
+   * @defaultValue `true`
+   */
+  alignLabels: boolean;
+  /**
+   * Price scale margins.
+   *
+   * @defaultValue `{ bottom: 0.1, top: 0.2 }`
+   * @example
+   * ```js
+   * chart.priceScale('right').applyOptions({
+   *     scaleMargins: {
+   *         top: 0.8,
+   *         bottom: 0,
+   *     },
+   * });
+   * ```
+   */
+  scaleMargins: PriceScaleMargins;
+  /**
+   * Set true to draw a border between the price scale and the chart area.
+   *
+   * @defaultValue `true`
+   */
+  borderVisible: boolean;
+  /**
+   * Price scale border color.
+   *
+   * @defaultValue `'#2B2B43'`
+   */
+  borderColor: string;
+  /**
+   * Price scale text color.
+   * If not provided {@link LayoutOptions.textColor} is used.
+   *
+   * @defaultValue `undefined`
+   */
+  textColor?: string;
+  /**
+   * Show top and bottom corner labels only if entire text is visible.
+   *
+   * @defaultValue `false`
+   */
+  entireTextOnly: boolean;
+  /**
+   * Indicates if this price scale visible. Ignored by overlay price scales.
+   *
+   * @defaultValue `true` for the right price scale and `false` for the left.
+   * For the yield curve chart, the default is for the left scale to be visible.
+   */
+  visible: boolean;
+  /**
+   * Draw small horizontal line on price axis labels.
+   *
+   * @defaultValue `false`
+   */
+  ticksVisible: boolean;
+  /**
+   * Define a minimum width for the price scale.
+   * Note: This value will be exceeded if the
+   * price scale needs more space to display it's contents.
+   *
+   * Setting a minimum width could be useful for ensuring that
+   * multiple charts positioned in a vertical stack each have
+   * an identical price scale width, or for plugins which
+   * require a bit more space within the price scale pane.
+   *
+   * @defaultValue 0
+   */
+  minimumWidth: number;
+  /**
+   * Ensures that tick marks are always visible at the very top and bottom of the price scale,
+   * regardless of the data range. When enabled, a tick mark will be drawn at both edges of the scale,
+   * providing clear boundary indicators.
+   *
+   * @defaultValue false
+   */
+  ensureEdgeTickMarksVisible: boolean;
+}
+/**
+ * Data representing the currently hovered object from the Hit test.
+ */
+export interface PrimitiveHoveredItem {
+  /**
+   * CSS cursor style as defined here: [MDN: CSS Cursor](https://developer.mozilla.org/en-US/docs/Web/CSS/cursor) or `undefined`
+   * if you want the library to use the default cursor style instead.
+   */
+  cursorStyle?: string;
+  /**
+   * Hovered objects external ID. Can be used to identify the source item within a mouse subscriber event.
+   */
+  externalId: string;
+  /**
+   * The zOrder of the hovered item.
+   */
+  zOrder: PrimitivePaneViewZOrder;
+  /**
+   * Set to true if the object is rendered using `drawBackground` instead of `draw`.
+   */
+  isBackground?: boolean;
+}
+/**
+ * Object containing references to the chart and series instances, and a requestUpdate method for triggering
+ * a refresh of the chart.
+ */
+export interface SeriesAttachedParameter<
+  HorzScaleItem = Time,
+  TSeriesType extends SeriesType = keyof SeriesOptionsMap,
+> {
+  /**
+   * Chart instance.
+   */
+  chart: IChartApiBase<HorzScaleItem>;
+  /**
+   * Series to which the Primitive is attached.
+   */
+  series: ISeriesApi<TSeriesType, HorzScaleItem>;
+  /**
+   * Request an update (redraw the chart)
+   */
+  requestUpdate: () => void;
+  /**
+   * Horizontal Scale Behaviour for the chart.
+   */
+  horzScaleBehavior: IHorzScaleBehavior<HorzScaleItem>;
+}
+/**
+ * Represents the type of data that a series contains.
+ *
+ * For example a bar series contains {@link BarData} or {@link WhitespaceData}.
+ */
+export interface SeriesDataItemTypeMap<HorzScaleItem = Time> {
+  /**
+   * The types of bar series data.
+   */
+  Bar: BarData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of candlestick series data.
+   */
+  Candlestick: CandlestickData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of area series data.
+   */
+  Area: AreaData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of baseline series data.
+   */
+  Baseline: BaselineData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of line series data.
+   */
+  Line: LineData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The types of histogram series data.
+   */
+  Histogram: HistogramData<HorzScaleItem> | WhitespaceData<HorzScaleItem>;
+  /**
+   * The base types of an custom series data.
+   */
+  Custom: CustomData<HorzScaleItem> | CustomSeriesWhitespaceData<HorzScaleItem>;
+}
+/**
+ * Series definition interface.
+ */
+export interface SeriesDefinition<T extends SeriesType> {
+  /**
+   * Series type.
+   */
+  readonly type: T;
+  /**
+   * Indicates if the series is built-in.
+   */
+  readonly isBuiltIn: boolean;
+  /**
+   * Default series options.
+   */
+  readonly defaultOptions: SeriesStyleOptionsMap[T];
+}
+export interface SeriesMarkerBar<TimeType> extends SeriesMarkerBase<TimeType> {
+  /**
+   * The position of the marker.
+   */
+  position: SeriesMarkerBarPosition;
+}
+/**
+ * Represents a series marker.
+ */
+export interface SeriesMarkerBase<TimeType> {
+  /**
+   * The time of the marker.
+   */
+  time: TimeType;
+  /**
+   * The position of the marker.
+   */
+  position: SeriesMarkerPosition;
+  /**
+   * The shape of the marker.
+   */
+  shape: SeriesMarkerShape;
+  /**
+   * The color of the marker.
+   */
+  color: string;
+  /**
+   * The ID of the marker.
+   */
+  id?: string;
+  /**
+   * The optional text of the marker.
+   */
+  text?: string;
+  /**
+   * The optional size of the marker.
+   *
+   * @defaultValue `1`
+   */
+  size?: number;
+  /**
+   * The price value for exact Y-axis positioning.
+   *
+   * Required when using {@link SeriesMarkerPricePosition} position type.
+   */
+  price?: number;
+}
+export interface SeriesMarkerPrice<TimeType>
+  extends SeriesMarkerBase<TimeType> {
+  /**
+   * The position of the marker.
+   */
+  position: SeriesMarkerPricePosition;
+  /**
+   * The price value for exact Y-axis positioning.
+   *
+   * Required when using {@link SeriesMarkerPricePosition} position type.
+   */
+  price: number;
+}
+/**
+ * Configuration options for the series markers plugin.
+ * These options affect all markers managed by the plugin.
+ */
+export interface SeriesMarkersOptions {
+  /**
+   * Defines the stacking order of the markers relative to the series and other primitives.
+   *
+   * @defaultValue `normal`
+   */
+  zOrder: SeriesMarkerZOrder;
+}
+/**
+ * Represents options common for all types of series
+ */
+export interface SeriesOptionsCommon {
+  /**
+   * Visibility of the label with the latest visible price on the price scale.
+   *
+   * @defaultValue `true`, `false` for yield curve charts
+   */
+  lastValueVisible: boolean;
+  /**
+   * You can name series when adding it to a chart. This name will be displayed on the label next to the last value label.
+   *
+   * @defaultValue `''`
+   */
+  title: string;
+  /**
+   * Target price scale to bind new series to.
+   *
+   * @defaultValue `'right'` if right scale is visible and `'left'` otherwise
+   */
+  priceScaleId?: string;
+  /**
+   * Visibility of the series.
+   * If the series is hidden, everything including price lines, baseline, price labels and markers, will also be hidden.
+   * Please note that hiding a series is not equivalent to deleting it, since hiding does not affect the timeline at all, unlike deleting where the timeline can be changed (some points can be deleted).
+   *
+   * @defaultValue `true`
+   */
+  visible: boolean;
+  /**
+   * Show the price line. Price line is a horizontal line indicating the last price of the series.
+   *
+   * @defaultValue `true`, `false` for yield curve charts
+   */
+  priceLineVisible: boolean;
+  /**
+   * The source to use for the value of the price line.
+   *
+   * @defaultValue {@link PriceLineSource.LastBar}
+   */
+  priceLineSource: PriceLineSource;
+  /**
+   * Width of the price line.
+   *
+   * @defaultValue `1`
+   */
+  priceLineWidth: LineWidth;
+  /**
+   * Color of the price line.
+   * By default, its color is set by the last bar color (or by line color on Line and Area charts).
+   *
+   * @defaultValue `''`
+   */
+  priceLineColor: string;
+  /**
+   * Price line style.
+   *
+   * @defaultValue {@link LineStyle.Dashed}
+   */
+  priceLineStyle: LineStyle;
+  /**
+   * Price format.
+   *
+   * @defaultValue `{ type: 'price', precision: 2, minMove: 0.01 }`
+   */
+  priceFormat: PriceFormat;
+  /**
+   * Visibility of base line. Suitable for percentage and `IndexedTo100` scales.
+   *
+   * @defaultValue `true`
+   */
+  baseLineVisible: boolean;
+  /**
+   * Color of the base line in `IndexedTo100` mode.
+   *
+   * @defaultValue `'#B2B5BE'`
+   */
+  baseLineColor: string;
+  /**
+   * Base line width. Suitable for percentage and `IndexedTo10` scales.
+   *
+   * @defaultValue `1`
+   */
+  baseLineWidth: LineWidth;
+  /**
+   * Base line style. Suitable for percentage and indexedTo100 scales.
+   *
+   * @defaultValue {@link LineStyle.Solid}
+   */
+  baseLineStyle: LineStyle;
+  /**
+   * Override the default {@link AutoscaleInfo} provider.
+   * By default, the chart scales data automatically based on visible data range.
+   * However, for some reasons one could require overriding this behavior.
+   *
+   * @defaultValue `undefined`
+   * @example Use price range from 0 to 100 regardless the current visible range
+   * ```js
+   * const firstSeries = chart.addSeries(LineSeries, {
+   *     autoscaleInfoProvider: () => ({
+   *         priceRange: {
+   *             minValue: 0,
+   *             maxValue: 100,
+   *         },
+   *     }),
+   * });
+   * ```
+   * @example Adding a small pixel margins to the price range
+   * ```js
+   * const firstSeries = chart.addSeries(LineSeries, {
+   *     autoscaleInfoProvider: () => ({
+   *         priceRange: {
+   *             minValue: 0,
+   *             maxValue: 100,
+   *         },
+   *         margins: {
+   *             above: 10,
+   *             below: 10,
+   *         },
+   *     }),
+   * });
+   * ```
+   * @example Using the default implementation to adjust the result
+   * ```js
+   * const firstSeries = chart.addSeries(LineSeries, {
+   *     autoscaleInfoProvider: original => {
+   *         const res = original();
+   *         if (res !== null) {
+   *             res.priceRange.minValue -= 10;
+   *             res.priceRange.maxValue += 10;
+   *         }
+   *         return res;
+   *     },
+   * });
+   * ```
+   */
+  autoscaleInfoProvider?: AutoscaleInfoProvider;
+}
+/**
+ * Represents the type of options for each series type.
+ *
+ * For example a bar series has options represented by {@link BarSeriesOptions}.
+ */
+export interface SeriesOptionsMap {
+  /**
+   * The type of bar series options.
+   */
+  Bar: BarSeriesOptions;
+  /**
+   * The type of candlestick series options.
+   */
+  Candlestick: CandlestickSeriesOptions;
+  /**
+   * The type of area series options.
+   */
+  Area: AreaSeriesOptions;
+  /**
+   * The type of baseline series options.
+   */
+  Baseline: BaselineSeriesOptions;
+  /**
+   * The type of line series options.
+   */
+  Line: LineSeriesOptions;
+  /**
+   * The type of histogram series options.
+   */
+  Histogram: HistogramSeriesOptions;
+  /**
+   * The type of a custom series options.
+   */
+  Custom: CustomSeriesOptions;
+}
+/**
+ * Represents the type of partial options for each series type.
+ *
+ * For example a bar series has options represented by {@link BarSeriesPartialOptions}.
+ */
+export interface SeriesPartialOptionsMap {
+  /**
+   * The type of bar series partial options.
+   */
+  Bar: BarSeriesPartialOptions;
+  /**
+   * The type of candlestick series partial options.
+   */
+  Candlestick: CandlestickSeriesPartialOptions;
+  /**
+   * The type of area series partial options.
+   */
+  Area: AreaSeriesPartialOptions;
+  /**
+   * The type of baseline series partial options.
+   */
+  Baseline: BaselineSeriesPartialOptions;
+  /**
+   * The type of line series partial options.
+   */
+  Line: LineSeriesPartialOptions;
+  /**
+   * The type of histogram series partial options.
+   */
+  Histogram: HistogramSeriesPartialOptions;
+  /**
+   * The type of a custom series partial options.
+   */
+  Custom: CustomSeriesPartialOptions;
+}
+/**
+ * Represents the type of style options for each series type.
+ *
+ * For example a bar series has style options represented by {@link BarStyleOptions}.
+ */
+export interface SeriesStyleOptionsMap {
+  /**
+   * The type of bar style options.
+   */
+  Bar: BarStyleOptions;
+  /**
+   * The type of candlestick style options.
+   */
+  Candlestick: CandlestickStyleOptions;
+  /**
+   * The type of area style options.
+   */
+  Area: AreaStyleOptions;
+  /**
+   * The type of baseline style options.
+   */
+  Baseline: BaselineStyleOptions;
+  /**
+   * The type of line style options.
+   */
+  Line: LineStyleOptions;
+  /**
+   * The type of histogram style options.
+   */
+  Histogram: HistogramStyleOptions;
+  /**
+   * The type of a custom series' style options.
+   */
+  Custom: CustomStyleOptions;
+}
+/**
+ * Represents a marker drawn above or below a data point to indicate a price change update.
+ * @template T The type of the time value, defaults to Time.
+ */
+export interface SeriesUpDownMarker<T = Time> {
+  /**
+   * The point on the horizontal scale.
+   */
+  time: T;
+  /**
+   * The price value for the data point.
+   */
+  value: number;
+  /**
+   * The direction of the price change.
+   */
+  sign: MarkerSign;
+}
+/**
+ * A base interface for a data point of single-value series.
+ */
+export interface SingleValueData<HorzScaleItem = Time>
+  extends WhitespaceData<HorzScaleItem> {
+  /**
+   * The time of the data.
+   */
+  time: HorzScaleItem;
+  /**
+   * Price value of the data.
+   */
+  value: number;
+}
+/**
+ * Represents a solid color.
+ */
+export interface SolidColor {
+  /**
+   * Type of color.
+   */
+  type: ColorType.Solid;
+  /**
+   * Color.
+   */
+  color: string;
+}
+export interface TextWatermarkLineOptions {
+  /**
+   * Watermark color.
+   *
+   * @defaultValue `'rgba(0, 0, 0, 0.5)'`
+   */
+  color: string;
+  /**
+   * Text of the watermark. Word wrapping is not supported.
+   *
+   * @defaultValue `''`
+   */
+  text: string;
+  /**
+   * Font size in pixels.
+   *
+   * @defaultValue `48`
+   */
+  fontSize: number;
+  /**
+   * Line height in pixels.
+   *
+   * @defaultValue `1.2 * fontSize`
+   */
+  lineHeight?: number;
+  /**
+   * Font family.
+   *
+   * @defaultValue `-apple-system, BlinkMacSystemFont, 'Trebuchet MS', Roboto, Ubuntu, sans-serif`
+   */
+  fontFamily: string;
+  /**
+   * Font style.
+   *
+   * @defaultValue `''`
+   */
+  fontStyle: string;
+}
+export interface TextWatermarkOptions {
+  /**
+   * Display the watermark.
+   *
+   * @defaultValue `true`
+   */
+  visible: boolean;
+  /**
+   * Horizontal alignment inside the chart area.
+   *
+   * @defaultValue `'center'`
+   */
+  horzAlign: HorzAlign;
+  /**
+   * Vertical alignment inside the chart area.
+   *
+   * @defaultValue `'center'`
+   */
+  vertAlign: VertAlign;
+  /**
+   * Text to be displayed within the watermark. Each item
+   * in the array is treated as new line.
+   *
+   * @defaultValue `[]`
+   */
+  lines: TextWatermarkLineOptions[];
+}
+/**
+ * Tick mark for the horizontal scale.
+ */
+export interface TickMark {
+  /** Index */
+  index: TimePointIndex;
+  /** Time / Coordinate */
+  time: InternalHorzScaleItem;
+  /** Weight of the tick mark */
+  weight: TickMarkWeightValue;
+  /** Original value for the `time` property */
+  originalTime: unknown;
+}
+/**
+ * Options for chart with time at the horizontal scale
+ */
+export interface TimeChartOptions extends ChartOptionsImpl<Time> {
+  /**
+   * Extended time scale options with option to override tickMarkFormatter
+   */
+  timeScale: TimeScaleOptions;
+}
+/**
+ * Represents a tick mark on the horizontal (time) scale.
+ */
+export interface TimeMark {
+  /** Does time mark need to be aligned */
+  needAlignCoordinate: boolean;
+  /** Coordinate for the time mark */
+  coord: number;
+  /** Display label for the time mark */
+  label: string;
+  /** Weight of the time mark */
+  weight: TickMarkWeightValue;
+}
+/**
+ * Extended time scale options for time-based horizontal scale
+ */
+export interface TimeScaleOptions extends HorzScaleOptions {
+  /**
+   * Tick marks formatter can be used to customize tick marks labels on the time axis.
+   *
+   * @defaultValue `undefined`
+   */
+  tickMarkFormatter?: TickMarkFormatter;
+}
+/**
+ * Represents a point on the time scale
+ */
+export interface TimeScalePoint {
+  /** Weight of the point */
+  readonly timeWeight: TickMarkWeightValue;
+  /** Time of the point */
+  readonly time: InternalHorzScaleItem;
+  /** Original time for the point */
+  readonly originalTime: unknown;
+}
+/**
+ * The TouchMouseEventData interface represents events that occur due to the user interacting with a
+ * pointing device (such as a mouse).
+ * See {@link https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent | MouseEvent}
+ */
+export interface TouchMouseEventData {
+  /**
+   * The X coordinate of the mouse pointer in local (DOM content) coordinates.
+   */
+  readonly clientX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer in local (DOM content) coordinates.
+   */
+  readonly clientY: Coordinate;
+  /**
+   * The X coordinate of the mouse pointer relative to the whole document.
+   */
+  readonly pageX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer relative to the whole document.
+   */
+  readonly pageY: Coordinate;
+  /**
+   * The X coordinate of the mouse pointer in global (screen) coordinates.
+   */
+  readonly screenX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer in global (screen) coordinates.
+   */
+  readonly screenY: Coordinate;
+  /**
+   * The X coordinate of the mouse pointer relative to the chart / price axis / time axis canvas element.
+   */
+  readonly localX: Coordinate;
+  /**
+   * The Y coordinate of the mouse pointer relative to the chart / price axis / time axis canvas element.
+   */
+  readonly localY: Coordinate;
+  /**
+   * Returns a boolean value that is true if the Ctrl key was active when the key event was generated.
+   */
+  readonly ctrlKey: boolean;
+  /**
+   * Returns a boolean value that is true if the Alt (Option or ⌥ on macOS) key was active when the
+   * key event was generated.
+   */
+  readonly altKey: boolean;
+  /**
+   * Returns a boolean value that is true if the Shift key was active when the key event was generated.
+   */
+  readonly shiftKey: boolean;
+  /**
+   * Returns a boolean value that is true if the Meta key (on Mac keyboards, the ⌘ Command key; on
+   * Windows keyboards, the Windows key (⊞)) was active when the key event was generated.
+   */
+  readonly metaKey: boolean;
+}
+/**
+ * Represent options for the tracking mode's behavior.
+ *
+ * Mobile users will not have the ability to see the values/dates like they do on desktop.
+ * To see it, they should enter the tracking mode. The tracking mode will deactivate the scrolling
+ * and make it possible to check values and dates.
+ */
+export interface TrackingModeOptions {
+  /** @inheritDoc TrackingModeExitMode
+   *
+   * @defaultValue {@link TrackingModeExitMode.OnNextTap}
+   */
+  exitMode: TrackingModeExitMode;
+}
+/**
+ * Configuration options for the UpDownMarkers plugin.
+ */
+export interface UpDownMarkersPluginOptions {
+  /**
+   * The color used for markers indicating a positive price change.
+   * This color will be applied to markers shown above data points where the price has increased.
+   */
+  positiveColor: string;
+  /**
+   * The color used for markers indicating a negative price change.
+   * This color will be applied to markers shown below data points where the price has decreased.
+   */
+  negativeColor: string;
+  /**
+   * The duration (in milliseconds) for which update markers remain visible on the chart.
+   * After this duration, the markers will automatically disappear.
+   * Set to 0 for markers to remain indefinitely until the next update.
+   */
+  updateVisibilityDuration: number;
+}
+/**
+ * Represents a vertical gradient of two colors.
+ */
+export interface VerticalGradientColor {
+  /**
+   * Type of color.
+   */
+  type: ColorType.VerticalGradient;
+  /**
+   * Top color
+   */
+  topColor: string;
+  /**
+   * Bottom color
+   */
+  bottomColor: string;
+}
+/**
+ * Represents a whitespace data item, which is a data point without a value.
+ *
+ * @example
+ * ```js
+ * const data = [
+ *     { time: '2018-12-03', value: 27.02 },
+ *     { time: '2018-12-04' }, // whitespace
+ *     { time: '2018-12-05' }, // whitespace
+ *     { time: '2018-12-06' }, // whitespace
+ *     { time: '2018-12-07' }, // whitespace
+ *     { time: '2018-12-08', value: 23.92 },
+ *     { time: '2018-12-13', value: 30.74 },
+ * ];
+ * ```
+ */
+export interface WhitespaceData<HorzScaleItem = Time> {
+  /**
+   * The time of the data.
+   */
+  time: HorzScaleItem;
+  /**
+   * Additional custom values which will be ignored by the library, but
+   * could be used by plugins.
+   */
+  customValues?: Record<string, unknown>;
+}
+/**
+ * Extended chart options that include yield curve specific options.
+ * This interface combines the standard chart options with yield curve options.
+ */
+export interface YieldCurveChartOptions extends ChartOptionsImpl<number> {
+  /**
+   * Yield curve specific options.
+   * This object contains all the settings related to how the yield curve is displayed and behaves.
+   */
+  yieldCurve: YieldCurveOptions;
+}
+/**
+ * Options specific to yield curve charts.
+ */
+export interface YieldCurveOptions {
+  /**
+   * The smallest time unit for the yield curve, typically representing one month.
+   * This value determines the granularity of the time scale.
+   * @defaultValue 1
+   */
+  baseResolution: number;
+  /**
+   * The minimum time range to be displayed on the chart, in units of baseResolution.
+   * This ensures that the chart always shows at least this much time range, even if there's less data.
+   * @defaultValue 120 (10 years)
+   */
+  minimumTimeRange: number;
+  /**
+   * The starting time value for the chart, in units of baseResolution.
+   * This determines where the time scale begins.
+   * @defaultValue 0
+   */
+  startTimeRange: number;
+  /**
+   * Optional custom formatter for time values on the horizontal axis.
+   * If not provided, a default formatter will be used.
+   * @param months - The number of months (or baseResolution units) to format
+   * @returns A string representation of the time value
+   */
+  formatTime?: (months: number) => string;
+}
+/**
+ * Alpha component of the RGBA color value
+ * The valid values are integers in range [0, 1]
+ */
+export type AlphaComponent = Nominal<number, "AlphaComponent">;
+/**
+ * Represents area series options.
+ */
+export type AreaSeriesOptions = SeriesOptions<AreaStyleOptions>;
+/**
+ * Represents area series options where all properties are optional.
+ */
+export type AreaSeriesPartialOptions = SeriesPartialOptions<AreaStyleOptions>;
+/**
+ * A custom function used to get autoscale information.
+ *
+ * @param baseImplementation - The default implementation of autoscale algorithm, you can use it to adjust the result.
+ */
+export type AutoscaleInfoProvider = (
+  baseImplementation: () => AutoscaleInfo | null,
+) => AutoscaleInfo | null;
+/**
+ * Represents the background color of the chart.
+ */
+export type Background = SolidColor | VerticalGradientColor;
+/**
+ * Represents a price as a `number`.
+ */
+export type BarPrice = Nominal<number, "BarPrice">;
+/**
+ * Represents bar series options.
+ */
+export type BarSeriesOptions = SeriesOptions<BarStyleOptions>;
+/**
+ * Represents bar series options where all properties are options.
+ */
+export type BarSeriesPartialOptions = SeriesPartialOptions<BarStyleOptions>;
+/**
+ * Represents a type of a base value of baseline series type.
+ */
+export type BaseValueType = BaseValuePrice;
+/**
+ * Structure describing baseline series options.
+ */
+export type BaselineSeriesOptions = SeriesOptions<BaselineStyleOptions>;
+/**
+ * Represents baseline series options where all properties are options.
+ */
+export type BaselineSeriesPartialOptions =
+  SeriesPartialOptions<BaselineStyleOptions>;
+/**
+ * Blue component of the RGB color value
+ * The valid values are integers in range [0, 255]
+ */
+export type BlueComponent = Nominal<number, "BlueComponent">;
+/**
+ * Represents candlestick series options.
+ */
+export type CandlestickSeriesOptions = SeriesOptions<CandlestickStyleOptions>;
+/**
+ * Represents candlestick series options where all properties are optional.
+ */
+export type CandlestickSeriesPartialOptions =
+  SeriesPartialOptions<CandlestickStyleOptions>;
+/**
+ * Structure describing options of the chart with time points at the horizontal scale. Series options are to be set separately
+ */
+export type ChartOptions = TimeChartOptions;
+export type ColorSpace = "display-p3" | "srgb";
+/**
+ * Represents a coordiate as a `number`.
+ */
+export type Coordinate = Nominal<number, "Coordinate">;
+/**
+ * Price line options for the {@link ISeriesApi.createPriceLine} method.
+ *
+ * `price` is required, while the rest of the options are optional.
+ */
+export type CreatePriceLineOptions = Partial<PriceLineOptions> &
+  Pick<PriceLineOptions, "price">;
+export type CustomColorParser = (color: string) => Rgba | null;
+/**
+ * Represents a custom series options.
+ */
+export type CustomSeriesOptions = SeriesOptions<CustomStyleOptions>;
+/**
+ * Represents a custom series options where all properties are optional.
+ */
+export type CustomSeriesPartialOptions =
+  SeriesPartialOptions<CustomStyleOptions>;
+/**
+ * Price values for the custom series. This list should include the largest, smallest, and current price values for the data point.
+ * The last value in the array will be used for the current value. You shouldn't need to
+ * have more than 3 values in this array since the library only needs a largest, smallest, and current value.
+ *
+ * Examples:
+ * - For a line series, this would contain a single number representing the current value.
+ * - For a candle series, this would contain the high, low, and close values. Where the last value would be the close value.
+ */
+export type CustomSeriesPricePlotValues = number[];
+/**
+ * A custom function use to handle data changed events.
+ */
+export type DataChangedHandler = (scope: DataChangedScope) => void;
+/**
+ * The extent of the data change.
+ */
+export type DataChangedScope = "full" | "update";
+/**
+ * Represents the type of data that a series contains.
+ */
+export type DataItem<HorzScaleItem> =
+  SeriesDataItemTypeMap<HorzScaleItem>[SeriesType];
+/**
+ * Represents a type `T` where every property is optional.
+ */
+export type DeepPartial<T> = {
+  [P in keyof T]?: T[P] extends (infer U)[]
+    ? DeepPartial<U>[]
+    : T[P] extends readonly (infer X)[]
+      ? readonly DeepPartial<X>[]
+      : DeepPartial<T[P]>;
+};
+/**
+ * Green component of the RGB color value
+ * The valid values are integers in range [0, 255]
+ */
+export type GreenComponent = Nominal<number, "GreenComponent">;
+/**
+ * Represents histogram series options.
+ */
+export type HistogramSeriesOptions = SeriesOptions<HistogramStyleOptions>;
+/**
+ * Represents histogram series options where all properties are optional.
+ */
+export type HistogramSeriesPartialOptions =
+  SeriesPartialOptions<HistogramStyleOptions>;
+/**
+ * Represents a horizontal alignment.
+ */
+export type HorzAlign = "left" | "center" | "right";
+/**
+ * Function for converting a horizontal scale item to an internal item.
+ */
+export type HorzScaleItemConverterToInternalObj<HorzScaleItem> = (
+  time: HorzScaleItem,
+) => InternalHorzScaleItem;
+export type HorzScalePriceItem = number;
+export type IImageWatermarkPluginApi<T> = PrimitiveHasApplyOptions<
+  IPanePrimitiveWrapper<T, ImageWatermarkOptions>
+>;
+/**
+ * Interface for pane primitives. It must be implemented to add some external graphics to a pane.
+ */
+export type IPanePrimitive<HorzScaleItem = Time> = IPanePrimitiveBase<
+  PaneAttachedParameter<HorzScaleItem>
+>;
+/**
+ * Interface for series primitives. It must be implemented to add some external graphics to series.
+ */
+export type ISeriesPrimitive<HorzScaleItem = Time> = ISeriesPrimitiveBase<
+  SeriesAttachedParameter<HorzScaleItem, SeriesType>
+>;
+export type ITextWatermarkPluginApi<T> = PrimitiveHasApplyOptions<
+  IPanePrimitiveWrapper<T, TextWatermarkOptions>
+>;
+/**
+ * Internal Horizontal Scale Item
+ */
+export type InternalHorzScaleItem = Nominal<unknown, "InternalHorzScaleItem">;
+/**
+ * Index key for a horizontal scale item.
+ */
+export type InternalHorzScaleItemKey = Nominal<
+  number,
+  "InternalHorzScaleItemKey"
+>;
+/**
+ * Represents line series options.
+ */
+export type LineSeriesOptions = SeriesOptions<LineStyleOptions>;
+/**
+ * Represents line series options where all properties are optional.
+ */
+export type LineSeriesPartialOptions = SeriesPartialOptions<LineStyleOptions>;
+/**
+ * Represents the width of a line.
+ */
+export type LineWidth = 1 | 2 | 3 | 4;
+/**
+ * Represents the `to` or `from` number in a logical range.
+ */
+export type Logical = Nominal<number, "Logical">;
+/**
+ * A logical range is an object with 2 properties: `from` and `to`, which are numbers and represent logical indexes on the time scale.
+ *
+ * The starting point of the time scale's logical range is the first data item among all series.
+ * Before that point all indexes are negative, starting from that point - positive.
+ *
+ * Indexes might have fractional parts, for instance 4.2, due to the time-scale being continuous rather than discrete.
+ *
+ * Integer part of the logical index means index of the fully visible bar.
+ * Thus, if we have 5.2 as the last visible logical index (`to` field), that means that the last visible bar has index 5, but we also have partially visible (for 20%) 6th bar.
+ * Half (e.g. 1.5, 3.5, 10.5) means exactly a middle of the bar.
+ */
+export type LogicalRange = IRange<Logical>;
+/**
+ * A custom function used to handle changes to the time scale's logical range.
+ */
+export type LogicalRangeChangeEventHandler = (
+  logicalRange: LogicalRange | null,
+) => void;
+/**
+ * A custom function use to handle mouse events.
+ */
+export type MouseEventHandler<HorzScaleItem> = (
+  param: MouseEventParams<HorzScaleItem>,
+) => void;
+/**
+ * Removes "readonly" from all properties
+ */
+export type Mutable<T> = {
+  -readonly [P in keyof T]: T[P];
+};
+/**
+ * This is the generic type useful for declaring a nominal type,
+ * which does not structurally matches with the base type and
+ * the other types declared over the same base type
+ *
+ * @example
+ * ```ts
+ * type Index = Nominal<number, 'Index'>;
+ * // let i: Index = 42; // this fails to compile
+ * let i: Index = 42 as Index; // OK
+ * ```
+ * @example
+ * ```ts
+ * type TagName = Nominal<string, 'TagName'>;
+ * ```
+ */
+export type Nominal<T, Name extends string> = T & {
+  /** The 'name' or species of the nominal. */
+  [Symbol.species]: Name;
+};
+/**
+ * Represents overlay price scale options.
+ */
+export type OverlayPriceScaleOptions = Omit<
+  PriceScaleOptions,
+  "visible" | "autoScale"
+>;
+/**
+ * A function used to format a percentage value as a string.
+ */
+export type PercentageFormatterFn = (percentageValue: number) => string;
+/**
+ * Represents information used to format prices.
+ */
+export type PriceFormat = PriceFormatBuiltIn | PriceFormatCustom;
+/**
+ * A function used to format a {@link BarPrice} as a string.
+ */
+export type PriceFormatterFn = (priceValue: BarPrice) => string;
+/**
+ * Converter function for changing prices into vertical coordinate values.
+ *
+ * This is provided as a convenience function since the series original data will most likely be defined
+ * in price values, and the renderer needs to draw with coordinates. This returns the same values as
+ * directly using the series' priceToCoordinate method.
+ */
+export type PriceToCoordinateConverter = (price: number) => Coordinate | null;
+/**
+ * Primitive has `applyOptions` as a method for adjusting the options after creation.
+ */
+export type PrimitiveHasApplyOptions<
+  T extends {
+    /**
+     * Method for applying options after the Primitive has been created.
+     */
+    applyOptions?: unknown;
+  },
+> = T & Required<Pick<T, "applyOptions">>;
+/**
+ * Defines where in the visual layer stack the renderer should be executed.
+ *
+ * - `bottom`: Draw below everything except the background.
+ * - `normal`: Draw at the same level as the series.
+ * - `top`: Draw above everything (including the crosshair).
+ */
+export type PrimitivePaneViewZOrder = "bottom" | "normal" | "top";
+/**
+ * Red component of the RGB color value
+ * The valid values are integers in range [0, 255]
+ */
+export type RedComponent = Nominal<number, "RedComponent">;
+export type Rgba = [
+  RedComponent,
+  GreenComponent,
+  BlueComponent,
+  AlphaComponent,
+];
+/**
+ * Represents a series marker.
+ */
+export type SeriesMarker<TimeType> =
+  | SeriesMarkerBar<TimeType>
+  | SeriesMarkerPrice<TimeType>;
+/**
+ * Represents the position of a series marker relative to a bar.
+ */
+export type SeriesMarkerBarPosition = "aboveBar" | "belowBar" | "inBar";
+/**
+ * Represents the position of a series marker relative to a bar.
+ */
+export type SeriesMarkerPosition =
+  | SeriesMarkerBarPosition
+  | SeriesMarkerPricePosition;
+/**
+ * Represents the position of a series marker relative to a specific price.
+ *
+ * The price value should be specified in the {@link SeriesMarker.price}
+ */
+export type SeriesMarkerPricePosition =
+  | "atPriceTop"
+  | "atPriceBottom"
+  | "atPriceMiddle";
+/**
+ * Represents the shape of a series marker.
+ */
+export type SeriesMarkerShape = "circle" | "square" | "arrowUp" | "arrowDown";
+/**
+ * The visual stacking order for the markers within the chart.
+ *
+ * - `normal`: Markers are drawn together with the series they belong to. They can appear below other series depending on the series stacking order.
+ * - `aboveSeries`: Markers are drawn above all series but below primitives that use the 'top' zOrder layer.
+ * - `top`: Markers are drawn on the topmost primitive layer, above all series and (most) other primitives.
+ */
+export type SeriesMarkerZOrder = "top" | "aboveSeries" | "normal";
+/**
+ * Represents the intersection of a series type `T`'s options and common series options.
+ *
+ * @see {@link SeriesOptionsCommon} for common options.
+ */
+export type SeriesOptions<T> = T & SeriesOptionsCommon;
+/**
+ * Represents a {@link SeriesOptions} where every property is optional.
+ */
+export type SeriesPartialOptions<T> = DeepPartial<T & SeriesOptionsCommon>;
+/**
+ * Represents a type of series.
+ *
+ * @see {@link SeriesOptionsMap}
+ */
+export type SeriesType = keyof SeriesOptionsMap;
+/**
+ * A custom function used to handle changes to the time scale's size.
+ */
+export type SizeChangeEventHandler = (width: number, height: number) => void;
+/**
+ * The `TickMarkFormatter` is used to customize tick mark labels on the time scale.
+ *
+ * This function should return `time` as a string formatted according to `tickMarkType` type (year, month, etc) and `locale`.
+ *
+ * Note that the returned string should be the shortest possible value and should have no more than 8 characters.
+ * Otherwise, the tick marks will overlap each other.
+ *
+ * If the formatter function returns `null` then the default tick mark formatter will be used as a fallback.
+ *
+ * @example
+ * ```js
+ * const customFormatter = (time, tickMarkType, locale) => {
+ *     // your code here
+ * };
+ * ```
+ */
+export type TickMarkFormatter = (
+  time: Time,
+  tickMarkType: TickMarkType,
+  locale: string,
+) => string | null;
+/**
+ * Weight of the tick mark. @see TickMarkWeight enum
+ */
+export type TickMarkWeightValue = Nominal<number, "TickMarkWeightValue">;
+export type TickmarksPercentageFormatterFn = (
+  percentageValue: number[],
+) => string[];
+export type TickmarksPriceFormatterFn = (priceValue: BarPrice[]) => string[];
+/**
+ * The Time type is used to represent the time of data items.
+ *
+ * Values can be a {@link UTCTimestamp}, a {@link BusinessDay}, or a business day string in ISO format.
+ *
+ * @example
+ * ```js
+ * const timestamp = 1529899200; // Literal timestamp representing 2018-06-25T04:00:00.000Z
+ * const businessDay = { year: 2019, month: 6, day: 1 }; // June 1, 2019
+ * const businessDayString = '2021-02-03'; // Business day string literal
+ * ```
+ */
+export type Time = UTCTimestamp | BusinessDay | string;
+/**
+ * A custom function used to override formatting of a time to a string.
+ */
+export type TimeFormatterFn<HorzScaleItem = Time> = (
+  time: HorzScaleItem,
+) => string;
+/**
+ * Index for a point on the horizontal (time) scale.
+ */
+export type TimePointIndex = Nominal<number, "TimePointIndex">;
+/**
+ * A custom function used to handle changes to the time scale's time range.
+ */
+export type TimeRangeChangeEventHandler<HorzScaleItem> = (
+  timeRange: IRange<HorzScaleItem> | null,
+) => void;
+/**
+ * Represents a time as a UNIX timestamp.
+ *
+ * If your chart displays an intraday interval you should use a UNIX Timestamp.
+ *
+ * Note that JavaScript Date APIs like `Date.now` return a number of milliseconds but UTCTimestamp expects a number of seconds.
+ *
+ * Note that to prevent errors, you should cast the numeric type of the time to `UTCTimestamp` type from the package (`value as UTCTimestamp`) in TypeScript code.
+ *
+ * @example
+ * ```ts
+ * const timestamp = 1529899200 as UTCTimestamp; // Literal timestamp representing 2018-06-25T04:00:00.000Z
+ * const timestamp2 = (Date.now() / 1000) as UTCTimestamp;
+ * ```
+ */
+export type UTCTimestamp = Nominal<number, "UTCTimestamp">;
+/**
+ * Defines the supported series types for up down markers primitive plugin.
+ */
+export type UpDownMarkersSupportedSeriesTypes = "Line" | "Area";
+/**
+ * Represents a vertical alignment.
+ */
+export type VertAlign = "top" | "center" | "bottom";
+/**
+ * Represents a visible price scale's options.
+ *
+ * @see {@link PriceScaleOptions}
+ */
+export type VisiblePriceScaleOptions = PriceScaleOptions;
+export type YieldCurveSeriesType = "Area" | "Line";
+
+export {
+  areaSeries as AreaSeries,
+  barSeries as BarSeries,
+  baselineSeries as BaselineSeries,
+  candlestickSeries as CandlestickSeries,
+  histogramSeries as HistogramSeries,
+  lineSeries as LineSeries,
+};
+
+export {};
diff --git a/websites/default/packages/lightweight-charts/wrapper.js b/websites/default/packages/lightweight-charts/wrapper.js
index 17451b94f..fd9e5ad79 100644
--- a/websites/default/packages/lightweight-charts/wrapper.js
+++ b/websites/default/packages/lightweight-charts/wrapper.js
@@ -1,6 +1,6 @@
 // @ts-check
 
-/** @import { IChartApi, ISeriesApi as _ISeriesApi, SeriesDefinition, SingleValueData as _SingleValueData, CandlestickData as _CandlestickData, BaselineData as _BaselineData, SeriesType, IPaneApi, LineSeriesPartialOptions, BaselineSeriesPartialOptions, CandlestickSeriesPartialOptions, WhitespaceData, DeepPartial, ChartOptions, Time, LineData as _LineData } from './v5.0.7/types' */
+/** @import { IChartApi, ISeriesApi as _ISeriesApi, SeriesDefinition, SingleValueData as _SingleValueData, CandlestickData as _CandlestickData, BaselineData as _BaselineData, SeriesType, IPaneApi, LineSeriesPartialOptions, BaselineSeriesPartialOptions, CandlestickSeriesPartialOptions, WhitespaceData, DeepPartial, ChartOptions, Time, LineData as _LineData } from './v5.0.8/types' */
 
 /**
  * @typedef {[number, number, number, number]} OHLCTuple
@@ -49,7 +49,7 @@ import {
   CandlestickSeries,
   LineSeries,
   BaselineSeries,
-} from "./v5.0.7/script.js";
+} from "./v5.0.8/script.js";
 
 const oklchToRGBA = createOklchToRGBA();
 
@@ -141,13 +141,15 @@ function createChartElement({
           }
         : {}),
       // ..._options,
-    })
+    }),
   );
 
   ichart.priceScale("right").applyOptions({
     minimumWidth: 80,
   });
 
+  ichart.panes().at(0)?.setStretchFactor(1);
+
   signals.createEffect(
     () => ({
       defaultColor: colors.default(),
@@ -173,7 +175,7 @@ function createChartElement({
           },
         },
       });
-    }
+    },
   );
 
   signals.createEffect(index, (index) => {
@@ -181,12 +183,14 @@ function createChartElement({
       index === /** @satisfies {MonthIndex} */ (7)
         ? 1
         : index === /** @satisfies {QuarterIndex} */ (19)
-        ? 2
-        : index === /** @satisfies {YearIndex} */ (23)
-        ? 6
-        : index === /** @satisfies {DecadeIndex} */ (1)
-        ? 60
-        : 0.5;
+          ? 2
+          : index === /** @satisfies {SemesterIndex} */ (20)
+            ? 3
+            : index === /** @satisfies {YearIndex} */ (24)
+              ? 6
+              : index === /** @satisfies {DecadeIndex} */ (1)
+                ? 60
+                : 0.5;
 
     ichart.applyOptions({
       timeScale: {
@@ -209,7 +213,7 @@ function createChartElement({
       activeResources.forEach((v) => {
         v.fetch();
       });
-    })
+    }),
   );
 
   if (fitContent) {
@@ -234,19 +238,20 @@ function createChartElement({
             ?.panes()
             .at(paneIndex)
             ?.getHTMLElement()
-            .children?.item(1)?.firstChild;
+            ?.children?.item(1)?.firstChild;
 
           if (!parent) throw Error("Parent should exist");
 
           const children = Array.from(parent.childNodes).filter(
             (element) =>
-              /** @type {HTMLElement} */ (element).dataset.position === position
+              /** @type {HTMLElement} */ (element).dataset.position ===
+              position,
           );
 
           if (children.length === 1) {
             children[0].remove();
           } else if (children.length > 1) {
-            throw Error("Unreacable");
+            throw Error("Untraceable");
           }
 
           const fieldset = window.document.createElement("fieldset");
@@ -257,12 +262,12 @@ function createChartElement({
           if (!pane) throw Error("Expect pane");
           pane
             .getHTMLElement()
-            .children?.item(1)
+            ?.children?.item(1)
             ?.firstChild?.appendChild(fieldset);
 
           fieldset.append(createChild(pane));
         }),
-      paneIndex ? 50 : 0
+      paneIndex ? 50 : 0,
     );
   }
 
@@ -346,7 +351,7 @@ function createChartElement({
         // Or remove ?
         iseries.applyOptions({
           visible: active,
-        })
+        }),
       );
 
       iseries.setSeriesOrder(order);
@@ -376,8 +381,8 @@ function createChartElement({
           const timeResource = vecsResources.getOrCreate(
             index,
             index === /** @satisfies {Height} */ (5)
-              ? "timestamp-fixed"
-              : "timestamp"
+              ? "timestamp_fixed"
+              : "timestamp",
           );
           timeResource.fetch();
 
@@ -471,7 +476,8 @@ function createChartElement({
                     timeScaleSetCallback?.(() => {
                       if (
                         index === /** @satisfies {QuarterIndex} */ (19) ||
-                        index === /** @satisfies {YearIndex} */ (23) ||
+                        index === /** @satisfies {SemesterIndex} */ (20) ||
+                        index === /** @satisfies {YearIndex} */ (24) ||
                         index === /** @satisfies {DecadeIndex} */ (1)
                       ) {
                         ichart.timeScale().setVisibleLogicalRange({
@@ -497,7 +503,7 @@ function createChartElement({
                   });
 
                   console.timeEnd(consoleTimeLabel);
-                }
+                },
               );
             } else {
               activeResources.delete(valuesResource);
@@ -527,13 +533,6 @@ function createChartElement({
         order,
       });
 
-      createPaneHeightObserver({
-        ichart,
-        paneIndex,
-        signals,
-        utils,
-      });
-
       addPriceScaleSelectorIfNeeded({
         paneIndex,
         seriesType,
@@ -590,7 +589,7 @@ function createChartElement({
             borderVisible: false,
             visible: defaultActive !== false,
           },
-          paneIndex
+          paneIndex,
         )
       );
 
@@ -646,7 +645,7 @@ function createChartElement({
             color: color(),
             ...options,
           },
-          paneIndex
+          paneIndex,
         )
       );
 
@@ -714,7 +713,7 @@ function createChartElement({
             topFillColor2: "transparent",
             lineVisible: true,
           },
-          paneIndex
+          paneIndex,
         )
       );
 
@@ -877,7 +876,7 @@ function createLegend({ signals, utils }) {
             } else {
               spanColor.style.backgroundColor = tameColor(color);
             }
-          }
+          },
         );
       });
 
@@ -928,63 +927,6 @@ function createLegend({ signals, utils }) {
   };
 }
 
-/**
- * @param {Object} args
- * @param {IChartApi} args.ichart
- * @param {number} args.paneIndex
- * @param {Signals} args.signals
- * @param {Utilities} args.utils
- */
-function createPaneHeightObserver({ ichart, paneIndex, signals, utils }) {
-  if (!paneIndex) return;
-
-  const owner = signals.getOwner();
-
-  const one = "1";
-
-  const callback = () =>
-    setTimeout(() => {
-      try {
-        const _element = ichart.panes().at(paneIndex)?.getHTMLElement();
-        if (!_element) return callback();
-        const element = _element;
-
-        if (element.dataset.observed === one) return;
-        element.dataset.observed = one;
-
-        signals.runWithOwner(owner, () => {
-          const height = signals.createSignal(null, {
-            save: {
-              keyPrefix: "charts",
-              key: `height-${paneIndex}`,
-              ...utils.serde.optNumber,
-            },
-          });
-
-          const savedHeight = height();
-          if (savedHeight !== null) {
-            ichart.panes().at(paneIndex)?.setHeight(savedHeight);
-          }
-
-          let firstRun = true;
-          new ResizeObserver(() => {
-            if (firstRun && savedHeight !== null) {
-              firstRun = false;
-            } else {
-              const h = ichart.panes().at(paneIndex)?.getHeight();
-              if (h === undefined) return;
-              height.set(h);
-            }
-          }).observe(element);
-        });
-      } catch {
-        callback();
-      }
-    }, 5);
-
-  callback();
-}
-
 /**
  * @param {ISeries} series
  * @param {DeepPartial<CreatePriceLine>} options
@@ -1037,17 +979,17 @@ function numberToShortUSFormat(value, digits) {
   if (modulused === 0) {
     return `${numberToUSFormat(
       value / (1_000_000 * 1_000 ** letterIndex),
-      3
+      3,
     )}${letter}`;
   } else if (modulused === 1) {
     return `${numberToUSFormat(
       value / (1_000_000 * 1_000 ** letterIndex),
-      2
+      2,
     )}${letter}`;
   } else {
     return `${numberToUSFormat(
       value / (1_000_000 * 1_000 ** letterIndex),
-      1
+      1,
     )}${letter}`;
   }
 }
@@ -1097,7 +1039,7 @@ function createOklchToRGBA() {
       return rgb.map((c) =>
         Math.abs(c) > 0.0031308
           ? (c < 0 ? -1 : 1) * (1.055 * Math.abs(c) ** (1 / 2.4) - 0.055)
-          : 12.92 * c
+          : 12.92 * c,
       );
     }
     /**
@@ -1109,7 +1051,7 @@ function createOklchToRGBA() {
           1, 0.3963377773761749, 0.2158037573099136, 1, -0.1055613458156586,
           -0.0638541728258133, 1, -0.0894841775298119, -1.2914855480194092,
         ]),
-        lab
+        lab,
       );
       const LMS = /** @type {[number, number, number]} */ (
         LMSg.map((val) => val ** 3)
@@ -1120,7 +1062,7 @@ function createOklchToRGBA() {
           -0.0405757452148008, 1.112286803280317, -0.0717110580655164,
           -0.0763729366746601, -0.4214933324022432, 1.5869240198367816,
         ]),
-        LMS
+        LMS,
       );
     }
     /**
@@ -1133,7 +1075,7 @@ function createOklchToRGBA() {
           -0.9692436362808796, 1.8759675015077202, 0.04155505740717559,
           0.05563007969699366, -0.20397695888897652, 1.0569715142428786,
         ],
-        xyz
+        xyz,
       );
     }
 
@@ -1156,8 +1098,8 @@ function createOklchToRGBA() {
       });
       const rgb = srgbLinear2rgb(
         xyz2rgbLinear(
-          oklab2xyz(oklch2oklab(/** @type {[number, number, number]} */ (lch)))
-        )
+          oklab2xyz(oklch2oklab(/** @type {[number, number, number]} */ (lch))),
+        ),
       ).map((v) => {
         return Math.max(Math.min(Math.round(v * 255), 255), 0);
       });
diff --git a/websites/default/scripts/chart.js b/websites/default/scripts/chart.js
index a312ee7b7..afe0b2682 100644
--- a/websites/default/scripts/chart.js
+++ b/websites/default/scripts/chart.js
@@ -7,7 +7,7 @@ const LINE = "line";
 const CANDLE = "candle";
 
 /**
- * @typedef {"timestamp" | "date" | "week" | "diff. epoch" | "month" | "quarter" | "year" | "decade" } SerializedChartableIndex
+ * @typedef {"timestamp" | "date" | "week" | "d.epoch" | "month" | "quarter" | "semester" | "year" | "decade" } SerializedChartableIndex
  */
 
 /**
@@ -47,7 +47,7 @@ export function init({
   });
 
   const TIMERANGE_LS_KEY = signals.createMemo(
-    () => `chart-timerange-${index()}`
+    () => `chart-timerange-${index()}`,
   );
 
   let firstRun = true;
@@ -101,7 +101,7 @@ export function init({
         from.set(t.from);
         to.set(t.to);
       }
-    })
+    }),
   );
 
   elements.charts.append(fieldset);
@@ -205,20 +205,23 @@ export function init({
         break;
       }
       default: {
-        if (index === /** @satisfies {WeekIndex} */ (22)) {
+        if (index === /** @satisfies {WeekIndex} */ (23)) {
           date.setUTCDate(date.getUTCDate() - ((date.getUTCDay() + 6) % 7));
         } else if (index === /** @satisfies {MonthIndex} */ (7)) {
           date.setUTCDate(1);
         } else if (index === /** @satisfies {QuarterIndex} */ (19)) {
           const month = date.getUTCMonth();
           date.setUTCMonth(month - (month % 3), 1);
-        } else if (index === /** @satisfies {YearIndex} */ (23)) {
+        } else if (index === /** @satisfies {SemesterIndex} */ (20)) {
+          const month = date.getUTCMonth();
+          date.setUTCMonth(month - (month % 6), 1);
+        } else if (index === /** @satisfies {YearIndex} */ (24)) {
           date.setUTCMonth(0, 1);
         } else if (index === /** @satisfies {DecadeIndex} */ (1)) {
           date.setUTCFullYear(
             Math.floor(date.getUTCFullYear() / 10) * 10,
             0,
-            1
+            1,
           );
         } else {
           throw Error("Unsupported");
@@ -361,9 +364,9 @@ export function init({
             ({ latest, hasData }) => {
               if (!series || !latest || !hasData) return;
               printLatest({ iseries: series.inner, unit: topUnit, index });
-            }
+            },
           );
-        }
+        },
       );
 
       [
@@ -384,14 +387,7 @@ export function init({
           legend: chart.legendBottom,
         },
       ].forEach(
-        ({
-          blueprints,
-          paneIndex,
-          unit,
-          seriesList: seriesList,
-          orderStart,
-          legend,
-        }) => {
+        ({ blueprints, paneIndex, unit, seriesList, orderStart, legend }) => {
           signals.createEffect(unit, (unit) => {
             legend.removeFrom(orderStart);
 
@@ -425,7 +421,7 @@ export function init({
                             blueprint.color?.() ?? blueprint.colors?.[1](),
                         },
                         order,
-                      })
+                      }),
                     );
                     break;
                   }
@@ -443,13 +439,13 @@ export function init({
                         paneIndex,
                         options: blueprint.options,
                         order,
-                      })
+                      }),
                     );
                 }
               }
             });
           });
-        }
+        },
       );
 
       firstRun = false;
@@ -469,9 +465,10 @@ function createIndexSelector({ option, vecIdToIndexes, signals, utils }) {
     "timestamp",
     "date",
     "week",
-    "diff. epoch",
+    "d.epoch",
     "month",
     "quarter",
+    "semester",
     "year",
     // "halving epoch",
     "decade",
@@ -488,7 +485,7 @@ function createIndexSelector({ option, vecIdToIndexes, signals, utils }) {
       [Object.values(o.top), Object.values(o.bottom)]
         .flat(2)
         .map((blueprint) => vecIdToIndexes[blueprint.key])
-        .flat()
+        .flat(),
     );
 
     const serializedIndexes = [...rawIndexes].flatMap((index) => {
@@ -515,7 +512,7 @@ function createIndexSelector({ option, vecIdToIndexes, signals, utils }) {
   fieldset.dataset.size = "sm";
 
   const index = signals.createMemo(() =>
-    utils.serde.chartableIndex.deserialize(selected())
+    utils.serde.chartableIndex.deserialize(selected()),
   );
 
   return { fieldset, index };
diff --git a/websites/default/scripts/explorer.js b/websites/default/scripts/explorer.js
new file mode 100644
index 000000000..e861c19e0
--- /dev/null
+++ b/websites/default/scripts/explorer.js
@@ -0,0 +1,116 @@
+// @ts-check
+
+/**
+ * @param {Object} args
+ * @param {Colors} args.colors
+ * @param {LightweightCharts} args.lightweightCharts
+ * @param {Accessor<ChartOption>} args.option
+ * @param {Signals} args.signals
+ * @param {Utilities} args.utils
+ * @param {WebSockets} args.webSockets
+ * @param {Elements} args.elements
+ * @param {VecsResources} args.vecsResources
+ * @param {VecIdToIndexes} args.vecIdToIndexes
+ */
+export function init({
+  colors,
+  elements,
+  lightweightCharts,
+  option,
+  signals,
+  utils,
+  webSockets,
+  vecsResources,
+  vecIdToIndexes,
+}) {
+  const chain = window.document.createElement("div");
+  chain.id = "chain";
+  elements.explorer.append(chain);
+
+  // vecsResources.getOrCreate(/** @satisfies {Height}*/ (5), "height");
+  //
+  const miners = [
+    { name: "Foundry USA", color: "orange" },
+    { name: "Via BTC", color: "teal" },
+    { name: "Ant Pool", color: "emerald" },
+    { name: "F2Pool", color: "indigo" },
+    { name: "Spider Pool", color: "yellow" },
+    { name: "Mara Pool", color: "amber" },
+    { name: "SEC Pool", color: "violet" },
+    { name: "Luxor", color: "orange" },
+    { name: "Brains Pool", color: "cyan" },
+  ];
+
+  for (let i = 0; i <= 10; i++) {
+    const { name, color } = utils.array.random(miners);
+    const { cubeElement, leftFaceElement, rightFaceElement, topFaceElement } =
+      createCube();
+
+    // cubeElement.style.setProperty("--color", `var(--${color})`);
+
+    const heightElement = window.document.createElement("p");
+    const height = (1_000_002 - i).toString();
+    const prefixLength = 7 - height.length;
+    const spanPrefix = window.document.createElement("span");
+    spanPrefix.style.opacity = "0.5";
+    spanPrefix.style.userSelect = "none";
+    heightElement.append(spanPrefix);
+    spanPrefix.innerHTML = "#" + "0".repeat(prefixLength);
+    const spanHeight = window.document.createElement("span");
+    heightElement.append(spanHeight);
+    spanHeight.innerHTML = height;
+    rightFaceElement.append(heightElement);
+
+    const feesElement = window.document.createElement("div");
+    feesElement.classList.add("fees");
+    leftFaceElement.append(feesElement);
+    const averageFeeElement = window.document.createElement("p");
+    feesElement.append(averageFeeElement);
+    averageFeeElement.innerHTML = `~1.41`;
+    const feeRangeElement = window.document.createElement("p");
+    feesElement.append(feeRangeElement);
+    const minFeeElement = window.document.createElement("span");
+    minFeeElement.innerHTML = `0.11`;
+    feeRangeElement.append(minFeeElement);
+    const dashElement = window.document.createElement("span");
+    dashElement.style.opacity = "0.5";
+    dashElement.innerHTML = `-`;
+    feeRangeElement.append(dashElement);
+    const maxFeeElement = window.document.createElement("span");
+    maxFeeElement.innerHTML = `12.1`;
+    feeRangeElement.append(maxFeeElement);
+    const feeUnitElement = window.document.createElement("p");
+    feesElement.append(feeUnitElement);
+    feeUnitElement.style.opacity = "0.5";
+    feeUnitElement.innerHTML = `sat/vB`;
+
+    const spanMiner = window.document.createElement("span");
+    spanMiner.innerHTML = name;
+    topFaceElement.append(spanMiner);
+
+    chain.prepend(cubeElement);
+  }
+}
+
+function createCube() {
+  const cubeElement = window.document.createElement("div");
+  cubeElement.classList.add("cube");
+  const rightFaceElement = window.document.createElement("div");
+  rightFaceElement.classList.add("face");
+  rightFaceElement.classList.add("right");
+  cubeElement.append(rightFaceElement);
+  const leftFaceElement = window.document.createElement("div");
+  leftFaceElement.classList.add("face");
+  leftFaceElement.classList.add("left");
+  cubeElement.append(leftFaceElement);
+  const topFaceElement = window.document.createElement("div");
+  topFaceElement.classList.add("face");
+  topFaceElement.classList.add("top");
+  cubeElement.append(topFaceElement);
+  return {
+    cubeElement,
+    leftFaceElement,
+    rightFaceElement,
+    topFaceElement,
+  };
+}
diff --git a/websites/default/scripts/main.js b/websites/default/scripts/main.js
index 8b18ea0b1..67208e6d8 100644
--- a/websites/default/scripts/main.js
+++ b/websites/default/scripts/main.js
@@ -6,7 +6,7 @@
  * @import * as _ from "../packages/ufuzzy/v1.0.18/types"
  * @import { SerializedChartableIndex } from "./chart";
  * @import { Signal, Signals, Accessor } from "../packages/solid-signals/wrapper";
- * @import { DateIndex, DecadeIndex, DifficultyEpoch, Index, HalvingEpoch, Height, MonthIndex, P2PK33AddressIndex, P2PK65AddressIndex, P2PKHAddressIndex, P2SHAddressIndex, P2MSOutputIndex, P2AAddressIndex, P2TRAddressIndex, P2WPKHAddressIndex, P2WSHAddressIndex, TxIndex, InputIndex, OutputIndex, VecId, WeekIndex, YearIndex, VecIdToIndexes, QuarterIndex, EmptyOutputIndex, OpReturnIndex, UnknownOutputIndex } from "./vecid-to-indexes"
+ * @import { DateIndex, DecadeIndex, DifficultyEpoch, Index, HalvingEpoch, Height, MonthIndex, P2PK33AddressIndex, P2PK65AddressIndex, P2PKHAddressIndex, P2SHAddressIndex, P2MSOutputIndex, P2AAddressIndex, P2TRAddressIndex, P2WPKHAddressIndex, P2WSHAddressIndex, TxIndex, InputIndex, OutputIndex, VecId, WeekIndex, SemesterIndex, YearIndex, VecIdToIndexes, QuarterIndex, EmptyOutputIndex, OpReturnIndex, UnknownOutputIndex } from "./vecid-to-indexes"
  */
 
 /**
@@ -64,14 +64,14 @@ function initPackages() {
   const imports = {
     async signals() {
       return import("../packages/solid-signals/wrapper.js").then(
-        (d) => d.default
+        (d) => d.default,
       );
     },
     async lightweightCharts() {
       return window.document.fonts.ready.then(() =>
         import("../packages/lightweight-charts/wrapper.js").then(
-          (d) => d.default
-        )
+          (d) => d.default,
+        ),
       );
     },
     async leanQr() {
@@ -79,7 +79,7 @@ function initPackages() {
     },
     async ufuzzy() {
       return import("../packages/ufuzzy/v1.0.18/script.js").then(
-        ({ default: d }) => d
+        ({ default: d }) => d,
       );
     },
   };
@@ -149,6 +149,13 @@ function createUtils() {
       }
       return range;
     },
+    /**
+     * @template T
+     * @param {T[]} array
+     */
+    random(array) {
+      return array[Math.floor(Math.random() * array.length)];
+    },
   };
 
   const dom = {
@@ -587,7 +594,7 @@ function createUtils() {
         window.history.pushState(
           null,
           "",
-          `${pathname}?${urlParams.toString()}`
+          `${pathname}?${urlParams.toString()}`,
         );
       } catch (_) {}
     },
@@ -604,7 +611,7 @@ function createUtils() {
         window.history.replaceState(
           null,
           "",
-          `${pathname}?${urlParams.toString()}`
+          `${pathname}?${urlParams.toString()}`,
         );
       } catch (_) {}
     },
@@ -850,7 +857,9 @@ function createUtils() {
     }
     if (
       (!unit || thoroughUnitCheck) &&
-      (id.endsWith("_size") || id.endsWith("_size_sum"))
+      (id.endsWith("_size") ||
+        id.endsWith("_size_sum") ||
+        id.endsWith("_size_cumulative"))
     ) {
       if (unit) throw Error(`Unit "${unit}" already assigned "${id}"`);
       unit = "mb";
@@ -859,7 +868,8 @@ function createUtils() {
       (!unit || thoroughUnitCheck) &&
       (id.endsWith("vsize") ||
         id.endsWith("vbytes") ||
-        id.endsWith("_vbytes_sum"))
+        id.endsWith("_vbytes_sum") ||
+        id.endsWith("_vbytes_cumulative"))
     ) {
       if (unit) throw Error(`Unit "${unit}" already assigned "${id}"`);
       unit = "vB";
@@ -1154,13 +1164,15 @@ function createUtils() {
             return "p2wshaddressindex";
           case /** @satisfies {QuarterIndex} */ (19):
             return "quarterindex";
-          case /** @satisfies {TxIndex} */ (20):
+          case /** @satisfies {SemesterIndex} */ (20):
+            return "semesterindex";
+          case /** @satisfies {TxIndex} */ (21):
             return "txindex";
-          case /** @satisfies {UnknownOutputIndex} */ (21):
+          case /** @satisfies {UnknownOutputIndex} */ (22):
             return "unknownoutputindex";
-          case /** @satisfies {WeekIndex} */ (22):
+          case /** @satisfies {WeekIndex} */ (23):
             return "weekindex";
-          case /** @satisfies {YearIndex} */ (23):
+          case /** @satisfies {YearIndex} */ (24):
             return "yearindex";
         }
       },
@@ -1177,7 +1189,7 @@ function createUtils() {
           case /** @satisfies {DecadeIndex} */ (1):
             return "decade";
           case /** @satisfies {DifficultyEpoch} */ (2):
-            return "diff. epoch";
+            return "d.epoch";
           // case /** @satisfies {HalvingEpoch} */ (4):
           //   return "halving";
           case /** @satisfies {Height} */ (5):
@@ -1186,9 +1198,11 @@ function createUtils() {
             return "month";
           case /** @satisfies {QuarterIndex} */ (19):
             return "quarter";
-          case /** @satisfies {WeekIndex} */ (22):
+          case /** @satisfies {SemesterIndex} */ (20):
+            return "semester";
+          case /** @satisfies {WeekIndex} */ (23):
             return "week";
-          case /** @satisfies {YearIndex} */ (23):
+          case /** @satisfies {YearIndex} */ (24):
             return "year";
           default:
             return null;
@@ -1205,15 +1219,17 @@ function createUtils() {
           case "date":
             return /** @satisfies {DateIndex} */ (0);
           case "week":
-            return /** @satisfies {WeekIndex} */ (22);
-          case "diff. epoch":
+            return /** @satisfies {WeekIndex} */ (23);
+          case "d.epoch":
             return /** @satisfies {DifficultyEpoch} */ (2);
           case "month":
             return /** @satisfies {MonthIndex} */ (7);
           case "quarter":
             return /** @satisfies {QuarterIndex} */ (19);
+          case "semester":
+            return /** @satisfies {SemesterIndex} */ (20);
           case "year":
-            return /** @satisfies {YearIndex} */ (23);
+            return /** @satisfies {YearIndex} */ (24);
           case "decade":
             return /** @satisfies {DecadeIndex} */ (1);
           default:
@@ -1248,8 +1264,8 @@ function createUtils() {
           today.getUTCDate(),
           0,
           0,
-          0
-        )
+          0,
+        ),
       );
     },
     /**
@@ -1336,7 +1352,7 @@ function createUtils() {
    */
   function getNumberOfDaysBetweenTwoDates(oldest, youngest) {
     return Math.round(
-      Math.abs((youngest.getTime() - oldest.getTime()) / date.ONE_DAY_IN_MS)
+      Math.abs((youngest.getTime() - oldest.getTime()) / date.ONE_DAY_IN_MS),
     );
   }
 
@@ -1456,7 +1472,7 @@ function createUtils() {
     function genPath(index, vecId, from, to) {
       let path = `/${serde.index.serialize(index)}-to-${vecId.replaceAll(
         "_",
-        "-"
+        "-",
       )}?`;
 
       if (from !== undefined) {
@@ -1528,8 +1544,10 @@ function createUtils() {
 /**
  * @param {Signals} signals
  * @param {Utilities} utils
+ * @param {Env} env
+ * @param {VecIdToIndexes} vecIdToIndexes
  */
-function createVecsResources(signals, utils) {
+function createVecsResources(signals, utils, env, vecIdToIndexes) {
   const owner = signals.getOwner();
 
   const defaultFrom = -10_000;
@@ -1556,13 +1574,17 @@ function createVecsResources(signals, utils) {
    * @param {VecId} id
    */
   function createVecResource(index, id) {
+    if (env.localhost && !(id in vecIdToIndexes)) {
+      throw Error(`${id} not recognized`);
+    }
+
     return signals.runWithOwner(owner, () => {
       /** @typedef {T extends number ? SingleValueData : CandlestickData} Value */
 
       const fetchedRecord = signals.createSignal(
         /** @type {Map<string, {loading: boolean, at: Date | null, vec: Signal<T[] | null>}>} */ (
           new Map()
-        )
+        ),
       );
 
       return {
@@ -1612,7 +1634,7 @@ function createVecsResources(signals, utils) {
               index,
               id,
               from,
-              to
+              to,
             )
           );
           fetched.at = new Date();
@@ -1708,6 +1730,7 @@ function getElements() {
     style: getComputedStyle(window.document.documentElement),
     charts: getElementById("charts"),
     table: getElementById("table"),
+    explorer: getElementById("explorer"),
     simulation: getElementById("simulation"),
   };
 }
@@ -1873,7 +1896,7 @@ function initWebSockets(signals, utils) {
 
         window.document.addEventListener(
           "visibilitychange",
-          reinitWebSocketIfDocumentNotHidden
+          reinitWebSocketIfDocumentNotHidden,
         );
 
         window.document.addEventListener("online", reinitWebSocket);
@@ -1882,7 +1905,7 @@ function initWebSockets(signals, utils) {
         ws?.close();
         window.document.removeEventListener(
           "visibilitychange",
-          reinitWebSocketIfDocumentNotHidden
+          reinitWebSocketIfDocumentNotHidden,
         );
         window.document.removeEventListener("online", reinitWebSocket);
         live.set(false);
@@ -1908,7 +1931,7 @@ function initWebSockets(signals, utils) {
             symbol: ["BTC/USD"],
             interval: 1440,
           },
-        })
+        }),
       );
     });
 
@@ -1937,7 +1960,7 @@ function initWebSockets(signals, utils) {
 
   /** @type {ReturnType<typeof createWebsocket<CandlestickData>>} */
   const kraken1dCandle = createWebsocket((callback) =>
-    krakenCandleWebSocketCreator(callback)
+    krakenCandleWebSocketCreator(callback),
   );
 
   kraken1dCandle.open();
@@ -1996,7 +2019,7 @@ function main() {
             }
 
             const frame = window.document.getElementById(
-              /** @type {string} */ (input.value)
+              /** @type {string} */ (input.value),
             );
 
             if (!frame) {
@@ -2094,23 +2117,23 @@ function main() {
 
           function initDark() {
             const preferredColorSchemeMatchMedia = window.matchMedia(
-              "(prefers-color-scheme: dark)"
+              "(prefers-color-scheme: dark)",
             );
             const dark = signals.createSignal(
-              preferredColorSchemeMatchMedia.matches
+              preferredColorSchemeMatchMedia.matches,
             );
             preferredColorSchemeMatchMedia.addEventListener(
               "change",
               ({ matches }) => {
                 dark.set(matches);
-              }
+              },
             );
             return dark;
           }
           const dark = initDark();
 
           const qrcode = signals.createSignal(
-            /** @type {string | null} */ (null)
+            /** @type {string | null} */ (null),
           );
 
           function createLastHeightResource() {
@@ -2121,7 +2144,7 @@ function main() {
                   lastHeight.set(h);
                 },
                 /** @satisfies {Height} */ (5),
-                "height"
+                "height",
               );
             }
             fetchLastHeight();
@@ -2132,7 +2155,12 @@ function main() {
 
           const webSockets = initWebSockets(signals, utils);
 
-          const vecsResources = createVecsResources(signals, utils);
+          const vecsResources = createVecsResources(
+            signals,
+            utils,
+            env,
+            vecIdToIndexes,
+          );
 
           const colors = createColors(dark, elements);
 
@@ -2142,6 +2170,7 @@ function main() {
             signals,
             utils,
             qrcode,
+            vecIdToIndexes,
           });
 
           // window.addEventListener("popstate", (_) => {
@@ -2165,10 +2194,10 @@ function main() {
               const owner = signals.getOwner();
 
               const chartOption = signals.createSignal(
-                /** @type {ChartOption | null} */ (null)
+                /** @type {ChartOption | null} */ (null),
               );
               const simOption = signals.createSignal(
-                /** @type {SimulationOption | null} */ (null)
+                /** @type {SimulationOption | null} */ (null),
               );
 
               let previousElement = /** @type {HTMLElement | undefined} */ (
@@ -2177,6 +2206,7 @@ function main() {
               let firstTimeLoadingChart = true;
               let firstTimeLoadingTable = true;
               let firstTimeLoadingSimulation = true;
+              let firstTimeLoadingExplorer = true;
 
               signals.createEffect(options.selected, (option) => {
                 console.log(utils.url.pathnameToSelectedId(), option.id);
@@ -2192,6 +2222,35 @@ function main() {
                 let element;
 
                 switch (option.kind) {
+                  case "explorer": {
+                    element = elements.explorer;
+
+                    if (firstTimeLoadingExplorer) {
+                      const lightweightCharts = packages.lightweightCharts();
+                      import("./explorer.js").then(({ init }) =>
+                        lightweightCharts.then((lightweightCharts) =>
+                          signals.runWithOwner(owner, () =>
+                            init({
+                              colors,
+                              elements,
+                              lightweightCharts,
+                              option: /** @type {Accessor<ChartOption>} */ (
+                                chartOption
+                              ),
+                              signals,
+                              utils,
+                              webSockets,
+                              vecsResources,
+                              vecIdToIndexes,
+                            }),
+                          ),
+                        ),
+                      );
+                    }
+                    firstTimeLoadingExplorer = false;
+
+                    break;
+                  }
                   case "chart": {
                     element = elements.charts;
 
@@ -2214,9 +2273,9 @@ function main() {
                               webSockets,
                               vecsResources,
                               vecIdToIndexes,
-                            })
-                          )
-                        )
+                            }),
+                          ),
+                        ),
                       );
                     }
                     firstTimeLoadingChart = false;
@@ -2236,8 +2295,8 @@ function main() {
                             vecsResources,
                             option,
                             vecIdToIndexes,
-                          })
-                        )
+                          }),
+                        ),
                       );
                     }
                     firstTimeLoadingTable = false;
@@ -2261,9 +2320,9 @@ function main() {
                               signals,
                               utils,
                               vecsResources,
-                            })
-                          )
-                        )
+                            }),
+                          ),
+                        ),
                       );
                     }
                     firstTimeLoadingSimulation = false;
@@ -2292,7 +2351,7 @@ function main() {
             createMobileSwitchEffect();
 
             utils.dom.onFirstIntersection(elements.aside, () =>
-              signals.runWithOwner(owner, initSelectedFrame)
+              signals.runWithOwner(owner, initSelectedFrame),
             );
           }
           initSelected();
@@ -2372,7 +2431,7 @@ function main() {
                   if (indexes?.length) {
                     const maxIndex = Math.min(
                       (order || indexes).length - 1,
-                      minIndex + RESULTS_PER_PAGE - 1
+                      minIndex + RESULTS_PER_PAGE - 1,
                     );
 
                     list = Array(maxIndex - minIndex + 1);
@@ -2448,7 +2507,7 @@ function main() {
                       haystack,
                       needle,
                       undefined,
-                      infoThresh
+                      infoThresh,
                     );
 
                     if (!result?.[0]?.length || !result?.[1]) {
@@ -2456,7 +2515,7 @@ function main() {
                         haystack,
                         needle,
                         outOfOrder,
-                        infoThresh
+                        infoThresh,
                       );
                     }
 
@@ -2465,7 +2524,7 @@ function main() {
                         haystack,
                         needle,
                         outOfOrder,
-                        infoThresh
+                        infoThresh,
                       );
                     }
 
@@ -2474,7 +2533,7 @@ function main() {
                         haystack,
                         needle,
                         outOfOrder,
-                        infoThresh
+                        infoThresh,
                       );
                     }
 
@@ -2483,7 +2542,7 @@ function main() {
                         haystack,
                         needle,
                         undefined,
-                        infoThresh
+                        infoThresh,
                       );
                     }
 
@@ -2492,7 +2551,7 @@ function main() {
                         haystack,
                         needle,
                         outOfOrder,
-                        infoThresh
+                        infoThresh,
                       );
                     }
 
@@ -2575,7 +2634,7 @@ function main() {
 
                   shareDiv.hidden = false;
                 });
-              })
+              }),
             );
           }
           initShare();
@@ -2599,7 +2658,7 @@ function main() {
                   utils.storage.write(barWidthLocalStorageKey, String(width));
                 } else {
                   elements.main.style.width = elements.style.getPropertyValue(
-                    "--default-main-width"
+                    "--default-main-width",
                   );
                   utils.storage.remove(barWidthLocalStorageKey);
                 }
@@ -2636,9 +2695,9 @@ function main() {
             window.addEventListener("mouseleave", setResizeFalse);
           }
           initDesktopResizeBar();
-        })
-      )
-    )
+        }),
+      ),
+    ),
   );
 }
 main();
diff --git a/websites/default/scripts/options.js b/websites/default/scripts/options.js
index 0d663d748..59ee685cf 100644
--- a/websites/default/scripts/options.js
+++ b/websites/default/scripts/options.js
@@ -46,6 +46,14 @@
  * @property {string} title
  * @property {string[]} path
  *
+ * @typedef {Object} PartialExplorerOptionSpecific
+ * @property {"explorer"} kind
+ * @property {string} title
+ *
+ * @typedef {PartialOption & PartialExplorerOptionSpecific} PartialExplorerOption
+ *
+ * @typedef {Required<PartialExplorerOption> & ProcessedOptionAddons} ExplorerOption
+ *
  * @typedef {Object} PartialChartOptionSpecific
  * @property {"chart"} [kind]
  * @property {string} title
@@ -85,9 +93,9 @@
  *
  * @typedef {Required<PartialUrlOption> & ProcessedOptionAddons} UrlOption
  *
- * @typedef {PartialChartOption | PartialTableOption | PartialSimulationOption | PartialUrlOption} AnyPartialOption
+ * @typedef {PartialExplorerOption | PartialChartOption | PartialTableOption | PartialSimulationOption | PartialUrlOption} AnyPartialOption
  *
- * @typedef {ChartOption | TableOption | SimulationOption | UrlOption} Option
+ * @typedef {ExplorerOption | ChartOption | TableOption | SimulationOption | UrlOption} Option
  *
  * @typedef {Object} PartialOptionsGroup
  * @property {string} name
@@ -105,10 +113,13 @@
  */
 
 /**
- * @param {Colors} colors
+ * @param {Object} args
+ * @param {Env} args.env
+ * @param {Colors} args.colors
+ * @param {VecIdToIndexes} args.vecIdToIndexes
  * @returns {PartialOptionsTree}
  */
-function createPartialOptions(colors) {
+function createPartialOptions({ env, colors, vecIdToIndexes }) {
   /**
    * @template {string} S
    * @typedef {Extract<VecId, `${S}${string}`>} StartsWith
@@ -197,13 +208,13 @@ function createPartialOptions(colors) {
 
   const terms = /** @type {const} */ ([
     {
-      key: "sth",
+      key: "short_term_holders",
       name: "short",
       title: "Short Term Holders",
       color: colors.yellow,
     },
     {
-      key: "lth",
+      key: "long_term_holders",
       name: "long",
       title: "Long Term Holders",
       color: colors.fuchsia,
@@ -212,341 +223,359 @@ function createPartialOptions(colors) {
 
   const upToDate = /** @type {const} */ ([
     {
-      key: "up_to_1d",
+      key: "utxos_up_to_1d_old",
       name: "1d",
-      title: "Up to 1 Day",
+      title: "UTXOs Up to 1 Day old",
       color: colors.pink,
     },
     {
-      key: "up_to_1w",
+      key: "utxos_up_to_1w_old",
       name: "1w",
-      title: "Up to 1 Week",
+      title: "UTXOs Up to 1 Week old",
       color: colors.red,
     },
     {
-      key: "up_to_1m",
+      key: "utxos_up_to_1m_old",
       name: "1m",
-      title: "Up to 1 Month",
+      title: "UTXOs Up to 1 Month old",
       color: colors.orange,
     },
     {
-      key: "up_to_2m",
+      key: "utxos_up_to_2m_old",
       name: "2m",
-      title: "Up to 2 Months",
+      title: "UTXOs Up to 2 Months old",
       color: colors.amber,
     },
     {
-      key: "up_to_3m",
+      key: "utxos_up_to_3m_old",
       name: "3m",
-      title: "Up to 3 Months",
+      title: "UTXOs Up to 3 Months old",
       color: colors.yellow,
     },
     {
-      key: "up_to_4m",
+      key: "utxos_up_to_4m_old",
       name: "4m",
-      title: "Up to 4 Months",
+      title: "UTXOs Up to 4 Months old",
       color: colors.lime,
     },
     {
-      key: "up_to_5m",
+      key: "utxos_up_to_5m_old",
       name: "5m",
-      title: "Up to 5 Months",
+      title: "UTXOs Up to 5 Months old",
       color: colors.green,
     },
     {
-      key: "up_to_6m",
+      key: "utxos_up_to_6m_old",
       name: "6m",
-      title: "Up to 6 Months",
+      title: "UTXOs Up to 6 Months old",
       color: colors.teal,
     },
     {
-      key: "up_to_1y",
+      key: "utxos_up_to_1y_old",
       name: "1y",
-      title: "Up to 1 Year",
+      title: "UTXOs Up to 1 Year old",
       color: colors.sky,
     },
     {
-      key: "up_to_2y",
+      key: "utxos_up_to_2y_old",
       name: "2y",
-      title: "Up to 2 Years",
+      title: "UTXOs Up to 2 Years old",
       color: colors.indigo,
     },
     {
-      key: "up_to_3y",
+      key: "utxos_up_to_3y_old",
       name: "3y",
-      title: "Up to 3 Years",
+      title: "UTXOs Up to 3 Years old",
       color: colors.violet,
     },
     {
-      key: "up_to_4y",
+      key: "utxos_up_to_4y_old",
       name: "4y",
-      title: "Up to 4 Years",
+      title: "UTXOs Up to 4 Years old",
       color: colors.purple,
     },
     {
-      key: "up_to_5y",
+      key: "utxos_up_to_5y_old",
       name: "5y",
-      title: "Up to 5 Years",
+      title: "UTXOs Up to 5 Years old",
       color: colors.fuchsia,
     },
     {
-      key: "up_to_6y",
+      key: "utxos_up_to_6y_old",
       name: "6y",
-      title: "Up to 6 Years",
+      title: "UTXOs Up to 6 Years old",
       color: colors.pink,
     },
     {
-      key: "up_to_7y",
+      key: "utxos_up_to_7y_old",
       name: "7y",
-      title: "Up to 7 Years",
+      title: "UTXOs Up to 7 Years old",
       color: colors.red,
     },
     {
-      key: "up_to_8y",
+      key: "utxos_up_to_8y_old",
       name: "8y",
-      title: "Up to 8 Years",
+      title: "UTXOs Up to 8 Years old",
       color: colors.orange,
     },
     {
-      key: "up_to_10y",
+      key: "utxos_up_to_10y_old",
       name: "10y",
-      title: "Up to 10 Years",
+      title: "UTXOs Up to 10 Years old",
       color: colors.amber,
     },
     {
-      key: "up_to_15y",
-      name: "15y",
-      title: "Up to 15 Years",
+      key: "utxos_up_to_12y_old",
+      name: "12y",
+      title: "UTXOs Up to 12 Years old",
       color: colors.yellow,
     },
+    {
+      key: "utxos_up_to_15y_old",
+      name: "15y",
+      title: "UTXOs Up to 15 Years old",
+      color: colors.lime,
+    },
   ]);
 
   const fromDate = /** @type {const} */ ([
     {
-      key: "from_1d",
+      key: "utxos_at_least_1d_old",
       name: "1d",
-      title: "From 1 Day",
+      title: "UTXOs at least 1 Day old",
       color: colors.red,
     },
     {
-      key: "from_1w",
+      key: "utxos_at_least_1w_old",
       name: "1w",
-      title: "From 1 Week",
+      title: "UTXOs at least 1 Week old",
       color: colors.orange,
     },
     {
-      key: "from_1m",
+      key: "utxos_at_least_1m_old",
       name: "1m",
-      title: "From 1 Month",
+      title: "UTXOs at least 1 Month old",
       color: colors.yellow,
     },
     {
-      key: "from_2m",
+      key: "utxos_at_least_2m_old",
       name: "2m",
-      title: "From 2 Months",
+      title: "UTXOs at least 2 Months old",
       color: colors.lime,
     },
     {
-      key: "from_3m",
+      key: "utxos_at_least_3m_old",
       name: "3m",
-      title: "From 3 Months",
+      title: "UTXOs at least 3 Months old",
       color: colors.green,
     },
     {
-      key: "from_4m",
+      key: "utxos_at_least_4m_old",
       name: "4m",
-      title: "From 4 Months",
+      title: "UTXOs at least 4 Months old",
       color: colors.teal,
     },
     {
-      key: "from_5m",
+      key: "utxos_at_least_5m_old",
       name: "5m",
-      title: "From 5 Months",
+      title: "UTXOs at least 5 Months old",
       color: colors.cyan,
     },
     {
-      key: "from_6m",
+      key: "utxos_at_least_6m_old",
       name: "6m",
-      title: "From 6 Months",
+      title: "UTXOs at least 6 Months old",
       color: colors.blue,
     },
     {
-      key: "from_1y",
+      key: "utxos_at_least_1y_old",
       name: "1y",
-      title: "From 1 Year",
+      title: "UTXOs at least 1 Year old",
       color: colors.indigo,
     },
     {
-      key: "from_2y",
+      key: "utxos_at_least_2y_old",
       name: "2y",
-      title: "From 2 Years",
+      title: "UTXOs at least 2 Years old",
       color: colors.violet,
     },
     {
-      key: "from_3y",
+      key: "utxos_at_least_3y_old",
       name: "3y",
-      title: "From 3 Years",
+      title: "UTXOs at least 3 Years old",
       color: colors.purple,
     },
     {
-      key: "from_4y",
+      key: "utxos_at_least_4y_old",
       name: "4y",
-      title: "From 4 Years",
+      title: "UTXOs at least 4 Years old",
       color: colors.fuchsia,
     },
     {
-      key: "from_5y",
+      key: "utxos_at_least_5y_old",
       name: "5y",
-      title: "From 5 Years",
+      title: "UTXOs at least 5 Years old",
       color: colors.pink,
     },
     {
-      key: "from_6y",
+      key: "utxos_at_least_6y_old",
       name: "6y",
-      title: "From 6 Years",
+      title: "UTXOs at least 6 Years old",
       color: colors.rose,
     },
     {
-      key: "from_7y",
+      key: "utxos_at_least_7y_old",
       name: "7y",
-      title: "From 7 Years",
+      title: "UTXOs at least 7 Years old",
       color: colors.red,
     },
     {
-      key: "from_8y",
+      key: "utxos_at_least_8y_old",
       name: "8y",
-      title: "From 8 Years",
+      title: "UTXOs at least 8 Years old",
       color: colors.orange,
     },
     {
-      key: "from_10y",
+      key: "utxos_at_least_10y_old",
       name: "10y",
-      title: "From 10 Years",
+      title: "UTXOs at least 10 Years old",
       color: colors.yellow,
     },
     {
-      key: "from_15y",
-      name: "15y",
-      title: "From 15 Years",
+      key: "utxos_at_least_12y_old",
+      name: "12y",
+      title: "UTXOs at least 12 Years old",
       color: colors.lime,
     },
+    {
+      key: "utxos_at_least_15y_old",
+      name: "15y",
+      title: "UTXOs at least 15 Years old",
+      color: colors.green,
+    },
   ]);
 
   const dateRange = /** @type {const} */ ([
     {
-      key: "start_to_1d",
-      name: "24h",
-      title: "Last 24 hours",
+      key: "utxos_up_to_1d_old",
+      name: "1d",
+      title: "UTXOs New Up to 1 Day old",
       color: colors.pink,
     },
     {
-      key: "from_1d_to_1w",
+      key: "utxos_at_least_1d_up_to_1w_old",
       name: "1d..1w",
-      title: "From 1 Day ago to 1 Week ago",
+      title: "UTXOs At least 1 Day ago Up to 1 Week old",
       color: colors.red,
     },
     {
-      key: "from_1w_to_1m",
+      key: "utxos_at_least_1w_up_to_1m_old",
       name: "1w..1m",
-      title: "From 1 Week ago to 1 Month ago",
+      title: "UTXOs At least 1 Week ago Up to 1 Month old",
       color: colors.orange,
     },
     {
-      key: "from_1m_to_2m",
+      key: "utxos_at_least_1m_up_to_2m_old",
       name: "1m..2m",
-      title: "From 1 Month ago to 2 Months ago",
+      title: "UTXOs At least 1 Month ago Up to 2 Months old",
       color: colors.yellow,
     },
     {
-      key: "from_2m_to_3m",
+      key: "utxos_at_least_2m_up_to_3m_old",
       name: "2m..3m",
-      title: "From 2 Month ago to 3 Months ago",
+      title: "UTXOs At least 2 Month ago Up to 3 Months old",
       color: colors.yellow,
     },
     {
-      key: "from_3m_to_4m",
+      key: "utxos_at_least_3m_up_to_4m_old",
       name: "3m..4m",
-      title: "From 3 Month ago to 4 Months ago",
+      title: "UTXOs At least 3 Month ago Up to 4 Months old",
       color: colors.lime,
     },
     {
-      key: "from_4m_to_5m",
+      key: "utxos_at_least_4m_up_to_5m_old",
       name: "4m..5m",
-      title: "From 4 Month ago to 5 Months ago",
+      title: "UTXOs At least 4 Month ago Up to 5 Months old",
       color: colors.lime,
     },
     {
-      key: "from_5m_to_6m",
+      key: "utxos_at_least_5m_up_to_6m_old",
       name: "5m..6m",
-      title: "From 5 Month ago to 6 Months ago",
+      title: "UTXOs At least 5 Month ago Up to 6 Months old",
       color: colors.lime,
     },
     {
-      key: "from_6m_to_1y",
+      key: "utxos_at_least_6m_up_to_1y_old",
       name: "6m..1y",
-      title: "From 6 Months ago to 1 Year ago",
+      title: "UTXOs At least 6 Months ago Up to 1 Year old",
       color: colors.green,
     },
     {
-      key: "from_1y_to_2y",
+      key: "utxos_at_least_1y_up_to_2y_old",
       name: "1y..2y",
-      title: "From 1 Year ago to 2 Years ago",
+      title: "UTXOs At least 1 Year ago Up to 2 Years old",
       color: colors.cyan,
     },
     {
-      key: "from_2y_to_3y",
+      key: "utxos_at_least_2y_up_to_3y_old",
       name: "2y..3y",
-      title: "From 2 Years ago to 3 Years ago",
+      title: "UTXOs At least 2 Years ago Up to 3 Years old",
       color: colors.blue,
     },
     {
-      key: "from_3y_to_4y",
+      key: "utxos_at_least_3y_up_to_4y_old",
       name: "3y..4y",
-      title: "From 3 Years ago to 4 Years ago",
+      title: "UTXOs At least 3 Years ago Up to 4 Years old",
       color: colors.indigo,
     },
     {
-      key: "from_4y_to_5y",
+      key: "utxos_at_least_4y_up_to_5y_old",
       name: "4y..5y",
-      title: "From 4 Years ago to 5 Years ago",
+      title: "UTXOs At least 4 Years ago Up to 5 Years old",
       color: colors.violet,
     },
     {
-      key: "from_5y_to_6y",
+      key: "utxos_at_least_5y_up_to_6y_old",
       name: "5y..6y",
-      title: "From 5 Years ago to 6 Years ago",
+      title: "UTXOs At least 5 Years ago Up to 6 Years old",
       color: colors.purple,
     },
     {
-      key: "from_6y_to_7y",
+      key: "utxos_at_least_6y_up_to_7y_old",
       name: "6y..7y",
-      title: "From 6 Years ago to 7 Years ago",
+      title: "UTXOs At least 6 Years ago Up to 7 Years old",
       color: colors.purple,
     },
     {
-      key: "from_7y_to_8y",
+      key: "utxos_at_least_7y_up_to_8y_old",
       name: "7y..8y",
-      title: "From 7 Years ago to 8 Years ago",
+      title: "UTXOs At least 7 Years ago Up to 8 Years old",
       color: colors.fuchsia,
     },
     {
-      key: "from_8y_to_10y",
+      key: "utxos_at_least_8y_up_to_10y_old",
       name: "8y..10y",
-      title: "From 8 Years ago to 10 Years ago",
+      title: "UTXOs At least 8 Years ago Up to 10 Years old",
       color: colors.fuchsia,
     },
     {
-      key: "from_10y_to_15y",
-      name: "10y..15y",
-      title: "From 10 Years ago to 15 Years ago",
+      key: "utxos_at_least_10y_up_to_12y_old",
+      name: "10y..12y",
+      title: "UTXOs At least 10 Years ago Up to 12 Years old",
       color: colors.pink,
     },
     {
-      key: "from_15y_to_end",
-      name: "15y+",
-      title: "From 15 Years ago to genesis (2009_01_03)",
+      key: "utxos_at_least_12y_up_to_15y_old",
+      name: "12y..15y",
+      title: "UTXOs At least 12 Years ago Up to 15 Years old",
       color: colors.red,
     },
+    {
+      key: "utxos_at_least_15y_old",
+      name: "15y+",
+      title: "UTXOs At least 15 Years old up to genesis",
+      color: colors.orange,
+    },
   ]);
 
   const epoch = /** @type {const} */ ([
@@ -582,159 +611,321 @@ function createPartialOptions(colors) {
     },
   ]);
 
-  const fromSize = /** @type {const} */ ([
+  const aboveAmount = /** @type {const} */ ([
     {
-      key: "from_1_000sats",
-      name: "1K sats",
-      title: "From 1K sats",
-      color: colors.cyan,
-    },
-    {
-      key: "from_1btc",
-      name: "1btc",
-      title: "From 1 BTC",
-      color: colors.violet,
-    },
-    {
-      key: "from_10btc",
-      name: "10btc",
-      title: "From 10 BTC",
-      color: colors.purple,
-    },
-    {
-      key: "from_100btc",
-      name: "100btc",
-      title: "From 100 BTC",
-      color: colors.pink,
-    },
-  ]);
-
-  const upToSize = /** @type {const} */ ([
-    {
-      key: "up_to_1_000sats",
-      name: "1K sats",
-      title: "Up to 1K sats",
-      color: colors.yellow,
-    },
-    {
-      key: "up_to_10_000sats",
-      name: "10K sats",
-      title: "Up to 10K sats",
-      color: colors.green,
-    },
-    {
-      key: "up_to_1btc",
-      name: "1btc",
-      title: "Up to 1 btc",
-      color: colors.cyan,
-    },
-    {
-      key: "up_to_10btc",
-      name: "10btc",
-      title: "Up to 10 btc",
-      color: colors.blue,
-    },
-    {
-      key: "up_to_100btc",
-      name: "100btc",
-      title: "Up to 100 btc",
-      color: colors.violet,
-    },
-  ]);
-
-  const sizeRanges = /** @type {const} */ ([
-    {
-      key: "0sats",
-      name: "0 sats",
-      title: "0 sats",
-      color: colors.red,
-    },
-    {
-      key: "from_1sat_to_10sats",
-      name: "1 sat..10 sats",
-      title: "From 1 sat to 10 sats",
+      key: "above_1sat",
+      name: ">=1 sat",
+      title: "Above 1 sat",
       color: colors.orange,
     },
     {
-      key: "from_10sats_to_100sats",
-      name: "10 sats..100 sats",
-      title: "From 10 sats to 100 sats",
+      key: "above_10sats",
+      name: ">=10 sats",
+      title: "Above 10 sats",
+      color: colors.orange,
+    },
+    {
+      key: "above_100sats",
+      name: ">=100 sats",
+      title: "Above 100 sats",
       color: colors.yellow,
     },
     {
-      key: "from_100sats_to_1_000sats",
-      name: "100 sats..1K sats",
-      title: "From 100 sats to 1K sats",
+      key: "above_1k_sats",
+      name: ">=1K sats",
+      title: "Above 1K sats",
       color: colors.lime,
     },
     {
-      key: "from_1_000sats_to_10_000sats",
-      name: "1K sats..10K sats",
-      title: "From 1K sats to 10K sats",
+      key: "above_10k_sats",
+      name: ">=10K sats",
+      title: "Above 10K sats",
       color: colors.green,
     },
     {
-      key: "from_10_000sats_to_100_000sats",
-      name: "10K sats..100K sats",
-      title: "From 10K sats to 100K sats",
+      key: "above_100k_sats",
+      name: ">=100K sats",
+      title: "Above 100K sats",
       color: colors.cyan,
     },
     {
-      key: "from_100_000sats_to_1_000_000sats",
-      name: "100K sats .. 1M sats",
-      title: "From 100K sats to 1M sats",
+      key: "above_1m_sats",
+      name: ">=1M sats",
+      title: "Above 1M sats",
       color: colors.blue,
     },
     {
-      key: "from_1_000_000sats_to_10_000_000sats",
-      name: "1M sats..10M sats",
-      title: "From 1M sats to 10M sats",
+      key: "above_10m_sats",
+      name: ">=10M sats",
+      title: "Above 10M sats",
       color: colors.indigo,
     },
     {
-      key: "from_10_000_000sats_to_1btc",
-      name: "10M sats..1 btc",
-      title: "From 10M sats to 1 BTC",
+      key: "above_1btc",
+      name: ">=1 btc",
+      title: "Above 1 BTC",
       color: colors.purple,
     },
     {
-      key: "from_1btc_to_10btc",
-      name: "1 btc..10 btc",
-      title: "From 1 BTC to 10 BTC",
+      key: "above_10btc",
+      name: ">=10 btc",
+      title: "Above 10 BTC",
       color: colors.violet,
     },
     {
-      key: "from_10btc_to_100btc",
-      name: "10 btc..100 btc",
-      title: "From 10 BTC to 100 BTC",
+      key: "above_100btc",
+      name: ">=100 btc",
+      title: "Above 100 BTC",
       color: colors.fuchsia,
     },
     {
-      key: "from_100btc_to_1_000btc",
-      name: "100 btc..1K btc",
-      title: "From 100 BTC to 1K BTC",
+      key: "above_1k_btc",
+      name: ">=1K btc",
+      title: "Above 1K BTC",
       color: colors.pink,
     },
     {
-      key: "from_1_000btc_to_10_000btc",
-      name: "1K btc..10K btc",
-      title: "From 1K BTC to 10K BTC",
+      key: "above_10k_btc",
+      name: ">=10K btc",
+      title: "Above 10K BTC",
       color: colors.red,
     },
+  ]);
+
+  const utxosAboveAmount = aboveAmount.map(
+    ({ key, name, title, color }) =>
+      /** @type {const} */ ({
+        key: `utxos_${key}`,
+        name,
+        title: `UTXOs ${title}`,
+        color,
+      }),
+  );
+
+  const addressesAboveAmount = aboveAmount.map(
+    ({ key, name, title, color }) =>
+      /** @type {const} */ ({
+        key: `addrs_${key}`,
+        name,
+        title: `Addresses ${title}`,
+        color,
+      }),
+  );
+
+  const underAmount = /** @type {const} */ ([
     {
-      key: "from_10_000btc_to_100_000btc",
-      name: "10K btc..100K btc",
-      title: "From 10K BTC to 100K BTC",
+      key: "under_10sats",
+      name: "<10 sats",
+      title: "under 10 sats",
       color: colors.orange,
     },
     {
-      key: "from_100_000btc",
+      key: "under_100sats",
+      name: "<100 sats",
+      title: "under 100 sats",
+      color: colors.yellow,
+    },
+    {
+      key: "under_1k_sats",
+      name: "<1k sats",
+      title: "under 1k sats",
+      color: colors.lime,
+    },
+    {
+      key: "under_10k_sats",
+      name: "<10k sats",
+      title: "under 10k sats",
+      color: colors.green,
+    },
+    {
+      key: "under_100k_sats",
+      name: "<100k sats",
+      title: "under 100k sats",
+      color: colors.cyan,
+    },
+    {
+      key: "under_1m_sats",
+      name: "<1m sats",
+      title: "under 1m sats",
+      color: colors.blue,
+    },
+    {
+      key: "under_10m_sats",
+      name: "<10m sats",
+      title: "under 10m sats",
+      color: colors.indigo,
+    },
+    {
+      key: "under_1btc",
+      name: "<1 btc",
+      title: "under 1 btc",
+      color: colors.purple,
+    },
+    {
+      key: "under_10btc",
+      name: "<10 btc",
+      title: "under 10 btc",
+      color: colors.violet,
+    },
+    {
+      key: "under_100btc",
+      name: "<100 btc",
+      title: "under 100 btc",
+      color: colors.fuchsia,
+    },
+    {
+      key: "under_1k_btc",
+      name: "<1k btc",
+      title: "under 1k btc",
+      color: colors.pink,
+    },
+    {
+      key: "under_10k_btc",
+      name: "<10k btc",
+      title: "under 10k btc",
+      color: colors.red,
+    },
+    {
+      key: "under_100k_btc",
+      name: "<100k btc",
+      title: "under 100k btc",
+      color: colors.orange,
+    },
+  ]);
+
+  const utxosUnderAmount = underAmount.map(
+    ({ key, name, title, color }) =>
+      /** @type {const} */ ({
+        key: `utxos_${key}`,
+        name,
+        title: `UTXOs ${title}`,
+        color,
+      }),
+  );
+
+  const addressesUnderAmount = underAmount.map(
+    ({ key, name, title, color }) =>
+      /** @type {const} */ ({
+        key: `addrs_${key}`,
+        name,
+        title: `Addresses ${title}`,
+        color,
+      }),
+  );
+
+  const amountRanges = /** @type {const} */ ([
+    {
+      key: "with_0sats",
+      name: "0 sats",
+      title: "valued 0 sats",
+      color: colors.red,
+    },
+    {
+      key: "above_1sat_under_10sats",
+      name: "1 sat..10 sats",
+      title: "Above 1 sat Under 10 sats",
+      color: colors.orange,
+    },
+    {
+      key: "above_10sats_under_100sats",
+      name: "10 sats..100 sats",
+      title: "Above 10 sats Under 100 sats",
+      color: colors.yellow,
+    },
+    {
+      key: "above_100sats_under_1k_sats",
+      name: "100 sats..1K sats",
+      title: "Above 100 sats Under 1K sats",
+      color: colors.lime,
+    },
+    {
+      key: "above_1k_sats_under_10k_sats",
+      name: "1K sats..10K sats",
+      title: "Above 1K sats Under 10K sats",
+      color: colors.green,
+    },
+    {
+      key: "above_10k_sats_under_100k_sats",
+      name: "10K sats..100K sats",
+      title: "Above 10K sats Under 100K sats",
+      color: colors.cyan,
+    },
+    {
+      key: "above_100k_sats_under_1m_sats",
+      name: "100K sats .. 1M sats",
+      title: "Above 100K sats Under 1M sats",
+      color: colors.blue,
+    },
+    {
+      key: "above_1m_sats_under_10m_sats",
+      name: "1M sats..10M sats",
+      title: "Above 1M sats Under 10M sats",
+      color: colors.indigo,
+    },
+    {
+      key: "above_10m_sats_under_1btc",
+      name: "10M sats..1 btc",
+      title: "Above 10M sats Under 1 BTC",
+      color: colors.purple,
+    },
+    {
+      key: "above_1btc_under_10btc",
+      name: "1 btc..10 btc",
+      title: "Above 1 BTC Under 10 BTC",
+      color: colors.violet,
+    },
+    {
+      key: "above_10btc_under_100btc",
+      name: "10 btc..100 btc",
+      title: "Above 10 BTC Under 100 BTC",
+      color: colors.fuchsia,
+    },
+    {
+      key: "above_100btc_under_1k_btc",
+      name: "100 btc..1K btc",
+      title: "Above 100 BTC Under 1K BTC",
+      color: colors.pink,
+    },
+    {
+      key: "above_1k_btc_under_10k_btc",
+      name: "1K btc..10K btc",
+      title: "Above 1K BTC Under 10K BTC",
+      color: colors.red,
+    },
+    {
+      key: "above_10k_btc_under_100k_btc",
+      name: "10K btc..100K btc",
+      title: "Above 10K BTC Under 100K BTC",
+      color: colors.orange,
+    },
+    {
+      key: "above_100k_btc",
       name: "100K btc+",
-      title: "From 100K BTC",
+      title: "Above 100K BTC",
       color: colors.yellow,
     },
   ]);
 
+  const utxosAmountRanges = amountRanges.map(
+    ({ key, name, title, color }) =>
+      /** @type {const} */ ({
+        key: `utxos_${key}`,
+        name,
+        title: `UTXOs ${title}`,
+        color,
+      }),
+  );
+
+  const addressesAmountRanges = amountRanges.map(
+    ({ key, name, title, color }) =>
+      /** @type {const} */ ({
+        key: `addrs_${key}`,
+        name,
+        title: `Addresses ${title}`,
+        color,
+      }),
+  );
+
   const type = /** @type {const} */ ([
     {
       key: "p2pk65",
@@ -755,7 +946,7 @@ function createPartialOptions(colors) {
       color: colors.yellow,
     },
     {
-      key: "p2ms",
+      key: "p2ms_outputs",
       name: "p2ms",
       title: "Pay To Bare Multisig",
       color: colors.lime,
@@ -791,13 +982,13 @@ function createPartialOptions(colors) {
       color: colors.purple,
     },
     {
-      key: "unknown",
+      key: "unknown_outputs",
       name: "unknown",
       title: "Pay To Unknown",
       color: colors.violet,
     },
     {
-      key: "empty",
+      key: "empty_outputs",
       name: "empty",
       title: "Pay To Empty",
       color: colors.fuchsia,
@@ -906,7 +1097,7 @@ function createPartialOptions(colors) {
         color: colors.orange,
       },
       {
-        key: `cumulative_${concat}`,
+        key: `${concat}_cumulative`,
         title: name ? `Cumulative ${name}` : "Cumulative",
         color: colors.red,
         defaultActive: false,
@@ -1036,78 +1227,82 @@ function createPartialOptions(colors) {
           name: legend,
           color,
         }),
-        createBaseSeries({
-          key: `${key}_ratio_p1sd_as_price`,
-          name: "+1σ",
-          color: colors.orange,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p2sd_as_price`,
-          name: "+2σ",
-          color: colors.red,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p3sd_as_price`,
-          name: "+3σ",
-          color: colors.pink,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_m1sd_as_price`,
-          name: "−1σ",
-          color: colors.cyan,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_m2sd_as_price`,
-          name: "−2σ",
-          color: colors.blue,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_m3sd_as_price`,
-          name: "−3σ",
-          color: colors.violet,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p99_as_price`,
-          name: "p99",
-          color: colors.orange,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p99_5_as_price`,
-          name: "p99.5",
-          color: colors.red,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p99_9_as_price`,
-          name: "p99.9",
-          color: colors.pink,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p1_as_price`,
-          name: "p1",
-          color: colors.cyan,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p0_5_as_price`,
-          name: "p0.5",
-          color: colors.blue,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p0_1_as_price`,
-          name: "p0.1",
-          color: colors.violet,
-          defaultActive: false,
-        }),
+        ...(`${key}_ratio_p1sd_as_price` in vecIdToIndexes
+          ? [
+              createBaseSeries({
+                key: `${key}_ratio_p1sd_as_price`,
+                name: "+1σ",
+                color: colors.orange,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p2sd_as_price`,
+                name: "+2σ",
+                color: colors.red,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p3sd_as_price`,
+                name: "+3σ",
+                color: colors.pink,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_m1sd_as_price`,
+                name: "−1σ",
+                color: colors.cyan,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_m2sd_as_price`,
+                name: "−2σ",
+                color: colors.blue,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_m3sd_as_price`,
+                name: "−3σ",
+                color: colors.violet,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p99_as_price`,
+                name: "p99",
+                color: colors.orange,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p99_5_as_price`,
+                name: "p99.5",
+                color: colors.red,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p99_9_as_price`,
+                name: "p99.9",
+                color: colors.pink,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p1_as_price`,
+                name: "p1",
+                color: colors.cyan,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p0_5_as_price`,
+                name: "p0.5",
+                color: colors.blue,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p0_1_as_price`,
+                name: "p0.1",
+                color: colors.violet,
+                defaultActive: false,
+              }),
+            ]
+          : []),
       ],
       bottom: [
         /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
@@ -1121,150 +1316,154 @@ function createPartialOptions(colors) {
             },
           },
         }),
-        createBaseSeries({
-          key: `${key}_ratio_p1sd`,
-          name: "+1σ",
-          color: colors.orange,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p2sd`,
-          name: "+2σ",
-          color: colors.red,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p3sd`,
-          name: "+3σ",
-          color: colors.pink,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_m1sd`,
-          name: "−1σ",
-          color: colors.cyan,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_m2sd`,
-          name: "−2σ",
-          color: colors.blue,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_m3sd`,
-          name: "−3σ",
-          color: colors.violet,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p99`,
-          name: "p99",
-          color: colors.orange,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p99_5`,
-          name: "p99.5",
-          color: colors.red,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p99_9`,
-          name: "p99.9",
-          color: colors.pink,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p1`,
-          name: "p1",
-          color: colors.cyan,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p0_5`,
-          name: "p0.5",
-          color: colors.blue,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_p0_1`,
-          name: "p0.1",
-          color: colors.violet,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_1w_sma`,
-          name: "1w sma",
-          color: colors.fuchsia,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_1m_sma`,
-          name: "1m sma",
-          color: colors.pink,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_1y_sma`,
-          name: "1y sma",
-          color: colors.rose,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_4y_sma`,
-          name: "4y_sma",
-          color: colors.purple,
-          defaultActive: false,
-        }),
-        createBaseSeries({
-          key: `${key}_ratio_sma`,
-          name: "sma",
-          color: colors.yellow,
-          defaultActive: false,
-        }),
-        /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
-          key: `${key}_ratio_1y_sma_momentum_oscillator`,
-          title: "1Y Momentum",
-          type: "Baseline",
-          options: {
-            createPriceLine: {
-              value: 0,
-            },
-          },
-        }),
-        /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
-          key: `${key}_ratio_zscore`,
-          title: "All time",
-          type: "Baseline",
-          options: {
-            createPriceLine: {
-              value: 0,
-            },
-          },
-        }),
-        /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
-          key: `${key}_ratio_4y_zscore`,
-          title: "4y",
-          type: "Baseline",
-          colors: [colors.yellow, colors.pink],
-          options: {
-            createPriceLine: {
-              value: 0,
-            },
-          },
-        }),
-        /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
-          key: `${key}_ratio_1y_zscore`,
-          title: "1y",
-          type: "Baseline",
-          colors: [colors.orange, colors.purple],
-          options: {
-            createPriceLine: {
-              value: 0,
-            },
-          },
-        }),
+        ...(`${key}_ratio_p1sd` in vecIdToIndexes
+          ? [
+              createBaseSeries({
+                key: `${key}_ratio_p1sd`,
+                name: "+1σ",
+                color: colors.orange,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p2sd`,
+                name: "+2σ",
+                color: colors.red,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p3sd`,
+                name: "+3σ",
+                color: colors.pink,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_m1sd`,
+                name: "−1σ",
+                color: colors.cyan,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_m2sd`,
+                name: "−2σ",
+                color: colors.blue,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_m3sd`,
+                name: "−3σ",
+                color: colors.violet,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p99`,
+                name: "p99",
+                color: colors.orange,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p99_5`,
+                name: "p99.5",
+                color: colors.red,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p99_9`,
+                name: "p99.9",
+                color: colors.pink,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p1`,
+                name: "p1",
+                color: colors.cyan,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p0_5`,
+                name: "p0.5",
+                color: colors.blue,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_p0_1`,
+                name: "p0.1",
+                color: colors.violet,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_1w_sma`,
+                name: "1w sma",
+                color: colors.fuchsia,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_1m_sma`,
+                name: "1m sma",
+                color: colors.pink,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_1y_sma`,
+                name: "1y sma",
+                color: colors.rose,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_4y_sma`,
+                name: "4y_sma",
+                color: colors.purple,
+                defaultActive: false,
+              }),
+              createBaseSeries({
+                key: `${key}_ratio_sma`,
+                name: "sma",
+                color: colors.yellow,
+                defaultActive: false,
+              }),
+              /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
+                key: `${key}_ratio_1y_sma_momentum_oscillator`,
+                title: "1Y Momentum",
+                type: "Baseline",
+                options: {
+                  createPriceLine: {
+                    value: 0,
+                  },
+                },
+              }),
+              /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
+                key: `${key}_ratio_zscore`,
+                title: "All time",
+                type: "Baseline",
+                options: {
+                  createPriceLine: {
+                    value: 0,
+                  },
+                },
+              }),
+              /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
+                key: `${key}_ratio_4y_zscore`,
+                title: "4y",
+                type: "Baseline",
+                colors: [colors.yellow, colors.pink],
+                options: {
+                  createPriceLine: {
+                    value: 0,
+                  },
+                },
+              }),
+              /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
+                key: `${key}_ratio_1y_zscore`,
+                title: "1y",
+                type: "Baseline",
+                colors: [colors.orange, colors.purple],
+                options: {
+                  createPriceLine: {
+                    value: 0,
+                  },
+                },
+              }),
+            ]
+          : []),
       ],
     };
   }
@@ -1290,169 +1489,321 @@ function createPartialOptions(colors) {
    * @property {readonly UTXOGroupObject[]} args.list
    */
 
+  /**
+   * @template {"" | CohortId} T
+   * @param {T} _key
+   */
+  const fixKey = (_key) =>
+    _key !== ""
+      ? /** @type {Exclude<"" | `${T}_`, "_">} */ (`${_key}_`)
+      : /** @type {const} */ ("");
+
   /**
    * @param {UTXOGroupObject | UTXOGroupsObject} args
    */
-  function createUTXOGroupFolder(args) {
-    /**
-     * @template {"" | CohortId} T
-     * @param {T} _key
-     */
-    const fixKey = (_key) =>
-      _key !== ""
-        ? /** @type {Exclude<"" | `${T}_`, "_">} */ (`${_key}_`)
-        : /** @type {const} */ ("");
-    0;
-
+  function createCohortGroupFolder(args) {
     const list = "list" in args ? args.list : [args];
     const useGroupName = "list" in args;
 
+    const title = args.title
+      ? `${useGroupName ? "by" : "of"} ${args.title}`
+      : "";
+
     return /** @satisfies {PartialOptionsGroup} */ ({
       name: args.name || "all",
       tree: [
-        {
-          name: "supply",
-          title: `${args.title} Supply`,
-          bottom: list.flatMap(({ color, name, key: _key }) => {
-            const key = fixKey(_key);
-            return /** @type {const} */ ([
-              createBaseSeries({
-                key: `${key}supply`,
-                name: useGroupName ? name : "Supply",
-                color: "list" in args ? color : colors.default,
+        !("list" in args)
+          ? {
+              name: "supply",
+              title: `Supply ${title}`,
+              bottom: list.flatMap(({ color, name, key: _key }) => {
+                const key = fixKey(_key);
+                return /** @type {const} */ ([
+                  createBaseSeries({
+                    key: `${key}supply`,
+                    name: "Supply",
+                    color: colors.default,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_btc`,
+                    name: "Supply",
+                    color: colors.default,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_usd`,
+                    name: "Supply",
+                    color: colors.default,
+                  }),
+                  ...(key
+                    ? [
+                        createBaseSeries({
+                          key: `${key}supply_relative_to_circulating_supply`,
+                          name: "Supply",
+                          color: colors.default,
+                        }),
+                      ]
+                    : []),
+                  createBaseSeries({
+                    key: `${key}halved_supply`,
+                    name: "Halved",
+                    color: colors.gray,
+                    options: {
+                      lineStyle: 4,
+                    },
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_profit`,
+                    name: "In Profit",
+                    color: colors.green,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_profit_in_btc`,
+                    name: "In Profit",
+                    color: colors.green,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_profit_in_usd`,
+                    name: "In Profit",
+                    color: colors.green,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_loss`,
+                    name: "In Loss",
+                    color: colors.red,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_loss_in_btc`,
+                    name: "In Loss",
+                    color: colors.red,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_loss_in_usd`,
+                    name: "In Loss",
+                    color: colors.red,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_even`,
+                    name: useGroupName ? name : "Even",
+                    color: colors.yellow,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_even_in_btc`,
+                    name: useGroupName ? name : "Even",
+                    color: colors.yellow,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_even_in_usd`,
+                    name: useGroupName ? name : "Even",
+                    color: colors.yellow,
+                  }),
+                  createBaseSeries({
+                    key: `${key}halved_supply_in_btc`,
+                    name: useGroupName ? name : "Halved",
+                    color: "list" in args ? color : colors.gray,
+                    options: {
+                      lineStyle: 4,
+                    },
+                  }),
+                  createBaseSeries({
+                    key: `${key}halved_supply_in_usd`,
+                    name: useGroupName ? name : "Halved",
+                    color: "list" in args ? color : colors.gray,
+                    options: {
+                      lineStyle: 4,
+                    },
+                  }),
+                  ...(key
+                    ? [
+                        createBaseSeries({
+                          key: `${key}supply_in_profit_relative_to_circulating_supply`,
+                          name: "In Profit",
+                          color: colors.green,
+                        }),
+                        createBaseSeries({
+                          key: `${key}supply_in_loss_relative_to_circulating_supply`,
+                          name: "In Loss",
+                          color: colors.red,
+                        }),
+                        createBaseSeries({
+                          key: `${key}supply_even_relative_to_circulating_supply`,
+                          name: "Even",
+                          color: colors.yellow,
+                        }),
+                      ]
+                    : []),
+                  createBaseSeries({
+                    key: `${key}supply_in_profit_relative_to_own_supply`,
+                    name: "In Profit",
+                    color: colors.green,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_in_loss_relative_to_own_supply`,
+                    name: "In Loss",
+                    color: colors.red,
+                  }),
+                  createBaseSeries({
+                    key: `${key}supply_even_relative_to_own_supply`,
+                    name: "Even",
+                    color: colors.yellow,
+                  }),
+                ]);
               }),
-              createBaseSeries({
-                key: `${key}supply_in_btc`,
-                name: useGroupName ? name : "Supply",
-                color: "list" in args ? color : colors.default,
-              }),
-              createBaseSeries({
-                key: `${key}supply_in_usd`,
-                name: useGroupName ? name : "Supply",
-                color: "list" in args ? color : colors.default,
-              }),
-              ...(key
-                ? [
-                    createBaseSeries({
-                      key: `${key}supply_relative_to_circulating_supply`,
-                      name: useGroupName ? name : "Supply",
-                      color: "list" in args ? color : colors.default,
-                    }),
-                  ]
-                : []),
-              ...(!("list" in args)
-                ? [
-                    createBaseSeries({
-                      key: `${key}halved_supply`,
-                      name: useGroupName ? name : "Halved",
-                      color: "list" in args ? color : colors.gray,
-                      options: {
-                        lineStyle: 4,
-                      },
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_in_profit`,
-                      name: useGroupName ? name : "In Profit",
-                      color: colors.green,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_in_loss`,
-                      name: useGroupName ? name : "In Loss",
-                      color: colors.red,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_even`,
-                      name: useGroupName ? name : "Even",
-                      color: colors.yellow,
-                    }),
-                    createBaseSeries({
-                      key: `${key}halved_supply_in_btc`,
-                      name: useGroupName ? name : "Halved",
-                      color: "list" in args ? color : colors.gray,
-                      options: {
-                        lineStyle: 4,
-                      },
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_in_profit_in_btc`,
-                      name: useGroupName ? name : "In Profit",
-                      color: colors.green,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_in_loss_in_btc`,
-                      name: useGroupName ? name : "In Loss",
-                      color: colors.red,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_even_in_btc`,
-                      name: useGroupName ? name : "Even",
-                      color: colors.yellow,
-                    }),
-                    createBaseSeries({
-                      key: `${key}halved_supply_in_usd`,
-                      name: useGroupName ? name : "Halved",
-                      color: "list" in args ? color : colors.gray,
-                      options: {
-                        lineStyle: 4,
-                      },
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_in_profit_in_usd`,
-                      name: useGroupName ? name : "In Profit",
-                      color: colors.green,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_in_loss_in_usd`,
-                      name: useGroupName ? name : "In Loss",
-                      color: colors.red,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_even_in_usd`,
-                      name: useGroupName ? name : "Even",
-                      color: colors.yellow,
-                    }),
-                    ...(key
-                      ? [
-                          createBaseSeries({
-                            key: `${key}supply_in_profit_relative_to_circulating_supply`,
-                            name: useGroupName ? name : "In Profit",
-                            color: colors.green,
-                          }),
-                          createBaseSeries({
-                            key: `${key}supply_in_loss_relative_to_circulating_supply`,
-                            name: useGroupName ? name : "In Loss",
-                            color: colors.red,
-                          }),
-                          createBaseSeries({
-                            key: `${key}supply_even_relative_to_circulating_supply`,
-                            name: useGroupName ? name : "Even",
-                            color: colors.yellow,
-                          }),
-                        ]
-                      : []),
-                    createBaseSeries({
-                      key: `${key}supply_in_profit_relative_to_own_supply`,
-                      name: useGroupName ? name : "In Profit",
-                      color: colors.green,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_in_loss_relative_to_own_supply`,
-                      name: useGroupName ? name : "In Loss",
-                      color: colors.red,
-                    }),
-                    createBaseSeries({
-                      key: `${key}supply_even_relative_to_own_supply`,
-                      name: useGroupName ? name : "Even",
-                      color: colors.yellow,
-                    }),
-                  ]
-                : []),
-            ]);
-          }),
-        },
+            }
+          : {
+              name: "supply",
+              tree: [
+                {
+                  name: "total",
+                  title: `Supply ${title}`,
+                  bottom: list.flatMap(({ color, name, key: _key }) => {
+                    const key = fixKey(_key);
+                    return /** @type {const} */ ([
+                      createBaseSeries({
+                        key: `${key}supply`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_in_btc`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_in_usd`,
+                        name,
+                        color,
+                      }),
+                      ...(key
+                        ? [
+                            createBaseSeries({
+                              key: `${key}supply_relative_to_circulating_supply`,
+                              name,
+                              color,
+                            }),
+                          ]
+                        : []),
+                    ]);
+                  }),
+                },
+                {
+                  name: "in profit",
+                  title: `Supply In Profit ${title}`,
+                  bottom: list.flatMap(({ color, name, key: _key }) => {
+                    const key = fixKey(_key);
+                    return /** @type {const} */ ([
+                      createBaseSeries({
+                        key: `${key}supply_in_profit`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_in_profit_in_btc`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_in_profit_in_usd`,
+                        name,
+                        color,
+                      }),
+                      ...(key
+                        ? [
+                            createBaseSeries({
+                              key: `${key}supply_in_profit_relative_to_circulating_supply`,
+                              name,
+                              color,
+                            }),
+                          ]
+                        : []),
+                      createBaseSeries({
+                        key: `${key}supply_in_profit_relative_to_own_supply`,
+                        name,
+                        color,
+                      }),
+                    ]);
+                  }),
+                },
+                {
+                  name: "in loss",
+                  title: `Supply In loss ${title}`,
+                  bottom: list.flatMap(({ color, name, key: _key }) => {
+                    const key = fixKey(_key);
+                    return /** @type {const} */ ([
+                      createBaseSeries({
+                        key: `${key}supply_in_loss`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_in_loss_in_btc`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_in_loss_in_usd`,
+                        name,
+                        color,
+                      }),
+                      ...(key
+                        ? [
+                            createBaseSeries({
+                              key: `${key}supply_in_loss_relative_to_circulating_supply`,
+                              name,
+                              color,
+                            }),
+                          ]
+                        : []),
+                      createBaseSeries({
+                        key: `${key}supply_in_loss_relative_to_own_supply`,
+                        name,
+                        color,
+                      }),
+                    ]);
+                  }),
+                },
+                {
+                  name: "even",
+                  title: `Even Supply ${title}`,
+                  bottom: list.flatMap(({ color, name, key: _key }) => {
+                    const key = fixKey(_key);
+                    return /** @type {const} */ ([
+                      createBaseSeries({
+                        key: `${key}supply_even`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_even_in_btc`,
+                        name,
+                        color,
+                      }),
+                      createBaseSeries({
+                        key: `${key}supply_even_in_usd`,
+                        name,
+                        color,
+                      }),
+                      ...(key
+                        ? [
+                            createBaseSeries({
+                              key: `${key}supply_even_relative_to_circulating_supply`,
+                              name,
+                              color,
+                            }),
+                          ]
+                        : []),
+                      createBaseSeries({
+                        key: `${key}supply_even_relative_to_own_supply`,
+                        name,
+                        color,
+                      }),
+                    ]);
+                  }),
+                },
+              ],
+            },
         {
           name: "utxo count",
-          title: `${args.title} UTXO Count`,
+          title: `UTXO Count ${title}`,
           bottom: list.flatMap(({ color, name, key: _key }) => {
             const key = fixKey(_key);
             return /** @type {const} */ ([
@@ -1464,12 +1815,104 @@ function createPartialOptions(colors) {
             ]);
           }),
         },
+        ...(list.filter(
+          ({ key }) => `${fixKey(key)}address_count` in vecIdToIndexes,
+        ).length
+          ? !("list" in args) ||
+            list.filter(
+              ({ key }) =>
+                `${fixKey(key)}empty_address_count` in vecIdToIndexes,
+            ).length == 0
+            ? [
+                {
+                  name: "address count",
+                  title: `Address Count ${title}`,
+                  bottom: list.flatMap(({ name, color, key: _key }) => {
+                    const key = fixKey(_key);
+                    return [
+                      ...(`${key}address_count` in vecIdToIndexes
+                        ? /** @type {const} */ ([
+                            createBaseSeries({
+                              key: `${key}address_count`,
+                              name: useGroupName ? name : "Loaded",
+                              color: useGroupName ? color : colors.orange,
+                            }),
+                          ])
+                        : []),
+                      ...(`${key}empty_address_count` in vecIdToIndexes
+                        ? /** @type {const} */ ([
+                            createBaseSeries({
+                              key: `${key}empty_address_count`,
+                              name: "Empty",
+                              color: colors.gray,
+                              defaultActive: false,
+                            }),
+                          ])
+                        : []),
+                    ];
+                  }),
+                },
+              ]
+            : [
+                {
+                  name: "address count",
+                  tree: [
+                    {
+                      name: "loaded",
+                      title: `Loaded Address Count ${title}`,
+                      bottom: list
+                        .filter(
+                          ({ key }) =>
+                            `${fixKey(key)}address_count` in vecIdToIndexes,
+                        )
+                        .flatMap(({ name, color, key: _key }) => {
+                          const key = fixKey(_key);
+                          return [
+                            createBaseSeries({
+                              key: `${key}address_count`,
+                              name,
+                              color,
+                            }),
+                          ];
+                        }),
+                    },
+                    ...(list.filter(
+                      ({ key }) =>
+                        `${fixKey(key)}empty_address_count` in vecIdToIndexes,
+                    ).length
+                      ? [
+                          {
+                            name: "empty",
+                            title: `Empty Address Count ${title}`,
+                            bottom: list
+                              .filter(
+                                ({ key }) =>
+                                  `${fixKey(key)}empty_address_count` in
+                                  vecIdToIndexes,
+                              )
+                              .flatMap(({ name, color, key: _key }) => {
+                                const key = fixKey(_key);
+                                return [
+                                  createBaseSeries({
+                                    key: `${key}empty_address_count`,
+                                    name,
+                                    color,
+                                  }),
+                                ];
+                              }),
+                          },
+                        ]
+                      : []),
+                  ],
+                },
+              ]
+          : []),
         {
           name: "Realized",
           tree: [
             {
               name: "cap",
-              title: `${args.title} Realized Capitalization`,
+              title: `Realized Capitalization ${title}`,
               bottom: list.flatMap(({ color, name, key: _key }) => {
                 const key = fixKey(_key);
                 return /** @type {const} */ ([
@@ -1499,17 +1942,17 @@ function createPartialOptions(colors) {
             "list" in args
               ? {
                   name: "Price",
-                  title: `${args.title} Realized Prices`,
+                  title: `Realized Price ${title}`,
                   top: args.list.map(({ color, name, key }) =>
                     createBaseSeries({
                       key: `${fixKey(key)}realized_price`,
                       name,
                       color,
-                    })
+                    }),
                   ),
                 }
               : createPriceWithRatio({
-                  title: `${args.title} Realized Price`,
+                  title: `Realized Price ${title}`,
                   key: `${fixKey(args.key)}realized_price`,
                   name: "price",
                   legend: "realized",
@@ -1519,7 +1962,7 @@ function createPartialOptions(colors) {
               ? [
                   {
                     name: "pnl",
-                    title: `${args.title} Realized Profit And Loss`,
+                    title: `Realized Profit And Loss ${title}`,
                     bottom: [
                       createBaseSeries({
                         key: `${fixKey(args.key)}realized_profit`,
@@ -1527,7 +1970,7 @@ function createPartialOptions(colors) {
                         color: colors.green,
                       }),
                       createBaseSeries({
-                        key: `cumulative_${fixKey(args.key)}realized_profit`,
+                        key: `${fixKey(args.key)}realized_profit_cumulative`,
                         name: "Cumulative Profit",
                         color: colors.green,
                         defaultActive: false,
@@ -1539,7 +1982,7 @@ function createPartialOptions(colors) {
                         defaultActive: false,
                       }),
                       createBaseSeries({
-                        key: `cumulative_${fixKey(args.key)}realized_loss`,
+                        key: `${fixKey(args.key)}realized_loss_cumulative`,
                         name: "Cumulative Loss",
                         color: colors.red,
                         defaultActive: false,
@@ -1550,9 +1993,9 @@ function createPartialOptions(colors) {
                         color: colors.red,
                       }),
                       createBaseSeries({
-                        key: `cumulative_${fixKey(
-                          args.key
-                        )}negative_realized_loss`,
+                        key: `${fixKey(
+                          args.key,
+                        )}negative_realized_loss_cumulative`,
                         name: "Cumulative Negative Loss",
                         color: colors.red,
                         defaultActive: false,
@@ -1560,7 +2003,7 @@ function createPartialOptions(colors) {
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
                         key: `${fixKey(
-                          args.key
+                          args.key,
                         )}realized_profit_relative_to_realized_cap`,
                         title: "Profit",
                         color: colors.green,
@@ -1573,7 +2016,7 @@ function createPartialOptions(colors) {
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
                         key: `${fixKey(
-                          args.key
+                          args.key,
                         )}realized_loss_relative_to_realized_cap`,
                         title: "Loss",
                         color: colors.red,
@@ -1587,7 +2030,7 @@ function createPartialOptions(colors) {
                   },
                   {
                     name: "Net pnl",
-                    title: `${args.title} Net Realized Profit And Loss`,
+                    title: `Net Realized Profit And Loss ${title}`,
                     bottom: list.flatMap(({ color, name, key }) => [
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
@@ -1601,9 +2044,9 @@ function createPartialOptions(colors) {
                       }),
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
-                        key: `cumulative_${fixKey(
-                          key
-                        )}net_realized_profit_and_loss`,
+                        key: `${fixKey(
+                          key,
+                        )}net_realized_profit_and_loss_cumulative`,
                         title: "Cumulative net",
                         defaultActive: false,
                         options: {
@@ -1614,9 +2057,9 @@ function createPartialOptions(colors) {
                       }),
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
-                        key: `cumulative_${fixKey(
-                          key
-                        )}net_realized_profit_and_loss_30d_change`,
+                        key: `${fixKey(
+                          key,
+                        )}net_realized_profit_and_loss_cumulative_30d_change`,
                         title: "cum net 30d change",
                         defaultActive: false,
                         options: {
@@ -1628,7 +2071,7 @@ function createPartialOptions(colors) {
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
                         key: `${fixKey(
-                          key
+                          key,
                         )}net_realized_profit_and_loss_relative_to_realized_cap`,
                         title: "Net",
                         options: {
@@ -1639,9 +2082,9 @@ function createPartialOptions(colors) {
                       }),
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
-                        key: `cumulative_${fixKey(
-                          key
-                        )}net_realized_profit_and_loss_30d_change_relative_to_realized_cap`,
+                        key: `${fixKey(
+                          key,
+                        )}net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap`,
                         title: "cum net 30d change",
                         options: {
                           createPriceLine: {
@@ -1651,10 +2094,10 @@ function createPartialOptions(colors) {
                       }),
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
-                        key: `cumulative_${fixKey(
-                          key
-                        )}net_realized_profit_and_loss_30d_change_relative_to_market_cap`,
-                        title: "cum net 30d change",
+                        key: `${fixKey(
+                          key,
+                        )}net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap`,
+                        title: "cumulative net 30d change",
                         options: {
                           createPriceLine: {
                             value: 0,
@@ -1665,7 +2108,7 @@ function createPartialOptions(colors) {
                   },
                   {
                     name: "sopr",
-                    title: `${args.title} Spent Output Profit Ratio`,
+                    title: `Spent Output Profit Ratio ${title}`,
                     bottom: list.flatMap(({ color, name, key }) => [
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
@@ -1694,7 +2137,7 @@ function createPartialOptions(colors) {
               : [
                   {
                     name: "profit",
-                    title: `${args.title} Realized Profit`,
+                    title: `Realized Profit ${title}`,
                     bottom: list.flatMap(({ color, name, key: _key }) => {
                       const key = fixKey(_key);
                       return /** @type {const} */ ([
@@ -1719,7 +2162,7 @@ function createPartialOptions(colors) {
                   },
                   {
                     name: "loss",
-                    title: `${args.title} Realized Loss`,
+                    title: `Realized Loss ${title}`,
                     bottom: list.flatMap(({ color, name, key: _key }) => {
                       const key = fixKey(_key);
                       return /** @type {const} */ ([
@@ -1744,7 +2187,7 @@ function createPartialOptions(colors) {
                   },
                   {
                     name: "Net pnl",
-                    title: `${args.title} Net Realized Profit And Loss`,
+                    title: `Net Realized Profit And Loss ${title}`,
                     bottom: list.flatMap(({ color, name, key }) => [
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
@@ -1760,7 +2203,7 @@ function createPartialOptions(colors) {
                       /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                         type: "Baseline",
                         key: `${fixKey(
-                          key
+                          key,
                         )}net_realized_profit_and_loss_relative_to_realized_cap`,
                         title: name,
                         color,
@@ -1777,12 +2220,12 @@ function createPartialOptions(colors) {
                     tree: [
                       {
                         name: "profit",
-                        title: `Cumulative ${args.title} Realized Profit`,
+                        title: `Cumulative Realized Profit ${title}`,
                         bottom: list.flatMap(({ color, name, key: _key }) => {
                           const key = fixKey(_key);
                           return /** @type {const} */ ([
                             createBaseSeries({
-                              key: `cumulative_${key}realized_profit`,
+                              key: `${key}realized_profit_cumulative`,
                               name,
                               color,
                             }),
@@ -1791,12 +2234,12 @@ function createPartialOptions(colors) {
                       },
                       {
                         name: "loss",
-                        title: `Cumulative ${args.title} Realized Loss`,
+                        title: `Cumulative Realized Loss ${title}`,
                         bottom: list.flatMap(({ color, name, key: _key }) => {
                           const key = fixKey(_key);
                           return /** @type {const} */ ([
                             createBaseSeries({
-                              key: `cumulative_${key}realized_loss`,
+                              key: `${key}realized_loss_cumulative`,
                               name,
                               color,
                             }),
@@ -1805,13 +2248,13 @@ function createPartialOptions(colors) {
                       },
                       {
                         name: "Net pnl",
-                        title: `Cumulative ${args.title} Net Realized Profit And Loss`,
+                        title: `Cumulative Net Realized Profit And Loss ${title}`,
                         bottom: list.flatMap(({ color, name, key }) => [
                           /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                             type: "Baseline",
-                            key: `cumulative_${fixKey(
-                              key
-                            )}net_realized_profit_and_loss`,
+                            key: `${fixKey(
+                              key,
+                            )}net_realized_profit_and_loss_cumulative`,
                             title: name,
                             color,
                             defaultActive: false,
@@ -1825,13 +2268,13 @@ function createPartialOptions(colors) {
                       },
                       {
                         name: "Net pnl 30d change",
-                        title: `Cumulative ${args.title} Net Realized Profit And Loss 30 Day Change`,
+                        title: `Cumulative Net Realized Profit And Loss 30 Day Change ${title}`,
                         bottom: list.flatMap(({ color, name, key }) => [
                           /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                             type: "Baseline",
-                            key: `cumulative_${fixKey(
-                              key
-                            )}net_realized_profit_and_loss_30d_change`,
+                            key: `${fixKey(
+                              key,
+                            )}net_realized_profit_and_loss_cumulative_30d_change`,
                             title: name,
                             color,
                             options: {
@@ -1842,9 +2285,9 @@ function createPartialOptions(colors) {
                           }),
                           /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                             type: "Baseline",
-                            key: `cumulative_${fixKey(
-                              key
-                            )}net_realized_profit_and_loss_30d_change_relative_to_realized_cap`,
+                            key: `${fixKey(
+                              key,
+                            )}net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap`,
                             title: name,
                             color,
                             options: {
@@ -1855,9 +2298,9 @@ function createPartialOptions(colors) {
                           }),
                           /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                             type: "Baseline",
-                            key: `cumulative_${fixKey(
-                              key
-                            )}net_realized_profit_and_loss_30d_change_relative_to_market_cap`,
+                            key: `${fixKey(
+                              key,
+                            )}net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap`,
                             title: name,
                             color,
                             options: {
@@ -1875,7 +2318,7 @@ function createPartialOptions(colors) {
                     tree: [
                       {
                         name: "Normal",
-                        title: `${args.title} Spent Output Profit Ratio`,
+                        title: `Spent Output Profit Ratio ${title}`,
                         bottom: list.flatMap(({ color, name, key }) => [
                           /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                             type: "Baseline",
@@ -1892,12 +2335,12 @@ function createPartialOptions(colors) {
                       },
                       {
                         name: "Adjusted",
-                        title: `${args.title} Adjusted Spent Output Profit Ratio`,
+                        title: `Adjusted Spent Output Profit Ratio ${title}`,
                         bottom: list.flatMap(({ color, name, key }) => [
                           /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                             type: "Baseline",
                             key: `${fixKey(
-                              key
+                              key,
                             )}adjusted_spent_output_profit_ratio`,
                             title: name,
                             color,
@@ -1914,13 +2357,13 @@ function createPartialOptions(colors) {
                 ]),
             {
               name: "Sell Side Risk Ratio",
-              title: `${args.title} Sell Side Risk Ratio`,
+              title: `Sell Side Risk Ratio ${title}`,
               bottom: list.flatMap(({ color, name, key }) =>
                 createBaseSeries({
                   key: `${fixKey(key)}sell_side_risk_ratio`,
                   name: useGroupName ? name : "Risk",
                   color: color,
-                })
+                }),
               ),
             },
           ],
@@ -1932,7 +2375,7 @@ function createPartialOptions(colors) {
               ? [
                   {
                     name: "pnl",
-                    title: `${args.title} Unrealized Profit And Loss`,
+                    title: `Unrealized Profit And Loss ${title}`,
                     bottom: [
                       // createBaseSeries({
                       //   key: `0`,
@@ -1964,7 +2407,7 @@ function createPartialOptions(colors) {
               : [
                   {
                     name: "profit",
-                    title: `${args.title} Unrealized Profit`,
+                    title: `Unrealized Profit ${title}`,
                     bottom: list.flatMap(({ color, name, key: _key }) => {
                       const key = fixKey(_key);
                       return /** @type {const} */ ([
@@ -1978,7 +2421,7 @@ function createPartialOptions(colors) {
                   },
                   {
                     name: "loss",
-                    title: `${args.title} Unrealized Loss`,
+                    title: `Unrealized Loss ${title}`,
                     bottom: list.flatMap(({ color, name, key: _key }) => {
                       const key = fixKey(_key);
                       return /** @type {const} */ ([
@@ -1993,7 +2436,7 @@ function createPartialOptions(colors) {
                 ]),
             {
               name: "Net pnl",
-              title: `${args.title} Net Unrealized Profit And Loss`,
+              title: `Net Unrealized Profit And Loss ${title}`,
               bottom: list.flatMap(({ color, name, key }) => [
                 /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                   type: "Baseline",
@@ -2009,7 +2452,7 @@ function createPartialOptions(colors) {
                 /** @satisfies {FetchedBaselineSeriesBlueprint} */ ({
                   type: "Baseline",
                   key: `${fixKey(
-                    key
+                    key,
                   )}net_unrealized_profit_and_loss_relative_to_market_cap`,
                   title: useGroupName ? name : "Net",
                   color: useGroupName ? color : undefined,
@@ -2030,7 +2473,7 @@ function createPartialOptions(colors) {
                 tree: [
                   {
                     name: "Average",
-                    title: `${args.title} Average Price Paid`,
+                    title: `Average Price Paid ${title}`,
                     top: list.flatMap(({ color, name, key: _key }) => {
                       const key = fixKey(_key);
                       return /** @type {const} */ ([
@@ -2044,7 +2487,7 @@ function createPartialOptions(colors) {
                   },
                   {
                     name: "Min",
-                    title: `${args.title} Min Price Paid`,
+                    title: `Min Price Paid ${title}`,
                     top: list.flatMap(({ color, name, key: _key }) => {
                       const key = fixKey(_key);
                       return /** @type {const} */ ([
@@ -2058,7 +2501,7 @@ function createPartialOptions(colors) {
                   },
                   {
                     name: "Max",
-                    title: `${args.title} Max Price Paid`,
+                    title: `Max Price Paid ${title}`,
                     top: list.flatMap(({ color, name, key: _key }) => {
                       const key = fixKey(_key);
                       return /** @type {const} */ ([
@@ -2076,7 +2519,7 @@ function createPartialOptions(colors) {
           : [
               {
                 name: "Price paid",
-                title: `${args.title} Prices Paid`,
+                title: `Prices Paid ${title}`,
                 top: [
                   createBaseSeries({
                     key: `${fixKey(args.key)}realized_price`,
@@ -2100,7 +2543,7 @@ function createPartialOptions(colors) {
             ]),
         {
           name: "Coins Destroyed",
-          title: `${args.title} Coins Destroyed`,
+          title: `Coins Destroyed ${title}`,
           bottom: list.flatMap(({ color, name, key: _key }) => {
             const key = fixKey(_key);
             return /** @type {const} */ ([
@@ -2110,7 +2553,7 @@ function createPartialOptions(colors) {
                 color,
               }),
               createBaseSeries({
-                key: `cumulative_${key}coinblocks_destroyed`,
+                key: `${key}coinblocks_destroyed_cumulative`,
                 name: useGroupName ? name : "cumulative",
                 color,
                 defaultActive: false,
@@ -2121,7 +2564,7 @@ function createPartialOptions(colors) {
                 color,
               }),
               createBaseSeries({
-                key: `cumulative_${key}coindays_destroyed`,
+                key: `${key}coindays_destroyed_cumulative`,
                 name: useGroupName ? name : "cumulative",
                 color,
                 defaultActive: false,
@@ -2134,6 +2577,15 @@ function createPartialOptions(colors) {
   }
 
   return [
+    ...(env.localhost
+      ? /** @type {const} */ ([
+          {
+            name: "Explorer",
+            title: "Explorer",
+            kind: "explorer",
+          },
+        ])
+      : []),
     {
       name: "Charts",
       tree: [
@@ -2199,7 +2651,7 @@ function createPartialOptions(colors) {
                       key: `${key}_sma`,
                       name: key,
                       color,
-                    })
+                    }),
                   ),
                 },
                 ...averages.map(({ key, name, color }) =>
@@ -2209,7 +2661,7 @@ function createPartialOptions(colors) {
                     title: `${name} Market Price Moving Average`,
                     legend: "average",
                     color,
-                  })
+                  }),
                 ),
               ],
             },
@@ -2326,7 +2778,7 @@ function createPartialOptions(colors) {
                           },
                         }),
                       ],
-                    })
+                    }),
                 ),
                 .../** @type {const} */ ([
                   { name: "2 Year", key: "2y" },
@@ -2397,7 +2849,7 @@ function createPartialOptions(colors) {
                           },
                         }),
                       ],
-                    })
+                    }),
                 ),
               ],
             },
@@ -2413,7 +2865,7 @@ function createPartialOptions(colors) {
                       name: `${year}`,
                       color,
                       defaultActive,
-                    })
+                    }),
                   ),
                 },
                 ...dcaClasses.map(
@@ -2440,7 +2892,7 @@ function createPartialOptions(colors) {
                           },
                         }),
                       ],
-                    })
+                    }),
                 ),
               ],
             },
@@ -2454,7 +2906,7 @@ function createPartialOptions(colors) {
               title: "Circulating Supply",
               bottom: [
                 createBaseSeries({
-                  key: "cumulative_subsidy_in_btc",
+                  key: "subsidy_in_btc_cumulative",
                   name: "Mined",
                 }),
               ],
@@ -2501,10 +2953,10 @@ function createPartialOptions(colors) {
               bottom: [
                 ...createAverageSumCumulativeMinMaxPercentilesSeries("fee"),
                 ...createAverageSumCumulativeMinMaxPercentilesSeries(
-                  "fee_in_btc"
+                  "fee_in_btc",
                 ),
                 ...createAverageSumCumulativeMinMaxPercentilesSeries(
-                  "fee_in_usd"
+                  "fee_in_usd",
                 ),
               ],
             },
@@ -2724,16 +3176,6 @@ function createPartialOptions(colors) {
               ],
             },
             // {
-            //   name: "Unspent Count",
-            //   title: "Unspent Transaction Output Count",
-            //   bottom: [
-            //     createBaseSeries({
-            //       key: "exact_utxo_count",
-            //       name: "cumulative",
-            //     }),
-            //   ],
-            // },
-            // {
             //   name: "Value",
             //   title: "Transaction Output Value",
             //   bottom: [
@@ -2741,331 +3183,147 @@ function createPartialOptions(colors) {
             //     ...createSumCumulativeSeries({ concat: "output_value" }),
             //   ],
             // },
-            // {
-            //   name: "types",
-            //   tree: [
-            //     {
-            //       name: "p2pk",
-            //       title: "Pay To Public Key Outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2pk33_count",
-            //           name: "33B Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2pk33_count_sum",
-            //           name: "33B sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2pk33_count",
-            //           name: "33B cumulative",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2pk65_count",
-            //           name: "65B Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2pk65_count_sum",
-            //           name: "65B sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2pk65_count",
-            //           name: "65B cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "p2pkh",
-            //       title: "Pay To Public Key Hash Outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2pkh_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2pkh_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2pkh_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "p2ms",
-            //       title: "Pay To Multisig Outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2ms_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2ms_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2ms_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "p2sh",
-            //       title: "Pay To Script Hash Outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2sh_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2sh_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2sh_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "op_return",
-            //       title: "op_return outputs",
-            //       bottom: [
-            //         createBaseSeries({ key: "opreturn_count", name: "Count" }),
-            //         createBaseSeries({
-            //           key: "opreturn_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_opreturn_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "p2wpkh",
-            //       title: "Pay To Witness Public Key Hash Outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2wpkh_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2wpkh_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2wpkh_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "p2wsh",
-            //       title: "Pay To Witness Script Hash Outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2wsh_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2wsh_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2wsh_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "p2tr",
-            //       title: "Pay To Taproot Outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2tr_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2tr_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2tr_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "p2a",
-            //       title: "Pay To Anchor outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "p2a_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "p2a_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_p2a_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "empty",
-            //       title: "empty outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "emptyoutput_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "emptyoutput_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_emptyoutput_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //     {
-            //       name: "unknown",
-            //       title: "unknown outputs",
-            //       bottom: [
-            //         createBaseSeries({
-            //           key: "unknownoutput_count",
-            //           name: "Count",
-            //         }),
-            //         createBaseSeries({
-            //           key: "unknownoutput_count_sum",
-            //           name: "sum",
-            //         }),
-            //         createBaseSeries({
-            //           key: "cumulative_unknownoutput_count",
-            //           name: "cumulative",
-            //         }),
-            //       ],
-            //     },
-            //   ],
-            //   // title: "Transaction Output Value",
-            //   // bottom: [
-            //   //   createAverageSeries({ concat: "output_value" }),
-            //   //   ...createSumCumulativeSeries({ concat: "output_value" }),
-            //   // ],
-            // },
           ],
         },
         {
-          name: "UTXOs",
+          name: "Cohorts",
           tree: [
-            createUTXOGroupFolder({
+            createCohortGroupFolder({
               key: "",
               name: "",
               title: "",
               color: colors.orange,
             }),
             {
-              name: "term",
+              name: "terms",
               tree: [
-                createUTXOGroupFolder({
+                createCohortGroupFolder({
                   name: "Compare",
-                  title: "Compare By Term",
+                  title: "UTXOs Term",
                   list: terms,
                 }),
-                ...terms.map(createUTXOGroupFolder),
+                ...terms.map(createCohortGroupFolder),
               ],
             },
             {
-              name: "Up to date",
+              name: "Epochs",
               tree: [
-                createUTXOGroupFolder({
+                createCohortGroupFolder({
                   name: "Compare",
-                  title: "Compare By Up To",
-                  list: upToDate,
-                }),
-                ...upToDate.map(createUTXOGroupFolder),
-              ],
-            },
-            {
-              name: "From Date",
-              tree: [
-                createUTXOGroupFolder({
-                  name: "Compare",
-                  title: "Compare By From",
-                  list: fromDate,
-                }),
-                ...fromDate.map(createUTXOGroupFolder),
-              ],
-            },
-            {
-              name: "Date Range",
-              tree: [
-                createUTXOGroupFolder({
-                  name: "Compare",
-                  title: "Compare By Range",
-                  list: dateRange,
-                }),
-                ...dateRange.map(createUTXOGroupFolder),
-              ],
-            },
-            {
-              name: "Epoch",
-              tree: [
-                createUTXOGroupFolder({
-                  name: "Compare",
-                  title: "Compare By Epoch",
+                  title: "Epoch",
                   list: epoch,
                 }),
-                ...epoch.map(createUTXOGroupFolder),
+                ...epoch.map(createCohortGroupFolder),
               ],
             },
             {
-              name: "Up to size",
+              name: "types",
               tree: [
-                createUTXOGroupFolder({
+                createCohortGroupFolder({
                   name: "Compare",
-                  title: "Compare By Up To Size",
-                  list: upToSize,
-                }),
-                ...upToSize.map(createUTXOGroupFolder),
-              ],
-            },
-            {
-              name: "From size",
-              tree: [
-                createUTXOGroupFolder({
-                  name: "Compare",
-                  title: "Compare By From Size",
-                  list: fromSize,
-                }),
-                ...fromSize.map(createUTXOGroupFolder),
-              ],
-            },
-            {
-              name: "Size range",
-              tree: [
-                createUTXOGroupFolder({
-                  name: "Compare",
-                  title: "Compare By Size Range",
-                  list: sizeRanges,
-                }),
-                ...sizeRanges.map(createUTXOGroupFolder),
-              ],
-            },
-            {
-              name: "type",
-              tree: [
-                createUTXOGroupFolder({
-                  name: "Compare",
-                  title: "Compare By Type",
+                  title: "Type",
                   list: type,
                 }),
-                ...type.map(createUTXOGroupFolder),
+                ...type.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "UTXOs Up to age",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "UTXOs Up To Age",
+                  list: upToDate,
+                }),
+                ...upToDate.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "UTXOs from age",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "UTXOs from age",
+                  list: fromDate,
+                }),
+                ...fromDate.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "UTXOs age Ranges",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "UTXOs Age Range",
+                  list: dateRange,
+                }),
+                ...dateRange.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "UTXOs under amounts",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "UTXOs under amount",
+                  list: utxosUnderAmount,
+                }),
+                ...utxosUnderAmount.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "UTXOs Above Amounts",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "UTXOs Above Amount",
+                  list: utxosAboveAmount,
+                }),
+                ...utxosAboveAmount.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "UTXOs between amounts",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "UTXOs between amounts",
+                  list: utxosAmountRanges,
+                }),
+                ...utxosAmountRanges.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "Addresses under amount",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "Addresses under Amount",
+                  list: addressesUnderAmount,
+                }),
+                ...addressesUnderAmount.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "Addresses above amount",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "Addresses above amount",
+                  list: addressesAboveAmount,
+                }),
+                ...addressesAboveAmount.map(createCohortGroupFolder),
+              ],
+            },
+            {
+              name: "Addresses between amounts",
+              tree: [
+                createCohortGroupFolder({
+                  name: "Compare",
+                  title: "Addresses between amounts",
+                  list: addressesAmountRanges,
+                }),
+                ...addressesAmountRanges.map(createCohortGroupFolder),
               ],
             },
           ],
@@ -3104,7 +3362,7 @@ function createPartialOptions(colors) {
                       name: "sum",
                     }),
                     createBaseSeries({
-                      key: "cumulative_opreturn_count",
+                      key: "opreturn_count_cumulative",
                       name: "cumulative",
                       color: colors.red,
                     }),
@@ -3145,7 +3403,7 @@ function createPartialOptions(colors) {
                   color: colors.red,
                 }),
                 createBaseSeries({
-                  key: "cumulative_coinblocks_destroyed",
+                  key: "coinblocks_destroyed_cumulative",
                   name: "Cumulative Destroyed",
                   color: colors.red,
                   defaultActive: false,
@@ -3156,7 +3414,7 @@ function createPartialOptions(colors) {
                   color: colors.orange,
                 }),
                 createBaseSeries({
-                  key: "cumulative_coinblocks_created",
+                  key: "coinblocks_created_cumulative",
                   name: "Cumulative created",
                   color: colors.orange,
                   defaultActive: false,
@@ -3167,7 +3425,7 @@ function createPartialOptions(colors) {
                   color: colors.green,
                 }),
                 createBaseSeries({
-                  key: "cumulative_coinblocks_stored",
+                  key: "coinblocks_stored_cumulative",
                   name: "Cumulative stored",
                   color: colors.green,
                   defaultActive: false,
@@ -3227,7 +3485,7 @@ function createPartialOptions(colors) {
                       name,
                       color,
                     }),
-                  ])
+                  ]),
               ),
             },
             {
@@ -3252,7 +3510,7 @@ function createPartialOptions(colors) {
                         key,
                         name,
                         color,
-                      })
+                      }),
                     ),
                   ],
                 },
@@ -3277,7 +3535,7 @@ function createPartialOptions(colors) {
                         color: colors.orange,
                       }),
                     ],
-                  })
+                  }),
                 ),
               ],
             },
@@ -3292,7 +3550,7 @@ function createPartialOptions(colors) {
                       key,
                       name,
                       color,
-                    })
+                    }),
                   ),
                 },
                 ...cointimePrices.map(({ key, name, color, title }) =>
@@ -3302,7 +3560,7 @@ function createPartialOptions(colors) {
                     color,
                     name,
                     title,
-                  })
+                  }),
                 ),
               ],
             },
@@ -3425,9 +3683,17 @@ function createPartialOptions(colors) {
  * @param {Signals} args.signals
  * @param {Env} args.env
  * @param {Utilities} args.utils
+ * @param {VecIdToIndexes} args.vecIdToIndexes
  * @param {Signal<string | null>} args.qrcode
  */
-export function initOptions({ colors, signals, env, utils, qrcode }) {
+export function initOptions({
+  colors,
+  signals,
+  env,
+  utils,
+  qrcode,
+  vecIdToIndexes,
+}) {
   const LS_SELECTED_KEY = `selected_id`;
 
   const urlSelected = utils.url.pathnameToSelectedId();
@@ -3436,7 +3702,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
   /** @type {Signal<Option>} */
   const selected = signals.createSignal(/** @type {any} */ (undefined));
 
-  const partialOptions = createPartialOptions(colors);
+  const partialOptions = createPartialOptions({ env, colors, vecIdToIndexes });
 
   /** @type {Option[]} */
   const list = [];
@@ -3445,7 +3711,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
   const detailsList = [];
 
   const treeElement = signals.createSignal(
-    /** @type {HTMLDivElement | null} */ (null)
+    /** @type {HTMLDivElement | null} */ (null),
   );
 
   /** @type {string[] | undefined} */
@@ -3457,6 +3723,9 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
    */
   function arrayToRecord(id, arr = []) {
     return (arr || []).reduce((record, blueprint) => {
+      if (env.localhost && !(blueprint.key in vecIdToIndexes)) {
+        throw Error(`${blueprint.key} not recognized`);
+      }
       const unit = utils.vecidToUnit(blueprint.key);
       record[unit] ??= [];
       record[unit].push(blueprint);
@@ -3557,7 +3826,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
           return null;
         }
       },
-      null
+      null,
     );
 
     partialTree.forEach((anyPartial, partialIndex) => {
@@ -3580,7 +3849,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
 
       if ("tree" in anyPartial) {
         const folderId = utils.stringToId(
-          `${(path || []).join(" ")} ${anyPartial.name} folder`
+          `${(path || []).join(" ")} ${anyPartial.name} folder`,
         );
 
         /** @type {Omit<OptionsGroup, keyof PartialOptionsGroup>} */
@@ -3595,13 +3864,13 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
         const thisPath = groupAddons.id;
 
         const passedDetails = signals.createSignal(
-          /** @type {HTMLDivElement | HTMLDetailsElement | null} */ (null)
+          /** @type {HTMLDivElement | HTMLDetailsElement | null} */ (null),
         );
 
         const childOptionsCount = recursiveProcessPartialTree(
           anyPartial.tree,
           passedDetails,
-          [...(path || []), thisPath]
+          [...(path || []), thisPath],
         );
 
         listForSum.push(childOptionsCount);
@@ -3657,7 +3926,15 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
         /** @type {Option} */
         let option;
 
-        if ("kind" in anyPartial && anyPartial.kind === "table") {
+        if ("kind" in anyPartial && anyPartial.kind === "explorer") {
+          option = /** @satisfies {ExplorerOption} */ ({
+            kind: anyPartial.kind,
+            id: anyPartial.kind,
+            name: anyPartial.name,
+            path: path || [],
+            title: anyPartial.title,
+          });
+        } else if ("kind" in anyPartial && anyPartial.kind === "table") {
           option = /** @satisfies {TableOption} */ ({
             kind: anyPartial.kind,
             id: anyPartial.kind,
@@ -3733,14 +4010,17 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
     });
 
     return signals.createMemo(() =>
-      listForSum.reduce((acc, s) => acc + s(), 0)
+      listForSum.reduce((acc, s) => acc + s(), 0),
     );
   }
   recursiveProcessPartialTree(partialOptions, treeElement);
 
   function setDefaultSelectedIfNeeded() {
     if (!selected()) {
-      selected.set(list[0]);
+      const firstChartOption = list.find((option) => option.kind === "chart");
+      if (firstChartOption) {
+        selected.set(firstChartOption);
+      }
     }
   }
   setDefaultSelectedIfNeeded();
@@ -3760,7 +4040,7 @@ export function initOptions({ colors, signals, env, utils, qrcode }) {
         console.log(
           [...m.entries()]
             .filter(([_, value]) => value > 1)
-            .map(([key, _]) => key)
+            .map(([key, _]) => key),
         );
 
         throw Error("ID duplicate");
diff --git a/websites/default/scripts/table.js b/websites/default/scripts/table.js
index 5a0602e14..fba8e74e5 100644
--- a/websites/default/scripts/table.js
+++ b/websites/default/scripts/table.js
@@ -29,11 +29,11 @@ function createTable({
           keyPrefix: "table",
           key: "index",
         },
-      }
+      },
     )
   );
   const index = signals.createMemo(() =>
-    serializedIndexToIndex(serializedIndex())
+    serializedIndexToIndex(serializedIndex()),
   );
 
   const table = window.document.createElement("table");
@@ -73,7 +73,7 @@ function createTable({
     table.append(tbody);
 
     const rowElements = signals.createSignal(
-      /** @type {HTMLTableRowElement[]} */ ([])
+      /** @type {HTMLTableRowElement[]} */ ([]),
     );
 
     /**
@@ -322,11 +322,11 @@ function createTable({
                           unit,
                         });
                     }
-                  }
+                  },
                 );
 
                 return () => vecId;
-              }
+              },
             );
           });
         });
@@ -340,9 +340,7 @@ function createTable({
     columns().forEach((vecId, colIndex) => addCol(vecId, colIndex));
 
     obj.addRandomCol = function () {
-      const vecId =
-        possibleVecIds[Math.floor(Math.random() * possibleVecIds.length)];
-      addCol(vecId);
+      addCol(utils.array.random(possibleVecIds));
     };
 
     return () => index;
@@ -393,7 +391,7 @@ export function init({
       },
       inside: span,
       title: "Click or tap to add a column to the table",
-    })
+    }),
   );
 }
 
@@ -408,6 +406,7 @@ function createSerializedIndexes() {
     /** @satisfies {VecId} */ ("inputindex"),
     /** @satisfies {VecId} */ ("monthindex"),
     /** @satisfies {VecId} */ ("opreturnindex"),
+    /** @satisfies {VecId} */ ("semesterindex"),
     /** @satisfies {VecId} */ ("outputindex"),
     /** @satisfies {VecId} */ ("p2aaddressindex"),
     /** @satisfies {VecId} */ ("p2msoutputindex"),
@@ -439,21 +438,23 @@ function serializedIndexToIndex(serializedIndex) {
     case "dateindex":
       return /** @satisfies {DateIndex} */ (0);
     case "weekindex":
-      return /** @satisfies {WeekIndex} */ (22);
+      return /** @satisfies {WeekIndex} */ (23);
     case "difficultyepoch":
       return /** @satisfies {DifficultyEpoch} */ (2);
     case "monthindex":
       return /** @satisfies {MonthIndex} */ (7);
     case "quarterindex":
       return /** @satisfies {QuarterIndex} */ (19);
+    case "semesterindex":
+      return /** @satisfies {SemesterIndex} */ (20);
     case "yearindex":
-      return /** @satisfies {YearIndex} */ (23);
+      return /** @satisfies {YearIndex} */ (24);
     case "decadeindex":
       return /** @satisfies {DecadeIndex} */ (1);
     case "halvingepoch":
       return /** @satisfies {HalvingEpoch} */ (4);
     case "txindex":
-      return /** @satisfies {TxIndex} */ (20);
+      return /** @satisfies {TxIndex} */ (21);
     case "inputindex":
       return /** @satisfies {InputIndex} */ (6);
     case "outputindex":
@@ -481,7 +482,7 @@ function serializedIndexToIndex(serializedIndex) {
     case "emptyoutputindex":
       return /** @satisfies {EmptyOutputIndex} */ (3);
     case "unknownoutputindex":
-      return /** @satisfies {UnknownOutputIndex} */ (21);
+      return /** @satisfies {UnknownOutputIndex} */ (22);
   }
 }
 
@@ -498,7 +499,7 @@ function createIndexToVecIds(vecIdToIndexes) {
       });
       return arr;
     },
-    /** @type {VecId[][]} */ (Array.from({ length: 24 }))
+    /** @type {VecId[][]} */ (Array.from({ length: 24 })),
   );
   indexToVecIds.forEach((arr) => {
     arr.sort();