diff --git a/create-models.sh b/create-models.sh
old mode 100644
new mode 100755
diff --git a/src/dactyl_keyboard/dactyl.clj b/src/dactyl_keyboard/dactyl.clj
index 169c8da..2cb6aa6 100644
--- a/src/dactyl_keyboard/dactyl.clj
+++ b/src/dactyl_keyboard/dactyl.clj
@@ -16,8 +16,8 @@
 (def nrows 5)
 (def ncols 6)
 
-(def α (/ π 11))                        ; curvature of the columns
-(def β (/ π 36))                        ; curvature of the rows
+(def α (/ π 9))                        ; curvature of the columns
+(def β (/ π 34))                        ; curvature of the rows
 (def centerrow (- nrows 3))             ; controls front-back tilt
 (def centercol 3)                       ; controls left-right tilt / tenting (higher number is more tenting)
 (def tenting-angle (/ π 12))            ; or, change this for more precise tenting control
diff --git a/src/dactyl_keyboard/dactyl.clj.orig b/src/dactyl_keyboard/dactyl.clj.orig
new file mode 100644
index 0000000..169c8da
--- /dev/null
+++ b/src/dactyl_keyboard/dactyl.clj.orig
@@ -0,0 +1,785 @@
+(ns dactyl-keyboard.dactyl
+  (:refer-clojure :exclude [use import])
+  (:require [clojure.core.matrix :refer [array matrix mmul]]
+            [scad-clj.scad :refer :all]
+            [scad-clj.model :refer :all]
+            [unicode-math.core :refer :all]))
+
+
+(defn deg2rad [degrees]
+  (* (/ degrees 180) pi))
+
+;;;;;;;;;;;;;;;;;;;;;;
+;; Shape parameters ;;
+;;;;;;;;;;;;;;;;;;;;;;
+
+(def nrows 5)
+(def ncols 6)
+
+(def α (/ π 11))                        ; curvature of the columns
+(def β (/ π 36))                        ; curvature of the rows
+(def centerrow (- nrows 3))             ; controls front-back tilt
+(def centercol 3)                       ; controls left-right tilt / tenting (higher number is more tenting)
+(def tenting-angle (/ π 12))            ; or, change this for more precise tenting control
+(def column-style 
+  (if (> nrows 5) :orthographic :standard))  ; options include :standard, :orthographic, and :fixed
+; (def column-style :fixed)
+
+(defn column-offset [column] (cond
+  (= column 2) [0 2.82 -4.5]
+  (>= column 4) [0 -12 5.64]            ; original [0 -5.8 5.64]
+  :else [0 0 0]))
+
+(def thumb-offsets [6 -3 7])
+
+(def keyboard-z-offset 9)               ; controls overall height; original=9 with centercol=3; use 16 for centercol=2
+
+(def extra-width 2.5)                   ; extra space between the base of keys; original= 2
+(def extra-height 1.0)                  ; original= 0.5
+
+(def wall-z-offset -15)                 ; length of the first downward-sloping part of the wall (negative)
+(def wall-xy-offset 5)                  ; offset in the x and/or y direction for the first downward-sloping part of the wall (negative)
+(def wall-thickness 2)                  ; wall thickness parameter; originally 5
+
+;; Settings for column-style == :fixed 
+;; The defaults roughly match Maltron settings
+;;   http://patentimages.storage.googleapis.com/EP0219944A2/imgf0002.png
+;; Fixed-z overrides the z portion of the column ofsets above.
+;; NOTE: THIS DOESN'T WORK QUITE LIKE I'D HOPED.
+(def fixed-angles [(deg2rad 10) (deg2rad 10) 0 0 0 (deg2rad -15) (deg2rad -15)])  
+(def fixed-x [-41.5 -22.5 0 20.3 41.4 65.5 89.6])  ; relative to the middle finger
+(def fixed-z [12.1    8.3 0  5   10.7 14.5 17.5])  
+(def fixed-tenting (deg2rad 0))  
+
+;;;;;;;;;;;;;;;;;;;;;;;
+;; General variables ;;
+;;;;;;;;;;;;;;;;;;;;;;;
+
+(def lastrow (dec nrows))
+(def cornerrow (dec lastrow))
+(def lastcol (dec ncols))
+
+;;;;;;;;;;;;;;;;;
+;; Switch Hole ;;
+;;;;;;;;;;;;;;;;;
+
+(def keyswitch-height 14.4) ;; Was 14.1, then 14.25
+(def keyswitch-width 14.4)
+
+(def sa-profile-key-height 12.7)
+
+(def plate-thickness 4)
+(def mount-width (+ keyswitch-width 3))
+(def mount-height (+ keyswitch-height 3))
+
+(def single-plate
+  (let [top-wall (->> (cube (+ keyswitch-width 3) 1.5 plate-thickness)
+                      (translate [0
+                                  (+ (/ 1.5 2) (/ keyswitch-height 2))
+                                  (/ plate-thickness 2)]))
+        left-wall (->> (cube 1.5 (+ keyswitch-height 3) plate-thickness)
+                       (translate [(+ (/ 1.5 2) (/ keyswitch-width 2))
+                                   0
+                                   (/ plate-thickness 2)]))
+        side-nub (->> (binding [*fn* 30] (cylinder 1 2.75))
+                      (rotate (/ π 2) [1 0 0])
+                      (translate [(+ (/ keyswitch-width 2)) 0 1])
+                      (hull (->> (cube 1.5 2.75 plate-thickness)
+                                 (translate [(+ (/ 1.5 2) (/ keyswitch-width 2))
+                                             0
+                                             (/ plate-thickness 2)]))))
+        plate-half (union top-wall left-wall (with-fn 100 side-nub))]
+    (union plate-half
+           (->> plate-half
+                (mirror [1 0 0])
+                (mirror [0 1 0])))))
+
+;;;;;;;;;;;;;;;;
+;; SA Keycaps ;;
+;;;;;;;;;;;;;;;;
+
+(def sa-length 18.25)
+(def sa-double-length 37.5)
+(def sa-cap {1 (let [bl2 (/ 18.5 2)
+                     m (/ 17 2)
+                     key-cap (hull (->> (polygon [[bl2 bl2] [bl2 (- bl2)] [(- bl2) (- bl2)] [(- bl2) bl2]])
+                                        (extrude-linear {:height 0.1 :twist 0 :convexity 0})
+                                        (translate [0 0 0.05]))
+                                   (->> (polygon [[m m] [m (- m)] [(- m) (- m)] [(- m) m]])
+                                        (extrude-linear {:height 0.1 :twist 0 :convexity 0})
+                                        (translate [0 0 6]))
+                                   (->> (polygon [[6 6] [6 -6] [-6 -6] [-6 6]])
+                                        (extrude-linear {:height 0.1 :twist 0 :convexity 0})
+                                        (translate [0 0 12])))]
+                 (->> key-cap
+                      (translate [0 0 (+ 5 plate-thickness)])
+                      (color [220/255 163/255 163/255 1])))
+             2 (let [bl2 (/ sa-double-length 2)
+                     bw2 (/ 18.25 2)
+                     key-cap (hull (->> (polygon [[bw2 bl2] [bw2 (- bl2)] [(- bw2) (- bl2)] [(- bw2) bl2]])
+                                        (extrude-linear {:height 0.1 :twist 0 :convexity 0})
+                                        (translate [0 0 0.05]))
+                                   (->> (polygon [[6 16] [6 -16] [-6 -16] [-6 16]])
+                                        (extrude-linear {:height 0.1 :twist 0 :convexity 0})
+                                        (translate [0 0 12])))]
+                 (->> key-cap
+                      (translate [0 0 (+ 5 plate-thickness)])
+                      (color [127/255 159/255 127/255 1])))
+             1.5 (let [bl2 (/ 18.25 2)
+                       bw2 (/ 28 2)
+                       key-cap (hull (->> (polygon [[bw2 bl2] [bw2 (- bl2)] [(- bw2) (- bl2)] [(- bw2) bl2]])
+                                          (extrude-linear {:height 0.1 :twist 0 :convexity 0})
+                                          (translate [0 0 0.05]))
+                                     (->> (polygon [[11 6] [-11 6] [-11 -6] [11 -6]])
+                                          (extrude-linear {:height 0.1 :twist 0 :convexity 0})
+                                          (translate [0 0 12])))]
+                   (->> key-cap
+                        (translate [0 0 (+ 5 plate-thickness)])
+                        (color [240/255 223/255 175/255 1])))})
+
+;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Placement Functions ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(def columns (range 0 ncols))
+(def rows (range 0 nrows))
+
+(def cap-top-height (+ plate-thickness sa-profile-key-height))
+(def row-radius (+ (/ (/ (+ mount-height extra-height) 2)
+                      (Math/sin (/ α 2)))
+                   cap-top-height))
+(def column-radius (+ (/ (/ (+ mount-width extra-width) 2)
+                         (Math/sin (/ β 2)))
+                      cap-top-height))
+(def column-x-delta (+ -1 (- (* column-radius (Math/sin β)))))
+(def column-base-angle (* β (- centercol 2)))
+
+(defn apply-key-geometry [translate-fn rotate-x-fn rotate-y-fn column row shape]
+  (let [column-angle (* β (- centercol column))   
+        placed-shape (->> shape
+                          (translate-fn [0 0 (- row-radius)])
+                          (rotate-x-fn  (* α (- centerrow row)))      
+                          (translate-fn [0 0 row-radius])
+                          (translate-fn [0 0 (- column-radius)])
+                          (rotate-y-fn  column-angle)
+                          (translate-fn [0 0 column-radius])
+                          (translate-fn (column-offset column)))
+        column-z-delta (* column-radius (- 1 (Math/cos column-angle)))
+        placed-shape-ortho (->> shape
+                                (translate-fn [0 0 (- row-radius)])
+                                (rotate-x-fn  (* α (- centerrow row)))      
+                                (translate-fn [0 0 row-radius])
+                                (rotate-y-fn  column-angle)
+                                (translate-fn [(- (* (- column centercol) column-x-delta)) 0 column-z-delta])
+                                (translate-fn (column-offset column)))
+        placed-shape-fixed (->> shape
+                                (rotate-y-fn  (nth fixed-angles column))
+                                (translate-fn [(nth fixed-x column) 0 (nth fixed-z column)])
+                                (translate-fn [0 0 (- (+ row-radius (nth fixed-z column)))])
+                                (rotate-x-fn  (* α (- centerrow row)))      
+                                (translate-fn [0 0 (+ row-radius (nth fixed-z column))])
+                                (rotate-y-fn  fixed-tenting)
+                                (translate-fn [0 (second (column-offset column)) 0])
+                                )]
+    (->> (case column-style
+          :orthographic placed-shape-ortho 
+          :fixed        placed-shape-fixed
+                        placed-shape)
+         (rotate-y-fn  tenting-angle)
+         (translate-fn [0 0 keyboard-z-offset]))))
+
+(defn key-place [column row shape]
+  (apply-key-geometry translate 
+    (fn [angle obj] (rotate angle [1 0 0] obj)) 
+    (fn [angle obj] (rotate angle [0 1 0] obj)) 
+    column row shape))
+
+(defn rotate-around-x [angle position] 
+  (mmul 
+   [[1 0 0]
+    [0 (Math/cos angle) (- (Math/sin angle))]
+    [0 (Math/sin angle)    (Math/cos angle)]]
+   position))
+
+(defn rotate-around-y [angle position] 
+  (mmul 
+   [[(Math/cos angle)     0 (Math/sin angle)]
+    [0                    1 0]
+    [(- (Math/sin angle)) 0 (Math/cos angle)]]
+   position))
+
+(defn key-position [column row position]
+  (apply-key-geometry (partial map +) rotate-around-x rotate-around-y column row position))
+
+
+(def key-holes
+  (apply union
+         (for [column columns
+               row rows
+               :when (or (.contains [2 3] column)
+                         (not= row lastrow))]
+           (->> single-plate
+                (key-place column row)))))
+
+(def caps
+  (apply union
+         (for [column columns
+               row rows
+               :when (or (.contains [2 3] column)
+                         (not= row lastrow))]
+           (->> (sa-cap (if (= column 5) 1 1))
+                (key-place column row)))))
+
+; (pr (rotate-around-y π [10 0 1]))
+; (pr (key-position 1 cornerrow [(/ mount-width 2) (- (/ mount-height 2)) 0]))
+
+;;;;;;;;;;;;;;;;;;;;
+;; Web Connectors ;;
+;;;;;;;;;;;;;;;;;;;;
+
+(def web-thickness 3.5)
+(def post-size 0.1)
+(def web-post (->> (cube post-size post-size web-thickness)
+                   (translate [0 0 (+ (/ web-thickness -2)
+                                      plate-thickness)])))
+
+(def post-adj (/ post-size 2))
+(def web-post-tr (translate [(- (/ mount-width 2) post-adj) (- (/ mount-height 2) post-adj) 0] web-post))
+(def web-post-tl (translate [(+ (/ mount-width -2) post-adj) (- (/ mount-height 2) post-adj) 0] web-post))
+(def web-post-bl (translate [(+ (/ mount-width -2) post-adj) (+ (/ mount-height -2) post-adj) 0] web-post))
+(def web-post-br (translate [(- (/ mount-width 2) post-adj) (+ (/ mount-height -2) post-adj) 0] web-post))
+
+(defn triangle-hulls [& shapes]
+  (apply union
+         (map (partial apply hull)
+              (partition 3 1 shapes))))
+
+(def connectors
+  (apply union
+         (concat
+          ;; Row connections
+          (for [column (range 0 (dec ncols))
+                row (range 0 lastrow)]
+            (triangle-hulls
+             (key-place (inc column) row web-post-tl)
+             (key-place column row web-post-tr)
+             (key-place (inc column) row web-post-bl)
+             (key-place column row web-post-br)))
+
+          ;; Column connections
+          (for [column columns
+                row (range 0 cornerrow)]
+            (triangle-hulls
+             (key-place column row web-post-bl)
+             (key-place column row web-post-br)
+             (key-place column (inc row) web-post-tl)
+             (key-place column (inc row) web-post-tr)))
+
+          ;; Diagonal connections
+          (for [column (range 0 (dec ncols))
+                row (range 0 cornerrow)]
+            (triangle-hulls
+             (key-place column row web-post-br)
+             (key-place column (inc row) web-post-tr)
+             (key-place (inc column) row web-post-bl)
+             (key-place (inc column) (inc row) web-post-tl))))))
+
+;;;;;;;;;;;;
+;; Thumbs ;;
+;;;;;;;;;;;;
+
+(def thumborigin 
+  (map + (key-position 1 cornerrow [(/ mount-width 2) (- (/ mount-height 2)) 0])
+         thumb-offsets))
+; (pr thumborigin)
+
+(defn thumb-tr-place [shape]
+  (->> shape
+      ;  (rotate (deg2rad  10) [1 0 0])
+      ;  (rotate (deg2rad -23) [0 1 0])
+      ;  (rotate (deg2rad  -3) [0 0 1])
+       (rotate (deg2rad  10) [1 0 0])
+       (rotate (deg2rad -23) [0 1 0])
+       (rotate (deg2rad  10) [0 0 1])
+       (translate thumborigin)
+       (translate [-12 -16 3])
+       ))
+(defn thumb-tl-place [shape]
+  (->> shape
+      ;  (rotate (deg2rad  10) [1 0 0])
+      ;  (rotate (deg2rad -23) [0 1 0])
+      ;  (rotate (deg2rad  -3) [0 0 1])
+       (rotate (deg2rad  10) [1 0 0])
+       (rotate (deg2rad -23) [0 1 0])
+       (rotate (deg2rad  10) [0 0 1])
+       (translate thumborigin)
+       (translate [-32 -15 -2])))
+(defn thumb-mr-place [shape]
+  (->> shape
+       (rotate (deg2rad  -6) [1 0 0])
+       (rotate (deg2rad -34) [0 1 0])
+       (rotate (deg2rad  48) [0 0 1])
+       (translate thumborigin)
+       (translate [-29 -40 -13])
+       ))
+(defn thumb-ml-place [shape]
+  (->> shape
+       (rotate (deg2rad   6) [1 0 0])
+       (rotate (deg2rad -34) [0 1 0])
+       (rotate (deg2rad  40) [0 0 1])
+       (translate thumborigin)
+       (translate [-51 -25 -12])))
+(defn thumb-br-place [shape]
+  (->> shape
+       (rotate (deg2rad -16) [1 0 0])
+       (rotate (deg2rad -33) [0 1 0])
+       (rotate (deg2rad  54) [0 0 1])
+       (translate thumborigin)
+       (translate [-37.8 -55.3 -25.3])
+       ))
+(defn thumb-bl-place [shape]
+  (->> shape
+       (rotate (deg2rad  -4) [1 0 0])
+       (rotate (deg2rad -35) [0 1 0])
+       (rotate (deg2rad  52) [0 0 1])
+       (translate thumborigin)
+       (translate [-56.3 -43.3 -23.5])
+       ))
+
+(defn thumb-1x-layout [shape]
+  (union
+   (thumb-mr-place shape)
+   (thumb-ml-place shape)
+   (thumb-br-place shape)
+   (thumb-bl-place shape)))
+
+(defn thumb-15x-layout [shape]
+  (union
+   (thumb-tr-place shape)
+   (thumb-tl-place shape)))
+
+(def larger-plate
+  (let [plate-height (/ (- sa-double-length mount-height) 3)
+        top-plate (->> (cube mount-width plate-height web-thickness)
+                       (translate [0 (/ (+ plate-height mount-height) 2)
+                                   (- plate-thickness (/ web-thickness 2))]))
+        ]
+    (union top-plate (mirror [0 1 0] top-plate))))
+
+(def thumbcaps
+  (union
+   (thumb-1x-layout (sa-cap 1))
+   (thumb-15x-layout (rotate (/ π 2) [0 0 1] (sa-cap 1.5)))))
+
+
+(def thumb
+  (union
+   (thumb-1x-layout single-plate)
+   (thumb-15x-layout single-plate)
+   (thumb-15x-layout larger-plate)
+   ))
+
+(def thumb-post-tr (translate [(- (/ mount-width 2) post-adj)  (- (/ mount-height  1.15) post-adj) 0] web-post))
+(def thumb-post-tl (translate [(+ (/ mount-width -2) post-adj) (- (/ mount-height  1.15) post-adj) 0] web-post))
+(def thumb-post-bl (translate [(+ (/ mount-width -2) post-adj) (+ (/ mount-height -1.15) post-adj) 0] web-post))
+(def thumb-post-br (translate [(- (/ mount-width 2) post-adj)  (+ (/ mount-height -1.15) post-adj) 0] web-post))
+
+(def thumb-connectors
+  (union
+      (triangle-hulls    ; top two
+             (thumb-tl-place thumb-post-tr)
+             (thumb-tl-place thumb-post-br)
+             (thumb-tr-place thumb-post-tl)
+             (thumb-tr-place thumb-post-bl))
+      (triangle-hulls    ; bottom two on the right
+             (thumb-br-place web-post-tr)
+             (thumb-br-place web-post-br)
+             (thumb-mr-place web-post-tl)
+             (thumb-mr-place web-post-bl))
+      (triangle-hulls    ; bottom two on the left
+             (thumb-bl-place web-post-tr)
+             (thumb-bl-place web-post-br)
+             (thumb-ml-place web-post-tl)
+             (thumb-ml-place web-post-bl))
+      (triangle-hulls    ; centers of the bottom four
+             (thumb-br-place web-post-tl)
+             (thumb-bl-place web-post-bl)
+             (thumb-br-place web-post-tr)
+             (thumb-bl-place web-post-br)
+             (thumb-mr-place web-post-tl)
+             (thumb-ml-place web-post-bl)
+             (thumb-mr-place web-post-tr)
+             (thumb-ml-place web-post-br))
+      (triangle-hulls    ; top two to the middle two, starting on the left
+             (thumb-tl-place thumb-post-tl)
+             (thumb-ml-place web-post-tr)
+             (thumb-tl-place thumb-post-bl)
+             (thumb-ml-place web-post-br)
+             (thumb-tl-place thumb-post-br)
+             (thumb-mr-place web-post-tr)
+             (thumb-tr-place thumb-post-bl)
+             (thumb-mr-place web-post-br)
+             (thumb-tr-place thumb-post-br)) 
+      (triangle-hulls    ; top two to the main keyboard, starting on the left
+             (thumb-tl-place thumb-post-tl)
+             (key-place 0 cornerrow web-post-bl)
+             (thumb-tl-place thumb-post-tr)
+             (key-place 0 cornerrow web-post-br)
+             (thumb-tr-place thumb-post-tl)
+             (key-place 1 cornerrow web-post-bl)
+             (thumb-tr-place thumb-post-tr)
+             (key-place 1 cornerrow web-post-br)
+             (key-place 2 lastrow web-post-tl)
+             (key-place 2 lastrow web-post-bl)
+             (thumb-tr-place thumb-post-tr)
+             (key-place 2 lastrow web-post-bl)
+             (thumb-tr-place thumb-post-br)
+             (key-place 2 lastrow web-post-br)
+             (key-place 3 lastrow web-post-bl)
+             (key-place 2 lastrow web-post-tr)
+             (key-place 3 lastrow web-post-tl)
+             (key-place 3 cornerrow web-post-bl)
+             (key-place 3 lastrow web-post-tr)
+             (key-place 3 cornerrow web-post-br)
+             (key-place 4 cornerrow web-post-bl))
+      (triangle-hulls 
+             (key-place 1 cornerrow web-post-br)
+             (key-place 2 lastrow web-post-tl)
+             (key-place 2 cornerrow web-post-bl)
+             (key-place 2 lastrow web-post-tr)
+             (key-place 2 cornerrow web-post-br)
+             (key-place 3 cornerrow web-post-bl)
+             )
+      (triangle-hulls 
+             (key-place 3 lastrow web-post-tr)
+             (key-place 3 lastrow web-post-br)
+             (key-place 3 lastrow web-post-tr)
+             (key-place 4 cornerrow web-post-bl))
+  ))
+
+;;;;;;;;;;
+;; Case ;;
+;;;;;;;;;;
+
+(defn bottom [height p]
+  (->> (project p)
+       (extrude-linear {:height height :twist 0 :convexity 0})
+       (translate [0 0 (- (/ height 2) 10)])))
+
+(defn bottom-hull [& p]
+  (hull p (bottom 0.001 p)))
+
+(def left-wall-x-offset 10)
+(def left-wall-z-offset  3)
+
+(defn left-key-position [row direction]
+  (map - (key-position 0 row [(* mount-width -0.5) (* direction mount-height 0.5) 0]) [left-wall-x-offset 0 left-wall-z-offset]) )
+
+(defn left-key-place [row direction shape]
+  (translate (left-key-position row direction) shape))
+
+
+(defn wall-locate1 [dx dy] [(* dx wall-thickness) (* dy wall-thickness) -1])
+(defn wall-locate2 [dx dy] [(* dx wall-xy-offset) (* dy wall-xy-offset) wall-z-offset])
+(defn wall-locate3 [dx dy] [(* dx (+ wall-xy-offset wall-thickness)) (* dy (+ wall-xy-offset wall-thickness)) wall-z-offset])
+
+(defn wall-brace [place1 dx1 dy1 post1 place2 dx2 dy2 post2]
+  (union
+    (hull
+      (place1 post1)
+      (place1 (translate (wall-locate1 dx1 dy1) post1))
+      (place1 (translate (wall-locate2 dx1 dy1) post1))
+      (place1 (translate (wall-locate3 dx1 dy1) post1))
+      (place2 post2)
+      (place2 (translate (wall-locate1 dx2 dy2) post2))
+      (place2 (translate (wall-locate2 dx2 dy2) post2))
+      (place2 (translate (wall-locate3 dx2 dy2) post2)))
+    (bottom-hull
+      (place1 (translate (wall-locate2 dx1 dy1) post1))
+      (place1 (translate (wall-locate3 dx1 dy1) post1))
+      (place2 (translate (wall-locate2 dx2 dy2) post2))
+      (place2 (translate (wall-locate3 dx2 dy2) post2)))
+      ))
+
+(defn key-wall-brace [x1 y1 dx1 dy1 post1 x2 y2 dx2 dy2 post2] 
+  (wall-brace (partial key-place x1 y1) dx1 dy1 post1 
+              (partial key-place x2 y2) dx2 dy2 post2))
+
+(def case-walls
+  (union
+   ; back wall
+   (for [x (range 0 ncols)] (key-wall-brace x 0 0 1 web-post-tl x       0 0 1 web-post-tr))
+   (for [x (range 1 ncols)] (key-wall-brace x 0 0 1 web-post-tl (dec x) 0 0 1 web-post-tr))
+   (key-wall-brace lastcol 0 0 1 web-post-tr lastcol 0 1 0 web-post-tr)
+   ; right wall
+   (for [y (range 0 lastrow)] (key-wall-brace lastcol y 1 0 web-post-tr lastcol y       1 0 web-post-br))
+   (for [y (range 1 lastrow)] (key-wall-brace lastcol (dec y) 1 0 web-post-br lastcol y 1 0 web-post-tr))
+   (key-wall-brace lastcol cornerrow 0 -1 web-post-br lastcol cornerrow 1 0 web-post-br)
+   ; left wall
+   (for [y (range 0 lastrow)] (union (wall-brace (partial left-key-place y 1)       -1 0 web-post (partial left-key-place y -1) -1 0 web-post)
+                                     (hull (key-place 0 y web-post-tl)
+                                           (key-place 0 y web-post-bl)
+                                           (left-key-place y  1 web-post)
+                                           (left-key-place y -1 web-post))))
+   (for [y (range 1 lastrow)] (union (wall-brace (partial left-key-place (dec y) -1) -1 0 web-post (partial left-key-place y  1) -1 0 web-post)
+                                     (hull (key-place 0 y       web-post-tl)
+                                           (key-place 0 (dec y) web-post-bl)
+                                           (left-key-place y        1 web-post)
+                                           (left-key-place (dec y) -1 web-post))))
+   (wall-brace (partial key-place 0 0) 0 1 web-post-tl (partial left-key-place 0 1) 0 1 web-post)
+   (wall-brace (partial left-key-place 0 1) 0 1 web-post (partial left-key-place 0 1) -1 0 web-post)
+   ; front wall
+   (key-wall-brace lastcol 0 0 1 web-post-tr lastcol 0 1 0 web-post-tr)
+   (key-wall-brace 3 lastrow   0 -1 web-post-bl 3 lastrow 0.5 -1 web-post-br)
+   (key-wall-brace 3 lastrow 0.5 -1 web-post-br 4 cornerrow 1 -1 web-post-bl)
+   (for [x (range 4 ncols)] (key-wall-brace x cornerrow 0 -1 web-post-bl x       cornerrow 0 -1 web-post-br))
+   (for [x (range 5 ncols)] (key-wall-brace x cornerrow 0 -1 web-post-bl (dec x) cornerrow 0 -1 web-post-br))
+   ; thumb walls
+   (wall-brace thumb-mr-place  0 -1 web-post-br thumb-tr-place  0 -1 thumb-post-br)
+   (wall-brace thumb-mr-place  0 -1 web-post-br thumb-mr-place  0 -1 web-post-bl)
+   (wall-brace thumb-br-place  0 -1 web-post-br thumb-br-place  0 -1 web-post-bl)
+   (wall-brace thumb-ml-place -0.3  1 web-post-tr thumb-ml-place  0  1 web-post-tl)
+   (wall-brace thumb-bl-place  0  1 web-post-tr thumb-bl-place  0  1 web-post-tl)
+   (wall-brace thumb-br-place -1  0 web-post-tl thumb-br-place -1  0 web-post-bl)
+   (wall-brace thumb-bl-place -1  0 web-post-tl thumb-bl-place -1  0 web-post-bl)
+   ; thumb corners
+   (wall-brace thumb-br-place -1  0 web-post-bl thumb-br-place  0 -1 web-post-bl)
+   (wall-brace thumb-bl-place -1  0 web-post-tl thumb-bl-place  0  1 web-post-tl)
+   ; thumb tweeners
+   (wall-brace thumb-mr-place  0 -1 web-post-bl thumb-br-place  0 -1 web-post-br)
+   (wall-brace thumb-ml-place  0  1 web-post-tl thumb-bl-place  0  1 web-post-tr)
+   (wall-brace thumb-bl-place -1  0 web-post-bl thumb-br-place -1  0 web-post-tl)
+   (wall-brace thumb-tr-place  0 -1 thumb-post-br (partial key-place 3 lastrow)  0 -1 web-post-bl)
+   ; clunky bit on the top left thumb connection  (normal connectors don't work well)
+   (bottom-hull
+     (left-key-place cornerrow -1 (translate (wall-locate2 -1 0) web-post))
+     (left-key-place cornerrow -1 (translate (wall-locate3 -1 0) web-post))
+     (thumb-ml-place (translate (wall-locate2 -0.3 1) web-post-tr))
+     (thumb-ml-place (translate (wall-locate3 -0.3 1) web-post-tr)))
+   (hull
+     (left-key-place cornerrow -1 (translate (wall-locate2 -1 0) web-post))
+     (left-key-place cornerrow -1 (translate (wall-locate3 -1 0) web-post))
+     (thumb-ml-place (translate (wall-locate2 -0.3 1) web-post-tr))
+     (thumb-ml-place (translate (wall-locate3 -0.3 1) web-post-tr))
+     (thumb-tl-place thumb-post-tl))
+   (hull
+     (left-key-place cornerrow -1 web-post)
+     (left-key-place cornerrow -1 (translate (wall-locate1 -1 0) web-post))
+     (left-key-place cornerrow -1 (translate (wall-locate2 -1 0) web-post))
+     (left-key-place cornerrow -1 (translate (wall-locate3 -1 0) web-post))
+     (thumb-tl-place thumb-post-tl))
+   (hull
+     (left-key-place cornerrow -1 web-post)
+     (left-key-place cornerrow -1 (translate (wall-locate1 -1 0) web-post))
+     (key-place 0 cornerrow web-post-bl)
+     (key-place 0 cornerrow (translate (wall-locate1 -1 0) web-post-bl))
+     (thumb-tl-place thumb-post-tl))
+   (hull
+     (thumb-ml-place web-post-tr)
+     (thumb-ml-place (translate (wall-locate1 -0.3 1) web-post-tr))
+     (thumb-ml-place (translate (wall-locate2 -0.3 1) web-post-tr))
+     (thumb-ml-place (translate (wall-locate3 -0.3 1) web-post-tr))
+     (thumb-tl-place thumb-post-tl))
+  ))
+
+
+(def rj9-start  (map + [3 -2 0] (key-position 0 0 (map + (wall-locate3 0 1) [0 (/ mount-height  2) 0]))))
+(def rj9-position  [(first rj9-start) (second rj9-start) 11])
+(def rj9-cube   (cube 11.5 4 16))
+(def rj9-space  (translate rj9-position rj9-cube))
+
+(def usbc-start  (map + [17.5 -2 0] (key-position 0 0 (map + (wall-locate3 0 1) [0 (/ mount-height  2) 0]))))
+(def usbc-position  [(first usbc-start) (second usbc-start) 4.75])
+(def usbc-cube   (cube 9.5 4 3.5))
+(def usbc-space  (translate usbc-position usbc-cube))
+
+
+(def reset-start  (map + [17.5 -2 0] (key-position 0 0 (map + (wall-locate3 0 1) [0 (/ mount-height  2) 0]))))
+(def reset-position  [(first reset-start) (second reset-start) 11])
+(def reset-cylinder (rotate (/ π 2) [1 0 0] (binding [*fn* 30] (cylinder 2 5))))
+(def reset-space (translate reset-position
+                   reset-cylinder) )
+
+ ;(union (cylinder [bottom-radius top-radius] height)
+
+;(def rj9-holder (translate rj9-position
+;                  (difference rj9-cube
+;                              (union (translate [0 2 0] (cube 10.78  9 18.38))
+;                                     (translate [0 0 5] (cube 10.78 13  5))))))
+;(def usbc-holder (translate usbc-position
+;                  (difference usbc-cube
+;                              (union (translate [0 2 0] (cube 10.78  9 18.38))
+;                                     (translate [0 0 5] (cube 10.78 13  5))))))
+
+;(def usb-holder-position key-position 1 0 (map + (wall-locate2 1 1) [0 (/ mount-height 2) 0])))
+(def usb-holder-position (map + [12.5 -2 0] (key-position 0 0 (map + (wall-locate3 0 1) [0 (/ mount-height  2) 0]))))
+(def usb-holder-size [9.5 10 3.5])
+(def usb-holder-thickness 4)
+(def usb-holder
+    (->> (cube (+ (first usb-holder-size) usb-holder-thickness) (second usb-holder-size) (+ (last usb-holder-size) usb-holder-thickness))
+         (translate [(first usb-holder-position) (second usb-holder-position) (/ (+ (last usb-holder-size) usb-holder-thickness) 2)])))
+(def usb-holder-hole
+    (->> (apply cube usb-holder-size)
+         (translate [(first usb-holder-position) (second usb-holder-position) (/ (+ (last usb-holder-size) usb-holder-thickness) 2)])))
+
+(def teensy-width 20)  
+(def teensy-height 12)
+(def teensy-length 33)
+(def teensy2-length 53)
+(def teensy-pcb-thickness 2) 
+(def teensy-holder-width  (+ 7 teensy-pcb-thickness))
+(def teensy-holder-height (+ 6 teensy-width))
+(def teensy-offset-height 5)
+(def teensy-holder-top-length 18)
+(def teensy-top-xy (key-position 0 (- centerrow 1) (wall-locate3 -1 0)))
+(def teensy-bot-xy (key-position 0 (+ centerrow 1) (wall-locate3 -1 0)))
+(def teensy-holder-length (- (second teensy-top-xy) (second teensy-bot-xy)))
+(def teensy-holder-offset (/ teensy-holder-length -2))
+(def teensy-holder-top-offset (- (/ teensy-holder-top-length 2) teensy-holder-length))
+ 
+(def teensy-holder 
+    (->> 
+        (union 
+          (->> (cube 3 teensy-holder-length (+ 6 teensy-width))
+               (translate [1.5 teensy-holder-offset 0]))
+          (->> (cube teensy-pcb-thickness teensy-holder-length 3)
+               (translate [(+ (/ teensy-pcb-thickness 2) 3) teensy-holder-offset (- -1.5 (/ teensy-width 2))]))
+          (->> (cube 4 teensy-holder-length 4)
+               (translate [(+ teensy-pcb-thickness 5) teensy-holder-offset (-  -1 (/ teensy-width 2))]))
+          (->> (cube teensy-pcb-thickness teensy-holder-top-length 3)
+               (translate [(+ (/ teensy-pcb-thickness 2) 3) teensy-holder-top-offset (+ 1.5 (/ teensy-width 2))]))
+          (->> (cube 4 teensy-holder-top-length 4)
+               (translate [(+ teensy-pcb-thickness 5) teensy-holder-top-offset (+ 1 (/ teensy-width 2))])))
+        (translate [(- teensy-holder-width) 0 0])
+        (translate [-1.4 0 0])
+        (translate [(first teensy-top-xy) 
+                    (- (second teensy-top-xy) 1) 
+                    (/ (+ 6 teensy-width) 2)])
+           ))
+
+(defn screw-insert-shape [bottom-radius top-radius height] 
+   (union (cylinder [bottom-radius top-radius] height)
+          (translate [0 0 (/ height 2)] (sphere top-radius))))
+
+(defn screw-insert [column row bottom-radius top-radius height] 
+  (let [shift-right   (= column lastcol)
+        shift-left    (= column 0)
+        shift-up      (and (not (or shift-right shift-left)) (= row 0))
+        shift-down    (and (not (or shift-right shift-left)) (>= row lastrow))
+        position      (if shift-up     (key-position column row (map + (wall-locate2  0  1) [0 (/ mount-height 2) 0]))
+                       (if shift-down  (key-position column row (map - (wall-locate2  0 -1) [0 (/ mount-height 2) 0]))
+                        (if shift-left (map + (left-key-position row 0) (wall-locate3 -1 0)) 
+                                       (key-position column row (map + (wall-locate2  1  0) [(/ mount-width 2) 0 0])))))
+        ]
+    (->> (screw-insert-shape bottom-radius top-radius height)
+         (translate [(first position) (second position) (/ height 2)])
+    )))
+
+(defn screw-insert-all-shapes [bottom-radius top-radius height]
+  (union (screw-insert 0 0         bottom-radius top-radius height)
+         (screw-insert 0 lastrow   bottom-radius top-radius height)
+         (screw-insert 2 (+ lastrow 0.3)  bottom-radius top-radius height)
+         (screw-insert 3 0         bottom-radius top-radius height)
+         (screw-insert lastcol 1   bottom-radius top-radius height)
+         ))
+(def screw-insert-height 3.8)
+(def screw-insert-bottom-radius (/ 5.31 2))
+(def screw-insert-top-radius (/ 5.1 2))
+(def screw-insert-holes  (screw-insert-all-shapes screw-insert-bottom-radius screw-insert-top-radius screw-insert-height))
+(def screw-insert-outers (screw-insert-all-shapes (+ screw-insert-bottom-radius 1.6) (+ screw-insert-top-radius 1.6) (+ screw-insert-height 1.5)))
+(def screw-insert-screw-holes  (screw-insert-all-shapes 1.7 1.7 350))
+
+(def wire-post-height 7)
+(def wire-post-overhang 3.5)
+(def wire-post-diameter 2.6)
+(defn wire-post [direction offset]
+   (->> (union (translate [0 (* wire-post-diameter -0.5 direction) 0] (cube wire-post-diameter wire-post-diameter wire-post-height))
+               (translate [0 (* wire-post-overhang -0.5 direction) (/ wire-post-height -2)] (cube wire-post-diameter wire-post-overhang wire-post-diameter)))
+        (translate [0 (- offset) (+ (/ wire-post-height -2) 3) ])
+        (rotate (/ α -2) [1 0 0])
+        (translate [3 (/ mount-height -2) 0])))
+
+(def wire-posts
+  (union
+     (thumb-ml-place (translate [-5 0 -2] (wire-post  1 0)))
+     (thumb-ml-place (translate [ 0 0 -2.5] (wire-post -1 6)))
+     (thumb-ml-place (translate [ 5 0 -2] (wire-post  1 0)))
+     (for [column (range 0 lastcol)
+           row (range 0 cornerrow)]
+       (union
+        (key-place column row (translate [-5 0 0] (wire-post 1 0)))
+        (key-place column row (translate [0 0 0] (wire-post -1 6)))
+        (key-place column row (translate [5 0 0] (wire-post  1 0)))))))
+
+
+(def model-right (difference 
+                   (union
+                    key-holes
+                    connectors
+                    thumb
+                    thumb-connectors
+                    (difference (union case-walls 
+                                       screw-insert-outers 
+                                       ;teensy-holder
+                                       ;usb-holder
+                                       )
+                                rj9-space 
+                                usbc-space
+                                reset-space
+                                ;usb-holder-hole
+                                screw-insert-holes)
+                    ;rj9-holder
+                    ;wire-posts
+                    ; thumbcaps
+                    ; caps
+                    )
+                   (translate [0 0 -20] (cube 350 350 40)) 
+                  ))
+
+(spit "things/right.scad"
+      (write-scad model-right))
+ 
+(spit "things/left.scad"
+      (write-scad (mirror [-1 0 0] model-right)))
+                  
+;(spit "things/right-test.scad"
+;      (write-scad 
+;                   (union
+;                    key-holes
+;                    connectors
+;                    thumb
+;                    thumb-connectors
+;                    case-walls 
+;                    thumbcaps
+;                    caps
+;                    teensy-holder
+;                    rj9-holder
+;                    usb-holder-hole
+;                    ; usb-holder-hole
+;                    ; ; teensy-holder-hole
+;                    ;             screw-insert-outers 
+;                    ;             teensy-screw-insert-holes
+;                    ;             teensy-screw-insert-outers
+;                    ;             usb-cutout 
+;                    ;             rj9-space 
+;                                ; wire-posts
+;                  )))
+
+;(spit "things/right-plate.scad"
+;      (write-scad 
+;                   (cut
+;                     (translate [0 0 -0.1]
+;                       (difference (union case-walls
+;                                          teensy-holder
+;                                          ; rj9-holder
+;                                          screw-insert-outers)
+;                                   (translate [0 0 -10] screw-insert-screw-holes))
+;                  ))))
+
+;(spit "things/test.scad"
+;      (write-scad 
+;         (difference usb-holder usb-holder-hole)))
+
+
+
+(defn -main [dum] 1)  ; dummy to make it easier to batch
diff --git a/src/dactyl_keyboard/dactyl.clj.rej b/src/dactyl_keyboard/dactyl.clj.rej
new file mode 100644
index 0000000..1951e7d
--- /dev/null
+++ b/src/dactyl_keyboard/dactyl.clj.rej
@@ -0,0 +1,19 @@
+--- src/dactyl_keyboard/dactyl.clj
++++ src/dactyl_keyboard/dactyl.clj
+@@ -13,13 +13,13 @@
+ ;; Shape parameters ;;
+ ;;;;;;;;;;;;;;;;;;;;;;
+ 
+-(def nrows 4)
+-(def ncols 5)
++(def nrows 6)
++(def ncols 6)
+ 
+ (def α (/ π 12))                        ; curvature of the columns
+ (def β (/ π 36))                        ; curvature of the rows
+ (def centerrow (- nrows 3))             ; controls front-back tilt
+-(def centercol 3)                       ; controls left-right tilt / tenting (higher number is more tenting)
++(def centercol 2)                       ; controls left-right tilt / tenting (higher number is more tenting)
+ (def tenting-angle (/ π 12))            ; or, change this for more precise tenting control
+ (def column-style 
+   (if (> nrows 5) :orthographic :standard))  ; options include :standard, :orthographic, and :fixed
diff --git a/things/left.stl b/things/left.stl
deleted file mode 100644
index 51d022f..0000000
Binary files a/things/left.stl and /dev/null differ
diff --git a/things/right.stl b/things/right.stl
deleted file mode 100644
index 099ea32..0000000
Binary files a/things/right.stl and /dev/null differ