UPDATE: Skeleton for the garbage collector

2024-03-09 14:32:54 +01:00
168 changed files with 3361 additions and 14173 deletions
--- a/.github/workflows/publish-wiki.yml
+++ b/.github/workflows/publish-wiki.yml
@@ -1,18 +0,0 @@
-name: Publish wiki
-on:
-  push:
-    branches: [main]
-    paths:
-      - wiki/**
-      - .github/workflows/publish-wiki.yml
-concurrency:
-  group: publish-wiki
-  cancel-in-progress: true
-permissions:
-  contents: write
-jobs:
-  publish-wiki:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: Andrew-Chen-Wang/github-wiki-action@v4
--- a/.github/workflows/rust-build-test.yaml
+++ b/.github/workflows/rust-build-test.yaml
@@ -16,9 +16,6 @@ jobs:
        steps:
            - uses: actions/checkout@v3

-            - name: Install wasm-pack
-              run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-
            - name: Build
              run: cargo build --release --verbose

--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-target/*
-.DS_Store
+target/*
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,22 +8,11 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

-[[package]]
-name = "aes"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
 "memchr",
 ]
@@ -45,57 +34,15 @@ dependencies = [

 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "bitcode"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48bc1c27654127a24c476d40198746860ef56475f41a601bfa5c4d0f832968f0"
-dependencies = [
- "bitcode_derive",
- "bytemuck",
-]
-
-[[package]]
-name = "bitcode_derive"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2966755a19aad59ee2aae91e2d48842c667a99d818ec72168efdab07200701cc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "bumpalo"
-version = "3.15.4"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
-
-[[package]]
-name = "bytemuck"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"

 [[package]]
 name = "byteorder"
@@ -126,11 +73,10 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.90"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
- "jobserver",
 "libc",
 ]

@@ -142,9 +88,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.37"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@@ -156,9 +102,9 @@ dependencies = [

 [[package]]
 name = "chrono-tz"
-version = "0.9.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
+checksum = "bbc529705a6e0028189c83f0a5dd9fb214105116f7e3c0eeab7ff0369766b0d1"
 dependencies = [
 "chrono",
 "chrono-tz-build",
@@ -167,106 +113,35 @@ dependencies = [

 [[package]]
 name = "chrono-tz-build"
-version = "0.3.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
+checksum = "d9998fb9f7e9b2111641485bf8beb32f92945f97f92a3d061f744cfef335f751"
 dependencies = [
 "parse-zoneinfo",
 "phf",
 "phf_codegen",
 ]

-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"

 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
 "cfg-if",
 ]

-[[package]]
-name = "crossbeam-utils"
-version = "0.8.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"

 [[package]]
 name = "flate2"
@@ -278,41 +153,22 @@ dependencies = [
 "miniz_oxide",
 ]

-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "getrandom"
-version = "0.2.13"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6"
+checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
 "cfg-if",
 "libc",
- "wasi",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
+ "wasi 0.11.0+wasi-snapshot-preview1",
 ]

 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
@@ -331,20 +187,10 @@ dependencies = [
 "cc",
 ]

-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "ironcalc"
 version = "0.1.3"
 dependencies = [
- "bitcode",
 "chrono",
 "ironcalc_base",
 "itertools",
@@ -358,9 +204,8 @@ dependencies = [

 [[package]]
 name = "ironcalc_base"
-version = "0.1.3"
+version = "0.1.2"
 dependencies = [
- "bitcode",
 "chrono",
 "chrono-tz",
 "js-sys",
@@ -370,88 +215,74 @@ dependencies = [
 "ryu",
 "serde",
 "serde_json",
+ "serde_repr",
 ]

 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
 "either",
 ]

 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "jobserver"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
-dependencies = [
- "libc",
-]
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"

 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8"
 dependencies = [
 "wasm-bindgen",
 ]

 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"

 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"

 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"

 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
 "adler",
 ]

-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
 "autocfg",
 ]

 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

 [[package]]
 name = "parse-zoneinfo"
@@ -462,29 +293,6 @@ dependencies = [
 "regex",
 ]

-[[package]]
-name = "password-hash"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest",
- "hmac",
- "password-hash",
- "sha2",
-]
-
 [[package]]
 name = "phf"
 version = "0.11.2"
@@ -525,15 +333,9 @@ dependencies = [

 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"

 [[package]]
 name = "ppv-lite86"
@@ -543,18 +345,18 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"

 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
 "proc-macro2",
 ]
@@ -591,9 +393,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -603,9 +405,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -614,53 +416,39 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"

 [[package]]
 name = "roxmltree"
-version = "0.19.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
+checksum = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671"
+dependencies = [
+ "xmlparser",
+]

 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
-[[package]]
-name = "scoped-tls"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"

 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
 "serde_derive",
 ]

-[[package]]
-name = "serde-wasm-bindgen"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf"
-dependencies = [
- "js-sys",
- "serde",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -669,9 +457,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.115"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
 "itoa",
 "ryu",
@@ -679,25 +467,14 @@ dependencies = [
 ]

 [[package]]
-name = "sha1"
-version = "0.10.6"
+name = "serde_repr"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]

 [[package]]
@@ -706,17 +483,11 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"

-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
 [[package]]
 name = "syn"
-version = "2.0.58"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -725,18 +496,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -745,29 +516,15 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.34"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
 dependencies = [
- "deranged",
- "num-conv",
- "powerfmt",
- "serde",
- "time-core",
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
 ]

-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -776,19 +533,19 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

 [[package]]
 name = "uuid"
-version = "1.8.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
 "getrandom",
 "serde",
 ]

 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"

 [[package]]
 name = "wasi"
@@ -796,22 +553,11 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

-[[package]]
-name = "wasm"
-version = "0.1.3"
-dependencies = [
- "ironcalc_base",
- "serde",
- "serde-wasm-bindgen",
- "wasm-bindgen",
- "wasm-bindgen-test",
-]
-
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce"
 dependencies = [
 "cfg-if",
 "wasm-bindgen-macro",
@@ -819,9 +565,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217"
 dependencies = [
 "bumpalo",
 "log",
@@ -832,23 +578,11 @@ dependencies = [
 "wasm-bindgen-shared",
 ]

-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@@ -856,9 +590,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -869,59 +603,46 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b"

 [[package]]
-name = "wasm-bindgen-test"
-version = "0.3.42"
+name = "winapi"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
 dependencies = [
- "console_error_panic_hook",
- "js-sys",
- "scoped-tls",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
 ]

 [[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.42"
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

 [[package]]
-name = "web-sys"
-version = "0.3.69"
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
 "windows-targets",
 ]

 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
 "windows_aarch64_gnullvm",
 "windows_aarch64_msvc",
@@ -934,91 +655,62 @@ dependencies = [

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "xmlparser"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"

 [[package]]
 name = "zip"
-version = "0.6.6"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815"
 dependencies = [
- "aes",
 "byteorder",
 "bzip2",
- "constant_time_eq",
 "crc32fast",
- "crossbeam-utils",
 "flate2",
- "hmac",
- "pbkdf2",
- "sha1",
+ "thiserror",
 "time",
- "zstd",
-]
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
-dependencies = [
- "cc",
- "pkg-config",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,6 @@ resolver = "2"
 members = [
  "base",
  "xlsx",
-  "bindings/wasm",
 ]

 exclude = [
--- a/14
+++ b/14
@@ -7,18 +7,14 @@ format:

 tests: lint
 	cargo test
-	./target/debug/documentation
-	cmp functions.md wiki/functions.md || exit 1
-	make remove-artifacts
-	cd bindings/wasm/ && wasm-pack build --target nodejs && node tests/test.mjs
+	make remove-xlsx

-remove-artifacts:
+remove-xlsx:
 	rm -f xlsx/hello-calc.xlsx
 	rm -f xlsx/hello-styles.xlsx
 	rm -f xlsx/widths-and-heights.xlsx
-	rm -f functions.md

-clean: remove-artifacts
+clean: remove-xlsx
 	cargo clean
 	rm -r -f base/target
 	rm -r -f xlsx/target
@@ -31,10 +27,6 @@ coverage:
 	CARGO_INCREMENTAL=0 RUSTFLAGS='-C instrument-coverage' LLVM_PROFILE_FILE='cargo-test-%p-%m.profraw' cargo test
 	grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" -o target/coverage/html

-update-docs:
-	cargo build
-	./target/debug/documentation -o wiki/functions.md
-
 docs:
 	cargo doc --no-deps

--- a/README.md
+++ b/README.md
@@ -117,7 +117,55 @@ See more examples in the `examples` folder of the xlsx crate.

 # ROADMAP

-See https://github.com/ironcalc
+> [!WARNING]  
+> This is work-in-progress. IronCalc in developed in the open. Expect things to be broken and change quickly until version 0.5
+
+Major milestones:
+
+* MVP, version 0.5.0: We intend to have a working version by mid March 2024 (version 0.5, MVP)
+* Stable, version 1.0.0 will come later in December 2024
+
+MVP stands for _Minimum Viable Product_
+
+## Version 0.5 or MVP (early 2024)
+
+Version 0.5 includes the engine, javascript and nodejs bindings and a web application
+
+Features of the engine include:
+
+* Read and write xlsx files
+* API to set and read values from cells
+* Implemented 192 Excel functions
+* Time functions with timezones
+* Prepared for i18n but will only support English
+* Wide test coverage
+
+UI features of the web application (backed by the engine):
+
+* Enter values and formulas. Browse mode
+* Italics, bold, underline, horizontal alignment
+* Number formatting
+* Add/remove/rename sheets
+* Copy/Paste extend values
+* Keyboard navigation
+* Delete/Add rows and columns
+* Resize rows and columns
+* Correct scrolling and navigation
+
+## Version 1.0 or Stable (December 2024)
+
+Minor milestones in the ROADMAD for version 1.0.0 (engine and UI):
+
+* Implementation of arrays and array formulas
+* Formula documentation and context help
+* Merge cells
+* Pivot tables
+* Define name manager (mostly UI)
+* Update main evaluation algorithm with a support graph
+* Dynamic arrays (SORT, UNIQUE, ..)
+* Full i18n support with different locales and languages
+* Python bindings
+* Full test coverage

 # Early testing

@@ -144,4 +192,4 @@ Licensed under either of
 * [MIT license](LICENSE-MIT)
 * [Apache license, version 2.0](LICENSE-Apache-2.0)

-at your option.
+at your option.
--- a/assets/android-chrome-192x192.png
+++ b/assets/android-chrome-192x192.png
--- a/assets/android-chrome-512x512.png
+++ b/assets/android-chrome-512x512.png
--- a/assets/apple-touch-icon.png
+++ b/assets/apple-touch-icon.png
--- a/assets/favicon-16x16.png
+++ b/assets/favicon-16x16.png
--- a/assets/favicon-32x32.png
+++ b/assets/favicon-32x32.png
--- a/assets/favicon.ico
+++ b/assets/favicon.ico
--- a/assets/icon/ironcalc_icon.png
+++ b/assets/icon/ironcalc_icon.png
--- a/assets/icon/ironcalc_icon.svg
+++ b/assets/icon/ironcalc_icon.svg
@@ -1,8 +0,0 @@
-<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="600" height="600" rx="20" fill="#F2994A"/>
-<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 100C348.98 166.034 322.748 229.362 276.055 276.055C268.163 283.947 259.796 291.255 251.021 297.95L251.021 500L348.98 500H251.021C251.021 433.966 277.252 370.637 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05L348.98 100Z" fill="white"/>
-<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M251.021 100.068C251.003 140.096 235.094 178.481 206.788 206.787C178.466 235.109 140.053 251.02 100 251.02V348.979C154.873 348.979 207.877 330.866 251.021 297.95V100.068Z" fill="white"/>
-<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 499.882C349.011 459.872 364.918 421.507 393.213 393.213C421.534 364.891 459.947 348.98 500 348.98V251.02C445.128 251.02 392.123 269.134 348.98 302.05V499.882Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M276.055 276.055C322.748 229.362 348.98 166.034 348.98 100H251.021V297.95C259.796 291.255 268.163 283.947 276.055 276.055Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M348.98 302.05V499.895C348.98 499.93 348.98 499.965 348.98 500L251.021 500C251.021 499.946 251.02 499.891 251.021 499.837C251.064 433.862 277.291 370.599 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05Z" fill="white"/>
-</svg>
--- a/assets/logo.png
+++ b/assets/logo.png
--- a/assets/logo/png/black.png
+++ b/assets/logo/png/black.png
--- a/assets/logo/png/orange+black.png
+++ b/assets/logo/png/orange+black.png
--- a/assets/logo/png/orange+white.png
+++ b/assets/logo/png/orange+white.png
--- a/assets/logo/png/white.png
+++ b/assets/logo/png/white.png
--- a/assets/logo/svg/black.svg
+++ b/assets/logo/svg/black.svg
--- a/assets/logo/svg/orange+black.svg
+++ b/assets/logo/svg/orange+black.svg
--- a/assets/logo/svg/orange+white.svg
+++ b/assets/logo/svg/orange+white.svg
--- a/assets/logo/svg/white.svg
+++ b/assets/logo/svg/white.svg
--- a/base/Cargo.toml
+++ b/base/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ironcalc_base"
-version = "0.1.3"
+version = "0.1.2"
 authors = ["Nicolás Hatcher <nicolas@theuniverse.today>"]
 edition = "2021"
 homepage = "https://www.ironcalc.com"
@@ -12,20 +12,18 @@ readme = "README.md"

 [dependencies]
 serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_repr = "0.1"
 ryu = "1.0"
 chrono = "0.4"
-chrono-tz = "0.9"
+chrono-tz = "0.7.0"
 regex = "1.0"
 once_cell = "1.16.0"
-bitcode = "0.6.0"
-
-[dev-dependencies]
-serde_json = "1.0"

 [target.'cfg(target_arch = "wasm32")'.dependencies]
-js-sys = { version = "0.3.69" }
+js-sys = { version = "0.3.60" }

 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rand = "0.8.5"
+rand = "0.8.4"


--- a/base/examples/formulas_and_errors.rs
+++ b/base/examples/formulas_and_errors.rs
@@ -1,4 +1,4 @@
-use ironcalc_base::{types::CellType, Model};
+use ironcalc_base::{model::Model, types::CellType};

 fn main() -> Result<(), Box<dyn std::error::Error>> {
    let mut model = Model::new_empty("formulas-and-errors", "en", "UTC")?;
--- a/base/examples/hello_world.rs
+++ b/base/examples/hello_world.rs
@@ -1,4 +1,4 @@
-use ironcalc_base::{cell::CellValue, Model};
+use ironcalc_base::{cell::CellValue, model::Model};

 fn main() -> Result<(), Box<dyn std::error::Error>> {
    let mut model = Model::new_empty("hello-world", "en", "UTC")?;
--- a/base/src/actions.rs
+++ b/base/src/actions.rs
@@ -77,13 +77,13 @@ impl Model {
        let style = source_cell.get_style();
        // FIXME: we need some user_input getter instead of get_text
        let formula_or_value = self
-            .get_cell_formula(sheet, source_row, source_column)?
+            .cell_formula(sheet, source_row, source_column)?
            .unwrap_or_else(|| source_cell.get_text(&self.workbook.shared_strings, &self.language));
        self.set_user_input(sheet, target_row, target_column, formula_or_value);
        self.workbook
            .worksheet_mut(sheet)?
            .set_cell_style(target_row, target_column, style);
-        self.cell_clear_all(sheet, source_row, source_column)?;
+        self.delete_cell(sheet, source_row, source_column)?;
        Ok(())
    }

@@ -157,11 +157,6 @@ impl Model {
            return Err("Please use insert columns instead".to_string());
        }

-        // first column being deleted
-        let column_start = column;
-        // last column being deleted
-        let column_end = column + column_count - 1;
-
        // Move cells
        let worksheet = &self.workbook.worksheet(sheet)?;
        let mut all_rows: Vec<i32> = worksheet.sheet_data.keys().copied().collect();
@@ -171,11 +166,11 @@ impl Model {
        for r in all_rows {
            let columns: Vec<i32> = self.get_columns_for_row(sheet, r, false)?;
            for col in columns {
-                if col >= column_start {
-                    if col > column_end {
+                if col >= column {
+                    if col >= column + column_count {
                        self.move_cell(sheet, r, col, r, col - column_count)?;
                    } else {
-                        self.cell_clear_all(sheet, r, col)?;
+                        self.delete_cell(sheet, r, col)?;
                    }
                }
            }
@@ -189,64 +184,6 @@ impl Model {
                delta: -column_count,
            }),
        );
-        let worksheet = &mut self.workbook.worksheet_mut(sheet)?;
-
-        // deletes all the column styles
-        let mut new_columns = Vec::new();
-        for col in worksheet.cols.iter_mut() {
-            // range under study
-            let min = col.min;
-            let max = col.max;
-            // In the diagram:
-            // |xxxxx| range we are studying [min, max]
-            // |*****| range we are deleting [column_start, column_end]
-            // we are going to split it in three big cases:
-            // ----------------|xxxxxxxx|-----------------
-            // -----|*****|------------------------------- Case A
-            // -------|**********|------------------------ Case B
-            // -------------|**************|-------------- Case C
-            // ------------------|****|------------------- Case D
-            // ---------------------|**********|---------- Case E
-            // -----------------------------|*****|------- Case F
-            if column_start < min {
-                if column_end < min {
-                    // Case A
-                    // We displace all columns
-                    let mut new_column = col.clone();
-                    new_column.min = min - column_count;
-                    new_column.max = max - column_count;
-                    new_columns.push(new_column);
-                } else if column_end < max {
-                    // Case B
-                    // We displace the end
-                    let mut new_column = col.clone();
-                    new_column.min = column_start;
-                    new_column.max = max - column_count;
-                    new_columns.push(new_column);
-                } else {
-                    // Case C
-                    // skip this, we are deleting the whole range
-                }
-            } else if column_start <= max {
-                if column_end <= max {
-                    // Case D
-                    // We displace the end
-                    let mut new_column = col.clone();
-                    new_column.max = max - column_count;
-                    new_columns.push(new_column);
-                } else {
-                    // Case E
-                    let mut new_column = col.clone();
-                    new_column.max = column_start - 1;
-                    new_columns.push(new_column);
-                }
-            } else {
-                // Case F
-                // No action required
-                new_columns.push(col.clone());
-            }
-        }
-        worksheet.cols = new_columns;

        Ok(())
    }
@@ -346,7 +283,7 @@ impl Model {
                    // remove all cells in row
                    // FIXME: We could just remove the entire row in one go
                    for column in columns {
-                        self.cell_clear_all(sheet, r, column)?;
+                        self.delete_cell(sheet, r, column)?;
                    }
                }
            }
--- a/base/src/cell.rs
+++ b/base/src/cell.rs
@@ -1,9 +1,12 @@
 use crate::{
    expressions::token::Error, language::Language, number_format::to_excel_precision_str, types::*,
 };
+use serde::{Deserialize, Serialize};
+use serde_json::json;

 /// A CellValue is the representation of the cell content.
-#[derive(Debug, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[serde(untagged)]
 pub enum CellValue {
    None,
    String(String),
@@ -11,6 +14,17 @@ pub enum CellValue {
    Boolean(bool),
 }

+impl CellValue {
+    pub fn to_json_str(&self) -> String {
+        match &self {
+            CellValue::None => "null".to_string(),
+            CellValue::String(s) => json!(s).to_string(),
+            CellValue::Number(f) => json!(f).to_string(),
+            CellValue::Boolean(b) => json!(b).to_string(),
+        }
+    }
+}
+
 impl From<f64> for CellValue {
    fn from(value: f64) -> Self {
        Self::Number(value)
--- a/base/src/expressions/lexer/mod.rs
+++ b/base/src/expressions/lexer/mod.rs
@@ -308,9 +308,9 @@ impl Lexer {
                                return self.consume_range(None);
                            }
                            let name_upper = name.to_ascii_uppercase();
-                            if name_upper == self.language.booleans.r#true {
+                            if name_upper == self.language.booleans.true_value {
                                return TokenType::Boolean(true);
-                            } else if name_upper == self.language.booleans.r#false {
+                            } else if name_upper == self.language.booleans.false_value {
                                return TokenType::Boolean(false);
                            }
                            if self.mode == LexerMode::A1 {
@@ -660,8 +660,8 @@ impl Lexer {
    fn consume_error(&mut self) -> TokenType {
        let errors = &self.language.errors;
        let rest_of_formula: String = self.chars[self.position - 1..self.len].iter().collect();
-        if rest_of_formula.starts_with(&errors.r#ref) {
-            self.position += errors.r#ref.chars().count() - 1;
+        if rest_of_formula.starts_with(&errors.ref_value) {
+            self.position += errors.ref_value.chars().count() - 1;
            return TokenType::Error(Error::REF);
        } else if rest_of_formula.starts_with(&errors.name) {
            self.position += errors.name.chars().count() - 1;
--- a/base/src/expressions/lexer/test/test_locale.rs
+++ b/base/src/expressions/lexer/test/test_locale.rs
@@ -6,11 +6,11 @@ use crate::{
        token::TokenType,
    },
    language::get_language,
-    locale::get_locale,
+    locale::get_locale_fix,
 };

 fn new_language_lexer(formula: &str, locale: &str, language: &str) -> Lexer {
-    let locale = get_locale(locale).unwrap();
+    let locale = get_locale_fix(locale).unwrap();
    let language = get_language(language).unwrap();
    Lexer::new(formula, LexerMode::A1, locale, language)
 }
--- a/base/src/expressions/parser/mod.rs
+++ b/base/src/expressions/parser/mod.rs
@@ -222,7 +222,7 @@ impl Parser {

    pub fn parse(&mut self, formula: &str, context: &Option<CellReferenceRC>) -> Node {
        self.lexer.set_formula(formula);
-        self.context.clone_from(context);
+        self.context = context.clone();
        self.parse_expr()
    }

--- a/base/src/expressions/token.rs
+++ b/base/src/expressions/token.rs
@@ -1,7 +1,7 @@
 use std::fmt;

-use bitcode::{Decode, Encode};
 use serde::{Deserialize, Serialize};
+use serde_repr::{Deserialize_repr, Serialize_repr};

 use crate::language::Language;

@@ -80,7 +80,8 @@ impl fmt::Display for OpProduct {
 ///  * "#ERROR!" means there was an error processing the formula (for instance "=A1+")
 ///  * "#N/IMPL!" means the formula or feature in Excel but has not been implemented in IronCalc
 /// Note that they are serialized/deserialized by index
-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize_repr, Deserialize_repr, Debug, PartialEq, Eq, Clone)]
+#[repr(u8)]
 pub enum Error {
    REF,
    NAME,
@@ -118,7 +119,7 @@ impl Error {
    pub fn to_localized_error_string(&self, language: &Language) -> String {
        match self {
            Error::NULL => language.errors.null.to_string(),
-            Error::REF => language.errors.r#ref.to_string(),
+            Error::REF => language.errors.ref_value.to_string(),
            Error::NAME => language.errors.name.to_string(),
            Error::VALUE => language.errors.value.to_string(),
            Error::DIV => language.errors.div.to_string(),
@@ -135,7 +136,7 @@ impl Error {

 pub fn get_error_by_name(name: &str, language: &Language) -> Option<Error> {
    let errors = &language.errors;
-    if name == errors.r#ref {
+    if name == errors.ref_value {
        return Some(Error::REF);
    } else if name == errors.name {
        return Some(Error::NAME);
--- a/base/src/functions/date_and_time.rs
+++ b/base/src/functions/date_and_time.rs
@@ -1,6 +1,7 @@
-use chrono::DateTime;
 use chrono::Datelike;
 use chrono::Months;
+use chrono::NaiveDateTime;
+use chrono::TimeZone;
 use chrono::Timelike;

 use crate::expressions::types::CellReferenceIndex;
@@ -257,8 +258,8 @@ impl Model {
        // milliseconds since January 1, 1970 00:00:00 UTC.
        let milliseconds = get_milliseconds_since_epoch();
        let seconds = milliseconds / 1000;
-        let local_time = match DateTime::from_timestamp(seconds, 0) {
-            Some(dt) => dt.with_timezone(&self.tz),
+        let dt = match NaiveDateTime::from_timestamp_opt(seconds, 0) {
+            Some(dt) => dt,
            None => {
                return CalcResult::Error {
                    error: Error::ERROR,
@@ -267,6 +268,7 @@ impl Model {
                }
            }
        };
+        let local_time = self.tz.from_utc_datetime(&dt);
        // 693_594 is computed as:
        // NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2
        // The 2 days offset is because of Excel 1900 bug
@@ -287,8 +289,8 @@ impl Model {
        // milliseconds since January 1, 1970 00:00:00 UTC.
        let milliseconds = get_milliseconds_since_epoch();
        let seconds = milliseconds / 1000;
-        let local_time = match DateTime::from_timestamp(seconds, 0) {
-            Some(dt) => dt.with_timezone(&self.tz),
+        let dt = match NaiveDateTime::from_timestamp_opt(seconds, 0) {
+            Some(dt) => dt,
            None => {
                return CalcResult::Error {
                    error: Error::ERROR,
@@ -297,6 +299,7 @@ impl Model {
                }
            }
        };
+        let local_time = self.tz.from_utc_datetime(&dt);
        // 693_594 is computed as:
        // NaiveDate::from_ymd(1900, 1, 1).num_days_from_ce() - 2
        // The 2 days offset is because of Excel 1900 bug
--- a/base/src/functions/information.rs
+++ b/base/src/functions/information.rs
@@ -165,8 +165,7 @@ impl Model {
                    message: "argument must be a reference to a single cell".to_string(),
                };
            }
-            let is_formula = if let Ok(f) = self.get_cell_formula(left.sheet, left.row, left.column)
-            {
+            let is_formula = if let Ok(f) = self.cell_formula(left.sheet, left.row, left.column) {
                f.is_some()
            } else {
                false
--- a/base/src/functions/mod.rs
+++ b/base/src/functions/mod.rs
@@ -1,5 +1,4 @@
 use core::fmt;
-use std::array::IntoIter;

 use crate::{
    calc_result::CalcResult,
@@ -245,206 +244,6 @@ pub enum Function {
    Subtotal,
 }

-impl Function {
-    pub fn into_iter() -> IntoIter<Function, 192> {
-        [
-            Function::And,
-            Function::False,
-            Function::If,
-            Function::Iferror,
-            Function::Ifna,
-            Function::Ifs,
-            Function::Not,
-            Function::Or,
-            Function::Switch,
-            Function::True,
-            Function::Xor,
-            Function::Sin,
-            Function::Cos,
-            Function::Tan,
-            Function::Asin,
-            Function::Acos,
-            Function::Atan,
-            Function::Sinh,
-            Function::Cosh,
-            Function::Tanh,
-            Function::Asinh,
-            Function::Acosh,
-            Function::Atanh,
-            Function::Abs,
-            Function::Pi,
-            Function::Sqrt,
-            Function::Sqrtpi,
-            Function::Atan2,
-            Function::Power,
-            Function::Max,
-            Function::Min,
-            Function::Product,
-            Function::Rand,
-            Function::Randbetween,
-            Function::Round,
-            Function::Rounddown,
-            Function::Roundup,
-            Function::Sum,
-            Function::Sumif,
-            Function::Sumifs,
-            Function::Choose,
-            Function::Column,
-            Function::Columns,
-            Function::Index,
-            Function::Indirect,
-            Function::Hlookup,
-            Function::Lookup,
-            Function::Match,
-            Function::Offset,
-            Function::Row,
-            Function::Rows,
-            Function::Vlookup,
-            Function::Xlookup,
-            Function::Concatenate,
-            Function::Exact,
-            Function::Value,
-            Function::T,
-            Function::Valuetotext,
-            Function::Concat,
-            Function::Find,
-            Function::Left,
-            Function::Len,
-            Function::Lower,
-            Function::Mid,
-            Function::Right,
-            Function::Search,
-            Function::Text,
-            Function::Trim,
-            Function::Upper,
-            Function::Isnumber,
-            Function::Isnontext,
-            Function::Istext,
-            Function::Islogical,
-            Function::Isblank,
-            Function::Iserr,
-            Function::Iserror,
-            Function::Isna,
-            Function::Na,
-            Function::Isref,
-            Function::Isodd,
-            Function::Iseven,
-            Function::ErrorType,
-            Function::Isformula,
-            Function::Type,
-            Function::Sheet,
-            Function::Average,
-            Function::Averagea,
-            Function::Averageif,
-            Function::Averageifs,
-            Function::Count,
-            Function::Counta,
-            Function::Countblank,
-            Function::Countif,
-            Function::Countifs,
-            Function::Maxifs,
-            Function::Minifs,
-            Function::Year,
-            Function::Day,
-            Function::Month,
-            Function::Eomonth,
-            Function::Date,
-            Function::Edate,
-            Function::Today,
-            Function::Now,
-            Function::Pmt,
-            Function::Pv,
-            Function::Rate,
-            Function::Nper,
-            Function::Fv,
-            Function::Ppmt,
-            Function::Ipmt,
-            Function::Npv,
-            Function::Mirr,
-            Function::Irr,
-            Function::Xirr,
-            Function::Xnpv,
-            Function::Rept,
-            Function::Textafter,
-            Function::Textbefore,
-            Function::Textjoin,
-            Function::Substitute,
-            Function::Ispmt,
-            Function::Rri,
-            Function::Sln,
-            Function::Syd,
-            Function::Nominal,
-            Function::Effect,
-            Function::Pduration,
-            Function::Tbillyield,
-            Function::Tbillprice,
-            Function::Tbilleq,
-            Function::Dollarde,
-            Function::Dollarfr,
-            Function::Ddb,
-            Function::Db,
-            Function::Cumprinc,
-            Function::Cumipmt,
-            Function::Besseli,
-            Function::Besselj,
-            Function::Besselk,
-            Function::Bessely,
-            Function::Erf,
-            Function::ErfPrecise,
-            Function::Erfc,
-            Function::ErfcPrecise,
-            Function::Bin2dec,
-            Function::Bin2hex,
-            Function::Bin2oct,
-            Function::Dec2Bin,
-            Function::Dec2hex,
-            Function::Dec2oct,
-            Function::Hex2bin,
-            Function::Hex2dec,
-            Function::Hex2oct,
-            Function::Oct2bin,
-            Function::Oct2dec,
-            Function::Oct2hex,
-            Function::Bitand,
-            Function::Bitlshift,
-            Function::Bitor,
-            Function::Bitrshift,
-            Function::Bitxor,
-            Function::Complex,
-            Function::Imabs,
-            Function::Imaginary,
-            Function::Imargument,
-            Function::Imconjugate,
-            Function::Imcos,
-            Function::Imcosh,
-            Function::Imcot,
-            Function::Imcsc,
-            Function::Imcsch,
-            Function::Imdiv,
-            Function::Imexp,
-            Function::Imln,
-            Function::Imlog10,
-            Function::Imlog2,
-            Function::Impower,
-            Function::Improduct,
-            Function::Imreal,
-            Function::Imsec,
-            Function::Imsech,
-            Function::Imsin,
-            Function::Imsinh,
-            Function::Imsqrt,
-            Function::Imsub,
-            Function::Imsum,
-            Function::Imtan,
-            Function::Convert,
-            Function::Delta,
-            Function::Gestep,
-            Function::Subtotal,
-        ]
-        .into_iter()
-    }
-}
-
 impl Function {
    /// Some functions in Excel like CONCAT are stringified as `_xlfn.CONCAT`.
    pub fn to_xlsx_string(&self) -> String {
@@ -909,23 +708,7 @@ impl fmt::Display for Function {
    }
 }

-/// Documentation for one function
-pub struct Documentation {
-    pub name: String,
-}
-
 impl Model {
-    /// Produces documentation for all implemented functions
-    pub fn documentation() -> Vec<Documentation> {
-        let mut doc = Vec::new();
-        for function in Function::into_iter() {
-            doc.push(Documentation {
-                name: function.to_string(),
-            });
-        }
-        doc
-    }
-
    pub(crate) fn evaluate_function(
        &mut self,
        kind: &Function,
@@ -1145,66 +928,3 @@ impl Model {
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::{
-        fs::File,
-        io::{BufRead, BufReader},
-    };
-
-    use crate::functions::Function;
-
-    #[test]
-    fn function_iterator() {
-        // This checks that the number of functions in the enum is the same
-        // as the number of functions in the Iterator.
-
-        // This is tricky. In Rust we cannot loop over all the members of an enum.
-        // There are alternatives like using an external crate like strum.
-        // But I am not in the mood for that.
-
-        // What we do here is read this file , extract the functions in the enum
-        // and check they are the same as in the iterator
-        let file = File::open("src/functions/mod.rs").unwrap();
-        let reader = BufReader::new(file);
-        let mut start = false;
-        let mut list = Vec::new();
-
-        for line in reader.lines() {
-            let text = line.unwrap();
-            let text = text.trim().trim_end_matches(',');
-            if text == "pub enum Function {" {
-                start = true;
-                continue;
-            }
-            if start {
-                if text == "}" {
-                    break;
-                }
-                if text.starts_with("//") {
-                    // skip comments
-                    continue;
-                }
-                if text.is_empty() {
-                    // skip empty lines
-                    continue;
-                }
-                list.push(text.to_owned());
-            }
-        }
-        // We make a list with their functions names, but we escape ".": ERROR.TYPE => ERRORTYPE
-        let iter_list = Function::into_iter()
-            .map(|f| format!("{}", f).replace('.', ""))
-            .collect::<Vec<_>>();
-
-        let len = iter_list.len();
-
-        assert_eq!(list.len(), len);
-        // We still need to check there are no duplicates. This will fail if a function in iter_list
-        // is included twice and one is missing
-        for function in list {
-            assert!(iter_list.contains(&function.to_uppercase()));
-        }
-    }
-}
--- a/base/src/garbage_collector.rs
+++ b/base/src/garbage_collector.rs
@@ -0,0 +1,12 @@
+use crate::model::Model;
+
+// The gc (Garbage Collector) cleans up leftover elements in the workbook:
+// * Strings that are no longe reachable
+// * Styles that are no longer reachable
+// * ...
+
+impl Model {
+    pub(crate) fn gc(&mut self) -> Result<(), String> {
+        todo!()
+    }
+}
--- a/base/src/language/language.bin
+++ b/base/src/language/language.bin
@@ -1 +0,0 @@
-PfrendeesD<>VRAITRUEWAHRVERDADEROTVFAUXFALSEFALSCHFALSOUw#REF!#REF!#BEZUG!#¡REF!e<>#NOM?#NAME?#NAME?#¿NOMBRE?x<>#VALEUR!#VALUE!#WERT!#¡VALOR!w<>#DIV/0!#DIV/0!#DIV/0!#¡DIV/0!<04>#N/A#N/A#NV#N/AXv#NOMBRE!#NUM!#ZAHL!#¡NUM!<02><>#N/IMPL!#N/IMPL!#N/IMPL!#N/IMPL!w{#SPILL!#SPILL!#ÜBERLAUF!#SPILL!ff#CALC!#CALC!#CALC!#CALC!ff#CIRC!#CIRC!#CIRC!#CIRC!ww#ERROR!#ERROR!#ERROR!#ERROR!ff#NULL!#NULL!#NULL!#NULL!
--- a/base/src/language/mod.rs
+++ b/base/src/language/mod.rs
@@ -1,17 +1,20 @@
+use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};
+
 use std::collections::HashMap;

-use bitcode::{Decode, Encode};
-use once_cell::sync::Lazy;
-
-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct Booleans {
-    pub r#true: String,
-    pub r#false: String,
+    #[serde(rename = "true")]
+    pub true_value: String,
+    #[serde(rename = "false")]
+    pub false_value: String,
 }

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct Errors {
-    pub r#ref: String,
+    #[serde(rename = "ref")]
+    pub ref_value: String,
    pub name: String,
    pub value: String,
    pub div: String,
@@ -25,14 +28,14 @@ pub struct Errors {
    pub null: String,
 }

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct Language {
    pub booleans: Booleans,
    pub errors: Errors,
 }

 static LANGUAGES: Lazy<HashMap<String, Language>> = Lazy::new(|| {
-    bitcode::decode(include_bytes!("language.bin")).expect("Failed parsing language file")
+    serde_json::from_str(include_str!("language.json")).expect("Failed parsing language file")
 });

 pub fn get_language(id: &str) -> Result<&Language, String> {
--- a/base/src/lib.rs
+++ b/base/src/lib.rs
@@ -8,7 +8,7 @@
 //!
 //! ```toml
 //! [dependencies]
-//! ironcalc_base = { git = "https://github.com/ironcalc/IronCalc" }
+//! ironcalc_base = { git = "https://github.com/ironcalc/IronCalc", version = "0.1"}
 //! ```
 //!
 //! <small> until version 0.5.0 you should use the git dependencies as stated </small>
@@ -31,30 +31,29 @@ pub mod expressions;
 pub mod formatter;
 pub mod language;
 pub mod locale;
+pub mod model;
 pub mod new_empty;
 pub mod number_format;
 pub mod types;
 pub mod worksheet;

+mod functions;
+
 mod actions;
 mod cast;
 mod constants;
-mod diffs;
-mod functions;
-mod implicit_intersection;
-mod model;
 mod styles;
+
+mod diffs;
+mod implicit_intersection;
+
 mod units;
-mod user_model;
 mod utils;
 mod workbook;
+mod garbage_collector;

 #[cfg(test)]
 mod test;

 #[cfg(test)]
 pub mod mock_time;
-
-pub use model::get_milliseconds_since_epoch;
-pub use model::Model;
-pub use user_model::UserModel;
--- a/base/src/locale/locales.bin
+++ b/base/src/locale/locales.bin
--- a/base/src/locale/mod.rs
+++ b/base/src/locale/mod.rs
@@ -1,29 +1,32 @@
-use bitcode::{Decode, Encode};
 use once_cell::sync::Lazy;
+use serde::{Deserialize, Serialize};

 use std::collections::HashMap;

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct Locale {
    pub dates: Dates,
    pub numbers: NumbersProperties,
    pub currency: Currency,
 }

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct Currency {
    pub iso: String,
    pub symbol: String,
 }

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct NumbersProperties {
+    #[serde(rename = "symbols-numberSystem-latn")]
    pub symbols: NumbersSymbols,
+    #[serde(rename = "decimalFormats-numberSystem-latn")]
    pub decimal_formats: DecimalFormats,
+    #[serde(rename = "currencyFormats-numberSystem-latn")]
    pub currency_formats: CurrencyFormats,
 }

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct Dates {
    pub day_names: Vec<String>,
    pub day_names_short: Vec<String>,
@@ -32,7 +35,8 @@ pub struct Dates {
    pub months_letter: Vec<String>,
 }

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct NumbersSymbols {
    pub decimal: String,
    pub group: String,
@@ -50,26 +54,40 @@ pub struct NumbersSymbols {
 }

 // See: https://cldr.unicode.org/translation/number-currency-formats/number-and-currency-patterns
-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
 pub struct CurrencyFormats {
    pub standard: String,
+    #[serde(rename = "standard-alphaNextToNumber")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub standard_alpha_next_to_number: Option<String>,
+    #[serde(rename = "standard-noCurrency")]
    pub standard_no_currency: String,
    pub accounting: String,
+    #[serde(rename = "accounting-alphaNextToNumber")]
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub accounting_alpha_next_to_number: Option<String>,
+    #[serde(rename = "accounting-noCurrency")]
    pub accounting_no_currency: String,
 }

-#[derive(Encode, Decode, Clone)]
+#[derive(Serialize, Deserialize, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct DecimalFormats {
    pub standard: String,
 }

-static LOCALES: Lazy<HashMap<String, Locale>> =
-    Lazy::new(|| bitcode::decode(include_bytes!("locales.bin")).expect("Failed parsing locale"));
+static LOCALES: Lazy<HashMap<String, Locale>> = Lazy::new(|| {
+    serde_json::from_str(include_str!("locales.json")).expect("Failed parsing locale")
+});

-pub fn get_locale(id: &str) -> Result<&Locale, String> {
+pub fn get_locale(_id: &str) -> Result<&Locale, String> {
    // TODO: pass the locale once we implement locales in Rust
+    let locale = LOCALES.get("en").ok_or("Invalid locale")?;
+    Ok(locale)
+}
+
+// TODO: Remove this function one we implement locales properly
+pub fn get_locale_fix(id: &str) -> Result<&Locale, String> {
    let locale = LOCALES.get(id).ok_or("Invalid locale")?;
    Ok(locale)
 }
--- a/base/src/mock_time.rs
+++ b/base/src/mock_time.rs
@@ -10,7 +10,7 @@ use std::cell::RefCell;
 // 8 November 2022 12:13 Berlin time

 thread_local! {
-    static MOCK_TIME: RefCell<i64> = const { RefCell::new(1667906008578) };
+    static MOCK_TIME: RefCell<i64> = RefCell::new(1667906008578);
 }

 pub fn get_milliseconds_since_epoch() -> i64 {
@@ -20,18 +20,3 @@ pub fn get_milliseconds_since_epoch() -> i64 {
 pub fn set_mock_time(time: i64) {
    MOCK_TIME.with(|cell| *cell.borrow_mut() = time);
 }
-
-#[cfg(test)]
-mod tests {
-    use crate::mock_time::MOCK_TIME;
-
-    use super::get_milliseconds_since_epoch;
-
-    #[test]
-    fn mock_time() {
-        let t = get_milliseconds_since_epoch();
-        assert_eq!(t, 1667906008578);
-
-        MOCK_TIME.with_borrow(|v| assert_eq!(*v, 1667906008578));
-    }
-}
--- a/base/src/model.rs
+++ b/base/src/model.rs
@@ -1,5 +1,14 @@
 #![deny(missing_docs)]

+//! # Model
+//!
+//! Note that sheets are 0-indexed and rows and columns are 1-indexed.
+//!
+//! IronCalc is row first. A cell is referenced by (`sheet`, `row`, `column`)
+//!
+
+use serde_json::json;
+
 use std::collections::HashMap;
 use std::vec::Vec;

@@ -38,11 +47,7 @@ use chrono_tz::Tz;
 #[cfg(test)]
 pub use crate::mock_time::get_milliseconds_since_epoch;

-/// Number of milliseconds since January 1, 1970
-/// Used by time and date functions. It takes the value from the environment:
-/// * The Operative System
-/// * The JavaScript environment
-/// * Or mocked for tests
+/// wasm implementation for time
 #[cfg(not(test))]
 #[cfg(not(target_arch = "wasm32"))]
 pub fn get_milliseconds_since_epoch() -> i64 {
@@ -53,11 +58,6 @@ pub fn get_milliseconds_since_epoch() -> i64 {
        .as_millis() as i64
 }

-/// Number of milliseconds since January 1, 1970
-/// Used by time and date functions. It takes the value from the environment:
-/// * The Operative System
-/// * The JavaScript environment
-/// * Or mocked for tests
 #[cfg(not(test))]
 #[cfg(target_arch = "wasm32")]
 pub fn get_milliseconds_since_epoch() -> i64 {
@@ -67,7 +67,7 @@ pub fn get_milliseconds_since_epoch() -> i64 {

 /// A cell might be evaluated or being evaluated
 #[derive(Clone)]
-pub(crate) enum CellState {
+pub enum CellState {
    /// The cell has already been evaluated
    Evaluated,
    /// The cell is being evaluated
@@ -75,7 +75,7 @@ pub(crate) enum CellState {
 }

 /// A parsed formula for a defined name
-pub(crate) enum ParsedDefinedName {
+pub enum ParsedDefinedName {
    /// CellReference (`=C4`)
    CellReference(CellReferenceIndex),
    /// A Range (`=C4:D6`)
@@ -105,21 +105,19 @@ pub struct Model {
    /// A list of parsed formulas
    pub parsed_formulas: Vec<Vec<Node>>,
    /// A list of parsed defined names
-    pub(crate) parsed_defined_names: HashMap<(Option<u32>, String), ParsedDefinedName>,
+    pub parsed_defined_names: HashMap<(Option<u32>, String), ParsedDefinedName>,
    /// An optimization to lookup strings faster
-    pub(crate) shared_strings: HashMap<String, usize>,
+    pub shared_strings: HashMap<String, usize>,
    /// An instance of the parser
-    pub(crate) parser: Parser,
+    pub parser: Parser,
    /// The list of cells with formulas that are evaluated of being evaluated
-    pub(crate) cells: HashMap<(u32, i32, i32), CellState>,
+    pub cells: HashMap<(u32, i32, i32), CellState>,
    /// The locale of the model
-    pub(crate) locale: Locale,
+    pub locale: Locale,
    /// Tha language used
-    pub(crate) language: Language,
+    pub language: Language,
    /// The timezone used to evaluate the model
-    pub(crate) tz: Tz,
-    /// The view id. A view consist of a selected sheet and ranges.
-    pub(crate) view_id: u32,
+    pub tz: Tz,
 }

 // FIXME: Maybe this should be the same as CellReference
@@ -661,7 +659,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// assert_eq!(model.workbook.worksheet(0)?.color, None);
@@ -728,7 +726,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// assert_eq!(model.is_empty_cell(0, 1, 1)?, true);
@@ -800,17 +798,17 @@ impl Model {
        None
    }

-    /// Returns a model from an internal binary representation of a workbook
+    /// Returns a model from a String representation of a workbook
    ///
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # use ironcalc_base::cell::CellValue;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// model.set_user_input(0, 1, 1, "Stella!".to_string());
-    /// let model2 = Model::from_bytes(&model.to_bytes())?;
+    /// let model2 = Model::from_json(&model.to_json_str())?;
    /// assert_eq!(
    ///     model2.get_cell_value_by_index(0, 1, 1),
    ///     Ok(CellValue::String("Stella!".to_string()))
@@ -818,12 +816,9 @@ impl Model {
    /// # Ok(())
    /// # }
    /// ```
-    ///
-    /// See also:
-    /// * [Model::to_bytes]
-    pub fn from_bytes(s: &[u8]) -> Result<Model, String> {
+    pub fn from_json(s: &str) -> Result<Model, String> {
        let workbook: Workbook =
-            bitcode::decode(s).map_err(|e| format!("Error parsing workbook: {e}"))?;
+            serde_json::from_str(s).map_err(|_| "Error parsing workbook".to_string())?;
        Model::from_workbook(workbook)
    }

@@ -832,7 +827,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # use ironcalc_base::cell::CellValue;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
@@ -888,7 +883,6 @@ impl Model {
            language,
            locale,
            tz,
-            view_id: 0,
        };

        model.parse_formulas();
@@ -902,7 +896,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # use ironcalc_base::expressions::types::CellReferenceIndex;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
@@ -971,7 +965,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # use ironcalc_base::expressions::types::{Area, CellReferenceIndex};
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
@@ -1042,7 +1036,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// let (sheet, row, column) = (0, 1, 1);
@@ -1089,7 +1083,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # use ironcalc_base::expressions::types::CellReferenceIndex;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
@@ -1144,13 +1138,13 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// let (sheet, row, column) = (0, 1, 1);
    /// model.set_user_input(sheet, row, column, "=SIN(B1*C3)+1".to_string());
    /// model.evaluate();
-    /// let result = model.get_cell_formula(sheet, row, column)?;
+    /// let result = model.cell_formula(sheet, row, column)?;
    /// assert_eq!(result, Some("=SIN(B1*C3)+1".to_string()));
    /// # Ok(())
    /// # }
@@ -1158,33 +1152,24 @@ impl Model {
    ///
    /// See also:
    /// * [Model::get_cell_content()]
-    pub fn get_cell_formula(
+    pub fn cell_formula(
        &self,
        sheet: u32,
        row: i32,
        column: i32,
    ) -> Result<Option<String>, String> {
        let worksheet = self.workbook.worksheet(sheet)?;
-        match worksheet.cell(row, column) {
-            Some(cell) => match cell.get_formula() {
-                Some(formula_index) => {
-                    let formula = &self
-                        .parsed_formulas
-                        .get(sheet as usize)
-                        .ok_or("missing sheet")?
-                        .get(formula_index as usize)
-                        .ok_or("missing formula")?;
-                    let cell_ref = CellReferenceRC {
-                        sheet: worksheet.get_name(),
-                        row,
-                        column,
-                    };
-                    Ok(Some(format!("={}", to_string(formula, &cell_ref))))
-                }
-                None => Ok(None),
-            },
-            None => Ok(None),
-        }
+        Ok(worksheet.cell(row, column).and_then(|cell| {
+            cell.get_formula().map(|formula_index| {
+                let formula = &self.parsed_formulas[sheet as usize][formula_index as usize];
+                let cell_ref = CellReferenceRC {
+                    sheet: worksheet.get_name(),
+                    row,
+                    column,
+                };
+                format!("={}", to_string(formula, &cell_ref))
+            })
+        }))
    }

    /// Updates the value of a cell with some text
@@ -1193,7 +1178,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// let (sheet, row, column) = (0, 1, 1);
@@ -1236,7 +1221,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// let (sheet, row, column) = (0, 1, 1);
@@ -1273,7 +1258,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// let (sheet, row, column) = (0, 1, 1);
@@ -1311,7 +1296,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// let (sheet, row, column) = (0, 1, 1);
@@ -1363,7 +1348,7 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # use ironcalc_base::cell::CellValue;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
@@ -1373,7 +1358,7 @@ impl Model {
    /// model.set_user_input(0, 1, 2, "=SUM(A:A)".to_string());
    /// model.evaluate();
    /// assert_eq!(model.get_cell_value_by_index(0, 1, 2), Ok(CellValue::Number(215.0)));
-    /// assert_eq!(model.get_formatted_cell_value(0, 1, 2), Ok("215$".to_string()));
+    /// assert_eq!(model.formatted_cell_value(0, 1, 2), Ok("215$".to_string()));
    /// # Ok(())
    /// # }
    /// ```
@@ -1544,7 +1529,7 @@ impl Model {
    /// Returns the cell value for (`sheet`, `row`, `column`)
    ///
    /// See also:
-    /// * [Model::get_formatted_cell_value()]
+    /// * [Model::formatted_cell_value()]
    pub fn get_cell_value_by_index(
        &self,
        sheet_index: u32,
@@ -1570,42 +1555,35 @@ impl Model {
    /// # Examples
    ///
    /// ```rust
-    /// # use ironcalc_base::Model;
+    /// # use ironcalc_base::model::Model;
    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
    /// let mut model = Model::new_empty("model", "en", "UTC")?;
    /// let (sheet, row, column) = (0, 1, 1);
    /// model.set_user_input(sheet, row, column, "=1/3".to_string());
    /// model.evaluate();
-    /// let result = model.get_formatted_cell_value(sheet, row, column)?;
+    /// let result = model.formatted_cell_value(sheet, row, column)?;
    /// assert_eq!(result, "0.333333333".to_string());
    /// # Ok(())
    /// # }
    /// ```
-    pub fn get_formatted_cell_value(
+    pub fn formatted_cell_value(
        &self,
        sheet_index: u32,
        row: i32,
        column: i32,
    ) -> Result<String, String> {
-        match self.workbook.worksheet(sheet_index)?.cell(row, column) {
-            Some(cell) => {
-                let format = self.get_style_for_cell(sheet_index, row, column).num_fmt;
-                let formatted_value =
-                    cell.formatted_value(&self.workbook.shared_strings, &self.language, |value| {
-                        format_number(value, &format, &self.locale).text
-                    });
-                Ok(formatted_value)
-            }
-            None => Ok("".to_string()),
-        }
-    }
-
-    /// Return the typeof a cell
-    pub fn get_cell_type(&self, sheet: u32, row: i32, column: i32) -> Result<CellType, String> {
-        Ok(match self.workbook.worksheet(sheet)?.cell(row, column) {
-            Some(c) => c.get_type(),
-            None => CellType::Number,
-        })
+        let format = self.get_style_for_cell(sheet_index, row, column).num_fmt;
+        let cell = self
+            .workbook
+            .worksheet(sheet_index)?
+            .cell(row, column)
+            .cloned()
+            .unwrap_or_default();
+        let formatted_value =
+            cell.formatted_value(&self.workbook.shared_strings, &self.language, |value| {
+                format_number(value, &format, &self.locale).text
+            });
+        Ok(formatted_value)
    }

    /// Returns a string with the cell content. If there is a formula returns the formula
@@ -1669,53 +1647,15 @@ impl Model {
        }
    }

-    /// Removes the content of the cell but leaves the style.
-    ///
-    /// See also:
-    /// * [Model::cell_clear_all()]
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// # use ironcalc_base::Model;
-    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
-    /// let (sheet, row, column) = (0, 1, 1);
-    /// model.set_user_input(sheet, row, column, "100$".to_string());
-    /// model.cell_clear_contents(sheet, row, column);
-    /// model.set_user_input(sheet, row, column, "10".to_string());
-    /// let result = model.get_formatted_cell_value(sheet, row, column)?;
-    /// assert_eq!(result, "10$".to_string());
-    /// # Ok(())
-    /// # }
-    /// ```
-    pub fn cell_clear_contents(&mut self, sheet: u32, row: i32, column: i32) -> Result<(), String> {
-        self.workbook
-            .worksheet_mut(sheet)?
-            .cell_clear_contents(row, column);
+    /// Sets cell to empty. Can be used to delete value without affecting style.
+    pub fn set_cell_empty(&mut self, sheet: u32, row: i32, column: i32) -> Result<(), String> {
+        let worksheet = self.workbook.worksheet_mut(sheet)?;
+        worksheet.set_cell_empty(row, column);
        Ok(())
    }

-    /// Deletes a cell by removing it from worksheet data. All content and style is removed.
-    ///
-    /// See also:
-    /// * [Model::cell_clear_contents()]
-    ///
-    /// # Examples
-    ///
-    /// ```rust
-    /// # use ironcalc_base::Model;
-    /// # fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// let mut model = Model::new_empty("model", "en", "UTC")?;
-    /// let (sheet, row, column) = (0, 1, 1);
-    /// model.set_user_input(sheet, row, column, "100$".to_string());
-    /// model.cell_clear_all(sheet, row, column);
-    /// model.set_user_input(sheet, row, column, "10".to_string());
-    /// let result = model.get_formatted_cell_value(sheet, row, column)?;
-    /// assert_eq!(result, "10".to_string());
-    /// # Ok(())
-    /// # }
-    pub fn cell_clear_all(&mut self, sheet: u32, row: i32, column: i32) -> Result<(), String> {
+    /// Deletes a cell by removing it from worksheet data.
+    pub fn delete_cell(&mut self, sheet: u32, row: i32, column: i32) -> Result<(), String> {
        let worksheet = self.workbook.worksheet_mut(sheet)?;

        let sheet_data = &mut worksheet.sheet_data;
@@ -1742,8 +1682,9 @@ impl Model {
                    if r.r == row {
                        if r.custom_format {
                            return r.s;
+                        } else {
+                            break;
                        }
-                        break;
                    }
                }
                let cols = &self.workbook.worksheets[sheet as usize].cols;
@@ -1766,30 +1707,19 @@ impl Model {
            .get_style(self.get_cell_style_index(sheet, row, column))
    }

-    /// Returns an internal binary representation of the workbook
-    ///
-    /// See also:
-    /// * [Model::from_bytes]
-    pub fn to_bytes(&self) -> Vec<u8> {
-        bitcode::encode(&self.workbook)
-    }
-
-    /// Returns data about the worksheets
-    pub fn get_worksheets_properties(&self) -> Vec<SheetProperties> {
-        self.workbook
-            .worksheets
-            .iter()
-            .map(|worksheet| SheetProperties {
-                name: worksheet.get_name(),
-                state: worksheet.state.to_string(),
-                color: worksheet.color.clone(),
-                sheet_id: worksheet.sheet_id,
-            })
-            .collect()
+    /// Returns a JSON string of the workbook
+    pub fn to_json_str(&self) -> String {
+        match serde_json::to_string(&self.workbook) {
+            Ok(s) => s,
+            Err(_) => {
+                // TODO, is this branch possible at all?
+                json!({"error": "Error stringifying workbook"}).to_string()
+            }
+        }
    }

    /// Returns markup representation of the given `sheet`.
-    pub fn get_sheet_markup(&self, sheet: u32) -> Result<String, String> {
+    pub fn sheet_markup(&self, sheet: u32) -> Result<String, String> {
        let worksheet = self.workbook.worksheet(sheet)?;
        let dimension = worksheet.dimension();

@@ -1799,9 +1729,9 @@ impl Model {
            let mut row_markup: Vec<String> = Vec::new();

            for column in 1..(dimension.max_column + 1) {
-                let mut cell_markup = match self.get_cell_formula(sheet, row, column)? {
+                let mut cell_markup = match self.cell_formula(sheet, row, column)? {
                    Some(formula) => formula,
-                    None => self.get_formatted_cell_value(sheet, row, column)?,
+                    None => self.formatted_cell_value(sheet, row, column)?,
                };
                let style = self.get_style_for_cell(sheet, row, column);
                if style.font.b {
@@ -1840,7 +1770,7 @@ impl Model {
    }

    /// Returns the number of frozen rows in `sheet`
-    pub fn get_frozen_rows_count(&self, sheet: u32) -> Result<i32, String> {
+    pub fn get_frozen_rows(&self, sheet: u32) -> Result<i32, String> {
        if let Some(worksheet) = self.workbook.worksheets.get(sheet as usize) {
            Ok(worksheet.frozen_rows)
        } else {
@@ -1849,7 +1779,7 @@ impl Model {
    }

    /// Return the number of frozen columns in `sheet`
-    pub fn get_frozen_columns_count(&self, sheet: u32) -> Result<i32, String> {
+    pub fn get_frozen_columns(&self, sheet: u32) -> Result<i32, String> {
        if let Some(worksheet) = self.workbook.worksheets.get(sheet as usize) {
            Ok(worksheet.frozen_columns)
        } else {
@@ -1890,34 +1820,6 @@ impl Model {
            Err("Invalid sheet".to_string())
        }
    }
-
-    /// Returns the width of a column
-    #[inline]
-    pub fn get_column_width(&self, sheet: u32, column: i32) -> Result<f64, String> {
-        self.workbook.worksheet(sheet)?.get_column_width(column)
-    }
-
-    /// Sets the width of a column
-    #[inline]
-    pub fn set_column_width(&mut self, sheet: u32, column: i32, width: f64) -> Result<(), String> {
-        self.workbook
-            .worksheet_mut(sheet)?
-            .set_column_width(column, width)
-    }
-
-    /// Returns the height of a row
-    #[inline]
-    pub fn get_row_height(&self, sheet: u32, row: i32) -> Result<f64, String> {
-        self.workbook.worksheet(sheet)?.row_height(row)
-    }
-
-    /// Sets the height of a row
-    #[inline]
-    pub fn set_row_height(&mut self, sheet: u32, column: i32, height: f64) -> Result<(), String> {
-        self.workbook
-            .worksheet_mut(sheet)?
-            .set_row_height(column, height)
-    }
 }

 #[cfg(test)]
--- a/base/src/new_empty.rs
+++ b/base/src/new_empty.rs
@@ -1,4 +1,4 @@
-use chrono::DateTime;
+use chrono::NaiveDateTime;

 use std::collections::HashMap;

@@ -6,18 +6,14 @@ use crate::{
    calc_result::Range,
    expressions::{
        lexer::LexerMode,
-        parser::{
-            stringify::{rename_sheet_in_node, to_rc_format},
-            Parser,
-        },
+        parser::stringify::{rename_sheet_in_node, to_rc_format},
+        parser::Parser,
        types::CellReferenceRC,
    },
    language::get_language,
    locale::get_locale,
    model::{get_milliseconds_since_epoch, Model, ParsedDefinedName},
-    types::{
-        Metadata, SheetState, Workbook, WorkbookSettings, WorkbookView, Worksheet, WorksheetView,
-    },
+    types::{Metadata, SheetState, Workbook, WorkbookSettings, Worksheet},
    utils::ParsedReference,
 };

@@ -37,20 +33,7 @@ fn is_valid_sheet_name(name: &str) -> bool {

 impl Model {
    /// Creates a new worksheet. Note that it does not check if the name or the sheet_id exists
-    fn new_empty_worksheet(name: &str, sheet_id: u32, view_ids: &[&u32]) -> Worksheet {
-        let mut views = HashMap::new();
-        for id in view_ids {
-            views.insert(
-                **id,
-                WorksheetView {
-                    row: 1,
-                    column: 1,
-                    range: [1, 1, 1, 1],
-                    top_row: 1,
-                    left_column: 1,
-                },
-            );
-        }
+    fn new_empty_worksheet(name: &str, sheet_id: u32) -> Worksheet {
        Worksheet {
            cols: vec![],
            rows: vec![],
@@ -65,7 +48,6 @@ impl Model {
            color: Default::default(),
            frozen_columns: 0,
            frozen_rows: 0,
-            views,
        }
    }

@@ -140,8 +122,8 @@ impl Model {
        self.parsed_defined_names = parsed_defined_names;
    }

-    /// Reparses all formulas and defined names
-    pub(crate) fn reset_parsed_structures(&mut self) {
+    // Reparses all formulas and defined names
+    fn reset_parsed_structures(&mut self) {
        self.parser
            .set_worksheets(self.workbook.get_worksheet_names());
        self.parsed_formulas = vec![];
@@ -152,10 +134,10 @@ impl Model {
    }

    /// Adds a sheet with a automatically generated name
-    pub fn new_sheet(&mut self) -> (String, u32) {
+    pub fn new_sheet(&mut self) {
        // First we find a name

-        // TODO: The name should depend on the locale
+        // TODO: When/if we support i18n the name could depend on the locale
        let base_name = "Sheet";
        let base_name_uppercase = base_name.to_uppercase();
        let mut index = 1;
@@ -171,11 +153,9 @@ impl Model {
        let sheet_name = format!("{}{}", base_name, index);
        // Now we need a sheet_id
        let sheet_id = self.get_new_sheet_id();
-        let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
-        let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id, &view_ids);
+        let worksheet = Model::new_empty_worksheet(&sheet_name, sheet_id);
        self.workbook.worksheets.push(worksheet);
        self.reset_parsed_structures();
-        (sheet_name, self.workbook.worksheets.len() as u32 - 1)
    }

    /// Inserts a sheet with a particular index
@@ -203,8 +183,7 @@ impl Model {
            Some(id) => id,
            None => self.get_new_sheet_id(),
        };
-        let view_ids: Vec<&u32> = self.workbook.views.keys().collect();
-        let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id, &view_ids);
+        let worksheet = Model::new_empty_worksheet(sheet_name, sheet_id);
        if sheet_index as usize > self.workbook.worksheets.len() {
            return Err("Sheet index out of range".to_string());
        }
@@ -244,10 +223,10 @@ impl Model {
        new_name: &str,
    ) -> Result<(), String> {
        if !is_valid_sheet_name(new_name) {
-            return Err(format!("Invalid name for a sheet: '{}'.", new_name));
+            return Err(format!("Invalid name for a sheet: '{}'", new_name));
        }
        if self.get_sheet_index_by_name(new_name).is_some() {
-            return Err(format!("Sheet already exists: '{}'.", new_name));
+            return Err(format!("Sheet already exists: '{}'", new_name));
        }
        let worksheets = &self.workbook.worksheets;
        let sheet_count = worksheets.len() as u32;
@@ -291,7 +270,7 @@ impl Model {
        if sheet_count == 1 {
            return Err("Cannot delete only sheet".to_string());
        };
-        if sheet_index >= sheet_count {
+        if sheet_index > sheet_count {
            return Err("Sheet index too large".to_string());
        }
        self.workbook.worksheets.remove(sheet_index as usize);
@@ -344,21 +323,18 @@ impl Model {

        let milliseconds = get_milliseconds_since_epoch();
        let seconds = milliseconds / 1000;
-        let dt = match DateTime::from_timestamp(seconds, 0) {
+        let dt = match NaiveDateTime::from_timestamp_opt(seconds, 0) {
            Some(s) => s,
            None => return Err(format!("Invalid timestamp: {}", milliseconds)),
        };
        // "2020-08-06T21:20:53Z
        let now = dt.format("%Y-%m-%dT%H:%M:%SZ").to_string();

-        let mut views = HashMap::new();
-        views.insert(0, WorkbookView { sheet: 0 });
-
        // String versions of the locale are added here to simplify the serialize/deserialize logic
        let workbook = Workbook {
            shared_strings: vec![],
            defined_names: vec![],
-            worksheets: vec![Model::new_empty_worksheet("Sheet1", 1, &[&0])],
+            worksheets: vec![Model::new_empty_worksheet("Sheet1", 1)],
            styles: Default::default(),
            name: name.to_string(),
            settings: WorkbookSettings {
@@ -374,7 +350,6 @@ impl Model {
                last_modified: now,
            },
            tables: HashMap::new(),
-            views,
        };
        let parsed_formulas = Vec::new();
        let worksheets = &workbook.worksheets;
@@ -395,7 +370,6 @@ impl Model {
            locale,
            language,
            tz,
-            view_id: 0,
        };
        model.parse_formulas();
        Ok(model)
--- a/base/src/test/engineering/test_complex.rs
+++ b/base/src/test/engineering/test_complex.rs
@@ -76,16 +76,10 @@ fn fn_imconjugate() {
 fn fn_imcos() {
    let mut model = new_empty_model();
    model._set("A1", r#"=IMCOS("4+3i")"#);
-    // In macos non intel this is "-6.58066304055116+7.58155274274655i"
-    model._set("A2", r#"=COMPLEX(-6.58066304055116, 7.58155274274654)"#);
-    model._set("A3", r#"=IMABS(IMSUB(A1, A2)) < G1"#);
-
-    // small number
-    model._set("G1", "0.0000001");

    model.evaluate();

-    assert_eq!(model._get_text("A3"), "TRUE");
+    assert_eq!(model._get_text("A1"), "-6.58066304055116+7.58155274274654i");
 }

 #[test]
--- a/base/src/test/mod.rs
+++ b/base/src/test/mod.rs
@@ -1,7 +1,6 @@
 mod test_actions;
 mod test_binary_search;
 mod test_cell;
-mod test_cell_clear_contents;
 mod test_circular_references;
 mod test_column_width;
 mod test_criteria;
@@ -29,8 +28,9 @@ mod test_frozen_rows_columns;
 mod test_general;
 mod test_math;
 mod test_metadata;
-mod test_model_cell_clear_all;
+mod test_model_delete_cell;
 mod test_model_is_empty_cell;
+mod test_model_set_cell_empty;
 mod test_move_formula;
 mod test_quote_prefix;
 mod test_set_user_input;
@@ -53,5 +53,4 @@ mod test_frozen_rows_and_columns;
 mod test_get_cell_content;
 mod test_percentage;
 mod test_today;
-mod test_types;
-mod user_model;
+mod test_gc;
--- a/base/src/test/test_actions.rs
+++ b/base/src/test/test_actions.rs
@@ -3,7 +3,6 @@
 use crate::constants::LAST_COLUMN;
 use crate::model::Model;
 use crate::test::util::new_empty_model;
-use crate::types::Col;

 #[test]
 fn test_insert_columns() {
@@ -196,250 +195,6 @@ fn test_delete_columns() {
    assert_eq!(model._get_formula("A3"), *"=SUM(#REF!:K4)");
 }

-#[test]
-fn test_delete_column_width() {
-    let mut model = new_empty_model();
-    let (sheet, column) = (0, 5);
-    let normal_width = model.get_column_width(sheet, column).unwrap();
-    // Set the width of one column to 5 times the normal width
-    assert!(model
-        .set_column_width(sheet, column, normal_width * 5.0)
-        .is_ok());
-
-    // delete it
-    assert!(model.delete_columns(sheet, column, 1).is_ok());
-
-    // all the columns around have the expected width
-    assert_eq!(
-        model.get_column_width(sheet, column - 1).unwrap(),
-        normal_width
-    );
-    assert_eq!(model.get_column_width(sheet, column).unwrap(), normal_width);
-    assert_eq!(
-        model.get_column_width(sheet, column + 1).unwrap(),
-        normal_width
-    );
-}
-
-#[test]
-// We set the style of columns 4 to 7 and delete column 4
-// We check that columns 4 to 6 have the new style
-fn test_delete_first_column_width() {
-    let mut model = new_empty_model();
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 4,
-        max: 7,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-    let (sheet, column) = (0, 4);
-    assert!(model.delete_columns(sheet, column, 1).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 1);
-    assert_eq!(
-        cols[0],
-        Col {
-            min: 4,
-            max: 6,
-            width: 300.0,
-            custom_width: true,
-            style: None
-        }
-    );
-}
-
-#[test]
-// Delete the last column in the range
-fn test_delete_last_column_width() {
-    let mut model = new_empty_model();
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 4,
-        max: 7,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-    let (sheet, column) = (0, 7);
-    assert!(model.delete_columns(sheet, column, 1).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 1);
-    assert_eq!(
-        cols[0],
-        Col {
-            min: 4,
-            max: 6,
-            width: 300.0,
-            custom_width: true,
-            style: None
-        }
-    );
-}
-
-#[test]
-// Deletes columns at the end
-fn test_delete_last_few_columns_width() {
-    let mut model = new_empty_model();
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 4,
-        max: 17,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-    let (sheet, column) = (0, 13);
-    assert!(model.delete_columns(sheet, column, 10).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 1);
-    assert_eq!(
-        cols[0],
-        Col {
-            min: 4,
-            max: 12,
-            width: 300.0,
-            custom_width: true,
-            style: None
-        }
-    );
-}
-
-#[test]
-fn test_delete_columns_non_overlapping_left() {
-    let mut model = new_empty_model();
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 10,
-        max: 17,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-    let (sheet, column) = (0, 3);
-    assert!(model.delete_columns(sheet, column, 4).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 1);
-    assert_eq!(
-        cols[0],
-        Col {
-            min: 6,
-            max: 13,
-            width: 300.0,
-            custom_width: true,
-            style: None
-        }
-    );
-}
-
-#[test]
-fn test_delete_columns_overlapping_left() {
-    let mut model = new_empty_model();
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 10,
-        max: 20,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-    let (sheet, column) = (0, 8);
-    assert!(model.delete_columns(sheet, column, 4).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 1);
-    assert_eq!(
-        cols[0],
-        Col {
-            min: 8,
-            max: 16,
-            width: 300.0,
-            custom_width: true,
-            style: None
-        }
-    );
-}
-
-#[test]
-fn test_delete_columns_non_overlapping_right() {
-    let mut model = new_empty_model();
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 10,
-        max: 17,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-    let (sheet, column) = (0, 23);
-    assert!(model.delete_columns(sheet, column, 4).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 1);
-    assert_eq!(
-        cols[0],
-        Col {
-            min: 10,
-            max: 17,
-            width: 300.0,
-            custom_width: true,
-            style: None
-        }
-    );
-}
-
-#[test]
-// deletes some columns in the middle of the range
-fn test_delete_middle_column_width() {
-    let mut model = new_empty_model();
-    // styled columns [4, 17]
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 4,
-        max: 17,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-
-    // deletes columns 10, 11, 12
-    let (sheet, column) = (0, 10);
-    assert!(model.delete_columns(sheet, column, 3).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 1);
-    assert_eq!(
-        cols[0],
-        Col {
-            min: 4,
-            max: 14,
-            width: 300.0,
-            custom_width: true,
-            style: None
-        }
-    );
-}
-
-#[test]
-// the range is inside the deleted columns
-fn delete_range_in_columns() {
-    let mut model = new_empty_model();
-    // styled columns [6, 10]
-    model.workbook.worksheets[0].cols = vec![Col {
-        min: 6,
-        max: 10,
-        width: 300.0,
-        custom_width: true,
-        style: None,
-    }];
-
-    // deletes columns [4, 17]
-    let (sheet, column) = (0, 4);
-    assert!(model.delete_columns(sheet, column, 8).is_ok());
-    let cols = &model.workbook.worksheets[0].cols;
-    assert_eq!(cols.len(), 0);
-}
-
-#[test]
-fn test_delete_columns_error() {
-    let mut model = new_empty_model();
-    let (sheet, column) = (0, 5);
-    assert!(model.delete_columns(sheet, column, -1).is_err());
-    assert!(model.delete_columns(sheet, column, 0).is_err());
-    assert!(model.delete_columns(sheet, column, 1).is_ok());
-}
-
 #[test]
 fn test_delete_rows() {
    let mut model = new_empty_model();
--- a/base/src/test/test_column_width.rs
+++ b/base/src/test/test_column_width.rs
@@ -23,9 +23,9 @@ fn test_column_width() {
        .unwrap();
    assert_eq!(model.workbook.worksheets[0].cols.len(), 3);
    let worksheet = model.workbook.worksheet(0).unwrap();
-    assert!((worksheet.get_column_width(1).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
-    assert!((worksheet.get_column_width(2).unwrap() - 30.0).abs() < f64::EPSILON);
-    assert!((worksheet.get_column_width(3).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
+    assert!((worksheet.column_width(1).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
+    assert!((worksheet.column_width(2).unwrap() - 30.0).abs() < f64::EPSILON);
+    assert!((worksheet.column_width(3).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
    assert_eq!(model.get_cell_style_index(0, 23, 2), 6);
 }

@@ -48,11 +48,9 @@ fn test_column_width_lower_edge() {
        .unwrap();
    assert_eq!(model.workbook.worksheets[0].cols.len(), 2);
    let worksheet = model.workbook.worksheet(0).unwrap();
-    assert!((worksheet.get_column_width(4).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
-    assert!((worksheet.get_column_width(5).unwrap() - 30.0).abs() < f64::EPSILON);
-    assert!(
-        (worksheet.get_column_width(6).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON
-    );
+    assert!((worksheet.column_width(4).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
+    assert!((worksheet.column_width(5).unwrap() - 30.0).abs() < f64::EPSILON);
+    assert!((worksheet.column_width(6).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON);
    assert_eq!(model.get_cell_style_index(0, 23, 5), 1);
 }

@@ -76,9 +74,9 @@ fn test_column_width_higher_edge() {
    assert_eq!(model.workbook.worksheets[0].cols.len(), 2);
    let worksheet = model.workbook.worksheet(0).unwrap();
    assert!(
-        (worksheet.get_column_width(15).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON
+        (worksheet.column_width(15).unwrap() - 10.0 * COLUMN_WIDTH_FACTOR).abs() < f64::EPSILON
    );
-    assert!((worksheet.get_column_width(16).unwrap() - 30.0).abs() < f64::EPSILON);
-    assert!((worksheet.get_column_width(17).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
+    assert!((worksheet.column_width(16).unwrap() - 30.0).abs() < f64::EPSILON);
+    assert!((worksheet.column_width(17).unwrap() - DEFAULT_COLUMN_WIDTH).abs() < f64::EPSILON);
    assert_eq!(model.get_cell_style_index(0, 23, 16), 1);
 }
--- a/base/src/test/test_frozen_rows_and_columns.rs
+++ b/base/src/test/test_frozen_rows_and_columns.rs
@@ -8,37 +8,34 @@ use crate::{
 #[test]
 fn test_empty_model() {
    let mut model = new_empty_model();
-    assert_eq!(model.get_frozen_rows_count(0), Ok(0));
-    assert_eq!(model.get_frozen_columns_count(0), Ok(0));
+    assert_eq!(model.get_frozen_rows(0), Ok(0));
+    assert_eq!(model.get_frozen_columns(0), Ok(0));

    let e = model.set_frozen_rows(0, 3);
    assert!(e.is_ok());
-    assert_eq!(model.get_frozen_rows_count(0), Ok(3));
-    assert_eq!(model.get_frozen_columns_count(0), Ok(0));
+    assert_eq!(model.get_frozen_rows(0), Ok(3));
+    assert_eq!(model.get_frozen_columns(0), Ok(0));

    let e = model.set_frozen_columns(0, 53);
    assert!(e.is_ok());
-    assert_eq!(model.get_frozen_rows_count(0), Ok(3));
-    assert_eq!(model.get_frozen_columns_count(0), Ok(53));
+    assert_eq!(model.get_frozen_rows(0), Ok(3));
+    assert_eq!(model.get_frozen_columns(0), Ok(53));

    // Set them back to zero
    let e = model.set_frozen_rows(0, 0);
    assert!(e.is_ok());
    let e = model.set_frozen_columns(0, 0);
    assert!(e.is_ok());
-    assert_eq!(model.get_frozen_rows_count(0), Ok(0));
-    assert_eq!(model.get_frozen_columns_count(0), Ok(0));
+    assert_eq!(model.get_frozen_rows(0), Ok(0));
+    assert_eq!(model.get_frozen_columns(0), Ok(0));
 }

 #[test]
 fn test_invalid_sheet() {
    let mut model = new_empty_model();
+    assert_eq!(model.get_frozen_rows(1), Err("Invalid sheet".to_string()));
    assert_eq!(
-        model.get_frozen_rows_count(1),
-        Err("Invalid sheet".to_string())
-    );
-    assert_eq!(
-        model.get_frozen_columns_count(3),
+        model.get_frozen_columns(3),
        Err("Invalid sheet".to_string())
    );

--- a/base/src/test/test_gc.rs
+++ b/base/src/test/test_gc.rs
@@ -0,0 +1,22 @@
+#![allow(clippy::unwrap_used)]
+
+use crate::test::util::new_empty_model;
+
+#[test]
+fn test_empty_model() {
+    let mut model = new_empty_model();
+    // set a string
+    model._set("A1", "Hello");
+    assert_eq!(model.shared_strings.len(), 1);
+    // calling the gc doesn't do anything
+    model.gc().unwrap();
+    assert_eq!(model.shared_strings.len(), 1);
+
+    // If we delete the cell the string is still in the list
+    model.delete_cell(0, 1, 1).unwrap();
+    assert_eq!(model.shared_strings.len(), 1);
+
+    // after the gc the string is no longer present
+    model.gc().unwrap();
+    assert_eq!(model.shared_strings.len(), 0);
+}
--- a/base/src/test/test_general.rs
+++ b/base/src/test/test_general.rs
@@ -411,11 +411,11 @@ fn test_get_formatted_cell_value() {

    model.evaluate();

-    assert_eq!(model.get_formatted_cell_value(0, 1, 1).unwrap(), "foobar");
-    assert_eq!(model.get_formatted_cell_value(0, 2, 1).unwrap(), "TRUE");
-    assert_eq!(model.get_formatted_cell_value(0, 3, 1).unwrap(), "");
-    assert_eq!(model.get_formatted_cell_value(0, 4, 1).unwrap(), "123.456");
-    assert_eq!(model.get_formatted_cell_value(0, 5, 1).unwrap(), "$123.46");
+    assert_eq!(model.formatted_cell_value(0, 1, 1).unwrap(), "foobar");
+    assert_eq!(model.formatted_cell_value(0, 2, 1).unwrap(), "TRUE");
+    assert_eq!(model.formatted_cell_value(0, 3, 1).unwrap(), "");
+    assert_eq!(model.formatted_cell_value(0, 4, 1).unwrap(), "123.456");
+    assert_eq!(model.formatted_cell_value(0, 5, 1).unwrap(), "$123.46");
 }

 #[test]
@@ -426,20 +426,20 @@ fn test_cell_formula() {
    model.evaluate();

    assert_eq!(
-        model.get_cell_formula(0, 1, 1), // A1
+        model.cell_formula(0, 1, 1), // A1
        Ok(Some("=1+2+3".to_string())),
    );
    assert_eq!(
-        model.get_cell_formula(0, 2, 1), // A2
+        model.cell_formula(0, 2, 1), // A2
        Ok(None),
    );
    assert_eq!(
-        model.get_cell_formula(0, 3, 1), // A3 - empty cell
+        model.cell_formula(0, 3, 1), // A3 - empty cell
        Ok(None),
    );

    assert_eq!(
-        model.get_cell_formula(42, 1, 1),
+        model.cell_formula(42, 1, 1),
        Err("Invalid sheet index".to_string()),
    );
 }
@@ -453,16 +453,16 @@ fn test_xlfn() {
    model.evaluate();
    // Only modern formulas strip the '_xlfn.'
    assert_eq!(
-        model.get_cell_formula(0, 1, 1).unwrap(),
+        model.cell_formula(0, 1, 1).unwrap(),
        Some("=_xlfn.SIN(1)".to_string())
    );
    // unknown formulas keep the '_xlfn.' prefix
    assert_eq!(
-        model.get_cell_formula(0, 2, 1).unwrap(),
+        model.cell_formula(0, 2, 1).unwrap(),
        Some("=_xlfn.SINY(1)".to_string())
    );
    assert_eq!(
-        model.get_cell_formula(0, 3, 1).unwrap(),
+        model.cell_formula(0, 3, 1).unwrap(),
        Some("=CONCAT(3,4)".to_string())
    );
 }
@@ -474,11 +474,11 @@ fn test_letter_case() {
    model._set("A2", "=sIn(2)");
    model.evaluate();
    assert_eq!(
-        model.get_cell_formula(0, 1, 1).unwrap(),
+        model.cell_formula(0, 1, 1).unwrap(),
        Some("=SIN(1)".to_string())
    );
    assert_eq!(
-        model.get_cell_formula(0, 2, 1).unwrap(),
+        model.cell_formula(0, 2, 1).unwrap(),
        Some("=SIN(2)".to_string())
    );
 }
--- a/base/src/test/test_model_cell_clear_all.rs
+++ b/base/src/test/test_model_cell_clear_all.rs
@@ -2,22 +2,22 @@
 use crate::test::util::new_empty_model;

 #[test]
-fn test_cell_clear_all_non_existing_sheet() {
+fn test_delete_cell_non_existing_sheet() {
    let mut model = new_empty_model();
    assert_eq!(
-        model.cell_clear_all(13, 1, 1),
+        model.delete_cell(13, 1, 1),
        Err("Invalid sheet index".to_string())
    );
 }

 #[test]
-fn test_cell_clear_all_unset_cell() {
+fn test_delete_cell_unset_cell() {
    let mut model = new_empty_model();
-    assert!(model.cell_clear_all(0, 1, 1).is_ok());
+    assert!(model.delete_cell(0, 1, 1).is_ok());
 }

 #[test]
-fn test_cell_clear_all_with_value() {
+fn test_delete_cell_with_value() {
    let mut model = new_empty_model();
    model._set("A1", "hello");
    model.evaluate();
@@ -25,7 +25,7 @@ fn test_cell_clear_all_with_value() {
    assert_eq!(model._get_text_at(0, 1, 1), "hello");
    assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));

-    model.cell_clear_all(0, 1, 1).unwrap();
+    model.delete_cell(0, 1, 1).unwrap();
    model.evaluate();

    assert_eq!(model._get_text_at(0, 1, 1), "");
@@ -33,7 +33,7 @@ fn test_cell_clear_all_with_value() {
 }

 #[test]
-fn test_cell_clear_all_referenced_elsewhere() {
+fn test_delete_cell_referenced_elsewhere() {
    let mut model = new_empty_model();
    model._set("A1", "35");
    model._set("A2", "=2*A1");
@@ -44,7 +44,7 @@ fn test_cell_clear_all_referenced_elsewhere() {
    assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));
    assert_eq!(model.is_empty_cell(0, 2, 1), Ok(false));

-    model.cell_clear_all(0, 1, 1).unwrap();
+    model.delete_cell(0, 1, 1).unwrap();
    model.evaluate();

    assert_eq!(model._get_text_at(0, 1, 1), "");
--- a/base/src/test/test_model_is_empty_cell.rs
+++ b/base/src/test/test_model_is_empty_cell.rs
@@ -16,7 +16,7 @@ fn test_is_empty_cell() {
    assert!(model.is_empty_cell(0, 3, 1).unwrap());
    model.set_user_input(0, 3, 1, "Hello World".to_string());
    assert!(!model.is_empty_cell(0, 3, 1).unwrap());
-    model.cell_clear_contents(0, 3, 1).unwrap();
+    model.set_cell_empty(0, 3, 1).unwrap();
    assert!(model.is_empty_cell(0, 3, 1).unwrap());
 }

--- a/base/src/test/test_model_set_cell_empty.rs
+++ b/base/src/test/test_model_set_cell_empty.rs
@@ -2,25 +2,25 @@
 use crate::test::util::new_empty_model;

 #[test]
-fn test_cell_clear_contents_non_existing_sheet() {
+fn test_set_cell_empty_non_existing_sheet() {
    let mut model = new_empty_model();
    assert_eq!(
-        model.cell_clear_contents(13, 1, 1),
+        model.set_cell_empty(13, 1, 1),
        Err("Invalid sheet index".to_string())
    );
 }

 #[test]
-fn test_cell_clear_contents_unset_cell() {
+fn test_set_cell_empty_unset_cell() {
    let mut model = new_empty_model();
-    model.cell_clear_contents(0, 1, 1).unwrap();
+    model.set_cell_empty(0, 1, 1).unwrap();
    assert_eq!(model.is_empty_cell(0, 1, 1), Ok(true));
    model.evaluate();
    assert_eq!(model._get_text_at(0, 1, 1), "");
 }

 #[test]
-fn test_cell_clear_contents_with_value() {
+fn test_set_cell_empty_with_value() {
    let mut model = new_empty_model();
    model._set("A1", "hello");
    model.evaluate();
@@ -28,7 +28,7 @@ fn test_cell_clear_contents_with_value() {
    assert_eq!(model._get_text_at(0, 1, 1), "hello");
    assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));

-    model.cell_clear_contents(0, 1, 1).unwrap();
+    model.set_cell_empty(0, 1, 1).unwrap();
    model.evaluate();

    assert_eq!(model._get_text_at(0, 1, 1), "");
@@ -36,7 +36,7 @@ fn test_cell_clear_contents_with_value() {
 }

 #[test]
-fn test_cell_clear_contents_referenced_elsewhere() {
+fn test_set_cell_empty_referenced_elsewhere() {
    let mut model = new_empty_model();
    model._set("A1", "35");
    model._set("A2", "=2*A1");
@@ -47,7 +47,7 @@ fn test_cell_clear_contents_referenced_elsewhere() {
    assert_eq!(model.is_empty_cell(0, 1, 1), Ok(false));
    assert_eq!(model.is_empty_cell(0, 2, 1), Ok(false));

-    model.cell_clear_contents(0, 1, 1).unwrap();
+    model.set_cell_empty(0, 1, 1).unwrap();
    model.evaluate();

    assert_eq!(model._get_text_at(0, 1, 1), "");
--- a/base/src/test/test_sheet_markup.rs
+++ b/base/src/test/test_sheet_markup.rs
@@ -21,7 +21,7 @@ fn test_sheet_markup() {
    model.set_cell_style(0, 4, 1, &style).unwrap();

    assert_eq!(
-        model.get_sheet_markup(0),
+        model.sheet_markup(0),
        Ok("**Item**|**Cost**\nRent|$600\nElectricity|$200\n**Total**|=SUM(B2:B3)".to_string()),
    )
 }
--- a/base/src/test/test_sheets.rs
+++ b/base/src/test/test_sheets.rs
@@ -236,11 +236,3 @@ fn test_delete_sheet_by_index() {
    assert_eq!(model.workbook.get_worksheet_names(), ["Sheet2"]);
    assert_eq!(model._get_text("Sheet2!A1"), "#REF!");
 }
-
-#[test]
-fn delete_sheet_error() {
-    let mut model = new_empty_model();
-    model.new_sheet();
-    assert!(model.delete_sheet(2).is_err());
-    assert!(model.delete_sheet(1).is_ok());
-}
--- a/base/src/test/test_types.rs
+++ b/base/src/test/test_types.rs
@@ -1,24 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::types::{Alignment, HorizontalAlignment, VerticalAlignment};
-
-#[test]
-fn alignment_default() {
-    let alignment = Alignment::default();
-    assert_eq!(
-        alignment,
-        Alignment {
-            horizontal: HorizontalAlignment::General,
-            vertical: VerticalAlignment::Bottom,
-            wrap_text: false
-        }
-    );
-
-    let s = serde_json::to_string(&alignment).unwrap();
-    // defaults stringifies as an empty object
-    assert_eq!(s, "{}");
-
-    let a: Alignment = serde_json::from_str("{}").unwrap();
-
-    assert_eq!(a, alignment)
-}
--- a/base/src/test/test_workbook.rs
+++ b/base/src/test/test_workbook.rs
@@ -1,14 +1,14 @@
 #![allow(clippy::unwrap_used)]

-use crate::{test::util::new_empty_model, types::SheetProperties};
+use crate::{test::util::new_empty_model, types::SheetInfo};

 #[test]
 fn workbook_worksheets_info() {
    let model = new_empty_model();
-    let sheets_info = model.get_worksheets_properties();
+    let sheets_info = model.workbook.get_worksheets_info();
    assert_eq!(
        sheets_info[0],
-        SheetProperties {
+        SheetInfo {
            name: "Sheet1".to_string(),
            state: "visible".to_string(),
            sheet_id: 1,
--- a/base/src/test/test_worksheet.rs
+++ b/base/src/test/test_worksheet.rs
@@ -39,7 +39,7 @@ fn test_worksheet_dimension_single_cell() {
 fn test_worksheet_dimension_single_cell_set_empty() {
    let mut model = new_empty_model();
    model._set("W11", "1");
-    model.cell_clear_contents(0, 11, 23).unwrap();
+    model.set_cell_empty(0, 11, 23).unwrap();
    assert_eq!(
        model.workbook.worksheet(0).unwrap().dimension(),
        WorksheetDimension {
@@ -55,7 +55,7 @@ fn test_worksheet_dimension_single_cell_set_empty() {
 fn test_worksheet_dimension_single_cell_deleted() {
    let mut model = new_empty_model();
    model._set("W11", "1");
-    model.cell_clear_all(0, 11, 23).unwrap();
+    model.delete_cell(0, 11, 23).unwrap();
    assert_eq!(
        model.workbook.worksheet(0).unwrap().dimension(),
        WorksheetDimension {
@@ -75,7 +75,7 @@ fn test_worksheet_dimension_multiple_cells() {
    model._set("AA17", "1");
    model._set("G17", "1");
    model._set("B19", "1");
-    model.cell_clear_all(0, 11, 23).unwrap();
+    model.delete_cell(0, 11, 23).unwrap();
    assert_eq!(
        model.workbook.worksheet(0).unwrap().dimension(),
        WorksheetDimension {
--- a/base/src/test/user_model/mod.rs
+++ b/base/src/test/user_model/mod.rs
@@ -1,11 +0,0 @@
-mod test_add_delete_sheets;
-mod test_clear_cells;
-mod test_diff_queue;
-mod test_evaluation;
-mod test_general;
-mod test_rename_sheet;
-mod test_row_column;
-mod test_styles;
-mod test_to_from_bytes;
-mod test_undo_redo;
-mod test_view;
--- a/base/src/test/user_model/test_add_delete_sheets.rs
+++ b/base/src/test/user_model/test_add_delete_sheets.rs
@@ -1,84 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{constants::DEFAULT_COLUMN_WIDTH, UserModel};
-
-#[test]
-fn add_undo_redo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.new_sheet();
-    model.set_user_input(1, 1, 1, "=1 + 1").unwrap();
-    model.set_user_input(1, 1, 2, "=A1*3").unwrap();
-    model
-        .set_column_width(1, 5, 5.0 * DEFAULT_COLUMN_WIDTH)
-        .unwrap();
-    model.new_sheet();
-    model.set_user_input(2, 1, 1, "=Sheet2!B1").unwrap();
-
-    model.undo().unwrap();
-    model.undo().unwrap();
-
-    assert!(model.get_formatted_cell_value(2, 1, 1).is_err());
-
-    model.redo().unwrap();
-    model.redo().unwrap();
-
-    assert_eq!(model.get_formatted_cell_value(2, 1, 1), Ok("6".to_string()));
-
-    model.delete_sheet(1).unwrap();
-
-    assert!(!model.can_undo());
-    assert!(!model.can_redo());
-}
-
-#[test]
-fn set_sheet_color() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_sheet_color(0, "#343434").unwrap();
-    let worksheets_properties = model.get_worksheets_properties();
-    assert_eq!(worksheets_properties.len(), 1);
-    assert_eq!(worksheets_properties[0].color, Some("#343434".to_owned()));
-    model.undo().unwrap();
-    assert_eq!(model.get_worksheets_properties()[0].color, None);
-
-    model.redo().unwrap();
-    assert_eq!(
-        model.get_worksheets_properties()[0].color,
-        Some("#343434".to_owned())
-    );
-    // changes the color if there is one
-    model.set_sheet_color(0, "#2534FF").unwrap();
-    assert_eq!(
-        model.get_worksheets_properties()[0].color,
-        Some("#2534FF".to_owned())
-    );
-    // Setting it back to none
-    model.set_sheet_color(0, "").unwrap();
-    assert_eq!(model.get_worksheets_properties()[0].color, None);
-}
-
-#[test]
-fn new_sheet_propagates() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.new_sheet();
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-    let worksheets_properties = model2.get_worksheets_properties();
-    assert_eq!(worksheets_properties.len(), 2);
-}
-
-#[test]
-fn delete_sheet_propagates() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.new_sheet();
-    model.delete_sheet(0).unwrap();
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-    let sheets_info = model2.get_worksheets_properties();
-    assert_eq!(sheets_info.len(), 1);
-}
--- a/base/src/test/user_model/test_clear_cells.rs
+++ b/base/src/test/user_model/test_clear_cells.rs
@@ -1,91 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{expressions::types::Area, UserModel};
-
-#[test]
-fn basic() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "100$").unwrap();
-    model
-        .range_clear_contents(&Area {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            width: 1,
-            height: 1,
-        })
-        .unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-    model.undo().unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 1),
-        Ok("100$".to_string())
-    );
-    model.redo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-
-    model.set_user_input(0, 1, 1, "300").unwrap();
-    // clear contents keeps the formatting
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 1),
-        Ok("300$".to_string())
-    );
-
-    model
-        .range_clear_all(&Area {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            width: 1,
-            height: 1,
-        })
-        .unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-    model.undo().unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 1),
-        Ok("300$".to_string())
-    );
-    model.redo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-    model.set_user_input(0, 1, 1, "400").unwrap();
-    // clear contents keeps the formatting
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 1),
-        Ok("400".to_string())
-    );
-}
-
-#[test]
-fn clear_empty_cell() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model
-        .range_clear_contents(&Area {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            width: 1,
-            height: 1,
-        })
-        .unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-    model.undo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-}
-
-#[test]
-fn clear_all_empty_cell() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model
-        .range_clear_all(&Area {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            width: 1,
-            height: 1,
-        })
-        .unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-    model.undo().unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-}
--- a/base/src/test/user_model/test_diff_queue.rs
+++ b/base/src/test/user_model/test_diff_queue.rs
@@ -1,161 +0,0 @@
-use crate::{
-    constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT},
-    test::util::new_empty_model,
-    UserModel,
-};
-
-#[test]
-fn send_queue() {
-    let mut model1 = UserModel::from_model(new_empty_model());
-    let width = model1.get_column_width(0, 3).unwrap() * 3.0;
-    model1.set_column_width(0, 3, width).unwrap();
-    model1.set_user_input(0, 1, 2, "Hello IronCalc!").unwrap();
-    let send_queue = model1.flush_send_queue();
-
-    let mut model2 = UserModel::from_model(new_empty_model());
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    assert_eq!(model2.get_column_width(0, 3), Ok(width));
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 1, 2),
-        Ok("Hello IronCalc!".to_string())
-    );
-}
-
-#[test]
-fn apply_external_diffs_wrong_str() {
-    let mut model1 = UserModel::from_model(new_empty_model());
-    assert!(model1.apply_external_diffs("invalid".as_bytes()).is_err());
-}
-
-#[test]
-fn queue_undo_redo() {
-    let mut model1 = UserModel::from_model(new_empty_model());
-    let width = model1.get_column_width(0, 3).unwrap() * 3.0;
-    model1.set_column_width(0, 3, width).unwrap();
-    model1.set_user_input(0, 1, 2, "Hello IronCalc!").unwrap();
-    assert!(model1.undo().is_ok());
-    assert!(model1.redo().is_ok());
-    let send_queue = model1.flush_send_queue();
-
-    let mut model2 = UserModel::from_model(new_empty_model());
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    assert_eq!(model2.get_column_width(0, 3), Ok(width));
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 1, 2),
-        Ok("Hello IronCalc!".to_string())
-    );
-}
-
-#[test]
-fn queue_undo_redo_multiple() {
-    let mut model1 = UserModel::from_model(new_empty_model());
-
-    // do a bunch of things
-    model1.set_frozen_columns_count(0, 5).unwrap();
-    model1.set_frozen_rows_count(0, 6).unwrap();
-    model1.set_column_width(0, 7, 300.0).unwrap();
-    model1.set_row_height(0, 23, 123.0).unwrap();
-    model1.set_user_input(0, 55, 55, "=42+8").unwrap();
-
-    for row in 1..5 {
-        model1.set_user_input(0, row, 17, "=ROW()").unwrap();
-    }
-
-    model1.insert_row(0, 3).unwrap();
-    model1.insert_row(0, 3).unwrap();
-
-    // undo al of them
-    while model1.can_undo() {
-        model1.undo().unwrap();
-    }
-
-    // check it is an empty model
-    assert_eq!(model1.get_frozen_columns_count(0), Ok(0));
-    assert_eq!(model1.get_frozen_rows_count(0), Ok(0));
-    assert_eq!(model1.get_column_width(0, 7), Ok(DEFAULT_COLUMN_WIDTH));
-    assert_eq!(
-        model1.get_formatted_cell_value(0, 55, 55),
-        Ok("".to_string())
-    );
-    assert_eq!(model1.get_row_height(0, 23), Ok(DEFAULT_ROW_HEIGHT));
-    assert_eq!(
-        model1.get_formatted_cell_value(0, 57, 55),
-        Ok("".to_string())
-    );
-    assert_eq!(model1.get_row_height(0, 25), Ok(DEFAULT_ROW_HEIGHT));
-
-    // redo all of them
-    while model1.can_redo() {
-        model1.redo().unwrap();
-    }
-
-    // now send all this to a new model
-    let send_queue = model1.flush_send_queue();
-    let mut model2 = UserModel::from_model(new_empty_model());
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    // Check everything is as expected
-    assert_eq!(model2.get_frozen_columns_count(0), Ok(5));
-    assert_eq!(model2.get_frozen_rows_count(0), Ok(6));
-    assert_eq!(model2.get_column_width(0, 7), Ok(300.0));
-    // I inserted two rows
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 57, 55),
-        Ok("50".to_string())
-    );
-    assert_eq!(model2.get_row_height(0, 25), Ok(123.0));
-
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 1, 17),
-        Ok("1".to_string())
-    );
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 2, 17),
-        Ok("2".to_string())
-    );
-
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 3, 17),
-        Ok("".to_string())
-    );
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 4, 17),
-        Ok("".to_string())
-    );
-
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 5, 17),
-        Ok("5".to_string())
-    );
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 6, 17),
-        Ok("6".to_string())
-    );
-}
-
-#[test]
-fn new_sheet() {
-    let mut model1 = UserModel::from_model(new_empty_model());
-    model1.new_sheet();
-    model1.set_user_input(0, 1, 1, "42").unwrap();
-    model1.set_user_input(1, 1, 1, "=Sheet1!A1*2").unwrap();
-
-    let send_queue = model1.flush_send_queue();
-    let mut model2 = UserModel::from_model(new_empty_model());
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    assert_eq!(
-        model2.get_formatted_cell_value(1, 1, 1),
-        Ok("84".to_string())
-    );
-}
-
-#[test]
-fn wrong_diffs_handled() {
-    let mut model = UserModel::from_model(new_empty_model());
-    assert!(model
-        .apply_external_diffs("Hello world".as_bytes())
-        .is_err());
-}
--- a/base/src/test/user_model/test_evaluation.rs
+++ b/base/src/test/user_model/test_evaluation.rs
@@ -1,31 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::UserModel;
-
-#[test]
-fn model_evaluates_automatically() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "=1 + 1").unwrap();
-
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("2".to_string()));
-    assert_eq!(model.get_cell_content(0, 1, 1), Ok("=1+1".to_string()));
-}
-
-#[test]
-fn pause_resume_evaluation() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.pause_evaluation();
-    model.set_user_input(0, 1, 1, "=1+1").unwrap();
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 1),
-        Ok("#ERROR!".to_string())
-    );
-    model.evaluate();
-
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("2".to_string()));
-    assert_eq!(model.get_cell_content(0, 1, 1), Ok("=1+1".to_string()));
-
-    model.resume_evaluation();
-    model.set_user_input(0, 2, 1, "=1+4").unwrap();
-    assert_eq!(model.get_formatted_cell_value(0, 2, 1), Ok("5".to_string()));
-}
--- a/base/src/test/user_model/test_general.rs
+++ b/base/src/test/user_model/test_general.rs
@@ -1,131 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::constants::{LAST_COLUMN, LAST_ROW};
-use crate::test::util::new_empty_model;
-use crate::types::CellType;
-use crate::UserModel;
-
-#[test]
-fn set_user_input_errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // Wrong sheet
-    assert!(model.set_user_input(1, 1, 1, "1").is_err());
-    // Wrong row
-    assert!(model.set_user_input(0, 0, 1, "1").is_err());
-    // Wrong column
-    assert!(model.set_user_input(0, 1, 0, "1").is_err());
-    // row too large
-    assert!(model.set_user_input(0, LAST_ROW, 1, "1").is_ok());
-    assert!(model.set_user_input(0, LAST_ROW + 1, 1, "1").is_err());
-    // column too large
-    assert!(model.set_user_input(0, 1, LAST_COLUMN, "1").is_ok());
-    assert!(model.set_user_input(0, 1, LAST_COLUMN + 1, "1").is_err());
-}
-
-#[test]
-fn user_model_debug_message() {
-    let model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let s = &format!("{:?}", model);
-    assert_eq!(s, "UserModel");
-}
-
-#[test]
-fn cell_type() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.set_user_input(0, 1, 1, "1").unwrap();
-    model.set_user_input(0, 1, 2, "Wish you were here").unwrap();
-    model.set_user_input(0, 1, 3, "true").unwrap();
-    model.set_user_input(0, 1, 4, "=1/0").unwrap();
-
-    assert_eq!(model.get_cell_type(0, 1, 1).unwrap(), CellType::Number);
-    assert_eq!(model.get_cell_type(0, 1, 2).unwrap(), CellType::Text);
-    assert_eq!(
-        model.get_cell_type(0, 1, 3).unwrap(),
-        CellType::LogicalValue
-    );
-    assert_eq!(model.get_cell_type(0, 1, 4).unwrap(), CellType::ErrorValue);
-
-    // empty cells are number type
-    assert_eq!(model.get_cell_type(0, 40, 40).unwrap(), CellType::Number);
-}
-
-#[test]
-fn insert_remove_rows() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let height = model.get_row_height(0, 5).unwrap();
-
-    // Insert some data in row 5 (and change the style)
-    assert!(model.set_user_input(0, 5, 1, "100$").is_ok());
-    // Change the height of the column
-    assert!(model.set_row_height(0, 5, 3.0 * height).is_ok());
-
-    // remove the row
-    assert!(model.delete_row(0, 5).is_ok());
-    // Row 5 has now the normal height
-    assert_eq!(model.get_row_height(0, 5), Ok(height));
-    // There is no value in A5
-    assert_eq!(model.get_formatted_cell_value(0, 5, 1), Ok("".to_string()));
-    // Setting a value will not format it
-    assert!(model.set_user_input(0, 5, 1, "125").is_ok());
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 1),
-        Ok("125".to_string())
-    );
-
-    // undo twice
-    assert!(model.undo().is_ok());
-    assert!(model.undo().is_ok());
-
-    assert_eq!(model.get_row_height(0, 5), Ok(3.0 * height));
-    assert_eq!(
-        model.get_formatted_cell_value(0, 5, 1),
-        Ok("100$".to_string())
-    );
-}
-
-#[test]
-fn insert_remove_columns() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // column E
-    let column_width = model.get_column_width(0, 5).unwrap();
-    println!("{column_width}");
-
-    // Insert some data in row 5 (and change the style) in E1
-    assert!(model.set_user_input(0, 1, 5, "100$").is_ok());
-    // Change the width of the column
-    assert!(model.set_column_width(0, 5, 3.0 * column_width).is_ok());
-    assert_eq!(model.get_column_width(0, 5).unwrap(), 3.0 * column_width);
-
-    // remove the column
-    assert!(model.delete_column(0, 5).is_ok());
-    // Column 5 has now the normal width
-    assert_eq!(model.get_column_width(0, 5), Ok(column_width));
-    // There is no value in E5
-    assert_eq!(model.get_formatted_cell_value(0, 1, 5), Ok("".to_string()));
-    // Setting a value will not format it
-    assert!(model.set_user_input(0, 1, 5, "125").is_ok());
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 5),
-        Ok("125".to_string())
-    );
-
-    // undo twice (set_user_input and delete_column)
-    assert!(model.undo().is_ok());
-    assert!(model.undo().is_ok());
-
-    assert_eq!(model.get_column_width(0, 5), Ok(3.0 * column_width));
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 5),
-        Ok("100$".to_string())
-    );
-}
-
-#[test]
-fn delete_remove_cell() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let (sheet, row, column) = (0, 1, 1);
-    model.set_user_input(sheet, row, column, "100$").unwrap();
-}
--- a/base/src/test/user_model/test_rename_sheet.rs
+++ b/base/src/test/user_model/test_rename_sheet.rs
@@ -1,39 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::UserModel;
-
-#[test]
-fn basic_rename() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.rename_sheet(0, "NewSheet").unwrap();
-    assert_eq!(model.get_worksheets_properties()[0].name, "NewSheet");
-}
-
-#[test]
-fn undo_redo() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model.rename_sheet(0, "NewSheet").unwrap();
-    model.undo().unwrap();
-    assert_eq!(model.get_worksheets_properties()[0].name, "Sheet1");
-    model.redo().unwrap();
-    assert_eq!(model.get_worksheets_properties()[0].name, "NewSheet");
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-    assert_eq!(model.get_worksheets_properties()[0].name, "NewSheet");
-}
-
-#[test]
-fn errors() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    assert_eq!(
-        model.rename_sheet(0, ""),
-        Err("Invalid name for a sheet: ''.".to_string())
-    );
-    assert_eq!(
-        model.rename_sheet(1, "Hello"),
-        Err("Invalid sheet index".to_string())
-    );
-}
--- a/base/src/test/user_model/test_row_column.rs
+++ b/base/src/test/user_model/test_row_column.rs
@@ -1,156 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    constants::{DEFAULT_COLUMN_WIDTH, DEFAULT_ROW_HEIGHT, LAST_COLUMN},
-    test::util::new_empty_model,
-    UserModel,
-};
-
-#[test]
-fn simple_insert_row() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let (sheet, column) = (0, 5);
-    for row in 1..5 {
-        assert!(model.set_user_input(sheet, row, column, "123").is_ok());
-    }
-    assert!(model.insert_row(sheet, 3).is_ok());
-    assert_eq!(
-        model.get_formatted_cell_value(sheet, 3, column).unwrap(),
-        ""
-    );
-
-    assert!(model.undo().is_ok());
-    assert_eq!(
-        model.get_formatted_cell_value(sheet, 3, column).unwrap(),
-        "123"
-    );
-    assert!(model.redo().is_ok());
-    assert_eq!(
-        model.get_formatted_cell_value(sheet, 3, column).unwrap(),
-        ""
-    );
-}
-
-#[test]
-fn simple_insert_column() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    let (sheet, row) = (0, 5);
-    for column in 1..5 {
-        assert!(model.set_user_input(sheet, row, column, "123").is_ok());
-    }
-    assert!(model.insert_column(sheet, 3).is_ok());
-    assert_eq!(model.get_formatted_cell_value(sheet, row, 3).unwrap(), "");
-
-    assert!(model.undo().is_ok());
-    assert_eq!(
-        model.get_formatted_cell_value(sheet, row, 3).unwrap(),
-        "123"
-    );
-    assert!(model.redo().is_ok());
-    assert_eq!(model.get_formatted_cell_value(sheet, row, 3).unwrap(), "");
-}
-
-#[test]
-fn simple_delete_column() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 1, 5, "3").unwrap();
-    model.set_user_input(0, 2, 5, "=E1*2").unwrap();
-    model
-        .set_column_width(0, 5, DEFAULT_COLUMN_WIDTH * 3.0)
-        .unwrap();
-
-    model.delete_column(0, 5).unwrap();
-
-    assert_eq!(model.get_formatted_cell_value(0, 2, 5), Ok("".to_string()));
-    assert_eq!(model.get_column_width(0, 5), Ok(DEFAULT_COLUMN_WIDTH));
-
-    model.undo().unwrap();
-
-    assert_eq!(model.get_formatted_cell_value(0, 2, 5), Ok("6".to_string()));
-    assert_eq!(model.get_column_width(0, 5), Ok(DEFAULT_COLUMN_WIDTH * 3.0));
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 2, 5),
-        Ok("6".to_string())
-    );
-    assert_eq!(
-        model2.get_column_width(0, 5),
-        Ok(DEFAULT_COLUMN_WIDTH * 3.0)
-    );
-}
-
-#[test]
-fn delete_column_errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(
-        model.delete_column(1, 1),
-        Err("Invalid sheet index".to_string())
-    );
-
-    assert_eq!(
-        model.delete_column(0, 0),
-        Err("Column number '0' is not valid.".to_string())
-    );
-    assert_eq!(
-        model.delete_column(0, LAST_COLUMN + 1),
-        Err("Column number '16385' is not valid.".to_string())
-    );
-
-    assert_eq!(model.delete_column(0, LAST_COLUMN), Ok(()));
-}
-
-#[test]
-fn simple_delete_row() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 15, 4, "3").unwrap();
-    model.set_user_input(0, 15, 6, "=D15*2").unwrap();
-
-    model
-        .set_row_height(0, 15, DEFAULT_ROW_HEIGHT * 3.0)
-        .unwrap();
-
-    model.delete_row(0, 15).unwrap();
-
-    assert_eq!(model.get_formatted_cell_value(0, 15, 6), Ok("".to_string()));
-    assert_eq!(model.get_row_height(0, 15), Ok(DEFAULT_ROW_HEIGHT));
-
-    model.undo().unwrap();
-
-    assert_eq!(
-        model.get_formatted_cell_value(0, 15, 6),
-        Ok("6".to_string())
-    );
-    assert_eq!(model.get_row_height(0, 15), Ok(DEFAULT_ROW_HEIGHT * 3.0));
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 15, 6),
-        Ok("6".to_string())
-    );
-    assert_eq!(model2.get_row_height(0, 15), Ok(DEFAULT_ROW_HEIGHT * 3.0));
-}
-
-#[test]
-fn simple_delete_row_no_style() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_user_input(0, 15, 4, "3").unwrap();
-    model.set_user_input(0, 15, 6, "=D15*2").unwrap();
-    model.delete_row(0, 15).unwrap();
-
-    assert_eq!(model.get_formatted_cell_value(0, 15, 6), Ok("".to_string()));
-}
--- a/base/src/test/user_model/test_styles.rs
+++ b/base/src/test/user_model/test_styles.rs
@@ -1,723 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{
-    expressions::types::Area,
-    types::{Alignment, BorderItem, BorderStyle, HorizontalAlignment, VerticalAlignment},
-    UserModel,
-};
-
-#[test]
-fn basic_fonts() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(!style.font.i);
-    assert!(!style.font.b);
-    assert!(!style.font.u);
-    assert!(!style.font.strike);
-    assert_eq!(style.font.color, Some("#000000".to_owned()));
-
-    // bold
-    model.update_range_style(&range, "font.b", "true").unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.b);
-
-    // italics
-    model.update_range_style(&range, "font.i", "true").unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.i);
-
-    // underline
-    model.update_range_style(&range, "font.u", "true").unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.u);
-
-    // strike
-    model
-        .update_range_style(&range, "font.strike", "true")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.strike);
-
-    // color
-    model
-        .update_range_style(&range, "font.color", "#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.font.color, Some("#F1F1F1".to_owned()));
-
-    while model.can_undo() {
-        model.undo().unwrap();
-    }
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(!style.font.i);
-    assert!(!style.font.b);
-    assert!(!style.font.u);
-    assert!(!style.font.strike);
-    assert_eq!(style.font.color, Some("#000000".to_owned()));
-
-    while model.can_redo() {
-        model.redo().unwrap();
-    }
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.i);
-    assert!(style.font.b);
-    assert!(style.font.u);
-    assert!(style.font.strike);
-    assert_eq!(style.font.color, Some("#F1F1F1".to_owned()));
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    let style = model2.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.i);
-    assert!(style.font.b);
-    assert!(style.font.u);
-    assert!(style.font.strike);
-    assert_eq!(style.font.color, Some("#F1F1F1".to_owned()));
-}
-
-#[test]
-fn font_errors() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-    assert_eq!(
-        model.update_range_style(&range, "font.b", "True"),
-        Err("Invalid value for boolean: 'True'.".to_string())
-    );
-    assert_eq!(
-        model.update_range_style(&range, "font.i", "FALSE"),
-        Err("Invalid value for boolean: 'FALSE'.".to_string())
-    );
-    assert_eq!(
-        model.update_range_style(&range, "font.bold", "true"),
-        Err("Invalid style path: 'font.bold'.".to_string())
-    );
-    assert_eq!(
-        model.update_range_style(&range, "font.strike", ""),
-        Err("Invalid value for boolean: ''.".to_string())
-    );
-    // There is no cast for booleans
-    assert_eq!(
-        model.update_range_style(&range, "font.b", "1"),
-        Err("Invalid value for boolean: '1'.".to_string())
-    );
-    // colors don't work by name
-    assert_eq!(
-        model.update_range_style(&range, "font.color", "blue"),
-        Err("Invalid color: 'blue'.".to_string())
-    );
-    // No short form
-    assert_eq!(
-        model.update_range_style(&range, "font.color", "#FFF"),
-        Err("Invalid color: '#FFF'.".to_string())
-    );
-}
-
-#[test]
-fn basic_fill() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.fill.bg_color, None);
-    assert_eq!(style.fill.fg_color, None);
-
-    // bg_color
-    model
-        .update_range_style(&range, "fill.bg_color", "#F2F2F2")
-        .unwrap();
-    model
-        .update_range_style(&range, "fill.fg_color", "#F3F4F5")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#F2F2F2".to_owned()));
-    assert_eq!(style.fill.fg_color, Some("#F3F4F5".to_owned()));
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    let style = model2.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.fill.bg_color, Some("#F2F2F2".to_owned()));
-    assert_eq!(style.fill.fg_color, Some("#F3F4F5".to_owned()));
-}
-
-#[test]
-fn fill_errors() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-    assert_eq!(
-        model.update_range_style(&range, "fill.bg_color", "#FFF"),
-        Err("Invalid color: '#FFF'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "fill.fg_color", "#FFF"),
-        Err("Invalid color: '#FFF'.".to_string())
-    );
-}
-
-#[test]
-fn basic_format() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.num_fmt, "general");
-
-    model
-        .update_range_style(&range, "num_fmt", "$#,##0.0000")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.num_fmt, "$#,##0.0000");
-
-    model.undo().unwrap();
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.num_fmt, "general");
-
-    model.redo().unwrap();
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.num_fmt, "$#,##0.0000");
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    let style = model2.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.num_fmt, "$#,##0.0000");
-}
-
-#[test]
-fn basic_borders() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    model
-        .update_range_style(&range, "border.left", "thin,#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::Thin,
-            color: Some("#F1F1F1".to_owned()),
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.left", "thin,")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::Thin,
-            color: None,
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.right", "dotted,#F1F1F2")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.right,
-        Some(BorderItem {
-            style: BorderStyle::Dotted,
-            color: Some("#F1F1F2".to_owned()),
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.top", "double,#F1F1F3")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.top,
-        Some(BorderItem {
-            style: BorderStyle::Double,
-            color: Some("#F1F1F3".to_owned()),
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.bottom", "medium,#F1F1F4")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.bottom,
-        Some(BorderItem {
-            style: BorderStyle::Medium,
-            color: Some("#F1F1F4".to_owned()),
-        })
-    );
-
-    while model.can_undo() {
-        model.undo().unwrap();
-    }
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.border.left, None);
-    assert_eq!(style.border.top, None);
-    assert_eq!(style.border.right, None);
-    assert_eq!(style.border.bottom, None);
-
-    while model.can_redo() {
-        model.redo().unwrap();
-    }
-
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::Thin,
-            color: None,
-        })
-    );
-    assert_eq!(
-        style.border.right,
-        Some(BorderItem {
-            style: BorderStyle::Dotted,
-            color: Some("#F1F1F2".to_owned()),
-        })
-    );
-    assert_eq!(
-        style.border.top,
-        Some(BorderItem {
-            style: BorderStyle::Double,
-            color: Some("#F1F1F3".to_owned()),
-        })
-    );
-    assert_eq!(
-        style.border.bottom,
-        Some(BorderItem {
-            style: BorderStyle::Medium,
-            color: Some("#F1F1F4".to_owned()),
-        })
-    );
-
-    let send_queue = model.flush_send_queue();
-
-    let mut model2 = UserModel::new_empty("model", "en", "UTC").unwrap();
-    model2.apply_external_diffs(&send_queue).unwrap();
-
-    let style = model2.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::Thin,
-            color: None,
-        })
-    );
-    assert_eq!(
-        style.border.right,
-        Some(BorderItem {
-            style: BorderStyle::Dotted,
-            color: Some("#F1F1F2".to_owned()),
-        })
-    );
-    assert_eq!(
-        style.border.top,
-        Some(BorderItem {
-            style: BorderStyle::Double,
-            color: Some("#F1F1F3".to_owned()),
-        })
-    );
-    assert_eq!(
-        style.border.bottom,
-        Some(BorderItem {
-            style: BorderStyle::Medium,
-            color: Some("#F1F1F4".to_owned()),
-        })
-    );
-}
-
-#[test]
-fn basic_alignment() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    let alignment = model.get_cell_style(0, 1, 1).unwrap().alignment;
-    assert_eq!(alignment, None);
-
-    model
-        .update_range_style(&range, "alignment.horizontal", "center")
-        .unwrap();
-    let alignment = model.get_cell_style(0, 1, 1).unwrap().alignment;
-    assert_eq!(
-        alignment,
-        Some(Alignment {
-            horizontal: HorizontalAlignment::Center,
-            vertical: VerticalAlignment::Bottom,
-            wrap_text: false
-        })
-    );
-
-    model
-        .update_range_style(&range, "alignment.horizontal", "centerContinuous")
-        .unwrap();
-    let alignment = model.get_cell_style(0, 1, 1).unwrap().alignment;
-    assert_eq!(
-        alignment,
-        Some(Alignment {
-            horizontal: HorizontalAlignment::CenterContinuous,
-            vertical: VerticalAlignment::Bottom,
-            wrap_text: false
-        })
-    );
-
-    let range = Area {
-        sheet: 0,
-        row: 2,
-        column: 2,
-        width: 1,
-        height: 1,
-    };
-
-    model
-        .update_range_style(&range, "alignment.vertical", "distributed")
-        .unwrap();
-    let alignment = model.get_cell_style(0, 2, 2).unwrap().alignment;
-    assert_eq!(
-        alignment,
-        Some(Alignment {
-            horizontal: HorizontalAlignment::General,
-            vertical: VerticalAlignment::Distributed,
-            wrap_text: false
-        })
-    );
-
-    model
-        .update_range_style(&range, "alignment.vertical", "justify")
-        .unwrap();
-    let alignment = model.get_cell_style(0, 2, 2).unwrap().alignment;
-    assert_eq!(
-        alignment,
-        Some(Alignment {
-            horizontal: HorizontalAlignment::General,
-            vertical: VerticalAlignment::Justify,
-            wrap_text: false
-        })
-    );
-
-    model.update_range_style(&range, "alignment", "").unwrap();
-    let alignment = model.get_cell_style(0, 2, 2).unwrap().alignment;
-    assert_eq!(alignment, None);
-
-    model.undo().unwrap();
-
-    let alignment = model.get_cell_style(0, 2, 2).unwrap().alignment;
-    assert_eq!(
-        alignment,
-        Some(Alignment {
-            horizontal: HorizontalAlignment::General,
-            vertical: VerticalAlignment::Justify,
-            wrap_text: false
-        })
-    );
-}
-
-#[test]
-fn alignment_errors() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    assert_eq!(
-        model.update_range_style(&range, "alignment", "some"),
-        Err("Alignment must be empty, but found: 'some'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "alignment.vertical", "justified"),
-        Err("Invalid value for vertical alignment: 'justified'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "alignment.horizontal", "unjustified"),
-        Err("Invalid value for horizontal alignment: 'unjustified'.".to_string())
-    );
-
-    model
-        .update_range_style(&range, "alignment.vertical", "justify")
-        .unwrap();
-
-    // Also fail if there is an alignment
-
-    assert_eq!(
-        model.update_range_style(&range, "alignment", "some"),
-        Err("Alignment must be empty, but found: 'some'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "alignment.vertical", "justified"),
-        Err("Invalid value for vertical alignment: 'justified'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "alignment.horizontal", "unjustified"),
-        Err("Invalid value for horizontal alignment: 'unjustified'.".to_string())
-    );
-}
-
-#[test]
-fn basic_wrap_text() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-    assert_eq!(
-        model.update_range_style(&range, "alignment.wrap_text", "T"),
-        Err("Invalid value for boolean: 'T'.".to_string())
-    );
-    model
-        .update_range_style(&range, "alignment.wrap_text", "true")
-        .unwrap();
-    let alignment = model.get_cell_style(0, 1, 1).unwrap().alignment;
-    assert_eq!(
-        alignment,
-        Some(Alignment {
-            horizontal: HorizontalAlignment::General,
-            vertical: VerticalAlignment::Bottom,
-            wrap_text: true
-        })
-    );
-    model.undo().unwrap();
-    let alignment = model.get_cell_style(0, 1, 1).unwrap().alignment;
-    assert_eq!(alignment, None);
-
-    model.redo().unwrap();
-
-    let alignment = model.get_cell_style(0, 1, 1).unwrap().alignment;
-    assert_eq!(
-        alignment,
-        Some(Alignment {
-            horizontal: HorizontalAlignment::General,
-            vertical: VerticalAlignment::Bottom,
-            wrap_text: true
-        })
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "alignment.wrap_text", "True"),
-        Err("Invalid value for boolean: 'True'.".to_string())
-    );
-}
-
-#[test]
-fn more_basic_borders() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    model
-        .update_range_style(&range, "border.left", "thick,#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::Thick,
-            color: Some("#F1F1F1".to_owned()),
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.left", "slantDashDot,#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::SlantDashDot,
-            color: Some("#F1F1F1".to_owned()),
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.left", "mediumDashDot,#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::MediumDashDot,
-            color: Some("#F1F1F1".to_owned()),
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.left", "mediumDashDotDot,#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::MediumDashDotDot,
-            color: Some("#F1F1F1".to_owned()),
-        })
-    );
-
-    model
-        .update_range_style(&range, "border.left", "mediumDashed,#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::MediumDashed,
-            color: Some("#F1F1F1".to_owned()),
-        })
-    );
-}
-
-#[test]
-fn border_errors() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    assert_eq!(
-        model.update_range_style(&range, "border.lef", "thick,#F1F1F1"),
-        Err("Invalid style path: 'border.lef'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "border.left", "thic,#F1F1F1"),
-        Err("Invalid border style: 'thic'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "border.left", "thick,#F1F1F"),
-        Err("Invalid color: '#F1F1F'.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "border.left", " "),
-        Err("Invalid border value: ' '.".to_string())
-    );
-
-    assert_eq!(
-        model.update_range_style(&range, "border.left", "thick,#F1F1F1,thin"),
-        Err("Invalid border value: 'thick,#F1F1F1,thin'.".to_string())
-    );
-}
-
-#[test]
-fn empty_removes_border() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-    model
-        .update_range_style(&range, "border.left", "mediumDashDotDot,#F1F1F1")
-        .unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(
-        style.border.left,
-        Some(BorderItem {
-            style: BorderStyle::MediumDashDotDot,
-            color: Some("#F1F1F1".to_owned()),
-        })
-    );
-
-    model.update_range_style(&range, "border.left", "").unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert_eq!(style.border.left, None);
-}
-
-#[test]
-fn false_removes_value() {
-    let mut model = UserModel::new_empty("model", "en", "UTC").unwrap();
-    let range = Area {
-        sheet: 0,
-        row: 1,
-        column: 1,
-        width: 1,
-        height: 1,
-    };
-
-    // bold
-    model.update_range_style(&range, "font.b", "true").unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(style.font.b);
-
-    model.update_range_style(&range, "font.b", "false").unwrap();
-    let style = model.get_cell_style(0, 1, 1).unwrap();
-    assert!(!style.font.b);
-}
--- a/base/src/test/user_model/test_to_from_bytes.rs
+++ b/base/src/test/user_model/test_to_from_bytes.rs
@@ -1,30 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{test::util::new_empty_model, UserModel};
-
-#[test]
-fn basic() {
-    let mut model1 = UserModel::from_model(new_empty_model());
-    let width = model1.get_column_width(0, 3).unwrap() * 3.0;
-    model1.set_column_width(0, 3, width).unwrap();
-    model1.set_user_input(0, 1, 2, "Hello IronCalc!").unwrap();
-
-    let model_bytes = model1.to_bytes();
-
-    let model2 = UserModel::from_bytes(&model_bytes).unwrap();
-
-    assert_eq!(model2.get_column_width(0, 3), Ok(width));
-    assert_eq!(
-        model2.get_formatted_cell_value(0, 1, 2),
-        Ok("Hello IronCalc!".to_string())
-    );
-}
-
-#[test]
-fn errors() {
-    let model_bytes = "Early in the morning, late in the century, Cricklewood Broadway.".as_bytes();
-    assert_eq!(
-        &UserModel::from_bytes(model_bytes).unwrap_err(),
-        "Error parsing workbook: invalid packing"
-    );
-}
--- a/base/src/test/user_model/test_undo_redo.rs
+++ b/base/src/test/user_model/test_undo_redo.rs
@@ -1,66 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use crate::{test::util::new_empty_model, UserModel};
-
-#[test]
-fn simple_undo_redo() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    // at the beginning I cannot undo or redo
-    assert!(!model.can_undo());
-    assert!(!model.can_redo());
-    assert!(model.set_user_input(0, 1, 1, "=1+2").is_ok());
-
-    // Once I enter a value I can undo but not redo
-    assert!(model.can_undo());
-    assert!(!model.can_redo());
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("3".to_string()));
-
-    // If I undo, I can't undo anymore, but I can redo
-    assert!(model.undo().is_ok());
-    assert!(!model.can_undo());
-    assert!(model.can_redo());
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("".to_string()));
-
-    // If I redo, I have the old value and formula
-    assert!(model.redo().is_ok());
-    assert_eq!(model.get_formatted_cell_value(0, 1, 1), Ok("3".to_string()));
-    assert_eq!(model.get_cell_content(0, 1, 1), Ok("=1+2".to_string()));
-    assert!(model.can_undo());
-    assert!(!model.can_redo());
-}
-
-#[test]
-fn undo_redo_respect_styles() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert!(model.set_user_input(0, 1, 1, "100").is_ok());
-    assert!(model.set_user_input(0, 1, 1, "125$").is_ok());
-    // The content of the cell is just the number 125
-    assert_eq!(model.get_cell_content(0, 1, 1), Ok("125".to_string()));
-    assert!(model.undo().is_ok());
-    // The cell has no currency number formatting
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 1),
-        Ok("100".to_string())
-    );
-    assert_eq!(model.get_cell_content(0, 1, 1), Ok("100".to_string()));
-    assert!(model.redo().is_ok());
-    // The cell has the number 125 formatted as '125$'
-    assert_eq!(
-        model.get_formatted_cell_value(0, 1, 1),
-        Ok("125$".to_string())
-    );
-    assert_eq!(model.get_cell_content(0, 1, 1), Ok("125".to_string()));
-}
-
-#[test]
-fn can_undo_can_redo() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert!(!model.can_undo());
-    assert!(!model.can_redo());
-
-    assert!(model.undo().is_ok());
-    assert!(model.redo().is_ok());
-}
--- a/base/src/test/user_model/test_view.rs
+++ b/base/src/test/user_model/test_view.rs
@@ -1,216 +0,0 @@
-#![allow(clippy::unwrap_used)]
-
-use std::collections::HashMap;
-
-use crate::{
-    constants::{LAST_COLUMN, LAST_ROW},
-    test::util::new_empty_model,
-    user_model::SelectedView,
-    UserModel,
-};
-
-#[test]
-fn initial_view() {
-    let model = new_empty_model();
-    let model = UserModel::from_model(model);
-    assert_eq!(model.get_selected_sheet(), 0);
-    assert_eq!(model.get_selected_cell(), (0, 1, 1));
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 1,
-            left_column: 1
-        }
-    );
-}
-
-#[test]
-fn set_the_cell_sets_the_range() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_selected_cell(5, 4).unwrap();
-    assert_eq!(model.get_selected_sheet(), 0);
-    assert_eq!(model.get_selected_cell(), (0, 5, 4));
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 5,
-            column: 4,
-            range: [5, 4, 5, 4],
-            top_row: 1,
-            left_column: 1
-        }
-    );
-}
-
-#[test]
-fn set_the_range_does_not_set_the_cell() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_selected_range(5, 4, 10, 6).unwrap();
-    assert_eq!(model.get_selected_sheet(), 0);
-    assert_eq!(model.get_selected_cell(), (0, 1, 1));
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [5, 4, 10, 6],
-            top_row: 1,
-            left_column: 1
-        }
-    );
-}
-
-#[test]
-fn add_new_sheet_and_back() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.new_sheet();
-    assert_eq!(model.get_selected_sheet(), 0);
-    model.set_selected_cell(5, 4).unwrap();
-    model.set_selected_sheet(1).unwrap();
-    assert_eq!(model.get_selected_cell(), (1, 1, 1));
-    model.set_selected_sheet(0).unwrap();
-    assert_eq!(model.get_selected_cell(), (0, 5, 4));
-}
-
-#[test]
-fn set_selected_cell_errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(
-        model.set_selected_cell(-5, 4),
-        Err("Invalid row: '-5'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_cell(5, -4),
-        Err("Invalid column: '-4'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(-1, 1, 1, 1),
-        Err("Invalid row: '-1'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(1, 0, 1, 1),
-        Err("Invalid column: '0'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(1, 1, LAST_ROW + 1, 1),
-        Err("Invalid row: '1048577'".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(1, 1, 1, LAST_COLUMN + 1),
-        Err("Invalid column: '16385'".to_string())
-    );
-}
-
-#[test]
-fn set_selected_cell_errors_wrong_sheet() {
-    let mut model = new_empty_model();
-    // forcefully set a wrong index
-    model.workbook.views.get_mut(&0).unwrap().sheet = 2;
-    let mut model = UserModel::from_model(model);
-    // It's returning the wrong number
-    assert_eq!(model.get_selected_sheet(), 2);
-
-    // But we can't set the selected cell anymore
-    assert_eq!(
-        model.set_selected_cell(3, 4),
-        Err("Invalid worksheet index 2".to_string())
-    );
-    assert_eq!(
-        model.set_selected_range(3, 4, 5, 6),
-        Err("Invalid worksheet index 2".to_string())
-    );
-
-    assert_eq!(
-        model.set_top_left_visible_cell(3, 4),
-        Err("Invalid worksheet index 2".to_string())
-    );
-
-    // we can fix it by setting the right cell
-    model.set_selected_sheet(0).unwrap();
-    model.set_selected_cell(3, 4).unwrap();
-}
-
-#[test]
-fn set_visible_cell() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    model.set_top_left_visible_cell(100, 12).unwrap();
-
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 100,
-            left_column: 12
-        }
-    );
-
-    let s = serde_json::to_string(&model.get_selected_view()).unwrap();
-    assert_eq!(
-        serde_json::from_str::<SelectedView>(&s).unwrap(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 100,
-            left_column: 12
-        }
-    );
-}
-
-#[test]
-fn set_visible_cell_errors() {
-    let model = new_empty_model();
-    let mut model = UserModel::from_model(model);
-    assert_eq!(
-        model.set_top_left_visible_cell(-100, 12),
-        Err("Invalid row: '-100'".to_string())
-    );
-    assert_eq!(
-        model.set_top_left_visible_cell(100, -12),
-        Err("Invalid column: '-12'".to_string())
-    );
-}
-
-#[test]
-fn errors_no_views() {
-    let mut model = new_empty_model();
-    // forcefully remove the view
-    model.workbook.views = HashMap::new();
-    // also in the sheet
-    model.workbook.worksheets[0].views = HashMap::new();
-    let mut model = UserModel::from_model(model);
-    // get methods will return defaults
-    assert_eq!(model.get_selected_sheet(), 0);
-    assert_eq!(model.get_selected_cell(), (0, 1, 1));
-    assert_eq!(
-        model.get_selected_view(),
-        SelectedView {
-            sheet: 0,
-            row: 1,
-            column: 1,
-            range: [1, 1, 1, 1],
-            top_row: 1,
-            left_column: 1
-        }
-    );
-
-    // set methods won't complain. but won't work either
-    model.set_selected_sheet(0).unwrap();
-    model.set_selected_cell(5, 6).unwrap();
-    assert_eq!(model.get_selected_cell(), (0, 1, 1));
-}
--- a/base/src/test/util.rs
+++ b/base/src/test/util.rs
@@ -32,11 +32,11 @@ impl Model {
        let cell_reference = self._parse_reference(cell);
        let column = cell_reference.column;
        let row = cell_reference.row;
-        self.get_cell_formula(cell_reference.sheet, row, column)
+        self.cell_formula(cell_reference.sheet, row, column)
            .unwrap()
    }
    pub fn _get_text_at(&self, sheet: u32, row: i32, column: i32) -> String {
-        self.get_formatted_cell_value(sheet, row, column).unwrap()
+        self.formatted_cell_value(sheet, row, column).unwrap()
    }
    pub fn _get_text(&self, cell: &str) -> String {
        let CellReferenceIndex { sheet, row, column } = self._parse_reference(cell);
--- a/base/src/types.rs
+++ b/base/src/types.rs
@@ -1,18 +1,39 @@
-use bitcode::{Decode, Encode};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fmt::Display};

 use crate::expressions::token::Error;

+// Useful for `#[serde(default = "default_as_true")]`
+fn default_as_true() -> bool {
+    true
+}
+
 fn default_as_false() -> bool {
    false
 }

+// Useful for `#[serde(skip_serializing_if = "is_true")]`
+fn is_true(b: &bool) -> bool {
+    *b
+}
+
 fn is_false(b: &bool) -> bool {
    !*b
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+fn is_zero(num: &i32) -> bool {
+    *num == 0
+}
+
+fn is_default_alignment(o: &Option<Alignment>) -> bool {
+    o.is_none() || *o == Some(Alignment::default())
+}
+
+fn hashmap_is_empty(h: &HashMap<String, Table>) -> bool {
+    h.values().len() == 0
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Metadata {
    pub application: String,
    pub app_version: String,
@@ -22,21 +43,14 @@ pub struct Metadata {
    pub last_modified: String, //"2020-11-20T16:24:35"
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct WorkbookSettings {
    pub tz: String,
    pub locale: String,
 }
-
-/// A Workbook View tracks of the selected sheet for each view
-#[derive(Encode, Decode, Debug, PartialEq, Clone)]
-pub struct WorkbookView {
-    /// The index of the currently selected sheet.
-    pub sheet: u32,
-}
-
 /// An internal representation of an IronCalc Workbook
-#[derive(Encode, Decode, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
+#[serde(deny_unknown_fields)]
 pub struct Workbook {
    pub shared_strings: Vec<String>,
    pub defined_names: Vec<DefinedName>,
@@ -45,22 +59,28 @@ pub struct Workbook {
    pub name: String,
    pub settings: WorkbookSettings,
    pub metadata: Metadata,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "hashmap_is_empty")]
    pub tables: HashMap<String, Table>,
-    pub views: HashMap<u32, WorkbookView>,
 }

 /// A defined name. The `sheet_id` is the sheet index in case the name is local
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct DefinedName {
    pub name: String,
    pub formula: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub sheet_id: Option<u32>,
 }

+// TODO: Move to worksheet.rs make frozen_rows/columns private and u32
+/// Internal representation of a worksheet Excel object
+
 /// * state:
 ///    18.18.68 ST_SheetState (Sheet Visibility Types)
 ///    hidden, veryHidden, visible
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[serde(rename_all = "lowercase")]
 pub enum SheetState {
    Visible,
    Hidden,
@@ -77,25 +97,8 @@ impl Display for SheetState {
    }
 }

-/// Represents the state of the worksheet as seen by the user. This includes
-/// details such as the currently selected cell, the visible range, and the
-/// position of the viewport.
-#[derive(Encode, Decode, Debug, PartialEq, Clone)]
-pub struct WorksheetView {
-    /// The row index of the currently selected cell.
-    pub row: i32,
-    /// The column index of the currently selected cell.
-    pub column: i32,
-    /// The selected range in the worksheet, specified as [start_row, start_column, end_row, end_column].
-    pub range: [i32; 4],
-    /// The row index of the topmost visible cell in the worksheet view.
-    pub top_row: i32,
-    /// The column index of the leftmost visible cell in the worksheet view.
-    pub left_column: i32,
-}
-
 /// Internal representation of a worksheet Excel object
-#[derive(Encode, Decode, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct Worksheet {
    pub dimension: String,
    pub cols: Vec<Col>,
@@ -105,12 +108,16 @@ pub struct Worksheet {
    pub shared_formulas: Vec<String>,
    pub sheet_id: u32,
    pub state: SheetState,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub color: Option<String>,
    pub merge_cells: Vec<String>,
    pub comments: Vec<Comment>,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "is_zero")]
    pub frozen_rows: i32,
+    #[serde(default)]
+    #[serde(skip_serializing_if = "is_zero")]
    pub frozen_columns: i32,
-    pub views: HashMap<u32, WorksheetView>,
 }

 /// Internal representation of Excel's sheet_data
@@ -118,7 +125,7 @@ pub struct Worksheet {
 pub type SheetData = HashMap<i32, HashMap<i32, Cell>>;

 // ECMA-376-1:2016 section 18.3.1.73
-#[derive(Encode, Decode, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct Row {
    /// Row index
    pub r: i32,
@@ -126,19 +133,23 @@ pub struct Row {
    pub custom_format: bool,
    pub custom_height: bool,
    pub s: i32,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub hidden: bool,
 }

 // ECMA-376-1:2016 section 18.3.1.13
-#[derive(Encode, Decode, Debug, PartialEq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Clone)]
 pub struct Col {
    // Column definitions are defined on ranges, unlike rows which store unique, per-row entries.
    /// First column affected by this record. Settings apply to column in \[min, max\] range.
    pub min: i32,
    /// Last column affected by this record. Settings apply to column in \[min, max\] range.
    pub max: i32,
+
    pub width: f64,
    pub custom_width: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub style: Option<i32>,
 }

@@ -153,55 +164,32 @@ pub enum CellType {
    CompoundData = 128,
 }

-#[derive(Encode, Decode, Debug, Clone, PartialEq)]
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+#[serde(tag = "t", deny_unknown_fields)]
 pub enum Cell {
-    EmptyCell {
-        s: i32,
-    },
-
-    BooleanCell {
-        v: bool,
-        s: i32,
-    },
-
-    NumberCell {
-        v: f64,
-        s: i32,
-    },
+    #[serde(rename = "empty")]
+    EmptyCell { s: i32 },
+    #[serde(rename = "b")]
+    BooleanCell { v: bool, s: i32 },
+    #[serde(rename = "n")]
+    NumberCell { v: f64, s: i32 },
    // Maybe we should not have this type. In Excel this is just a string
-    ErrorCell {
-        ei: Error,
-        s: i32,
-    },
+    #[serde(rename = "e")]
+    ErrorCell { ei: Error, s: i32 },
    // Always a shared string
-    SharedString {
-        si: i32,
-        s: i32,
-    },
+    #[serde(rename = "s")]
+    SharedString { si: i32, s: i32 },
    // Non evaluated Formula
-    CellFormula {
-        f: i32,
-        s: i32,
-    },
-
-    CellFormulaBoolean {
-        f: i32,
-        v: bool,
-        s: i32,
-    },
-
-    CellFormulaNumber {
-        f: i32,
-        v: f64,
-        s: i32,
-    },
+    #[serde(rename = "u")]
+    CellFormula { f: i32, s: i32 },
+    #[serde(rename = "fb")]
+    CellFormulaBoolean { f: i32, v: bool, s: i32 },
+    #[serde(rename = "fn")]
+    CellFormulaNumber { f: i32, v: f64, s: i32 },
    // always inline string
-    CellFormulaString {
-        f: i32,
-        v: String,
-        s: i32,
-    },
-
+    #[serde(rename = "str")]
+    CellFormulaString { f: i32, v: String, s: i32 },
+    #[serde(rename = "fe")]
    CellFormulaError {
        f: i32,
        ei: Error,
@@ -220,16 +208,17 @@ impl Default for Cell {
    }
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Comment {
    pub text: String,
    pub author_name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub author_id: Option<String>,
    pub cell_ref: String,
 }

 // ECMA-376-1:2016 section 18.5.1.2
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Table {
    pub name: String,
    pub display_name: String,
@@ -237,24 +226,34 @@ pub struct Table {
    pub reference: String,
    pub totals_row_count: u32,
    pub header_row_count: u32,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub header_row_dxf_id: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub data_dxf_id: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub totals_row_dxf_id: Option<u32>,
    pub columns: Vec<TableColumn>,
    pub style_info: TableStyleInfo,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub has_filters: bool,
 }

 // totals_row_label vs totals_row_function might be mutually exclusive. Use an enum?
 // the totals_row_function is an enum not String methinks
-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct TableColumn {
    pub id: u32,
    pub name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub totals_row_label: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub header_row_dxf_id: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub data_dxf_id: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub totals_row_dxf_id: Option<u32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub totals_row_function: Option<String>,
 }

@@ -272,16 +271,25 @@ impl Default for TableColumn {
    }
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Default)]
 pub struct TableStyleInfo {
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub name: Option<String>,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub show_first_column: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub show_last_column: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub show_row_stripes: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub show_column_stripes: bool,
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Styles {
    pub num_fmts: Vec<NumFmt>,
    pub fonts: Vec<Font>,
@@ -306,9 +314,8 @@ impl Default for Styles {
    }
 }

-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Style {
-    #[serde(skip_serializing_if = "Option::is_none")]
    pub alignment: Option<Alignment>,
    pub num_fmt: String,
    pub fill: Fill,
@@ -317,7 +324,7 @@ pub struct Style {
    pub quote_prefix: bool,
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct NumFmt {
    pub num_fmt_id: i32,
    pub format_code: String,
@@ -335,7 +342,7 @@ impl Default for NumFmt {
 // ST_FontScheme simple type (§18.18.33).
 // Usually major fonts are used for styles like headings,
 // and minor fonts are used for body and paragraph text.
-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "lowercase")]
 #[derive(Default)]
 pub enum FontScheme {
@@ -355,7 +362,7 @@ impl Display for FontScheme {
    }
 }

-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Font {
    #[serde(default = "default_as_false")]
    #[serde(skip_serializing_if = "is_false")]
@@ -398,7 +405,7 @@ impl Default for Font {
 }

 // TODO: Maybe use an enum for the pattern_type values here?
-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct Fill {
    pub pattern_type: String,
    #[serde(skip_serializing_if = "Option::is_none")]
@@ -417,7 +424,7 @@ impl Default for Fill {
    }
 }

-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum HorizontalAlignment {
    Center,
@@ -459,7 +466,7 @@ impl Display for HorizontalAlignment {
    }
 }

-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum VerticalAlignment {
    Bottom,
@@ -494,7 +501,7 @@ impl Display for VerticalAlignment {
 }

 // 1762
-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Default)]
 pub struct Alignment {
    #[serde(default)]
    #[serde(skip_serializing_if = "HorizontalAlignment::is_default")]
@@ -507,17 +514,29 @@ pub struct Alignment {
    pub wrap_text: bool,
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct CellStyleXfs {
    pub num_fmt_id: i32,
    pub font_id: i32,
    pub fill_id: i32,
    pub border_id: i32,
+    #[serde(default = "default_as_true")]
+    #[serde(skip_serializing_if = "is_true")]
    pub apply_number_format: bool,
+    #[serde(default = "default_as_true")]
+    #[serde(skip_serializing_if = "is_true")]
    pub apply_border: bool,
+    #[serde(default = "default_as_true")]
+    #[serde(skip_serializing_if = "is_true")]
    pub apply_alignment: bool,
+    #[serde(default = "default_as_true")]
+    #[serde(skip_serializing_if = "is_true")]
    pub apply_protection: bool,
+    #[serde(default = "default_as_true")]
+    #[serde(skip_serializing_if = "is_true")]
    pub apply_font: bool,
+    #[serde(default = "default_as_true")]
+    #[serde(skip_serializing_if = "is_true")]
    pub apply_fill: bool,
 }

@@ -538,24 +557,39 @@ impl Default for CellStyleXfs {
    }
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Default)]
 pub struct CellXfs {
    pub xf_id: i32,
    pub num_fmt_id: i32,
    pub font_id: i32,
    pub fill_id: i32,
    pub border_id: i32,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub apply_number_format: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub apply_border: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub apply_alignment: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub apply_protection: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub apply_font: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub apply_fill: bool,
+    #[serde(default = "default_as_false")]
+    #[serde(skip_serializing_if = "is_false")]
    pub quote_prefix: bool,
+    #[serde(skip_serializing_if = "is_default_alignment")]
    pub alignment: Option<Alignment>,
 }

-#[derive(Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct CellStyles {
    pub name: String,
    pub xf_id: i32,
@@ -572,7 +606,7 @@ impl Default for CellStyles {
    }
 }

-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum BorderStyle {
    Thin,
@@ -602,13 +636,13 @@ impl Display for BorderStyle {
    }
 }

-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
 pub struct BorderItem {
    pub style: BorderStyle,
    pub color: Option<String>,
 }

-#[derive(Serialize, Deserialize, Encode, Decode, Debug, PartialEq, Eq, Clone, Default)]
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone, Default)]
 pub struct Border {
    #[serde(default = "default_as_false")]
    #[serde(skip_serializing_if = "is_false")]
@@ -631,10 +665,9 @@ pub struct Border {
 /// Information need to show a sheet tab in the UI
 /// The color is serialized only if it is not Color::None
 #[derive(Serialize, Deserialize, Debug, PartialEq)]
-pub struct SheetProperties {
+pub struct SheetInfo {
    pub name: String,
    pub state: String,
    pub sheet_id: u32,
-    #[serde(skip_serializing_if = "Option::is_none")]
    pub color: Option<String>,
 }
--- a/base/src/user_model.rs
+++ b/base/src/user_model.rs
--- a/base/src/workbook.rs
+++ b/base/src/workbook.rs
@@ -27,4 +27,16 @@ impl Workbook {
            .get_mut(worksheet_index as usize)
            .ok_or_else(|| "Invalid sheet index".to_string())
    }
+
+    pub fn get_worksheets_info(&self) -> Vec<SheetInfo> {
+        self.worksheets
+            .iter()
+            .map(|worksheet| SheetInfo {
+                name: worksheet.get_name(),
+                state: worksheet.state.to_string(),
+                color: worksheet.color.clone(),
+                sheet_id: worksheet.sheet_id,
+            })
+            .collect()
+    }
 }
--- a/base/src/worksheet.rs
+++ b/base/src/worksheet.rs
@@ -42,7 +42,7 @@ impl Worksheet {
        self.sheet_data.get_mut(&row)?.get_mut(&column)
    }

-    pub(crate) fn update_cell(&mut self, row: i32, column: i32, new_cell: Cell) {
+    fn update_cell(&mut self, row: i32, column: i32, new_cell: Cell) {
        match self.sheet_data.get_mut(&row) {
            Some(column_data) => match column_data.get(&column) {
                Some(_cell) => {
@@ -68,8 +68,9 @@ impl Worksheet {
            if row.r == row_index {
                if row.custom_format {
                    return row.s;
+                } else {
+                    break;
                }
-                break;
            }
        }
        let cols = &self.cols;
@@ -105,8 +106,64 @@ impl Worksheet {
    }

    pub fn set_column_style(&mut self, column: i32, style_index: i32) -> Result<(), String> {
-        let width = constants::DEFAULT_COLUMN_WIDTH / constants::COLUMN_WIDTH_FACTOR;
-        self.set_column_width_and_style(column, width, Some(style_index))
+        let cols = &mut self.cols;
+        let col = Col {
+            min: column,
+            max: column,
+            width: constants::DEFAULT_COLUMN_WIDTH / constants::COLUMN_WIDTH_FACTOR,
+            custom_width: true,
+            style: Some(style_index),
+        };
+        let mut index = 0;
+        let mut split = false;
+        for c in cols.iter_mut() {
+            let min = c.min;
+            let max = c.max;
+            if min <= column && column <= max {
+                if min == column && max == column {
+                    c.style = Some(style_index);
+                    return Ok(());
+                } else {
+                    // We need to split the result
+                    split = true;
+                    break;
+                }
+            }
+            if column < min {
+                // We passed, we should insert at index
+                break;
+            }
+            index += 1;
+        }
+        if split {
+            let min = cols[index].min;
+            let max = cols[index].max;
+            let pre = Col {
+                min,
+                max: column - 1,
+                width: cols[index].width,
+                custom_width: cols[index].custom_width,
+                style: cols[index].style,
+            };
+            let post = Col {
+                min: column + 1,
+                max,
+                width: cols[index].width,
+                custom_width: cols[index].custom_width,
+                style: cols[index].style,
+            };
+            cols.remove(index);
+            if column != max {
+                cols.insert(index, post);
+            }
+            cols.insert(index, col);
+            if column != min {
+                cols.insert(index, pre);
+            }
+        } else {
+            cols.insert(index, col);
+        }
+        Ok(())
    }

    pub fn set_row_style(&mut self, row: i32, style_index: i32) -> Result<(), String> {
@@ -134,7 +191,7 @@ impl Worksheet {
                cell.set_style(style_index);
            }
            None => {
-                self.cell_clear_contents_with_style(row, column, style_index);
+                self.set_cell_empty_with_style(row, column, style_index);
            }
        }

@@ -166,13 +223,13 @@ impl Worksheet {
        self.update_cell(row, column, cell);
    }

-    pub fn cell_clear_contents(&mut self, row: i32, column: i32) {
+    pub fn set_cell_empty(&mut self, row: i32, column: i32) {
        let s = self.get_style(row, column);
        let cell = Cell::EmptyCell { s };
        self.update_cell(row, column, cell);
    }

-    pub fn cell_clear_contents_with_style(&mut self, row: i32, column: i32, style: i32) {
+    pub fn set_cell_empty_with_style(&mut self, row: i32, column: i32, style: i32) {
        let cell = Cell::EmptyCell { s: style };
        self.update_cell(row, column, cell);
    }
@@ -180,8 +237,7 @@ impl Worksheet {
    pub fn set_frozen_rows(&mut self, frozen_rows: i32) -> Result<(), String> {
        if frozen_rows < 0 {
            return Err("Frozen rows cannot be negative".to_string());
-        }
-        if frozen_rows >= constants::LAST_ROW {
+        } else if frozen_rows >= constants::LAST_ROW {
            return Err("Too many rows".to_string());
        }
        self.frozen_rows = frozen_rows;
@@ -191,8 +247,7 @@ impl Worksheet {
    pub fn set_frozen_columns(&mut self, frozen_columns: i32) -> Result<(), String> {
        if frozen_columns < 0 {
            return Err("Frozen columns cannot be negative".to_string());
-        }
-        if frozen_columns >= constants::LAST_COLUMN {
+        } else if frozen_columns >= constants::LAST_COLUMN {
            return Err("Too many columns".to_string());
        }
        self.frozen_columns = frozen_columns;
@@ -226,21 +281,11 @@ impl Worksheet {
        });
        Ok(())
    }
-
    /// Changes the width of a column.
    ///   * If the column does not a have a width we simply add it
    ///   * If it has, it might be part of a range and we ned to split the range.
    /// Fails if column index is outside allowed range.
    pub fn set_column_width(&mut self, column: i32, width: f64) -> Result<(), String> {
-        self.set_column_width_and_style(column, width, None)
-    }
-
-    pub(crate) fn set_column_width_and_style(
-        &mut self,
-        column: i32,
-        width: f64,
-        style: Option<i32>,
-    ) -> Result<(), String> {
        if !is_valid_column_number(column) {
            return Err(format!("Column number '{column}' is not valid."));
        }
@@ -250,7 +295,7 @@ impl Worksheet {
            max: column,
            width: width / constants::COLUMN_WIDTH_FACTOR,
            custom_width: true,
-            style,
+            style: None,
        };
        let mut index = 0;
        let mut split = false;
@@ -261,9 +306,11 @@ impl Worksheet {
                if min == column && max == column {
                    c.width = width / constants::COLUMN_WIDTH_FACTOR;
                    return Ok(());
+                } else {
+                    // We need to split the result
+                    split = true;
+                    break;
                }
-                split = true;
-                break;
            }
            if column < min {
                // We passed, we should insert at index
@@ -304,7 +351,7 @@ impl Worksheet {
    }

    /// Return the width of a column in pixels
-    pub fn get_column_width(&self, column: i32) -> Result<f64, String> {
+    pub fn column_width(&self, column: i32) -> Result<f64, String> {
        if !is_valid_column_number(column) {
            return Err(format!("Column number '{column}' is not valid."));
        }
@@ -316,8 +363,9 @@ impl Worksheet {
            if column >= min && column <= max {
                if col.custom_width {
                    return Ok(col.width * constants::COLUMN_WIDTH_FACTOR);
+                } else {
+                    break;
                }
-                break;
            }
        }
        Ok(constants::DEFAULT_COLUMN_WIDTH)
--- a/bindings/wasm/.gitignore
+++ b/bindings/wasm/.gitignore
@@ -1 +0,0 @@
-target/*
--- a/bindings/wasm/Cargo.toml
+++ b/bindings/wasm/Cargo.toml
@@ -1,23 +0,0 @@
-[package]
-name = "wasm"
-version = "0.1.3"
-authors = ["Nicolas Hatcher <nicolas@theuniverse.today>"]
-description = "IronCalc Web bindings"
-license = "MIT/Apache-2.0"
-repository = "https://github.com/ironcalc/web-bindings"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib"]
-
-[dependencies]
-# Uses `../ironcalc/base` when used locally, and uses
-# the inicated version from crates.io when published.
-# https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#multiple-locations
-ironcalc_base = { path = "../../base", version = "0.1" }
-serde = { version = "1.0", features = ["derive"] }
-wasm-bindgen = "0.2.92"
-serde-wasm-bindgen = "0.4"
-
-[dev-dependencies]
-wasm-bindgen-test = "0.3.38"
--- a/bindings/wasm/Makefile
+++ b/bindings/wasm/Makefile
@@ -1,20 +0,0 @@
-all:
-	wasm-pack build --target web --scope ironcalc --release
-	cp README.pkg.md pkg/README.md
-	tsc types.ts --target esnext --module esnext
-	python fix_types.py
-
-tests:
-	wasm-pack build --target nodejs && node tests/test.mjs
-
-lint:
-	cargo check
-	cargo fmt -- --check
-	cargo clippy --all-targets --all-features -- -D warnings
-
-clean:
-	cargo clean
-	rm -rf pkg
-	rm -f types.js
-
-.PHONY: all lint clean
--- a/bindings/wasm/README.md
+++ b/bindings/wasm/README.md
@@ -1,31 +0,0 @@
-# IronCalc Web bindings
-
-This crate is used to build the web bindings for IronCalc.
-Note that it does not contain the xlsx writer and reader, only the engine.
-
-https://www.npmjs.com/package/@ironcalc/wasm?activeTab=readme
-
-## Building
-
-```bash
-make
-```
-
-## Testing
-
-Right now this is a manual process and only carries out a smoke test:
-
-1. Build the package
-2. Run `python -m http.server`
-3. In your browser open <http://0.0.0.0:8000/test.html>
-
-## Publishing
-
-Follow the commands:
-
-```bash
-wasm-pack login
-make
-cd pkg
-npm publish --access=public
-```
--- a/bindings/wasm/README.pkg.md
+++ b/bindings/wasm/README.pkg.md
@@ -1,33 +0,0 @@
-# IronCalc Web bindings
-
-This package contains web bindings for IronCalc. Note that it does not contain the xlsx writer and reader, only the engine.
-
-
-## Usage
-
-In your project
-
-```
-npm install @ironcalc/wasm
-```
-
-And then in your TypeScript
-
-```TypeScript
-import init, { Model } from "@ironcalc/wasm";
-
-await init();
-
-function compute() {
-    const model = new Model('en', 'UTC');
-    
-    model.setUserInput(0, 1, 1, "23");
-    model.setUserInput(0, 1, 2, "=A1*3+1");
-    
-    const result = model.getFormattedCellValue(0, 1, 2);
-    
-    console.log("Result: ", result);
-}
-
-compute();
-```
--- a/bindings/wasm/fix_types.py
+++ b/bindings/wasm/fix_types.py
@@ -1,97 +0,0 @@
-# Regrettably at the time of writing there is not a perfect way to
-# generate the TypeScript types from Rust so we basically fix them manually
-# Hopefully this will suffice for our needs and one day will be automatic
-
-header = r"""
-/* tslint:disable */
-/* eslint-disable */
-""".strip()
-
-get_tokens_str = r"""
-* @returns {any}
-*/
-export function getTokens(formula: string): any;
-""".strip()
-
-get_tokens_str_types = r"""
-* @returns {MarkedToken[]}
-*/
-export function getTokens(formula: string): MarkedToken[];
-""".strip()
-
-update_style_str = r"""
-/**
-* @param {any} range
-* @param {string} style_path
-* @param {string} value
-*/
-  updateRangeStyle(range: any, style_path: string, value: string): void;
-""".strip()
-
-update_style_str_types = r"""
-/**
-* @param {Area} range
-* @param {string} style_path
-* @param {string} value
-*/
-  updateRangeStyle(range: Area, style_path: string, value: string): void;
-""".strip()
-
-properties = r"""
-/**
-* @returns {any}
-*/
-  getWorksheetsProperties(): any;
-""".strip()
-
-properties_types = r"""
-/**
-* @returns {WorksheetProperties[]}
-*/
-  getWorksheetsProperties(): WorksheetProperties[];
-""".strip()
-
-style = r"""
-* @returns {any}
-*/
-  getCellStyle(sheet: number, row: number, column: number): any;
-""".strip()
-
-style_types = r"""
-* @returns {CellStyle}
-*/
-  getCellStyle(sheet: number, row: number, column: number): CellStyle;
-""".strip()
-
-def fix_types(text):
-    text = text.replace(get_tokens_str, get_tokens_str_types)
-    text = text.replace(update_style_str, update_style_str_types)
-    text = text.replace(properties, properties_types)
-    text = text.replace(style, style_types)
-    with open("types.ts") as f:
-        types_str = f.read()
-        header_types = "{}\n\n{}".format(header, types_str)
-    text = text.replace(header, header_types)
-    return text
-    
-
-
-if __name__ == "__main__":
-    types_file = "pkg/wasm.d.ts"
-    with open(types_file) as f:
-        text = f.read()
-    text = fix_types(text)
-    with open(types_file, "wb") as f:
-        f.write(bytes(text, "utf8"))
-
-    js_file = "pkg/wasm.js"
-    with open("types.js") as f:
-        text_js = f.read()
-    with open(js_file) as f:
-        text = f.read()
-
-    with open(js_file, "wb") as f:
-        f.write(bytes("{}\n{}".format(text_js, text), "utf8"))
-    
-
-    
--- a/bindings/wasm/src/lib.rs
+++ b/bindings/wasm/src/lib.rs
@@ -1,341 +0,0 @@
-use wasm_bindgen::{
-    prelude::{wasm_bindgen, JsError},
-    JsValue,
-};
-
-use ironcalc_base::{
-    expressions::{lexer::util::get_tokens as tokenizer, types::Area},
-    types::CellType,
-    UserModel as BaseModel,
-};
-
-fn to_js_error(error: String) -> JsError {
-    JsError::new(&error.to_string())
-}
-
-/// Return an array with a list of all the tokens from a formula
-/// This is used by the UI to color them according to a theme.
-#[wasm_bindgen(js_name = "getTokens")]
-pub fn get_tokens(formula: &str) -> Result<JsValue, JsError> {
-    let tokens = tokenizer(formula);
-    serde_wasm_bindgen::to_value(&tokens).map_err(JsError::from)
-}
-#[wasm_bindgen]
-pub struct Model {
-    model: BaseModel,
-}
-
-#[wasm_bindgen]
-impl Model {
-    #[wasm_bindgen(constructor)]
-    pub fn new(locale: &str, timezone: &str) -> Result<Model, JsError> {
-        let model = BaseModel::new_empty("workbook", locale, timezone).map_err(to_js_error)?;
-        Ok(Model { model })
-    }
-
-    pub fn from_bytes(bytes: &[u8]) -> Result<Model, JsError> {
-        let model = BaseModel::from_bytes(bytes).map_err(to_js_error)?;
-        Ok(Model { model })
-    }
-
-    pub fn undo(&mut self) -> Result<(), JsError> {
-        self.model.undo().map_err(to_js_error)
-    }
-
-    pub fn redo(&mut self) -> Result<(), JsError> {
-        self.model.redo().map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "canUndo")]
-    pub fn can_undo(&self) -> bool {
-        self.model.can_undo()
-    }
-
-    #[wasm_bindgen(js_name = "canRedo")]
-    pub fn can_redo(&self) -> bool {
-        self.model.can_redo()
-    }
-
-    #[wasm_bindgen(js_name = "pauseEvaluation")]
-    pub fn pause_evaluation(&mut self) {
-        self.model.pause_evaluation()
-    }
-
-    #[wasm_bindgen(js_name = "resumeEvaluation")]
-    pub fn resume_evaluation(&mut self) {
-        self.model.resume_evaluation()
-    }
-
-    pub fn evaluate(&mut self) {
-        self.model.evaluate();
-    }
-
-    #[wasm_bindgen(js_name = "flushSendQueue")]
-    pub fn flush_send_queue(&mut self) -> Vec<u8> {
-        self.model.flush_send_queue()
-    }
-
-    #[wasm_bindgen(js_name = "applyExternalDiffs")]
-    pub fn apply_external_diffs(&mut self, diffs: &[u8]) -> Result<(), JsError> {
-        self.model.apply_external_diffs(diffs).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "getCellContent")]
-    pub fn get_cell_content(&self, sheet: u32, row: i32, column: i32) -> Result<String, JsError> {
-        self.model
-            .get_cell_content(sheet, row, column)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "newSheet")]
-    pub fn new_sheet(&mut self) {
-        self.model.new_sheet()
-    }
-
-    #[wasm_bindgen(js_name = "deleteSheet")]
-    pub fn delete_sheet(&mut self, sheet: u32) -> Result<(), JsError> {
-        self.model.delete_sheet(sheet).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "renameSheet")]
-    pub fn rename_sheet(&mut self, sheet: u32, name: &str) -> Result<(), JsError> {
-        self.model.rename_sheet(sheet, name).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "rangeClearAll")]
-    pub fn range_clear_all(
-        &mut self,
-        sheet: u32,
-        start_row: i32,
-        start_column: i32,
-        end_row: i32,
-        end_column: i32,
-    ) -> Result<(), JsError> {
-        let range = Area {
-            sheet,
-            row: start_row,
-            column: start_column,
-            width: end_column - start_column + 1,
-            height: end_row - start_row + 1,
-        };
-        self.model.range_clear_all(&range).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "rangeClearContents")]
-    pub fn range_clear_contents(
-        &mut self,
-        sheet: u32,
-        start_row: i32,
-        start_column: i32,
-        end_row: i32,
-        end_column: i32,
-    ) -> Result<(), JsError> {
-        let range = Area {
-            sheet,
-            row: start_row,
-            column: start_column,
-            width: end_column - start_column + 1,
-            height: end_row - start_row + 1,
-        };
-        self.model.range_clear_contents(&range).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "insertRow")]
-    pub fn insert_row(&mut self, sheet: u32, row: i32) -> Result<(), JsError> {
-        self.model.insert_row(sheet, row).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "insertColumn")]
-    pub fn insert_column(&mut self, sheet: u32, column: i32) -> Result<(), JsError> {
-        self.model.insert_column(sheet, column).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "deleteRow")]
-    pub fn delete_row(&mut self, sheet: u32, row: i32) -> Result<(), JsError> {
-        self.model.delete_row(sheet, row).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "deleteColumn")]
-    pub fn delete_column(&mut self, sheet: u32, column: i32) -> Result<(), JsError> {
-        self.model.delete_column(sheet, column).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setRowHeight")]
-    pub fn set_row_height(&mut self, sheet: u32, row: i32, height: f64) -> Result<(), JsError> {
-        self.model
-            .set_row_height(sheet, row, height)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setColumnWidth")]
-    pub fn set_column_width(&mut self, sheet: u32, column: i32, width: f64) -> Result<(), JsError> {
-        self.model
-            .set_column_width(sheet, column, width)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "getRowHeight")]
-    pub fn get_row_height(&mut self, sheet: u32, row: i32) -> Result<f64, JsError> {
-        self.model.get_row_height(sheet, row).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "getColumnWidth")]
-    pub fn get_column_width(&mut self, sheet: u32, column: i32) -> Result<f64, JsError> {
-        self.model
-            .get_column_width(sheet, column)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setUserInput")]
-    pub fn set_user_input(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-        input: &str,
-    ) -> Result<(), JsError> {
-        self.model
-            .set_user_input(sheet, row, column, input)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "getFormattedCellValue")]
-    pub fn get_formatted_cell_value(
-        &self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-    ) -> Result<String, JsError> {
-        self.model
-            .get_formatted_cell_value(sheet, row, column)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "getFrozenRowsCount")]
-    pub fn get_frozen_rows_count(&self, sheet: u32) -> Result<i32, JsError> {
-        self.model.get_frozen_rows_count(sheet).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "getFrozenColumnsCount")]
-    pub fn get_frozen_columns_count(&self, sheet: u32) -> Result<i32, JsError> {
-        self.model
-            .get_frozen_columns_count(sheet)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setFrozenRowsCount")]
-    pub fn set_frozen_rows_count(&mut self, sheet: u32, count: i32) -> Result<(), JsError> {
-        self.model
-            .set_frozen_rows_count(sheet, count)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setFrozenColumnsCount")]
-    pub fn set_frozen_columns_count(&mut self, sheet: u32, count: i32) -> Result<(), JsError> {
-        self.model
-            .set_frozen_columns_count(sheet, count)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "updateRangeStyle")]
-    pub fn update_range_style(
-        &mut self,
-        range: JsValue,
-        style_path: &str,
-        value: &str,
-    ) -> Result<(), JsError> {
-        let range: Area =
-            serde_wasm_bindgen::from_value(range).map_err(|e| to_js_error(e.to_string()))?;
-        self.model
-            .update_range_style(&range, style_path, value)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "getCellStyle")]
-    pub fn get_cell_style(
-        &mut self,
-        sheet: u32,
-        row: i32,
-        column: i32,
-    ) -> Result<JsValue, JsError> {
-        self.model
-            .get_cell_style(sheet, row, column)
-            .map_err(to_js_error)
-            .map(|x| serde_wasm_bindgen::to_value(&x).unwrap())
-    }
-
-    #[wasm_bindgen(js_name = "getCellType")]
-    pub fn get_cell_type(&self, sheet: u32, row: i32, column: i32) -> Result<i32, JsError> {
-        Ok(
-            match self
-                .model
-                .get_cell_type(sheet, row, column)
-                .map_err(to_js_error)?
-            {
-                CellType::Number => 1,
-                CellType::Text => 2,
-                CellType::LogicalValue => 4,
-                CellType::ErrorValue => 16,
-                CellType::Array => 64,
-                CellType::CompoundData => 128,
-            },
-        )
-    }
-
-    #[wasm_bindgen(js_name = "getWorksheetsProperties")]
-    pub fn get_worksheets_properties(&self) -> JsValue {
-        serde_wasm_bindgen::to_value(&self.model.get_worksheets_properties()).unwrap()
-    }
-
-    #[wasm_bindgen(js_name = "getSelectedSheet")]
-    pub fn get_selected_sheet(&self) -> u32 {
-        self.model.get_selected_sheet()
-    }
-
-    #[wasm_bindgen(js_name = "getSelectedCell")]
-    pub fn get_selected_cell(&self) -> Vec<i32> {
-        let (sheet, row, column) = self.model.get_selected_cell();
-        vec![sheet as i32, row, column]
-    }
-
-    #[wasm_bindgen(js_name = "getSelectedView")]
-    pub fn get_selected_view(&self) -> JsValue {
-        serde_wasm_bindgen::to_value(&self.model.get_selected_view()).unwrap()
-    }
-
-    #[wasm_bindgen(js_name = "setSelectedSheet")]
-    pub fn set_selected_sheet(&mut self, sheet: u32) -> Result<(), JsError> {
-        self.model.set_selected_sheet(sheet).map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setSelectedCell")]
-    pub fn set_selected_cell(&mut self, row: i32, column: i32) -> Result<(), JsError> {
-        self.model
-            .set_selected_cell(row, column)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setSelectedRange")]
-    pub fn set_selected_range(
-        &mut self,
-        start_row: i32,
-        start_column: i32,
-        end_row: i32,
-        end_column: i32,
-    ) -> Result<(), JsError> {
-        self.model
-            .set_selected_range(start_row, start_column, end_row, end_column)
-            .map_err(to_js_error)
-    }
-
-    #[wasm_bindgen(js_name = "setTopLeftVisibleCell")]
-    pub fn set_top_left_visible_cell(
-        &mut self,
-        top_row: i32,
-        top_column: i32,
-    ) -> Result<(), JsError> {
-        self.model
-            .set_top_left_visible_cell(top_row, top_column)
-            .map_err(to_js_error)
-    }
-}
--- a/bindings/wasm/test.html
+++ b/bindings/wasm/test.html
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Test IronCalc Web Bindings</title>
-    <script type="module">
-        import init, { Model } from "./pkg/wasm.js";
-
-        await init();
-
-        function test() {
-            const model = new Model('en', 'UTC');
-            model.setUserInput(0, 1, 1, "23");
-            model.setUserInput(0, 1, 2, "=A1*3+1");
-            
-            const result = model.getFormattedCellValue(0, 1, 2);
-            console.assert(result === "70");
-            console.log("Hoooray! Tests passed");
-        }
-
-        test();
-    </script>
-</head>
-<body>
-    <div>Please have a look at the console</div>
-</body>
-</html>
--- a/bindings/wasm/tests/test.mjs
+++ b/bindings/wasm/tests/test.mjs
@@ -1,123 +0,0 @@
-import test from 'node:test';
-import assert from 'node:assert'
-import { Model } from "../pkg/wasm.js";
-
-test('Frozen rows and columns', () => {
-    let model = new Model('en', 'UTC');
-    assert.strictEqual(model.getFrozenRowsCount(0), 0);
-    assert.strictEqual(model.getFrozenColumnsCount(0), 0);
-
-    model.setFrozenColumnsCount(0, 4);
-    model.setFrozenRowsCount(0, 3)
-
-    assert.strictEqual(model.getFrozenRowsCount(0), 3);
-    assert.strictEqual(model.getFrozenColumnsCount(0), 4);
-});
-
-test('Row height', () => {
-    let model = new Model('en', 'UTC');
-    assert.strictEqual(model.getRowHeight(0, 3), 21);
-
-    model.setRowHeight(0, 3, 32);
-    assert.strictEqual(model.getRowHeight(0, 3), 32);
-
-    model.undo();
-    assert.strictEqual(model.getRowHeight(0, 3), 21);
-
-    model.redo();
-    assert.strictEqual(model.getRowHeight(0, 3), 32);
-
-    model.setRowHeight(0, 3, 320);
-    assert.strictEqual(model.getRowHeight(0, 3), 320);
-});
-
-test('Evaluates correctly', (t) => {
-    const model = new Model('en', 'UTC');
-    model.setUserInput(0, 1, 1, "23");
-    model.setUserInput(0, 1, 2, "=A1*3+1");
-
-    const result = model.getFormattedCellValue(0, 1, 2);
-    assert.strictEqual(result, "70");
-});
-
-test('Styles work', () => {
-    const model = new Model('en', 'UTC');
-    let style = model.getCellStyle(0, 1, 1);
-    assert.deepEqual(style, {
-        num_fmt: 'general',
-        fill: { pattern_type: 'none' },
-        font: {
-            sz: 11,
-            color: '#000000',
-            name: 'Calibri',
-            family: 2,
-            scheme: 'minor'
-        },
-        border: {},
-        quote_prefix: false
-    });
-    model.setUserInput(0, 1, 1, "'=1+1");
-    style = model.getCellStyle(0, 1, 1);
-    assert.deepEqual(style, {
-        num_fmt: 'general',
-        fill: { pattern_type: 'none' },
-        font: {
-            sz: 11,
-            color: '#000000',
-            name: 'Calibri',
-            family: 2,
-            scheme: 'minor'
-        },
-        border: {},
-        quote_prefix: true
-    });
-});
-
-test("Add sheets", (t) => {
-    const model = new Model('en', 'UTC');
-    model.newSheet();
-    model.renameSheet(1, "NewName");
-    let props = model.getWorksheetsProperties();
-    assert.deepEqual(props, [{
-        name: 'Sheet1',
-        sheet_id: 1,
-        state: 'visible'
-    },
-    {
-        name: 'NewName',
-        sheet_id: 2,
-        state: 'visible'
-    }
-    ]);
-});
-
-test("invalid sheet index throws an exception", () => {
-    const model = new Model('en', 'UTC');
-    assert.throws(() => {
-        model.setRowHeight(1, 1, 100);
-    }, {
-        name: 'Error',
-        message: 'Invalid sheet index',
-    });
-});
-
-test("invalid column throws an exception", () => {
-    const model = new Model('en', 'UTC');
-    assert.throws(() => {
-        model.setRowHeight(0, -1, 100);
-    }, {
-        name: 'Error',
-        message: "Row number '-1' is not valid.",
-    });
-});
-
-test("floating column numbers get truncated", () => {
-    const model = new Model('en', 'UTC');
-    model.setRowHeight(0.8, 5.2, 100.5);
-
-    assert.strictEqual(model.getRowHeight(0.11, 5.99), 100.5);
-    assert.strictEqual(model.getRowHeight(0, 5), 100.5);
-});
-
-
-
--- a/bindings/wasm/types.ts
+++ b/bindings/wasm/types.ts
@@ -1,194 +0,0 @@
-export interface Area {
-  sheet: number;
-  row: number;
-  column: number;
-  width: number;
-  height: number;
-}
-
-type ErrorType =
-  | "REF"
-  | "NAME"
-  | "VALUE"
-  | "DIV"
-  | "NA"
-  | "NUM"
-  | "ERROR"
-  | "NIMPL"
-  | "SPILL"
-  | "CALC"
-  | "CIRC";
-
-type OpCompareType =
-  | "LessThan"
-  | "GreaterThan"
-  | "Equal"
-  | "LessOrEqualThan"
-  | "GreaterOrEqualThan"
-  | "NonEqual";
-
-type OpSumType = "Add" | "Minus";
-
-type OpProductType = "Times" | "Divide";
-
-interface ReferenceType {
-  sheet: string | null;
-  row: number;
-  column: number;
-  absolute_column: boolean;
-  absolute_row: boolean;
-}
-
-interface ParsedReferenceType {
-  column: number;
-  row: number;
-  absolute_column: boolean;
-  absolute_row: boolean;
-}
-
-interface Reference {
-  Reference: ReferenceType;
-}
-
-interface Range {
-  Range: {
-    sheet: string | null;
-    left: ParsedReferenceType;
-    right: ParsedReferenceType;
-  };
-}
-
-export type TokenType =
-  | "Illegal"
-  | "Eof"
-  | { Ident: string }
-  | { String: string }
-  | { Boolean: boolean }
-  | { Number: number }
-  | { ERROR: ErrorType }
-  | { COMPARE: OpCompareType }
-  | { SUM: OpSumType }
-  | { PRODUCT: OpProductType }
-  | "POWER"
-  | "LPAREN"
-  | "RPAREN"
-  | "COLON"
-  | "SEMICOLON"
-  | "LBRACKET"
-  | "RBRACKET"
-  | "LBRACE"
-  | "RBRACE"
-  | "COMMA"
-  | "BANG"
-  | "PERCENT"
-  | "AND"
-  | Reference
-  | Range;
-
-export interface MarkedToken {
-  token: TokenType;
-  start: number;
-  end: number;
-}
-
-export interface WorksheetProperties {
-  name: string;
-  color: string;
-  sheet_id: number;
-}
-
-interface CellStyleFill {
-  pattern_type: string;
-  fg_color?: string;
-  bg_color?: string;
-}
-
-interface CellStyleFont {
-  u: boolean;
-  b: boolean;
-  i: boolean;
-  strike: boolean;
-  sz: number;
-  color: string;
-  name: string;
-  family: number;
-  scheme: string;
-}
-
-export enum BorderType {
-  BorderAll,
-  BorderInner,
-  BorderCenterH,
-  BorderCenterV,
-  BorderOuter,
-  BorderNone,
-  BorderTop,
-  BorderRight,
-  BorderBottom,
-  BorderLeft,
-  None,
-}
-
-export interface BorderOptions {
-  color: string;
-  style: BorderStyle;
-  border: BorderType;
-}
-
-export enum BorderStyle {
-  Thin = "thin",
-  Medium = "medium",
-  Thick = "thick",
-  Dashed = "dashed",
-  Dotted = "dotted",
-  Double = "double",
-  None = "none",
-}
-
-interface BorderItem {
-  style: string;
-  color: string;
-}
-
-interface CellStyleBorder {
-  diagonal_up?: boolean;
-  diagonal_down?: boolean;
-  left: BorderItem;
-  right: BorderItem;
-  top: BorderItem;
-  bottom: BorderItem;
-  diagonal: BorderItem;
-}
-
-export type VerticalAlignment =
-  | "bottom"
-  | "center"
-  | "distributed"
-  | "justify"
-  | "top";
-
-export type HorizontalAlignment =
-  | "left"
-  | "center"
-  | "right"
-  | "general"
-  | "centerContinuous"
-  | "distributed"
-  | "fill"
-  | "justify";
-
-interface Alignment {
-  horizontal: HorizontalAlignment;
-  vertical: VerticalAlignment;
-  wrap_text: boolean;
-}
-
-export interface CellStyle {
-  read_only: boolean;
-  quote_prefix: boolean;
-  fill: CellStyleFill;
-  font: CellStyleFont;
-  border: CellStyleBorder;
-  num_fmt: string;
-  alignment?: Alignment;
-}
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,3 +0,0 @@
-ignore:
-  - "xlsx/src/bin"
-  - "bindings/wasm"
--- a/solidjs_app/.gitignore
+++ b/solidjs_app/.gitignore
@@ -1,2 +0,0 @@
-node_modules/*
-dist/*
--- a/solidjs_app/.storybook/main.ts
+++ b/solidjs_app/.storybook/main.ts
@@ -1,19 +0,0 @@
-import type { StorybookConfig } from "storybook-solidjs-vite";
-
-const config: StorybookConfig = {
-  stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
-  addons: [
-    "@storybook/addon-links",
-    "@storybook/addon-essentials",
-    "@chromatic-com/storybook",
-    "@storybook/addon-interactions",
-  ],
-  framework: {
-    name: "storybook-solidjs-vite",
-    options: {},
-  },
-  docs: {
-    autodocs: "tag",
-  },
-};
-export default config;
--- a/solidjs_app/.storybook/preview.ts
+++ b/solidjs_app/.storybook/preview.ts
@@ -1,12 +0,0 @@
-const preview: Preview = {
-  parameters: {
-    controls: {
-      matchers: {
-        color: /(background|color)$/i,
-        date: /Date$/i,
-      },
-    },
-  },
-};
-
-export default preview;
--- a/solidjs_app/Makefile
+++ b/solidjs_app/Makefile
@@ -1,8 +0,0 @@
-
-lint:
-	pnpm biome lint *   
-
-format:
-	pnpm biome format * 
-build:
-	pnpm run build
--- a/solidjs_app/README.md
+++ b/solidjs_app/README.md
@@ -1,70 +0,0 @@
-# Web IronCalc
-
-## Widgets
-
-Toolbar
-NavigationBar
-FormulaBar
-ColorPicker
-Number Formatter
-Border Picker
-
-
-## Stack
-
-Vite
-TypeScript
-SolidJs
-Lucide Icons
-BiomeJs
-Storybook
-pnpm
-
-## Recreate
-
-Install nodejs
-Activate pnpm
-    corepack enable pnpm
-Create app    
-    pnpm create vite
-    pnpm install
-add biomejs
-    pnpm add --save-dev --save-exact @biomejs/biome
-    pnpm biome init
-add solidjs
-add storybook
-    pnpm dlx storybook@latest init
-add i18n
-    pnpm add @solid-primitives/i18n
-(https://github.com/jfgodoy/vite-plugin-solid-svg)
-add vite-plugin-solid-svg
-add script: "restore": "cp node_modules/@ironcalc/wasm/wasm_bg.wasm node_modules/.vite/deps/",
-
-
-
-## Usage
-
-```bash
-$ pnpm install # or npm install or yarn install
-```
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `pnpm run dev`
-
-Runs the app in the development mode.<br>
-Open [http://localhost:5173](http://localhost:5173) to view it in the browser.
-
-### `pnpm run build`
-
-Builds the app for production to the `dist` folder.<br>
-It correctly bundles Solid in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-## Deployment
-
-Learn more about deploying your application with the [documentations](https://vitejs.dev/guide/static-deploy.html)
--- a/solidjs_app/biome.json
+++ b/solidjs_app/biome.json
@@ -1,15 +0,0 @@
-{
-  "$schema": "https://biomejs.dev/schemas/1.7.0/schema.json",
-  "organizeImports": {
-    "enabled": true
-  },
-  "linter": {
-    "enabled": true,
-    "rules": {
-      "recommended": true
-    }
-  },
-  "formatter": {
-    "indentStyle": "space"
-  }
-}
--- a/solidjs_app/index.html
+++ b/solidjs_app/index.html
@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/ironcalc_icon.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + Solid + TS</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/index.tsx"></script>
-  </body>
-</html>
--- a/solidjs_app/package.json
+++ b/solidjs_app/package.json
@@ -1,35 +0,0 @@
-{
-  "name": "app",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "restore": "cp node_modules/@ironcalc/wasm/wasm_bg.wasm node_modules/.vite/deps/",
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "preview": "vite preview",
-    "storybook": "storybook dev -p 6006",
-    "build-storybook": "storybook build"
-  },
-  "dependencies": {
-    "@ironcalc/wasm": "file:../bindings/wasm/pkg",
-    "@solid-primitives/i18n": "^2.1.1",
-    "lucide-solid": "^0.379.0",
-    "solid-js": "^1.8.15"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "1.7.0",
-    "@chromatic-com/storybook": "^1.3.3",
-    "@storybook/addon-essentials": "^8.0.8",
-    "@storybook/addon-interactions": "^8.0.8",
-    "@storybook/addon-links": "^8.0.8",
-    "@storybook/blocks": "^8.0.8",
-    "storybook": "^8.0.8",
-    "storybook-solidjs": "^1.0.0-beta.2",
-    "storybook-solidjs-vite": "^1.0.0-beta.2",
-    "typescript": "^5.2.2",
-    "vite": "^5.2.0",
-    "vite-plugin-solid": "^2.10.2",
-    "vite-plugin-solid-svg": "^0.8.1"
-  }
-}
--- a/solidjs_app/pnpm-lock.yaml
+++ b/solidjs_app/pnpm-lock.yaml
--- a/solidjs_app/public/ironcalc_icon.svg
+++ b/solidjs_app/public/ironcalc_icon.svg
@@ -1,8 +0,0 @@
-<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="600" height="600" rx="20" fill="#F2994A"/>
-<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 100C348.98 166.034 322.748 229.362 276.055 276.055C268.163 283.947 259.796 291.255 251.021 297.95L251.021 500L348.98 500H251.021C251.021 433.966 277.252 370.637 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05L348.98 100Z" fill="white"/>
-<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M251.021 100.068C251.003 140.096 235.094 178.481 206.788 206.787C178.466 235.109 140.053 251.02 100 251.02V348.979C154.873 348.979 207.877 330.866 251.021 297.95V100.068Z" fill="white"/>
-<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M348.98 499.882C349.011 459.872 364.918 421.507 393.213 393.213C421.534 364.891 459.947 348.98 500 348.98V251.02C445.128 251.02 392.123 269.134 348.98 302.05V499.882Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M276.055 276.055C322.748 229.362 348.98 166.034 348.98 100H251.021V297.95C259.796 291.255 268.163 283.947 276.055 276.055Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M348.98 302.05V499.895C348.98 499.93 348.98 499.965 348.98 500L251.021 500C251.021 499.946 251.02 499.891 251.021 499.837C251.064 433.862 277.291 370.599 323.945 323.945C331.837 316.053 340.204 308.745 348.98 302.05Z" fill="white"/>
-</svg>
--- a/solidjs_app/src/App.css
+++ b/solidjs_app/src/App.css
@@ -1,7 +0,0 @@
-#root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
-}
-
--- a/solidjs_app/src/App.tsx
+++ b/solidjs_app/src/App.tsx
@@ -1,29 +0,0 @@
-import { Show, createResource } from "solid-js";
-// import "./App.css";
-// import solidLogo from "./assets/solid.svg";
-
-import init, { Model } from "@ironcalc/wasm";
-import Workbook from "./components/Workbook";
-
-const fetchModel = async () => {
-  await init();
-  // const model_bytes = new Uint8Array(
-  //     await (await fetch("./example.ic")).arrayBuffer(),
-  //   );
-  //   const _model = Model.from_bytes(model_bytes);*/
-  const model = new Model("en", "UTC");
-  model.setUserInput(0, 1, 1, "=1+1");
-  return model;
-};
-
-function App() {
-  const [model] = createResource(fetchModel);
-
-  return (
-    <Show when={model()} fallback={<div>Loading...</div>}>
-      {(model) => <Workbook model={model()} />}
-    </Show>
-  );
-}
-
-export default App;
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`PfrendeesD<>VRAITRUEWAHRVERDADEROTVFAUXFALSEFALSCHFALSOUw#REF!#REF!#BEZUG!#¡REF!e<>#NOM?#NAME?#NAME?#¿NOMBRE?x<>#VALEUR!#VALUE!#WERT!#¡VALOR!w<>#DIV/0!#DIV/0!#DIV/0!#¡DIV/0!<04>#N/A#N/A#NV#N/AXv#NOMBRE!#NUM!#ZAHL!#¡NUM!<02><>#N/IMPL!#N/IMPL!#N/IMPL!#N/IMPL!w{#SPILL!#SPILL!#ÜBERLAUF!#SPILL!ff#CALC!#CALC!#CALC!#CALC!ff#CIRC!#CIRC!#CIRC!#CIRC!ww#ERROR!#ERROR!#ERROR!#ERROR!ff#NULL!#NULL!#NULL!#NULL!`