diff --git a/matrix_sdk_common/Cargo.toml b/matrix_sdk_common/Cargo.toml
index e6bf1e3c..8cb3e794 100644
--- a/matrix_sdk_common/Cargo.toml
+++ b/matrix_sdk_common/Cargo.toml
@@ -19,10 +19,10 @@ js_int = "0.1.9"
 version = "0.0.1"
 git = "https://github.com/ruma/ruma"
 rev = "4a9b1aeb3c87bd8574391d7084ec5bf109f7d363"
-features = ["client-api", "unstable-pre-spec"]
+features = ["client-api", "unstable-pre-spec", "unstable-exhaustive-types"]
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-uuid = { version = "0.8.1", features = ["v4"] }
+uuid = { version = "0.8.1", features = ["v4", "serde"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.tokio]
 version = "0.2.22"
diff --git a/matrix_sdk_crypto/src/key_request.rs b/matrix_sdk_crypto/src/key_request.rs
new file mode 100644
index 00000000..760a91f7
--- /dev/null
+++ b/matrix_sdk_crypto/src/key_request.rs
@@ -0,0 +1,218 @@
+/// TODO
+///
+/// Make a state machine that handles key requests.
+///
+/// Start with the outgoing key requests. We need to queue up a request and
+/// store the outgoing key requests, store if the request was sent out.
+/// Once we receive a key, check if we have an outgoing requests and if so
+/// accept and store the key if we don't have a better one. Send out a
+/// key request cancelation if we receive one.
+///
+/// Incoming key requests:
+/// First handle the easy case, if we trust the device and have a session, queue
+/// up a to-device request.
+///
+/// If we don't have a session, queue up a key claim request, once we get a
+/// session send out the key if we trust the device.
+///
+/// If we don't trust the device store an object that remembers the request and
+/// let the users introspect that object.
+use dashmap::DashMap;
+use serde::{Deserialize, Serialize};
+use serde_json::value::to_raw_value;
+use std::{collections::BTreeMap, sync::Arc};
+use tracing::{error, info, trace};
+
+use matrix_sdk_common::{
+    api::r0::to_device::DeviceIdOrAllDevices,
+    events::{
+        forwarded_room_key::ForwardedRoomKeyEventContent,
+        room_key_request::{Action, RequestedKeyInfo, RoomKeyRequestEventContent},
+        EventType, ToDeviceEvent,
+    },
+    identifiers::{DeviceIdBox, EventEncryptionAlgorithm, RoomId, UserId},
+    uuid::Uuid,
+};
+
+use crate::{
+    requests::{OutgoingRequest, ToDeviceRequest},
+    store::Store,
+};
+
+#[derive(Debug, Clone)]
+struct KeyRequestMachine {
+    user_id: Arc<UserId>,
+    device_id: Arc<DeviceIdBox>,
+    store: Store,
+    outgoing_to_device_requests: Arc<DashMap<Uuid, OutgoingRequest>>,
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+struct OugoingKeyInfo {
+    request_id: Uuid,
+    info: RequestedKeyInfo,
+    sent_out: bool,
+}
+
+trait Encode {
+    fn encode(&self) -> String;
+}
+
+impl Encode for RequestedKeyInfo {
+    fn encode(&self) -> String {
+        format!(
+            "{}|{}|{}|{}",
+            self.sender_key, self.room_id, self.session_id, self.algorithm
+        )
+    }
+}
+
+impl Encode for ForwardedRoomKeyEventContent {
+    fn encode(&self) -> String {
+        format!(
+            "{}|{}|{}|{}",
+            self.sender_key, self.room_id, self.session_id, self.algorithm
+        )
+    }
+}
+
+impl KeyRequestMachine {
+    async fn create_outgoing_key_request(
+        &self,
+        room_id: &RoomId,
+        sender_key: &str,
+        session_id: &str,
+    ) {
+        let key_info = RequestedKeyInfo {
+            algorithm: EventEncryptionAlgorithm::MegolmV1AesSha2,
+            room_id: room_id.to_owned(),
+            sender_key: sender_key.to_owned(),
+            session_id: session_id.to_owned(),
+        };
+
+        let id: Option<String> = self.store.get_object(&key_info.encode()).await.unwrap();
+
+        if id.is_some() {
+            // We already sent out a request for this key, nothing to do.
+            return;
+        }
+
+        info!("Creating new outgoing room key request {:#?}", key_info);
+
+        let id = Uuid::new_v4();
+
+        let content = RoomKeyRequestEventContent {
+            action: Action::Request,
+            request_id: id.to_string(),
+            requesting_device_id: (&*self.device_id).clone(),
+            body: Some(key_info),
+        };
+
+        let mut messages = BTreeMap::new();
+
+        messages
+            .entry((&*self.user_id).to_owned())
+            .or_insert_with(BTreeMap::new)
+            .insert(
+                DeviceIdOrAllDevices::AllDevices,
+                to_raw_value(&content).unwrap(),
+            );
+
+        let request = OutgoingRequest {
+            request_id: id,
+            request: Arc::new(
+                ToDeviceRequest {
+                    event_type: EventType::RoomKeyRequest,
+                    txn_id: id,
+                    messages,
+                }
+                .into(),
+            ),
+        };
+
+        let info = OugoingKeyInfo {
+            request_id: id,
+            info: content.body.unwrap(),
+            sent_out: false,
+        };
+
+        self.save_outgoing_key_info(id, info).await;
+        self.outgoing_to_device_requests.insert(id, request);
+    }
+
+    async fn save_outgoing_key_info(&self, id: Uuid, info: OugoingKeyInfo) {
+        // We need to access the key info via the hash of an RequestedKeyInfo
+        // and with the unique request id.
+        // Once to mark the request as sent. And another time to check if the
+        // received forwarded key matches to a request.
+        let id_string = id.to_string();
+        self.store.save_object(&id_string, &info).await.unwrap();
+        self.store
+            .save_object(&info.info.encode(), &id)
+            .await
+            .unwrap();
+    }
+
+    async fn get_key_info(&self, content: &ForwardedRoomKeyEventContent) -> Option<OugoingKeyInfo> {
+        let id: Option<Uuid> = self.store.get_object(&content.encode()).await.unwrap();
+
+        if let Some(id) = id {
+            self.store.get_object(&id.to_string()).await.unwrap()
+        } else {
+            None
+        }
+    }
+
+    async fn delete_key_info(&self, info: OugoingKeyInfo) {
+        self.store
+            .delete_object(&info.request_id.to_string())
+            .await
+            .unwrap();
+        self.store.delete_object(&info.info.encode()).await.unwrap();
+    }
+
+    async fn mark_outgoing_request_as_sent(&self, id: Uuid) {
+        self.outgoing_to_device_requests.remove(&id);
+        let info: Option<OugoingKeyInfo> = self.store.get_object(&id.to_string()).await.unwrap();
+
+        if let Some(mut info) = info {
+            trace!("Marking outgoing key request as sent {:#?}", info);
+            info.sent_out = true;
+            self.save_outgoing_key_info(id, info).await;
+        } else {
+            error!("Trying to mark a room key request with the id {} as sent, but no key info was found", id);
+        }
+    }
+
+    async fn receive_forwarded_room_key(
+        &self,
+        _sender_key: &str,
+        _signing_key: &str,
+        event: &mut ToDeviceEvent<ForwardedRoomKeyEventContent>,
+    ) {
+        let key_info = self.get_key_info(&event.content).await;
+
+        if let Some(info) = key_info {
+            // TODO create a new room key and store it if it's a better version
+            // of the existing key or if we don't have it at all.
+            self.outgoing_to_device_requests.remove(&info.request_id);
+            self.delete_key_info(info).await;
+        } else {
+            info!(
+                "Received a forwarded room key from {}, but no key info was found.",
+                event.sender,
+            );
+        }
+    }
+
+    fn handle_incoming_key_request(&self, event: &ToDeviceEvent<RoomKeyRequestEventContent>) {
+        match event.content.action {
+            Action::Request => todo!(),
+            Action::CancelRequest => todo!(),
+        }
+    }
+
+    fn cancel_request(&self) {
+        todo!()
+    }
+}
diff --git a/matrix_sdk_crypto/src/lib.rs b/matrix_sdk_crypto/src/lib.rs
index 9678e4e4..da3446d1 100644
--- a/matrix_sdk_crypto/src/lib.rs
+++ b/matrix_sdk_crypto/src/lib.rs
@@ -30,6 +30,8 @@
 mod error;
 mod file_encryption;
 mod identities;
+#[allow(dead_code)]
+mod key_request;
 mod machine;
 pub mod olm;
 mod requests;
diff --git a/matrix_sdk_crypto/src/store/memorystore.rs b/matrix_sdk_crypto/src/store/memorystore.rs
index acd6f704..c06614b7 100644
--- a/matrix_sdk_crypto/src/store/memorystore.rs
+++ b/matrix_sdk_crypto/src/store/memorystore.rs
@@ -172,6 +172,10 @@ impl CryptoStore for MemoryStore {
         Ok(())
     }
 
+    async fn remove_value(&self, key: &str) -> Result<Option<String>> {
+        Ok(self.values.remove(key).map(|(_, v)| v))
+    }
+
     async fn get_value(&self, key: &str) -> Result<Option<String>> {
         Ok(self.values.get(key).map(|v| v.to_owned()))
     }
diff --git a/matrix_sdk_crypto/src/store/mod.rs b/matrix_sdk_crypto/src/store/mod.rs
index 31e3e9ea..b3d098fb 100644
--- a/matrix_sdk_crypto/src/store/mod.rs
+++ b/matrix_sdk_crypto/src/store/mod.rs
@@ -105,6 +105,12 @@ impl Store {
         let value = serde_json::to_string(value)?;
         self.save_value(key.to_owned(), value).await
     }
+
+    #[allow(dead_code)]
+    pub async fn delete_object(&self, key: &str) -> Result<()> {
+        self.0.remove_value(key).await?;
+        Ok(())
+    }
 }
 
 impl Deref for Store {
@@ -293,6 +299,9 @@ pub trait CryptoStore: Debug {
     /// Save a serializeable object in the store.
     async fn save_value(&self, key: String, value: String) -> Result<()>;
 
+    /// Remove a value from the store.
+    async fn remove_value(&self, key: &str) -> Result<Option<String>>;
+
     /// Load a serializeable object from the store.
     async fn get_value(&self, key: &str) -> Result<Option<String>>;
 }
diff --git a/matrix_sdk_crypto/src/store/sqlite.rs b/matrix_sdk_crypto/src/store/sqlite.rs
index 0072b476..2ea7d6c1 100644
--- a/matrix_sdk_crypto/src/store/sqlite.rs
+++ b/matrix_sdk_crypto/src/store/sqlite.rs
@@ -1376,6 +1376,10 @@ impl CryptoStore for SqliteStore {
         todo!()
     }
 
+    async fn remove_value(&self, _key: &str) -> Result<Option<String>> {
+        todo!()
+    }
+
     async fn get_value(&self, _key: &str) -> Result<Option<String>> {
         todo!()
     }