diff --git a/inputs/2022/2022_09.solution b/inputs/2022/2022_09.solution
index ab11824..62af888 100644
--- a/inputs/2022/2022_09.solution
+++ b/inputs/2022/2022_09.solution
@@ -1,2 +1,2 @@
 Part 1: 6311
-Part 2: ???
+Part 2: 2482
diff --git a/rs/src/y2022/d09.rs b/rs/src/y2022/d09.rs
index ae78faa..7d166db 100644
--- a/rs/src/y2022/d09.rs
+++ b/rs/src/y2022/d09.rs
@@ -1,60 +1,93 @@
 use std::collections::HashSet;
+use std::iter;
 
-#[derive(Clone, Copy, PartialEq, Eq)]
-enum Direction {
-    Left,
-    Right,
-    Down,
-    Up,
+fn move_head(dir: &str, head: (i32, i32)) -> (i32, i32) {
+    match dir {
+        "L" => (head.0 - 1, head.1),
+        "R" => (head.0 + 1, head.1),
+        "D" => (head.0, head.1 - 1),
+        "U" => (head.0, head.1 + 1),
+        _ => head,
+    }
 }
 
-impl Direction {
-    fn from_str(s: &str) -> Option<Self> {
-        match s {
-            "L" => Some(Self::Left),
-            "R" => Some(Self::Right),
-            "D" => Some(Self::Down),
-            "U" => Some(Self::Up),
-            _ => None,
-        }
+fn move_tail(anchor: (i32, i32), tail: (i32, i32)) -> (i32, i32) {
+    let mut dx = anchor.0 - tail.0;
+    let mut dy = anchor.1 - tail.1;
+
+    if dx.abs() == dy.abs() {
+        // Move diagonally
+        dx = dx.signum();
+        dy = dy.signum();
+    } else {
+        // Move diagonally until either dx or dy is 0, then catch up along the
+        // remaining axis.
+        let diagonal_steps = dx.abs().min(dy.abs());
+        dx = (dx - dx.signum() * diagonal_steps).signum();
+        dy = (dy - dy.signum() * diagonal_steps).signum();
     }
 
-    fn move_head(self, head: (i32, i32)) -> (i32, i32) {
-        match self {
-            Self::Left => (head.0 - 1, head.1),
-            Self::Right => (head.0 + 1, head.1),
-            Self::Down => (head.0, head.1 - 1),
-            Self::Up => (head.0, head.1 + 1),
-        }
-    }
+    (anchor.0 - dx, anchor.1 - dy)
+}
 
-    fn move_tail(self, anchor: (i32, i32), tail: (i32, i32)) -> (i32, i32) {
-        match self {
-            Self::Left if tail.0 > anchor.0 + 1 => (anchor.0 + 1, anchor.1),
-            Self::Right if tail.0 < anchor.0 - 1 => (anchor.0 - 1, anchor.1),
-            Self::Down if tail.1 > anchor.1 + 1 => (anchor.0, anchor.1 + 1),
-            Self::Up if tail.1 < anchor.1 - 1 => (anchor.0, anchor.1 - 1),
-            _ => tail,
+fn simulate_rope(input: &str, segments: usize) -> usize {
+    let mut head = (0, 0);
+    let mut tails = vec![(0, 0); segments - 1];
+    let mut tail_trail = HashSet::new();
+    for line in input.lines() {
+        let (dir, amount) = line.split_once(' ').unwrap();
+        let amount = amount.parse::<i32>().unwrap();
+        for _ in 0..amount {
+            head = move_head(dir, head);
+            let mut anchor = head;
+            for tail in &mut tails {
+                *tail = move_tail(anchor, *tail);
+                anchor = *tail;
+            }
+            tail_trail.insert(anchor);
         }
+        // eprint_field(head, &tails, &tail_trail);
     }
+    tail_trail.len()
 }
 
 pub fn solve(input: String) {
-    // +x points right, +y points up
-    let mut head = (0, 0);
-    let mut tail = (0, 0);
-    let mut tail_trail = HashSet::new();
-
-    for line in input.lines() {
-        let (dir, amount) = line.split_once(' ').unwrap();
-        let dir = Direction::from_str(dir).unwrap();
-        let amount = amount.parse::<i32>().unwrap();
-        for _ in 0..amount {
-            head = dir.move_head(head);
-            tail = dir.move_tail(head, tail);
-            tail_trail.insert(tail);
-        }
-    }
-
-    println!("Part 1: {}", tail_trail.len());
+    println!("Part 1: {}", simulate_rope(&input, 2));
+    println!("Part 2: {}", simulate_rope(&input, 10));
+}
+
+fn eprint_field(head: (i32, i32), tails: &[(i32, i32)], trail: &HashSet<(i32, i32)>) {
+    let coords = iter::once((0, 0))
+        .chain(iter::once(head))
+        .chain(tails.iter().cloned())
+        .chain(trail.iter().cloned())
+        .collect::<Vec<_>>();
+    let min_x = *coords.iter().map(|(x, _)| x).min().unwrap();
+    let max_x = *coords.iter().map(|(x, _)| x).max().unwrap();
+    let min_y = *coords.iter().map(|(_, y)| y).min().unwrap();
+    let max_y = *coords.iter().map(|(_, y)| y).max().unwrap();
+    let width = (max_x - min_x + 1) as usize;
+    let height = (max_y - min_y + 1) as usize;
+    let mut field = vec![vec!['.'; width]; height];
+    let set = |field: &mut [Vec<char>], x: i32, y: i32, c: char| {
+        field[(y - min_y) as usize][(x - min_x) as usize] = c;
+    };
+    for (x, y) in trail.iter() {
+        set(&mut field, *x, *y, '#');
+    }
+    for (i, (x, y)) in tails.iter().enumerate().rev() {
+        set(&mut field, *x, *y, (('1' as usize) + i) as u8 as char);
+    }
+    set(&mut field, head.0, head.1, 'H');
+    set(&mut field, 0, 0, 's');
+    for row in field.into_iter().rev() {
+        eprintln!(
+            "{}",
+            row.iter()
+                .map(|c| format!("{c}"))
+                .collect::<Vec<_>>()
+                .join("")
+        );
+    }
+    eprintln!();
 }
diff --git a/sample_inputs/2022/2022_09.input b/sample_inputs/2022/2022_09.01.input
similarity index 100%
rename from sample_inputs/2022/2022_09.input
rename to sample_inputs/2022/2022_09.01.input
diff --git a/sample_inputs/2022/2022_09.01.solution b/sample_inputs/2022/2022_09.01.solution
new file mode 100644
index 0000000..c06aac4
--- /dev/null
+++ b/sample_inputs/2022/2022_09.01.solution
@@ -0,0 +1,2 @@
+Part 1: 13
+Part 2: 1
diff --git a/sample_inputs/2022/2022_09.02.input b/sample_inputs/2022/2022_09.02.input
new file mode 100644
index 0000000..60bd43b
--- /dev/null
+++ b/sample_inputs/2022/2022_09.02.input
@@ -0,0 +1,8 @@
+R 5
+U 8
+L 8
+D 3
+R 17
+D 10
+L 25
+U 20
diff --git a/sample_inputs/2022/2022_09.02.solution b/sample_inputs/2022/2022_09.02.solution
new file mode 100644
index 0000000..de43538
--- /dev/null
+++ b/sample_inputs/2022/2022_09.02.solution
@@ -0,0 +1,2 @@
+Part 1: 88
+Part 2: 36
diff --git a/sample_inputs/2022/2022_09.solution b/sample_inputs/2022/2022_09.solution
deleted file mode 100644
index e16442d..0000000
--- a/sample_inputs/2022/2022_09.solution
+++ /dev/null
@@ -1,2 +0,0 @@
-Part 1: 13
-Part 2: ???