diff --git a/README.md b/README.md
index cefcbdfb..26a477ee 100644
--- a/README.md
+++ b/README.md
@@ -25,4 +25,4 @@ Development occurs in language-specific directories:
 |[Day18.hs](hs/src/Day18.hs)|[Day18.kt](kt/aoc2024-lib/src/commonMain/kotlin/com/github/ephemient/aoc2024/Day18.kt)|[day18.py](py/aoc2024/day18.py)|[day18.rs](rs/src/day18.rs)|
 |[Day19.hs](hs/src/Day19.hs)|[Day19.kt](kt/aoc2024-lib/src/commonMain/kotlin/com/github/ephemient/aoc2024/Day19.kt)|[day19.py](py/aoc2024/day19.py)|[day19.rs](rs/src/day19.rs)|
 |[Day20.hs](hs/src/Day20.hs)|[Day20.kt](kt/aoc2024-lib/src/commonMain/kotlin/com/github/ephemient/aoc2024/Day20.kt)|[day20.py](py/aoc2024/day20.py)|[day20.rs](rs/src/day20.rs)|
-|[Day21.hs](hs/src/Day21.hs)|[Day21.kt](kt/aoc2024-lib/src/jvmCodegen/kotlin/com/github/ephemient/aoc2024/codegen/Day21.kt)|||
+|[Day21.hs](hs/src/Day21.hs)|[Day21.kt](kt/aoc2024-lib/src/jvmCodegen/kotlin/com/github/ephemient/aoc2024/codegen/Day21.kt)|[day21.py](py/aoc2024/day21.py)||
diff --git a/py/aoc2024/day21.py b/py/aoc2024/day21.py
new file mode 100644
index 00000000..7d41901f
--- /dev/null
+++ b/py/aoc2024/day21.py
@@ -0,0 +1,87 @@
+"""
+Day 21: Keyboard Conundrum
+"""
+
+from functools import cache
+
+SAMPLE_INPUT = """
+029A
+980A
+179A
+456A
+379A
+"""
+
+_keys = {
+    "0": (1, 0),
+    "1": (0, 1),
+    "2": (1, 1),
+    "3": (2, 1),
+    "4": (0, 2),
+    "5": (1, 2),
+    "6": (2, 2),
+    "7": (0, 3),
+    "8": (1, 3),
+    "9": (2, 3),
+    "^": (1, 0),
+    "A": (2, 0),
+    "<": (0, -1),
+    "v": (1, -1),
+    ">": (2, -1),
+}
+
+
+@cache
+def _robot_moves(src: tuple[int, int], dst: tuple[int, int], depth: int) -> int:
+    x1, y1 = src
+    x2, y2 = dst
+    if not depth:
+        return abs(x2 - x1) + abs(y2 - y1) + 1
+
+    def inner(this: tuple[int, int], that: tuple[int, int]) -> int:
+        if this == dst:
+            return _robot_moves(that, _keys["A"], depth - 1)
+        x, y = this
+        return min(
+            _robot_moves(that, that2, depth - 1) + inner(this2, that2)
+            for this2, that2 in filter(
+                None,
+                [
+                    ((x + 1, y), _keys[">"]) if x < x2 else None,
+                    ((x - 1, y), _keys["<"]) if x > x2 and (y or x != 1) else None,
+                    ((x, y + 1), _keys["^"]) if y < y2 and (x or y != -1) else None,
+                    ((x, y - 1), _keys["v"]) if y > y2 and (x or y != 1) else None,
+                ],
+            )
+        )
+
+    return inner(src, _keys["A"])
+
+
+def part1(data: str) -> int:
+    """
+    >>> part1(SAMPLE_INPUT)
+    126384
+    """
+    return _solve(data, 2)
+
+
+def part2(data: str) -> int:
+    return _solve(data, 25)
+
+
+def _solve(data: str, depth: int) -> int:
+    total = 0
+    for line in data.splitlines():
+        num, moves, pos = 0, 0, _keys["A"]
+        for char in line:
+            if char.isdigit():
+                num = 10 * num + int(char)
+            pos2 = _keys[char]
+            moves += _robot_moves(pos, pos2, depth)
+            pos = pos2
+        total += num * moves
+    return total
+
+
+parts = (part1, part2)
diff --git a/py/pyproject.toml b/py/pyproject.toml
index 692afa1b..92cb128f 100644
--- a/py/pyproject.toml
+++ b/py/pyproject.toml
@@ -44,6 +44,7 @@ day17 = "aoc2024.day17:parts"
 day18 = "aoc2024.day18:parts"
 day19 = "aoc2024.day19:parts"
 day20 = "aoc2024.day20:parts"
+day21 = "aoc2024.day21:parts"
 
 [build-system]
 requires = ["poetry-core"]