diff --git a/2024/15/15-1.py b/2024/15/15-1.py
new file mode 100644
index 0000000..074e90a
--- /dev/null
+++ b/2024/15/15-1.py
@@ -0,0 +1,92 @@
+import functools
+
+map = {}
+moves = []
+currentPosition = startPosition = (-1, -1)
+width = height = 0
+total = 0
+
+def calcGpsCoords():
+    global total
+
+    for i in range(height):
+        for j in range(width):
+            if map[i,j] == 'O':
+                total += i * 100 + j
+
+def printMap():
+    output = ""
+    for i in range(height):
+        line = ""
+        for j in range(width):
+            line += map[i,j]
+        output += line + "\n"
+    print(output)
+
+@functools.cache
+def getDirectionCoords(direction):
+    match direction:
+        case '^':
+            return 0, -1
+        case 'v':
+            return 0, 1
+        case '<':
+            return -1, 0
+        case '>':
+            return 1, 0
+        case _:
+            raise Exception("bruh")
+
+def tryMoveInDirection(startX, startY, direction):
+    global currentPosition
+    # see if there's something in front, try move that (recursively)
+    # if there's a wall in front, return False
+    # move up if all clear, return True
+
+    char = map[startY, startX]
+
+    dirX, dirY = getDirectionCoords(direction)
+    nextX, nextY = startX + dirX, startY + dirY
+    nextSpot = map[nextY, nextX]
+    if nextSpot == '#':
+        return False
+
+    if nextSpot == 'O':
+        # it's a box, try move it and all subsequent boxes
+        if not tryMoveInDirection(nextX, nextY, direction):
+            return False
+        
+    # the robot and box(es) could move without hitting a wall
+    map[nextY, nextX] = char
+    map[startY, startX] = '.'
+    currentPosition = (nextX, nextY)
+    return True
+
+
+
+with open("2024/15/input.txt") as f: 
+    writingMap = True
+    for i, line in enumerate(f):
+        line = line.strip()
+        if i == 0:
+            width = height = int(len(line))
+
+        if len(line) == 0:
+            writingMap = False
+        length = len(line)
+        for j, char in enumerate(line):
+            if writingMap:
+                if char == "@":
+                    currentPosition = startPosition = (j, i)
+                map[i,j] = char
+            else:
+                moves.append(char)
+
+    printMap()
+
+    for direction in moves:
+        tryMoveInDirection(currentPosition[0], currentPosition[1], direction)
+
+    printMap()
+    calcGpsCoords()
+    print(total)
\ No newline at end of file
diff --git a/2024/15/testinput.txt b/2024/15/testinput.txt
new file mode 100644
index 0000000..b2bce78
--- /dev/null
+++ b/2024/15/testinput.txt
@@ -0,0 +1,21 @@
+##########
+#..O..O.O#
+#......O.#
+#.OO..O.O#
+#..O@..O.#
+#O#..O...#
+#O..O..O.#
+#.OO.O.OO#
+#....O...#
+##########
+
+<vv>^<v^>v>^vv^v>v<>v^v<v<^vv<<<^><<><>>v<vvv<>^v^>^<<<><<v<<<v^vv^v>^
+vvv<<^>^v^^><<>>><>^<<><^vv^^<>vvv<>><^^v>^>vv<>v<<<<v<^v>^<^^>>>^<v<v
+><>vv>v^v^<>><>>>><^^>vv>v<^^^>>v^v^<^^>v^^>v^<^v>v<>>v^v^<v>v^^<^^vv<
+<<v<^>>^^^^>>>v^<>vvv^><v<<<>^^^vv^<vvv>^>v<^^^^v<>^>vvvv><>>v^<<^^^^^
+^><^><>>><>^^<<^^v>>><^<v>^<vv>>v>>>^v><>^v><<<<v>>v<v<v>vvv>^<><<>^><
+^>><>^v<><^vvv<^^<><v<<<<<><^v<<<><<<^^<v<^^^><^>>^<v^><<<^>>^v<v^v<v^
+>^>>^v>vv>^<<^v<>><<><<v<<v><>v<^vv<<<>^^v^>^^>>><<^v>>v^v><^^>>^<>vv^
+<><^^>^^^<><vvvvv^v<v<<>^v<v>v<<^><<><<><<<^^<<<^<<>><<><^^^>^^<>^>v<>
+^^>vv<^v^v<vv>^<><v<^v>^^^>>>^^vvv^>vvv<>>>^<^>>>>>^<<^v>^vvv<>^<><<v>
+v^^>>><<^^<>>^v^<v^vv<>v^<<>^<^v^v><^<<<><<^<v><v<>vv>>v><v^<vv<>v^<<^
\ No newline at end of file
diff --git a/2024/15/testinputsmall.txt b/2024/15/testinputsmall.txt
new file mode 100644
index 0000000..c6138ff
--- /dev/null
+++ b/2024/15/testinputsmall.txt
@@ -0,0 +1,10 @@
+########
+#..O.O.#
+##@.O..#
+#...O..#
+#.#.O..#
+#...O..#
+#......#
+########
+
+<^^>>>vv<v>>v<<
\ No newline at end of file