diff --git a/card_game/src/lib.rs b/card_game/src/lib.rs
index 0dd30bb..6239339 100644
--- a/card_game/src/lib.rs
+++ b/card_game/src/lib.rs
@@ -476,7 +476,6 @@ impl<C: Default> Default for SessionConfig<C> {
 		G: serde::Serialize + for <'a> serde::Deserialize<'a>,
 		G::Stats: serde::Serialize + for <'a> serde::Deserialize<'a>,
 		G::Config: serde::Serialize + for <'a> serde::Deserialize<'a>,
-		Vec<StateSnapshot<G>>: serde::Serialize + for <'a> serde::Deserialize<'a>,
 	")
 )]
 pub struct Session<G: Game> {
@@ -502,14 +501,6 @@ impl<G: Game> StateSnapshot<G> {
 	}
 }
 #[derive(Clone, Debug)]
-#[cfg_attr(
-	feature = "serde",
-	derive(serde_derive::Deserialize, serde_derive::Serialize),
-	serde(bound = "
-		G: serde::Serialize + for <'a> serde::Deserialize<'a>,
-		Vec<StateSnapshot<G>>: serde::Serialize + for <'a> serde::Deserialize<'a>,
-	")
-)]
 pub struct SessionState<G: Game> {
 	state: G,
 	history: Vec<StateSnapshot<G>>,
@@ -670,3 +661,48 @@ where
 		self.state.is_win()
 	}
 }
+
+#[cfg(feature = "serde")]
+impl<'de, G: Game> serde::Deserialize<'de> for SessionState<G>
+where
+	G: serde::Serialize + for<'a> serde::Deserialize<'a>,
+{
+	fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+	where
+		D: serde::Deserializer<'de>,
+	{
+		struct SessionStateVisitor<G>(core::marker::PhantomData<G>);
+		impl<'de, G: Game> serde::de::Visitor<'de> for SessionStateVisitor<G> {
+			type Value = SessionState<G>;
+			fn expecting(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+				write!(f, "State History")
+			}
+			fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
+			where
+				A: serde::de::SeqAccess<'de>,
+			{
+				let mut stack = Stack::new();
+				while let Some(card) = seq.next_element()? {
+					// TODO: Error
+					stack.try_push(card).unwrap();
+				}
+				Ok(stack)
+			}
+		}
+		deserializer.deserialize_seq(SessionStateVisitor(core::marker::PhantomData))
+	}
+}
+#[cfg(feature = "serde")]
+impl<G: Game> serde::Serialize for SessionState<G> {
+	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: serde::Serializer,
+	{
+		use serde::ser::SerializeSeq;
+		let mut seq = serializer.serialize_seq(Some(self.len()))?;
+		for card in self.as_slice() {
+			seq.serialize_element(card)?;
+		}
+		seq.end()
+	}
+}