work

fix Draw (redraw)
oop
2026-02-26 19:18:27 -05:00 · 2026-02-21 00:19:39 -05:00 · 2026-02-18 16:49:59 -05:00 · 2026-02-17 18:14:38 -05:00 · 2026-02-17 18:14:19 -05:00 · 2026-01-29 16:39:19 -05:00
96 changed files with 3837 additions and 2767 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -39,9 +39,9 @@ dependencies = [

 [[package]]
 name = "aligned"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "377e4c0ba83e4431b10df45c1d4666f178ea9c552cac93e60c3a88bf32785923"
+checksum = "ee4508988c62edf04abd8d92897fca0c2995d907ce1dfeaf369dac3716a40685"
 dependencies = [
 "as-slice",
 ]
@@ -55,6 +55,12 @@ dependencies = [
 "equator",
 ]

+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
 [[package]]
 name = "android-activity"
 version = "0.6.0"
@@ -119,7 +125,7 @@ dependencies = [
 "objc2-foundation 0.3.2",
 "parking_lot",
 "percent-encoding",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 "wl-clipboard-rs",
 "x11rb",
 ]
@@ -291,9 +297,9 @@ checksum = "f4ad8f11f288f48ca24471bbd51ac257aaeaaa07adae295591266b792902ae64"

 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"

 [[package]]
 name = "bytemuck"
@@ -361,9 +367,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.49"
+version = "1.2.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
+checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203"
 dependencies = [
 "find-msvc-tools",
 "jobserver",
@@ -515,9 +521,9 @@ dependencies = [

 [[package]]
 name = "cosmic-text"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "173852283a9a57a3cbe365d86e74dc428a09c50421477d5ad6fe9d9509e37737"
+checksum = "c4cadaea21e24c49c0c82116f2b465ae6a49d63c90e428b0f8d9ae1f638ac91f"
 dependencies = [
 "bitflags 2.10.0",
 "fontdb",
@@ -527,7 +533,7 @@ dependencies = [
 "rangemap",
 "rustc-hash",
 "self_cell",
- "skrifa",
+ "skrifa 0.39.0",
 "smol_str",
 "swash",
 "sys-locale",
@@ -692,12 +698,6 @@ dependencies = [
 "zune-inflate",
 ]

-[[package]]
-name = "fastrand"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
-
 [[package]]
 name = "fax"
 version = "0.2.6"
@@ -729,9 +729,9 @@ dependencies = [

 [[package]]
 name = "find-msvc-tools"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844"
+checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff"

 [[package]]
 name = "fixedbitset"
@@ -835,7 +835,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
 dependencies = [
- "rustix 1.1.2",
+ "rustix 1.1.3",
 "windows-link",
 ]

@@ -893,34 +893,17 @@ dependencies = [
 "gl_generator",
 ]

-[[package]]
-name = "gpu-alloc"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
-dependencies = [
- "bitflags 2.10.0",
- "gpu-alloc-types",
-]
-
-[[package]]
-name = "gpu-alloc-types"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
-dependencies = [
- "bitflags 2.10.0",
-]
-
 [[package]]
 name = "gpu-allocator"
-version = "0.27.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c151a2a5ef800297b4e79efa4f4bec035c5f51d5ae587287c9b952bdf734cacd"
+checksum = "51255ea7cfaadb6c5f1528d43e92a82acb2b96c43365989a28b2d44ee38f8795"
 dependencies = [
+ "ash",
+ "hashbrown 0.16.1",
 "log",
 "presser",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
 "windows",
 ]

@@ -958,14 +941,14 @@ dependencies = [

 [[package]]
 name = "harfrust"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92c020db12c71d8a12a3fe7607873cade3a01a6287e29d540c8723276221b9d8"
+checksum = "e0caaee032384c10dd597af4579c67dee16650d862a9ccbe1233ff1a379abc07"
 dependencies = [
 "bitflags 2.10.0",
 "bytemuck",
 "core_maths",
- "read-fonts",
+ "read-fonts 0.36.0",
 "smallvec",
 ]

@@ -984,6 +967,8 @@ version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
 dependencies = [
+ "allocator-api2",
+ "equivalent",
 "foldhash 0.2.0",
 ]

@@ -1020,7 +1005,7 @@ dependencies = [
 "rgb",
 "tiff",
 "zune-core 0.5.0",
- "zune-jpeg 0.5.6",
+ "zune-jpeg 0.5.8",
 ]

 [[package]]
@@ -1070,6 +1055,7 @@ dependencies = [
 "iris-core",
 "iris-macro",
 "pollster",
+ "tokio",
 "unicode-segmentation",
 "wgpu",
 "winit",
@@ -1091,6 +1077,7 @@ dependencies = [
 name = "iris-macro"
 version = "0.1.0"
 dependencies = [
+ "proc-macro2",
 "quote",
 "syn",
 ]
@@ -1171,9 +1158,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"

 [[package]]
 name = "libc"
-version = "0.2.178"
+version = "0.2.179"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
+checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f"

 [[package]]
 name = "libfuzzer-sys"
@@ -1203,13 +1190,13 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"

 [[package]]
 name = "libredox"
-version = "0.1.10"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616"
 dependencies = [
 "bitflags 2.10.0",
 "libc",
- "redox_syscall 0.5.18",
+ "redox_syscall 0.7.0",
 ]

 [[package]]
@@ -1296,9 +1283,9 @@ dependencies = [

 [[package]]
 name = "metal"
-version = "0.32.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00c15a6f673ff72ddcc22394663290f870fb224c1bfce55734a75c414150e605"
+checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
 dependencies = [
 "bitflags 2.10.0",
 "block",
@@ -1321,9 +1308,9 @@ dependencies = [

 [[package]]
 name = "moxcms"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80986bbbcf925ebd3be54c26613d861255284584501595cf418320c078945608"
+checksum = "ac9557c559cd6fc9867e122e20d2cbefc9ca29d80d027a8e39310920ed2f0a97"
 dependencies = [
 "num-traits",
 "pxfm",
@@ -1331,9 +1318,9 @@ dependencies = [

 [[package]]
 name = "naga"
-version = "27.0.3"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066cf25f0e8b11ee0df221219010f213ad429855f57c494f995590c861a9a7d8"
+checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
 dependencies = [
 "arrayvec",
 "bit-set",
@@ -1766,10 +1753,11 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"

 [[package]]
 name = "orbclient"
-version = "0.3.49"
+version = "0.3.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827"
+checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd"
 dependencies = [
+ "libc",
 "libredox",
 ]

@@ -1908,7 +1896,7 @@ dependencies = [
 "concurrent-queue",
 "hermit-abi",
 "pin-project-lite",
- "rustix 1.1.2",
+ "rustix 1.1.3",
 "windows-sys 0.61.2",
 ]

@@ -1920,9 +1908,9 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"

 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "f89776e4d69bb58bc6993e99ffa1d11f228b839984854c7daeb5d37f87cbe950"

 [[package]]
 name = "portable-atomic-util"
@@ -1959,9 +1947,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.103"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0"
 dependencies = [
 "unicode-ident",
 ]
@@ -2011,9 +1999,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"

 [[package]]
 name = "quick-xml"
-version = "0.37.5"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+checksum = "b66c2058c55a409d601666cffe35f04333cf1013010882cec174a7467cd4e21c"
 dependencies = [
 "memchr",
 ]
@@ -2070,9 +2058,9 @@ checksum = "c3d6831663a5098ea164f89cff59c6284e95f4e3c76ce9848d4529f5ccca9bde"

 [[package]]
 name = "rangemap"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbbbbea733ec66275512d0b9694f34102e7d5406fdbe2ad8d21b28dce92887c"
+checksum = "973443cf09a9c8656b574a866ab68dfa19f0867d0340648c7d2f6a71b8a8ea68"

 [[package]]
 name = "rav1e"
@@ -2155,6 +2143,16 @@ name = "read-fonts"
 version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
+dependencies = [
+ "bytemuck",
+ "font-types",
+]
+
+[[package]]
+name = "read-fonts"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eaa2941a4c05443ee3a7b26ab076a553c343ad5995230cc2b1d3e993bdc6345"
 dependencies = [
 "bytemuck",
 "core_maths",
@@ -2179,6 +2177,15 @@ dependencies = [
 "bitflags 2.10.0",
 ]

+[[package]]
+name = "redox_syscall"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f3fe0889e69e2ae9e41f4d6c4c0181701d00e4697b356fb1f74173a5e0ee27"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
 [[package]]
 name = "renderdoc-sys"
 version = "1.1.0"
@@ -2218,9 +2225,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34"
 dependencies = [
 "bitflags 2.10.0",
 "errno",
@@ -2271,9 +2278,9 @@ dependencies = [

 [[package]]
 name = "self_cell"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16c2f82143577edb4921b71ede051dac62ca3c16084e918bf7b40c96ae10eb33"
+checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89"

 [[package]]
 name = "serde"
@@ -2333,7 +2340,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
 dependencies = [
 "bytemuck",
- "read-fonts",
+ "read-fonts 0.35.0",
+]
+
+[[package]]
+name = "skrifa"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c9eb0b904a04d09bd68c65d946617b8ff733009999050f3b851c32fb3cfb60e"
+dependencies = [
+ "bytemuck",
+ "read-fonts 0.36.0",
 ]

 [[package]]
@@ -2424,16 +2441,16 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47846491253e976bdd07d0f9cc24b7daf24720d11309302ccbbc6e6b6e53550a"
 dependencies = [
- "skrifa",
+ "skrifa 0.37.0",
 "yazi",
 "zeno",
 ]

 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.113"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2449,19 +2466,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "tempfile"
-version = "3.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
-dependencies = [
- "fastrand",
- "getrandom",
- "once_cell",
- "rustix 1.1.2",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -2566,19 +2570,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"

 [[package]]
-name = "toml_datetime"
-version = "0.7.3"
+name = "tokio"
+version = "1.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
+dependencies = [
+ "pin-project-lite",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.5+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
 dependencies = [
 "serde_core",
 ]

 [[package]]
 name = "toml_edit"
-version = "0.23.9"
+version = "0.23.10+spec-1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832"
+checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
 "indexmap",
 "toml_datetime",
@@ -2588,18 +2601,18 @@ dependencies = [

 [[package]]
 name = "toml_parser"
-version = "1.0.4"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
 dependencies = [
 "winnow",
 ]

 [[package]]
 name = "tracing"
-version = "0.1.43"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
 "pin-project-lite",
 "tracing-core",
@@ -2607,9 +2620,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.35"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"

 [[package]]
 name = "tree_magic_mini"
@@ -2763,13 +2776,13 @@ dependencies = [

 [[package]]
 name = "wayland-backend"
-version = "0.3.11"
+version = "0.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
+checksum = "fee64194ccd96bf648f42a65a7e589547096dfa702f7cadef84347b66ad164f9"
 dependencies = [
 "cc",
 "downcast-rs",
- "rustix 1.1.2",
+ "rustix 1.1.3",
 "scoped-tls",
 "smallvec",
 "wayland-sys",
@@ -2777,12 +2790,12 @@ dependencies = [

 [[package]]
 name = "wayland-client"
-version = "0.31.11"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
+checksum = "b8e6faa537fbb6c186cb9f1d41f2f811a4120d1b57ec61f50da451a0c5122bec"
 dependencies = [
 "bitflags 2.10.0",
- "rustix 1.1.2",
+ "rustix 1.1.3",
 "wayland-backend",
 "wayland-scanner",
 ]
@@ -2800,20 +2813,20 @@ dependencies = [

 [[package]]
 name = "wayland-cursor"
-version = "0.31.11"
+version = "0.31.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29"
+checksum = "5864c4b5b6064b06b1e8b74ead4a98a6c45a285fe7a0e784d24735f011fdb078"
 dependencies = [
- "rustix 1.1.2",
+ "rustix 1.1.3",
 "wayland-client",
 "xcursor",
 ]

 [[package]]
 name = "wayland-protocols"
-version = "0.32.9"
+version = "0.32.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
+checksum = "baeda9ffbcfc8cd6ddaade385eaf2393bd2115a69523c735f12242353c3df4f3"
 dependencies = [
 "bitflags 2.10.0",
 "wayland-backend",
@@ -2823,9 +2836,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols-plasma"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032"
+checksum = "aa98634619300a535a9a97f338aed9a5ff1e01a461943e8346ff4ae26007306b"
 dependencies = [
 "bitflags 2.10.0",
 "wayland-backend",
@@ -2836,9 +2849,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
+checksum = "e9597cdf02cf0c34cd5823786dce6b5ae8598f05c2daf5621b6e178d4f7345f3"
 dependencies = [
 "bitflags 2.10.0",
 "wayland-backend",
@@ -2849,9 +2862,9 @@ dependencies = [

 [[package]]
 name = "wayland-scanner"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
+checksum = "5423e94b6a63e68e439803a3e153a9252d5ead12fd853334e2ad33997e3889e3"
 dependencies = [
 "proc-macro2",
 "quick-xml",
@@ -2860,9 +2873,9 @@ dependencies = [

 [[package]]
 name = "wayland-sys"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
+checksum = "1e6dbfc3ac5ef974c92a2235805cc0114033018ae1290a72e474aa8b28cbbdfd"
 dependencies = [
 "dlib",
 "log",
@@ -2898,12 +2911,13 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"

 [[package]]
 name = "wgpu"
-version = "27.0.1"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe68bac7cde125de7a731c3400723cadaaf1703795ad3f4805f187459cd7a77"
+checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
 dependencies = [
 "arrayvec",
 "bitflags 2.10.0",
+ "bytemuck",
 "cfg-if",
 "cfg_aliases",
 "document-features",
@@ -2927,9 +2941,9 @@ dependencies = [

 [[package]]
 name = "wgpu-core"
-version = "27.0.3"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27a75de515543b1897b26119f93731b385a19aea165a1ec5f0e3acecc229cae7"
+checksum = "8bb4c8b5db5f00e56f1f08869d870a0dff7c8bc7ebc01091fec140b0cf0211a9"
 dependencies = [
 "arrayvec",
 "bit-set",
@@ -2959,36 +2973,36 @@ dependencies = [

 [[package]]
 name = "wgpu-core-deps-apple"
-version = "27.0.0"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0772ae958e9be0c729561d5e3fd9a19679bcdfb945b8b1a1969d9bfe8056d233"
+checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da"
 dependencies = [
 "wgpu-hal",
 ]

 [[package]]
 name = "wgpu-core-deps-emscripten"
-version = "27.0.0"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06ac3444a95b0813ecfd81ddb2774b66220b264b3e2031152a4a29fda4da6b5"
+checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79"
 dependencies = [
 "wgpu-hal",
 ]

 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "27.0.0"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71197027d61a71748e4120f05a9242b2ad142e3c01f8c1b47707945a879a03c3"
+checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae"
 dependencies = [
 "wgpu-hal",
 ]

 [[package]]
 name = "wgpu-hal"
-version = "27.0.4"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b21cb61c57ee198bc4aff71aeadff4cbb80b927beb912506af9c780d64313ce"
+checksum = "293080d77fdd14d6b08a67c5487dfddbf874534bb7921526db56a7b75d7e3bef"
 dependencies = [
 "android_system_properties",
 "arrayvec",
@@ -3002,7 +3016,6 @@ dependencies = [
 "core-graphics-types 0.2.0",
 "glow",
 "glutin_wgl_sys",
- "gpu-alloc",
 "gpu-allocator",
 "gpu-descriptor",
 "hashbrown 0.16.1",
@@ -3035,15 +3048,14 @@ dependencies = [

 [[package]]
 name = "wgpu-types"
-version = "27.0.1"
+version = "28.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afdcf84c395990db737f2dd91628706cb31e86d72e53482320d368e52b5da5eb"
+checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
 dependencies = [
 "bitflags 2.10.0",
 "bytemuck",
 "js-sys",
 "log",
- "thiserror 2.0.17",
 "web-sys",
 ]

@@ -3058,32 +3070,54 @@ dependencies = [

 [[package]]
 name = "windows"
-version = "0.58.0"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
 dependencies = [
 "windows-core",
- "windows-targets 0.52.6",
 ]

 [[package]]
 name = "windows-core"
-version = "0.58.0"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
 "windows-implement",
 "windows-interface",
+ "windows-link",
 "windows-result",
 "windows-strings",
- "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core",
+ "windows-link",
+ "windows-threading",
 ]

 [[package]]
 name = "windows-implement"
-version = "0.58.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3092,9 +3126,9 @@ dependencies = [

 [[package]]
 name = "windows-interface"
-version = "0.58.0"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3108,22 +3142,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"

 [[package]]
-name = "windows-result"
-version = "0.2.0"
+name = "windows-numerics"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-core",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
 ]

 [[package]]
 name = "windows-strings"
-version = "0.1.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
- "windows-result",
- "windows-targets 0.52.6",
+ "windows-link",
 ]

 [[package]]
@@ -3153,6 +3196,15 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.61.2"
@@ -3186,13 +3238,39 @@ dependencies = [
 "windows_aarch64_gnullvm 0.52.6",
 "windows_aarch64_msvc 0.52.6",
 "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
 "windows_i686_msvc 0.52.6",
 "windows_x86_64_gnu 0.52.6",
 "windows_x86_64_gnullvm 0.52.6",
 "windows_x86_64_msvc 0.52.6",
 ]

+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.42.2"
@@ -3205,6 +3283,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
@@ -3217,6 +3301,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
@@ -3229,12 +3319,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
@@ -3247,6 +3349,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
@@ -3259,6 +3367,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -3271,6 +3385,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
@@ -3283,6 +3403,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
 [[package]]
 name = "winit"
 version = "0.30.12"
@@ -3352,15 +3478,14 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"

 [[package]]
 name = "wl-clipboard-rs"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5ff8d0e60065f549fafd9d6cb626203ea64a798186c80d8e7df4f8af56baeb"
+checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
 dependencies = [
 "libc",
 "log",
 "os_pipe",
- "rustix 0.38.44",
- "tempfile",
+ "rustix 1.1.3",
 "thiserror 2.0.17",
 "tree_magic_mini",
 "wayland-backend",
@@ -3391,7 +3516,7 @@ dependencies = [
 "libc",
 "libloading",
 "once_cell",
- "rustix 1.1.2",
+ "rustix 1.1.3",
 "x11rb-protocol",
 ]

@@ -3502,9 +3627,9 @@ dependencies = [

 [[package]]
 name = "zune-jpeg"
-version = "0.5.6"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f520eebad972262a1dde0ec455bce4f8b298b1e5154513de58c114c4c54303e8"
+checksum = "e35aee689668bf9bd6f6f3a6c60bb29ba1244b3b43adfd50edd554a371da37d5"
 dependencies = [
 "zune-core 0.5.0",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,5 @@
 [package]
 name = "iris"
-default-run = "test"
 version.workspace = true
 edition.workspace = true

@@ -16,6 +15,10 @@ arboard = { workspace = true, features = ["wayland-data-control"] }
 pollster = { workspace = true }
 wgpu = { workspace = true }
 image = { workspace = true }
+tokio = { workspace = true, features = ["sync", "rt", "rt-multi-thread"] }
+
+[dev-dependencies]
+tokio = { workspace = true, features = ["sync", "rt", "rt-multi-thread", "time"] }

 [workspace]
 members = ["core", "macro"]
@@ -27,12 +30,13 @@ edition = "2024"
 [workspace.dependencies]
 pollster = "0.4.0"
 winit = "0.30.12"
-wgpu = "27.0.1"
+wgpu = "28.0.0"
 bytemuck = "1.23.1"
 image = "0.25.6"
-cosmic-text = "0.15.0"
+cosmic-text = "0.16.0"
 unicode-segmentation = "1.12.0"
 fxhash = "0.2.1"
 arboard = "3.6.1"
 iris-core = { path = "core" }
 iris-macro = { path = "macro" }
+tokio = "1.49.0"
--- a/1
+++ b/1
@@ -16,7 +16,6 @@ scaling
    field could be best solution so redrawing stuff isn't needed & you can specify both as user

 WidgetRef<W> or smth instead of Id
-    fyi this is not the same as what was just implemented
    enum that's either an Id or an actual concrete instance of W
    painter takes them in instead of (or in addition to) id
    then type wrapper widgets to contain them
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -10,4 +10,3 @@ bytemuck ={ workspace = true }
 image = { workspace = true }
 cosmic-text = { workspace = true }
 fxhash = { workspace = true }
-
--- a/core/src/attr.rs
+++ b/core/src/attr.rs
@@ -0,0 +1,23 @@
+use crate::{UiRsc, WidgetIdFn, WidgetLike, WeakWidget};
+
+pub trait WidgetAttr<Rsc, W: ?Sized> {
+    type Input;
+    fn run(rsc: &mut Rsc, id: WeakWidget<W>, input: Self::Input);
+}
+
+pub trait Attrable<Rsc, W: ?Sized, Tag> {
+    fn attr<A: WidgetAttr<Rsc, W>>(self, input: A::Input) -> impl WidgetIdFn<Rsc, W>;
+}
+
+impl<Rsc: UiRsc, WL: WidgetLike<Rsc, Tag>, Tag> Attrable<Rsc, WL::Widget, Tag> for WL {
+    fn attr<A: WidgetAttr<Rsc, WL::Widget>>(
+        self,
+        input: A::Input,
+    ) -> impl WidgetIdFn<Rsc, WL::Widget> {
+        |rsc| {
+            let id = self.add(rsc);
+            A::run(rsc, id, input);
+            id
+        }
+    }
+}
--- a/core/src/event/ctx.rs
+++ b/core/src/event/ctx.rs
@@ -0,0 +1,18 @@
+use crate::{HasEvents, WeakWidget, Widget};
+
+pub struct EventCtx<'a, Rsc: HasEvents, Data> {
+    pub state: &'a mut Rsc::State,
+    pub data: Data,
+}
+
+pub struct EventIdCtx<'a, Rsc: HasEvents, Data, W: ?Sized> {
+    pub widget: WeakWidget<W>,
+    pub state: &'a mut Rsc::State,
+    pub data: Data,
+}
+
+impl<Rsc: HasEvents, Data, W: Widget> EventIdCtx<'_, Rsc, Data, W> {
+    pub fn widget<'a>(&self, rsc: &'a mut Rsc) -> &'a mut W {
+        &mut rsc.ui_mut().widgets[self.widget]
+    }
+}
--- a/core/src/event/manager.rs
+++ b/core/src/event/manager.rs
@@ -0,0 +1,157 @@
+use crate::{
+    ActiveData, Event, EventCtx, EventFn, EventIdCtx, EventLike, HasEvents, IdLike, LayerId,
+    WeakWidget, WidgetEventFn, WidgetId,
+    util::{HashMap, HashSet, TypeMap},
+};
+use std::{any::TypeId, rc::Rc};
+
+pub struct EventManager<Rsc> {
+    widget_to_types: HashMap<WidgetId, HashSet<TypeId>>,
+    types: TypeMap<dyn EventManagerLike<Rsc>>,
+}
+
+impl<Rsc> Default for EventManager<Rsc> {
+    fn default() -> Self {
+        Self {
+            widget_to_types: Default::default(),
+            types: Default::default(),
+        }
+    }
+}
+
+impl<Rsc: HasEvents + 'static> EventManager<Rsc> {
+    pub fn get_type<E: EventLike>(&mut self) -> &mut TypeEventManager<Rsc, E::Event> {
+        self.types.type_or_default()
+    }
+
+    pub fn register<I: IdLike + 'static, E: EventLike>(
+        &mut self,
+        id: I,
+        event: E,
+        f: impl for<'a> WidgetEventFn<Rsc, <E::Event as Event>::Data<'a>, I::Widget>,
+    ) {
+        let i = id.id();
+        self.get_type::<E>().register(id, event, f);
+        self.widget_to_types
+            .entry(i)
+            .or_default()
+            .insert(Self::type_key::<E>());
+    }
+
+    pub fn type_key<E: EventLike>() -> TypeId {
+        TypeId::of::<TypeEventManager<Rsc, E::Event>>()
+    }
+}
+
+pub trait EventsLike {
+    fn remove(&mut self, id: WidgetId);
+    fn draw(&mut self, active: &ActiveData);
+    fn undraw(&mut self, active: &ActiveData);
+}
+
+impl<Rsc: HasEvents + 'static> EventsLike for EventManager<Rsc> {
+    fn remove(&mut self, id: WidgetId) {
+        for t in self.widget_to_types.get(&id).into_flat_iter() {
+            self.types.get_mut(t).unwrap().remove(id);
+        }
+    }
+
+    fn draw(&mut self, active: &ActiveData) {
+        for t in self.widget_to_types.get(&active.id).into_flat_iter() {
+            self.types.get_mut(t).unwrap().draw(active);
+        }
+    }
+
+    fn undraw(&mut self, active: &ActiveData) {
+        for t in self.widget_to_types.get(&active.id).into_flat_iter() {
+            self.types.get_mut(t).unwrap().undraw(active);
+        }
+    }
+}
+
+pub trait EventManagerLike<State> {
+    fn remove(&mut self, id: WidgetId);
+    fn draw(&mut self, data: &ActiveData);
+    fn undraw(&mut self, data: &ActiveData);
+}
+
+type EventData<Rsc, E> = (E, Rc<dyn for<'a> EventFn<Rsc, <E as Event>::Data<'a>>>);
+pub struct TypeEventManager<Rsc: HasEvents, E: Event> {
+    // TODO: reduce visiblity!!
+    pub active: HashMap<LayerId, HashMap<WidgetId, E::State>>,
+    map: HashMap<WidgetId, Vec<EventData<Rsc, E>>>,
+}
+
+impl<Rsc: HasEvents, E: Event> EventManagerLike<Rsc> for TypeEventManager<Rsc, E> {
+    fn remove(&mut self, id: WidgetId) {
+        self.map.remove(&id);
+        for layer in self.active.values_mut() {
+            layer.remove(&id);
+        }
+    }
+    fn draw(&mut self, data: &ActiveData) {
+        self.active
+            .entry(data.layer)
+            .or_default()
+            .entry(data.id)
+            .or_default();
+    }
+    fn undraw(&mut self, data: &ActiveData) {
+        if let Some(layer) = self.active.get_mut(&data.layer) {
+            layer.remove(&data.id);
+        }
+    }
+}
+
+impl<Rsc: HasEvents, E: Event> Default for TypeEventManager<Rsc, E> {
+    fn default() -> Self {
+        Self {
+            active: Default::default(),
+            map: Default::default(),
+        }
+    }
+}
+
+impl<Rsc: HasEvents + 'static, E: Event> TypeEventManager<Rsc, E> {
+    fn register<I: IdLike + 'static>(
+        &mut self,
+        widget: I,
+        event: impl EventLike<Event = E>,
+        f: impl for<'a> WidgetEventFn<Rsc, E::Data<'a>, I::Widget>,
+    ) {
+        let event = event.into_event();
+        self.map.entry(widget.id()).or_default().push((
+            event,
+            Rc::new(move |ctx, rsc| {
+                f(
+                    EventIdCtx {
+                        widget: WeakWidget::new(widget.id()),
+                        state: ctx.state,
+                        data: ctx.data,
+                    },
+                    rsc,
+                );
+            }),
+        ));
+    }
+
+    pub fn run_fn<'a>(
+        &mut self,
+        id: impl IdLike,
+    ) -> impl for<'b> FnOnce(EventCtx<'_, Rsc, E::Data<'b>>, &mut Rsc) + 'a {
+        let fs = self.map.get(&id.id()).cloned().unwrap_or_default();
+        move |ctx, rsc| {
+            for (e, f) in fs {
+                if let Some(data) = e.should_run(&ctx.data) {
+                    f(
+                        EventCtx {
+                            state: ctx.state,
+                            data,
+                        },
+                        rsc,
+                    )
+                }
+            }
+        }
+    }
+}
--- a/core/src/event/mod.rs
+++ b/core/src/event/mod.rs
@@ -0,0 +1,44 @@
+mod ctx;
+mod manager;
+mod rsc;
+
+pub use ctx::*;
+pub use manager::*;
+pub use rsc::*;
+
+pub trait Event: Sized + 'static + Clone {
+    type Data<'a>: Clone = ();
+    type State: Default = ();
+    #[allow(unused_variables)]
+    fn should_run<'a>(&self, data: &Self::Data<'a>) -> Option<Self::Data<'a>> {
+        Some(data.clone())
+    }
+}
+
+pub trait EventLike {
+    type Event: Event;
+    fn into_event(self) -> Self::Event;
+}
+
+impl<E: Event> EventLike for E {
+    type Event = Self;
+
+    fn into_event(self) -> Self::Event {
+        self
+    }
+}
+
+pub trait EventFn<Rsc: HasEvents, Data>: Fn(EventCtx<Rsc, Data>, &mut Rsc) + 'static {}
+impl<Rsc: HasEvents, F: Fn(EventCtx<Rsc, Data>, &mut Rsc) + 'static, Data> EventFn<Rsc, Data>
+    for F
+{
+}
+
+pub trait WidgetEventFn<Rsc: HasEvents, Data, W: ?Sized>:
+    Fn(EventIdCtx<Rsc, Data, W>, &mut Rsc) + 'static
+{
+}
+impl<Rsc: HasEvents, F: Fn(EventIdCtx<Rsc, Data, W>, &mut Rsc) + 'static, Data, W: ?Sized>
+    WidgetEventFn<Rsc, Data, W> for F
+{
+}
--- a/core/src/event/rsc.rs
+++ b/core/src/event/rsc.rs
@@ -0,0 +1,34 @@
+use crate::{
+    Event, EventCtx, EventLike, EventManager, IdLike, UiRsc, WeakWidget, Widget, WidgetEventFn,
+};
+
+pub trait HasState: 'static {
+    type State;
+}
+
+pub trait HasEvents: Sized + UiRsc + HasState {
+    fn events(&self) -> &EventManager<Self>;
+    fn events_mut(&mut self) -> &mut EventManager<Self>;
+
+    fn register_event<W: Widget + ?Sized, E: EventLike>(
+        &mut self,
+        id: WeakWidget<W>,
+        event: E,
+        f: impl for<'a> WidgetEventFn<Self, <E::Event as Event>::Data<'a>, W>,
+    ) {
+        self.events_mut().register(id, event, f);
+    }
+}
+
+pub trait RunEvents: HasEvents {
+    fn run_event<E: EventLike>(
+        &mut self,
+        id: impl IdLike,
+        data: <E::Event as Event>::Data<'_>,
+        state: &mut Self::State,
+    ) {
+        let f = self.events_mut().get_type::<E>().run_fn(id);
+        f(EventCtx { state, data }, self)
+    }
+}
+impl<T: HasEvents> RunEvents for T {}
--- a/core/src/layout/attr.rs
+++ b/core/src/layout/attr.rs
@@ -1,20 +0,0 @@
-use crate::layout::{Ui, WidgetIdFn, WidgetLike, WidgetRef};
-
-pub trait WidgetAttr<W: ?Sized> {
-    type Input;
-    fn run(ui: &mut Ui, id: &WidgetRef<W>, input: Self::Input);
-}
-
-pub trait Attrable<W: ?Sized, Tag> {
-    fn attr<A: WidgetAttr<W>>(self, input: A::Input) -> impl WidgetIdFn<W>;
-}
-
-impl<WL: WidgetLike<Tag>, Tag> Attrable<WL::Widget, Tag> for WL {
-    fn attr<A: WidgetAttr<WL::Widget>>(self, input: A::Input) -> impl WidgetIdFn<WL::Widget> {
-        |ui| {
-            let id = self.add(ui);
-            A::run(ui, &id, input);
-            id
-        }
-    }
-}
--- a/core/src/layout/event.rs
+++ b/core/src/layout/event.rs
@@ -1,187 +0,0 @@
-use std::{hash::Hash, rc::Rc};
-
-use crate::{
-    layout::{IdFnTag, Ui, UiModule, WidgetIdFn, WidgetLike, WidgetRef},
-    util::{HashMap, Id},
-};
-
-pub trait Event: Sized {
-    type Module<Ctx: 'static>: EventModule<Self, Ctx>;
-    type Data: Clone;
-}
-
-pub struct EventCtx<'a, Ctx, Data> {
-    pub ui: &'a mut Ui,
-    pub state: &'a mut Ctx,
-    pub data: Data,
-}
-
-pub type ECtx<'a, Ctx, Data, W> = EventIdCtx<'a, Ctx, Data, W>;
-pub struct EventIdCtx<'a, Ctx, Data, W: ?Sized> {
-    pub widget: &'a WidgetRef<W>,
-    pub ui: &'a mut Ui,
-    pub state: &'a mut Ctx,
-    pub data: Data,
-}
-
-pub trait EventFn<Ctx, Data>: Fn(EventCtx<Ctx, Data>) + 'static {}
-impl<F: Fn(EventCtx<Ctx, Data>) + 'static, Ctx, Data> EventFn<Ctx, Data> for F {}
-
-pub trait WidgetEventFn<Ctx, Data, W: ?Sized>: Fn(EventIdCtx<Ctx, Data, W>) + 'static {}
-impl<F: Fn(EventIdCtx<Ctx, Data, W>) + 'static, Ctx, Data, W: ?Sized> WidgetEventFn<Ctx, Data, W>
-    for F
-{
-}
-
-
-impl Ui {
-    pub fn register_event<W: ?Sized, E: Event, Ctx: 'static>(
-        &mut self,
-        id: &WidgetRef<W>,
-        event: E,
-        f: impl EventFn<Ctx, E::Data>,
-    ) {
-        self.data
-            .modules
-            .get_mut::<E::Module<Ctx>>()
-            .register(id.id(), event, f);
-    }
-
-    pub fn register_widget_event<W: ?Sized + 'static, E: Event, Ctx: 'static>(
-        &mut self,
-        id: &WidgetRef<W>,
-        event: E,
-        f: impl WidgetEventFn<Ctx, E::Data, W>,
-    ) {
-        let id_ = id.weak();
-        self.data
-            .modules
-            .get_mut::<E::Module<Ctx>>()
-            .register(id.id(), event, move |ctx| {
-                f(EventIdCtx {
-                    widget: &id_.expect_strong(),
-                    ui: ctx.ui,
-                    state: ctx.state,
-                    data: ctx.data,
-                })
-            });
-    }
-}
-
-pub trait DefaultEvent: Hash + Eq + 'static {
-    type Data: Clone;
-}
-
-impl<E: DefaultEvent> Event for E {
-    type Module<Ctx: 'static> = DefaultEventModule<E, Ctx>;
-    type Data = E::Data;
-}
-
-pub trait EventModule<E: Event, Ctx>: UiModule + Default {
-    fn register(&mut self, id: Id, event: E, f: impl EventFn<Ctx, E::Data>);
-    fn run<'a>(
-        &self,
-        id: &Id,
-        event: E,
-    ) -> Option<impl Fn(EventCtx<Ctx, E::Data>) + use<'a, Self, E, Ctx>>;
-}
-
-type EventFnMap<Ctx, Data> = HashMap<Id, Vec<Rc<dyn EventFn<Ctx, Data>>>>;
-pub struct DefaultEventModule<E: Event, Ctx> {
-    map: HashMap<E, EventFnMap<Ctx, <E as Event>::Data>>,
-}
-
-impl<E: Event + 'static, Ctx: 'static> UiModule for DefaultEventModule<E, Ctx> {
-    fn on_remove(&mut self, id: &Id) {
-        for map in self.map.values_mut() {
-            map.remove(id);
-        }
-    }
-}
-
-pub trait HashableEvent: Event + Hash + Eq + 'static {}
-impl<E: Event + Hash + Eq + 'static> HashableEvent for E {}
-
-impl<E: HashableEvent, Ctx: 'static> EventModule<E, Ctx> for DefaultEventModule<E, Ctx> {
-    fn register(&mut self, id: Id, event: E, f: impl EventFn<Ctx, <E as Event>::Data>) {
-        self.map
-            .entry(event)
-            .or_default()
-            .entry(id)
-            .or_default()
-            .push(Rc::new(f));
-    }
-
-    fn run<'a>(
-        &self,
-        id: &Id,
-        event: E,
-    ) -> Option<impl Fn(EventCtx<Ctx, E::Data>) + use<'a, E, Ctx>> {
-        if let Some(map) = self.map.get(&event)
-            && let Some(fs) = map.get(id)
-        {
-            let fs = fs.clone();
-            Some(move |ctx: EventCtx<Ctx, <E as Event>::Data>| {
-                for f in &fs {
-                    f(EventCtx {
-                        ui: ctx.ui,
-                        state: ctx.state,
-                        data: ctx.data.clone(),
-                    })
-                }
-            })
-        } else {
-            None
-        }
-    }
-}
-
-impl<E: HashableEvent, Ctx: 'static> DefaultEventModule<E, Ctx> {
-    pub fn run_all(&self, event: E, ctx: EventCtx<Ctx, E::Data>)
-    where
-        E::Data: Clone,
-    {
-        if let Some(map) = self.map.get(&event) {
-            for fs in map.values() {
-                for f in fs {
-                    f(EventCtx {
-                        ui: ctx.ui,
-                        state: ctx.state,
-                        data: ctx.data.clone(),
-                    })
-                }
-            }
-        }
-    }
-}
-
-impl<E: Event + 'static, Ctx: 'static> Default for DefaultEventModule<E, Ctx> {
-    fn default() -> Self {
-        Self {
-            map: Default::default(),
-        }
-    }
-}
-
-impl Ui {
-    pub fn run_event<E: Event, Ctx: 'static, W: ?Sized>(
-        &mut self,
-        ctx: &mut Ctx,
-        id: &WidgetRef<W>,
-        event: E,
-        data: E::Data,
-    ) {
-        if let Some(f) = self
-            .data
-            .modules
-            .get_mut::<E::Module<Ctx>>()
-            .run(&id.id(), event)
-        {
-            f(EventCtx {
-                ui: self,
-                state: ctx,
-                data,
-            });
-        }
-    }
-}
--- a/core/src/layout/mod.rs
+++ b/core/src/layout/mod.rs
@@ -1,24 +0,0 @@
-mod attr;
-mod event;
-mod module;
-mod num;
-mod orientation;
-mod painter;
-mod primitive;
-mod ui;
-mod view;
-mod widget;
-
-pub use attr::*;
-pub use event::*;
-pub use module::*;
-pub use num::*;
-pub use orientation::*;
-pub use painter::*;
-pub use primitive::*;
-pub use ui::*;
-pub use view::*;
-pub use widget::*;
-
-pub use crate::util::Vec2;
-pub type UiColor = Color<u8>;
--- a/core/src/layout/module.rs
+++ b/core/src/layout/module.rs
@@ -1,35 +0,0 @@
-use std::any::{Any, TypeId};
-
-use crate::{
-    layout::WidgetInstance,
-    util::{HashMap, Id},
-};
-
-#[allow(unused_variables)]
-pub trait UiModule: Any {
-    fn on_draw(&mut self, inst: &WidgetInstance) {}
-    fn on_undraw(&mut self, inst: &WidgetInstance) {}
-    fn on_remove(&mut self, id: &Id) {}
-    fn on_move(&mut self, inst: &WidgetInstance) {}
-}
-
-#[derive(Default)]
-pub struct Modules {
-    map: HashMap<TypeId, Box<dyn UiModule>>,
-}
-
-impl Modules {
-    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut (dyn UiModule + 'static)> {
-        self.map.values_mut().map(|m| m.as_mut())
-    }
-
-    pub fn get_mut<M: UiModule + Default>(&mut self) -> &mut M {
-        let rf = self
-            .map
-            .entry(TypeId::of::<M>())
-            .or_insert_with(|| Box::new(M::default()))
-            .as_mut();
-        let any: &mut dyn Any = &mut *rf;
-        any.downcast_mut().unwrap()
-    }
-}
--- a/core/src/layout/painter.rs
+++ b/core/src/layout/painter.rs
@@ -1,609 +0,0 @@
-use std::{cell::Ref, marker::Unsize, sync::mpsc::Sender};
-
-use crate::{
-    layout::{
-        Axis, Len, Modules, PrimitiveLayers, RenderedText, Size, TextAttrs, TextBuffer, TextData,
-        TextureHandle, Textures, UiRegion, UiVec2, Vec2, Widget, WidgetRef, WidgetUpdate, Widgets,
-    },
-    render::{Mask, MaskIdx, Primitive, PrimitiveHandle, PrimitiveInst},
-    util::{HashMap, HashSet, Id, TrackedArena},
-};
-
-/// makes your surfaces look pretty
-pub struct Painter<'a, 'c> {
-    ctx: &'a mut PainterCtx<'c>,
-    widget: WidgetRef,
-    id: Id,
-    region: UiRegion,
-    mask: MaskIdx,
-    textures: Vec<TextureHandle>,
-    primitives: Vec<PrimitiveHandle>,
-    children: Vec<Id>,
-    children_width: HashMap<Id, (UiVec2, Len)>,
-    children_height: HashMap<Id, (UiVec2, Len)>,
-    pub layer: usize,
-}
-
-/// context for a painter; lets you draw and redraw widgets
-struct PainterCtx<'a> {
-    pub widgets: &'a Widgets,
-    pub active: &'a mut HashMap<Id, WidgetInstance>,
-    pub layers: &'a mut PrimitiveLayers,
-    pub textures: &'a mut Textures,
-    pub masks: &'a mut TrackedArena<Mask, u32>,
-    pub text: &'a mut TextData,
-    pub output_size: Vec2,
-    pub modules: &'a mut Modules,
-    pub cache_width: HashMap<Id, (UiVec2, Len)>,
-    pub cache_height: HashMap<Id, (UiVec2, Len)>,
-    pub needs_redraw: HashSet<Id>,
-    draw_started: HashSet<Id>,
-}
-
-/// stores information for children about the highest level parent that needed their size
-/// so that they can redraw the parent if their size changes
-#[derive(Clone, Copy, Debug, Default)]
-pub struct ResizeRef {
-    x: Option<(Id, (UiVec2, Len))>,
-    y: Option<(Id, (UiVec2, Len))>,
-}
-
-/// important non rendering data for retained drawing
-#[derive(Debug)]
-pub struct WidgetInstance {
-    pub id: Id,
-    pub region: UiRegion,
-    pub parent: Option<Id>,
-    pub textures: Vec<TextureHandle>,
-    pub primitives: Vec<PrimitiveHandle>,
-    pub children: Vec<Id>,
-    pub resize: ResizeRef,
-    pub mask: MaskIdx,
-    pub layer: usize,
-}
-
-/// data to be stored in Ui to create PainterCtxs easily
-pub struct PainterData {
-    pub widgets: Widgets,
-    pub active: HashMap<Id, WidgetInstance>,
-    pub layers: PrimitiveLayers,
-    pub textures: Textures,
-    pub text: TextData,
-    pub output_size: Vec2,
-    pub modules: Modules,
-    pub px_dependent: HashSet<Id>,
-    pub masks: TrackedArena<Mask, u32>,
-}
-
-impl PainterData {
-    pub fn new(send: Sender<WidgetUpdate>) -> Self {
-        Self {
-            widgets: Widgets::new(send),
-            active: Default::default(),
-            layers: Default::default(),
-            textures: Default::default(),
-            text: Default::default(),
-            output_size: Default::default(),
-            modules: Default::default(),
-            px_dependent: Default::default(),
-            masks: Default::default(),
-        }
-    }
-}
-
-impl<'a> PainterCtx<'a> {
-    /// redraws a widget that's currently active (drawn)
-    /// can be called on something already drawn or removed,
-    /// will just return if so
-    pub fn redraw<W: Widget + ?Sized + Unsize<dyn Widget>>(&mut self, widget: &WidgetRef<W>) {
-        let id = widget.id();
-        self.needs_redraw.remove(&id);
-        if self.draw_started.contains(&id) {
-            return;
-        }
-        let Some(active) = self.active.get(&id) else {
-            return;
-        };
-        let mut resize = active.resize;
-
-        // set resize back after redrawing
-        let finish = |s: &mut Self, resize| {
-            if let Some(active) = s.active.get_mut(&id) {
-                // might need to get_or_insert here instead of just assuming
-                active.resize = resize;
-            }
-        };
-
-        // check if a parent depends on the desired size of this, if so then redraw it first
-        // TODO: this is stupid having 2 of these, don't ask me what the consequences are
-        let mut ret = false;
-        if let Some((rid, (outer, old_desired))) = &mut resize.x {
-            let new_desired = SizeCtx {
-                source: id,
-                cache_width: &mut self.cache_width,
-                cache_height: &mut self.cache_height,
-                text: self.text,
-                textures: self.textures,
-                outer: *outer,
-                output_size: self.output_size,
-                checked_width: &mut Default::default(),
-                checked_height: &mut Default::default(),
-                id,
-            }
-            .width(widget);
-            if new_desired != *old_desired {
-                // unsure if I need to walk down the tree here
-                self.redraw(&self.widgets.get(*rid));
-                *old_desired = new_desired;
-                if self.draw_started.contains(&id) {
-                    ret = true;
-                }
-            }
-        }
-
-        if let Some((rid, (outer, old_desired))) = &mut resize.y {
-            // NOTE: might need hack in Span here (or also do it properly here)
-            let new_desired = SizeCtx {
-                source: id,
-                cache_width: &mut self.cache_width,
-                cache_height: &mut self.cache_height,
-                text: self.text,
-                textures: self.textures,
-                outer: *outer,
-                output_size: self.output_size,
-                checked_width: &mut Default::default(),
-                checked_height: &mut Default::default(),
-                id,
-            }
-            .height(widget);
-            if new_desired != *old_desired {
-                self.redraw(&self.widgets.get(*rid));
-                *old_desired = new_desired;
-                if self.draw_started.contains(&id) {
-                    ret = true;
-                }
-            }
-        }
-
-        if ret {
-            return finish(self, resize);
-        }
-
-        let Some(active) = self.remove(id) else {
-            return;
-        };
-
-        self.draw_inner(
-            active.layer,
-            widget,
-            active.region,
-            active.parent,
-            active.mask,
-            Some(active.children),
-        );
-        finish(self, resize);
-    }
-
-    fn draw_inner<W: Widget + ?Sized + Unsize<dyn Widget>>(
-        &mut self,
-        layer: usize,
-        widget: &WidgetRef<W>,
-        region: UiRegion,
-        parent: Option<Id>,
-        mask: MaskIdx,
-        old_children: Option<Vec<Id>>,
-    ) {
-        let id = widget.id();
-        // I have no idea if these checks work lol
-        // the idea is u can't redraw stuff u already drew,
-        // and if parent is different then there's another copy with a different parent
-        // but this has a very weird issue where you can't move widgets unless u remove first
-        // so swapping is impossible rn I think?
-        // there's definitely better solutions like a counter (>1 = panic) but don't care rn
-        // if self.draw_started.contains(&id) {
-        //     panic!(
-        //         "Cannot draw the same widget ({}) twice (1)",
-        //         self.widgets.data(&id).unwrap().label
-        //     );
-        // }
-        let mut old_children = old_children.unwrap_or_default();
-        let mut resize = ResizeRef::default();
-        if let Some(active) = self.active.get_mut(&id)
-            && !self.needs_redraw.contains(&id)
-        {
-            // check to see if we can skip drawing first
-            if active.parent != parent {
-                panic!("Cannot draw the same widget twice (2)");
-            }
-            if active.region == region {
-                return;
-            } else if active.region.size() == region.size() {
-                // TODO: epsilon?
-                let from = active.region;
-                self.mov(id, from, region);
-                return;
-            }
-            // if not, then maintain resize and track old children to remove unneeded
-            let active = self.remove(id).unwrap();
-            old_children = active.children;
-            resize = active.resize;
-        }
-
-        // draw widget
-        self.draw_started.insert(id);
-
-        let mut painter = Painter {
-            region,
-            mask,
-            layer,
-            widget: widget.as_any(),
-            id,
-            textures: Vec::new(),
-            primitives: Vec::new(),
-            ctx: self,
-            children: Vec::new(),
-            children_width: Default::default(),
-            children_height: Default::default(),
-        };
-
-        widget.get_mut_quiet().draw(&mut painter);
-
-        let children_width = painter.children_width;
-        let children_height = painter.children_height;
-
-        // add to active
-        let instance = WidgetInstance {
-            id,
-            region,
-            parent,
-            textures: painter.textures,
-            primitives: painter.primitives,
-            children: painter.children,
-            resize,
-            mask: painter.mask,
-            layer,
-        };
-        // set resize for children who's size this widget depends on
-        for (cid, outer) in children_width {
-            if let Some(w) = self.active.get_mut(&cid)
-                && w.resize.x.is_none()
-            {
-                w.resize.x = Some((id, outer))
-            }
-        }
-        for (cid, outer) in children_height {
-            if let Some(w) = self.active.get_mut(&cid)
-                && w.resize.y.is_none()
-            {
-                w.resize.y = Some((id, outer))
-            }
-        }
-
-        // remove old children that weren't kept
-        for c in &old_children {
-            if !instance.children.contains(c) {
-                self.remove_rec(*c);
-            }
-        }
-
-        // update modules
-        for m in self.modules.iter_mut() {
-            m.on_draw(&instance);
-        }
-        self.active.insert(id, instance);
-    }
-
-    fn mov(&mut self, id: Id, from: UiRegion, to: UiRegion) {
-        let active = self.active.get_mut(&id).unwrap();
-        for h in &active.primitives {
-            let region = self.layers[h.layer].region_mut(h);
-            *region = region.outside(&from).within(&to);
-        }
-        active.region = active.region.outside(&from).within(&to);
-        for m in self.modules.iter_mut() {
-            m.on_move(active);
-        }
-        // children will not be changed, so this technically should not be needed
-        // probably need unsafe
-        let children = active.children.clone();
-        for child in children {
-            self.mov(child, from, to);
-        }
-    }
-
-    /// NOTE: instance textures are cleared and self.textures freed
-    fn remove(&mut self, id: Id) -> Option<WidgetInstance> {
-        let mut inst = self.active.remove(&id);
-        if let Some(inst) = &mut inst {
-            for h in &inst.primitives {
-                let mask = self.layers.free(h);
-                if mask != MaskIdx::NONE {
-                    self.masks.remove(mask);
-                }
-            }
-            inst.textures.clear();
-            self.textures.free();
-            for m in self.modules.iter_mut() {
-                m.on_undraw(inst);
-            }
-        }
-        inst
-    }
-
-    fn remove_rec(&mut self, id: Id) -> Option<WidgetInstance> {
-        let inst = self.remove(id);
-        if let Some(inst) = &inst {
-            for c in &inst.children {
-                self.remove_rec(*c);
-            }
-        }
-        inst
-    }
-}
-
-impl PainterData {
-    fn ctx(&mut self, needs_redraw: HashSet<Id>) -> PainterCtx<'_> {
-        PainterCtx {
-            widgets: &self.widgets,
-            active: &mut self.active,
-            layers: &mut self.layers,
-            textures: &mut self.textures,
-            text: &mut self.text,
-            output_size: self.output_size,
-            modules: &mut self.modules,
-            masks: &mut self.masks,
-            cache_width: Default::default(),
-            cache_height: Default::default(),
-            draw_started: Default::default(),
-            needs_redraw,
-        }
-    }
-
-    pub fn draw<W: Widget + ?Sized + Unsize<dyn Widget>>(&mut self, id: &WidgetRef<W>) {
-        let mut ctx = self.ctx(Default::default());
-        ctx.draw_started.clear();
-        ctx.layers.clear();
-        ctx.draw_inner(0, id, UiRegion::FULL, None, MaskIdx::NONE, None);
-    }
-
-    pub fn redraw(&mut self, ids: HashSet<Id>) {
-        let mut ctx = self.ctx(ids);
-        while let Some(&id) = ctx.needs_redraw.iter().next() {
-            ctx.redraw(&ctx.widgets.get(id));
-        }
-    }
-}
-
-impl<'a, 'c> Painter<'a, 'c> {
-    fn primitive_at<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
-        let h = self.ctx.layers.write(
-            self.layer,
-            PrimitiveInst {
-                id: self.id(),
-                primitive,
-                region,
-                mask_idx: self.mask,
-            },
-        );
-        if self.mask != MaskIdx::NONE {
-            // TODO: I have no clue if this works at all :joy:
-            self.ctx.masks.push_ref(self.mask);
-        }
-        self.primitives.push(h);
-    }
-
-    /// Writes a primitive to be rendered
-    pub fn primitive<P: Primitive>(&mut self, primitive: P) {
-        self.primitive_at(primitive, self.region)
-    }
-
-    pub fn primitive_within<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
-        self.primitive_at(primitive, region.within(&self.region));
-    }
-
-    pub fn set_mask(&mut self, region: UiRegion) {
-        assert!(self.mask == MaskIdx::NONE);
-        self.mask = self.ctx.masks.push(Mask { region });
-    }
-
-    /// Draws a widget within this widget's region.
-    pub fn widget<W: Widget + ?Sized + Unsize<dyn Widget>>(&mut self, id: &WidgetRef<W>) {
-        self.widget_at(id, self.region);
-    }
-
-    /// Draws a widget somewhere within this one.
-    /// Useful for drawing child widgets in select areas.
-    pub fn widget_within<W: Widget + ?Sized + Unsize<dyn Widget>>(
-        &mut self,
-        id: &WidgetRef<W>,
-        region: UiRegion,
-    ) {
-        self.widget_at(id, region.within(&self.region));
-    }
-
-    fn widget_at<W: Widget + ?Sized + Unsize<dyn Widget>>(
-        &mut self,
-        id: &WidgetRef<W>,
-        region: UiRegion,
-    ) {
-        self.children.push(id.id());
-        self.ctx
-            .draw_inner(self.layer, id, region, Some(self.id()), self.mask, None);
-    }
-
-    pub fn texture_within(&mut self, handle: &TextureHandle, region: UiRegion) {
-        self.textures.push(handle.clone());
-        self.primitive_at(handle.primitive(), region.within(&self.region));
-    }
-
-    pub fn texture(&mut self, handle: &TextureHandle) {
-        self.textures.push(handle.clone());
-        self.primitive(handle.primitive());
-    }
-
-    pub fn texture_at(&mut self, handle: &TextureHandle, region: UiRegion) {
-        self.textures.push(handle.clone());
-        self.primitive_at(handle.primitive(), region);
-    }
-
-    /// returns (handle, offset from top left)
-    pub fn render_text(&mut self, buffer: &mut TextBuffer, attrs: &TextAttrs) -> RenderedText {
-        self.ctx
-            .text
-            .get_mut()
-            .draw(buffer, attrs, self.ctx.textures)
-    }
-
-    pub fn region(&self) -> UiRegion {
-        self.region
-    }
-
-    pub fn size<W: Widget + ?Sized>(&mut self, id: &WidgetRef<W>) -> Size {
-        self.size_ctx().size(id)
-    }
-
-    pub fn len_axis<W: Widget + ?Sized>(&mut self, id: &WidgetRef<W>, axis: Axis) -> Len {
-        match axis {
-            Axis::X => self.size_ctx().width(id),
-            Axis::Y => self.size_ctx().height(id),
-        }
-    }
-
-    pub fn size_ctx(&mut self) -> SizeCtx<'_> {
-        SizeCtx {
-            source: self.id(),
-            id: self.id(),
-            text: self.ctx.text,
-            textures: self.ctx.textures,
-            output_size: self.ctx.output_size,
-            checked_width: &mut self.children_width,
-            checked_height: &mut self.children_height,
-            cache_width: &mut self.ctx.cache_width,
-            cache_height: &mut self.ctx.cache_height,
-            outer: self.region.size(),
-        }
-    }
-
-    pub fn output_size(&self) -> Vec2 {
-        self.ctx.output_size
-    }
-
-    pub fn px_size(&mut self) -> Vec2 {
-        self.region.size().to_abs(self.ctx.output_size)
-    }
-
-    pub fn text_data(&mut self) -> &mut TextData {
-        self.ctx.text
-    }
-
-    pub fn child_layer(&mut self) {
-        self.layer = self.ctx.layers.child(self.layer);
-    }
-
-    pub fn next_layer(&mut self) {
-        self.layer = self.ctx.layers.next(self.layer);
-    }
-
-    pub fn label(&self) -> Ref<'_, String> {
-        self.widget.get_label()
-    }
-
-    pub fn id(&self) -> Id {
-        self.id
-    }
-}
-
-pub struct SizeCtx<'a> {
-    pub text: &'a mut TextData,
-    pub textures: &'a mut Textures,
-    source: Id,
-    cache_width: &'a mut HashMap<Id, (UiVec2, Len)>,
-    cache_height: &'a mut HashMap<Id, (UiVec2, Len)>,
-    checked_width: &'a mut HashMap<Id, (UiVec2, Len)>,
-    checked_height: &'a mut HashMap<Id, (UiVec2, Len)>,
-    /// TODO: should this be pub? rn used for sized
-    pub outer: UiVec2,
-    output_size: Vec2,
-    id: Id,
-}
-
-impl SizeCtx<'_> {
-    pub fn id(&self) -> &Id {
-        &self.id
-    }
-
-    pub fn source(&self) -> &Id {
-        &self.source
-    }
-
-    pub fn width<W: Widget + ?Sized>(&mut self, widget: &WidgetRef<W>) -> Len {
-        // first check cache
-        // TODO: is this needed? broken rn bc does not store children during upper size check,
-        // so if something actually using check_* hits cache it fails to add them
-        // if let Some(&(outer, len)) = self.cache_width.get(&id)
-        //     && outer == self.outer
-        // {
-        //     self.checked_width.insert(id, (self.outer, len));
-        //     return len;
-        // }
-        // store self vars that need to be maintained
-        let id = widget.id();
-        let self_outer = self.outer;
-        let self_id = self.id;
-        // get size of input id
-        self.id = id;
-        let len = widget.get_mut_quiet().desired_width(self);
-        // restore vars & update cache + checked
-        self.outer = self_outer;
-        self.id = self_id;
-        self.cache_width.insert(id, (self.outer, len));
-        self.checked_width.insert(id, (self.outer, len));
-        len
-    }
-
-    // TODO: should be refactored to share code w width_inner
-    pub fn height<W: Widget + ?Sized>(&mut self, widget: &WidgetRef<W>) -> Len {
-        // if let Some(&(outer, len)) = self.cache_height.get(&id)
-        //     && outer == self.outer
-        // {
-        //     self.checked_height.insert(id, (self.outer, len));
-        //     return len;
-        // }
-        let id = widget.id();
-        let self_outer = self.outer;
-        let self_id = self.id;
-        self.id = id;
-        let len = widget.get_mut_quiet().desired_height(self);
-        self.outer = self_outer;
-        self.id = self_id;
-        self.cache_height.insert(id, (self.outer, len));
-        self.checked_height.insert(id, (self.outer, len));
-        len
-    }
-
-    pub fn len_axis<W: Widget + ?Sized>(&mut self, id: &WidgetRef<W>, axis: Axis) -> Len {
-        match axis {
-            Axis::X => self.width(id),
-            Axis::Y => self.height(id),
-        }
-    }
-
-    pub fn size<W: Widget + ?Sized>(&mut self, id: &WidgetRef<W>) -> Size {
-        Size {
-            x: self.width(id),
-            y: self.height(id),
-        }
-    }
-
-    pub fn px_size(&mut self) -> Vec2 {
-        self.outer.to_abs(self.output_size)
-    }
-
-    pub fn output_size(&mut self) -> Vec2 {
-        self.output_size
-    }
-
-    pub fn draw_text(&mut self, buffer: &mut TextBuffer, attrs: &TextAttrs) -> RenderedText {
-        self.text.get_mut().draw(buffer, attrs, self.textures)
-    }
-}
--- a/core/src/layout/primitive/mask.rs
+++ b/core/src/layout/primitive/mask.rs
@@ -1,46 +0,0 @@
-//! tree structure for masking
-
-use crate::layout::UiRegion;
-
-pub struct Masks {
-    data: Vec<MaskNode>,
-}
-
-#[repr(C)]
-#[derive(Clone, Copy)]
-pub struct MaskPtr(u32);
-
-#[repr(C)]
-pub struct MaskNode {
-    /// TODO: this is just a rect for now,
-    /// but would like to support arbitrary masks
-    /// at some point; custom shader
-    /// would probably handle that case
-    /// bc you'd need to render to a special target
-    /// anyways
-    region: UiRegion,
-    prev: MaskPtr,
-}
-
-impl MaskPtr {
-    const NONE: Self = Self(u32::MAX);
-}
-
-impl Masks {
-    pub fn push(&mut self, parent: MaskPtr, region: UiRegion) -> MaskPtr {
-        match parent.0 {
-            _ => {
-            }
-            u32::MAX => {
-                let i = self.data.len();
-                self.data.push(MaskNode {
-                    region,
-                    prev: parent,
-                });
-                MaskPtr(i as u32)
-            }
-        }
-    }
-
-    pub fn pop(&mut self, i: usize) {}
-}
--- a/core/src/layout/ui.rs
+++ b/core/src/layout/ui.rs
@@ -1,167 +0,0 @@
-use image::DynamicImage;
-
-use crate::{
-    layout::{
-        IdLike, PainterData, PixelRegion, TextureHandle, Vec2, Widget, WidgetInstance, WidgetLike,
-        WidgetRef, WidgetUpdate,
-    },
-    util::{HashSet, Id},
-};
-use std::sync::mpsc::{Receiver, channel};
-
-pub struct Ui {
-    pub(crate) data: PainterData,
-    root: Option<WidgetRef>,
-    updates: HashSet<Id>,
-    free: Vec<Id>,
-    recv: Receiver<WidgetUpdate>,
-    full_redraw: bool,
-    resized: bool,
-}
-
-impl Ui {
-    pub fn add<W: Widget, Tag>(&mut self, w: impl WidgetLike<Tag, Widget = W>) -> WidgetRef<W> {
-        w.add(self)
-    }
-
-    pub fn add_widget<W: Widget>(&mut self, w: W) -> WidgetRef<W> {
-        self.data.widgets.insert(w)
-    }
-
-    pub fn set_root<Tag>(&mut self, w: impl WidgetLike<Tag>) {
-        self.root = Some(w.add(self));
-        self.full_redraw = true;
-    }
-
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    pub fn add_texture(&mut self, image: DynamicImage) -> TextureHandle {
-        self.data.textures.add(image)
-    }
-
-    pub fn resize(&mut self, size: impl Into<Vec2>) {
-        self.data.output_size = size.into();
-        self.resized = true;
-    }
-
-    fn redraw_all(&mut self) {
-        for (_, inst) in self.data.active.drain() {
-            for m in self.data.modules.iter_mut() {
-                m.on_undraw(&inst);
-            }
-        }
-        // free before bc nothing should exist
-        self.free();
-        if let Some(root) = &self.root {
-            self.data.draw(root);
-        }
-    }
-
-    pub fn update(&mut self) -> bool {
-        for update in self.recv.try_iter() {
-            match update {
-                WidgetUpdate::Drop(id) => {
-                    self.free.push(id);
-                }
-                WidgetUpdate::Mutate(id) => {
-                    self.updates.insert(id);
-                }
-            }
-        }
-        if self.full_redraw {
-            self.redraw_all();
-            self.full_redraw = false;
-            true
-        } else if self.resized {
-            self.resized = false;
-            self.redraw_all();
-            true
-        } else if !self.updates.is_empty() {
-            self.redraw_updates();
-            true
-        } else {
-            false
-        }
-    }
-
-    fn redraw_updates(&mut self) {
-        self.data.redraw(std::mem::take(&mut self.updates));
-        self.free();
-    }
-
-    /// free any resources that don't have references anymore
-    fn free(&mut self) {
-        for id in self.free.drain(..) {
-            for m in self.data.modules.iter_mut() {
-                m.on_remove(&id);
-            }
-            self.data.widgets.delete(id);
-        }
-        self.data.textures.free();
-    }
-
-    pub fn needs_redraw(&self) -> bool {
-        self.full_redraw || !self.updates.is_empty()
-    }
-
-    pub fn num_widgets(&self) -> usize {
-        self.data.widgets.len()
-    }
-
-    pub fn active_widgets(&self) -> usize {
-        self.data.active.len()
-    }
-
-    pub fn debug_layers(&self) {
-        for ((idx, depth), primitives) in self.data.layers.iter_depth() {
-            let indent = " ".repeat(depth * 2);
-            let len = primitives.instances().len();
-            print!("{indent}{idx}: {len} primitives");
-            if len >= 1 {
-                print!(" ({})", primitives.instances()[0].binding);
-            }
-            println!();
-        }
-    }
-
-    pub fn window_region<W>(&self, id: &impl IdLike<W>) -> Option<PixelRegion> {
-        let region = self.data.active.get(&id.id())?.region;
-        Some(region.to_px(self.data.output_size))
-    }
-
-    pub fn debug(&self, label: &str) -> impl Iterator<Item = &WidgetInstance> {
-        self.data.active.iter().filter_map(move |(id, inst)| {
-            let widget = &self.data.widgets.get(*id);
-            if widget.get_label().as_str() == label {
-                Some(inst)
-            } else {
-                None
-            }
-        })
-    }
-
-    pub fn data(&self) -> &PainterData {
-        &self.data
-    }
-
-    pub fn data_mut(&mut self) -> &mut PainterData {
-        &mut self.data
-    }
-}
-
-impl Default for Ui {
-    fn default() -> Self {
-        let (send, recv) = channel();
-        Self {
-            data: PainterData::new(send),
-            root: Default::default(),
-            updates: Default::default(),
-            free: Default::default(),
-            full_redraw: false,
-            recv,
-            resized: false,
-        }
-    }
-}
--- a/core/src/layout/view.rs
+++ b/core/src/layout/view.rs
@@ -1,17 +0,0 @@
-use crate::layout::{Widget, WidgetLike, WidgetRef};
-use std::marker::Unsize;
-
-pub trait WidgetView {
-    type Widget: Widget + ?Sized + Unsize<dyn Widget> = dyn Widget;
-    fn view(&self) -> &WidgetRef<Self::Widget>;
-}
-
-pub struct ViewTag;
-
-impl<WV: WidgetView> WidgetLike<ViewTag> for WV {
-    type Widget = WV::Widget;
-
-    fn add(self, _ui: &mut super::Ui) -> WidgetRef<Self::Widget> {
-        self.view().clone()
-    }
-}
--- a/core/src/layout/widget/handle.rs
+++ b/core/src/layout/widget/handle.rs
@@ -1,163 +0,0 @@
-use std::{
-    cell::{Ref, RefMut},
-    marker::Unsize,
-    ops::CoerceUnsized,
-    sync::mpsc::Sender,
-};
-
-use crate::{
-    layout::{IdFnTag, IdTag, Ui, Widget, WidgetLike},
-    util::{Handle, Id, WeakHandle},
-};
-
-/// An handle for a widget in a UI.
-///
-/// TODO: ergonomic clones when they get put in rust-analyzer & don't cause ICEs?
-pub struct WidgetRef<W: ?Sized = dyn Widget>(Handle<Inner<W>>);
-pub struct WeakWidgetRef<W: ?Sized = dyn Widget>(WeakHandle<Inner<W>>);
-
-struct Inner<W: ?Sized> {
-    id: Id,
-    send: Sender<WidgetUpdate>,
-    label: String,
-    widget: W,
-}
-
-pub enum WidgetUpdate {
-    Drop(Id),
-    Mutate(Id),
-}
-
-impl<W> PartialEq for WidgetRef<W> {
-    fn eq(&self, other: &Self) -> bool {
-        self.id() == other.id()
-    }
-}
-
-impl<W> std::fmt::Debug for WidgetRef<W> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        self.id().fmt(f)
-    }
-}
-
-impl<W: ?Sized> Clone for WidgetRef<W> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-impl<W: Widget> WidgetRef<W> {
-    pub(super) fn new(id: Id, widget: W, send: Sender<WidgetUpdate>) -> Self {
-        let mut label = std::any::type_name::<W>().to_string();
-        if let (Some(first), Some(last)) = (label.find(":"), label.rfind(":")) {
-            label = label.split_at(first).0.to_string() + "::" + label.split_at(last + 1).1;
-        }
-        Self(
-            Inner {
-                widget,
-                id,
-                send,
-                label,
-            }
-            .into(),
-        )
-    }
-}
-
-impl<W: Widget + ?Sized + Unsize<dyn Widget>> WidgetRef<W> {
-    pub fn any(self) -> WidgetRef<dyn Widget> {
-        WidgetRef(self.0)
-    }
-    pub fn as_any(&self) -> WidgetRef<dyn Widget> {
-        WidgetRef(self.0.clone())
-    }
-}
-
-impl<W: ?Sized> WidgetRef<W> {
-    pub fn id(&self) -> Id {
-        self.0.get().id
-    }
-
-    pub fn get(&self) -> Ref<'_, W> {
-        Ref::map(self.0.get(), |i| &i.widget)
-    }
-
-    pub fn get_mut(&self) -> RefMut<'_, W> {
-        let inner = self.0.get_mut();
-        let _ = inner.send.send(WidgetUpdate::Mutate(inner.id));
-        RefMut::map(inner, |i| &mut i.widget)
-    }
-
-    pub fn get_mut_quiet(&self) -> RefMut<'_, W> {
-        RefMut::map(self.0.get_mut(), |i| &mut i.widget)
-    }
-
-    pub fn get_label(&self) -> Ref<'_, String> {
-        Ref::map(self.0.get(), |i| &i.label)
-    }
-
-    pub fn set_label(&self, label: impl Into<String>) {
-        self.0.get_mut().label = label.into();
-    }
-
-    pub fn refs(&self) -> usize {
-        self.0.refs()
-    }
-
-    pub fn weak(&self) -> WeakWidgetRef<W> {
-        WeakWidgetRef(self.0.weak())
-    }
-}
-
-impl<W: ?Sized> WeakWidgetRef<W> {
-    /// should guarantee that widget is still valid to prevent indexing failures
-    pub(crate) fn expect_strong(&self) -> WidgetRef<W> {
-        WidgetRef(self.0.strong().expect("widget should not be dropped"))
-    }
-}
-
-impl<W: Widget + ?Sized + Unsize<dyn Widget>> WeakWidgetRef<W> {
-    pub fn any(self) -> WeakWidgetRef<dyn Widget> {
-        WeakWidgetRef(self.0.clone())
-    }
-}
-
-impl<W: ?Sized> Drop for Inner<W> {
-    fn drop(&mut self) {
-        let _ = self.send.send(WidgetUpdate::Drop(self.id));
-    }
-}
-
-pub trait WidgetIdFn<W: ?Sized = dyn Widget>: FnOnce(&mut Ui) -> WidgetRef<W> {}
-impl<W: ?Sized, F: FnOnce(&mut Ui) -> WidgetRef<W>> WidgetIdFn<W> for F {}
-
-pub trait WidgetRet: FnOnce(&mut Ui) -> WidgetRef {}
-impl<F: FnOnce(&mut Ui) -> WidgetRef> WidgetRet for F {}
-
-impl<W: Widget + ?Sized + Unsize<dyn Widget> + 'static> WidgetLike<IdTag> for WidgetRef<W> {
-    type Widget = W;
-    fn add(self, _: &mut Ui) -> WidgetRef<W> {
-        self
-    }
-}
-
-impl<W: Widget + ?Sized + Unsize<dyn Widget> + 'static, F: FnOnce(&mut Ui) -> WidgetRef<W>>
-    WidgetLike<IdFnTag> for F
-{
-    type Widget = W;
-    fn add(self, ui: &mut Ui) -> WidgetRef<W> {
-        self(ui)
-    }
-}
-
-pub trait IdLike<W> {
-    fn id(&self) -> Id;
-}
-
-impl<W> IdLike<W> for WidgetRef<W> {
-    fn id(&self) -> Id {
-        self.id()
-    }
-}
-
-impl<W: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<WidgetRef<U>> for WidgetRef<W> {}
--- a/core/src/layout/widget/like.rs
+++ b/core/src/layout/widget/like.rs
@@ -1,79 +0,0 @@
-use super::*;
-use std::marker::Unsize;
-
-pub trait WidgetLike<Tag> {
-    type Widget: Widget + ?Sized + Unsize<dyn Widget> + 'static;
-
-    fn add(self, ui: &mut Ui) -> WidgetRef<Self::Widget>;
-
-    fn with_id<W2>(
-        self,
-        f: impl FnOnce(&mut Ui, WidgetRef<Self::Widget>) -> WidgetRef<W2>,
-    ) -> impl WidgetIdFn<W2>
-    where
-        Self: Sized,
-    {
-        move |ui| {
-            let id = self.add(ui);
-            f(ui, id)
-        }
-    }
-
-    fn set_root(self, ui: &mut Ui)
-    where
-        Self: Sized,
-    {
-        ui.set_root(self);
-    }
-}
-
-pub struct WidgetArr<const LEN: usize> {
-    pub arr: [WidgetRef; LEN],
-}
-
-impl<const LEN: usize> WidgetArr<LEN> {
-    pub fn new(arr: [WidgetRef; LEN]) -> Self {
-        Self { arr }
-    }
-}
-
-pub trait WidgetArrLike<const LEN: usize, Tag> {
-    fn ui(self, ui: &mut Ui) -> WidgetArr<LEN>;
-}
-
-impl<const LEN: usize> WidgetArrLike<LEN, ArrTag> for WidgetArr<LEN> {
-    fn ui(self, _: &mut Ui) -> WidgetArr<LEN> {
-        self
-    }
-}
-
-// I hate this language it's so bad why do I even use it
-macro_rules! impl_widget_arr {
-    ($n:expr;$($W:ident)*) => {
-        impl_widget_arr!($n;$($W)*;$(${concat($W,Tag)})*);
-    };
-    ($n:expr;$($W:ident)*;$($Tag:ident)*) => {
-        impl<$($W: WidgetLike<$Tag>,$Tag,)*> WidgetArrLike<$n, ($($Tag,)*)> for ($($W,)*) {
-            fn ui(self, ui: &mut Ui) -> WidgetArr<$n> {
-                #[allow(non_snake_case)]
-                let ($($W,)*) = self;
-                WidgetArr::new(
-                    [$($W.add(ui),)*],
-                )
-            }
-        }
-    };
-}
-
-impl_widget_arr!(1;A);
-impl_widget_arr!(2;A B);
-impl_widget_arr!(3;A B C);
-impl_widget_arr!(4;A B C D);
-impl_widget_arr!(5;A B C D E);
-impl_widget_arr!(6;A B C D E F);
-impl_widget_arr!(7;A B C D E F G);
-impl_widget_arr!(8;A B C D E F G H);
-impl_widget_arr!(9;A B C D E F G H I);
-impl_widget_arr!(10;A B C D E F G H I J);
-impl_widget_arr!(11;A B C D E F G H I J K);
-impl_widget_arr!(12;A B C D E F G H I J K L);
--- a/core/src/layout/widget/mod.rs
+++ b/core/src/layout/widget/mod.rs
@@ -1,63 +0,0 @@
-mod handle;
-mod like;
-mod tag;
-mod widgets;
-
-pub use handle::*;
-pub use like::*;
-pub use tag::*;
-pub use widgets::*;
-
-use crate::layout::{Len, Painter, SizeCtx, Ui};
-
-pub trait Widget: 'static {
-    fn draw(&mut self, painter: &mut Painter);
-    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len;
-    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len;
-}
-
-impl Widget for () {
-    fn draw(&mut self, _: &mut Painter) {}
-    fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
-        Len::ZERO
-    }
-    fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
-        Len::ZERO
-    }
-}
-
-/// A function that returns a widget given a UI.
-/// Useful for defining trait functions on widgets that create a parent widget so that the children
-/// don't need to be IDs yet
-pub trait WidgetFn<W: Widget + ?Sized>: FnOnce(&mut Ui) -> W {}
-impl<W: Widget, F: FnOnce(&mut Ui) -> W> WidgetFn<W> for F {}
-
-impl<W: Widget, F: FnOnce(&mut Ui) -> W> WidgetLike<FnTag> for F {
-    type Widget = W;
-    fn add(self, ui: &mut Ui) -> WidgetRef<W> {
-        self(ui).add(ui)
-    }
-}
-
-impl<W: Widget> WidgetLike<WidgetTag> for W {
-    type Widget = W;
-    fn add(self, ui: &mut Ui) -> WidgetRef<W> {
-        ui.add_widget(self)
-    }
-}
-
-pub trait WidgetOption {
-    fn get(self, ui: &mut Ui) -> Option<WidgetRef>;
-}
-
-impl WidgetOption for () {
-    fn get(self, _: &mut Ui) -> Option<WidgetRef> {
-        None
-    }
-}
-
-impl<F: FnOnce(&mut Ui) -> Option<WidgetRef>> WidgetOption for F {
-    fn get(self, ui: &mut Ui) -> Option<WidgetRef> {
-        self(ui)
-    }
-}
--- a/core/src/layout/widget/tag.rs
+++ b/core/src/layout/widget/tag.rs
@@ -1,5 +0,0 @@
-pub struct WidgetTag;
-pub struct FnTag;
-pub struct IdTag;
-pub struct IdFnTag;
-pub struct ArrTag;
--- a/core/src/layout/widget/widgets.rs
+++ b/core/src/layout/widget/widgets.rs
@@ -1,50 +0,0 @@
-use std::sync::mpsc::Sender;
-
-use crate::{
-    layout::{WeakWidgetRef, Widget, WidgetRef, WidgetUpdate},
-    util::{HashMap, Id, IdTracker},
-};
-
-pub struct Widgets {
-    ids: IdTracker,
-    map: HashMap<Id, WeakWidgetRef>,
-    send: Sender<WidgetUpdate>,
-}
-
-impl Widgets {
-    pub fn new(send: Sender<WidgetUpdate>) -> Self {
-        Self {
-            ids: IdTracker::default(),
-            map: HashMap::default(),
-            send,
-        }
-    }
-
-    pub fn get(&self, id: Id) -> WidgetRef {
-        self.map.get(&id).unwrap().expect_strong()
-    }
-
-    pub fn insert<W: Widget>(&mut self, widget: W) -> WidgetRef<W> {
-        let id = self.ids.next();
-        let rf = WidgetRef::new(id, widget, self.send.clone());
-        self.map.insert(id, rf.weak().any());
-        rf
-    }
-
-    pub fn delete(&mut self, id: Id) {
-        self.map.remove(&id);
-        self.ids.free(id);
-    }
-
-    pub fn reserve(&mut self) -> Id {
-        self.ids.next()
-    }
-
-    pub fn len(&self) -> usize {
-        self.map.len()
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.map.is_empty()
-    }
-}
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -11,9 +11,26 @@
 #![feature(associated_type_defaults)]
 #![feature(unsize)]
 #![feature(coerce_unsized)]
+#![feature(option_into_flat_iter)]
+
+mod attr;
+mod event;
+mod num;
+mod orientation;
+mod primitive;
+mod render;
+mod ui;
+mod widget;

-pub mod layout;
-pub mod render;
 pub mod util;

-pub use image;
+pub use attr::*;
+pub use event::*;
+pub use num::*;
+pub use orientation::*;
+pub use primitive::*;
+pub use render::*;
+pub use ui::*;
+pub use widget::*;
+
+pub type UiColor = primitive::Color<u8>;
--- a/core/src/layout/num.rs
+++ b/core/src/layout/num.rs
@@ -23,16 +23,8 @@ impl const UiNum for i32 {
    }
 }

-impl<T: const UiNum, U: const UiNum> const From<(T, U)> for Vec2
-where
-    (T, U): const Destruct,
-{
-    fn from((x, y): (T, U)) -> Self {
-        Self {
-            x: x.to_f32(),
-            y: y.to_f32(),
-        }
-    }
+pub const fn vec2(x: impl const UiNum, y: impl const UiNum) -> Vec2 {
+    Vec2::new(x.to_f32(), y.to_f32())
 }

 impl<T: const UiNum + Copy> const From<T> for Vec2 {
@@ -44,6 +36,14 @@ impl<T: const UiNum + Copy> const From<T> for Vec2 {
    }
 }

-pub const fn vec2(x: impl const UiNum, y: impl const UiNum) -> Vec2 {
-    Vec2::new(x.to_f32(), y.to_f32())
+impl<T: const UiNum, U: const UiNum> const From<(T, U)> for Vec2
+where
+    (T, U): const Destruct,
+{
+    fn from((x, y): (T, U)) -> Self {
+        Self {
+            x: x.to_f32(),
+            y: y.to_f32(),
+        }
+    }
 }
--- a/core/src/layout/orientation/align.rs
+++ b/core/src/layout/orientation/align.rs
@@ -1,4 +1,4 @@
-use crate::layout::vec2;
+use crate::vec2;

 use super::*;

--- a/core/src/layout/orientation/axis.rs
+++ b/core/src/layout/orientation/axis.rs
@@ -6,9 +6,6 @@ pub enum Axis {
    Y,
 }

-pub trait Axis_ {
-}
-
 impl std::ops::Not for Axis {
    type Output = Self;

@@ -71,3 +68,48 @@ impl Vec2 {
        }
    }
 }
+
+pub const trait AxisT {
+    fn get() -> Axis;
+}
+
+pub struct XAxis;
+impl const AxisT for XAxis {
+    fn get() -> Axis {
+        Axis::X
+    }
+}
+
+pub struct YAxis;
+impl const AxisT for YAxis {
+    fn get() -> Axis {
+        Axis::Y
+    }
+}
+
+#[derive(Clone, Copy, Debug, Default)]
+pub struct BothAxis<T> {
+    pub x: T,
+    pub y: T,
+}
+
+impl<T> BothAxis<T> {
+    pub const fn axis<A: const AxisT>(&mut self) -> &mut T {
+        match A::get() {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+    pub fn take_axis<A: const AxisT>(self) -> T {
+        match A::get() {
+            Axis::X => self.x,
+            Axis::Y => self.y,
+        }
+    }
+    pub fn axis_dyn(&mut self, axis: Axis) -> &mut T {
+        match axis {
+            Axis::X => &mut self.x,
+            Axis::Y => &mut self.y,
+        }
+    }
+}
--- a/core/src/layout/orientation/len.rs
+++ b/core/src/layout/orientation/len.rs
@@ -1,5 +1,5 @@
 use super::*;
-use crate::{layout::UiNum, util::impl_op};
+use crate::{UiNum, util::impl_op};

 #[derive(Debug, Default, Clone, Copy, PartialEq)]
 pub struct Size {
--- a/core/src/layout/orientation/mod.rs
+++ b/core/src/layout/orientation/mod.rs
@@ -3,7 +3,8 @@ mod axis;
 mod len;
 mod pos;

-use super::Vec2;
+use crate::util::Vec2;
+
 pub use align::*;
 pub use axis::*;
 pub use len::*;
--- a/core/src/layout/orientation/pos.rs
+++ b/core/src/layout/orientation/pos.rs
@@ -2,7 +2,7 @@ use std::{fmt::Display, hash::Hash, marker::Destruct};

 use super::*;
 use crate::{
-    layout::UiNum,
+    UiNum,
    util::{LerpUtil, impl_op},
 };

--- a/core/src/layout/primitive/color.rs
+++ b/core/src/layout/primitive/color.rs
@@ -1,11 +1,9 @@
-#![allow(clippy::multiple_bound_locations)]
-
 use std::marker::Destruct;

 /// stored in linear for sane manipulation
 #[repr(C)]
 #[derive(Clone, Copy, Hash, PartialEq, Eq, bytemuck::Zeroable, Debug)]
-pub struct Color<T: ColorNum> {
+pub struct Color<T> {
    pub r: T,
    pub g: T,
    pub b: T,
--- a/core/src/layout/primitive/layer.rs
+++ b/core/src/layout/primitive/layer.rs
@@ -1,6 +1,11 @@
 use std::ops::{Index, IndexMut};

-use crate::render::{MaskIdx, Primitive, PrimitiveHandle, PrimitiveInst, Primitives};
+use crate::{
+    render::{MaskIdx, Primitive, PrimitiveHandle, PrimitiveInst, Primitives},
+    util::to_mut,
+};
+
+pub type LayerId = usize;

 struct LayerNode<T> {
    next: Ptr,
@@ -49,13 +54,13 @@ impl<T: Default> Layers<T> {
        self.vec.push(LayerNode::head());
    }

-    fn push(&mut self, node: LayerNode<T>) -> usize {
+    fn push(&mut self, node: LayerNode<T>) -> LayerId {
        let i = self.vec.len();
        self.vec.push(node);
        i
    }

-    pub fn next(&mut self, i: usize) -> usize {
+    pub fn next(&mut self, i: LayerId) -> LayerId {
        if let Ptr::Next(i) = self.vec[i].next {
            return i;
        }
@@ -75,7 +80,7 @@ impl<T: Default> Layers<T> {
        i_new
    }

-    pub fn child(&mut self, i: usize) -> usize {
+    pub fn child(&mut self, i: LayerId) -> LayerId {
        if let Some(c) = self.vec[i].child {
            return c.head;
        }
@@ -100,11 +105,11 @@ impl<T: Default> Layers<T> {
        self.vec.iter_mut().map(|n| &mut n.data).enumerate()
    }

-    pub fn iter(&self) -> impl Iterator<Item = (usize, &T)> {
+    pub fn iter(&self) -> impl Iterator<Item = (LayerId, &T)> {
        self.indices().map(|i| (i, &self.vec[i].data))
    }

-    pub fn iter_depth(&self) -> impl Iterator<Item = ((usize, usize), &T)> {
+    pub fn iter_depth(&self) -> impl Iterator<Item = ((LayerId, usize), &T)> {
        self.indices()
            .map(|i| ((i, self.vec[i].depth), &self.vec[i].data))
    }
@@ -115,7 +120,11 @@ impl<T: Default> Layers<T> {
 }

 impl PrimitiveLayers {
-    pub fn write<P: Primitive>(&mut self, layer: usize, info: PrimitiveInst<P>) -> PrimitiveHandle {
+    pub fn write<P: Primitive>(
+        &mut self,
+        layer: LayerId,
+        info: PrimitiveInst<P>,
+    ) -> PrimitiveHandle {
        self[layer].write(layer, info)
    }

@@ -130,16 +139,16 @@ impl<T: Default> Default for Layers<T> {
    }
 }

-impl<T> Index<usize> for Layers<T> {
+impl<T> Index<LayerId> for Layers<T> {
    type Output = T;

-    fn index(&self, index: usize) -> &Self::Output {
+    fn index(&self, index: LayerId) -> &Self::Output {
        &self.vec[index].data
    }
 }

-impl<T> IndexMut<usize> for Layers<T> {
-    fn index_mut(&mut self, index: usize) -> &mut Self::Output {
+impl<T> IndexMut<LayerId> for Layers<T> {
+    fn index_mut(&mut self, index: LayerId) -> &mut Self::Output {
        &mut self.vec[index].data
    }
 }
@@ -170,8 +179,7 @@ impl<'a, T> Iterator for LayerIteratorMut<'a, T> {
    fn next(&mut self) -> Option<Self::Item> {
        let i = self.inner.next()?;
        // SAFETY: requires index iterator to work properly
-        #[allow(mutable_transmutes)]
-        let layer = unsafe { std::mem::transmute::<&T, &mut T>(&self.inner.vec[i].data) };
+        let layer = unsafe { to_mut(&self.inner.vec[i].data) };
        Some((i, layer))
    }
 }
@@ -180,8 +188,7 @@ impl<'a, T> DoubleEndedIterator for LayerIteratorMut<'a, T> {
    fn next_back(&mut self) -> Option<Self::Item> {
        let i = self.inner.next_back()?;
        // SAFETY: requires index iterator to work properly
-        #[allow(mutable_transmutes)]
-        let layer = unsafe { std::mem::transmute::<&T, &mut T>(&self.inner.vec[i].data) };
+        let layer = unsafe { to_mut(&self.inner.vec[i].data) };
        Some((i, layer))
    }
 }
--- a/core/src/layout/primitive/mod.rs
+++ b/core/src/layout/primitive/mod.rs
--- a/core/src/layout/primitive/text.rs
+++ b/core/src/layout/primitive/text.rs
@@ -1,29 +1,23 @@
-use std::simd::{Simd, num::SimdUint};
-
-use crate::{
-    layout::{Align, RegionAlign, TextureHandle, Textures, UiColor, Vec2},
-    util::Handle,
-};
+use crate::{Align, RegionAlign, TextureHandle, Textures, UiColor, util::Vec2};
 use cosmic_text::{
    Attrs, AttrsList, Buffer, CacheKey, Color, Family, FontSystem, Metrics, Placement, SwashCache,
    SwashContent,
 };
-use image::{GenericImageView, RgbaImage};
+use image::{DynamicImage, GenericImageView, RgbaImage};
+use std::simd::{Simd, num::SimdUint};

 /// TODO: properly wrap this
 pub mod text_lib {
    pub use cosmic_text::*;
 }

-pub type TextData = Handle<TextDataInner>;
-
-pub struct TextDataInner {
+pub struct TextData {
    pub font_system: FontSystem,
    pub swash_cache: SwashCache,
    glyph_cache: Vec<(Placement, CacheKey, Color)>,
 }

-impl Default for TextDataInner {
+impl Default for TextData {
    fn default() -> Self {
        Self {
            font_system: FontSystem::new(),
@@ -64,7 +58,7 @@ pub type TextBuffer = Buffer;

 impl Default for TextAttrs {
    fn default() -> Self {
-        let size = 14.0;
+        let size = 16.0;
        Self {
            color: UiColor::WHITE,
            font_size: size,
@@ -78,7 +72,7 @@ impl Default for TextAttrs {

 pub const LINE_HEIGHT_MULT: f32 = 1.1;

-impl TextDataInner {
+impl TextData {
    pub fn draw(
        &mut self,
        buffer: &mut TextBuffer,
@@ -191,3 +185,7 @@ pub struct RenderedText {
    pub top_left_offset: Vec2,
    pub size: Vec2,
 }
+
+pub trait HasTextures {
+    fn add_texture(&mut self, image: DynamicImage) -> TextureHandle;
+}
--- a/core/src/layout/primitive/texture.rs
+++ b/core/src/layout/primitive/texture.rs
@@ -1,12 +1,13 @@
+use crate::{
+    render::TexturePrimitive,
+    util::{RefCounter, Vec2},
+};
+use image::{DynamicImage, GenericImageView};
 use std::{
    ops::Index,
    sync::mpsc::{Receiver, Sender, channel},
 };

-use image::{DynamicImage, GenericImageView};
-
-use crate::{layout::Vec2, render::TexturePrimitive, util::RefCounter};
-
 #[derive(Debug, Clone)]
 pub struct TextureHandle {
    inner: TexturePrimitive,
--- a/core/src/render/data.rs
+++ b/core/src/render/data.rs
@@ -1,4 +1,4 @@
-use crate::{layout::UiRegion, util::Id};
+use crate::{UiRegion, util::Id};
 use wgpu::*;

 #[repr(C)]
--- a/core/src/render/mod.rs
+++ b/core/src/render/mod.rs
@@ -1,7 +1,7 @@
 use std::num::NonZero;

 use crate::{
-    layout::Ui,
+    UiData, UiRenderState,
    render::{data::PrimitiveInstance, texture::GpuTextures, util::ArrBuf},
    util::HashMap,
 };
@@ -59,12 +59,18 @@ impl UiRenderNode {
        }
    }

-    pub fn update(&mut self, device: &Device, queue: &Queue, ui: &mut Ui) {
+    pub fn update(
+        &mut self,
+        device: &Device,
+        queue: &Queue,
+        ui: &mut UiData,
+        ui_render: &mut UiRenderState,
+    ) {
        self.active.clear();
-        for (i, primitives) in ui.data.layers.iter_mut() {
+        for (i, primitives) in ui_render.layers.iter_mut() {
            self.active.push(i);
            for change in primitives.apply_free() {
-                if let Some(inst) = ui.data.active.get_mut(&change.id) {
+                if let Some(inst) = ui_render.active.get_mut(&change.id) {
                    for h in &mut inst.primitives {
                        if h.layer == i && h.inst_idx == change.old {
                            h.inst_idx = change.new;
@@ -101,10 +107,10 @@ impl UiRenderNode {
            }
        }
        let mut changed = false;
-        changed |= self.textures.update(&mut ui.data.textures);
-        if ui.data.masks.changed {
-            ui.data.masks.changed = false;
-            self.masks.update(device, queue, &ui.data.masks[..]);
+        changed |= self.textures.update(&mut ui.textures);
+        if ui.masks.changed {
+            ui.masks.changed = false;
+            self.masks.update(device, queue, &ui.masks[..]);
            changed = true;
        }
        if changed {
@@ -183,7 +189,7 @@ impl UiRenderNode {
        let pipeline_layout = device.create_pipeline_layout(&PipelineLayoutDescriptor {
            label: Some("UI Shape Pipeline Layout"),
            bind_group_layouts: &[&uniform_layout, &primitive_layout, &rsc_layout],
-            push_constant_ranges: &[],
+            immediate_size: 0,
        });
        let pipeline = device.create_render_pipeline(&RenderPipelineDescriptor {
            label: Some("UI Shape Pipeline"),
@@ -219,7 +225,7 @@ impl UiRenderNode {
                mask: !0,
                alpha_to_coverage_enabled: false,
            },
-            multiview: None,
+            multiview_mask: None,
            cache: None,
        });

--- a/core/src/render/primitive.rs
+++ b/core/src/render/primitive.rs
@@ -1,19 +1,18 @@
 use std::ops::{Deref, DerefMut};

 use crate::{
-    layout::{Color, UiRegion},
+    Color, UiRegion, WidgetId,
    render::{
        ArrBuf,
        data::{MaskIdx, PrimitiveInstance},
    },
-    util::Id,
 };
 use bytemuck::Pod;
 use wgpu::*;

 pub struct Primitives {
    instances: Vec<PrimitiveInstance>,
-    assoc: Vec<Id>,
+    assoc: Vec<WidgetId>,
    data: PrimitiveData,
    free: Vec<usize>,
    pub updated: bool,
@@ -99,7 +98,7 @@ macro_rules! primitives {
 }

 pub struct PrimitiveInst<P> {
-    pub id: Id,
+    pub id: WidgetId,
    pub primitive: P,
    pub region: UiRegion,
    pub mask_idx: MaskIdx,
@@ -175,7 +174,7 @@ impl Primitives {
 }

 pub struct PrimitiveChange {
-    pub id: Id,
+    pub id: WidgetId,
    pub old: usize,
    pub new: usize,
 }
--- a/core/src/render/texture.rs
+++ b/core/src/render/texture.rs
@@ -1,7 +1,7 @@
 use image::{DynamicImage, EncodableLayout};
 use wgpu::{util::DeviceExt, *};

-use crate::layout::{TextureUpdate, Textures};
+use crate::{TextureUpdate, Textures};

 pub struct GpuTextures {
    device: Device,
--- a/core/src/ui/active.rs
+++ b/core/src/ui/active.rs
@@ -0,0 +1,14 @@
+use crate::{LayerId, MaskIdx, PrimitiveHandle, TextureHandle, UiRegion, WidgetId};
+
+/// important non rendering data for retained drawing
+#[derive(Debug)]
+pub struct ActiveData {
+    pub id: WidgetId,
+    pub region: UiRegion,
+    pub parent: Option<WidgetId>,
+    pub textures: Vec<TextureHandle>,
+    pub primitives: Vec<PrimitiveHandle>,
+    pub children: Vec<WidgetId>,
+    pub mask: MaskIdx,
+    pub layer: LayerId,
+}
--- a/core/src/ui/cache.rs
+++ b/core/src/ui/cache.rs
@@ -0,0 +1,18 @@
+use crate::{BothAxis, Len, UiVec2, WidgetId, util::HashMap};
+
+#[derive(Default)]
+pub struct Cache {
+    pub size: BothAxis<HashMap<WidgetId, (UiVec2, Len)>>,
+}
+
+impl Cache {
+    pub fn remove(&mut self, id: WidgetId) {
+        self.size.x.remove(&id);
+        self.size.y.remove(&id);
+    }
+
+    pub fn clear(&mut self) {
+        self.size.x.clear();
+        self.size.y.clear();
+    }
+}
--- a/core/src/ui/mod.rs
+++ b/core/src/ui/mod.rs
@@ -0,0 +1,47 @@
+use crate::{Mask, TextData, Textures, WeakWidget, WidgetId, Widgets, util::TrackedArena};
+
+mod active;
+mod cache;
+mod painter;
+mod render_state;
+mod size;
+
+pub use active::*;
+pub use painter::Painter;
+pub use render_state::*;
+pub use size::*;
+
+#[derive(Default)]
+pub struct UiData {
+    pub widgets: Widgets,
+    pub textures: Textures,
+    pub text: TextData,
+    pub masks: TrackedArena<Mask, u32>,
+}
+
+pub trait UiRsc {
+    fn ui(&self) -> &UiData;
+    fn ui_mut(&mut self) -> &mut UiData;
+
+    #[allow(unused_variables)]
+    fn on_add(&mut self, id: WeakWidget) {}
+    #[allow(unused_variables)]
+    fn on_remove(&mut self, id: WidgetId) {}
+    #[allow(unused_variables)]
+    fn on_draw(&mut self, active: &ActiveData, redrawn: bool) {}
+    #[allow(unused_variables)]
+    fn on_undraw(&mut self, active: &ActiveData) {}
+
+    fn widgets(&self) -> &Widgets {
+        &self.ui().widgets
+    }
+    fn widgets_mut(&mut self) -> &mut Widgets {
+        &mut self.ui_mut().widgets
+    }
+    fn free(&mut self) {
+        while let Some(id) = self.widgets_mut().free_next() {
+            self.on_remove(id);
+        }
+        self.ui_mut().textures.free();
+    }
+}
--- a/core/src/ui/painter.rs
+++ b/core/src/ui/painter.rs
@@ -0,0 +1,145 @@
+use crate::{
+    Axis, Len, RenderedText, Size, SizeCtx, StrongWidget, TextAttrs, TextBuffer, TextData,
+    TextureHandle, UiRegion, UiRenderState, UiRsc, Widget, WidgetId,
+    render::{Mask, MaskIdx, Primitive, PrimitiveHandle, PrimitiveInst},
+    util::Vec2,
+};
+
+/// makes your surfaces look pretty
+pub struct Painter<'a> {
+    pub(super) state: &'a mut UiRenderState,
+    pub(super) rsc: &'a mut dyn UiRsc,
+
+    pub(super) region: UiRegion,
+    pub(super) mask: MaskIdx,
+    pub(super) textures: Vec<TextureHandle>,
+    pub(super) primitives: Vec<PrimitiveHandle>,
+    pub(super) children: Vec<WidgetId>,
+    pub layer: usize,
+    pub(super) id: WidgetId,
+}
+
+impl<'a> Painter<'a> {
+    fn primitive_at<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
+        let h = self.state.layers.write(
+            self.layer,
+            PrimitiveInst {
+                id: self.id,
+                primitive,
+                region,
+                mask_idx: self.mask,
+            },
+        );
+        if self.mask != MaskIdx::NONE {
+            // TODO: I have no clue if this works at all :joy:
+            self.rsc.ui_mut().masks.push_ref(self.mask);
+        }
+        self.primitives.push(h);
+    }
+
+    /// Writes a primitive to be rendered
+    pub fn primitive<P: Primitive>(&mut self, primitive: P) {
+        self.primitive_at(primitive, self.region)
+    }
+
+    pub fn primitive_within<P: Primitive>(&mut self, primitive: P, region: UiRegion) {
+        self.primitive_at(primitive, region.within(&self.region));
+    }
+
+    pub fn set_mask(&mut self, region: UiRegion) {
+        assert!(self.mask == MaskIdx::NONE);
+        self.mask = self.rsc.ui_mut().masks.push(Mask { region });
+    }
+
+    /// Draws a widget within this widget's region.
+    pub fn widget<W: ?Sized>(&mut self, id: &StrongWidget<W>) {
+        self.widget_at(id, self.region);
+    }
+
+    /// Draws a widget somewhere within this one.
+    /// Useful for drawing child widgets in select areas.
+    pub fn widget_within<W: ?Sized>(&mut self, id: &StrongWidget<W>, region: UiRegion) {
+        self.widget_at(id, region.within(&self.region));
+    }
+
+    fn widget_at<W: ?Sized>(&mut self, id: &StrongWidget<W>, region: UiRegion) {
+        self.children.push(id.id());
+        self.state.draw_inner(
+            self.layer,
+            id.id(),
+            region,
+            Some(self.id),
+            self.mask,
+            None,
+            self.rsc,
+        );
+    }
+
+    pub fn texture_within(&mut self, handle: &TextureHandle, region: UiRegion) {
+        self.textures.push(handle.clone());
+        self.primitive_at(handle.primitive(), region.within(&self.region));
+    }
+
+    pub fn texture(&mut self, handle: &TextureHandle) {
+        self.textures.push(handle.clone());
+        self.primitive(handle.primitive());
+    }
+
+    pub fn texture_at(&mut self, handle: &TextureHandle, region: UiRegion) {
+        self.textures.push(handle.clone());
+        self.primitive_at(handle.primitive(), region);
+    }
+
+    /// returns (handle, offset from top left)
+    pub fn render_text(&mut self, buffer: &mut TextBuffer, attrs: &TextAttrs) -> RenderedText {
+        let ui = self.rsc.ui_mut();
+        ui.text.draw(buffer, attrs, &mut ui.textures)
+    }
+
+    pub fn region(&self) -> UiRegion {
+        self.region
+    }
+
+    pub fn size<W: ?Sized + Widget>(&mut self, id: &StrongWidget<W>) -> Size {
+        self.size_ctx().size(id)
+    }
+
+    pub fn len_axis<W: ?Sized + Widget>(&mut self, id: &StrongWidget<W>, axis: Axis) -> Len {
+        match axis {
+            Axis::X => self.size_ctx().width(id),
+            Axis::Y => self.size_ctx().height(id),
+        }
+    }
+
+    pub fn output_size(&self) -> Vec2 {
+        self.state.output_size
+    }
+
+    pub fn px_size(&mut self) -> Vec2 {
+        self.region.size().to_abs(self.state.output_size)
+    }
+
+    pub fn text_data(&mut self) -> &mut TextData {
+        &mut self.rsc.ui_mut().text
+    }
+
+    pub fn child_layer(&mut self) {
+        self.layer = self.state.layers.child(self.layer);
+    }
+
+    pub fn next_layer(&mut self) {
+        self.layer = self.state.layers.next(self.layer);
+    }
+
+    pub fn label(&self) -> &str {
+        &self.rsc.widgets().data(self.id).unwrap().label
+    }
+
+    pub fn id(&self) -> &WidgetId {
+        &self.id
+    }
+
+    pub fn size_ctx(&mut self) -> SizeCtx<'_> {
+        self.state.size_ctx(self.id, self.region.size(), self.rsc)
+    }
+}
--- a/core/src/ui/render_state.rs
+++ b/core/src/ui/render_state.rs
@@ -0,0 +1,321 @@
+use crate::{
+    ActiveData, Axis, IdLike, MaskIdx, Painter, PixelRegion, PrimitiveLayers, SizeCtx,
+    StrongWidget, UiRegion, UiRsc, UiVec2, WidgetId, Widgets,
+    ui::cache::Cache,
+    util::{HashMap, HashSet, Vec2, forget_ref},
+};
+
+pub struct UiRenderState {
+    pub active: HashMap<WidgetId, ActiveData>,
+    pub layers: PrimitiveLayers,
+    pub(super) output_size: Vec2,
+    pub cache: Cache,
+
+    old_root: Option<WidgetId>,
+    resized: bool,
+    draw_started: HashSet<WidgetId>,
+}
+
+impl UiRenderState {
+    pub fn new() -> Self {
+        Self {
+            active: Default::default(),
+            layers: Default::default(),
+            cache: Default::default(),
+            output_size: Vec2::ZERO,
+            old_root: None,
+            resized: false,
+            draw_started: Default::default(),
+        }
+    }
+
+    pub fn resize(&mut self, size: impl Into<Vec2>) {
+        self.output_size = size.into();
+        self.resized = true;
+    }
+
+    pub fn update<'a>(&mut self, root: impl Into<Option<&'a StrongWidget>>, rsc: &mut dyn UiRsc) {
+        // safety mechanism for memory leaks; might wanna return a result instead so user can
+        // decide whether to panic or not
+        if !rsc.widgets().waiting.is_empty() {
+            let widgets = rsc.widgets();
+            let len = widgets.waiting.len();
+            let all: Vec<_> = widgets
+                .waiting
+                .iter()
+                .map(|&w| format!("'{}' ({w:?})", widgets.label(w)))
+                .collect();
+            panic!(
+                "{len} widget(s) were never upgraded\n\
+                this is likely a memory leak; consider upgrading to strong if you plan on using it later\n\
+                weak widgets: {all:#?}"
+            );
+        }
+        let root = root.into();
+        if self.root_changed(root) || self.resized {
+            self.redraw_all(root, rsc);
+            self.old_root = root.map(|r| r.id());
+            self.resized = false;
+        } else if rsc.widgets().has_updates() {
+            self.redraw_updates(rsc);
+        }
+    }
+
+    fn redraw_all(&mut self, root: Option<&StrongWidget>, rsc: &mut dyn UiRsc) {
+        self.clear(rsc);
+        // free all resources & cache
+        if let Some(id) = root {
+            self.draw_inner(0, id.id(), UiRegion::FULL, None, MaskIdx::NONE, None, rsc);
+        }
+    }
+
+    // TODO: should prolly make a DrawInfo struct or smth for everything other than rsc
+    #[allow(clippy::too_many_arguments)]
+    pub(super) fn draw_inner(
+        &mut self,
+        layer: usize,
+        id: WidgetId,
+        region: UiRegion,
+        parent: Option<WidgetId>,
+        mask: MaskIdx,
+        old_children: Option<Vec<WidgetId>>,
+        rsc: &mut dyn UiRsc,
+    ) {
+        let mut redrawn = old_children.is_some();
+        let mut old_children = old_children.unwrap_or_default();
+        if let Some(active) = self.active.get_mut(&id)
+            && !rsc.widgets().needs_redraw.contains(&id)
+        {
+            redrawn = true;
+            // check to see if we can skip drawing first
+            if active.region == region {
+                return;
+            } else if active.region.size() == region.size() {
+                // TODO: epsilon?
+                let from = active.region;
+                self.mov(id, from, region);
+                return;
+            }
+            // if not, then maintain resize and track old children to remove unneeded
+            let active = self.remove(id, false, rsc).unwrap();
+            old_children = active.children;
+        }
+
+        // draw widget
+        self.draw_started.insert(id);
+
+        let mut painter = Painter {
+            state: self,
+            region,
+            mask,
+            layer,
+            id,
+            textures: Vec::new(),
+            primitives: Vec::new(),
+            children: Vec::new(),
+            rsc,
+        };
+
+        let mut widget = painter.rsc.widgets().get_dyn_dynamic(id);
+        widget.draw(&mut painter);
+        drop(widget);
+
+        let Painter {
+            state: _,
+            rsc: _,
+            region,
+            mask,
+            textures,
+            primitives,
+            children,
+            layer,
+            id,
+        } = painter;
+
+        // add to active
+        let active = ActiveData {
+            id,
+            region,
+            parent,
+            textures,
+            primitives,
+            children,
+            mask,
+            layer,
+        };
+
+        // remove old children that weren't kept
+        for c in &old_children {
+            if !active.children.contains(c) {
+                self.remove_rec(*c, rsc);
+            }
+        }
+
+        rsc.on_draw(&active, redrawn);
+        self.active.insert(id, active);
+    }
+
+    fn mov(&mut self, id: WidgetId, from: UiRegion, to: UiRegion) {
+        let active = self.active.get_mut(&id).unwrap();
+        for h in &active.primitives {
+            let region = self.layers[h.layer].region_mut(h);
+            *region = region.outside(&from).within(&to);
+        }
+        active.region = active.region.outside(&from).within(&to);
+        // SAFETY: children cannot be recursive
+        let children = unsafe { forget_ref(&active.children) };
+        for child in children {
+            self.mov(*child, from, to);
+        }
+    }
+
+    /// NOTE: instance textures are cleared and self.textures freed
+    fn remove(&mut self, id: WidgetId, undraw: bool, rsc: &mut dyn UiRsc) -> Option<ActiveData> {
+        let mut active = self.active.remove(&id);
+        if let Some(active) = &mut active {
+            for h in &active.primitives {
+                let mask = self.layers.free(h);
+                if mask != MaskIdx::NONE {
+                    rsc.ui_mut().masks.remove(mask);
+                }
+            }
+            active.textures.clear();
+            rsc.ui_mut().textures.free();
+            if undraw {
+                rsc.on_undraw(active);
+            }
+        }
+        active
+    }
+
+    fn remove_rec(&mut self, id: WidgetId, rsc: &mut dyn UiRsc) -> Option<ActiveData> {
+        self.cache.remove(id);
+        let inst = self.remove(id, true, rsc);
+        if let Some(inst) = &inst {
+            for c in &inst.children {
+                self.remove_rec(*c, rsc);
+            }
+        }
+        inst
+    }
+
+    fn clear(&mut self, rsc: &mut dyn UiRsc) {
+        for (_, active) in self.active.drain() {
+            rsc.on_undraw(&active);
+        }
+        self.cache.clear();
+        self.layers.clear();
+        rsc.widgets_mut().needs_redraw.clear();
+        rsc.free();
+    }
+
+    pub fn redraw_updates(&mut self, rsc: &mut dyn UiRsc) {
+        while let Some(&id) = rsc.widgets().needs_redraw.iter().next() {
+            self.redraw(id, rsc);
+        }
+        rsc.free();
+    }
+
+    pub fn root_changed<'a>(&self, root: impl Into<Option<&'a StrongWidget>>) -> bool {
+        root.into().map(|r| r.id()) != self.old_root
+    }
+
+    pub fn needs_redraw<'a>(
+        &self,
+        root: impl Into<Option<&'a StrongWidget>>,
+        widgets: &Widgets,
+    ) -> bool {
+        self.root_changed(root) || widgets.has_updates()
+    }
+
+    pub fn active_widgets(&self) -> usize {
+        self.active.len()
+    }
+
+    pub fn debug(&self, widgets: &Widgets, label: &str) -> impl Iterator<Item = &ActiveData> {
+        self.active.iter().filter_map(move |(&id, inst)| {
+            let l = widgets.label(id);
+            if l == label { Some(inst) } else { None }
+        })
+    }
+
+    pub fn debug_layers(&self) {
+        for ((idx, depth), primitives) in self.layers.iter_depth() {
+            let indent = " ".repeat(depth * 2);
+            let len = primitives.instances().len();
+            print!("{indent}{idx}: {len} primitives");
+            if len >= 1 {
+                print!(" ({})", primitives.instances()[0].binding);
+            }
+            println!();
+        }
+    }
+
+    pub fn window_region(&self, id: &impl IdLike) -> Option<PixelRegion> {
+        let region = self.active.get(&id.id())?.region;
+        Some(region.to_px(self.output_size))
+    }
+
+    /// redraws a widget that's currently active (drawn)
+    pub fn redraw(&mut self, id: WidgetId, rsc: &mut dyn UiRsc) {
+        rsc.widgets_mut().needs_redraw.remove(&id);
+        self.draw_started.remove(&id);
+        // check if parent depends on the desired size of this, if so then redraw it first
+        for axis in [Axis::X, Axis::Y] {
+            if let Some(&(outer, old)) = self.cache.size.axis_dyn(axis).get(&id)
+                && let Some(current) = self.active.get(&id)
+                && let Some(pid) = current.parent
+            {
+                self.cache.size.axis_dyn(axis).remove(&id);
+                let new = self.size_ctx(id, outer, rsc).len_axis(id, axis);
+                self.cache.size.axis_dyn(axis).insert(id, (outer, new));
+                if new != old {
+                    self.redraw(pid, rsc);
+                }
+            }
+        }
+
+        if self.draw_started.contains(&id) {
+            return;
+        }
+
+        let Some(active) = self.remove(id, false, rsc) else {
+            return;
+        };
+
+        self.draw_inner(
+            active.layer,
+            id,
+            active.region,
+            active.parent,
+            active.mask,
+            Some(active.children),
+            rsc,
+        );
+    }
+
+    pub(super) fn size_ctx<'b>(
+        &'b mut self,
+        source: WidgetId,
+        outer: UiVec2,
+        rsc: &'b mut dyn UiRsc,
+    ) -> SizeCtx<'b> {
+        let ui = rsc.ui_mut();
+        SizeCtx {
+            source,
+            cache: &mut self.cache,
+            text: &mut ui.text,
+            textures: &mut ui.textures,
+            widgets: &ui.widgets,
+            outer,
+            output_size: self.output_size,
+            id: source,
+        }
+    }
+}
+
+impl Default for UiRenderState {
+    fn default() -> Self {
+        Self::new()
+    }
+}
--- a/core/src/ui/size.rs
+++ b/core/src/ui/size.rs
@@ -0,0 +1,86 @@
+use crate::{
+    Axis, AxisT, IdLike, Len, RenderedText, Size, TextAttrs, TextBuffer, TextData, Textures,
+    UiVec2, WidgetAxisFns, WidgetId, Widgets, XAxis, YAxis, ui::cache::Cache, util::Vec2,
+};
+
+pub struct SizeCtx<'a> {
+    pub text: &'a mut TextData,
+    pub textures: &'a mut Textures,
+    pub(super) source: WidgetId,
+    pub(super) widgets: &'a Widgets,
+    pub(super) cache: &'a mut Cache,
+    /// TODO: should this be pub? rn used for sized
+    pub outer: UiVec2,
+    pub(super) output_size: Vec2,
+    pub(super) id: WidgetId,
+}
+
+impl SizeCtx<'_> {
+    pub fn id(&self) -> &WidgetId {
+        &self.id
+    }
+
+    pub fn source(&self) -> &WidgetId {
+        &self.source
+    }
+
+    pub(super) fn len_inner<A: const AxisT>(&mut self, id: WidgetId) -> Len {
+        if let Some((_, len)) = self.cache.size.axis::<A>().get(&id) {
+            return *len;
+        }
+        let len = self
+            .widgets
+            .get_dyn_dynamic(id)
+            .desired_len::<A>(&mut SizeCtx {
+                text: self.text,
+                textures: self.textures,
+                source: self.source,
+                widgets: self.widgets,
+                cache: self.cache,
+                outer: self.outer,
+                output_size: self.output_size,
+                id,
+            });
+        self.cache.size.axis::<A>().insert(id, (self.outer, len));
+        len
+    }
+
+    pub fn width(&mut self, id: impl IdLike) -> Len {
+        self.len_inner::<XAxis>(id.id())
+    }
+
+    pub fn height(&mut self, id: impl IdLike) -> Len {
+        self.len_inner::<YAxis>(id.id())
+    }
+
+    pub fn len_axis(&mut self, id: impl IdLike, axis: Axis) -> Len {
+        match axis {
+            Axis::X => self.width(id),
+            Axis::Y => self.height(id),
+        }
+    }
+
+    pub fn size(&mut self, id: impl IdLike) -> Size {
+        let id = id.id();
+        Size {
+            x: self.width(id),
+            y: self.height(id),
+        }
+    }
+
+    pub fn px_size(&mut self) -> Vec2 {
+        self.outer.to_abs(self.output_size)
+    }
+
+    pub fn output_size(&mut self) -> Vec2 {
+        self.output_size
+    }
+
+    pub fn draw_text(&mut self, buffer: &mut TextBuffer, attrs: &TextAttrs) -> RenderedText {
+        self.text.draw(buffer, attrs, self.textures)
+    }
+
+    pub fn label(&self, id: WidgetId) -> &String {
+        self.widgets.label(id)
+    }
+}
--- a/core/src/util/borrow.rs
+++ b/core/src/util/borrow.rs
@@ -0,0 +1,35 @@
+use std::ops::{Deref, DerefMut};
+
+pub struct DynBorrower<'a, T: ?Sized> {
+    data: &'a mut T,
+    borrowed: &'a mut bool,
+}
+
+impl<'a, T: ?Sized> DynBorrower<'a, T> {
+    pub fn new(data: &'a mut T, borrowed: &'a mut bool) -> Self {
+        if *borrowed {
+            panic!("tried to mutably borrow the same thing twice");
+        }
+        Self { data, borrowed }
+    }
+}
+
+impl<T: ?Sized> Drop for DynBorrower<'_, T> {
+    fn drop(&mut self) {
+        *self.borrowed = false;
+    }
+}
+
+impl<T: ?Sized> Deref for DynBorrower<'_, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        self.data
+    }
+}
+
+impl<T: ?Sized> DerefMut for DynBorrower<'_, T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        self.data
+    }
+}
--- a/core/src/util/handle.rs
+++ b/core/src/util/handle.rs
@@ -1,60 +0,0 @@
-use std::{
-    cell::{Ref, RefCell, RefMut},
-    marker::Unsize,
-    ops::CoerceUnsized,
-    rc::{Rc, Weak},
-};
-
-pub struct Handle<T: ?Sized>(Rc<RefCell<T>>);
-pub struct WeakHandle<T: ?Sized>(Weak<RefCell<T>>);
-
-impl<T: ?Sized> Handle<T> {
-    pub fn get(&self) -> Ref<'_, T> {
-        self.0.borrow()
-    }
-
-    pub fn get_mut(&self) -> RefMut<'_, T> {
-        self.0.borrow_mut()
-    }
-
-    pub fn refs(&self) -> usize {
-        Rc::strong_count(&self.0)
-    }
-
-    pub fn weak(&self) -> WeakHandle<T> {
-        WeakHandle(Rc::downgrade(&self.0))
-    }
-}
-
-impl<T: ?Sized> WeakHandle<T> {
-    pub fn strong(&self) -> Option<Handle<T>> {
-        Some(Handle(self.0.upgrade()?))
-    }
-}
-
-impl<T: ?Sized> Clone for Handle<T> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-impl<T: ?Sized> Clone for WeakHandle<T> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-impl<T: Default> Default for Handle<T> {
-    fn default() -> Self {
-        Self(Default::default())
-    }
-}
-
-impl<T> From<T> for Handle<T> {
-    fn from(value: T) -> Self {
-        Self(Rc::new(RefCell::new(value)))
-    }
-}
-
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Handle<U>> for Handle<T> {}
-impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<WeakHandle<U>> for WeakHandle<T> {}
--- a/core/src/util/mod.rs
+++ b/core/src/util/mod.rs
@@ -1,17 +1,23 @@
 mod arena;
+mod borrow;
 mod change;
-mod handle;
 mod id;
 mod math;
 mod refcount;
+mod slot;
+mod trust;
+mod typemap;
 mod vec2;

 pub use arena::*;
+pub use borrow::*;
 pub use change::*;
-pub use handle::*;
 pub use id::*;
 pub use math::*;
 pub use refcount::*;
+pub use slot::*;
+pub use trust::*;
+pub use typemap::*;
 pub use vec2::*;

 pub type HashMap<K, V> = fxhash::FxHashMap<K, V>;
--- a/core/src/util/refcount.rs
+++ b/core/src/util/refcount.rs
@@ -10,7 +10,6 @@ impl RefCounter {
    pub fn new() -> Self {
        Self(Arc::new(0.into()))
    }
-    #[allow(unused)]
    pub fn refs(&self) -> u32 {
        self.0.load(Ordering::Acquire)
    }
@@ -18,12 +17,17 @@ impl RefCounter {
        let refs = self.0.fetch_sub(1, Ordering::Release);
        refs == 0
    }
-    #[allow(unused)]
    pub fn quiet_clone(&self) -> Self {
        Self(self.0.clone())
    }
 }

+impl Default for RefCounter {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Clone for RefCounter {
    fn clone(&self) -> Self {
        self.0.fetch_add(1, Ordering::Release);
--- a/core/src/util/slot.rs
+++ b/core/src/util/slot.rs
@@ -0,0 +1,69 @@
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct SlotId {
+    idx: u32,
+    genr: u32,
+}
+
+pub struct SlotVec<T> {
+    data: Vec<(u32, Option<T>)>,
+    free: Vec<u32>,
+}
+
+impl<T> SlotVec<T> {
+    pub fn new() -> Self {
+        Self {
+            data: Default::default(),
+            free: Default::default(),
+        }
+    }
+
+    pub fn add(&mut self, x: T) -> SlotId {
+        if let Some(idx) = self.free.pop() {
+            let (genr, data) = &mut self.data[idx as usize];
+            *data = Some(x);
+            SlotId { idx, genr: *genr }
+        } else {
+            let idx = self.data.len() as u32;
+            let genr = 0;
+            self.data.push((genr, Some(x)));
+            SlotId { idx, genr }
+        }
+    }
+
+    pub fn free(&mut self, id: SlotId) {
+        let (genr, data) = &mut self.data[id.idx as usize];
+        *genr += 1;
+        *data = None;
+        self.free.push(id.idx);
+    }
+
+    pub fn get(&self, id: SlotId) -> Option<&T> {
+        let slot = &self.data[id.idx as usize];
+        if slot.0 != id.genr {
+            return None;
+        }
+        slot.1.as_ref()
+    }
+
+    pub fn get_mut(&mut self, id: SlotId) -> Option<&mut T> {
+        let slot = &mut self.data[id.idx as usize];
+        if slot.0 != id.genr {
+            return None;
+        }
+        slot.1.as_mut()
+    }
+
+    pub fn len(&self) -> usize {
+        self.data.len() - self.free.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+}
+
+impl<T> Default for SlotVec<T> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
--- a/core/src/util/trust.rs
+++ b/core/src/util/trust.rs
@@ -0,0 +1,17 @@
+#[allow(clippy::missing_safety_doc)]
+pub unsafe fn forget_ref<'a, T>(x: &T) -> &'a T {
+    unsafe { std::mem::transmute::<&T, &T>(x) }
+}
+
+#[allow(clippy::missing_safety_doc)]
+pub unsafe fn forget_mut<'a, T>(x: &mut T) -> &'a mut T {
+    unsafe { std::mem::transmute::<&mut T, &mut T>(x) }
+}
+
+#[allow(clippy::mut_from_ref, clippy::missing_safety_doc)]
+pub unsafe fn to_mut<T>(x: &T) -> &mut T {
+    #[allow(mutable_transmutes)]
+    unsafe {
+        std::mem::transmute::<&T, &mut T>(x)
+    }
+}
--- a/core/src/util/typemap.rs
+++ b/core/src/util/typemap.rs
@@ -0,0 +1,56 @@
+use crate::util::HashMap;
+use std::{
+    any::TypeId,
+    marker::Unsize,
+    ops::{Deref, DerefMut},
+};
+
+pub struct TypeMap<Trait: ?Sized> {
+    map: HashMap<TypeId, Box<Trait>>,
+}
+
+impl<Trait: ?Sized> TypeMap<Trait> {
+    pub fn set_type<T: Unsize<Trait> + 'static>(&mut self, val: T) {
+        self.map
+            .insert(TypeId::of::<T>(), Box::new(val) as Box<Trait>);
+    }
+
+    pub fn type_mut<T: Unsize<Trait> + 'static>(&mut self) -> Option<&mut T> {
+        Some(Self::convert_mut(self.map.get_mut(&TypeId::of::<T>())?))
+    }
+
+    pub fn type_or_default<T: Default + Unsize<Trait> + 'static>(&mut self) -> &mut T {
+        Self::convert_mut(
+            self.map
+                .entry(TypeId::of::<T>())
+                .or_insert(Box::new(T::default()) as Box<Trait>),
+        )
+    }
+
+    fn convert_mut<T: Unsize<Trait>>(entry: &mut Box<Trait>) -> &mut T {
+        // allegedly this is just what Any does...
+        unsafe { &mut *(entry.as_mut() as *mut Trait as *mut T) }
+    }
+}
+
+impl<T: ?Sized> Deref for TypeMap<T> {
+    type Target = HashMap<TypeId, Box<T>>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.map
+    }
+}
+
+impl<T: ?Sized> DerefMut for TypeMap<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.map
+    }
+}
+
+impl<T: ?Sized> Default for TypeMap<T> {
+    fn default() -> Self {
+        Self {
+            map: Default::default(),
+        }
+    }
+}
--- a/core/src/widget/data.rs
+++ b/core/src/widget/data.rs
@@ -0,0 +1,22 @@
+use crate::Widget;
+
+pub struct WidgetData {
+    pub widget: Box<dyn Widget>,
+    pub label: String,
+    /// dynamic borrow checking
+    pub borrowed: bool,
+}
+
+impl WidgetData {
+    pub fn new<W: Widget>(widget: W) -> Self {
+        let mut label = std::any::type_name::<W>().to_string();
+        if let (Some(first), Some(last)) = (label.find(":"), label.rfind(":")) {
+            label = label.split_at(first).0.to_string() + "::" + label.split_at(last + 1).1;
+        }
+        Self {
+            widget: Box::new(widget),
+            label,
+            borrowed: false,
+        }
+    }
+}
--- a/core/src/widget/handle.rs
+++ b/core/src/widget/handle.rs
@@ -0,0 +1,164 @@
+use std::{marker::Unsize, ops::CoerceUnsized, sync::mpsc::Sender};
+
+use crate::{
+    UiRsc, Widget,
+    util::{RefCounter, SlotId},
+};
+
+pub type WidgetId = SlotId;
+
+/// An identifier for a widget that can index a UI or event ctx to get it.
+/// This is a strong handle that does not impl Clone, and when it is dropped,
+/// a signal is sent to the owning UI to clean up the resources.
+///
+/// TODO: ergonomic clones when they get put in rust-analyzer & don't cause ICEs?
+pub struct StrongWidget<W: ?Sized = dyn Widget> {
+    pub(super) id: WidgetId,
+    counter: RefCounter,
+    send: Sender<WidgetId>,
+    ty: *const W,
+}
+
+/// A weak handle to a widget.
+/// Will not keep it alive, but can still be used for indexing like WidgetHandle.
+pub struct WeakWidget<W: ?Sized = dyn Widget> {
+    pub(super) id: WidgetId,
+    #[allow(unused)]
+    ty: *const W,
+}
+
+impl<W: Widget + ?Sized + Unsize<dyn Widget>> StrongWidget<W> {
+    pub fn any(self) -> StrongWidget<dyn Widget> {
+        self
+    }
+}
+
+impl<W: ?Sized> StrongWidget<W> {
+    pub(crate) fn new(id: WidgetId, send: Sender<WidgetId>) -> Self {
+        Self {
+            id,
+            counter: RefCounter::new(),
+            send,
+            ty: null_ptr(),
+        }
+    }
+
+    pub fn id(&self) -> WidgetId {
+        self.id
+    }
+
+    pub fn refs(&self) -> u32 {
+        self.counter.refs()
+    }
+
+    pub fn weak(&self) -> WeakWidget<W> {
+        let Self { ty, id, .. } = *self;
+        WeakWidget { ty, id }
+    }
+}
+
+impl<W: ?Sized> WeakWidget<W> {
+    pub(crate) fn new(id: WidgetId) -> Self {
+        Self { id, ty: null_ptr() }
+    }
+
+    pub fn id(&self) -> WidgetId {
+        self.id
+    }
+
+    #[track_caller]
+    pub fn upgrade(self, ui: &mut impl UiRsc) -> StrongWidget<W> {
+        ui.widgets_mut().upgrade(self)
+    }
+}
+
+impl<W: ?Sized> Drop for StrongWidget<W> {
+    fn drop(&mut self) {
+        if self.counter.drop() {
+            let _ = self.send.send(self.id);
+        }
+    }
+}
+
+pub trait WidgetIdFn<Rsc, W: ?Sized = dyn Widget>: FnOnce(&mut Rsc) -> WeakWidget<W> {}
+impl<Rsc, W: ?Sized, F: FnOnce(&mut Rsc) -> WeakWidget<W>> WidgetIdFn<Rsc, W> for F {}
+
+pub trait IdLike {
+    type Widget: ?Sized;
+    fn id(&self) -> WidgetId;
+}
+
+impl<W: ?Sized> IdLike for &StrongWidget<W> {
+    type Widget = W;
+    fn id(&self) -> WidgetId {
+        self.id
+    }
+}
+
+impl<W: ?Sized> IdLike for StrongWidget<W> {
+    type Widget = W;
+    fn id(&self) -> WidgetId {
+        self.id
+    }
+}
+
+impl<W: ?Sized> IdLike for WeakWidget<W> {
+    type Widget = W;
+    fn id(&self) -> WidgetId {
+        self.id
+    }
+}
+
+impl IdLike for WidgetId {
+    type Widget = dyn Widget;
+    fn id(&self) -> WidgetId {
+        *self
+    }
+}
+
+impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<StrongWidget<U>> for StrongWidget<T> {}
+impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<WeakWidget<U>> for WeakWidget<T> {}
+
+impl<W: ?Sized> Clone for WeakWidget<W> {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+impl<W: ?Sized> Copy for WeakWidget<W> {}
+impl<W: ?Sized> PartialEq for WeakWidget<W> {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl<W> PartialEq for StrongWidget<W> {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl<W> std::fmt::Debug for StrongWidget<W> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.id.fmt(f)
+    }
+}
+
+impl<'a, W: Widget + 'a, State: UiRsc> FnOnce<(&'a mut State,)> for WeakWidget<W> {
+    type Output = &'a mut W;
+
+    extern "rust-call" fn call_once(self, args: (&'a mut State,)) -> Self::Output {
+        &mut args.0.widgets_mut()[self]
+    }
+}
+
+fn null_ptr<W: ?Sized>() -> *const W {
+    if size_of::<&W>() == size_of::<*const dyn Widget>() {
+        let w: *const dyn Widget = &();
+        unsafe { std::mem::transmute_copy(&w) }
+    } else {
+        unsafe { std::mem::transmute_copy(&[0usize; 1]) }
+    }
+}
+
+unsafe impl<W: ?Sized> Send for WeakWidget<W> {}
+unsafe impl<W: ?Sized> Sync for WeakWidget<W> {}
--- a/core/src/widget/like.rs
+++ b/core/src/widget/like.rs
@@ -0,0 +1,75 @@
+use crate::UiRsc;
+
+use super::*;
+use std::marker::Unsize;
+
+pub trait WidgetLike<Rsc: UiRsc, Tag>: Sized {
+    type Widget: Widget + ?Sized + Unsize<dyn Widget>;
+
+    fn add(self, rsc: &mut Rsc) -> WeakWidget<Self::Widget>;
+
+    fn add_strong(self, rsc: &mut Rsc) -> StrongWidget<Self::Widget> {
+        self.add(rsc).upgrade(rsc)
+    }
+
+    fn with_id<W2>(
+        self,
+        f: impl FnOnce(&mut Rsc, WeakWidget<Self::Widget>) -> WeakWidget<W2>,
+    ) -> impl WidgetIdFn<Rsc, W2> {
+        move |state| {
+            let id = self.add(state);
+            f(state, id)
+        }
+    }
+
+    fn set_root(self, rsc: &mut Rsc, root: &mut impl HasRoot) {
+        let id = self.add_strong(rsc);
+        root.set_root(id);
+    }
+}
+
+pub trait HasRoot {
+    fn set_root(&mut self, root: StrongWidget);
+}
+
+pub trait WidgetArrLike<Rsc, const LEN: usize, Tag> {
+    #[track_caller]
+    fn add(self, state: &mut Rsc) -> WidgetArr<LEN>;
+}
+
+impl<Rsc, const LEN: usize> WidgetArrLike<Rsc, LEN, ArrTag> for WidgetArr<LEN> {
+    fn add(self, _: &mut Rsc) -> WidgetArr<LEN> {
+        self
+    }
+}
+
+// variadic generics please save us
+macro_rules! impl_widget_arr {
+    ($n:expr;$($W:ident)*) => {
+        impl_widget_arr!($n;$($W)*;$(${concat($W,Tag)})*);
+    };
+    ($n:expr;$($W:ident)*;$($Tag:ident)*) => {
+        impl<Rsc: UiRsc, $($W: WidgetLike<Rsc, $Tag>,$Tag,)*> WidgetArrLike<Rsc, $n, ($($Tag,)*)> for ($($W,)*) {
+            fn add(self, rsc: &mut Rsc) -> WidgetArr<$n> {
+                #[allow(non_snake_case)]
+                let ($($W,)*) = self;
+                WidgetArr::new(
+                    [$($W.add(rsc).upgrade(rsc),)*],
+                )
+            }
+        }
+    };
+}
+
+impl_widget_arr!(1;A);
+impl_widget_arr!(2;A B);
+impl_widget_arr!(3;A B C);
+impl_widget_arr!(4;A B C D);
+impl_widget_arr!(5;A B C D E);
+impl_widget_arr!(6;A B C D E F);
+impl_widget_arr!(7;A B C D E F G);
+impl_widget_arr!(8;A B C D E F G H);
+impl_widget_arr!(9;A B C D E F G H I);
+impl_widget_arr!(10;A B C D E F G H I J);
+impl_widget_arr!(11;A B C D E F G H I J K);
+impl_widget_arr!(12;A B C D E F G H I J K L);
--- a/core/src/widget/mod.rs
+++ b/core/src/widget/mod.rs
@@ -0,0 +1,87 @@
+use crate::{Axis, AxisT, Len, Painter, SizeCtx};
+use std::any::Any;
+
+mod data;
+mod handle;
+mod like;
+mod tag;
+mod view;
+mod widgets;
+
+pub use data::*;
+pub use handle::*;
+pub use like::*;
+pub use tag::*;
+pub use view::*;
+pub use widgets::*;
+
+pub trait Widget: Any {
+    fn draw(&mut self, painter: &mut Painter);
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len;
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len;
+}
+
+pub trait WidgetAxisFns {
+    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx) -> Len;
+}
+
+impl<W: Widget + ?Sized> WidgetAxisFns for W {
+    fn desired_len<A: AxisT>(&mut self, ctx: &mut SizeCtx) -> Len {
+        match A::get() {
+            Axis::X => self.desired_width(ctx),
+            Axis::Y => self.desired_height(ctx),
+        }
+    }
+}
+
+impl Widget for () {
+    fn draw(&mut self, _: &mut Painter) {}
+    fn desired_width(&mut self, _: &mut SizeCtx) -> Len {
+        Len::ZERO
+    }
+    fn desired_height(&mut self, _: &mut SizeCtx) -> Len {
+        Len::ZERO
+    }
+}
+
+impl dyn Widget {
+    pub fn as_any(&self) -> &dyn Any {
+        self
+    }
+
+    pub fn as_any_mut(&mut self) -> &mut dyn Any {
+        self
+    }
+}
+
+/// A function that returns a widget given a UI.
+/// Useful for defining trait functions on widgets that create a parent widget so that the children
+/// don't need to be IDs yet
+pub trait WidgetFn<State, W: Widget + ?Sized>: FnOnce(&mut State) -> W {}
+impl<State, W: Widget + ?Sized, F: FnOnce(&mut State) -> W> WidgetFn<State, W> for F {}
+
+pub struct WidgetArr<const LEN: usize> {
+    pub arr: [StrongWidget; LEN],
+}
+
+impl<const LEN: usize> WidgetArr<LEN> {
+    pub fn new(arr: [StrongWidget; LEN]) -> Self {
+        Self { arr }
+    }
+}
+
+pub trait WidgetOption<State> {
+    fn get(self, state: &mut State) -> Option<StrongWidget>;
+}
+
+impl<State> WidgetOption<State> for () {
+    fn get(self, _: &mut State) -> Option<StrongWidget> {
+        None
+    }
+}
+
+impl<State, F: FnOnce(&mut State) -> Option<StrongWidget>> WidgetOption<State> for F {
+    fn get(self, state: &mut State) -> Option<StrongWidget> {
+        self(state)
+    }
+}
--- a/core/src/widget/tag.rs
+++ b/core/src/widget/tag.rs
@@ -0,0 +1,64 @@
+use super::*;
+use crate::UiRsc;
+use std::marker::Unsize;
+
+pub struct WidgetTag;
+impl<Rsc: UiRsc, W: Widget> WidgetLike<Rsc, WidgetTag> for W {
+    type Widget = W;
+    fn add(self, rsc: &mut Rsc) -> WeakWidget<W> {
+        let w = rsc.ui_mut().widgets.add_weak(self);
+        rsc.on_add(w);
+        w
+    }
+}
+
+pub struct FnTag;
+impl<Rsc: UiRsc, W: Widget, F: FnOnce(&mut Rsc) -> W> WidgetLike<Rsc, FnTag> for F {
+    type Widget = W;
+    fn add(self, rsc: &mut Rsc) -> WeakWidget<W> {
+        self(rsc).add(rsc)
+    }
+}
+
+pub trait WidgetFnTrait<Rsc> {
+    type Widget: Widget;
+    fn run(self, rsc: &mut Rsc) -> Self::Widget;
+}
+pub struct FnTraitTag;
+impl<Rsc: UiRsc, T: WidgetFnTrait<Rsc>> WidgetLike<Rsc, FnTraitTag> for T {
+    type Widget = T::Widget;
+    #[track_caller]
+    fn add(self, rsc: &mut Rsc) -> WeakWidget<T::Widget> {
+        self.run(rsc).add(rsc)
+    }
+}
+
+pub struct RefTag;
+impl<Rsc: UiRsc, W: ?Sized + Widget + Unsize<dyn Widget>> WidgetLike<Rsc, RefTag>
+    for WeakWidget<W>
+{
+    type Widget = W;
+    fn add(self, _: &mut Rsc) -> WeakWidget<W> {
+        self
+    }
+}
+
+pub struct RefFnTag;
+impl<Rsc: UiRsc, W: ?Sized + Widget + Unsize<dyn Widget>, F: FnOnce(&mut Rsc) -> WeakWidget<W>>
+    WidgetLike<Rsc, RefFnTag> for F
+{
+    type Widget = W;
+    fn add(self, rsc: &mut Rsc) -> WeakWidget<W> {
+        self(rsc)
+    }
+}
+
+pub struct ViewTag;
+impl<Rsc: UiRsc, V: WidgetView> WidgetLike<Rsc, ViewTag> for V {
+    type Widget = V::Widget;
+    fn add(self, _: &mut Rsc) -> WeakWidget<Self::Widget> {
+        self.root()
+    }
+}
+
+pub struct ArrTag;
--- a/core/src/widget/view.rs
+++ b/core/src/widget/view.rs
@@ -0,0 +1,24 @@
+use std::marker::Unsize;
+
+use crate::{IdLike, WeakWidget, Widget};
+
+pub trait WidgetView {
+    type Widget: Widget + ?Sized + Unsize<dyn Widget>;
+    fn root(&self) -> WeakWidget<Self::Widget>;
+}
+
+pub trait HasWidget {
+    type Widget: Widget + ?Sized + Unsize<dyn Widget>;
+}
+
+impl<W: Widget + Unsize<dyn Widget> + ?Sized> HasWidget for WeakWidget<W> {
+    type Widget = W;
+}
+
+impl<WV: WidgetView> IdLike for WV {
+    type Widget = WV::Widget;
+
+    fn id(&self) -> super::WidgetId {
+        self.root().id
+    }
+}
--- a/core/src/widget/widgets.rs
+++ b/core/src/widget/widgets.rs
@@ -0,0 +1,145 @@
+use std::sync::mpsc::{Receiver, Sender, channel};
+
+use crate::{
+    IdLike, StrongWidget, WeakWidget, Widget, WidgetData, WidgetId,
+    util::{DynBorrower, HashSet, SlotVec, forget_mut, to_mut},
+};
+
+pub struct Widgets {
+    pub needs_redraw: HashSet<WidgetId>,
+    vec: SlotVec<WidgetData>,
+    send: Sender<WidgetId>,
+    recv: Receiver<WidgetId>,
+    pub(crate) waiting: HashSet<WidgetId>,
+}
+
+impl Widgets {
+    pub fn new() -> Self {
+        let (send, recv) = channel();
+        Self {
+            needs_redraw: Default::default(),
+            vec: Default::default(),
+            waiting: Default::default(),
+            send,
+            recv,
+        }
+    }
+
+    pub fn has_updates(&self) -> bool {
+        !self.needs_redraw.is_empty()
+    }
+
+    pub fn get_dyn(&self, id: WidgetId) -> Option<&dyn Widget> {
+        Some(self.vec.get(id)?.widget.as_ref())
+    }
+
+    pub fn get_dyn_mut(&mut self, id: WidgetId) -> Option<&mut dyn Widget> {
+        self.needs_redraw.insert(id);
+        Some(self.vec.get_mut(id)?.widget.as_mut())
+    }
+
+    /// get_dyn but dynamic borrow checking of widgets
+    /// lets you do recursive (tree) operations, like the painter does
+    pub(crate) fn get_dyn_dynamic<'a>(&self, id: WidgetId) -> WidgetWrapper<'a> {
+        // SAFETY: must guarantee no other mutable references to this widget exist
+        // done through the borrow variable
+        let data = unsafe { forget_mut(to_mut(self.vec.get(id).unwrap())) };
+        if data.borrowed {
+            panic!("tried to mutably borrow the same widget twice");
+        }
+        WidgetWrapper::new(data.widget.as_mut(), &mut data.borrowed)
+    }
+
+    pub fn get<I: IdLike>(&self, id: &I) -> Option<&I::Widget>
+    where
+        I::Widget: Sized + Widget,
+    {
+        self.get_dyn(id.id())?.as_any().downcast_ref()
+    }
+
+    pub fn get_mut<I: IdLike>(&mut self, id: &I) -> Option<&mut I::Widget>
+    where
+        I::Widget: Sized + Widget,
+    {
+        self.get_dyn_mut(id.id())?.as_any_mut().downcast_mut()
+    }
+
+    pub fn add_strong<W: Widget>(&mut self, widget: W) -> StrongWidget<W> {
+        let id = self.vec.add(WidgetData::new(widget));
+        StrongWidget::new(id, self.send.clone())
+    }
+
+    pub fn add_weak<W: Widget>(&mut self, widget: W) -> WeakWidget<W> {
+        let id = self.vec.add(WidgetData::new(widget));
+        self.waiting.insert(id);
+        WeakWidget::new(id)
+    }
+
+    #[track_caller]
+    pub fn upgrade<W: ?Sized>(&mut self, rf: WeakWidget<W>) -> StrongWidget<W> {
+        if !self.waiting.remove(&rf.id()) {
+            let label = self.label(rf);
+            let id = rf.id();
+            panic!(
+                "widget '{label}' ({id:?}) was already added\ncannot add a widget twice; consider creating two"
+            )
+        }
+        StrongWidget::new(rf.id(), self.send.clone())
+    }
+
+    pub fn data(&self, id: impl IdLike) -> Option<&WidgetData> {
+        self.vec.get(id.id())
+    }
+
+    pub fn label(&self, id: impl IdLike) -> &String {
+        &self.data(id.id()).unwrap().label
+    }
+
+    /// useful for debugging
+    pub fn set_label(&mut self, id: impl IdLike, label: String) {
+        self.data_mut(id.id()).unwrap().label = label;
+    }
+
+    pub fn data_mut(&mut self, id: impl IdLike) -> Option<&mut WidgetData> {
+        self.vec.get_mut(id.id())
+    }
+
+    pub fn free_next(&mut self) -> Option<WidgetId> {
+        let next = self.recv.try_recv().ok()?;
+        self.vec.free(next);
+        Some(next)
+    }
+
+    #[allow(clippy::len_without_is_empty)]
+    pub fn len(&self) -> usize {
+        self.vec.len()
+    }
+}
+
+impl Default for Widgets {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+pub type WidgetWrapper<'a> = DynBorrower<'a, dyn Widget>;
+
+impl<I: IdLike> std::ops::Index<I> for Widgets
+where
+    I::Widget: Sized + Widget,
+{
+    type Output = I::Widget;
+
+    fn index(&self, id: I) -> &Self::Output {
+        self.get(&id).unwrap()
+    }
+}
+
+impl<I: IdLike> std::ops::IndexMut<I> for Widgets
+where
+    I::Widget: Sized + Widget,
+{
+    fn index_mut(&mut self, id: I) -> &mut Self::Output {
+        self.get_mut(&id).unwrap()
+    }
+}
--- a/examples/minimal.rs
+++ b/examples/minimal.rs
@@ -1,14 +1,17 @@
-use iris::{prelude::*};
+use iris::prelude::*;

 fn main() {
    DefaultApp::<State>::run();
 }

-struct State;
+#[derive(DefaultUiState)]
+struct State {
+    ui_state: DefaultUiState,
+}

 impl DefaultAppState for State {
-    fn new(ui: &mut Ui, _state: &UiState, _proxy: Proxy<Self::Event>) -> Self {
-        rect(Color::RED).set_root(ui);
-        Self
+    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>) -> Self {
+        rect(Color::RED).set_root(rsc, &mut ui_state);
+        Self { ui_state }
    }
 }
--- a/examples/tabs/assets/sungals.png
+++ b/examples/tabs/assets/sungals.png
--- a/examples/tabs/main.rs
+++ b/examples/tabs/main.rs
@@ -1,20 +1,22 @@
 use cosmic_text::Family;
-use iris::prelude::*;
-use len_fns::*;
+use std::{cell::RefCell, rc::Rc};
 use winit::event::WindowEvent;

+use iris::prelude::*;
+type ClientRsc = DefaultRsc<Client>;
+
 fn main() {
    DefaultApp::<Client>::run();
 }

+#[derive(DefaultUiState)]
 pub struct Client {
-    info: WidgetRef<Text>,
+    ui_state: DefaultUiState,
+    info: WeakWidget<Text>,
 }

-event_ctx!(Client);
-
 impl DefaultAppState for Client {
-    fn new(ui: &mut Ui, _state: &UiState, _proxy: Proxy<Self::Event>) -> Self {
+    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>) -> Self {
        let rrect = rect(Color::WHITE).radius(20);
        let pad_test = (
            rrect.color(Color::BLUE),
@@ -37,7 +39,7 @@ impl DefaultAppState for Client {
                .width(rest(3)),
        )
            .span(Dir::RIGHT)
-            .add(ui);
+            .add(rsc);

        let span_test = (
            rrect.color(Color::GREEN).width(100),
@@ -48,32 +50,30 @@ impl DefaultAppState for Client {
            rrect.color(Color::RED).width(100),
        )
            .span(Dir::LEFT)
-            .add(ui);
+            .add(rsc);

-        let span_add = Span::empty(Dir::RIGHT).add(ui);
-        let span_add_ = span_add.clone();
+        let span_add = Span::empty(Dir::RIGHT).add(rsc);

        let add_button = rect(Color::LIME)
            .radius(30)
-            .on(CursorSense::click(), move |ctx| {
+            .on(CursorSense::click(), move |_, rsc| {
                let child = image(include_bytes!("assets/sungals.png"))
                    .center()
-                    .add(ctx.ui);
-                span_add_.get_mut().children.push(child);
+                    .add_strong(rsc);
+                span_add(rsc).push(child);
            })
            .sized((150, 150))
            .align(Align::BOT_RIGHT);

-        let span_add_ = span_add.clone();
        let del_button = rect(Color::RED)
            .radius(30)
-            .on(CursorSense::click(), move |_| {
-                span_add_.get_mut().children.pop();
+            .on(CursorSense::click(), move |_, rsc| {
+                span_add(rsc).pop();
            })
            .sized((150, 150))
            .align(Align::BOT_LEFT);

-        let span_add_test = (span_add, add_button, del_button).stack().add(ui);
+        let span_add_test = (span_add, add_button, del_button).stack().add(rsc);

        let btext = |content| wtext(content).size(30);

@@ -96,36 +96,40 @@ impl DefaultAppState for Client {
            wtext("pretty cool right?").size(50),
        )
            .span(Dir::DOWN)
-            .add(ui);
+            .add(rsc);

-        let texts = Span::empty(Dir::DOWN).gap(10).add(ui);
-        let msg_area = texts.clone().scroll().masked().background(rect(Color::SKY));
+        let texts = Span::empty(Dir::DOWN).gap(10).add(rsc);
+        let msg_area = texts.scrollable().masked().background(rect(Color::SKY));
        let add_text = wtext("add")
-            .editable(false)
+            .editable(EditMode::MultiLine)
            .text_align(Align::LEFT)
            .size(30)
            .attr::<Selectable>(())
-            .on(Submit, move |ctx| {
-                let content = ctx.widget.get_mut().take();
+            .on(Submit, move |ctx, rsc| {
+                let w = ctx.widget;
+                let content = w.edit(rsc).take();
                let text = wtext(content)
-                    .editable(false)
+                    .editable(EditMode::MultiLine)
                    .size(30)
                    .text_align(Align::LEFT)
                    .wrap(true)
                    .attr::<Selectable>(());
-                let msg_box = text.background(rect(Color::WHITE.darker(0.5))).add(ctx.ui);
-                texts.get_mut().children.push(msg_box);
+                let msg_box = text
+                    .background(rect(Color::WHITE.darker(0.5)))
+                    .add_strong(rsc);
+                texts(rsc).push(msg_box);
            })
-            .add(ui);
+            .add(rsc);
+
        let text_edit_scroll = (
            msg_area.height(rest(1)),
            (
                Rect::new(Color::WHITE.darker(0.9)),
                (
-                    add_text.clone().width(rest(1)),
+                    add_text.width(rest(1)),
                    Rect::new(Color::GREEN)
-                        .on(CursorSense::click(), move |ctx| {
-                            ctx.ui.run_event(ctx.state, &add_text, Submit, ());
+                        .on(CursorSense::click(), move |ctx, rsc: &mut ClientRsc| {
+                            rsc.run_event::<Submit>(add_text, (), ctx.state);
                        })
                        .sized((40, 40)),
                )
@@ -138,25 +142,39 @@ impl DefaultAppState for Client {
                .align(Align::BOT),
        )
            .span(Dir::DOWN)
-            .add(ui);
+            .add(rsc);

-        let main = pad_test.clone().pad(10).add(ui);
+        let main = WidgetPtr::empty().add(rsc);

-        let switch_button = |color, to: WidgetRef, label| {
-            let main_ = main.clone();
+        let vals = Rc::new(RefCell::new((0, Vec::new())));
+        let mut switch_button = |color, to: WeakWidget, label| {
+            let to = to.upgrade(rsc);
+            let vec = &mut vals.borrow_mut().1;
+            let i = vec.len();
+            if vec.is_empty() {
+                vec.push(None);
+                main(rsc).set(to);
+            } else {
+                vec.push(Some(to));
+            }
+            let vals = vals.clone();
            let rect = rect(color)
-                .on(CursorSense::click(), move |ctx| {
-                    main_.get_mut().inner = to.clone();
-                    ctx.widget.get_mut().color = color.darker(0.3);
+                .on(CursorSense::click(), move |ctx, rsc| {
+                    let (prev, vec) = &mut *vals.borrow_mut();
+                    if let Some(h) = vec[i].take() {
+                        vec[*prev] = main(rsc).replace(h);
+                        *prev = i;
+                    }
+                    ctx.widget(rsc).color = color.darker(0.3);
                })
                .on(
                    CursorSense::HoverStart | CursorSense::unclick(),
-                    move |ctx| {
-                        ctx.widget.get_mut().color = color.brighter(0.2);
+                    move |ctx, rsc| {
+                        ctx.widget(rsc).color = color.brighter(0.2);
                    },
                )
-                .on(CursorSense::HoverEnd, move |ctx| {
-                    ctx.widget.get_mut().color = color;
+                .on(CursorSense::HoverEnd, move |ctx, rsc| {
+                    ctx.widget(rsc).color = color;
                });
            (rect, wtext(label).size(30).text_align(Align::CENTER)).stack()
        };
@@ -174,25 +192,30 @@ impl DefaultAppState for Client {
        )
            .span(Dir::RIGHT);

-        let info = wtext("").add(ui);
-        let info_sect = info.clone().pad(10).align(Align::RIGHT);
+        let info = wtext("").add(rsc);
+        let info_sect = info.pad(10).align(Align::RIGHT);

-        ((tabs.height(40), main).span(Dir::DOWN), info_sect)
+        ((tabs.height(40), main.pad(10)).span(Dir::DOWN), info_sect)
            .stack()
-            .set_root(ui);
+            .set_root(rsc, &mut ui_state);

-        Self { info }
+        Self { ui_state, info }
    }

-    fn window_event(&mut self, _: WindowEvent, ui: &mut Ui, state: &UiState) {
+    fn window_event(
+        &mut self,
+        _: WindowEvent,
+        rsc: &mut DefaultRsc<Self>,
+        render: &mut UiRenderState,
+    ) {
        let new = format!(
-            "widgets: {}\nactive:{}\nviews: {}",
-            ui.num_widgets(),
-            ui.active_widgets(),
-            state.renderer.ui.view_count()
+            "widgets: {}\nactive: {}\nviews: {}",
+            rsc.widgets().len(),
+            render.active_widgets(),
+            self.ui_state.renderer.ui.view_count(),
        );
-        if new != *self.info.get().content {
-            *self.info.get_mut().content = new;
+        if new != *rsc.widgets()[self.info].content {
+            *rsc.widgets_mut()[self.info].content = new;
        }
    }
 }
--- a/examples/task.rs
+++ b/examples/task.rs
@@ -0,0 +1,30 @@
+use iris::prelude::*;
+use std::time::Duration;
+
+fn main() {
+    DefaultApp::<State>::run();
+}
+
+#[derive(DefaultUiState)]
+struct State {
+    ui_state: DefaultUiState,
+}
+
+impl DefaultAppState for State {
+    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>) -> Self {
+        let rect = rect(Color::RED).add(rsc);
+        rect.task_on(CursorSense::click(), async move |mut ctx| {
+            tokio::time::sleep(Duration::from_secs(1)).await;
+            ctx.update(move |_, rsc| {
+                let rect = rect(rsc);
+                if rect.color == Color::RED {
+                    rect.color = Color::BLUE;
+                } else {
+                    rect.color = Color::RED;
+                }
+            });
+        })
+        .set_root(rsc, &mut ui_state);
+        Self { ui_state }
+    }
+}
--- a/examples/view.rs
+++ b/examples/view.rs
@@ -0,0 +1,49 @@
+use iris::prelude::*;
+
+fn main() {
+    DefaultApp::<State>::run();
+}
+
+#[derive(DefaultUiState)]
+struct State {
+    ui_state: DefaultUiState,
+}
+
+type Rsc = DefaultRsc<State>;
+
+#[derive(Clone, Copy, WidgetView)]
+struct Test {
+    #[root]
+    root: WeakWidget<Rect>,
+    cur: WeakState<bool>,
+}
+
+impl Test {
+    pub fn new(rsc: &mut Rsc) -> Self {
+        let root = rect(Color::RED).add(rsc);
+        let cur = rsc.create_state(root, false);
+        Self { root, cur }
+    }
+    pub fn toggle(&self, rsc: &mut Rsc) {
+        let cur = &mut rsc[self.cur];
+        *cur = !*cur;
+        if *cur {
+            rsc[self.root].color = Color::BLUE;
+        } else {
+            rsc[self.root].color = Color::RED;
+        }
+    }
+}
+
+impl DefaultAppState for State {
+    fn new(mut ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>) -> Self {
+        let test = Test::new(rsc);
+
+        test.on(CursorSense::click(), move |_, rsc| {
+            test.toggle(rsc);
+        })
+        .set_root(rsc, &mut ui_state);
+
+        Self { ui_state }
+    }
+}
--- a/macro/Cargo.toml
+++ b/macro/Cargo.toml
@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true

 [dependencies]
+proc-macro2 = "1.0.103"
 quote = "1.0.42"
 syn = { version = "2.0.111", features = ["full"] }

--- a/macro/src/lib.rs
+++ b/macro/src/lib.rs
@@ -2,14 +2,18 @@ extern crate proc_macro;
 use proc_macro::TokenStream;
 use quote::quote;
 use syn::{
-    Block, Ident, Signature, Token, Visibility,
+    Attribute, Block, Error, GenericParam, Generics, Ident, ItemStruct, ItemTrait, Signature,
+    Token, Type, Visibility,
    parse::{Parse, ParseStream, Result},
-    parse_macro_input,
+    parse_macro_input, parse_quote,
+    spanned::Spanned,
 };

 struct Input {
+    attrs: Vec<Attribute>,
    vis: Visibility,
    name: Ident,
+    generics: Generics,
    fns: Vec<InputFn>,
 }

@@ -20,8 +24,11 @@ struct InputFn {

 impl Parse for Input {
    fn parse(input: ParseStream) -> Result<Self> {
+        let attrs = input.call(Attribute::parse_outer)?;
        let vis = input.parse()?;
+        input.parse::<Token![trait]>()?;
        let name = input.parse()?;
+        let generics = input.parse::<Generics>()?;
        input.parse::<Token![;]>()?;
        let mut fns = Vec::new();
        while !input.is_empty() {
@@ -32,27 +39,25 @@ impl Parse for Input {
        if !input.is_empty() {
            input.error("function expected");
        }
-        Ok(Input { vis, name, fns })
+        Ok(Input {
+            attrs,
+            vis,
+            name,
+            generics,
+            fns,
+        })
    }
 }

-// pub trait $name<W: WidgetLike<Tag>, Tag> {
-//     $(
-//     fn $fn $(<$($T $(: $TT $(+ $TL)?)?,)*>)?($self $(, $arg: $ty)*) -> $ret;
-//     )*
-// }
-//
-// impl<W: WidgetLike<Tag>, Tag> $name<W, Tag> for W {
-//     $(
-//     fn $fn $(<$($T $(: $TT $(+ $TL)?)?,)*>)?($self $(, $arg: $ty)*) -> $ret {
-//         $code
-//     }
-//     )*
-// }
-
 #[proc_macro]
 pub fn widget_trait(input: TokenStream) -> TokenStream {
-    let Input { vis, name, fns } = parse_macro_input!(input as Input);
+    let Input {
+        attrs,
+        vis,
+        name,
+        mut generics,
+        fns,
+    } = parse_macro_input!(input as Input);

    let sigs: Vec<_> = fns.iter().map(|f| f.sig.clone()).collect();
    let impls: Vec<_> = fns
@@ -60,13 +65,132 @@ pub fn widget_trait(input: TokenStream) -> TokenStream {
        .map(|InputFn { sig, body }| quote! { #sig #body })
        .collect();

-    TokenStream::from(quote! {
-        #vis trait #name<WL: WidgetLike<Tag>, Tag> {
+    let Some(GenericParam::Type(state)) = generics.params.first() else {
+        return Error::new(name.span(), "expected state generic parameter")
+            .into_compile_error()
+            .into();
+    };
+
+    let state = &state.ident;
+
+    generics
+        .params
+        .push(parse_quote!(WL: WidgetLike<#state, Tag>));
+    generics.params.push(parse_quote!(Tag));
+
+    let mut trai: ItemTrait = parse_quote!(
+        #vis trait #name #generics {
            #(#sigs;)*
        }
+    );

-        impl<WL: WidgetLike<Tag>, Tag> #name<WL, Tag> for WL {
+    trai.attrs = attrs;
+
+    quote! {
+        #trai
+
+        impl #generics #name<Rsc, WL, Tag> for WL {
            #(#impls)*
        }
-    })
+    }
+    .into()
+}
+
+#[proc_macro_derive(DefaultUiState, attributes(default_ui_state))]
+pub fn derive_default_ui_state(input: TokenStream) -> TokenStream {
+    let mut output = proc_macro2::TokenStream::new();
+
+    let state: ItemStruct = parse_macro_input!(input);
+
+    let mut found_attr = false;
+    let mut state_field = None;
+    for field in &state.fields {
+        if !found_attr
+            && let Type::Path(path) = &field.ty
+            && path.path.is_ident("DefaultUiState")
+        {
+            state_field = Some(field);
+        }
+        let Some(attr) = field
+            .attrs
+            .iter()
+            .find(|a| a.path().is_ident("default_ui_state"))
+        else {
+            continue;
+        };
+        if found_attr {
+            output.extend(
+                Error::new(
+                    attr.span(),
+                    "cannot have more than one default_ui_state attribute",
+                )
+                .into_compile_error(),
+            );
+            continue;
+        }
+        found_attr = true;
+        state_field = Some(field);
+    }
+    let Some(field) = state_field else {
+        output.extend(
+            Error::new(state.ident.span(), "no DefaultUiState field found").into_compile_error(),
+        );
+        return output.into();
+    };
+    let sname = &state.ident;
+    let fname = field.ident.as_ref().unwrap();
+    output.extend(quote! {
+        impl iris::default::HasDefaultUiState for #sname {
+            fn default_state(&self) -> &iris::default::DefaultUiState {
+                &self.#fname
+            }
+            fn default_state_mut(&mut self) -> &mut iris::default::DefaultUiState {
+                &mut self.#fname
+            }
+        }
+    });
+    output.into()
+}
+
+#[proc_macro_derive(WidgetView, attributes(root))]
+pub fn derive_widget_view(input: TokenStream) -> TokenStream {
+    let mut output = proc_macro2::TokenStream::new();
+
+    let state: ItemStruct = parse_macro_input!(input);
+
+    let mut found_attr = false;
+    let mut state_field = None;
+    for field in &state.fields {
+        let Some(attr) = field.attrs.iter().find(|a| a.path().is_ident("root")) else {
+            continue;
+        };
+        if found_attr {
+            output.extend(
+                Error::new(attr.span(), "cannot have more than one root widget")
+                    .into_compile_error(),
+            );
+            continue;
+        }
+        found_attr = true;
+        state_field = Some(field);
+    }
+    let Some(field) = state_field else {
+        output.extend(
+            Error::new(state.ident.span(), "no root widget field found (#[root])")
+                .into_compile_error(),
+        );
+        return output.into();
+    };
+    let sname = &state.ident;
+    let fname = field.ident.as_ref().unwrap();
+    let fty = &field.ty;
+    output.extend(quote! {
+        impl iris::core::WidgetView for #sname {
+            type Widget = <#fty as iris::core::HasWidget>::Widget;
+            fn root(&self) -> #fty {
+                self.#fname
+            }
+        }
+    });
+    output.into()
 }
--- a/readme.md
+++ b/readme.md
@@ -1,22 +1,25 @@
 # iris

-my fisrt attempt at a rust ui library
+My experimental attempt at a rust ui library (also my first ui library).

-it's called iris because it's the structure around what you actually want to display and colorful
+It's currently designed around using retained data structures (widgets), rather than diffing generated trees from data like xilem or iced. This is an experiment and I'm not sure if it's a good idea or not.

-there's a `main.rs` that runs a testing window, so can just `cargo run` to see it working
+Examples are in `examples`, eg. `cargo run --example tabs`.

-goals, in general order:
+Goals, in general order:
 1. does what I want it to (text, images, video, animations)
 2. very easy to use ignoring ergonomic ref counting
-3. reasonably fast / efficient (a lot faster than electron, save battery life)
+3. reasonably fast / efficient (a lot faster than electron, save battery life, try to beat iced and xilem)

-not targeting web rn cause wanna use actual nice gpu features & entire point of this is to make desktop apps
+## dev details
+
+not targeting web rn cause wanna use actual nice gpu features & entire point of this is to make desktop apps / not need a web browser

 general ideas trynna use rn / experiment with:
 - retained mode
- specifically designed around wgpu
+- specifically designed around wgpu so there's no translation
 - postfix functions for most things to prevent unreadable indentation (going very well)
+- events can be done directly where you draw the widgets
 - almost no macros in user code & actual LSP typechecking (variadic generics if you can hear me please save us)
 - relative anchor + absolute offset coord system (+ "rest" / leftover during widget layout)
 - single threaded ui & pass context around to make non async usage straightforward (pretty unsure about this)
@@ -24,3 +27,5 @@ general ideas trynna use rn / experiment with:

 under heavy initial development so not gonna try to explain status, maybe check TODO for that;
 sizable chance it gets a rewrite once I know everything I need and what seems to work best
+
+it's called iris because it's the structure around what you actually want to display and colorful
--- a/src/default/app.rs
+++ b/src/default/app.rs
@@ -11,6 +11,13 @@ pub trait AppState {
    fn window_event(&mut self, event: WindowEvent, event_loop: &ActiveEventLoop);
    fn event(&mut self, event: Self::Event, event_loop: &ActiveEventLoop);
    fn exit(&mut self);
+
+    fn run()
+    where
+        Self: Sized,
+    {
+        App::<Self>::run();
+    }
 }

 pub struct App<State: AppState> {
--- a/src/default/attr.rs
+++ b/src/default/attr.rs
@@ -1,50 +1,73 @@
-use crate::{prelude::*, default::UiState};
+use crate::prelude::*;
 use std::time::{Duration, Instant};
 use winit::dpi::{LogicalPosition, LogicalSize};

 pub struct Selector;

-impl<W: 'static> WidgetAttr<W> for Selector {
-    type Input = WidgetRef<TextEdit>;
+impl<Rsc: HasEvents, W: Widget + 'static> WidgetAttr<Rsc, W> for Selector
+where
+    Rsc::State: HasDefaultUiState,
+{
+    type Input = WeakWidget<TextEdit>;

-    fn run(ui: &mut Ui, container: &WidgetRef<W>, id: Self::Input) {
-        let container = container.clone();
-        ui.register_event(
-            &container.clone(),
-            CursorSense::click_or_drag(),
-            move |mut ctx| {
-                let ui = ctx.ui;
-                let region = ui.window_region(&id).unwrap();
-                let id_pos = region.top_left;
-                let container_pos = ui.window_region(&container).unwrap().top_left;
-                ctx.data.cursor += container_pos - id_pos;
-                ctx.data.size = region.size();
-                select(ui, id.clone(), ctx.state, ctx.data);
-            },
-        );
+    fn run(rsc: &mut Rsc, container: WeakWidget<W>, id: Self::Input) {
+        rsc.register_event(container, CursorSense::click_or_drag(), move |ctx, rsc| {
+            let region = ctx.data.render.window_region(&id).unwrap();
+            let id_pos = region.top_left;
+            let container_pos = ctx.data.render.window_region(&container).unwrap().top_left;
+            let pos = ctx.data.pos + container_pos - id_pos;
+            let size = region.size();
+            select(
+                rsc,
+                ctx.data.render,
+                ctx.state,
+                id,
+                pos,
+                size,
+                ctx.data.sense.is_dragging(),
+            );
+        });
    }
 }

 pub struct Selectable;

-impl WidgetAttr<TextEdit> for Selectable {
+impl<Rsc: HasEvents> WidgetAttr<Rsc, TextEdit> for Selectable
+where
+    Rsc::State: HasDefaultUiState,
+{
    type Input = ();

-    fn run(ui: &mut Ui, id: &WidgetRef<TextEdit>, _: Self::Input) {
-        let id = id.clone();
-        ui.register_event(&id.clone(), CursorSense::click_or_drag(), move |ctx| {
-            select(ctx.ui, id.clone(), ctx.state, ctx.data);
+    fn run(rsc: &mut Rsc, id: WeakWidget<TextEdit>, _: Self::Input) {
+        rsc.register_event(id, CursorSense::click_or_drag(), move |ctx, rsc| {
+            select(
+                rsc,
+                ctx.data.render,
+                ctx.state,
+                id,
+                ctx.data.pos,
+                ctx.data.size,
+                ctx.data.sense.is_dragging(),
+            );
        });
    }
 }

-fn select(ui: &mut Ui, id: WidgetRef<TextEdit>, state: &mut UiState, data: CursorData) {
+fn select(
+    rsc: &mut impl UiRsc,
+    render: &UiRenderState,
+    state: &mut impl HasDefaultUiState,
+    id: WeakWidget<TextEdit>,
+    pos: Vec2,
+    size: Vec2,
+    dragging: bool,
+) {
+    let state = state.default_state_mut();
    let now = Instant::now();
    let recent = (now - state.last_click) < Duration::from_millis(300);
    state.last_click = now;
-    id.get_mut()
-        .select(data.cursor, data.size, data.sense.is_dragging(), recent);
-    if let Some(region) = ui.window_region(&id) {
+    id.edit(rsc).select(pos, size, dragging, recent);
+    if let Some(region) = render.window_region(&id) {
        state.window.set_ime_allowed(true);
        state.window.set_ime_cursor_area(
            LogicalPosition::<f32>::from(region.top_left.tuple()),
--- a/src/default/event.rs
+++ b/src/default/event.rs
@@ -1,15 +1,17 @@
-use crate::layout::DefaultEvent;
+use iris_core::Event;

 #[derive(Eq, PartialEq, Hash, Clone)]
 pub struct Submit;
+impl Event for Submit {}

 #[derive(Eq, PartialEq, Hash, Clone)]
 pub struct Edited;
+impl Event for Edited {}

-impl DefaultEvent for Submit {
-    type Data = ();
-}
+#[derive(Eq, PartialEq, Hash, Clone)]
+pub struct Draw;
+impl Event for Draw {}

-impl DefaultEvent for Edited {
-    type Data = ();
-}
+#[derive(Eq, PartialEq, Hash, Clone)]
+pub struct Undraw;
+impl Event for Undraw {}
--- a/src/default/input.rs
+++ b/src/default/input.rs
@@ -1,8 +1,4 @@
-use crate::{
-    widget::{CursorState, Modifiers},
-    layout::Vec2,
-    default::UiState,
-};
+use crate::prelude::*;
 use winit::{
    event::{MouseButton, MouseScrollDelta, WindowEvent},
    keyboard::{Key, NamedKey},
@@ -70,7 +66,7 @@ impl Input {
    }
 }

-impl UiState {
+impl DefaultUiState {
    pub fn window_size(&self) -> Vec2 {
        let size = self.renderer.window().inner_size();
        (size.width, size.height).into()
--- a/src/default/mod.rs
+++ b/src/default/mod.rs
@@ -1,67 +1,77 @@
 use crate::prelude::*;
 use arboard::Clipboard;
-use std::sync::Arc;
-use std::time::Instant;
-use winit::event::{Ime, WindowEvent};
-use winit::event_loop::{ActiveEventLoop, EventLoopProxy};
-use winit::window::{Window, WindowAttributes};
+use std::{
+    marker::{PhantomData, Sized},
+    sync::Arc,
+    time::Instant,
+};
+use winit::{
+    event::{Ime, WindowEvent},
+    event_loop::{ActiveEventLoop, EventLoopProxy},
+    window::{Window, WindowAttributes},
+};

 mod app;
 mod attr;
 mod event;
 mod input;
 mod render;
+mod sense;
+mod state;
+mod task;

 pub use app::*;
 pub use attr::*;
 pub use event::*;
 pub use input::*;
 pub use render::*;
+pub use sense::*;
+pub use state::*;
+pub use task::*;

-pub type Proxy<Event> = EventLoopProxy<Event>;
-pub type DefaultApp<Data> = App<DefaultState<Data>>;
-
-pub struct DefaultState<AppState> {
-    ui: Ui,
-    ui_state: UiState,
-    app_state: AppState,
+pub struct EventSender<State: DefaultAppState> {
+    proxy: EventLoopProxy<UiMainEvent<State>>,
 }

-pub struct UiState {
+impl<State: DefaultAppState> Clone for EventSender<State> {
+    fn clone(&self) -> Self {
+        Self {
+            proxy: self.proxy.clone(),
+        }
+    }
+}
+
+impl<State: DefaultAppState> EventSender<State> {
+    pub fn send(&self, event: State::Event) {
+        let _ = self.proxy.send_event(UiMainEvent::App(event));
+    }
+    pub fn run(&self, f: impl MainCallback<State>) {
+        let _ = self.proxy.send_event(UiMainEvent::Callback(Box::new(f)));
+    }
+}
+
+pub struct DefaultUiState {
+    pub root: Option<StrongWidget>,
    pub renderer: UiRenderer,
    pub input: Input,
-    pub focus: Option<WidgetRef<TextEdit>>,
+    pub focus: Option<WeakWidget<TextEdit>>,
    pub clipboard: Clipboard,
    pub window: Arc<Window>,
    pub ime: usize,
    pub last_click: Instant,
 }

-pub trait DefaultAppState: 'static {
-    type Event: 'static = ();
-    fn new(ui: &mut Ui, state: &UiState, proxy: Proxy<Self::Event>) -> Self;
-    #[allow(unused_variables)]
-    fn event(&mut self, event: Self::Event, ui: &mut Ui, state: &UiState) {}
-    #[allow(unused_variables)]
-    fn exit(&mut self, ui: &mut Ui, state: &UiState) {}
-    #[allow(unused_variables)]
-    fn window_event(&mut self, event: WindowEvent, ui: &mut Ui, state: &UiState) {}
-    fn window_attrs() -> WindowAttributes {
-        WindowAttributes::default()
+impl HasRoot for DefaultUiState {
+    fn set_root(&mut self, root: StrongWidget) {
+        self.root = Some(root);
    }
 }

-impl<State: DefaultAppState> AppState for DefaultState<State> {
-    type Event = State::Event;
-
-    fn new(event_loop: &ActiveEventLoop, proxy: EventLoopProxy<Self::Event>) -> Self {
-        let window = Arc::new(
-            event_loop
-                .create_window(State::window_attrs())
-                .expect("failed to create window "),
-        );
-        let mut ui = Ui::new();
-        let ui_state = UiState {
+impl DefaultUiState {
+    pub fn new(window: impl Into<Arc<Window>>) -> Self {
+        let window = window.into();
+        Self {
+            root: None,
            renderer: UiRenderer::new(window.clone()),
            window,
            input: Input::default(),
@@ -69,75 +79,256 @@ impl<State: DefaultAppState> AppState for DefaultState<State> {
            ime: 0,
            last_click: Instant::now(),
            focus: None,
+        }
+    }
+}
+
+pub trait HasDefaultUiState: Sized + 'static {
+    fn default_state(&self) -> &DefaultUiState;
+    fn default_state_mut(&mut self) -> &mut DefaultUiState;
+}
+
+pub trait DefaultAppState: HasDefaultUiState {
+    type Event: Send = ();
+    fn new(ui_state: DefaultUiState, rsc: &mut DefaultRsc<Self>) -> Self;
+    #[allow(unused_variables)]
+    fn event(
+        &mut self,
+        event: Self::Event,
+        rsc: &mut DefaultRsc<Self>,
+        render: &mut UiRenderState,
+    ) {
+    }
+    #[allow(unused_variables)]
+    fn exit(&mut self, rsc: &mut DefaultRsc<Self>, render: &mut UiRenderState) {}
+    #[allow(unused_variables)]
+    fn window_event(
+        &mut self,
+        event: WindowEvent,
+        rsc: &mut DefaultRsc<Self>,
+        render: &mut UiRenderState,
+    ) {
+    }
+    fn window_attributes() -> WindowAttributes {
+        Default::default()
+    }
+}
+
+pub struct DefaultRsc<State: 'static + DefaultAppState> {
+    pub ui: UiData,
+    pub events: EventManager<Self>,
+    pub tasks: Tasks<Self>,
+    pub state: WidgetState,
+    pub widget_events: Vec<WidgetEvent>,
+    pub window_event: EventSender<State>,
+    _state: PhantomData<State>,
+}
+
+pub struct WidgetEvent {
+    id: WidgetId,
+    ty: WidgetEventType,
+}
+
+pub enum WidgetEventType {
+    Draw,
+    Undraw,
+    Remove,
+}
+
+pub trait MainCallback<State>: FnOnce(&mut DefaultRsc<State>) + Sync + Send + 'static {}
+impl<F: FnOnce(&mut DefaultRsc<State>) + Sync + Send + 'static, State> MainCallback<State> for F {}
+
+pub enum UiMainEvent<State: DefaultAppState> {
+    RequestUpdate,
+    Callback(Box<dyn MainCallback<State>>),
+    App(State::Event),
+}
+
+impl<State: DefaultAppState> DefaultRsc<State> {
+    fn init(proxy: EventLoopProxy<UiMainEvent<State>>) -> (Self, TaskMsgReceiver<Self>) {
+        let window_event = EventSender {
+            proxy: proxy.clone(),
        };
-        let app_state = State::new(&mut ui, &ui_state, proxy);
+        let (tasks, recv) = Tasks::init(move || {
+            if proxy.send_event(UiMainEvent::RequestUpdate).is_err() {
+                panic!("main thread blew up or smth");
+            }
+        });
+        (
+            Self {
+                ui: Default::default(),
+                events: Default::default(),
+                tasks,
+                widget_events: Default::default(),
+                state: Default::default(),
+                window_event,
+                _state: Default::default(),
+            },
+            recv,
+        )
+    }
+
+    pub fn create_state<T: 'static>(&mut self, id: impl IdLike, data: T) -> WeakState<T> {
+        self.state.add(id.id(), data)
+    }
+}
+
+impl<State: DefaultAppState> UiRsc for DefaultRsc<State> {
+    fn ui(&self) -> &UiData {
+        &self.ui
+    }
+
+    fn ui_mut(&mut self) -> &mut UiData {
+        &mut self.ui
+    }
+
+    fn on_draw(&mut self, active: &ActiveData, redrawn: bool) {
+        self.events.draw(active);
+        if !redrawn {
+            self.widget_events.push(WidgetEvent {
+                id: active.id,
+                ty: WidgetEventType::Draw,
+            });
+        }
+    }
+
+    fn on_undraw(&mut self, active: &ActiveData) {
+        self.events.undraw(active);
+        self.widget_events.push(WidgetEvent {
+            id: active.id,
+            ty: WidgetEventType::Undraw,
+        });
+    }
+
+    fn on_remove(&mut self, id: WidgetId) {
+        self.events.remove(id);
+        self.state.remove(id);
+        self.widget_events.push(WidgetEvent {
+            id,
+            ty: WidgetEventType::Remove,
+        });
+    }
+}
+
+impl<State: 'static + DefaultAppState> HasState for DefaultRsc<State> {
+    type State = State;
+}
+
+impl<State: 'static + DefaultAppState> HasEvents for DefaultRsc<State> {
+    fn events(&self) -> &EventManager<Self> {
+        &self.events
+    }
+
+    fn events_mut(&mut self) -> &mut EventManager<Self> {
+        &mut self.events
+    }
+}
+
+impl<State: 'static + DefaultAppState> HasTasks for DefaultRsc<State> {
+    fn tasks_mut(&mut self) -> &mut Tasks<Self> {
+        &mut self.tasks
+    }
+}
+
+impl<State: 'static + DefaultAppState> HasWidgetState for DefaultRsc<State> {
+    fn widget_state(&self) -> &WidgetState {
+        &self.state
+    }
+
+    fn widget_state_mut(&mut self) -> &mut WidgetState {
+        &mut self.state
+    }
+}
+
+pub struct DefaultApp<State: DefaultAppState> {
+    rsc: DefaultRsc<State>,
+    render: UiRenderState,
+    state: State,
+    task_recv: TaskMsgReceiver<DefaultRsc<State>>,
+}
+
+impl<State: DefaultAppState> AppState for DefaultApp<State> {
+    type Event = UiMainEvent<State>;
+
+    fn new(event_loop: &ActiveEventLoop, proxy: EventLoopProxy<Self::Event>) -> Self {
+        let window = event_loop
+            .create_window(State::window_attributes())
+            .unwrap();
+        let default_state = DefaultUiState::new(window);
+        let (mut rsc, task_recv) = DefaultRsc::init(proxy);
+        let state = State::new(default_state, &mut rsc);
+        let render = UiRenderState::new();
        Self {
-            ui,
-            ui_state,
-            app_state,
+            rsc,
+            state,
+            render,
+            task_recv,
        }
    }

    fn event(&mut self, event: Self::Event, _: &ActiveEventLoop) {
-        self.app_state.event(event, &mut self.ui, &self.ui_state);
+        match event {
+            UiMainEvent::RequestUpdate => {
+                self.check_updates();
+            }
+            UiMainEvent::App(event) => {
+                self.state.event(event, &mut self.rsc, &mut self.render);
+            }
+            UiMainEvent::Callback(f) => f(&mut self.rsc),
+        }
    }

    fn window_event(&mut self, event: WindowEvent, event_loop: &ActiveEventLoop) {
        let Self {
-            ui,
-            ui_state,
-            app_state,
+            rsc, render, state, ..
        } = self;

-        let input_changed = ui_state.input.event(&event);
-        let cursor_state = ui_state.cursor_state().clone();
-        let old = ui_state.focus.clone();
-        if cursor_state.buttons.left.is_start() {
-            ui_state.focus = None;
-        }
-        if input_changed {
+        // input handling
+        let ui_state = state.default_state_mut();
+        if ui_state.input.event(&event) {
+            let cursor_state = ui_state.cursor_state().clone();
+            let old = ui_state.focus;
+            if cursor_state.buttons.left.is_start() {
+                ui_state.focus = None;
+            }
            let window_size = ui_state.window_size();
-            // call sensors with all 3 important contexts
-            // TODO: allow user to specify custom contexts?
-            // and give them both states in case they need both
-            ui.run_sensors(&mut (), &cursor_state, window_size);
-            ui.run_sensors(ui_state, &cursor_state, window_size);
-            ui.run_sensors(app_state, &cursor_state, window_size);
-        }
-        if old != ui_state.focus
-            && let Some(old) = old
-        {
-            old.get_mut().deselect();
+            render.run_sensors(rsc, state, cursor_state, window_size);
+            if old != state.default_state().focus
+                && let Some(old) = old
+            {
+                old.edit(rsc).deselect();
+            }
        }
+        let ui_state = state.default_state_mut();
        match &event {
            WindowEvent::CloseRequested => event_loop.exit(),
            WindowEvent::RedrawRequested => {
-                ui_state.renderer.update(ui);
+                render.update(&ui_state.root, rsc);
+                ui_state.renderer.update(&mut rsc.ui, render);
                ui_state.renderer.draw();
            }
            WindowEvent::Resized(size) => {
-                ui.resize((size.width, size.height));
+                render.resize((size.width, size.height));
                ui_state.renderer.resize(size)
            }
            WindowEvent::KeyboardInput { event, .. } => {
-                if let Some(sel) = &ui_state.focus
+                if let Some(sel) = ui_state.focus
                    && event.state.is_pressed()
                {
-                    let sel = &sel.clone();
-                    let res = sel.get_mut().apply_event(event, &ui_state.input.modifiers);
-                    match res {
+                    let mut text = sel.edit(rsc);
+                    match text.apply_event(event, &ui_state.input.modifiers) {
                        TextInputResult::Unfocus => {
                            ui_state.focus = None;
                            ui_state.window.set_ime_allowed(false);
                        }
                        TextInputResult::Submit => {
-                            ui.run_event(app_state, sel, Submit, ());
+                            rsc.run_event::<Submit>(sel, (), state);
                        }
                        TextInputResult::Paste => {
                            if let Ok(t) = ui_state.clipboard.get_text() {
-                                sel.get_mut().insert(&t);
+                                text.insert(&t);
                            }
-                            ui.run_event(app_state, sel, Edited, ());
+                            rsc.run_event::<Edited>(sel, (), state);
                        }
                        TextInputResult::Copy(text) => {
                            if let Err(err) = ui_state.clipboard.set_text(text) {
@@ -145,37 +336,119 @@ impl<State: DefaultAppState> AppState for DefaultState<State> {
                            }
                        }
                        TextInputResult::Used => {
-                            ui.run_event(app_state, sel, Edited, ());
+                            rsc.run_event::<Edited>(sel, (), state);
                        }
                        TextInputResult::Unused => {}
                    }
                }
            }
            WindowEvent::Ime(ime) => {
-                if let Some(sel) = &ui_state.focus {
+                if let Some(sel) = ui_state.focus {
+                    let mut text = sel.edit(rsc);
                    match ime {
                        Ime::Enabled | Ime::Disabled => (),
                        Ime::Preedit(content, _pos) => {
                            // TODO: highlight once that's real
-                            sel.get_mut().replace(ui_state.ime, content);
+                            text.replace(ui_state.ime, content);
                            ui_state.ime = content.chars().count();
                        }
                        Ime::Commit(content) => {
-                            sel.get_mut().insert(content);
+                            text.insert(content);
                        }
                    }
                }
            }
            _ => (),
        }
-        app_state.window_event(event, ui, ui_state);
-        if ui.update() {
-            ui_state.renderer.window().request_redraw();
-        }
-        ui_state.input.end_frame();
+        state.window_event(event, rsc, render);
+
+        self.check_updates();
+        self.state.default_state_mut().input.end_frame();
    }

    fn exit(&mut self) {
-        self.app_state.exit(&mut self.ui, &self.ui_state);
+        self.state.exit(&mut self.rsc, &mut self.render);
+    }
+}
+
+impl<State: DefaultAppState> DefaultApp<State> {
+    pub fn check_updates(&mut self) {
+        let Self {
+            rsc,
+            render,
+            state,
+            task_recv,
+        } = self;
+
+        for update in task_recv.try_iter() {
+            update(state, rsc);
+        }
+
+        let mut events = std::mem::take(&mut rsc.widget_events);
+        for event in events.drain(..) {
+            match event.ty {
+                WidgetEventType::Draw => {
+                    rsc.run_event::<Draw>(event.id, (), state);
+                }
+                WidgetEventType::Undraw => {
+                    rsc.run_event::<Undraw>(event.id, (), state);
+                }
+                _ => (),
+            }
+        }
+        rsc.widget_events = events;
+
+        let ui_state = state.default_state();
+        if render.needs_redraw(&ui_state.root, rsc.widgets()) {
+            ui_state.renderer.window().request_redraw();
+        }
+    }
+}
+
+pub trait RscIdx<Rsc> {
+    type Output;
+    fn get(self, rsc: &Rsc) -> &Self::Output;
+    fn get_mut(self, rsc: &mut Rsc) -> &mut Self::Output;
+}
+
+impl<State: 'static + DefaultAppState, I: RscIdx<DefaultRsc<State>>> std::ops::Index<I>
+    for DefaultRsc<State>
+{
+    type Output = I::Output;
+
+    fn index(&self, index: I) -> &Self::Output {
+        index.get(self)
+    }
+}
+
+impl<State: 'static + DefaultAppState, I: RscIdx<DefaultRsc<State>>> std::ops::IndexMut<I>
+    for DefaultRsc<State>
+{
+    fn index_mut(&mut self, index: I) -> &mut Self::Output {
+        index.get_mut(self)
+    }
+}
+
+impl<W: Widget, Rsc: UiRsc> RscIdx<Rsc> for WeakWidget<W> {
+    type Output = W;
+
+    fn get(self, rsc: &Rsc) -> &Self::Output {
+        &rsc.ui().widgets[self]
+    }
+
+    fn get_mut(self, rsc: &mut Rsc) -> &mut Self::Output {
+        &mut rsc.ui_mut().widgets[self]
+    }
+}
+
+impl<T: 'static, Rsc: HasWidgetState> RscIdx<Rsc> for WeakState<T> {
+    type Output = T;
+
+    fn get(self, rsc: &Rsc) -> &Self::Output {
+        rsc.widget_state().get(self)
+    }
+
+    fn get_mut(self, rsc: &mut Rsc) -> &mut Self::Output {
+        rsc.widget_state_mut().get_mut(self)
    }
 }
--- a/src/default/render.rs
+++ b/src/default/render.rs
@@ -1,10 +1,7 @@
-use crate::{
-    layout::Ui,
-    render::{UiLimits, UiRenderNode},
-};
+use iris_core::{UiData, UiLimits, UiRenderNode, UiRenderState};
 use pollster::FutureExt;
 use std::sync::Arc;
-use wgpu::{util::StagingBelt, *};
+use wgpu::*;
 use winit::{dpi::PhysicalSize, window::Window};

 pub const CLEAR_COLOR: Color = Color::BLACK;
@@ -16,13 +13,12 @@ pub struct UiRenderer {
    queue: Queue,
    config: SurfaceConfiguration,
    encoder: CommandEncoder,
-    staging_belt: StagingBelt,
    pub ui: UiRenderNode,
 }

 impl UiRenderer {
-    pub fn update(&mut self, updates: &mut Ui) {
-        self.ui.update(&self.device, &self.queue, updates);
+    pub fn update(&mut self, ui: &mut UiData, render: &mut UiRenderState) {
+        self.ui.update(&self.device, &self.queue, ui, render);
    }

    pub fn draw(&mut self) {
@@ -49,9 +45,7 @@ impl UiRenderer {
        }

        self.queue.submit(std::iter::once(encoder.finish()));
-        self.staging_belt.finish();
        output.present();
-        self.staging_belt.recall();
    }

    pub fn resize(&mut self, size: &PhysicalSize<u32>) {
@@ -72,7 +66,6 @@ impl UiRenderer {

        let instance = Instance::new(&InstanceDescriptor {
            backends: Backends::PRIMARY,
-            flags: InstanceFlags::empty(),
            ..Default::default()
        });

@@ -122,7 +115,7 @@ impl UiRenderer {
            format: surface_format,
            width: size.width,
            height: size.height,
-            present_mode: PresentMode::AutoVsync,
+            present_mode: PresentMode::AutoNoVsync,
            alpha_mode: surface_caps.alpha_modes[0],
            desired_maximum_frame_latency: 2,
            view_formats: vec![],
@@ -130,10 +123,9 @@ impl UiRenderer {

        surface.configure(&device, &config);

-        let staging_belt = StagingBelt::new(4096 * 4);
        let encoder = Self::create_encoder(&device);

-        let shape_pipeline = UiRenderNode::new(&device, &queue, &config, ui_limits);
+        let ui = UiRenderNode::new(&device, &queue, &config, ui_limits);

        Self {
            surface,
@@ -141,8 +133,7 @@ impl UiRenderer {
            queue,
            config,
            encoder,
-            staging_belt,
-            ui: shape_pipeline,
+            ui,
            window,
        }
    }
--- a/src/default/sense.rs
+++ b/src/default/sense.rs
@@ -1,16 +1,9 @@
 use crate::prelude::*;
-use crate::util::Id;
-
 use std::{
    ops::{BitOr, Deref, DerefMut},
    rc::Rc,
 };

-use crate::{
-    layout::{UiModule, UiRegion, Vec2},
-    util::HashMap,
-};
-
 #[derive(Clone, Copy, PartialEq)]
 pub enum CursorButton {
    Left,
@@ -29,8 +22,23 @@ pub enum CursorSense {
    Scroll,
 }

+#[derive(Clone)]
 pub struct CursorSenses(Vec<CursorSense>);

+impl Event for CursorSenses {
+    type Data<'a> = CursorData<'a>;
+    type State = SensorState;
+    fn should_run<'a>(&self, data: &Self::Data<'a>) -> Option<Self::Data<'a>> {
+        if let Some(sense) = should_run(self, &data.cursor, data.hover) {
+            let mut data = data.clone();
+            data.sense = sense;
+            Some(data)
+        } else {
+            None
+        }
+    }
+}
+
 impl CursorSense {
    pub fn click() -> Self {
        Self::PressStart(CursorButton::Left)
@@ -75,6 +83,16 @@ impl CursorButtons {
        self.middle.end_frame();
        self.right.end_frame();
    }
+
+    pub fn iter(&self) -> impl Iterator<Item = (CursorButton, &ActivationState)> {
+        [
+            CursorButton::Left,
+            CursorButton::Middle,
+            CursorButton::Right,
+        ]
+        .into_iter()
+        .map(|b| (b, self.select(&b)))
+    }
 }

 impl CursorState {
@@ -98,135 +116,86 @@ pub enum ActivationState {
 /// or basically have some way to have custom senses
 /// that depend on active widget positions
 /// but I'm not sure how or if worth it
-pub struct Sensor<Ctx, Data> {
+pub struct Sensor<Ctx: HasEvents, Data> {
    pub senses: CursorSenses,
    pub f: Rc<dyn EventFn<Ctx, Data>>,
 }

-pub type SensorMap<Ctx, Data> = HashMap<Id, SensorGroup<Ctx, Data>>;
 pub type SenseShape = UiRegion;
-pub struct SensorGroup<Ctx, Data> {
+
+#[derive(Default, Debug)]
+pub struct SensorState {
    pub hover: ActivationState,
-    pub sensors: Vec<Sensor<Ctx, Data>>,
 }

 #[derive(Clone)]
-pub struct CursorData {
-    pub cursor: Vec2,
+pub struct CursorData<'a> {
+    /// where this widget was hit
+    pub pos: Vec2,
    pub size: Vec2,
    pub scroll_delta: Vec2,
-    /// the (first) sense that triggered this event
-    /// the senses are checked in order
+    pub hover: ActivationState,
+    pub cursor: CursorState,
+    /// the first sense that triggered this
    pub sense: CursorSense,
-}
-
-pub struct CursorModule<Ctx> {
-    map: SensorMap<Ctx, CursorData>,
-    active: HashMap<usize, HashMap<Id, SenseShape>>,
-}
-
-impl<Ctx: 'static> UiModule for CursorModule<Ctx> {
-    fn on_draw(&mut self, inst: &WidgetInstance) {
-        if self.map.contains_key(&inst.id) {
-            self.active
-                .entry(inst.layer)
-                .or_default()
-                .insert(inst.id, inst.region);
-        }
-    }
-
-    fn on_undraw(&mut self, inst: &WidgetInstance) {
-        if let Some(layer) = self.active.get_mut(&inst.layer) {
-            layer.remove(&inst.id);
-        }
-    }
-
-    fn on_remove(&mut self, id: &Id) {
-        self.map.remove(id);
-        for layer in self.active.values_mut() {
-            layer.remove(id);
-        }
-    }
-
-    fn on_move(&mut self, inst: &WidgetInstance) {
-        if let Some(map) = self.active.get_mut(&inst.layer)
-            && let Some(region) = map.get_mut(&inst.id)
-        {
-            *region = inst.region;
-        }
-    }
-}
-
-impl<Ctx> CursorModule<Ctx> {
-    pub fn merge(&mut self, other: Self) {
-        for (id, group) in other.map {
-            for sensor in group.sensors {
-                self.map.entry(id).or_default().sensors.push(sensor);
-            }
-        }
-    }
+    pub render: &'a UiRenderState,
 }

 pub trait SensorUi {
-    fn run_sensors<Ctx: 'static>(&mut self, ctx: &mut Ctx, cursor: &CursorState, window_size: Vec2);
+    fn run_sensors<Rsc: HasEvents>(
+        &self,
+        rsc: &mut Rsc,
+        state: &mut Rsc::State,
+        cursor: CursorState,
+        window_size: Vec2,
+    );
 }

-impl SensorUi for Ui {
-    fn run_sensors<Ctx: 'static>(
-        &mut self,
-        ctx: &mut Ctx,
-        cursor: &CursorState,
+impl SensorUi for UiRenderState {
+    fn run_sensors<Rsc: HasEvents>(
+        &self,
+        rsc: &mut Rsc,
+        state: &mut Rsc::State,
+        cursor: CursorState,
        window_size: Vec2,
    ) {
-        CursorModule::<Ctx>::run(self, ctx, cursor, window_size);
-    }
-}
-
-impl<Ctx: 'static> CursorModule<Ctx> {
-    pub fn run(ui: &mut Ui, ctx: &mut Ctx, cursor: &CursorState, window_size: Vec2) {
-        let layers = std::mem::take(&mut ui.data_mut().layers);
-        let mut module = std::mem::take(ui.data_mut().modules.get_mut::<Self>());
-
-        for i in layers.indices().rev() {
-            let Some(list) = module.active.get_mut(&i) else {
-                continue;
-            };
+        // in order to remove this take, need to store active list in UiRenderState somehow
+        // this would probably be done through a generic parameter that adds yet another rsc /
+        // state like thing, but local to render state, and is passed to UiRsc events so you can
+        // update it there?
+        let mut active = std::mem::take(&mut rsc.events_mut().get_type::<CursorSense>().active);
+        for layer in self.layers.indices().rev() {
            let mut sensed = false;
-            for (id, shape) in list.iter() {
-                let group = module.map.get_mut(id).unwrap();
+            for (id, sensor) in active.get_mut(&layer).into_flat_iter() {
+                let shape = self.active.get(id).unwrap().region;
                let region = shape.to_px(window_size);
                let in_shape = cursor.exists && region.contains(cursor.pos);
-                group.hover.update(in_shape);
-                if group.hover == ActivationState::Off {
+                sensor.hover.update(in_shape);
+                if sensor.hover == ActivationState::Off {
                    continue;
                }
                sensed = true;

-                for sensor in &mut group.sensors {
-                    if let Some(sense) = should_run(&sensor.senses, cursor, group.hover) {
-                        let data = CursorData {
-                            cursor: cursor.pos - region.top_left,
-                            size: region.bot_right - region.top_left,
-                            scroll_delta: cursor.scroll_delta,
-                            sense,
-                        };
-                        (sensor.f)(EventCtx {
-                            ui,
-                            state: ctx,
-                            data,
-                        });
-                    }
-                }
+                let cursor = cursor.clone();
+
+                let data = CursorData {
+                    pos: cursor.pos - region.top_left,
+                    size: region.bot_right - region.top_left,
+                    scroll_delta: cursor.scroll_delta,
+                    hover: sensor.hover,
+                    cursor,
+                    // this does not have any meaning;
+                    // might wanna set up Event to have a prepare stage
+                    sense: CursorSense::Hovering,
+                    render: self,
+                };
+                rsc.run_event::<CursorSense>(*id, data, state);
            }
            if sensed {
                break;
            }
        }
-
-        let ui_mod = ui.data_mut().modules.get_mut::<Self>();
-        std::mem::swap(ui_mod, &mut module);
-        ui_mod.merge(module);
-        ui.data_mut().layers = layers;
+        rsc.events_mut().get_type::<CursorSense>().active = active;
    }
 }

@@ -294,66 +263,10 @@ impl ActivationState {
    }
 }

-impl Event for CursorSenses {
-    type Module<Ctx: 'static> = CursorModule<Ctx>;
-    type Data = CursorData;
-}
-
-impl Event for CursorSense {
-    type Module<Ctx: 'static> = CursorModule<Ctx>;
-    type Data = CursorData;
-}
-
-impl<E: Event<Data = <CursorSenses as Event>::Data> + Into<CursorSenses>, Ctx: 'static>
-    EventModule<E, Ctx> for CursorModule<Ctx>
-{
-    fn register(&mut self, id: Id, senses: E, f: impl EventFn<Ctx, <E as Event>::Data>) {
-        // TODO: does not add to active if currently active
-        self.map.entry(id).or_default().sensors.push(Sensor {
-            senses: senses.into(),
-            f: Rc::new(f),
-        });
-    }
-
-    fn run<'a>(
-        &self,
-        id: &Id,
-        event: E,
-    ) -> Option<impl Fn(EventCtx<Ctx, <E as Event>::Data>) + use<'a, E, Ctx>> {
-        let senses = event.into();
-        if let Some(group) = self.map.get(id) {
-            let fs: Vec<_> = group
-                .sensors
-                .iter()
-                .filter_map(|sensor| {
-                    if sensor.senses.iter().any(|s| senses.contains(s)) {
-                        Some(sensor.f.clone())
-                    } else {
-                        None
-                    }
-                })
-                .collect();
-            Some(move |ctx: EventCtx<Ctx, CursorData>| {
-                for f in &fs {
-                    f(EventCtx {
-                        state: ctx.state,
-                        ui: ctx.ui,
-                        data: ctx.data.clone(),
-                    });
-                }
-            })
-        } else {
-            None
-        }
-    }
-}
-
-impl<Ctx, Data> Default for SensorGroup<Ctx, Data> {
-    fn default() -> Self {
-        Self {
-            hover: Default::default(),
-            sensors: Default::default(),
-        }
+impl EventLike for CursorSense {
+    type Event = CursorSenses;
+    fn into_event(self) -> Self::Event {
+        self.into()
    }
 }

@@ -393,12 +306,3 @@ impl BitOr<CursorSense> for CursorSenses {
        self
    }
 }
-
-impl<Ctx> Default for CursorModule<Ctx> {
-    fn default() -> Self {
-        Self {
-            map: Default::default(),
-            active: Default::default(),
-        }
-    }
-}
--- a/src/default/state.rs
+++ b/src/default/state.rs
@@ -0,0 +1,75 @@
+use iris_core::{
+    WidgetId,
+    util::{HashMap, HashSet},
+};
+use std::{
+    any::{Any, TypeId},
+    marker::PhantomData,
+};
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash)]
+struct Key {
+    id: WidgetId,
+    ty: TypeId,
+    i: usize,
+}
+
+#[derive(Default)]
+pub struct WidgetState {
+    widgets: HashMap<WidgetId, HashSet<(TypeId, usize)>>,
+    counts: HashMap<(WidgetId, TypeId), usize>,
+    map: HashMap<Key, Box<dyn Any>>,
+}
+
+impl WidgetState {
+    pub fn new() -> Self {
+        Self::default()
+    }
+    pub fn add<T: 'static>(&mut self, id: WidgetId, data: T) -> WeakState<T> {
+        let ty = TypeId::of::<T>();
+        let count = self.counts.entry((id, ty)).or_default();
+        let i = *count;
+        let key = Key { ty, i, id };
+        self.map.insert(key, Box::new(data));
+        self.widgets.entry(id).or_default().insert((ty, i));
+        *count += 1;
+        WeakState {
+            key,
+            _pd: PhantomData,
+        }
+    }
+    pub fn remove(&mut self, id: WidgetId) {
+        for &(ty, i) in self.widgets.get(&id).into_iter().flatten() {
+            self.map.remove(&Key { id, ty, i });
+        }
+    }
+    pub fn get<T: 'static>(&self, state: WeakState<T>) -> &T {
+        self.map.get(&state.key).unwrap().downcast_ref().unwrap()
+    }
+    pub fn get_mut<T: 'static>(&mut self, state: WeakState<T>) -> &mut T {
+        self.map
+            .get_mut(&state.key)
+            .unwrap()
+            .downcast_mut()
+            .unwrap()
+    }
+}
+
+#[derive(Clone, Copy)]
+pub struct WeakState<T> {
+    key: Key,
+    _pd: PhantomData<T>,
+}
+
+pub trait HasWidgetState {
+    fn widget_state(&self) -> &WidgetState;
+    fn widget_state_mut(&mut self) -> &mut WidgetState;
+}
+
+impl<'a, T: 'static> FnOnce<(&'a mut WidgetState,)> for WeakState<T> {
+    type Output = &'a mut T;
+
+    extern "rust-call" fn call_once(self, (state,): (&'a mut WidgetState,)) -> Self::Output {
+        state.get_mut(self)
+    }
+}
--- a/src/default/task.rs
+++ b/src/default/task.rs
@@ -0,0 +1,81 @@
+use iris_core::HasState;
+use std::{
+    pin::Pin,
+    sync::{
+        Arc,
+        mpsc::{Receiver as SyncReceiver, Sender as SyncSender, channel as sync_channel},
+    },
+};
+use tokio::{
+    runtime::Runtime,
+    sync::mpsc::{
+        UnboundedReceiver as AsyncReceiver, UnboundedSender as AsyncSender,
+        unbounded_channel as async_channel,
+    },
+};
+
+pub type TaskMsgSender<Rsc> = SyncSender<Box<dyn TaskUpdate<Rsc>>>;
+pub type TaskMsgReceiver<Rsc> = SyncReceiver<Box<dyn TaskUpdate<Rsc>>>;
+
+pub trait TaskUpdate<Rsc: HasState>: FnOnce(&mut Rsc::State, &mut Rsc) + Send {}
+impl<F: FnOnce(&mut Rsc::State, &mut Rsc) + Send, Rsc: HasState> TaskUpdate<Rsc> for F {}
+
+pub struct Tasks<Rsc: HasState> {
+    start: AsyncSender<BoxTask>,
+    request_update: Arc<dyn Fn() + Send + Sync>,
+    msg_send: SyncSender<Box<dyn TaskUpdate<Rsc>>>,
+}
+
+pub struct TaskCtx<Rsc: HasState> {
+    send: TaskMsgSender<Rsc>,
+}
+
+impl<Rsc: HasState> TaskCtx<Rsc> {
+    pub fn update(&mut self, f: impl TaskUpdate<Rsc> + 'static) {
+        let _ = self.send.send(Box::new(f));
+    }
+}
+impl<Rsc: HasState + 'static> TaskCtx<Rsc> {
+    fn new(send: TaskMsgSender<Rsc>) -> Self {
+        Self { send }
+    }
+}
+
+type BoxTask = Pin<Box<dyn Future<Output = ()> + Send>>;
+
+impl<Rsc: HasState> Tasks<Rsc> {
+    pub fn init(request_update: impl Fn() + 'static + Send + Sync) -> (Self, TaskMsgReceiver<Rsc>) {
+        let (start, start_recv) = async_channel();
+        let (msgs, msgs_recv) = sync_channel();
+        std::thread::spawn(|| {
+            let rt = Runtime::new().unwrap();
+            rt.block_on(listen(start_recv))
+        });
+        (
+            Self {
+                start,
+                msg_send: msgs,
+                request_update: Arc::new(request_update),
+            },
+            msgs_recv,
+        )
+    }
+
+    pub fn spawn<F: AsyncFnOnce(TaskCtx<Rsc>) + 'static + std::marker::Send>(&mut self, task: F)
+    where
+        F::CallOnceFuture: Send,
+    {
+        let send = self.msg_send.clone();
+        let request_update = self.request_update.clone();
+        let _ = self.start.send(Box::pin(async move {
+            task(TaskCtx::new(send)).await;
+            request_update();
+        }));
+    }
+}
+
+async fn listen(mut recv: AsyncReceiver<BoxTask>) {
+    while let Some(task) = recv.recv().await {
+        tokio::spawn(task);
+    }
+}
--- a/src/event.rs
+++ b/src/event.rs
@@ -0,0 +1,87 @@
+use iris_core::*;
+use iris_macro::*;
+use std::sync::Arc;
+
+use crate::default::{TaskCtx, TaskUpdate, Tasks};
+
+pub trait Eventable<Rsc: HasEvents, Tag>: WidgetLike<Rsc, Tag> {
+    fn on<E: EventLike>(
+        self,
+        event: E,
+        f: impl for<'a> WidgetEventFn<Rsc, <E::Event as Event>::Data<'a>, Self::Widget>,
+    ) -> impl WidgetIdFn<Rsc, Self::Widget> {
+        move |rsc| {
+            let id = self.add(rsc);
+            rsc.register_event(id, event.into_event(), move |ctx, rsc| {
+                f(
+                    EventIdCtx {
+                        widget: id,
+                        state: ctx.state,
+                        data: ctx.data,
+                    },
+                    rsc,
+                );
+            });
+            id
+        }
+    }
+}
+impl<WL: WidgetLike<Rsc, Tag>, Rsc: HasEvents, Tag> Eventable<Rsc, Tag> for WL {}
+
+widget_trait! {
+    pub trait TaskEventable<Rsc: HasEvents + HasTasks>;
+    fn task_on<'a, E: EventLike, F: AsyncWidgetEventFn<Rsc, WL::Widget>>(
+        self,
+        event: E,
+        f: F,
+    ) -> impl WidgetIdFn<Rsc, WL::Widget>
+        where <E::Event as Event>::Data<'a>: Send,
+        for<'b> F::CallRefFuture<'b>: Send,
+    {
+        let f = Arc::new(f);
+        move |rsc| {
+            let id = self.add(rsc);
+            rsc.register_event(id, event.into_event(), move |_, rsc| {
+                let f = f.clone();
+                rsc.tasks_mut().spawn(async move |task| {
+                    f(AsyncEventIdCtx {
+                        widget: id,
+                        task,
+                    }).await;
+                });
+            });
+            id
+        }
+    }
+}
+
+pub trait HasTasks: Sized + HasState + HasEvents {
+    fn tasks_mut(&mut self) -> &mut Tasks<Self>;
+
+    fn spawn_task<F: AsyncFnOnce(TaskCtx<Self>) + 'static + std::marker::Send>(&mut self, task: F)
+    where
+        F::CallOnceFuture: Send,
+    {
+        self.tasks_mut().spawn(task);
+    }
+}
+
+pub trait AsyncWidgetEventFn<Rsc: HasEvents, W: ?Sized>:
+    AsyncFn(AsyncEventIdCtx<Rsc, W>) + Send + Sync + 'static
+{
+}
+impl<Rsc: HasEvents, F: AsyncFn(AsyncEventIdCtx<Rsc, W>) + Send + Sync + 'static, W: ?Sized>
+    AsyncWidgetEventFn<Rsc, W> for F
+{
+}
+
+pub struct AsyncEventIdCtx<Rsc: HasEvents, W: ?Sized> {
+    pub widget: WeakWidget<W>,
+    task: TaskCtx<Rsc>,
+}
+
+impl<Rsc: HasEvents, W: ?Sized> AsyncEventIdCtx<Rsc, W> {
+    pub fn update(&mut self, f: impl TaskUpdate<Rsc> + 'static) {
+        self.task.update(f);
+    }
+}
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,22 +2,25 @@
 #![feature(fn_traits)]
 #![feature(gen_blocks)]
 #![feature(associated_type_defaults)]
+#![feature(unsize)]
+#![feature(option_into_flat_iter)]
+#![feature(async_fn_traits)]

-mod default;
-mod traits;
-mod widget;
+pub mod default;
+pub mod event;
+pub mod widget;

-pub use iris_core::*;
-pub use iris_macro::*;
+pub use iris_core as core;
+pub use iris_macro as macros;

 pub mod prelude {
-    pub use super::default::*;
-    pub use super::traits::*;
-    pub use super::widget::*;
-
-    pub use iris_core::layout::*;
-    pub use iris_core::render::*;
-    pub use iris_core::util::Handle;
-
+    use super::*;
+    pub use default::*;
+    pub use event::*;
+    pub use iris_core::*;
    pub use iris_macro::*;
+    pub use widget::*;
+
+    pub use iris_core::util::Vec2;
+    pub use len_fns::*;
 }
--- a/src/traits.rs
+++ b/src/traits.rs
@@ -1,82 +0,0 @@
-use crate::prelude::*;
-use iris_macro::widget_trait;
-
-// TODO: naming in here is a bit weird like eventable
-#[macro_export]
-macro_rules! event_ctx {
-    ($ty: ty) => {
-        mod local_event_trait {
-            use super::*;
-            use std::marker::Sized;
-            #[allow(unused_imports)]
-            use $crate::prelude::*;
-
-            #[allow(unused)]
-            pub trait EventableCtx<W: ?Sized, Tag, Ctx: 'static> {
-                fn on<E: Event>(
-                    self,
-                    event: E,
-                    f: impl WidgetEventFn<Ctx, E::Data, W>,
-                ) -> impl WidgetIdFn<W> + EventableCtx<W, IdFnTag, Ctx>;
-            }
-
-            impl<WL: WidgetLike<Tag>, Tag> EventableCtx<WL::Widget, Tag, $ty> for WL {
-                fn on<E: Event>(
-                    self,
-                    event: E,
-                    f: impl WidgetEventFn<$ty, E::Data, WL::Widget>,
-                ) -> impl WidgetIdFn<WL::Widget> + EventableCtx<WL::Widget, IdFnTag, $ty> {
-                    eventable::Eventable::on(self, event, f)
-                }
-            }
-
-            #[allow(unused)]
-            pub trait EventableCtxUi<W: ?Sized, Tag, Ctx: 'static>
-            where
-                WidgetRef<W>: EventableCtx<W, Tag, Ctx>,
-            {
-                fn on<E: Event>(
-                    &mut self,
-                    widget: &WidgetRef<W>,
-                    event: E,
-                    f: impl WidgetEventFn<Ctx, E::Data, W>,
-                );
-            }
-
-            impl<W: ?Sized + 'static, Tag> EventableCtxUi<W, Tag, $ty> for Ui
-            where
-                WidgetRef<W>: EventableCtx<W, Tag, $ty>,
-            {
-                fn on<E: Event>(
-                    &mut self,
-                    widget: &WidgetRef<W>,
-                    event: E,
-                    f: impl WidgetEventFn<$ty, E::Data, W>,
-                ) {
-                    self.register_widget_event(&widget, event, f);
-                }
-            }
-        }
-        use local_event_trait::*;
-    };
-}
-pub use event_ctx;
-
-pub mod eventable {
-    use super::*;
-
-    widget_trait!(
-        pub Eventable;
-        fn on<E: Event, Ctx: 'static>(
-            self,
-            event: E,
-            f: impl WidgetEventFn<Ctx, E::Data, WL::Widget>,
-        ) -> impl WidgetIdFn<WL::Widget> {
-            move |ui| {
-                let id = self.add(ui);
-                ui.register_widget_event(&id, event, f);
-                id
-            }
-        }
-    );
-}
--- a/src/widget/image.rs
+++ b/src/widget/image.rs
@@ -1,5 +1,5 @@
-use image::DynamicImage;
 use crate::prelude::*;
+use image::DynamicImage;

 pub struct Image {
    handle: TextureHandle,
@@ -19,10 +19,10 @@ impl Widget for Image {
    }
 }

-pub fn image(image: impl LoadableImage) -> impl WidgetFn<Image> {
+pub fn image<State: UiRsc>(image: impl LoadableImage) -> impl WidgetFn<State, Image> {
    let image = image.get_image().expect("Failed to load image");
-    move |ui| Image {
-        handle: ui.add_texture(image),
+    move |state| Image {
+        handle: state.ui_mut().textures.add(image),
    }
 }

--- a/src/widget/mask.rs
+++ b/src/widget/mask.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;

 pub struct Masked {
-    pub inner: WidgetRef,
+    pub inner: StrongWidget,
 }

 impl Widget for Masked {
--- a/src/widget/mod.rs
+++ b/src/widget/mod.rs
@@ -3,15 +3,15 @@ mod mask;
 mod position;
 mod ptr;
 mod rect;
-mod sense;
 mod text;
 mod trait_fns;
+mod selector;

 pub use image::*;
 pub use mask::*;
 pub use position::*;
 pub use ptr::*;
 pub use rect::*;
-pub use sense::*;
 pub use text::*;
 pub use trait_fns::*;
+pub use selector::*;
--- a/src/widget/position/align.rs
+++ b/src/widget/position/align.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;

 pub struct Aligned {
-    pub inner: WidgetRef,
+    pub inner: StrongWidget,
    pub align: Align,
 }

--- a/src/widget/position/layer.rs
+++ b/src/widget/position/layer.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;

 pub struct LayerOffset {
-    pub inner: WidgetRef,
+    pub inner: StrongWidget,
    pub offset: usize,
 }

--- a/src/widget/position/max_size.rs
+++ b/src/widget/position/max_size.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;

 pub struct MaxSize {
-    pub inner: WidgetRef,
+    pub inner: StrongWidget,
    pub x: Option<Len>,
    pub y: Option<Len>,
 }
--- a/src/widget/position/offset.rs
+++ b/src/widget/position/offset.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;

 pub struct Offset {
-    pub inner: WidgetRef,
+    pub inner: StrongWidget,
    pub amt: UiVec2,
 }

--- a/src/widget/position/pad.rs
+++ b/src/widget/position/pad.rs
@@ -2,7 +2,7 @@ use crate::prelude::*;

 pub struct Pad {
    pub padding: Padding,
-    pub inner: WidgetRef,
+    pub inner: StrongWidget,
 }

 impl Widget for Pad {
--- a/src/widget/position/scroll.rs
+++ b/src/widget/position/scroll.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;

 pub struct Scroll {
-    inner: WidgetRef,
+    inner: StrongWidget,
    axis: Axis,
    amt: f32,
    snap_end: bool,
@@ -41,7 +41,7 @@ impl Widget for Scroll {
 }

 impl Scroll {
-    pub fn new(inner: WidgetRef, axis: Axis) -> Self {
+    pub fn new(inner: StrongWidget, axis: Axis) -> Self {
        Self {
            inner,
            axis,
--- a/src/widget/position/sized.rs
+++ b/src/widget/position/sized.rs
@@ -1,7 +1,7 @@
 use crate::prelude::*;

 pub struct Sized {
-    pub inner: WidgetRef,
+    pub inner: StrongWidget,
    pub x: Option<Len>,
    pub y: Option<Len>,
 }
--- a/src/widget/position/span.rs
+++ b/src/widget/position/span.rs
@@ -2,7 +2,7 @@ use crate::prelude::*;
 use std::marker::PhantomData;

 pub struct Span {
-    pub children: Vec<WidgetRef>,
+    pub children: Vec<StrongWidget>,
    pub dir: Dir,
    pub gap: f32,
 }
@@ -62,6 +62,14 @@ impl Span {
        self
    }

+    pub fn push(&mut self, w: StrongWidget) {
+        self.children.push(w);
+    }
+
+    pub fn pop(&mut self) -> Option<StrongWidget> {
+        self.children.pop()
+    }
+
    fn len_sum(&mut self, ctx: &mut SizeCtx) -> Len {
        let gap = self.gap * self.children.len().saturating_sub(1) as f32;
        self.children.iter().fold(Len::abs(gap), |mut s, id| {
@@ -144,28 +152,31 @@ impl Span {
    }
 }

-pub struct SpanBuilder<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> {
+pub struct SpanBuilder<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag> {
    pub children: Wa,
    pub dir: Dir,
    pub gap: f32,
-    _pd: PhantomData<Tag>,
+    _pd: PhantomData<(State, Tag)>,
 }

-impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> FnOnce<(&mut Ui,)>
-    for SpanBuilder<LEN, Wa, Tag>
+impl<Rsc, const LEN: usize, Wa: WidgetArrLike<Rsc, LEN, Tag>, Tag> WidgetFnTrait<Rsc>
+    for SpanBuilder<Rsc, LEN, Wa, Tag>
 {
-    type Output = Span;
+    type Widget = Span;

-    extern "rust-call" fn call_once(self, args: (&mut Ui,)) -> Self::Output {
+    #[track_caller]
+    fn run(self, rsc: &mut Rsc) -> Self::Widget {
        Span {
-            children: self.children.ui(args.0).arr.to_vec(),
+            children: self.children.add(rsc).arr.into_iter().collect(),
            dir: self.dir,
            gap: self.gap,
        }
    }
 }

-impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> SpanBuilder<LEN, Wa, Tag> {
+impl<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag>
+    SpanBuilder<State, LEN, Wa, Tag>
+{
    pub fn new(children: Wa, dir: Dir) -> Self {
        Self {
            children,
@@ -182,7 +193,7 @@ impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> SpanBuilder<LEN, Wa, Ta
 }

 impl std::ops::Deref for Span {
-    type Target = Vec<WidgetRef>;
+    type Target = Vec<StrongWidget>;

    fn deref(&self) -> &Self::Target {
        &self.children
--- a/src/widget/position/stack.rs
+++ b/src/widget/position/stack.rs
@@ -3,7 +3,7 @@ use std::marker::PhantomData;
 use crate::prelude::*;

 pub struct Stack {
-    pub children: Vec<WidgetRef>,
+    pub children: Vec<StrongWidget>,
    pub size: StackSize,
 }

@@ -42,26 +42,29 @@ pub enum StackSize {
    Child(usize),
 }

-pub struct StackBuilder<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> {
+pub struct StackBuilder<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag> {
    pub children: Wa,
    pub size: StackSize,
-    _pd: PhantomData<Tag>,
+    _pd: PhantomData<(State, Tag)>,
 }

-impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> FnOnce<(&mut Ui,)>
-    for StackBuilder<LEN, Wa, Tag>
+impl<Rsc, const LEN: usize, Wa: WidgetArrLike<Rsc, LEN, Tag>, Tag> WidgetFnTrait<Rsc>
+    for StackBuilder<Rsc, LEN, Wa, Tag>
 {
-    type Output = Stack;
+    type Widget = Stack;

-    extern "rust-call" fn call_once(self, args: (&mut Ui,)) -> Self::Output {
+    #[track_caller]
+    fn run(self, rsc: &mut Rsc) -> Self::Widget {
        Stack {
-            children: self.children.ui(args.0).arr.to_vec(),
+            children: self.children.add(rsc).arr.into_iter().collect(),
            size: self.size,
        }
    }
 }

-impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> StackBuilder<LEN, Wa, Tag> {
+impl<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag>
+    StackBuilder<State, LEN, Wa, Tag>
+{
    pub fn new(children: Wa) -> Self {
        Self {
            children,
--- a/src/widget/ptr.rs
+++ b/src/widget/ptr.rs
@@ -1,8 +1,8 @@
 use crate::prelude::*;
+use std::marker::{Sized, Unsize};

-#[derive(Default)]
 pub struct WidgetPtr {
-    pub inner: Option<WidgetRef>,
+    pub inner: Option<StrongWidget>,
 }

 impl Widget for WidgetPtr {
@@ -28,3 +28,32 @@ impl Widget for WidgetPtr {
        }
    }
 }
+
+impl WidgetPtr {
+    pub fn new(widget: StrongWidget) -> Self {
+        Self {
+            inner: Some(widget),
+        }
+    }
+    pub fn empty() -> Self {
+        Self {
+            inner: Default::default(),
+        }
+    }
+    pub fn set<W: ?Sized + Unsize<dyn Widget>>(&mut self, to: StrongWidget<W>) {
+        self.inner = Some(to)
+    }
+
+    pub fn replace<W: ?Sized + Unsize<dyn Widget>>(
+        &mut self,
+        to: StrongWidget<W>,
+    ) -> Option<StrongWidget> {
+        self.inner.replace(to)
+    }
+}
+
+impl Default for WidgetPtr {
+    fn default() -> Self {
+        Self::empty()
+    }
+}
--- a/src/widget/selector.rs
+++ b/src/widget/selector.rs
@@ -0,0 +1,48 @@
+use std::hash::Hash;
+
+use iris_core::util::HashMap;
+
+use crate::prelude::*;
+
+pub struct WidgetSelector<T> {
+    current: (T, StrongWidget),
+    map: HashMap<T, StrongWidget>,
+}
+
+impl<T: Hash + Eq> WidgetSelector<T> {
+    pub fn new(key: T, widget: StrongWidget) -> Self {
+        Self {
+            current: (key, widget),
+            map: Default::default(),
+        }
+    }
+
+    pub fn set(&mut self, key: T, widget: StrongWidget) {
+        self.map.insert(key, widget);
+    }
+
+    pub fn select(&mut self, key: T) -> bool {
+        if let Some(val) = self.map.remove(&key) {
+            let mut new = (key, val);
+            std::mem::swap(&mut new, &mut self.current);
+            self.map.insert(new.0, new.1);
+            true
+        } else {
+            false
+        }
+    }
+}
+
+impl<T: 'static> Widget for WidgetSelector<T> {
+    fn draw(&mut self, painter: &mut Painter) {
+        painter.widget(&self.current.1);
+    }
+
+    fn desired_width(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.width(&self.current.1)
+    }
+
+    fn desired_height(&mut self, ctx: &mut SizeCtx) -> Len {
+        ctx.height(&self.current.1)
+    }
+}
--- a/src/widget/text/build.rs
+++ b/src/widget/text/build.rs
@@ -1,15 +1,16 @@
 use crate::prelude::*;
 use cosmic_text::{Attrs, Family, Metrics};
-use std::marker::Sized;
+use std::marker::{PhantomData, Sized};

-pub struct TextBuilder<O = TextOutput, H: WidgetOption = ()> {
+pub struct TextBuilder<State, O = TextOutput, H: WidgetOption<State> = ()> {
    pub content: String,
    pub attrs: TextAttrs,
    pub hint: H,
    pub output: O,
+    state: PhantomData<State>,
 }

-impl<O, H: WidgetOption> TextBuilder<O, H> {
+impl<State, O, H: WidgetOption<State>> TextBuilder<State, O, H> {
    pub fn size(mut self, size: impl UiNum) -> Self {
        self.attrs.font_size = size.to_f32();
        self.attrs.line_height = self.attrs.font_size * LINE_HEIGHT_MULT;
@@ -39,43 +40,54 @@ impl<O, H: WidgetOption> TextBuilder<O, H> {
        self.attrs.wrap = wrap;
        self
    }
-    pub fn editable(self, single_line: bool) -> TextBuilder<TextEditOutput, H> {
+    pub fn editable(self, mode: EditMode) -> TextBuilder<State, TextEditOutput, H> {
        TextBuilder {
            content: self.content,
            attrs: self.attrs,
            hint: self.hint,
-            output: TextEditOutput { single_line },
+            output: TextEditOutput { mode },
+            state: PhantomData,
        }
    }
 }

-impl<O> TextBuilder<O> {
-    pub fn hint<W: WidgetLike<Tag>, Tag>(self, hint: W) -> TextBuilder<O, impl WidgetOption> {
+impl<Rsc: UiRsc, O> TextBuilder<Rsc, O> {
+    pub fn hint<W: WidgetLike<Rsc, Tag>, Tag>(
+        self,
+        hint: W,
+    ) -> TextBuilder<Rsc, O, impl WidgetOption<Rsc>> {
        TextBuilder {
            content: self.content,
            attrs: self.attrs,
-            hint: move |ui: &mut Ui| Some(hint.add(ui).any()),
+            hint: move |rsc: &mut Rsc| Some(hint.add_strong(rsc).any()),
            output: self.output,
+            state: PhantomData,
        }
    }
 }

-pub trait TextBuilderOutput: Sized {
+pub trait TextBuilderOutput<State>: Sized {
    type Output;
-    fn run<H: WidgetOption>(ui: &mut Ui, builder: TextBuilder<Self, H>) -> Self::Output;
+    fn run<H: WidgetOption<State>>(
+        state: &mut State,
+        builder: TextBuilder<State, Self, H>,
+    ) -> Self::Output;
 }

 pub struct TextOutput;
-impl TextBuilderOutput for TextOutput {
+impl<Rsc: UiRsc> TextBuilderOutput<Rsc> for TextOutput {
    type Output = Text;

-    fn run<H: WidgetOption>(ui: &mut Ui, builder: TextBuilder<Self, H>) -> Self::Output {
+    fn run<H: WidgetOption<Rsc>>(
+        state: &mut Rsc,
+        builder: TextBuilder<Rsc, Self, H>,
+    ) -> Self::Output {
        let mut buf = TextBuffer::new_empty(Metrics::new(
            builder.attrs.font_size,
            builder.attrs.line_height,
        ));
-        let hint = builder.hint.get(ui);
-        let font_system = &mut ui.data().text.get_mut().font_system;
+        let hint = builder.hint.get(state);
+        let font_system = &mut state.ui_mut().text.font_system;
        buf.set_text(font_system, &builder.content, &Attrs::new(), SHAPING, None);
        let mut text = Text {
            content: builder.content.into(),
@@ -88,22 +100,25 @@ impl TextBuilderOutput for TextOutput {
 }

 pub struct TextEditOutput {
-    single_line: bool,
+    mode: EditMode,
 }
-impl TextBuilderOutput for TextEditOutput {
+
+impl<State: UiRsc> TextBuilderOutput<State> for TextEditOutput {
    type Output = TextEdit;

-    fn run<H: WidgetOption>(ui: &mut Ui, builder: TextBuilder<Self, H>) -> Self::Output {
+    fn run<H: WidgetOption<State>>(
+        state: &mut State,
+        builder: TextBuilder<State, Self, H>,
+    ) -> Self::Output {
        let buf = TextBuffer::new_empty(Metrics::new(
            builder.attrs.font_size,
            builder.attrs.line_height,
        ));
        let mut text = TextEdit::new(
-            TextView::new(buf, builder.attrs, builder.hint.get(ui)),
-            builder.output.single_line,
-            ui.data().text.clone(),
+            TextView::new(buf, builder.attrs, builder.hint.get(state)),
+            builder.output.mode,
        );
-        let font_system = &mut ui.data().text.get_mut().font_system;
+        let font_system = &mut state.ui_mut().text.font_system;
        text.buf
            .set_text(font_system, &builder.content, &Attrs::new(), SHAPING, None);
        builder.attrs.apply(font_system, &mut text.buf, None);
@@ -111,19 +126,22 @@ impl TextBuilderOutput for TextEditOutput {
    }
 }

-impl<O: TextBuilderOutput, H: WidgetOption> FnOnce<(&mut Ui,)> for TextBuilder<O, H> {
+impl<State, O: TextBuilderOutput<State>, H: WidgetOption<State>> FnOnce<(&mut State,)>
+    for TextBuilder<State, O, H>
+{
    type Output = O::Output;

-    extern "rust-call" fn call_once(self, args: (&mut Ui,)) -> Self::Output {
+    extern "rust-call" fn call_once(self, args: (&mut State,)) -> Self::Output {
        O::run(args.0, self)
    }
 }

-pub fn wtext(content: impl Into<String>) -> TextBuilder {
+pub fn wtext<State>(content: impl Into<String>) -> TextBuilder<State> {
    TextBuilder {
        content: content.into(),
        attrs: TextAttrs::default(),
        hint: (),
        output: TextOutput,
+        state: PhantomData,
    }
 }
--- a/src/widget/text/edit.rs
+++ b/src/widget/text/edit.rs
@@ -1,7 +1,6 @@
-use std::ops::{Deref, DerefMut};
-
 use crate::prelude::*;
-use cosmic_text::{Affinity, Attrs, Cursor, LayoutRun, Motion};
+use cosmic_text::{Affinity, Attrs, Cursor, FontSystem, LayoutRun, Motion};
+use std::ops::{Deref, DerefMut};
 use unicode_segmentation::UnicodeSegmentation;
 use winit::{
    event::KeyEvent,
@@ -13,19 +12,23 @@ pub struct TextEdit {
    selection: TextSelection,
    history: Vec<(String, TextSelection)>,
    double_hit: Option<Cursor>,
-    data: TextData,
-    pub single_line: bool,
+    pub mode: EditMode,
+}
+
+#[derive(Clone, Copy, PartialEq)]
+pub enum EditMode {
+    SingleLine,
+    MultiLine,
 }

 impl TextEdit {
-    pub fn new(view: TextView, single_line: bool, data: TextData) -> Self {
+    pub fn new(view: TextView, mode: EditMode) -> Self {
        Self {
            view,
            selection: Default::default(),
            history: Default::default(),
            double_hit: None,
-            single_line,
-            data,
+            mode,
        }
    }
    pub fn select_content(&self, start: Cursor, end: Cursor) -> String {
@@ -44,369 +47,6 @@ impl TextEdit {
            str
        }
    }
-
-    pub fn take(&mut self) -> String {
-        let text = self
-            .buf
-            .lines
-            .drain(..)
-            .map(|l| l.into_text())
-            .collect::<Vec<_>>()
-            .join("\n");
-        self.set("");
-        text
-    }
-
-    pub fn set(&mut self, text: &str) {
-        let text = self.string(text);
-        self.view.buf.set_text(
-            &mut self.data.get_mut().font_system,
-            &text,
-            &Attrs::new(),
-            SHAPING,
-            None,
-        );
-        self.selection.clear();
-    }
-
-    pub fn motion(&mut self, motion: Motion, select: bool) {
-        if let TextSelection::Pos(cursor) = self.selection
-            && let Some(new) = self.buf_motion(cursor, motion)
-        {
-            self.selection = if select {
-                TextSelection::Span {
-                    start: cursor,
-                    end: new,
-                }
-            } else {
-                TextSelection::Pos(new)
-            };
-        } else if let TextSelection::Span { start, end } = self.selection {
-            if select {
-                if let Some(cursor) = self.buf_motion(end, motion) {
-                    self.selection = TextSelection::Span { start, end: cursor };
-                }
-            } else {
-                let (start, end) = sort_cursors(start, end);
-                match motion {
-                    Motion::Left | Motion::LeftWord => self.selection = TextSelection::Pos(start),
-                    Motion::Right | Motion::RightWord => self.selection = TextSelection::Pos(end),
-                    _ => {
-                        if let Some(cursor) = self.buf_motion(end, motion) {
-                            self.selection = TextSelection::Pos(cursor);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    pub fn replace(&mut self, len: usize, text: &str) {
-        let text = self.string(text);
-        for _ in 0..len {
-            self.delete(false);
-        }
-        self.insert_inner(&text, false);
-    }
-
-    fn string(&self, text: &str) -> String {
-        if self.single_line {
-            text.replace('\n', "")
-        } else {
-            text.to_string()
-        }
-    }
-
-    pub fn insert(&mut self, text: &str) {
-        let text = self.string(text);
-        let mut lines = text.split('\n');
-        let Some(first) = lines.next() else {
-            return;
-        };
-        self.insert_inner(first, true);
-        for line in lines {
-            self.newline();
-            self.insert_inner(line, true);
-        }
-    }
-
-    pub fn clear_span(&mut self) -> bool {
-        if let TextSelection::Span { start, end } = self.selection {
-            self.delete_between(start, end);
-            let (start, _) = sort_cursors(start, end);
-            self.selection = TextSelection::Pos(start);
-            true
-        } else {
-            false
-        }
-    }
-
-    pub fn delete_between(&mut self, start: Cursor, end: Cursor) {
-        let lines = &mut self.view.buf.lines;
-        let (start, end) = sort_cursors(start, end);
-        if start.line == end.line {
-            let line = &mut lines[start.line];
-            let text = line.text();
-            let text = text[..start.index].to_string() + &text[end.index..];
-            edit_line(line, text);
-        } else {
-            // start
-            let start_text = lines[start.line].text()[..start.index].to_string();
-            let end_text = &lines[end.line].text()[end.index..];
-            let text = start_text + end_text;
-            edit_line(&mut lines[start.line], text);
-        }
-        // between
-        let range = (start.line + 1)..=end.line;
-        if !range.is_empty() {
-            lines.splice(range, None);
-        }
-    }
-
-    fn insert_inner(&mut self, text: &str, mov: bool) {
-        self.clear_span();
-        if let TextSelection::Pos(cursor) = self.selection {
-            let line = &mut self.view.buf.lines[cursor.line];
-            let mut line_text = line.text().to_string();
-            line_text.insert_str(cursor.index, text);
-            edit_line(line, line_text);
-            if mov {
-                for _ in 0..text.chars().count() {
-                    self.motion(Motion::Right, false);
-                }
-            }
-        }
-    }
-
-    pub fn newline(&mut self) {
-        if self.single_line {
-            return;
-        }
-        self.clear_span();
-        if let TextSelection::Pos(cursor) = &mut self.selection {
-            let lines = &mut self.view.buf.lines;
-            let line = &mut lines[cursor.line];
-            let new = line.split_off(cursor.index);
-            cursor.line += 1;
-            lines.insert(cursor.line, new);
-            cursor.index = 0;
-        }
-    }
-
-    pub fn backspace(&mut self, word: bool) {
-        if !self.clear_span()
-            && let TextSelection::Pos(cursor) = &mut self.selection
-            && (cursor.index != 0 || cursor.line != 0)
-        {
-            self.motion(if word { Motion::LeftWord } else { Motion::Left }, false);
-            self.delete(word);
-        }
-    }
-
-    pub fn delete(&mut self, word: bool) {
-        if self.clear_span() {
-            return;
-        }
-        if let TextSelection::Pos(cursor) = &mut self.selection {
-            if word {
-                let start = *cursor;
-                if let Some(end) = self.buf_motion(start, Motion::RightWord) {
-                    self.delete_between(start, end);
-                }
-            } else {
-                let lines = &mut self.view.buf.lines;
-                let line = &mut lines[cursor.line];
-                if cursor.index == line.text().len() {
-                    if cursor.line == lines.len() - 1 {
-                        return;
-                    }
-                    let add = lines.remove(cursor.line + 1).into_text();
-                    let line = &mut lines[cursor.line];
-                    let mut cur = line.text().to_string();
-                    cur.push_str(&add);
-                    edit_line(line, cur);
-                } else {
-                    let mut text = line.text().to_string();
-                    text.remove(cursor.index);
-                    edit_line(line, text);
-                }
-            }
-        }
-    }
-
-    fn buf_motion(&mut self, cursor: Cursor, motion: Motion) -> Option<Cursor> {
-        self.view
-            .buf
-            .cursor_motion(
-                &mut self.data.get_mut().font_system,
-                cursor,
-                None,
-                motion,
-            )
-            .map(|r| r.0)
-    }
-
-    pub fn select_word_at(&mut self, cursor: Cursor) {
-        if let (Some(start), Some(end)) = (
-            self.buf_motion(cursor, Motion::LeftWord),
-            self.buf_motion(cursor, Motion::RightWord),
-        ) {
-            self.selection = TextSelection::Span { start, end };
-        }
-    }
-
-    pub fn select_line_at(&mut self, cursor: Cursor) {
-        let end = self.buf.lines[cursor.line].text().len();
-        self.selection = TextSelection::Span {
-            start: Cursor::new(cursor.line, 0),
-            end: Cursor::new(cursor.line, end),
-        }
-    }
-
-    pub fn select(&mut self, pos: Vec2, size: Vec2, drag: bool, recent: bool) {
-        let pos = pos - self.region().top_left().to_abs(size);
-        let hit = self.buf.hit(pos.x, pos.y);
-        let sel = &mut self.selection;
-        match sel {
-            TextSelection::None => {
-                if !drag && let Some(hit) = hit {
-                    *sel = TextSelection::Pos(hit)
-                }
-            }
-            TextSelection::Pos(pos) => match (hit, drag) {
-                (None, false) => *sel = TextSelection::None,
-                (None, true) => (),
-                (Some(hit), false) => {
-                    if recent && hit == *pos {
-                        self.double_hit = Some(hit);
-                        return self.select_word_at(hit);
-                    } else {
-                        *pos = hit
-                    }
-                }
-                (Some(end), true) => *sel = TextSelection::Span { start: *pos, end },
-            },
-            TextSelection::Span { start, end } => match (hit, drag) {
-                (None, false) => *sel = TextSelection::None,
-                (None, true) => *sel = TextSelection::Pos(*start),
-                (Some(hit), false) => {
-                    if recent
-                        && let Some(double) = self.double_hit
-                        && double == hit
-                    {
-                        return self.select_line_at(hit);
-                    } else {
-                        *sel = TextSelection::Pos(hit)
-                    }
-                }
-                (Some(hit), true) => *end = hit,
-            },
-        }
-        if let TextSelection::Span { start, end } = sel
-            && start == end
-        {
-            *sel = TextSelection::Pos(*start);
-        }
-    }
-
-    pub fn deselect(&mut self) {
-        self.selection = TextSelection::None;
-    }
-
-    pub fn apply_event(&mut self, event: &KeyEvent, modifiers: &Modifiers) -> TextInputResult {
-        let old = (self.content(), self.selection);
-        let mut undo = false;
-        let res = self.apply_event_inner(event, modifiers, &mut undo);
-        if undo && let Some((old, selection)) = self.history.pop() {
-            self.set(&old);
-            self.selection = selection;
-        } else if self.content() != old.0 {
-            self.history.push(old);
-        }
-        res
-    }
-
-    fn apply_event_inner(
-        &mut self,
-        event: &KeyEvent,
-        modifiers: &Modifiers,
-        undo: &mut bool,
-    ) -> TextInputResult {
-        match &event.logical_key {
-            Key::Named(named) => match named {
-                NamedKey::Backspace => self.backspace(modifiers.control),
-                NamedKey::Delete => self.delete(modifiers.control),
-                NamedKey::Space => self.insert(" "),
-                NamedKey::Enter => {
-                    if modifiers.shift {
-                        self.newline();
-                    } else {
-                        return TextInputResult::Submit;
-                    }
-                }
-                NamedKey::ArrowRight => {
-                    if modifiers.control {
-                        self.motion(Motion::RightWord, modifiers.shift)
-                    } else {
-                        self.motion(Motion::Right, modifiers.shift)
-                    }
-                }
-                NamedKey::ArrowLeft => {
-                    if modifiers.control {
-                        self.motion(Motion::LeftWord, modifiers.shift)
-                    } else {
-                        self.motion(Motion::Left, modifiers.shift)
-                    }
-                }
-                NamedKey::ArrowUp => self.motion(Motion::Up, modifiers.shift),
-                NamedKey::ArrowDown => self.motion(Motion::Down, modifiers.shift),
-                NamedKey::Escape => {
-                    self.deselect();
-                    return TextInputResult::Unfocus;
-                }
-                _ => return TextInputResult::Unused,
-            },
-            Key::Character(text) => {
-                if modifiers.control {
-                    match text.as_str() {
-                        "v" => return TextInputResult::Paste,
-                        "c" => {
-                            if let TextSelection::Span { start, end } = self.selection {
-                                let content = self.select_content(start, end);
-                                return TextInputResult::Copy(content);
-                            }
-                        }
-                        "x" => {
-                            if let TextSelection::Span { start, end } = self.selection {
-                                let content = self.select_content(start, end);
-                                self.clear_span();
-                                return TextInputResult::Copy(content);
-                            }
-                        }
-                        "a" => {
-                            if !self.buf.lines[0].text().is_empty() || self.buf.lines.len() > 1 {
-                                let lines = &self.buf.lines;
-                                let last_line = lines.len() - 1;
-                                let last_idx = lines[last_line].text().len();
-                                self.selection = TextSelection::Span {
-                                    start: Cursor::new(0, 0),
-                                    end: Cursor::new(last_line, last_idx),
-                                };
-                            }
-                        }
-                        "z" => {
-                            *undo = true;
-                        }
-                        _ => self.insert(text),
-                    }
-                } else {
-                    self.insert(text);
-                }
-            }
-            _ => return TextInputResult::Unused,
-        }
-        TextInputResult::Used
-    }
 }

 impl Widget for TextEdit {
@@ -540,6 +180,373 @@ fn cursor_pos(cursor: Cursor, buf: &TextBuffer) -> Option<Vec2> {
    prev
 }

+pub struct TextEditCtx<'a> {
+    pub text: &'a mut TextEdit,
+    pub font_system: &'a mut FontSystem,
+}
+
+impl<'a> TextEditCtx<'a> {
+    pub fn take(&mut self) -> String {
+        let text = self
+            .text
+            .buf
+            .lines
+            .drain(..)
+            .map(|l| l.into_text())
+            .collect::<Vec<_>>()
+            .join("\n");
+        self.text
+            .buf
+            .set_text(self.font_system, "", &Attrs::new(), SHAPING, None);
+        self.text.selection.clear();
+        text
+    }
+
+    pub fn set(&mut self, text: &str) {
+        let text = self.string(text);
+        self.text
+            .buf
+            .set_text(self.font_system, &text, &Attrs::new(), SHAPING, None);
+        self.text.selection.clear();
+    }
+
+    pub fn motion(&mut self, motion: Motion, select: bool) {
+        if let TextSelection::Pos(cursor) = self.text.selection
+            && let Some(new) = self.buf_motion(cursor, motion)
+        {
+            if select {
+                self.text.selection = TextSelection::Span {
+                    start: cursor,
+                    end: new,
+                };
+            } else {
+                self.text.selection = TextSelection::Pos(new);
+            }
+        } else if let TextSelection::Span { start, end } = self.text.selection {
+            if select {
+                if let Some(cursor) = self.buf_motion(end, motion) {
+                    self.text.selection = TextSelection::Span { start, end: cursor };
+                }
+            } else {
+                let (start, end) = sort_cursors(start, end);
+                let sel = &mut self.text.selection;
+                match motion {
+                    Motion::Left | Motion::LeftWord => *sel = TextSelection::Pos(start),
+                    Motion::Right | Motion::RightWord => *sel = TextSelection::Pos(end),
+                    _ => {
+                        if let Some(cursor) = self.buf_motion(end, motion) {
+                            self.text.selection = TextSelection::Pos(cursor);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    pub fn replace(&mut self, len: usize, text: &str) {
+        let text = self.string(text);
+        for _ in 0..len {
+            self.delete(false);
+        }
+        self.insert_inner(&text, false);
+    }
+
+    fn string(&self, text: &str) -> String {
+        if self.text.mode == EditMode::SingleLine {
+            text.replace('\n', "")
+        } else {
+            text.to_string()
+        }
+    }
+
+    pub fn insert(&mut self, text: &str) {
+        let text = self.string(text);
+        let mut lines = text.split('\n');
+        let Some(first) = lines.next() else {
+            return;
+        };
+        self.insert_inner(first, true);
+        for line in lines {
+            self.newline();
+            self.insert_inner(line, true);
+        }
+    }
+
+    pub fn clear_span(&mut self) -> bool {
+        if let TextSelection::Span { start, end } = self.text.selection {
+            self.delete_between(start, end);
+            let (start, _) = sort_cursors(start, end);
+            self.text.selection = TextSelection::Pos(start);
+            true
+        } else {
+            false
+        }
+    }
+
+    pub fn delete_between(&mut self, start: Cursor, end: Cursor) {
+        let lines = &mut self.text.view.buf.lines;
+        let (start, end) = sort_cursors(start, end);
+        if start.line == end.line {
+            let line = &mut lines[start.line];
+            let text = line.text();
+            let text = text[..start.index].to_string() + &text[end.index..];
+            edit_line(line, text);
+        } else {
+            // start
+            let start_text = lines[start.line].text()[..start.index].to_string();
+            let end_text = &lines[end.line].text()[end.index..];
+            let text = start_text + end_text;
+            edit_line(&mut lines[start.line], text);
+        }
+        // between
+        let range = (start.line + 1)..=end.line;
+        if !range.is_empty() {
+            lines.splice(range, None);
+        }
+    }
+
+    fn insert_inner(&mut self, text: &str, mov: bool) {
+        self.clear_span();
+        if let TextSelection::Pos(cursor) = &mut self.text.selection {
+            let line = &mut self.text.view.buf.lines[cursor.line];
+            let mut line_text = line.text().to_string();
+            line_text.insert_str(cursor.index, text);
+            edit_line(line, line_text);
+            if mov {
+                for _ in 0..text.chars().count() {
+                    self.motion(Motion::Right, false);
+                }
+            }
+        }
+    }
+
+    pub fn newline(&mut self) {
+        if self.text.mode == EditMode::SingleLine {
+            return;
+        }
+        self.clear_span();
+        if let TextSelection::Pos(cursor) = &mut self.text.selection {
+            let lines = &mut self.text.view.buf.lines;
+            let line = &mut lines[cursor.line];
+            let new = line.split_off(cursor.index);
+            cursor.line += 1;
+            lines.insert(cursor.line, new);
+            cursor.index = 0;
+        }
+    }
+
+    pub fn backspace(&mut self, word: bool) {
+        if !self.clear_span()
+            && let TextSelection::Pos(cursor) = &mut self.text.selection
+            && (cursor.index != 0 || cursor.line != 0)
+        {
+            self.motion(if word { Motion::LeftWord } else { Motion::Left }, false);
+            self.delete(word);
+        }
+    }
+
+    pub fn delete(&mut self, word: bool) {
+        if !self.clear_span()
+            && let TextSelection::Pos(cursor) = &mut self.text.selection
+        {
+            if word {
+                let start = *cursor;
+                if let Some(end) = self.buf_motion(start, Motion::RightWord) {
+                    self.delete_between(start, end);
+                }
+            } else {
+                let lines = &mut self.text.view.buf.lines;
+                let line = &mut lines[cursor.line];
+                if cursor.index == line.text().len() {
+                    if cursor.line == lines.len() - 1 {
+                        return;
+                    }
+                    let add = lines.remove(cursor.line + 1).into_text();
+                    let line = &mut lines[cursor.line];
+                    let mut cur = line.text().to_string();
+                    cur.push_str(&add);
+                    edit_line(line, cur);
+                } else {
+                    let mut text = line.text().to_string();
+                    text.remove(cursor.index);
+                    edit_line(line, text);
+                }
+            }
+        }
+    }
+
+    fn buf_motion(&mut self, cursor: Cursor, motion: Motion) -> Option<Cursor> {
+        self.text
+            .buf
+            .cursor_motion(self.font_system, cursor, None, motion)
+            .map(|r| r.0)
+    }
+
+    pub fn select_word_at(&mut self, cursor: Cursor) {
+        if let (Some(start), Some(end)) = (
+            self.buf_motion(cursor, Motion::LeftWord),
+            self.buf_motion(cursor, Motion::RightWord),
+        ) {
+            self.text.selection = TextSelection::Span { start, end };
+        }
+    }
+
+    pub fn select_line_at(&mut self, cursor: Cursor) {
+        let end = self.text.buf.lines[cursor.line].text().len();
+        self.text.selection = TextSelection::Span {
+            start: Cursor::new(cursor.line, 0),
+            end: Cursor::new(cursor.line, end),
+        }
+    }
+
+    pub fn select(&mut self, pos: Vec2, size: Vec2, drag: bool, recent: bool) {
+        let pos = pos - self.text.region().top_left().to_abs(size);
+        let hit = self.text.buf.hit(pos.x, pos.y);
+        let sel = &mut self.text.selection;
+        match sel {
+            TextSelection::None => {
+                if !drag && let Some(hit) = hit {
+                    *sel = TextSelection::Pos(hit)
+                }
+            }
+            TextSelection::Pos(pos) => match (hit, drag) {
+                (None, false) => *sel = TextSelection::None,
+                (None, true) => (),
+                (Some(hit), false) => {
+                    if recent && hit == *pos {
+                        self.text.double_hit = Some(hit);
+                        return self.select_word_at(hit);
+                    } else {
+                        *pos = hit
+                    }
+                }
+                (Some(end), true) => *sel = TextSelection::Span { start: *pos, end },
+            },
+            TextSelection::Span { start, end } => match (hit, drag) {
+                (None, false) => *sel = TextSelection::None,
+                (None, true) => *sel = TextSelection::Pos(*start),
+                (Some(hit), false) => {
+                    if recent
+                        && let Some(double) = self.text.double_hit
+                        && double == hit
+                    {
+                        return self.select_line_at(hit);
+                    } else {
+                        *sel = TextSelection::Pos(hit)
+                    }
+                }
+                (Some(hit), true) => *end = hit,
+            },
+        }
+        if let TextSelection::Span { start, end } = sel
+            && start == end
+        {
+            *sel = TextSelection::Pos(*start);
+        }
+    }
+
+    pub fn deselect(&mut self) {
+        self.text.selection = TextSelection::None;
+    }
+
+    pub fn apply_event(&mut self, event: &KeyEvent, modifiers: &Modifiers) -> TextInputResult {
+        let old = (self.text.content(), self.text.selection);
+        let mut undo = false;
+        let res = self.apply_event_inner(event, modifiers, &mut undo);
+        if undo && let Some((old, selection)) = self.text.history.pop() {
+            self.set(&old);
+            self.text.selection = selection;
+        } else if self.text.content() != old.0 {
+            self.text.history.push(old);
+        }
+        res
+    }
+
+    fn apply_event_inner(
+        &mut self,
+        event: &KeyEvent,
+        modifiers: &Modifiers,
+        undo: &mut bool,
+    ) -> TextInputResult {
+        match &event.logical_key {
+            Key::Named(named) => match named {
+                NamedKey::Backspace => self.backspace(modifiers.control),
+                NamedKey::Delete => self.delete(modifiers.control),
+                NamedKey::Space => self.insert(" "),
+                NamedKey::Enter => {
+                    if modifiers.shift {
+                        self.newline();
+                    } else {
+                        return TextInputResult::Submit;
+                    }
+                }
+                NamedKey::ArrowRight => {
+                    if modifiers.control {
+                        self.motion(Motion::RightWord, modifiers.shift)
+                    } else {
+                        self.motion(Motion::Right, modifiers.shift)
+                    }
+                }
+                NamedKey::ArrowLeft => {
+                    if modifiers.control {
+                        self.motion(Motion::LeftWord, modifiers.shift)
+                    } else {
+                        self.motion(Motion::Left, modifiers.shift)
+                    }
+                }
+                NamedKey::ArrowUp => self.motion(Motion::Up, modifiers.shift),
+                NamedKey::ArrowDown => self.motion(Motion::Down, modifiers.shift),
+                NamedKey::Escape => {
+                    self.deselect();
+                    return TextInputResult::Unfocus;
+                }
+                _ => return TextInputResult::Unused,
+            },
+            Key::Character(text) => {
+                if modifiers.control {
+                    match text.as_str() {
+                        "v" => return TextInputResult::Paste,
+                        "c" => {
+                            if let TextSelection::Span { start, end } = self.text.selection {
+                                let content = self.text.select_content(start, end);
+                                return TextInputResult::Copy(content);
+                            }
+                        }
+                        "x" => {
+                            if let TextSelection::Span { start, end } = self.text.selection {
+                                let content = self.text.select_content(start, end);
+                                self.clear_span();
+                                return TextInputResult::Copy(content);
+                            }
+                        }
+                        "a" => {
+                            if !self.text.buf.lines[0].text().is_empty()
+                                || self.text.buf.lines.len() > 1
+                            {
+                                let lines = &self.text.buf.lines;
+                                let last_line = lines.len() - 1;
+                                let last_idx = lines[last_line].text().len();
+                                self.text.selection = TextSelection::Span {
+                                    start: Cursor::new(0, 0),
+                                    end: Cursor::new(last_line, last_idx),
+                                };
+                            }
+                        }
+                        "z" => {
+                            *undo = true;
+                        }
+                        _ => self.insert(text),
+                    }
+                } else {
+                    self.insert(text);
+                }
+            }
+            _ => return TextInputResult::Unused,
+        }
+        TextInputResult::Used
+    }
+}
+
 #[derive(Default)]
 pub struct Modifiers {
    pub shift: bool,
@@ -608,3 +615,17 @@ impl DerefMut for TextEdit {
        &mut self.view
    }
 }
+
+pub trait TextEditable {
+    fn edit<'a>(&self, ui: &'a mut impl UiRsc) -> TextEditCtx<'a>;
+}
+
+impl<I: IdLike<Widget = TextEdit>> TextEditable for I {
+    fn edit<'a>(&self, ui: &'a mut impl UiRsc) -> TextEditCtx<'a> {
+        let ui = ui.ui_mut();
+        TextEditCtx {
+            text: ui.widgets.get_mut(self).unwrap(),
+            font_system: &mut ui.text.font_system,
+        }
+    }
+}
--- a/src/widget/text/mod.rs
+++ b/src/widget/text/mod.rs
@@ -3,8 +3,9 @@ mod edit;

 pub use build::*;
 pub use edit::*;
+use iris_core::util::MutDetect;

-use crate::{prelude::*, util::MutDetect};
+use crate::prelude::*;
 use cosmic_text::{Attrs, BufferLine, Cursor, Metrics, Shaping};
 use std::ops::{Deref, DerefMut};

@@ -21,11 +22,11 @@ pub struct TextView {
    // cache
    tex: Option<RenderedText>,
    width: Option<f32>,
-    pub hint: Option<WidgetRef>,
+    pub hint: Option<StrongWidget>,
 }

 impl TextView {
-    pub fn new(buf: TextBuffer, attrs: TextAttrs, hint: Option<WidgetRef>) -> Self {
+    pub fn new(buf: TextBuffer, attrs: TextAttrs, hint: Option<StrongWidget>) -> Self {
        Self {
            attrs: attrs.into(),
            buf: buf.into(),
@@ -67,12 +68,9 @@ impl TextView {
            return tex.clone();
        }
        self.width = width;
-        let mut text_data = ctx.text.get_mut();
-        self.attrs
-            .apply(&mut text_data.font_system, &mut self.buf, width);
-        self.buf
-            .shape_until_scroll(&mut text_data.font_system, false);
-        drop(text_data);
+        let font_system = &mut ctx.text.font_system;
+        self.attrs.apply(font_system, &mut self.buf, width);
+        self.buf.shape_until_scroll(font_system, false);
        let tex = ctx.draw_text(&mut self.buf, &self.attrs);
        self.tex = Some(tex.clone());
        self.attrs.changed = false;
@@ -139,7 +137,7 @@ impl Text {
        if self.content.changed {
            self.content.changed = false;
            self.view.buf.set_text(
-                &mut ctx.text.get_mut().font_system,
+                &mut ctx.text.font_system,
                &self.content,
                &Attrs::new().family(self.view.attrs.family),
                SHAPING,
--- a/src/widget/trait_fns.rs
+++ b/src/widget/trait_fns.rs
@@ -1,147 +1,148 @@
+use super::*;
 use crate::prelude::*;
-use iris_macro::widget_trait;

 // these methods should "not require any context" (require unit) because they're in core
-event_ctx!(());
+widget_trait! {
+    pub trait CoreWidget<Rsc: UiRsc + 'static>;

-widget_trait!(
-    pub CoreWidget;
-
-    fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Pad> {
-        |ui| Pad {
+    fn pad(self, padding: impl Into<Padding>) -> impl WidgetFn<Rsc, Pad> {
+        |state| Pad {
            padding: padding.into(),
-            inner: self.add(ui),
+            inner: self.add_strong(state),
        }
    }

-    fn align(self, align: impl Into<Align>) -> impl WidgetFn<Aligned> {
-        move |ui| Aligned {
-            inner: self.add(ui),
+    fn align(self, align: impl Into<Align>) -> impl WidgetFn<Rsc, Aligned> {
+        move |state| Aligned {
+            inner: self.add_strong(state),
            align: align.into(),
        }
    }

-    fn center(self) -> impl WidgetFn<Aligned> {
+    fn center(self) -> impl WidgetFn<Rsc, Aligned> {
        self.align(Align::CENTER)
    }

-    fn label(self, label: impl Into<String>) -> impl WidgetIdFn<WL::Widget> {
-        |ui| {
-            let id = self.add(ui);
-            id.set_label(label);
+    fn label(self, label: impl Into<String>) -> impl WidgetIdFn<Rsc, WL::Widget> {
+        |state| {
+            let id = self.add(state);
+            state.ui_mut().widgets.set_label(id, label.into());
            id
        }
    }

-    fn sized(self, size: impl Into<Size>) -> impl WidgetFn<Sized> {
+    fn sized(self, size: impl Into<Size>) -> impl WidgetFn<Rsc, Sized> {
        let size = size.into();
-        move |ui| Sized {
-            inner: self.add(ui),
+        move |state| Sized {
+            inner: self.add_strong(state),
            x: Some(size.x),
            y: Some(size.y),
        }
    }

-    fn max_width(self, len: impl Into<Len>) -> impl WidgetFn<MaxSize> {
+    fn max_width(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, MaxSize> {
        let len = len.into();
-        move |ui| MaxSize {
-            inner: self.add(ui),
+        move |state| MaxSize {
+            inner: self.add_strong(state),
            x: Some(len),
            y: None,
        }
    }

-    fn max_height(self, len: impl Into<Len>) -> impl WidgetFn<MaxSize> {
+    fn max_height(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, MaxSize> {
        let len = len.into();
-        move |ui| MaxSize {
-            inner: self.add(ui),
+        move |state| MaxSize {
+            inner: self.add_strong(state),
            x: None,
            y: Some(len),
        }
    }

-    fn width(self, len: impl Into<Len>) -> impl WidgetFn<Sized> {
+    fn width(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, Sized> {
        let len = len.into();
-        move |ui| Sized {
-            inner: self.add(ui),
+        move |state| Sized {
+            inner: self.add_strong(state),
            x: Some(len),
            y: None,
        }
    }

-    fn height(self, len: impl Into<Len>) -> impl WidgetFn<Sized> {
+    fn height(self, len: impl Into<Len>) -> impl WidgetFn<Rsc, Sized> {
        let len = len.into();
-        move |ui| Sized {
-            inner: self.add(ui),
+        move |state| Sized {
+            inner: self.add_strong(state),
            x: None,
            y: Some(len),
        }
    }

-    fn offset(self, amt: impl Into<UiVec2>) -> impl WidgetFn<Offset> {
-        move |ui| Offset {
-            inner: self.add(ui),
+    fn offset(self, amt: impl Into<UiVec2>) -> impl WidgetFn<Rsc, Offset> {
+        move |state| Offset {
+            inner: self.add_strong(state),
            amt: amt.into(),
        }
    }

-    fn scroll(self) -> impl WidgetIdFn<Scroll> {
-        move |ui| {
-            Scroll::new(self.add(ui), Axis::Y)
-                .on(CursorSense::Scroll, |ctx| {
-                    let s = &mut *ctx.widget.get_mut();
-                    s.scroll(ctx.data.scroll_delta.y * 50.0);
+    fn scrollable(self) -> impl WidgetIdFn<Rsc, Scroll> where Rsc: HasEvents {
+        move |state| {
+            Scroll::new(self.add_strong(state), Axis::Y)
+                .on(CursorSense::Scroll, |ctx, rsc| {
+                    let delta = ctx.data.scroll_delta.y * 50.0;
+                    ctx.widget(rsc).scroll(delta);
                })
-                .add(ui)
+                .add(state)
        }
    }

-    fn masked(self) -> impl WidgetFn<Masked> {
-        move |ui| Masked {
-            inner: self.add(ui),
+    fn masked(self) -> impl WidgetFn<Rsc, Masked> {
+        move |state| Masked {
+            inner: self.add_strong(state),
        }
    }

-    fn background<T,>(self, w: impl WidgetLike<T>) -> impl WidgetFn<Stack> {
-        move |ui| Stack {
-            children: vec![w.add(ui), self.add(ui)],
+    fn background<T>(self, w: impl WidgetLike<Rsc, T>) -> impl WidgetFn<Rsc, Stack> {
+        move |state| Stack {
+            children: vec![w.add_strong(state), self.add_strong(state)],
            size: StackSize::Child(1),
        }
    }

-    fn foreground<T,>(self, w: impl WidgetLike<T>) -> impl WidgetFn<Stack> {
-        move |ui| Stack {
-            children: vec![self.add(ui), w.add(ui)],
+    fn foreground<T>(self, w: impl WidgetLike<Rsc, T>) -> impl WidgetFn<Rsc, Stack> {
+        move |state| Stack {
+            children: vec![self.add_strong(state), w.add_strong(state)],
            size: StackSize::Child(0),
        }
    }

-    fn layer_offset(self, offset: usize) -> impl WidgetFn<LayerOffset> {
-        move |ui| LayerOffset {
-            inner: self.add(ui),
+    fn layer_offset(self, offset: usize) -> impl WidgetFn<Rsc, LayerOffset> {
+        move |state| LayerOffset {
+            inner: self.add_strong(state),
            offset,
        }
    }

-    fn to_any(self) -> impl WidgetRet {
-        |ui| self.add(ui)
+    fn to_any(self) -> impl WidgetIdFn<Rsc> {
+        |state| self.add(state)
    }

-    fn set_ptr(self, ptr: &WidgetRef<WidgetPtr>, ui: &mut Ui) {
-        ptr.get_mut().inner = Some(self.add(ui));
+    fn set_ptr(self, ptr: WeakWidget<WidgetPtr>, state: &mut Rsc) {
+        let id = self.add_strong(state);
+        state.ui_mut().widgets[ptr].inner = Some(id);
    }
-);
-
-pub trait CoreWidgetArr<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> {
-    fn span(self, dir: Dir) -> SpanBuilder<LEN, Wa, Tag>;
-    fn stack(self) -> StackBuilder<LEN, Wa, Tag>;
 }

-impl<const LEN: usize, Wa: WidgetArrLike<LEN, Tag>, Tag> CoreWidgetArr<LEN, Wa, Tag> for Wa {
-    fn span(self, dir: Dir) -> SpanBuilder<LEN, Wa, Tag> {
+pub trait CoreWidgetArr<Rsc, const LEN: usize, Wa: WidgetArrLike<Rsc, LEN, Tag>, Tag> {
+    fn span(self, dir: Dir) -> SpanBuilder<Rsc, LEN, Wa, Tag>;
+    fn stack(self) -> StackBuilder<Rsc, LEN, Wa, Tag>;
+}
+
+impl<State, const LEN: usize, Wa: WidgetArrLike<State, LEN, Tag>, Tag>
+    CoreWidgetArr<State, LEN, Wa, Tag> for Wa
+{
+    fn span(self, dir: Dir) -> SpanBuilder<State, LEN, Wa, Tag> {
        SpanBuilder::new(self, dir)
    }
-    fn stack(self) -> StackBuilder<LEN, Wa, Tag> {
+    fn stack(self) -> StackBuilder<State, LEN, Wa, Tag> {
        StackBuilder::new(self)
    }
 }
Author	SHA1	Message	Date
shadow cat	1102dc7338	work	2026-02-26 19:18:27 -05:00
shadow cat	1aadef0e7e	fix Draw (redraw)	2026-02-21 00:19:39 -05:00
shadowcat	426ff0adfc	oop	2026-02-18 16:49:59 -05:00
shadow cat	dab6cf298a	Merge branch 'work' of git.arirex.me:shadowcat/iris into work	2026-02-17 18:14:38 -05:00
shadow cat	38d896d44d	selector	2026-02-17 18:14:19 -05:00
shadow cat	7b54aaf3c4	readme	2026-01-29 16:39:19 -05:00
shadow cat	17c436d944	stuff	2026-01-22 23:33:46 -05:00
shadow cat	a592318a6f	impl idlike for widgetview	2026-01-20 18:11:21 -05:00
Shadow Cat	796bc41752	didn't actually remove state on widget remove (mem leak)	2026-01-19 21:39:13 -05:00
shadow cat	7bafb04a34	widget state	2026-01-19 20:39:58 -05:00
Shadow Cat	06dd015092	finished moving out render_state	2026-01-19 18:00:24 -05:00
shadow cat	79813db3ba	work	2026-01-12 18:40:27 -05:00
shadow cat	a9c76e4326	lol bounds	2026-01-05 17:50:18 -05:00
shadow cat	32e45e9238	griefed last commit	2026-01-05 17:20:11 -05:00
shadow cat	2fadfe4b82	app event stuff bruh	2026-01-05 17:16:56 -05:00
shadow cat	d11107f965	widget view	2026-01-05 17:01:09 -05:00
shadow cat	07de7c8722	update deps	2026-01-04 14:45:18 -05:00
shadow cat	f2ac6f195f	remove typed stuff / just specify rsc if needed	2026-01-03 18:06:05 -05:00
shadow cat	59901b6580	tasks initial impl (still working on task_on trait method)	2026-01-03 16:26:23 -05:00
shadow cat	5da1e9e767	separate state from rsc	2026-01-01 22:18:08 -05:00
shadow cat	462c0e6416	move event data out of widgetdata	2025-12-23 15:42:04 -05:00
Shadow Cat	54534c4c34	bruh vsync griefs my laptop	2025-12-20 18:25:22 -05:00
Shadow Cat	f0fe671bd8	fix illegal instruction during handle ptr creation in release mode	2025-12-20 17:58:10 -05:00
Shadow Cat	1ccf947220	convenience methods for span	2025-12-20 01:38:56 -05:00
Shadow Cat	c00ded78c0	switch away from handles to refs that must be upgraded once	2025-12-20 01:36:07 -05:00
Shadow Cat	32ca4ec5a6	warning	2025-12-20 00:27:08 -05:00
Shadow Cat	fabc7d0b90	abuse macros..	2025-12-20 00:26:08 -05:00
Shadow Cat	bae17235c6	better global state structure?	2025-12-19 21:54:48 -05:00
shadow cat	30bc55c78e	remove state generic from a lot of things	2025-12-17 21:37:55 -05:00
shadow cat	7e6369029f	trust + fix redraw bug	2025-12-17 01:16:28 -05:00
shadow cat	70ac0fbcb2	typed stuff	2025-12-17 00:55:36 -05:00
shadow cat	1363f31fcd	FIX SIZE CACHE	2025-12-17 00:09:20 -05:00
shadow cat	ecbb9e56e2	small QOL	2025-12-16 20:24:21 -05:00
shadow cat	ac9571b29f	small changes	2025-12-16 18:38:06 -05:00
shadow cat	71f3beaf94	refactor painter	2025-12-16 00:48:14 -05:00
shadow cat	2183fbd3cb	make painter not stupid (size ctx is kinda tho)	2025-12-16 00:26:25 -05:00
shadow cat	486ed0ffd7	prelude macro visibility	2025-12-15 23:15:52 -05:00
shadow cat	8d1a810483	macro goodness	2025-12-15 23:11:32 -05:00
shadow cat	0b8a93c5ce	RE ADD CONTEXT	2025-12-15 21:50:53 -05:00
shadowcat	dc2be7f688	refactor out typemap	2025-12-15 16:25:12 -05:00
shadowcat	9d8ca8fa72	refactor events	2025-12-12 02:02:54 -05:00
shadowcat	a2a32b4322	ctx inference holy	2025-12-12 01:50:08 -05:00
shadowcat	37b1987aa8	remove modules and have single event manager (atomics feature parity + preparation for local state)	2025-12-12 01:46:24 -05:00
shadowcat	a708813ce7	idk work (r + h)	2025-12-11 23:05:27 -05:00
shadowcat	a70d09e162	lol	2025-12-11 16:24:07 -05:00
shadowcat	966b6a2ac2	proper widgetid + slot vec instead of map	2025-12-11 16:23:14 -05:00
shadowcat	2dad409300	handles (tuple)	2025-12-11 07:30:59 -05:00
shadowcat	36668c82f4	strong & weak widgets	2025-12-11 07:16:06 -05:00
shadowcat	a85e129026	move everything out of layout	2025-12-11 05:48:29 -05:00
shadowcat	174c447706	switch to macro	2025-12-11 05:31:34 -05:00
shadowcat	2dc5b0f62c	refactor project structure (start of redoing atomic branch without atomics)	2025-12-11 05:25:58 -05:00