diff --git a/src/board.rs b/src/board.rs
index dac08f4..688608b 100644
--- a/src/board.rs
+++ b/src/board.rs
@@ -39,7 +39,7 @@ impl From<CompatBoard> for Board {
 	fn from(value: CompatBoard) -> Self {
 		match value {
 			CompatBoard::V1(string) => Self {
-				grid: Grid::parse(&string),
+				grid: Grid::from_ascii(&string),
 				comments: Vec::new(),
 			},
 			CompatBoard::V2 { grid, comments } => Self { grid, comments },
@@ -149,7 +149,7 @@ impl Board {
 
 	pub fn from_user_str(source: &str) -> Self {
 		serde_json::from_str(source).unwrap_or_else(|_| Self {
-			grid: Grid::parse(source),
+			grid: Grid::from_ascii(source),
 			comments: Vec::new(),
 		})
 	}
diff --git a/src/marble_engine/grid.rs b/src/marble_engine/grid.rs
index f292b13..a958be1 100644
--- a/src/marble_engine/grid.rs
+++ b/src/marble_engine/grid.rs
@@ -53,7 +53,7 @@ impl ResizeDeltas {
 }
 
 impl Grid {
-	pub fn parse(source: &str) -> Self {
+	pub fn from_ascii(source: &str) -> Self {
 		let mut rows = Vec::new();
 
 		let mut width = 0;
@@ -79,13 +79,18 @@ impl Grid {
 		}
 	}
 
-	pub fn to_str(&self) -> String {
+	pub fn to_ascii(&self) -> String {
 		let mut out = String::new();
 		for y in 0..self.height {
 			for x in 0..self.width {
 				let tile = self.get((x, y).into()).unwrap();
 				out.push(tile.to_char());
 			}
+			if y > 0 {
+				while out.as_bytes().last() == Some(&b' ') {
+					out.pop();
+				}
+			}
 			out.push('\n');
 		}
 		out
@@ -269,12 +274,12 @@ impl Grid {
 
 impl From<String> for Grid {
 	fn from(value: String) -> Self {
-		Self::parse(&value)
+		Self::from_ascii(&value)
 	}
 }
 
 impl From<Grid> for String {
 	fn from(val: Grid) -> String {
-		val.to_str()
+		val.to_ascii()
 	}
 }
diff --git a/tests/main.rs b/tests/main.rs
index 336f92e..7b8e118 100644
--- a/tests/main.rs
+++ b/tests/main.rs
@@ -3,7 +3,7 @@ use marble_machinations::marble_engine::{grid::Grid, Machine};
 #[test]
 fn creating_marbles_cause_indirect_claim() {
 	let mut eng = Machine::new_empty();
-	eng.set_grid(Grid::parse(
+	eng.set_grid(Grid::from_ascii(
 		"
   I
 o 2