diff --git a/day04/part1.min.py b/day04/part1.min.py
index 65fa374..de9bc28 100644
--- a/day04/part1.min.py
+++ b/day04/part1.min.py
@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-print(sum(b>=x<=a<=y>=b or y>=a<=x<=b>=y for a,b,x,y in(map(int,l.strip().replace(',', '-').split('-'))for l in open("input.txt"))))
+print(sum(b>=x<=a<=y>=b or y>=a<=x<=b>=y for a,b,x,y in(map(int,l.strip().replace(',','-').split('-'))for l in open("input.txt"))))
diff --git a/day04/part2.min.py b/day04/part2.min.py
index 3bb4900..a50830b 100644
--- a/day04/part2.min.py
+++ b/day04/part2.min.py
@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-print(sum(x<=a<=y or x<=b<=y or a<=x<= b or a<=y<=b for a,b,x,y in(map(int,l.strip().replace(',', '-').split('-'))for l in open("input.txt"))))
+print(sum(not(b<x or a>y)for a,b,x,y in(map(int,l.strip().replace(',','-').split('-'))for l in open("input.txt"))))
diff --git a/day05/input.txt b/day05/input.txt
new file mode 100644
index 0000000..6fdd232
--- /dev/null
+++ b/day05/input.txt
@@ -0,0 +1,513 @@
+        [H]         [S]         [D]
+    [S] [C]         [C]     [Q] [L]
+    [C] [R] [Z]     [R]     [H] [Z]
+    [G] [N] [H] [S] [B]     [R] [F]
+[D] [T] [Q] [F] [Q] [Z]     [Z] [N]
+[Z] [W] [F] [N] [F] [W] [J] [V] [G]
+[T] [R] [B] [C] [L] [P] [F] [L] [H]
+[H] [Q] [P] [L] [G] [V] [Z] [D] [B]
+ 1   2   3   4   5   6   7   8   9
+
+move 2 from 7 to 2
+move 1 from 4 to 8
+move 2 from 1 to 9
+move 4 from 6 to 5
+move 1 from 7 to 6
+move 2 from 1 to 4
+move 7 from 8 to 9
+move 7 from 4 to 5
+move 4 from 2 to 4
+move 1 from 5 to 9
+move 14 from 5 to 4
+move 1 from 3 to 8
+move 5 from 4 to 8
+move 1 from 2 to 5
+move 2 from 4 to 1
+move 6 from 8 to 1
+move 1 from 8 to 6
+move 1 from 2 to 5
+move 5 from 3 to 7
+move 2 from 6 to 3
+move 2 from 4 to 7
+move 3 from 3 to 9
+move 7 from 4 to 1
+move 1 from 6 to 9
+move 2 from 6 to 1
+move 3 from 5 to 2
+move 1 from 1 to 8
+move 21 from 9 to 1
+move 1 from 4 to 2
+move 7 from 7 to 2
+move 1 from 4 to 2
+move 23 from 1 to 5
+move 5 from 5 to 1
+move 1 from 3 to 6
+move 1 from 6 to 3
+move 12 from 1 to 6
+move 1 from 3 to 6
+move 2 from 1 to 8
+move 1 from 9 to 3
+move 2 from 8 to 1
+move 2 from 1 to 8
+move 1 from 1 to 3
+move 2 from 3 to 1
+move 2 from 8 to 1
+move 3 from 6 to 1
+move 1 from 8 to 7
+move 4 from 6 to 2
+move 3 from 6 to 9
+move 2 from 5 to 7
+move 2 from 7 to 8
+move 1 from 7 to 9
+move 9 from 1 to 5
+move 12 from 5 to 9
+move 1 from 8 to 6
+move 1 from 6 to 9
+move 1 from 6 to 9
+move 7 from 9 to 4
+move 10 from 2 to 1
+move 12 from 5 to 4
+move 7 from 4 to 9
+move 7 from 4 to 7
+move 1 from 5 to 4
+move 7 from 7 to 8
+move 1 from 6 to 3
+move 1 from 3 to 1
+move 3 from 2 to 4
+move 1 from 6 to 8
+move 7 from 1 to 2
+move 1 from 6 to 7
+move 12 from 9 to 4
+move 3 from 8 to 5
+move 1 from 7 to 3
+move 6 from 9 to 1
+move 10 from 1 to 9
+move 7 from 9 to 5
+move 3 from 9 to 5
+move 1 from 3 to 4
+move 2 from 2 to 1
+move 1 from 5 to 1
+move 9 from 4 to 3
+move 1 from 1 to 3
+move 8 from 4 to 7
+move 7 from 5 to 3
+move 2 from 7 to 2
+move 8 from 3 to 9
+move 1 from 1 to 8
+move 10 from 2 to 3
+move 4 from 8 to 7
+move 12 from 3 to 4
+move 9 from 7 to 2
+move 2 from 1 to 3
+move 1 from 9 to 6
+move 2 from 4 to 9
+move 1 from 7 to 6
+move 5 from 5 to 9
+move 8 from 3 to 1
+move 2 from 6 to 3
+move 14 from 4 to 3
+move 15 from 3 to 9
+move 1 from 3 to 1
+move 3 from 9 to 8
+move 1 from 8 to 1
+move 1 from 3 to 2
+move 5 from 2 to 8
+move 1 from 4 to 2
+move 2 from 1 to 3
+move 2 from 3 to 9
+move 3 from 2 to 4
+move 6 from 1 to 8
+move 2 from 2 to 6
+move 1 from 6 to 4
+move 2 from 4 to 7
+move 5 from 8 to 5
+move 1 from 6 to 9
+move 7 from 9 to 6
+move 1 from 5 to 3
+move 2 from 7 to 8
+move 2 from 2 to 4
+move 3 from 5 to 6
+move 1 from 3 to 8
+move 1 from 5 to 6
+move 2 from 4 to 1
+move 3 from 1 to 6
+move 21 from 9 to 5
+move 1 from 4 to 3
+move 1 from 4 to 9
+move 2 from 9 to 2
+move 1 from 3 to 9
+move 4 from 2 to 3
+move 3 from 8 to 1
+move 14 from 5 to 9
+move 7 from 5 to 4
+move 3 from 8 to 4
+move 4 from 3 to 2
+move 3 from 8 to 5
+move 1 from 2 to 3
+move 1 from 5 to 1
+move 2 from 5 to 4
+move 3 from 2 to 9
+move 11 from 4 to 1
+move 17 from 9 to 2
+move 17 from 2 to 9
+move 10 from 9 to 2
+move 2 from 8 to 2
+move 3 from 8 to 3
+move 8 from 9 to 7
+move 4 from 7 to 3
+move 2 from 3 to 2
+move 3 from 2 to 3
+move 9 from 3 to 5
+move 1 from 1 to 9
+move 8 from 5 to 1
+move 2 from 7 to 9
+move 24 from 1 to 3
+move 24 from 3 to 6
+move 1 from 5 to 3
+move 10 from 2 to 1
+move 1 from 4 to 5
+move 3 from 9 to 1
+move 1 from 3 to 5
+move 17 from 6 to 5
+move 1 from 7 to 4
+move 13 from 5 to 4
+move 3 from 5 to 8
+move 1 from 7 to 9
+move 3 from 6 to 9
+move 8 from 6 to 4
+move 1 from 9 to 6
+move 11 from 1 to 8
+move 1 from 5 to 6
+move 12 from 4 to 9
+move 2 from 5 to 1
+move 1 from 1 to 7
+move 5 from 9 to 2
+move 1 from 7 to 9
+move 3 from 1 to 5
+move 3 from 5 to 9
+move 7 from 9 to 3
+move 4 from 9 to 6
+move 3 from 6 to 8
+move 5 from 4 to 3
+move 2 from 2 to 6
+move 3 from 9 to 3
+move 3 from 6 to 4
+move 4 from 2 to 6
+move 11 from 3 to 5
+move 11 from 6 to 9
+move 2 from 3 to 5
+move 1 from 5 to 8
+move 3 from 6 to 2
+move 7 from 9 to 2
+move 8 from 5 to 7
+move 6 from 4 to 5
+move 2 from 4 to 3
+move 1 from 8 to 6
+move 4 from 8 to 3
+move 13 from 8 to 3
+move 1 from 9 to 5
+move 6 from 7 to 2
+move 1 from 7 to 6
+move 1 from 6 to 5
+move 2 from 6 to 7
+move 13 from 3 to 5
+move 6 from 2 to 7
+move 1 from 6 to 1
+move 1 from 2 to 8
+move 2 from 7 to 8
+move 14 from 5 to 8
+move 1 from 1 to 4
+move 9 from 2 to 1
+move 14 from 8 to 7
+move 3 from 3 to 9
+move 11 from 5 to 3
+move 1 from 4 to 5
+move 4 from 9 to 8
+move 4 from 8 to 7
+move 5 from 3 to 9
+move 11 from 7 to 8
+move 9 from 1 to 3
+move 4 from 3 to 2
+move 6 from 8 to 4
+move 2 from 8 to 2
+move 13 from 3 to 6
+move 1 from 4 to 1
+move 5 from 4 to 2
+move 10 from 2 to 6
+move 4 from 9 to 1
+move 8 from 7 to 8
+move 10 from 8 to 5
+move 2 from 3 to 2
+move 2 from 8 to 6
+move 1 from 7 to 1
+move 2 from 7 to 6
+move 2 from 2 to 9
+move 2 from 8 to 6
+move 6 from 1 to 7
+move 5 from 9 to 1
+move 4 from 7 to 8
+move 1 from 7 to 2
+move 2 from 1 to 7
+move 1 from 3 to 8
+move 1 from 1 to 6
+move 2 from 2 to 6
+move 1 from 7 to 8
+move 1 from 1 to 9
+move 8 from 5 to 7
+move 2 from 7 to 9
+move 9 from 6 to 3
+move 13 from 6 to 8
+move 3 from 9 to 1
+move 5 from 6 to 1
+move 3 from 8 to 1
+move 3 from 3 to 4
+move 1 from 4 to 3
+move 1 from 4 to 8
+move 4 from 6 to 3
+move 11 from 8 to 2
+move 1 from 6 to 9
+move 8 from 3 to 9
+move 3 from 5 to 8
+move 4 from 1 to 2
+move 6 from 8 to 5
+move 6 from 5 to 1
+move 5 from 1 to 3
+move 3 from 3 to 4
+move 3 from 8 to 4
+move 2 from 4 to 5
+move 10 from 7 to 8
+move 5 from 9 to 2
+move 1 from 7 to 5
+move 3 from 5 to 2
+move 4 from 9 to 3
+move 4 from 1 to 5
+move 1 from 3 to 2
+move 3 from 5 to 2
+move 6 from 2 to 5
+move 10 from 8 to 3
+move 4 from 4 to 5
+move 4 from 2 to 8
+move 12 from 3 to 8
+move 1 from 1 to 3
+move 9 from 8 to 6
+move 1 from 4 to 1
+move 6 from 8 to 7
+move 3 from 1 to 7
+move 9 from 5 to 7
+move 11 from 7 to 2
+move 2 from 7 to 3
+move 9 from 2 to 7
+move 1 from 8 to 7
+move 1 from 5 to 2
+move 2 from 6 to 2
+move 2 from 1 to 2
+move 6 from 3 to 5
+move 2 from 3 to 6
+move 4 from 7 to 3
+move 3 from 3 to 1
+move 2 from 1 to 5
+move 7 from 7 to 6
+move 1 from 1 to 5
+move 3 from 2 to 4
+move 1 from 3 to 2
+move 18 from 2 to 1
+move 4 from 2 to 7
+move 6 from 5 to 9
+move 1 from 4 to 8
+move 2 from 6 to 1
+move 19 from 1 to 2
+move 4 from 9 to 5
+move 5 from 7 to 2
+move 1 from 8 to 7
+move 1 from 1 to 2
+move 6 from 5 to 7
+move 1 from 3 to 8
+move 6 from 7 to 6
+move 1 from 4 to 1
+move 4 from 7 to 9
+move 1 from 1 to 3
+move 1 from 2 to 5
+move 1 from 4 to 8
+move 1 from 3 to 4
+move 3 from 5 to 4
+move 2 from 8 to 9
+move 9 from 2 to 4
+move 19 from 6 to 4
+move 1 from 4 to 7
+move 5 from 9 to 5
+move 10 from 2 to 9
+move 2 from 5 to 4
+move 14 from 4 to 7
+move 2 from 2 to 1
+move 3 from 9 to 1
+move 1 from 1 to 3
+move 13 from 7 to 6
+move 1 from 5 to 9
+move 1 from 6 to 9
+move 1 from 7 to 2
+move 5 from 9 to 7
+move 1 from 5 to 2
+move 3 from 7 to 3
+move 3 from 4 to 9
+move 1 from 5 to 2
+move 4 from 4 to 2
+move 2 from 7 to 3
+move 4 from 1 to 6
+move 1 from 7 to 9
+move 11 from 9 to 5
+move 8 from 2 to 9
+move 6 from 9 to 6
+move 8 from 4 to 5
+move 14 from 5 to 6
+move 1 from 5 to 4
+move 3 from 5 to 1
+move 1 from 5 to 2
+move 2 from 6 to 4
+move 2 from 4 to 2
+move 1 from 9 to 2
+move 1 from 2 to 3
+move 1 from 9 to 3
+move 3 from 2 to 7
+move 7 from 6 to 7
+move 5 from 4 to 3
+move 23 from 6 to 1
+move 5 from 7 to 2
+move 22 from 1 to 6
+move 6 from 6 to 3
+move 6 from 2 to 4
+move 6 from 4 to 1
+move 3 from 7 to 8
+move 3 from 1 to 8
+move 4 from 3 to 2
+move 1 from 1 to 3
+move 3 from 3 to 1
+move 1 from 7 to 5
+move 1 from 6 to 5
+move 1 from 7 to 4
+move 4 from 6 to 9
+move 5 from 3 to 6
+move 2 from 2 to 1
+move 3 from 9 to 4
+move 11 from 1 to 9
+move 2 from 4 to 7
+move 4 from 6 to 1
+move 1 from 5 to 4
+move 5 from 8 to 9
+move 1 from 7 to 1
+move 3 from 2 to 7
+move 4 from 1 to 2
+move 3 from 4 to 2
+move 1 from 8 to 5
+move 1 from 5 to 4
+move 1 from 5 to 4
+move 5 from 6 to 1
+move 3 from 7 to 6
+move 5 from 2 to 8
+move 15 from 9 to 2
+move 1 from 3 to 9
+move 10 from 6 to 8
+move 1 from 4 to 9
+move 1 from 8 to 3
+move 1 from 4 to 6
+move 4 from 6 to 3
+move 2 from 9 to 7
+move 1 from 7 to 6
+move 1 from 1 to 6
+move 3 from 3 to 8
+move 2 from 7 to 8
+move 3 from 8 to 4
+move 12 from 2 to 9
+move 14 from 9 to 5
+move 12 from 8 to 2
+move 1 from 6 to 7
+move 8 from 3 to 1
+move 2 from 4 to 6
+move 1 from 3 to 6
+move 5 from 6 to 1
+move 17 from 1 to 2
+move 29 from 2 to 1
+move 1 from 8 to 5
+move 1 from 4 to 3
+move 1 from 8 to 5
+move 1 from 8 to 7
+move 5 from 2 to 1
+move 1 from 3 to 5
+move 1 from 6 to 4
+move 6 from 5 to 8
+move 1 from 4 to 9
+move 1 from 7 to 2
+move 1 from 2 to 6
+move 7 from 8 to 7
+move 1 from 6 to 9
+move 2 from 9 to 2
+move 2 from 2 to 8
+move 15 from 1 to 2
+move 2 from 8 to 3
+move 9 from 1 to 2
+move 24 from 2 to 7
+move 11 from 1 to 2
+move 1 from 3 to 1
+move 22 from 7 to 6
+move 6 from 5 to 2
+move 2 from 6 to 5
+move 1 from 1 to 9
+move 1 from 9 to 6
+move 6 from 5 to 1
+move 12 from 6 to 2
+move 3 from 1 to 5
+move 1 from 3 to 2
+move 25 from 2 to 6
+move 4 from 7 to 5
+move 8 from 5 to 4
+move 4 from 4 to 8
+move 1 from 1 to 8
+move 5 from 8 to 4
+move 4 from 4 to 1
+move 2 from 1 to 9
+move 20 from 6 to 8
+move 4 from 2 to 6
+move 19 from 8 to 7
+move 2 from 9 to 3
+move 1 from 8 to 2
+move 11 from 6 to 7
+move 3 from 1 to 2
+move 5 from 4 to 3
+move 1 from 1 to 3
+move 1 from 3 to 5
+move 2 from 2 to 8
+move 33 from 7 to 3
+move 1 from 5 to 3
+move 1 from 8 to 7
+move 1 from 7 to 4
+move 5 from 6 to 8
+move 2 from 7 to 6
+move 2 from 2 to 3
+move 1 from 2 to 5
+move 1 from 7 to 9
+move 1 from 5 to 7
+move 1 from 8 to 2
+move 1 from 4 to 3
+move 43 from 3 to 7
+move 1 from 3 to 8
+move 1 from 6 to 8
+move 8 from 7 to 5
+move 3 from 5 to 3
+move 1 from 6 to 4
+move 2 from 6 to 7
+move 4 from 8 to 7
+move 3 from 3 to 2
+move 1 from 9 to 6
+move 3 from 8 to 3
+move 1 from 6 to 7
+move 1 from 4 to 6
+move 1 from 3 to 7
+move 1 from 3 to 2
+move 5 from 2 to 5
+move 1 from 6 to 1
+move 1 from 3 to 2
+move 42 from 7 to 5
+move 44 from 5 to 4
+move 2 from 5 to 8
+move 1 from 7 to 3
+move 16 from 4 to 6
+move 3 from 5 to 9
diff --git a/day05/part1.min.py b/day05/part1.min.py
new file mode 100644
index 0000000..d3030d3
--- /dev/null
+++ b/day05/part1.min.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python3
+import re, itertools
+
+lines = (x for x in open("input.txt"))
+m=[[e for e in line if e!=' ']for line in zip(*([*line[1::4]]for line in itertools.takewhile(lambda x:'['in x,lines)))]
+next(lines)
+for line in lines:
+    a,s,t=map(int,re.search(r"(\d+).+(\d+).+(\d+)",line).groups())
+    m[t-1],m[s-1]=m[s-1][:a][::-1]+m[t-1],m[s-1][a:]
+
+print(''.join(i[0] for i in m))
diff --git a/day05/part1.py b/day05/part1.py
new file mode 100644
index 0000000..9d18025
--- /dev/null
+++ b/day05/part1.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+import re
+
+NUM = 9
+
+lines = (x for x in open("input.txt"))
+stacks = [[] for _ in range(NUM)]
+
+for line in lines:
+    if '[' not in line:
+        break
+    for i, v in enumerate(line[1::4]):
+        if v != ' ':
+            stacks[i].append(v)
+
+next(lines)
+for line in lines:
+    a, s, t = map(int, re.search(r"move (\d+) from (\d+) to (\d+)", line).groups())
+    stacks[t-1] = stacks[s-1][:a][::-1]+stacks[t-1]
+    stacks[s-1] = stacks[s-1][a:]
+
+print(''.join(i[0] for i in stacks))
diff --git a/day05/part2.py b/day05/part2.py
new file mode 100644
index 0000000..9d18025
--- /dev/null
+++ b/day05/part2.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python3
+import re
+
+NUM = 9
+
+lines = (x for x in open("input.txt"))
+stacks = [[] for _ in range(NUM)]
+
+for line in lines:
+    if '[' not in line:
+        break
+    for i, v in enumerate(line[1::4]):
+        if v != ' ':
+            stacks[i].append(v)
+
+next(lines)
+for line in lines:
+    a, s, t = map(int, re.search(r"move (\d+) from (\d+) to (\d+)", line).groups())
+    stacks[t-1] = stacks[s-1][:a][::-1]+stacks[t-1]
+    stacks[s-1] = stacks[s-1][a:]
+
+print(''.join(i[0] for i in stacks))