diff --git a/Cargo.lock b/Cargo.lock
index c88c5786..dc215c39 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -116,9 +116,9 @@ checksum = "4af5687fe33aec5e70ef14caac5e0d363e335e5e5d6385fb75978d0c241b1d67"
 
 [[package]]
 name = "async-trait"
-version = "0.1.38"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e1a4a2f97ce50c9d0282c1468816208588441492b40d813b2e0419c22c05e7f"
+checksum = "687c230d85c0a52504709705fc8a53e4a692b83a2184f03dae73e38e1e93a783"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -223,9 +223,9 @@ checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
 
 [[package]]
 name = "bytemuck"
-version = "1.3.1"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db7a1029718df60331e557c9e83a55523c955e5dd2a7bfeffad6bbd50b538ae9"
+checksum = "41aa2ec95ca3b5c54cf73c91acf06d24f4495d5f1b1c12506ae3483d646177ac"
 
 [[package]]
 name = "byteorder"
@@ -301,6 +301,12 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "const_fn"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2"
+
 [[package]]
 name = "constant_time_eq"
 version = "0.1.5"
@@ -319,7 +325,7 @@ dependencies = [
  "percent-encoding",
  "rand",
  "sha2",
- "time 0.2.16",
+ "time 0.2.19",
  "version_check",
 ]
 
@@ -660,9 +666,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
+checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6"
 dependencies = [
  "cfg-if",
  "libc",
@@ -721,12 +727,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.8.2"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25"
-dependencies = [
- "autocfg",
-]
+checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7"
 
 [[package]]
 name = "heck"
@@ -843,9 +846,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.23.8"
+version = "0.23.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "543904170510c1b5fb65140485d84de4a57fddb2ed685481e9020ce3d2c9f64c"
+checksum = "974e194911d1f7efe3cd8a8f9db3b767e43536327e899e8bc9a12ef5711b74d2"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -859,9 +862,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9"
+checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
 dependencies = [
  "autocfg",
  "hashbrown",
@@ -920,9 +923,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.44"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a7e2c92a4804dd459b86c339278d0fe87cf93757fae222c3fa3ae75458bc73"
+checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -954,9 +957,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.76"
+version = "0.2.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3"
+checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
 
 [[package]]
 name = "lock_api"
@@ -1120,9 +1123,9 @@ dependencies = [
 
 [[package]]
 name = "net2"
-version = "0.2.34"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7"
+checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1379,9 +1382,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.19"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
+checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"
 dependencies = [
  "unicode-xid",
 ]
@@ -1587,7 +1590,7 @@ dependencies = [
  "rocket_codegen",
  "rocket_http",
  "state",
- "time 0.2.16",
+ "time 0.2.19",
  "tokio",
  "toml",
  "version_check",
@@ -1622,7 +1625,7 @@ dependencies = [
  "ref-cast",
  "smallvec",
  "state",
- "time 0.2.16",
+ "time 0.2.19",
  "tokio",
  "tokio-rustls",
  "unicode-xid",
@@ -1631,6 +1634,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.0.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "ruma-api",
  "ruma-appservice-api",
@@ -1646,6 +1650,7 @@ dependencies = [
 [[package]]
 name = "ruma-api"
 version = "0.17.0-alpha.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "http",
  "percent-encoding",
@@ -1660,6 +1665,7 @@ dependencies = [
 [[package]]
 name = "ruma-api-macros"
 version = "0.17.0-alpha.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1670,6 +1676,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.2.0-alpha.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "ruma-api",
  "ruma-common",
@@ -1682,6 +1689,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.10.0-alpha.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "assign",
  "http",
@@ -1700,6 +1708,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.2.0"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "js_int",
  "ruma-api",
@@ -1713,6 +1722,7 @@ dependencies = [
 [[package]]
 name = "ruma-events"
 version = "0.22.0-alpha.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -1727,6 +1737,7 @@ dependencies = [
 [[package]]
 name = "ruma-events-macros"
 version = "0.22.0-alpha.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -1737,6 +1748,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.0.3"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "js_int",
  "ruma-api",
@@ -1751,6 +1763,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers"
 version = "0.17.4"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "rand",
  "ruma-identifiers-macros",
@@ -1762,6 +1775,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-macros"
 version = "0.17.4"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1772,6 +1786,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.1.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "serde",
  "strum",
@@ -1780,6 +1795,7 @@ dependencies = [
 [[package]]
 name = "ruma-serde"
 version = "0.2.3"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "form_urlencoded",
  "itoa",
@@ -1791,6 +1807,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.6.0-dev.1"
+source = "git+https://github.com/timokoesters/ruma?branch=timo-fed-fixes#ca07bb61d88fd665464dab9707de6d47048fc225"
 dependencies = [
  "base64",
  "ring",
@@ -1910,18 +1927,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.115"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
+checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.115"
+version = "1.0.116"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
+checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2021,9 +2038,9 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
 
 [[package]]
 name = "socket2"
-version = "0.3.12"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918"
+checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44"
 dependencies = [
  "cfg-if",
  "libc",
@@ -2055,6 +2072,7 @@ checksum = "7345c971d1ef21ffdbd103a75990a15eb03604fc8b8852ca8cb418ee1a099028"
 [[package]]
 name = "state-res"
 version = "0.1.0"
+source = "git+https://github.com/timokoesters/state-res?branch=spec-comp#0081081604b051d412a2365b68357e064c33320c"
 dependencies = [
  "itertools",
  "js_int",
@@ -2139,15 +2157,15 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.2.3"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
+checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd"
 
 [[package]]
 name = "syn"
-version = "1.0.39"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d8d6567fe7c7f8835a3a98af4208f3846fba258c1bc3c31d6e506239f11f9"
+checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2210,11 +2228,11 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15"
+checksum = "80c1a1fd93112fc50b11c43a1def21f926be3c18884fad676ea879572da070a1"
 dependencies = [
- "cfg-if",
+ "const_fn",
  "libc",
  "standback",
  "stdweb",
@@ -2288,9 +2306,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9"
+checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
 dependencies = [
  "futures-core",
  "rustls",
@@ -2362,9 +2380,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f0e00789804e99b20f12bc7003ca416309d28a6f495d6af58d1e2c2842461b5"
+checksum = "5bcf46c1f1f06aeea2d6b81f3c863d0930a596c86ad1920d4e5bad6dd1d7119a"
 dependencies = [
  "lazy_static",
 ]
@@ -2382,9 +2400,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-serde"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6ccba2f8f16e0ed268fc765d9b7ff22e965e7185d32f8f1ec8294fe17d86e79"
+checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b"
 dependencies = [
  "serde",
  "tracing-core",
@@ -2392,9 +2410,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd165311cc4d7a555ad11cc77a37756df836182db0d81aac908c8184c584f40"
+checksum = "82bb5079aa76438620837198db8a5c529fb9878c730bc2b28179b0241cf04c10"
 dependencies = [
  "ansi_term",
  "chrono",
@@ -2525,9 +2543,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c"
+checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
 dependencies = [
  "cfg-if",
  "serde",
@@ -2537,9 +2555,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0"
+checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -2552,9 +2570,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.17"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95f8d235a77f880bcef268d379810ea6c0af2eacfa90b1ad5af731776e0c4699"
+checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -2564,9 +2582,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2"
+checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2574,9 +2592,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556"
+checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2587,15 +2605,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.67"
+version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092"
+checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
 
 [[package]]
 name = "web-sys"
-version = "0.3.44"
+version = "0.3.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dda38f4e5ca63eda02c059d243aa25b5f35ab98451e518c51612cd0f1bd19a47"
+checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
diff --git a/Cargo.toml b/Cargo.toml
index 5d354333..1b7a7007 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,8 @@ edition = "2018"
 #rocket = { git = "https://github.com/SergioBenitez/Rocket.git", rev = "8d779caa22c63b15a6c3ceb75d8f6d4971b2eb67", features = ["tls"] } # Used to handle requests
 rocket = { git = "https://github.com/timokoesters/Rocket.git", branch = "empty_parameters", features = ["tls"] }
 #ruma = { git = "https://github.com/ruma/ruma", features = ["rand", "client-api", "federation-api", "unstable-pre-spec", "unstable-synapse-quirks"], rev = "aff914050eb297bd82b8aafb12158c88a9e480e1" } # Used for matrix spec type definitions and helpers
-#ruma = { git = "https://github.com/timokoesters/ruma", features = ["rand", "client-api", "federation-api", "unstable-pre-spec", "unstable-synapse-quirks"], branch = "timo-fixes" } # Used for matrix spec type definitions and helpers
-ruma = { path = "../ruma/ruma", features = ["unstable-exhaustive-types", "rand", "client-api", "federation-api", "unstable-pre-spec", "unstable-synapse-quirks"] }
+ruma = { git = "https://github.com/timokoesters/ruma", features = ["rand", "client-api", "federation-api", "unstable-exhaustive-types", "unstable-pre-spec", "unstable-synapse-quirks"], branch = "timo-fed-fixes" } # Used for matrix spec type definitions and helpers
+#ruma = { path = "../ruma/ruma", features = ["unstable-exhaustive-types", "rand", "client-api", "federation-api", "unstable-pre-spec", "unstable-synapse-quirks"] }
 tokio = "0.2.22" # Used for long polling
 sled = "0.32.0" # Used for storing data permanently
 log = "0.4.8" # Used for emitting log entries
@@ -32,8 +32,8 @@ reqwest = "0.10.6" # Used to send requests
 thiserror = "1.0.19" # Used for conduit::Error type
 image = { version = "0.23.4", default-features = false, features = ["jpeg", "png", "gif"] } # Used to generate thumbnails for images
 base64 = "0.12.3" # Used to encode server public key
-#state-res = { git = "https://github.com/ruma/state-res", version = "0.1.0", branch = "spec-comp" }
-state-res = { path = "../state-res" }
+state-res = { git = "https://github.com/timokoesters/state-res", branch = "spec-comp", features = ["unstable-pre-spec"] }
+#state-res = { path = "../state-res", features = ["unstable-pre-spec"] }
 ring = "0.16.15"
 
 [features]
diff --git a/src/client_server/account.rs b/src/client_server/account.rs
index cb77a15d..3db933c1 100644
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -356,14 +356,14 @@ pub fn deactivate_route(
 
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                room_id: room_id.clone(),
-                sender: sender_id.clone(),
                 event_type: EventType::RoomMember,
                 content: serde_json::to_value(event).expect("event is valid, we just created it"),
                 unsigned: None,
                 state_key: Some(sender_id.to_string()),
                 redacts: None,
             },
+            &sender_id,
+            &room_id,
             &db.globals,
             &db.account_data,
         )?;
diff --git a/src/client_server/alias.rs b/src/client_server/alias.rs
index 1d30261b..bfdaecac 100644
--- a/src/client_server/alias.rs
+++ b/src/client_server/alias.rs
@@ -64,9 +64,7 @@ pub async fn get_alias_helper(
         let response = server_server::send_request(
             &db,
             room_alias.server_name().to_string(),
-            federation::query::get_room_information::v1::Request {
-                room_alias,
-            },
+            federation::query::get_room_information::v1::Request { room_alias },
         )
         .await?;
 
diff --git a/src/client_server/directory.rs b/src/client_server/directory.rs
index 34feb718..2764d2c5 100644
--- a/src/client_server/directory.rs
+++ b/src/client_server/directory.rs
@@ -14,7 +14,7 @@ use ruma::{
         },
         federation,
     },
-    directory::{IncomingFilter, PublicRoomsChunk, IncomingRoomNetwork},
+    directory::{IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk},
     events::{
         room::{avatar, canonical_alias, guest_access, history_visibility, name, topic},
         EventType,
diff --git a/src/client_server/media.rs b/src/client_server/media.rs
index 038012e2..d0774472 100644
--- a/src/client_server/media.rs
+++ b/src/client_server/media.rs
@@ -34,12 +34,8 @@ pub fn create_content_route(
         db.globals.server_name(),
         utils::random_string(MXC_LENGTH)
     );
-    db.media.create(
-        mxc.clone(),
-        &body.filename,
-        &body.content_type,
-        &body.file,
-    )?;
+    db.media
+        .create(mxc.clone(), &body.filename, &body.content_type, &body.file)?;
 
     Ok(create_content::Response { content_uri: mxc }.into())
 }
diff --git a/src/client_server/membership.rs b/src/client_server/membership.rs
index 606e4700..ea2271bb 100644
--- a/src/client_server/membership.rs
+++ b/src/client_server/membership.rs
@@ -4,6 +4,7 @@ use crate::{
     pdu::{PduBuilder, PduEvent},
     server_server, utils, ConduitResult, Database, Error, Ruma,
 };
+use log::warn;
 use ruma::{
     api::{
         client::{
@@ -20,8 +21,7 @@ use ruma::{
     EventId, Raw, RoomId, RoomVersionId, UserId,
 };
 use state_res::StateEvent;
-
-use std::{collections::BTreeMap, convert::TryFrom};
+use std::{collections::BTreeMap, convert::TryFrom, sync::Arc};
 
 #[cfg(feature = "conduit_bin")]
 use rocket::{get, post};
@@ -106,14 +106,14 @@ pub fn leave_room_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: body.room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomMember,
             content: serde_json::to_value(event).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some(sender_id.to_string()),
             redacts: None,
         },
+        &sender_id,
+        &body.room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -134,8 +134,6 @@ pub fn invite_user_route(
     if let invite_user::IncomingInvitationRecipient::UserId { user_id } = &body.recipient {
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                room_id: body.room_id.clone(),
-                sender: sender_id.clone(),
                 event_type: EventType::RoomMember,
                 content: serde_json::to_value(member::MemberEventContent {
                     membership: member::MembershipState::Invite,
@@ -149,6 +147,8 @@ pub fn invite_user_route(
                 state_key: Some(user_id.to_string()),
                 redacts: None,
             },
+            &sender_id,
+            &body.room_id,
             &db.globals,
             &db.account_data,
         )?;
@@ -191,14 +191,14 @@ pub fn kick_user_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: body.room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomMember,
             content: serde_json::to_value(event).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some(body.user_id.to_string()),
             redacts: None,
         },
+        &sender_id,
+        &body.room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -246,14 +246,14 @@ pub fn ban_user_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: body.room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomMember,
             content: serde_json::to_value(event).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some(body.user_id.to_string()),
             redacts: None,
         },
+        &sender_id,
+        &body.room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -292,14 +292,14 @@ pub fn unban_user_route(
 
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: body.room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomMember,
             content: serde_json::to_value(event).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some(body.user_id.to_string()),
             redacts: None,
         },
+        &sender_id,
+        &body.room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -473,7 +473,7 @@ async fn join_room_by_id_helper(
         let send_join_response = server_server::send_request(
             &db,
             room_id.server_name().to_string(),
-            federation::membership::create_join_event::v1::Request {
+            federation::membership::create_join_event::v2::Request {
                 room_id,
                 event_id: &event_id,
                 pdu_stub: serde_json::from_value(join_event_stub_value)
@@ -482,25 +482,39 @@ async fn join_room_by_id_helper(
         )
         .await?;
 
-        dbg!(&send_join_response);
-
         let mut event_map = send_join_response
             .room_state
             .state
             .iter()
             .chain(send_join_response.room_state.auth_chain.iter())
             .map(|pdu| {
-                pdu.deserialize()
-                    .map(StateEvent::Full)
-                    .map(|ev| (ev.event_id(), ev))
+                let mut value = serde_json::from_str(pdu.json().get())
+                    .expect("converting raw jsons to values always works");
+                let event_id = EventId::try_from(&*format!(
+                    "${}",
+                    ruma::signatures::reference_hash(&value)
+                        .expect("ruma can calculate reference hashes")
+                ))
+                .expect("ruma's reference hashes are valid event ids");
+
+                value
+                    .as_object_mut()
+                    .ok_or_else(|| Error::BadServerResponse("PDU is not an object."))?
+                    .insert("event_id".to_owned(), event_id.to_string().into());
+
+                serde_json::from_value::<StateEvent>(value)
+                    .map(|ev| (event_id, Arc::new(ev)))
+                    .map_err(|e| {
+                        warn!("{}", e);
+                        Error::BadServerResponse("Invalid PDU bytes in send_join response.")
+                    })
             })
-            .collect::<Result<BTreeMap<EventId, StateEvent>, _>>()
-            .map_err(|_| Error::bad_database("Invalid PDU found in db."))?;
+            .collect::<Result<BTreeMap<EventId, Arc<StateEvent>>, _>>()?;
 
         let control_events = event_map
             .values()
             .filter(|pdu| pdu.is_power_event())
-            .map(|pdu| pdu.event_id())
+            .map(|pdu| pdu.event_id().clone())
             .collect::<Vec<_>>();
 
         // These events are not guaranteed to be sorted but they are resolved according to spec
@@ -515,7 +529,9 @@ async fn join_room_by_id_helper(
                 .room_state
                 .auth_chain
                 .iter()
-                .filter_map(|pdu| Some(StateEvent::Full(pdu.deserialize().ok()?).event_id()))
+                .filter_map(|pdu| {
+                    Some(StateEvent::Full(pdu.deserialize().ok()?).event_id().clone())
+                })
                 .collect::<Vec<_>>(),
         );
 
@@ -575,31 +591,31 @@ async fn join_room_by_id_helper(
 
             // We do not rebuild the PDU in this case only insert to DB
             db.rooms
-                .append_pdu(PduEvent::try_from(pdu)?, &db.globals, &db.account_data)?;
+                .append_pdu(PduEvent::from(&**pdu), &db.globals, &db.account_data)?;
         }
-    }
-
-    let event = member::MemberEventContent {
-        membership: member::MembershipState::Join,
-        displayname: db.users.displayname(&sender_id)?,
-        avatar_url: db.users.avatar_url(&sender_id)?,
-        is_direct: None,
-        third_party_invite: None,
-    };
+    } else {
+        let event = member::MemberEventContent {
+            membership: member::MembershipState::Join,
+            displayname: db.users.displayname(&sender_id)?,
+            avatar_url: db.users.avatar_url(&sender_id)?,
+            is_direct: None,
+            third_party_invite: None,
+        };
 
-    db.rooms.build_and_append_pdu(
-        PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
-            event_type: EventType::RoomMember,
-            content: serde_json::to_value(event).expect("event is valid, we just created it"),
-            unsigned: None,
-            state_key: Some(sender_id.to_string()),
-            redacts: None,
-        },
-        &db.globals,
-        &db.account_data,
-    )?;
+        db.rooms.build_and_append_pdu(
+            PduBuilder {
+                event_type: EventType::RoomMember,
+                content: serde_json::to_value(event).expect("event is valid, we just created it"),
+                unsigned: None,
+                state_key: Some(sender_id.to_string()),
+                redacts: None,
+            },
+            &sender_id,
+            &room_id,
+            &db.globals,
+            &db.account_data,
+        )?;
+    }
 
     Ok(join_room_by_id::Response::new(room_id.clone()).into())
 }
diff --git a/src/client_server/message.rs b/src/client_server/message.rs
index 09c3517f..025331e6 100644
--- a/src/client_server/message.rs
+++ b/src/client_server/message.rs
@@ -27,11 +27,10 @@ pub fn send_message_event_route(
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: body.room_id.clone(),
-            sender: sender_id.clone(),
             event_type: body.content.event_type().into(),
             content: serde_json::from_str(
                 body.json_body
+                    .as_ref()
                     .ok_or(Error::BadRequest(ErrorKind::BadJson, "Invalid JSON body."))?
                     .get(),
             )
@@ -40,6 +39,8 @@ pub fn send_message_event_route(
             state_key: None,
             redacts: None,
         },
+        &sender_id,
+        &body.room_id,
         &db.globals,
         &db.account_data,
     )?;
diff --git a/src/client_server/profile.rs b/src/client_server/profile.rs
index 386d8988..2a2e05ef 100644
--- a/src/client_server/profile.rs
+++ b/src/client_server/profile.rs
@@ -33,8 +33,6 @@ pub fn set_displayname_route(
         let room_id = room_id?;
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                room_id: room_id.clone(),
-                sender: sender_id.clone(),
                 event_type: EventType::RoomMember,
                 content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
                     displayname: body.displayname.clone(),
@@ -62,6 +60,8 @@ pub fn set_displayname_route(
                 state_key: Some(sender_id.to_string()),
                 redacts: None,
             },
+            &sender_id,
+            &room_id,
             &db.globals,
             &db.account_data,
         )?;
@@ -136,8 +136,6 @@ pub fn set_avatar_url_route(
         let room_id = room_id?;
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                room_id: room_id.clone(),
-                sender: sender_id.clone(),
                 event_type: EventType::RoomMember,
                 content: serde_json::to_value(ruma::events::room::member::MemberEventContent {
                     avatar_url: body.avatar_url.clone(),
@@ -165,6 +163,8 @@ pub fn set_avatar_url_route(
                 state_key: Some(sender_id.to_string()),
                 redacts: None,
             },
+            &sender_id,
+            &room_id,
             &db.globals,
             &db.account_data,
         )?;
diff --git a/src/client_server/redact.rs b/src/client_server/redact.rs
index cd1b4438..51173489 100644
--- a/src/client_server/redact.rs
+++ b/src/client_server/redact.rs
@@ -20,8 +20,6 @@ pub fn redact_event_route(
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: body.room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomRedaction,
             content: serde_json::to_value(redaction::RedactionEventContent {
                 reason: body.reason.clone(),
@@ -31,6 +29,8 @@ pub fn redact_event_route(
             state_key: None,
             redacts: Some(body.event_id.clone()),
         },
+        &sender_id,
+        &body.room_id,
         &db.globals,
         &db.account_data,
     )?;
diff --git a/src/client_server/room.rs b/src/client_server/room.rs
index 9918123f..9a83f81b 100644
--- a/src/client_server/room.rs
+++ b/src/client_server/room.rs
@@ -55,14 +55,14 @@ pub fn create_room_route(
     // 1. The room create event
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomCreate,
             content: serde_json::to_value(content).expect("event is valid, we just created it"),
             unsigned: None,
             state_key: Some("".to_owned()),
             redacts: None,
         },
+        &sender_id,
+        &room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -70,8 +70,6 @@ pub fn create_room_route(
     // 2. Let the room creator join
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomMember,
             content: serde_json::to_value(member::MemberEventContent {
                 membership: member::MembershipState::Join,
@@ -85,6 +83,8 @@ pub fn create_room_route(
             state_key: Some(sender_id.to_string()),
             redacts: None,
         },
+        &sender_id,
+        &room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -119,14 +119,14 @@ pub fn create_room_route(
     };
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomPowerLevels,
             content: power_levels_content,
             unsigned: None,
             state_key: Some("".to_owned()),
             redacts: None,
         },
+        &sender_id,
+        &room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -142,8 +142,6 @@ pub fn create_room_route(
     // 4.1 Join Rules
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomJoinRules,
             content: match preset {
                 create_room::RoomPreset::PublicChat => serde_json::to_value(
@@ -160,6 +158,8 @@ pub fn create_room_route(
             state_key: Some("".to_owned()),
             redacts: None,
         },
+        &sender_id,
+        &room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -167,8 +167,6 @@ pub fn create_room_route(
     // 4.2 History Visibility
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomHistoryVisibility,
             content: serde_json::to_value(history_visibility::HistoryVisibilityEventContent::new(
                 history_visibility::HistoryVisibility::Shared,
@@ -178,6 +176,8 @@ pub fn create_room_route(
             state_key: Some("".to_owned()),
             redacts: None,
         },
+        &sender_id,
+        &room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -185,8 +185,6 @@ pub fn create_room_route(
     // 4.3 Guest Access
     db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
             event_type: EventType::RoomGuestAccess,
             content: match preset {
                 create_room::RoomPreset::PublicChat => {
@@ -204,6 +202,8 @@ pub fn create_room_route(
             state_key: Some("".to_owned()),
             redacts: None,
         },
+        &sender_id,
+        &room_id,
         &db.globals,
         &db.account_data,
     )?;
@@ -212,24 +212,27 @@ pub fn create_room_route(
     for event in &body.initial_state {
         let pdu_builder = serde_json::from_str::<PduBuilder>(
             &serde_json::to_string(&event).expect("AnyInitialStateEvent::to_string always works"),
-        ).map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event."))?;
+        )
+        .map_err(|_| Error::BadRequest(ErrorKind::InvalidParam, "Invalid initial state event."))?;
 
         // Silently skip encryption events if they are not allowed
-        if pdu_builder.event_type == EventType::RoomEncryption && db.globals.encryption_disabled()
-        {
+        if pdu_builder.event_type == EventType::RoomEncryption && db.globals.encryption_disabled() {
             continue;
         }
 
-        db.rooms
-            .build_and_append_pdu(pdu_builder, &db.globals, &db.account_data)?;
+        db.rooms.build_and_append_pdu(
+            pdu_builder,
+            &sender_id,
+            &room_id,
+            &db.globals,
+            &db.account_data,
+        )?;
     }
 
     // 6. Events implied by name and topic
     if let Some(name) = &body.name {
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                room_id: room_id.clone(),
-                sender: sender_id.clone(),
                 event_type: EventType::RoomName,
                 content: serde_json::to_value(
                     name::NameEventContent::new(name.clone()).map_err(|_| {
@@ -241,6 +244,8 @@ pub fn create_room_route(
                 state_key: Some("".to_owned()),
                 redacts: None,
             },
+            &sender_id,
+            &room_id,
             &db.globals,
             &db.account_data,
         )?;
@@ -249,8 +254,6 @@ pub fn create_room_route(
     if let Some(topic) = &body.topic {
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                room_id: room_id.clone(),
-                sender: sender_id.clone(),
                 event_type: EventType::RoomTopic,
                 content: serde_json::to_value(topic::TopicEventContent {
                     topic: topic.clone(),
@@ -260,6 +263,8 @@ pub fn create_room_route(
                 state_key: Some("".to_owned()),
                 redacts: None,
             },
+            &sender_id,
+            &room_id,
             &db.globals,
             &db.account_data,
         )?;
@@ -269,8 +274,6 @@ pub fn create_room_route(
     for user in &body.invite {
         db.rooms.build_and_append_pdu(
             PduBuilder {
-                room_id: room_id.clone(),
-                sender: sender_id.clone(),
                 event_type: EventType::RoomMember,
                 content: serde_json::to_value(member::MemberEventContent {
                     membership: member::MembershipState::Invite,
@@ -284,6 +287,8 @@ pub fn create_room_route(
                 state_key: Some(user.to_string()),
                 redacts: None,
             },
+            &sender_id,
+            &room_id,
             &db.globals,
             &db.account_data,
         )?;
diff --git a/src/client_server/search.rs b/src/client_server/search.rs
index 2967e001..3b03e7ac 100644
--- a/src/client_server/search.rs
+++ b/src/client_server/search.rs
@@ -77,7 +77,7 @@ pub fn search_events_route(
 
     Ok(search_events::Response::new(ResultCategories {
         room_events: ResultRoomEvents {
-            count: None, // TODO? maybe not
+            count: None,             // TODO? maybe not
             groups: BTreeMap::new(), // TODO
             next_batch,
             results,
diff --git a/src/client_server/state.rs b/src/client_server/state.rs
index 75463cba..1fe3cd6c 100644
--- a/src/client_server/state.rs
+++ b/src/client_server/state.rs
@@ -213,14 +213,14 @@ pub fn send_state_event_for_key_helper(
 
     let event_id = db.rooms.build_and_append_pdu(
         PduBuilder {
-            room_id: room_id.clone(),
-            sender: sender_id.clone(),
             event_type: content.event_type().into(),
             content: json,
             unsigned: None,
             state_key,
             redacts: None,
         },
+        &sender_id,
+        &room_id,
         &db.globals,
         &db.account_data,
     )?;
diff --git a/src/database.rs b/src/database.rs
index a105058c..0d18020b 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -97,7 +97,6 @@ impl Database {
                 },
                 pduid_pdu: db.open_tree("pduid_pdu")?,
                 eventid_pduid: db.open_tree("eventid_pduid")?,
-                roomstateid_pduid: db.open_tree("roomstateid_pduid")?,
                 roomid_pduleaves: db.open_tree("roomid_pduleaves")?,
 
                 alias_roomid: db.open_tree("alias_roomid")?,
diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index ee070b38..60333782 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -25,6 +25,7 @@ use std::{
     collections::{BTreeMap, HashMap},
     convert::{TryFrom, TryInto},
     mem,
+    sync::Arc,
 };
 
 /// The unique identifier of each state group.
@@ -33,10 +34,6 @@ use std::{
 /// hashing the entire state.
 pub type StateHashId = Vec<u8>;
 
-/// This identifier consists of roomId + count. It represents a
-/// unique event, it will never be overwritten or removed.
-pub type PduId = IVec;
-
 pub struct Rooms {
     pub edus: edus::RoomEdus,
     pub(super) pduid_pdu: sled::Tree, // PduId = RoomId + Count
@@ -54,22 +51,22 @@ pub struct Rooms {
     pub(super) roomuserid_invited: sled::Tree,
     pub(super) userroomid_left: sled::Tree,
 
-    // STATE TREES
-    /// This holds the full current state, including the latest event.
-    pub(super) roomstateid_pduid: sled::Tree, // RoomStateId = Room + StateType + StateKey
-    /// This holds the full room state minus the latest event.
-    pub(super) pduid_statehash: sled::Tree, // PDU id -> StateHash
-    /// Also holds the full room state minus the latest event.
-    pub(super) stateid_pduid: sled::Tree, // StateId = StateHash + (EventType, StateKey)
-    /// The room_id -> the latest StateHash
+    /// Remember the current state hash of a room.
     pub(super) roomid_statehash: sled::Tree,
+    /// Remember the state hash at events in the past.
+    pub(super) pduid_statehash: sled::Tree,
+    /// The state for a given state hash.
+    pub(super) stateid_pduid: sled::Tree, // StateId = StateHash + EventType + StateKey
 }
 
 impl StateStore for Rooms {
-    fn get_event(&self, room_id: &RoomId, event_id: &EventId) -> state_res::Result<StateEvent> {
+    fn get_event(
+        &self,
+        room_id: &RoomId,
+        event_id: &EventId,
+    ) -> state_res::Result<Arc<StateEvent>> {
         let pid = self
-            .eventid_pduid
-            .get(event_id.as_bytes())
+            .get_pdu_id(event_id)
             .map_err(StateError::custom)?
             .ok_or_else(|| {
                 StateError::NotFound("PDU via room_id and event_id not found in the db.".into())
@@ -87,7 +84,7 @@ impl StateStore for Rooms {
             // conduit's PDU's always contain a room_id but some
             // of ruma's do not so this must be an Option
             if pdu.room_id() == Some(room_id) {
-                Ok(pdu)
+                Ok(Arc::new(pdu))
             } else {
                 Err(StateError::NotFound(
                     "Found PDU for incorrect room in db.".into(),
@@ -136,53 +133,12 @@ impl Rooms {
         None
     }
 
-    /// Fetch the current State using the `roomstateid_pduid` tree.
-    pub fn current_state_pduids(&self, room_id: &RoomId) -> Result<StateMap<PduId>> {
-        // TODO this could also scan roomstateid_pduid if we passed in room_id ?
-        self.roomstateid_pduid
-            .scan_prefix(room_id.as_bytes())
-            .values()
-            .map(|pduid| {
-                let pduid = &pduid?;
-                self.pduid_pdu.get(pduid)?.map_or_else(
-                    || {
-                        Err(Error::bad_database(
-                            "Failed to find current state of pduid's.",
-                        ))
-                    },
-                    |b| {
-                        Ok((
-                            serde_json::from_slice::<PduEvent>(&b)
-                                .map_err(|_| Error::bad_database("Invalid PDU in db."))?,
-                            pduid.clone(),
-                        ))
-                    },
-                )
-            })
-            .map(|pair| {
-                let (pdu, id) = pair?;
-                Ok(((pdu.kind, pdu.state_key), id))
-            })
-            .collect::<Result<StateMap<_>>>()
-    }
-
     /// Returns the last state hash key added to the db.
-    pub fn current_state_hash(&self, room_id: &RoomId) -> Result<StateHashId> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-
-        // We must check here because this method is called outside and before
-        // `append_state_pdu` so the DB can be empty
-        if self.pduid_statehash.scan_prefix(prefix).next().is_none() {
-            // return the hash of the room_id, this represents a room with no state
-            return self.new_state_hash_id(room_id);
-        }
-
-        self.pduid_statehash
-            .iter()
-            .next_back()
-            .map(|pair| Ok(pair?.1.to_vec()))
-            .ok_or_else(|| Error::bad_database("No PDU's found for this room."))?
+    pub fn current_state_hash(&self, room_id: &RoomId) -> Result<Option<StateHashId>> {
+        Ok(self
+            .roomid_statehash
+            .get(room_id.as_bytes())?
+            .map(|bytes| bytes.to_vec()))
     }
 
     /// This fetches auth event_ids from the current state using the
@@ -243,39 +199,11 @@ impl Rooms {
 
     /// Generate a new StateHash.
     ///
-    /// A unique hash made from hashing the current states pduid's.
-    fn new_state_hash_id(&self, room_id: &RoomId) -> Result<StateHashId> {
-        // Use hashed roomId as the first StateHash key for first state event in room
-        if self
-            .pduid_statehash
-            .scan_prefix(room_id.as_bytes())
-            .next()
-            .is_none()
-        {
-            return Ok(digest::digest(&digest::SHA256, room_id.as_bytes())
-                .as_ref()
-                .to_vec());
-        }
-
-        let pdu_ids_to_hash = self
-            .pduid_statehash
-            .scan_prefix(room_id.as_bytes())
-            .values()
-            .next_back()
-            .unwrap() // We just checked if the tree was empty
-            .map(|hash| {
-                self.stateid_pduid
-                    .scan_prefix(hash)
-                    .values()
-                    // pduid is roomId + count so just hash the whole thing
-                    .map(|pid| Ok(pid?.to_vec()))
-                    .collect::<Result<Vec<Vec<u8>>>>()
-            })??;
-
-        let hash = digest::digest(
-            &digest::SHA256,
-            &pdu_ids_to_hash.into_iter().flatten().collect::<Vec<u8>>(),
-        );
+    /// A unique hash made from hashing all PDU ids of the state joined with 0xff.
+    fn calculate_hash(&self, pdu_id_bytes: &[&[u8]]) -> Result<StateHashId> {
+        // We only hash the pdu's event ids, not the whole pdu
+        let bytes = pdu_id_bytes.join(&0xff);
+        let hash = digest::digest(&digest::SHA256, &bytes);
         Ok(hash.as_ref().to_vec())
     }
 
@@ -297,29 +225,38 @@ impl Rooms {
         &self,
         room_id: &RoomId,
     ) -> Result<HashMap<(EventType, String), PduEvent>> {
-        let mut hashmap = HashMap::new();
-        for pdu in
-            self.roomstateid_pduid
-                .scan_prefix(&room_id.as_bytes())
+        if let Some(current_state_hash) = self.current_state_hash(room_id)? {
+            let mut prefix = current_state_hash;
+            prefix.push(0xff);
+
+            let mut hashmap = HashMap::new();
+            for pdu in self
+                .stateid_pduid
+                .scan_prefix(prefix)
                 .values()
-                .map(|value| {
+                .map(|pdu_id| {
                     Ok::<_, Error>(
                         serde_json::from_slice::<PduEvent>(
-                            &self.pduid_pdu.get(value?)?.ok_or_else(|| {
-                                Error::bad_database("PDU not found for ID in db.")
+                            &self.pduid_pdu.get(pdu_id?)?.ok_or_else(|| {
+                                Error::bad_database("PDU in state not found in database.")
                             })?,
                         )
-                        .map_err(|_| Error::bad_database("Invalid PDU in db."))?,
+                        .map_err(|_| {
+                            Error::bad_database("Invalid PDU bytes in current room state.")
+                        })?,
                     )
                 })
-        {
-            let pdu = pdu?;
-            let state_key = pdu.state_key.clone().ok_or_else(|| {
-                Error::bad_database("Room state contains event without state_key.")
-            })?;
-            hashmap.insert((pdu.kind.clone(), state_key), pdu);
+            {
+                let pdu = pdu?;
+                let state_key = pdu.state_key.clone().ok_or_else(|| {
+                    Error::bad_database("Room state contains event without state_key.")
+                })?;
+                hashmap.insert((pdu.kind.clone(), state_key), pdu);
+            }
+            Ok(hashmap)
+        } else {
+            Ok(HashMap::new())
         }
-        Ok(hashmap)
     }
 
     /// Returns all state entries for this type.
@@ -328,33 +265,40 @@ impl Rooms {
         room_id: &RoomId,
         event_type: &EventType,
     ) -> Result<HashMap<String, PduEvent>> {
-        let mut prefix = room_id.as_bytes().to_vec();
-        prefix.push(0xff);
-        prefix.extend_from_slice(&event_type.to_string().as_bytes());
+        if let Some(current_state_hash) = self.current_state_hash(room_id)? {
+            let mut prefix = current_state_hash;
+            prefix.push(0xff);
+            prefix.extend_from_slice(&event_type.to_string().as_bytes());
+            prefix.push(0xff);
 
-        let mut hashmap = HashMap::new();
-        for pdu in
-            self.roomstateid_pduid
+            let mut hashmap = HashMap::new();
+            for pdu in self
+                .stateid_pduid
                 .scan_prefix(&prefix)
                 .values()
-                .map(|value| {
+                .map(|pdu_id| {
                     Ok::<_, Error>(
                         serde_json::from_slice::<PduEvent>(
-                            &self.pduid_pdu.get(value?)?.ok_or_else(|| {
-                                Error::bad_database("PDU not found for ID in db.")
+                            &self.pduid_pdu.get(pdu_id?)?.ok_or_else(|| {
+                                Error::bad_database("PDU in state not found in database.")
                             })?,
                         )
-                        .map_err(|_| Error::bad_database("Invalid PDU in db."))?,
+                        .map_err(|_| {
+                            Error::bad_database("Invalid PDU bytes in current room state.")
+                        })?,
                     )
                 })
-        {
-            let pdu = pdu?;
-            let state_key = pdu.state_key.clone().ok_or_else(|| {
-                Error::bad_database("Room state contains event without state_key.")
-            })?;
-            hashmap.insert(state_key, pdu);
+            {
+                let pdu = pdu?;
+                let state_key = pdu.state_key.clone().ok_or_else(|| {
+                    Error::bad_database("Room state contains event without state_key.")
+                })?;
+                hashmap.insert(state_key, pdu);
+            }
+            Ok(hashmap)
+        } else {
+            Ok(HashMap::new())
         }
-        Ok(hashmap)
     }
 
     /// Returns a single PDU from `room_id` with key (`event_type`, `state_key`).
@@ -364,23 +308,24 @@ impl Rooms {
         event_type: &EventType,
         state_key: &str,
     ) -> Result<Option<PduEvent>> {
-        let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
-        key.extend_from_slice(&event_type.to_string().as_bytes());
-        key.push(0xff);
-        key.extend_from_slice(&state_key.as_bytes());
-
-        self.roomstateid_pduid.get(&key)?.map_or(Ok(None), |value| {
-            Ok::<_, Error>(Some(
-                serde_json::from_slice::<PduEvent>(
-                    &self
-                        .pduid_pdu
-                        .get(value)?
-                        .ok_or_else(|| Error::bad_database("PDU not found for ID in db."))?,
-                )
-                .map_err(|_| Error::bad_database("Invalid PDU in db."))?,
-            ))
-        })
+        if let Some(current_state_hash) = self.current_state_hash(room_id)? {
+            let mut key = current_state_hash;
+            key.push(0xff);
+            key.extend_from_slice(&event_type.to_string().as_bytes());
+            key.push(0xff);
+            key.extend_from_slice(&state_key.as_bytes());
+
+            self.stateid_pduid.get(&key)?.map_or(Ok(None), |pdu_id| {
+                Ok::<_, Error>(Some(
+                    serde_json::from_slice::<PduEvent>(&self.pduid_pdu.get(pdu_id)?.ok_or_else(
+                        || Error::bad_database("PDU in state not found in database."),
+                    )?)
+                    .map_err(|_| Error::bad_database("Invalid PDU bytes in current room state."))?,
+                ))
+            })
+        } else {
+            Ok(None)
+        }
     }
 
     /// Returns the `count` of this pdu's id.
@@ -528,8 +473,8 @@ impl Rooms {
         self.eventid_pduid
             .insert(pdu.event_id.as_bytes(), &*pdu_id)?;
 
-        if let Some(state_key) = &pdu.state_key {
-            self.append_state_pdu(&pdu.room_id, &pdu_id, state_key, &pdu.kind)?;
+        if pdu.state_key.is_some() {
+            self.append_to_state(&pdu_id, &pdu)?;
         }
 
         match &pdu.kind {
@@ -603,59 +548,69 @@ impl Rooms {
     /// This adds all current state events (not including the incoming event)
     /// to `stateid_pduid` and adds the incoming event to `pduid_statehash`.
     /// The incoming event is the `pdu_id` passed to this method.
-    fn append_state_pdu(
-        &self,
-        room_id: &RoomId,
-        pdu_id: &[u8],
-        state_key: &str,
-        kind: &EventType,
-    ) -> Result<StateHashId> {
-        let state_hash = self.new_state_hash_id(room_id)?;
-        let state = self.current_state_pduids(room_id)?;
-
-        let mut key = state_hash.to_vec();
-        key.push(0xff);
-
-        // TODO eventually we could avoid writing to the DB so much on every event
-        // by keeping track of the delta and write that every so often
-        for ((ev_ty, state_key), pid) in state {
-            let mut state_id = key.to_vec();
-            state_id.extend_from_slice(ev_ty.to_string().as_bytes());
-            key.push(0xff);
-            state_id.extend_from_slice(state_key.expect("state event").as_bytes());
-            key.push(0xff);
+    fn append_to_state(&self, new_pdu_id: &[u8], new_pdu: &PduEvent) -> Result<StateHashId> {
+        let old_state =
+            if let Some(old_state_hash) = self.roomid_statehash.get(new_pdu.room_id.as_bytes())? {
+                // Store state for event. The state does not include the event itself.
+                // Instead it's the state before the pdu, so the room's old state.
+                self.pduid_statehash.insert(new_pdu_id, &old_state_hash)?;
+                if new_pdu.state_key.is_none() {
+                    return Ok(old_state_hash.to_vec());
+                }
 
-            self.stateid_pduid.insert(&state_id, &pid)?;
-        }
+                let mut prefix = old_state_hash.to_vec();
+                prefix.push(0xff);
+                self.stateid_pduid
+                    .scan_prefix(&prefix)
+                    .filter_map(|pdu| pdu.map_err(|e| error!("{}", e)).ok())
+                    .map(|(k, v)| (k.subslice(prefix.len(), k.len() - prefix.len()), v))
+                    .collect::<HashMap<IVec, IVec>>()
+            } else {
+                HashMap::new()
+            };
+
+        if let Some(state_key) = &new_pdu.state_key {
+            let mut new_state = old_state;
+            let mut pdu_key = new_pdu.kind.as_str().as_bytes().to_vec();
+            pdu_key.push(0xff);
+            pdu_key.extend_from_slice(state_key.as_bytes());
+            new_state.insert(pdu_key.into(), new_pdu_id.into());
 
-        // This event's state does not include the event itself. `current_state_pduids`
-        // uses `roomstateid_pduid` before the current event is inserted to the tree so the state
-        // will be everything up to but not including the incoming event.
-        self.pduid_statehash.insert(pdu_id, state_hash.as_slice())?;
+            let new_state_hash =
+                self.calculate_hash(&new_state.values().map(|b| &**b).collect::<Vec<_>>())?;
 
-        self.roomid_statehash
-            .insert(room_id.as_bytes(), state_hash.as_slice())?;
+            let mut key = new_state_hash.to_vec();
+            key.push(0xff);
+
+            // TODO: we could avoid writing to the DB on every state event by keeping
+            // track of the delta and write that every so often
+            for (key_without_prefix, pdu_id) in new_state {
+                let mut state_id = key.clone();
+                state_id.extend_from_slice(&key_without_prefix);
+                self.stateid_pduid.insert(&state_id, &pdu_id)?;
+            }
 
-        let mut key = room_id.as_bytes().to_vec();
-        key.push(0xff);
-        key.extend_from_slice(kind.to_string().as_bytes());
-        key.push(0xff);
-        key.extend_from_slice(state_key.as_bytes());
-        self.roomstateid_pduid.insert(key, pdu_id)?;
+            self.roomid_statehash
+                .insert(new_pdu.room_id.as_bytes(), &*new_state_hash)?;
 
-        Ok(state_hash)
+            Ok(new_state_hash)
+        } else {
+            Err(Error::bad_database(
+                "Tried to insert non-state event into room without a state.",
+            ))
+        }
     }
 
     /// Creates a new persisted data unit and adds it to a room.
     pub fn build_and_append_pdu(
         &self,
         pdu_builder: PduBuilder,
+        sender: &UserId,
+        room_id: &RoomId,
         globals: &super::globals::Globals,
         account_data: &super::account_data::AccountData,
     ) -> Result<EventId> {
         let PduBuilder {
-            room_id,
-            sender,
             event_type,
             content,
             unsigned,
@@ -741,8 +696,7 @@ impl Rooms {
                             ErrorKind::Unknown,
                             "Membership can't be the first event",
                         ))?)?
-                        .map(|pdu| pdu.convert_for_state_res())
-                        .transpose()?;
+                        .map(|pdu| pdu.convert_for_state_res());
                     event_auth::valid_membership_change(
                         // TODO this is a bit of a hack but not sure how to have a type
                         // declared in `state_res` crate easily convert to/from conduit::PduEvent
@@ -753,11 +707,12 @@ impl Rooms {
                             state_key: Some(state_key.to_owned()),
                             sender: &sender,
                         },
-                        prev_event.as_ref(),
+                        prev_event,
+                        None,
                         &auth_events
                             .iter()
                             .map(|((ty, key), pdu)| {
-                                Ok(((ty.clone(), key.clone()), pdu.convert_for_state_res()?))
+                                Ok(((ty.clone(), key.clone()), pdu.convert_for_state_res()))
                             })
                             .collect::<Result<StateMap<_>>>()?,
                     )
@@ -812,9 +767,8 @@ impl Rooms {
 
         let mut pdu = PduEvent {
             event_id: EventId::try_from("$thiswillbefilledinlater").expect("we know this is valid"),
-            room_id,
-            sender,
-            origin: globals.server_name().to_owned(),
+            room_id: room_id.clone(),
+            sender: sender.clone(),
             origin_server_ts: utils::millis_since_unix_epoch()
                 .try_into()
                 .expect("time is valid"),
@@ -834,7 +788,7 @@ impl Rooms {
             hashes: ruma::events::pdu::EventHash {
                 sha256: "aaa".to_owned(),
             },
-            signatures: HashMap::new(),
+            signatures: BTreeMap::new(),
         };
 
         // Generate event id
@@ -1028,8 +982,6 @@ impl Rooms {
 
                     self.build_and_append_pdu(
                         PduBuilder {
-                            room_id: room_id.clone(),
-                            sender: user_id.clone(),
                             event_type: EventType::RoomMember,
                             content: serde_json::to_value(member_content)
                                 .expect("event is valid, we just created it"),
@@ -1037,6 +989,8 @@ impl Rooms {
                             state_key: Some(user_id.to_string()),
                             redacts: None,
                         },
+                        &user_id,
+                        &room_id,
                         globals,
                         account_data,
                     )?;
diff --git a/src/pdu.rs b/src/pdu.rs
index 15264842..f23e688c 100644
--- a/src/pdu.rs
+++ b/src/pdu.rs
@@ -5,18 +5,17 @@ use ruma::{
         pdu::EventHash, room::member::MemberEventContent, AnyEvent, AnyRoomEvent, AnyStateEvent,
         AnyStrippedStateEvent, AnySyncRoomEvent, AnySyncStateEvent, EventType, StateEvent,
     },
-    EventId, Raw, RoomId, ServerName, UserId,
+    EventId, Raw, RoomId, ServerKeyId, ServerName, UserId,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::json;
-use std::{collections::HashMap, convert::TryFrom};
+use std::{collections::BTreeMap, convert::TryInto, sync::Arc, time::UNIX_EPOCH};
 
-#[derive(Deserialize, Serialize)]
+#[derive(Deserialize, Serialize, Debug)]
 pub struct PduEvent {
     pub event_id: EventId,
     pub room_id: RoomId,
     pub sender: UserId,
-    pub origin: Box<ServerName>,
     pub origin_server_ts: UInt,
     #[serde(rename = "type")]
     pub kind: EventType,
@@ -31,7 +30,7 @@ pub struct PduEvent {
     #[serde(default, skip_serializing_if = "serde_json::Map::is_empty")]
     pub unsigned: serde_json::Map<String, serde_json::Value>,
     pub hashes: EventHash,
-    pub signatures: HashMap<String, HashMap<String, String>>,
+    pub signatures: BTreeMap<Box<ServerName>, BTreeMap<ServerKeyId, String>>,
 }
 
 impl PduEvent {
@@ -199,66 +198,69 @@ impl PduEvent {
     }
 }
 
-impl TryFrom<&state_res::StateEvent> for PduEvent {
-    type Error = Error;
-    fn try_from(pdu: &state_res::StateEvent) -> Result<Self> {
-        serde_json::from_value(json!({
-            "event_id": pdu.event_id(),
-            "room_id": pdu.room_id(),
-            "sender": pdu.sender(),
-            "origin": pdu.origin(),
-            "origin_server_ts": pdu.origin_server_ts(),
-            "event_type": pdu.kind(),
-            "content": pdu.content(),
-            "state_key": pdu.state_key(),
-            "prev_events": pdu.prev_event_ids(),
-            "depth": pdu.depth(),
-            "auth_events": pdu.auth_events(),
-            "redacts": pdu.redacts(),
-            "unsigned": pdu.unsigned(),
-            "hashes": pdu.hashes(),
-            "signatures": pdu.signatures(),
-        }))
-        .map_err(|_| Error::bad_database("Failed to convert PDU to ruma::Pdu type."))
+impl From<&state_res::StateEvent> for PduEvent {
+    fn from(pdu: &state_res::StateEvent) -> Self {
+        Self {
+            event_id: pdu.event_id().clone(),
+            room_id: pdu.room_id().unwrap().clone(),
+            sender: pdu.sender().clone(),
+            origin_server_ts: (pdu
+                .origin_server_ts()
+                .duration_since(UNIX_EPOCH)
+                .expect("time is valid")
+                .as_millis() as u64)
+                .try_into()
+                .expect("time is valid"),
+            kind: pdu.kind(),
+            content: pdu.content().clone(),
+            state_key: pdu.state_key(),
+            prev_events: pdu.prev_event_ids(),
+            depth: pdu.depth().clone(),
+            auth_events: pdu.auth_events(),
+            redacts: pdu.redacts().cloned(),
+            unsigned: pdu.unsigned().clone().into_iter().collect(),
+            hashes: pdu.hashes().clone(),
+            signatures: pdu.signatures(),
+        }
     }
 }
 
 impl PduEvent {
-    pub fn convert_for_state_res(&self) -> Result<state_res::StateEvent> {
-        serde_json::from_value(json!({
-            "event_id": self.event_id,
-            "room_id": self.room_id,
-            "sender": self.sender,
-            "origin": self.origin,
-            "origin_server_ts": self.origin_server_ts,
-            "type": self.kind,
-            "content": self.content,
-            "state_key": self.state_key,
-            "prev_events": self.prev_events
-                .iter()
-                // TODO How do we create one of these
-                .map(|id| (id, EventHash { sha256: "hello".into() }))
-                .collect::<Vec<_>>(),
-            "depth": self.depth,
-            "auth_events": self.auth_events
-                .iter()
-                // TODO How do we create one of these
-                .map(|id| (id, EventHash { sha256: "hello".into() }))
-                .collect::<Vec<_>>(),
-            "redacts": self.redacts,
-            "unsigned": self.unsigned,
-            "hashes": self.hashes,
-            "signatures": self.signatures,
-        }))
-        .map_err(|_| Error::bad_database("Failed to convert PDU to ruma::Pdu type."))
+    pub fn convert_for_state_res(&self) -> Arc<state_res::StateEvent> {
+        Arc::new(
+            serde_json::from_value(json!({
+                "event_id": self.event_id,
+                "room_id": self.room_id,
+                "sender": self.sender,
+                "origin_server_ts": self.origin_server_ts,
+                "type": self.kind,
+                "content": self.content,
+                "state_key": self.state_key,
+                "prev_events": self.prev_events
+                    .iter()
+                    // TODO How do we create one of these
+                    .map(|id| (id, EventHash { sha256: "hello".into() }))
+                    .collect::<Vec<_>>(),
+                "depth": self.depth,
+                "auth_events": self.auth_events
+                    .iter()
+                    // TODO How do we create one of these
+                    .map(|id| (id, EventHash { sha256: "hello".into() }))
+                    .collect::<Vec<_>>(),
+                "redacts": self.redacts,
+                "unsigned": self.unsigned,
+                "hashes": self.hashes,
+                "signatures": self.signatures,
+            }))
+            .expect("all conduit PDUs are state events"),
+        )
     }
 }
 
 /// Build the start of a PDU in order to add it to the `Database`.
 #[derive(Debug, Deserialize)]
 pub struct PduBuilder {
-    pub room_id: RoomId,
-    pub sender: UserId,
+    #[serde(rename = "type")]
     pub event_type: EventType,
     pub content: serde_json::Value,
     pub unsigned: Option<serde_json::Map<String, serde_json::Value>>,
diff --git a/src/server_server.rs b/src/server_server.rs
index d39abe64..ffa5c5be 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -139,6 +139,7 @@ where
                 .unwrap()
                 .into_iter()
                 .collect();
+
             Ok(
                 T::IncomingResponse::try_from(http_response.body(body).unwrap())
                     .expect("TODO: error handle other server errors"),