diff --git a/2017/06/6.md b/2017/06/6.md
new file mode 100644
index 0000000..4ec831c
--- /dev/null
+++ b/2017/06/6.md
@@ -0,0 +1,76 @@
+## \-\-- Day 6: Memory Reallocation \-\--
+
+A debugger program here is having an issue: it is trying to repair a
+memory reallocation routine, but it keeps getting stuck in an infinite
+loop.
+
+In this area, there are [sixteen memory
+banks]{title="There are also five currency banks, two river banks, three airplanes banking, a banked billards shot, and a left bank."};
+each memory bank can hold any number of *blocks*. The goal of the
+reallocation routine is to balance the blocks between the memory banks.
+
+The reallocation routine operates in cycles. In each cycle, it finds the
+memory bank with the most blocks (ties won by the lowest-numbered memory
+bank) and redistributes those blocks among the banks. To do this, it
+removes all of the blocks from the selected bank, then moves to the next
+(by index) memory bank and inserts one of the blocks. It continues doing
+this until it runs out of blocks; if it reaches the last memory bank, it
+wraps around to the first one.
+
+The debugger would like to know how many redistributions can be done
+before a blocks-in-banks configuration is produced that *has been seen
+before*.
+
+For example, imagine a scenario with only four memory banks:
+
+-   The banks start with `0`, `2`, `7`, and `0` blocks. The third bank
+    has the most blocks, so it is chosen for redistribution.
+-   Starting with the next bank (the fourth bank) and then continuing to
+    the first bank, the second bank, and so on, the `7` blocks are
+    spread out over the memory banks. The fourth, first, and second
+    banks get two blocks each, and the third bank gets one back. The
+    final result looks like this: `2 4 1 2`.
+-   Next, the second bank is chosen because it contains the most blocks
+    (four). Because there are four memory banks, each gets one block.
+    The result is: `3 1 2 3`.
+-   Now, there is a tie between the first and fourth memory banks, both
+    of which have three blocks. The first bank wins the tie, and its
+    three blocks are distributed evenly over the other three banks,
+    leaving it with none: `0 2 3 4`.
+-   The fourth bank is chosen, and its four blocks are distributed such
+    that each of the four banks receives one: `1 3 4 1`.
+-   The third bank is chosen, and the same thing happens: `2 4 1 2`.
+
+At this point, we\'ve reached a state we\'ve seen before: `2 4 1 2` was
+already seen. The infinite loop is detected after the fifth block
+redistribution cycle, and so the answer in this example is `5`.
+
+Given the initial block counts in your puzzle input, *how many
+redistribution cycles* must be completed before a configuration is
+produced that has been seen before?
+
+Your puzzle answer was `14029`.
+
+## \-\-- Part Two \-\-- {#part2}
+
+Out of curiosity, the debugger would also like to know the size of the
+loop: starting from a state that has already been seen, how many block
+redistribution cycles must be performed before that same state is seen
+again?
+
+In the example above, `2 4 1 2` is seen again after four cycles, and so
+the answer in that example would be `4`.
+
+*How many cycles* are in the infinite loop that arises from the
+configuration in your puzzle input?
+
+Your puzzle answer was `2765`.
+
+Both parts of this puzzle are complete! They provide two gold stars:
+\*\*
+
+At this point, you should [return to your Advent calendar](/2017) and
+try another puzzle.
+
+If you still want to see it, you can [get your puzzle
+input](6/input).
diff --git a/2017/06/solution.py b/2017/06/solution.py
new file mode 100644
index 0000000..163b01f
--- /dev/null
+++ b/2017/06/solution.py
@@ -0,0 +1,61 @@
+#!/bin/python3
+import sys
+from pprint import pprint
+
+input_f = sys.argv[1]
+
+#########################################
+#                                       #
+#              Part 1                   #
+#                                       #
+#########################################
+line = []
+
+tests = []
+
+with open(input_f) as file:
+    for line in file:
+        line = line.rstrip().split()
+        line = list(map(int, line))
+
+tests = []
+steps = 0
+tests.append(''.join(map(str,line)))
+stop = False
+while stop != True: #line not in tests:
+    steps+=1
+
+    idmx,mx = max(enumerate(line),key=lambda x: x[1])
+    tmp = idmx
+    #print(line)
+    #print(tests)
+    #print('Max [',idmx,'] =',mx)
+    while True:
+        #print(line)
+        #print('Min:',min(line))
+        #print(line[idmx])
+        #print('mx:',mx)
+        idmx = (idmx + 1) % len(line)
+        line[idmx] += 1
+        line[tmp] -= 1
+        #print(mx,min(line))
+        if mx == 1:
+            #print('APPENDING')
+            if ''.join(map(str,line)) in tests:
+                found_at = tests.index(''.join(map(str,line)))
+                #print(''.join(map(str,line)),tests)
+                stop = True 
+            tests.append(''.join(map(str,line)))
+            break
+        mx -= 1
+        #input()
+    #input()
+#print(tests)
+#print(line)
+print(steps-found_at)
+print(steps)
+#########################################
+#                                       #
+#              Part 2                   #
+#                                       #
+#########################################
diff --git a/2017/06/test2 b/2017/06/test2
new file mode 100644
index 0000000..fd81a1c
--- /dev/null
+++ b/2017/06/test2
@@ -0,0 +1 @@
+0 2 7 0