diff --git a/2016/day01.rkt b/2016/day01.rkt
index 1c16f80..fcae573 100644
--- a/2016/day01.rkt
+++ b/2016/day01.rkt
@@ -1,9 +1,8 @@
 #lang br/quicklang
-(require racket/file)
 (module+ reader
   (provide read-syntax)
   (define (read-syntax path port)
-    (define turn-strings (string-split (port->string port) ", "))
+    (define turn-strings (string-split (port->string port) ","))
     (define turn-pattern #px"^([LR])(\\d+)$")
     (define turn-datums
       (for*/list ([tstr (in-list turn-strings)])
@@ -21,48 +20,36 @@
 (define (loc-dist loc)
   (+ (abs (imag-part loc)) (abs (real-part loc))))
 
-(define (locs-between loca locb)
-  (define real-steps (abs (- (real-part loca) (real-part locb))))
-  (define imag-steps (abs (- (imag-part loca) (imag-part locb))))
-  (define diff (- locb loca))
-  (let loop ([locs (list loca)])
-    (if (equal? (car locs) locb)
-        (reverse locs)
-        (cons (+ (real-part loca)
-                 (* +i (imag-part loca))) locs))))
-
-(module+ test
-  (require rackunit)
-  (check-equal? (locs-between 0 3) '(0 1 2 3))
-  (check-equal? (locs-between 3 0) (reverse (locs-between 0 3)))
-  (check-equal? (locs-between +0i +3i) '(+0i +1i +2i +3i))
-  (check-equal? (locs-between +3i +0i) (reverse (locs-between +0i +3i))))
+(struct $turn (rot dist) #:transparent)
+(define rotate-left +i)
+(define rotate-right -i)
+(define same-dir 1)
 
 (define (solve . turns)
-  (define first-loc-visited-twice #f)
+  (define found-twice-visited-loc #f)
   (define north 0+1i)
-  (let loop ([locs (list 0+0i)] [dir north] [turns turns])
-    (if (empty? turns)
-        (displayln (format "part 1 (dist of final location): ~a" (loc-dist (car locs))))
-        (let* ([turn (car turns)]
-               [rotation (car turn)]
-               [new-dir (* dir rotation)]
-               [dist (cdr turn)]
-               [loc (car locs)]
-               [new-loc (+ loc (* new-dir dist))])
-          
-          (when (and
-                 (not first-loc-visited-twice)
-                 (report* locs loc new-loc (member new-loc locs)))
-            (set! first-loc-visited-twice new-loc)
-            (displayln (format "part 2 (dist of first twice-visited location): ~a" (loc-dist new-loc))))        
-          (loop (report (append (locs-between new-loc loc) (cdr locs))) new-dir (cdr turns))))))
+  (define starting-loc 0+0i)
+  (let loop ([locs (list starting-loc)] [dir north] [turns turns])
+    (cond
+      [(empty? turns)
+       (displayln (format "part 1 (dist of final location): ~a" (loc-dist (car locs))))]
+      [(zero? ($turn-dist (car turns))) (loop locs dir (cdr turns))]
+      [else 
+       (define new-dir (* dir ($turn-rot (car turns))))
+       (define one-step 1)
+       (define new-loc (+ (car locs) (* new-dir one-step)))
+       (when (and (not found-twice-visited-loc) (member new-loc locs))
+         (set! found-twice-visited-loc new-loc)
+         (displayln (format "part 2 (dist of first twice-visited location): ~a"
+                            (loc-dist new-loc))))
+       (define decremented-turn ($turn same-dir (sub1 ($turn-dist (car turns)))))
+       (loop (cons new-loc locs) new-dir (cons decremented-turn (cdr turns)))])))
 
 (define-macro-cases turn
   [(_ DIR DIST)
-   (with-pattern ([NEW-DIR (syntax-case #'DIR ()
-                             ["L" #'+i]
-                             ["R" #'-i])])
-     #'(cons NEW-DIR (string->number DIST)))]
+   (with-pattern ([ENCODED-DIR (syntax-case #'DIR ()
+                             ["L" #'rotate-left]
+                             ["R" #'rotate-right])])
+     #'($turn ENCODED-DIR (string->number DIST)))]
   [else #'(void)])
 (provide turn)
\ No newline at end of file