diff --git a/2020/src/bin/day11.rs b/2020/src/bin/day11.rs
index c11c6cc..2105c55 100644
--- a/2020/src/bin/day11.rs
+++ b/2020/src/bin/day11.rs
@@ -69,20 +69,39 @@ fn occupied_neighbors(pos: &Position2D, grid: &Parsed) -> usize {
         .count()
 }
 
-fn make_step(previous: &Parsed) -> (Parsed, bool) {
+const DIRECTIONS: [(i64, i64); 8] = [(0, 1), (1, 0), (1, 1), (0, -1), (-1, 0), (-1, -1), (-1, 1), (1, -1)];
+
+fn neighbors_in_vision(pos: &Position2D, grid: &Parsed) -> usize {
+    DIRECTIONS
+        .iter()
+        .map(|t| Position2D::from(*t))
+        .map(|p| {
+            (1..)
+                .find_map(|n| match grid.get(&(*pos + (p * n))) {
+                    Some(&Tile::Occupied) => Some(true),
+                    Some(&Tile::Floor) => None,
+                    _ => Some(false),
+                })
+                .unwrap()
+        })
+        .filter(|&b| b)
+        .count()
+}
+
+fn make_step<F: Fn(&Position2D, &Parsed) -> usize>(previous: &Parsed, count_neighbors: F, limit: usize) -> (Parsed, bool) {
     let mut grid = previous.to_owned();
     let mut changed = false;
     for (pos, tile) in grid.iter_mut() {
         match tile {
             Tile::Floor => (),
             Tile::Empty => {
-                if occupied_neighbors(&pos, &previous) == 0 {
+                if count_neighbors(&pos, &previous) == 0 {
                     *tile = Tile::Occupied;
                     changed = true;
                 }
             }
             Tile::Occupied => {
-                if occupied_neighbors(&pos, &previous) >= 4 {
+                if count_neighbors(&pos, &previous) >= limit {
                     *tile = Tile::Empty;
                     changed = true;
                 }
@@ -92,29 +111,30 @@ fn make_step(previous: &Parsed) -> (Parsed, bool) {
     (grid, changed)
 }
 
-fn part1(parsed: &Parsed) -> usize {
+fn move_until_equilibrium<F: Fn(&Position2D, &Parsed) -> usize>(parsed: &Parsed, count_neighbors: F, limit: usize) -> usize {
     let mut p = parsed.to_owned();
     loop {
-        let (parsed, changed) = make_step(&p);
+        let (parsed, changed) = make_step(&p, &count_neighbors, limit);
         if !changed {
             break;
         }
-        // println!("{}", draw_ascii(&parsed));
         p = parsed;
     }
     p.iter().filter(|(_, t)| t == &&Tile::Occupied).count()
 }
 
-const DIRECTIONS: [(i64, i64); 8] = [(0, 1), (1, 0), (1, 1), (0, -1), (-1, 0), (-1, -1), (-1, 1), (1, -1)];
+fn part1(parsed: &Parsed) -> usize {
+    move_until_equilibrium(parsed, occupied_neighbors, 4)
+}
 
 fn part2(parsed: &Parsed) -> usize {
-    unimplemented!()
+    move_until_equilibrium(parsed, neighbors_in_vision, 5)
 }
 
 fn main() {
     let input = parse_input(&read_input());
     println!("Part 1: {}", part1(&input));
-    // println!("Part 2: {}", part2(&input));
+    println!("Part 2: {}", part2(&input));
 }
 
 #[cfg(test)]
@@ -160,18 +180,69 @@ L.L.L..L..
     #[test]
     fn step_test() {
         let input = parse_input(TEST_INPUT);
-        let (first_step, changed) = make_step(&input);
+        let (first_step, changed) = make_step(&input, occupied_neighbors, 4);
         let after_first = parse_input(AFTER_1_STEP);
-        assert_eq!(draw_ascii(&first_step, Tile::Floor), draw_ascii(&after_first, Tile::Floor));
+
+        assert_eq!(draw_ascii(&first_step), draw_ascii(&after_first));
         assert_eq!((&first_step, changed), (&after_first, true));
-        let (second_step, changed) = make_step(&first_step);
+        let (second_step, changed) = make_step(&first_step, occupied_neighbors, 4);
         let after_second = parse_input(AFTER_2_STEPS);
         assert_eq!((second_step, changed), (after_second, true));
     }
 
+    const P2_AFTER_1: &str = "#.##.##.##
+#######.##
+#.#.#..#..
+####.##.##
+#.##.##.##
+#.#####.##
+..#.#.....
+##########
+#.######.#
+#.#####.##";
+    const P2_AFTER_2: &str = "#.LL.LL.L#
+#LLLLLL.LL
+L.L.L..L..
+LLLL.LL.LL
+L.LL.LL.LL
+L.LLLLL.LL
+..L.L.....
+LLLLLLLLL#
+#.LLLLLL.L
+#.LLLLL.L#";
+    const P2_AFTER_3: &str = "#.L#.##.L#
+#L#####.LL
+L.#.#..#..
+##L#.##.##
+#.##.#L.##
+#.#####.#L
+..#.#.....
+LLL####LL#
+#.L#####.L
+#.L####.L#";
+
+    #[test]
+    fn step_test_part2() {
+        let input = parse_input(TEST_INPUT);
+        let (step_1, changed) = make_step(&input, neighbors_in_vision, 5);
+        let after_1 = parse_input(P2_AFTER_1);
+        assert_eq!(draw_ascii(&step_1), draw_ascii(&after_1));
+        assert_eq!((&step_1, changed), (&after_1, true));
+
+        let (step_2, changed) = make_step(&step_1, neighbors_in_vision, 5);
+        let after_2 = parse_input(P2_AFTER_2);
+        assert_eq!(draw_ascii(&step_2), draw_ascii(&after_2));
+        assert_eq!((&step_2, changed), (&after_2, true));
+
+        let (step_3, changed) = make_step(&step_2, neighbors_in_vision, 5);
+        let after_3 = parse_input(P2_AFTER_3);
+        assert_eq!(draw_ascii(&step_3), draw_ascii(&after_3));
+        assert_eq!((&step_3, changed), (&after_3, true));
+    }
+
     test!(part1() == 37);
-    //test!(part2() == 0);
-    //bench!(part1() == 0);
-    //bench!(part2() == 0);
-    //bench_input!(len == 0);
+    test!(part2() == 26);
+    bench!(part1() == 2164);
+    bench!(part2() == 1974);
+    bench_input!(len == 8372);
 }
diff --git a/2020/src/grid.rs b/2020/src/grid.rs
index a0d2e68..4bbc32a 100644
--- a/2020/src/grid.rs
+++ b/2020/src/grid.rs
@@ -116,6 +116,8 @@ impl_op!(+ |a: Position2D, b: Direction| -> Position2D { a + match b {
         }
 });
 
+impl_op!(*|a: Position2D, b: i64| -> Position2D { Position2D { x: a.x * b, y: a.y * b } });
+
 impl AddAssign<i8> for Direction {
     fn add_assign(&mut self, rhs: i8) {
         *self = *self + rhs;