diff --git a/.gitignore b/.gitignore
index a9c6d62..78fde41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.pyc
 *.log
+*.gcode
 scad/conf/machine.scad
 scad/stl.scad
 dummy.csg
diff --git a/bom.py b/bom.py
index 5c58092..9ca4639 100755
--- a/bom.py
+++ b/bom.py
@@ -34,52 +34,47 @@ class BOM:
         return ass.replace("assembly", "assemblies")
 
     def print_bom(self, breakdown, file = None):
+        print >> file, "Vitamins:"
         if breakdown:
             longest = 0
             for ass in self.assemblies:
                 name = ass.replace("_assembly","")
                 longest = max(longest, len(name))
             for i in range(longest):
-                print >> file, " " * 14,
                 for ass in sorted(self.assemblies):
-                    name = ass.replace("_assembly","").replace("_"," ")
-                    if longest - i > len(name):
+                    name = ass.replace("_assembly","").replace("_"," ").capitalize()
+                    index = i - (longest - len(name))
+                    if index < 0:
                         print >> file, "  ",
                     else:
-                        print >> file, " %s" % name[i - (longest - len(name))],
+                        print >> file, " %s" % name[index],
                 print >> file
 
-        print >> file, "Vitamins:"
         for part in sorted(self.vitamins):
             if ': ' in part:
                 part_no, description = part.split(': ')
             else:
                 part_no, description = "", part
-            print >> file, "%3d %-10s" % (self.vitamins[part], part_no),
             if breakdown:
                 for ass in sorted(self.assemblies):
                     bom = self.assemblies[ass]
                     if part in bom.vitamins:
-                        print >> file, "%2d" % bom.vitamins[part],
+                        file.write("%2d|" % bom.vitamins[part])
                     else:
-                        print >> file, "  ",
-
-            print >> file, description
+                        file.write("  |")
+            print >> file, "%3d" % self.vitamins[part], description
 
         print >> file
         print >> file, "Printed:"
         for part in sorted(self.printed):
-            print >> file, "%3d" % self.printed[part],
             if breakdown:
-                print >> file, " " * 10,
                 for ass in sorted(self.assemblies):
                     bom = self.assemblies[ass]
                     if part in bom.printed:
-                        print >> file, "%2d" % bom.printed[part],
+                        file.write("%2d|" % bom.printed[part])
                     else:
-                        print >> file, "  ",
-
-            print >> file, part
+                        file.write("  |")
+            print >> file, "%3d" % self.printed[part], part
 
         print >> file
         if self.assemblies:
diff --git a/mendel/bom/D_connector_assembly.txt b/mendel/bom/D_connector_assembly.txt
index 2e8260d..332dc68 100644
--- a/mendel/bom/D_connector_assembly.txt
+++ b/mendel/bom/D_connector_assembly.txt
@@ -1,15 +1,15 @@
 D_connector_assembly:
 Vitamins:
-  2 CS03016    M3 cap screw x 16
-  2 CS03020    M3 cap screw x 20
-  2 CS03045    M3 cap screw x 45
-  1 DTYPEP9    9 way D plug
-  1 DTYPES9    9 way D socket
-  2 NUTM3      Nut M3
-  2 NYLOCM3    Nyloc nut M3
-  4 PSW0213    No2 pan wood screw x 13
-  4 WA2555     Washer M2.5 x 5 x 0.5
-  8 WA3075     Washer M3 x 7 x 0.5
+  2 M3 cap screw x 16mm
+  2 M3 cap screw x 20mm
+  2 M3 cap screw x 45mm
+  1 9 way D plug
+  1 9 way D socket
+  2 Nut M3
+  2 Nyloc nut M3
+  4 No2 pan wood screw x 13mm
+  4 Washer M2.5 x 5mm x 0.5mm
+  8 Washer M3 x 7mm x 0.5mm
 
 Printed:
   1 d_motor_bracket.stl
diff --git a/mendel/bom/bed_assembly.txt b/mendel/bom/bed_assembly.txt
index 7969c16..691bcf3 100644
--- a/mendel/bom/bed_assembly.txt
+++ b/mendel/bom/bed_assembly.txt
@@ -1,11 +1,11 @@
 bed_assembly:
 Vitamins:
-  4 BD0019     19mm bulldog clip
-  1 BED214214  PCB bed 214 x 214
-  4 CS03010    M3 cap screw x 10
-  1 GL2214202  Glass sheet 214 x 202 x 2
-  4 HP0320     Hex pillar M3 x 20
-  2 WA3075     Washer M3 x 7 x 0.5
+  4 19mm bulldog clip
+  1 PCB bed 214mm x 214mm
+  4 M3 cap screw x 10mm
+  1 Glass sheet 214mm x 202mm x 2mm
+  4 Hex pillar M3 x 20mm
+  2 Washer M3 x 7mm x 0.5mm
 
 Printed:
 
diff --git a/mendel/bom/bed_fan_assembly.txt b/mendel/bom/bed_fan_assembly.txt
index 772bd6c..89530e7 100644
--- a/mendel/bom/bed_fan_assembly.txt
+++ b/mendel/bom/bed_fan_assembly.txt
@@ -1,9 +1,9 @@
 bed_fan_assembly:
 Vitamins:
-  4 CS04020    M4 cap screw x 20
-  1 FAN8038    Fan 80 x 38
-  4 NYLOCM4    Nyloc nut M4
-  4 WA4099     Washer M4 x 9 x 0.9
+  4 M4 cap screw x 20mm
+  1 Fan 80mm x 38mm
+  4 Nyloc nut M4
+  4 Washer M4 x 9mm x 0.9mm
 
 Printed:
   1 fan_guard.stl
diff --git a/mendel/bom/bom.txt b/mendel/bom/bom.txt
index c13b3dd..d5ed138 100644
--- a/mendel/bom/bom.txt
+++ b/mendel/bom/bom.txt
@@ -1,130 +1,130 @@
-                                                                z   
-                                                                    
-                                                                l   
-                D        e                                      i   
-                         l              x           y           m   
-                c        e                                      i   
-                o        c              c           c           t   
-                n     b  t     m        a  x  x     a  y  y        z
-                n     e  r     a     x  r        y  r        z  s   
-                e     d  o  f  c  w     r  i  m     r  i  m     w  m
-                c        n  r  h  a  a  i  d  o  a  i  d  o  a  i  o
-                t  b  f  i  a  i  d  x  a  l  t  x  a  l  t  x  t  t
-                o  e  a  c  m  n  e  i  g  e  o  i  g  e  o  i  c  o
-                r  d  n  s  e  e  s  s  e  r  r  s  e  r  r  s  h  r
 Vitamins:
-  1 AC10468432              1                                        Acrylic sheet 468 x 432 x 10
-  2 AC6170324               2                                        Acrylic sheet 170 x 324 x 6
-  1 AC6224224                                       1                Acrylic sheet 224 x 224 x 6
-  1 AC6468324               1                                        Acrylic sheet 468 x 324 x 6
-  5 AF150234                                        5                Aluminium foil tape 50 x 234 x 0.05
-  3 BB608                         3                                  Ball bearing 608 8 x 22 x 7
-  3 BB624                                  1           2             Ball bearing 624 4 x 13 x 5
-  4 BD0019         4                                                 19mm bulldog clip
-  1 BED214214      1                                                 PCB bed 214 x 214
-  1 BT56674                                      1                   Belt T5 x 6 x 674
-  1 BT56866                          1                               Belt T5 x 6 x 866
-  1 CB6200224                                       1                Corrugated cardboard 200 x 224 x 6
-  8 CS03010        4     4                                           M3 cap screw x 10
- 30 CS03016     2        4                    2  4 14        2     2 M3 cap screw x 16
- 11 CS03020     2                       1                          8 M3 cap screw x 20
-  4 CS03025                             2           2                M3 cap screw x 25
-  2 CS03030                       2                                  M3 cap screw x 30
-  2 CS03045     2                                                    M3 cap screw x 45
-  4 CS04020           4                                              M4 cap screw x 20
-  2 CS04040                                1           1             M4 cap screw x 40
-  1 DTYPEP9     1                                                    9 way D plug
-  1 DTYPES9     1                                                    9 way D socket
-  1 FAN8038           1                                              Fan 80 x 38
-  3 GB0306                        1           1           1          M3 grub screw x 6
-  1 GL2214202      1                                                 Glass sheet 214 x 202 x 2
-  4 HP0320         4                                                 Hex pillar M3 x 20
-  7 HX03016                                2  4                 1    M3 hex screw x 16
-  2 HX04020                       2                                  M4 hex screw x 20
-  2 HX04050                       2                                  M4 hex screw x 50
-  1 HX08060                       1                                  M8 hex screw x 60
-  1 KY240W12L            1                                           PSU e.g. KY240W12L
- 10 LM8UU                               3  2  2     3                LM8UU linear bearing
-  5 NEMA17475                     1           1           1        2 NEMA17 x 47.5 stepper motor
-  6 NUTM3       2                 1     1     1           1          Nut M3
-  2 NUTM4                         2                                  Nut M4
-  3 NUTM8                         1        1  1                      Nut M8
- 45 NYLOCM3     2                       2  2  6  4 16        2  1 10 Nyloc nut M3
-  6 NYLOCM4           4                    1           1             Nyloc nut M4
-  1 PP517402                         1                               Polypropylene strip 402mm x 17mm x 0.5mm
-  1 PP527320                1                                        Polypropylene strip 320mm x 27mm x 0.5mm
-  1 PP529275                1                                        Polypropylene strip 275mm x 29mm x 0.5mm
- 18 PS0308                        3           3           4        8 M3 pan screw x 8
- 38 PS04012                28                                4  2  4 M4 pan screw x 12
- 24 PS04016                11                    8     1  4          M4 pan screw x 16
- 12 PSW0213     4                             2  2           2  2    No2 pan wood screw x 13
-  1 RD822                         1                                  Smooth rod 8 x 22
-  1 RD8270                                       1                   Smooth rod 8 x 270
-  2 RD8275                                                   2       Smooth rod 8 x 275
-  2 RD8382                           2                               Smooth rod 8 x 382
-  1 RD8428                                       1                   Smooth rod 8 x 428
-  1 SANGUINOL            1                                           Electronics e.g. Sanguinolou
-  4 SMMICRO                                   1  1           1  1    Microswitch
-  1 SPR127510                     1                                  Spring 12 x 0.75 x 10
-  2 SPR710010                     2                                  Spring 7 x 1 x 10
-  2 ST8211                                                   2       Threaded rod 8 x 211
-  2 TB7516                                                         2 Tubing OD 7 ID 5 x 16
- 12 WA2555      4                             2  2           2  2    Washer M2.5 x 5 x 0.5
- 87 WA3075      8  2     8        3     2  2  9  4 24     4  2  1 18 Washer M3 x 7 x 0.5
- 74 WA4099            4    39     2        2     8     5  4  4  2  4 Washer M4 x 9 x 0.9
-  4 WA502014                               2           2             Washer M5 x 20 x 1.4
-  1 WA801615                      1                                  Washer M8 x 16 x 1.5
-  2 WING04                              2                            Wingnut M4
-  2 WR301015                                                    2    Rubber washer M3 x 10 x 1.5
- 26 WS3075               8        3           3           4        8 Star washer M3 x 7 x 0.5
- 53 WS4099                 30                    8     1  4  4  2  4 Star washer M4 x 9 x 0.9
-  6 ZT0087                              3           3                Ziptie 87
+                                                 Z   
+                                                     
+                                                 l   
+ D        E                                      i   
+          l              X           Y           m   
+ c        e                                      i   
+ o        c              c           c           t   
+ n     B  t     M        a  X  X     a  Y  Y        Z
+ n     e  r     a     X  r        Y  r        Z  s   
+ e     d  o  F  c  W     r  i  m     r  i  m     w  m
+ c        n  r  h  a  a  i  d  o  a  i  d  o  a  i  o
+ t  B  f  i  a  i  d  x  a  l  t  x  a  l  t  x  t  t
+ o  e  a  c  m  n  e  i  g  e  o  i  g  e  o  i  c  o
+ r  d  n  s  e  e  s  s  e  r  r  s  e  r  r  s  h  r
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Acrylic sheet 468mm x 432mm x 10mm
+  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  2 Acrylic sheet 170mm x 324mm x 6mm
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 Acrylic sheet 224mm x 224mm x 6mm
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Acrylic sheet 468mm x 324mm x 6mm
+  |  |  |  |  |  |  |  |  |  |  |  | 5|  |  |  |  |  |  5 Aluminium foil tape 50mm x 234mm x 0.05mm
+  |  |  |  |  |  | 3|  |  |  |  |  |  |  |  |  |  |  |  3 Ball bearing 608 8mm x 22mm x 7mm
+  |  |  |  |  |  |  |  |  | 1|  |  |  | 2|  |  |  |  |  3 Ball bearing 624 4mm x 13mm x 5mm
+  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 19mm bulldog clip
+  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 PCB bed 214mm x 214mm
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Belt T5 x 6mm x 674mm
+  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  1 Belt T5 x 6mm x 866mm
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 Corrugated cardboard 200mm x 224mm x 6mm
+  | 4|  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  8 M3 cap screw x 10mm
+ 2|  |  | 4|  |  |  |  |  |  | 2| 4|14|  |  | 2|  | 2| 30 M3 cap screw x 16mm
+ 2|  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  | 8| 11 M3 cap screw x 20mm
+  |  |  |  |  |  |  |  | 2|  |  |  | 2|  |  |  |  |  |  4 M3 cap screw x 25mm
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 M3 cap screw x 30mm
+ 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  2 M3 cap screw x 45mm
+  |  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 M4 cap screw x 20mm
+  |  |  |  |  |  |  |  |  | 1|  |  |  | 1|  |  |  |  |  2 M4 cap screw x 40mm
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 9 way D plug
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 9 way D socket
+  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Fan 80mm x 38mm
+  |  |  |  |  |  | 1|  |  |  | 1|  |  |  | 1|  |  |  |  3 M3 grub screw x 6mm
+  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Glass sheet 214mm x 202mm x 2mm
+  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 Hex pillar M3 x 20mm
+  |  |  |  |  |  |  |  |  | 2| 4|  |  |  |  |  | 1|  |  7 M3 hex screw x 16mm
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 M4 hex screw x 20mm
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 M4 hex screw x 50mm
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 M8 hex screw x 60mm
+  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 PSU e.g. KY240W12L
+  |  |  |  |  |  |  |  | 3| 2| 2|  | 3|  |  |  |  |  | 10 LM8UU linear bearing
+  |  |  |  |  |  | 1|  |  |  | 1|  |  |  | 1|  |  | 2|  5 NEMA17 x 47.5mm stepper motor
+ 2|  |  |  |  |  | 1|  | 1|  | 1|  |  |  | 1|  |  |  |  6 Nut M3
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 Nut M4
+  |  |  |  |  |  | 1|  |  | 1| 1|  |  |  |  |  |  |  |  3 Nut M8
+ 2|  |  |  |  |  |  |  | 2| 2| 6| 4|16|  |  | 2| 1|10| 45 Nyloc nut M3
+  |  | 4|  |  |  |  |  |  | 1|  |  |  | 1|  |  |  |  |  6 Nyloc nut M4
+  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  1 Polypropylene strip 402mm x 17mm x 0.5mm
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Polypropylene strip 320mm x 27mm x 0.5mm
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Polypropylene strip 275mm x 29mm x 0.5mm
+  |  |  |  |  |  | 3|  |  |  | 3|  |  |  | 4|  |  | 8| 18 M3 pan screw x 8mm
+  |  |  |  |28|  |  |  |  |  |  |  |  |  |  | 4| 2| 4| 38 M4 pan screw x 12mm
+  |  |  |  |11|  |  |  |  |  |  | 8|  | 1| 4|  |  |  | 24 M4 pan screw x 16mm
+ 4|  |  |  |  |  |  |  |  |  | 2| 2|  |  |  | 2| 2|  | 12 No2 pan wood screw x 13mm
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 Smooth rod 8mm x 22mm
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Smooth rod 8mm x 270mm
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  2 Smooth rod 8mm x 275mm
+  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  2 Smooth rod 8mm x 382mm
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Smooth rod 8mm x 428mm
+  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Electronics e.g. Sanguinolou
+  |  |  |  |  |  |  |  |  |  | 1| 1|  |  |  | 1| 1|  |  4 Microswitch
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 Spring 12mm OD x 0.75mm gauge x 10mm length
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 Spring 7mm OD x 1mm gauge x 10mm length
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  2 Threaded rod M8 x 211mm
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  2 Tubing OD 7mm ID 5mm x 16mm
+ 4|  |  |  |  |  |  |  |  |  | 2| 2|  |  |  | 2| 2|  | 12 Washer M2.5 x 5mm x 0.5mm
+ 8| 2|  | 8|  |  | 3|  | 2| 2| 9| 4|24|  | 4| 2| 1|18| 87 Washer M3 x 7mm x 0.5mm
+  |  | 4|  |39|  | 2|  |  | 2|  | 8|  | 5| 4| 4| 2| 4| 74 Washer M4 x 9mm x 0.9mm
+  |  |  |  |  |  |  |  |  | 2|  |  |  | 2|  |  |  |  |  4 Washer M5 x 20mm x 1.4mm
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 Washer M8 x 16mm x 1.5mm
+  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  2 Wingnut M4
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  2 Rubber washer M3 x 10mm x 1.5mm
+  |  |  | 8|  |  | 3|  |  |  | 3|  |  |  | 4|  |  | 8| 26 Star washer M3 x 7mm x 0.5mm
+  |  |  |  |30|  |  |  |  |  |  | 8|  | 1| 4| 4| 2| 4| 53 Star washer M4 x 9mm x 0.9mm
+  |  |  |  |  |  |  |  | 3|  |  |  | 3|  |  |  |  |  |  6 Ziptie 87mm min length
 
 Printed:
-  2                         2                                        cable_clip_AB.stl
-  2                         2                                        cable_clip_AD.stl
-  1                         1                                        cable_clip_CA.stl
-  1             1                                                    d_motor_bracket.stl
-  1             1                                                    d_motor_bracket_lid.stl
-  1             1                                                    d_shell.stl
-  1             1                                                    d_shell_lid.stl
-  1                   1                                              fan_guard.stl
- 10                        10                                        fixing_block.stl
-  4                      4                                           pcb_spacer.stl
-  2                                           1           1          pulley.stl
-  2             1                             1                      ribbon_clamp_12_33.stl
-  1                                           1                      ribbon_clamp_20_33.stl
-  1                         1                                        ribbon_clamp_20_44.stl
-  2                                                 2                ribbon_clamp_22_33.stl
-  1                         1                                        ribbon_clamp_22_44.stl
-  1                               1                                  wades_big_gear.stl
-  1                               1                                  wades_block.stl
-  1                               1                                  wades_gear_spacer.stl
-  1                               1                                  wades_idler_block.stl
-  1                               1                                  wades_small_gear.stl
-  1                                     1                            x_belt_clamp.stl
-  1                                     1                            x_belt_grip.stl
-  1                                     1                            x_belt_tensioner.stl
-  1                                     1                            x_carriage.stl
-  1                                        1                         x_idler_bracket.stl
-  1                                           1                      x_motor_bracket.stl
-  3                                              3                   y_bar_clamp.stl
-  1                                              1                   y_bar_clamp_switch.stl
-  2                                                 2                y_bearing_mount.stl
-  1                                                 1                y_bearing_mount_switch.stl
-  1                                                 1                y_belt_anchor.stl
-  1                                                 1                y_belt_anchor_toothed.stl
-  1                                                 1                y_belt_clip.stl
-  1                                                 1                y_belt_clip_toothed.stl
-  1                                                    1             y_idler_bracket.stl
-  1                                                       1          y_motor_bracket.stl
-  1                                                          1       z_bar_clamp.stl
-  1                                                          1       z_bar_clamp_switch.stl
-  4                                                                4 z_coupling.stl
-  1                                                             1    z_limit_switch_bracket.stl
-  1                                                                1 z_motor_bracket_lhs.stl
-  1                                                                1 z_motor_bracket_rhs.stl
-  2                                                          2       z_screw_pointer.stl
+  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  2 cable_clip_AB.stl
+  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  2 cable_clip_AD.stl
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 cable_clip_CA.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_motor_bracket.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_motor_bracket_lid.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_shell.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_shell_lid.stl
+  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 fan_guard.stl
+  |  |  |  |10|  |  |  |  |  |  |  |  |  |  |  |  |  | 10 fixing_block.stl
+  |  |  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 pcb_spacer.stl
+  |  |  |  |  |  |  |  |  |  | 1|  |  |  | 1|  |  |  |  2 pulley.stl
+ 1|  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  2 ribbon_clamp_12_33.stl
+  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  1 ribbon_clamp_20_33.stl
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 ribbon_clamp_20_44.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  2 ribbon_clamp_22_33.stl
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 ribbon_clamp_22_44.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_big_gear.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_block.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_gear_spacer.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_idler_block.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_small_gear.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_belt_clamp.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_belt_grip.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_belt_tensioner.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_carriage.stl
+  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  1 x_idler_bracket.stl
+  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  1 x_motor_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  | 3|  |  |  |  |  |  |  3 y_bar_clamp.stl
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 y_bar_clamp_switch.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  2 y_bearing_mount.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_bearing_mount_switch.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_anchor.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_anchor_toothed.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_clip.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_clip_toothed.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  1 y_idler_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  1 y_motor_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  1 z_bar_clamp.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  1 z_bar_clamp_switch.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 4|  4 z_coupling.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  1 z_limit_switch_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  1 z_motor_bracket_lhs.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  1 z_motor_bracket_rhs.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  2 z_screw_pointer.stl
 
 Sub-assemblies:
   1 D_connector_assembly
diff --git a/mendel/bom/electronics_assembly.txt b/mendel/bom/electronics_assembly.txt
index 24fa4a9..7ffdb4c 100644
--- a/mendel/bom/electronics_assembly.txt
+++ b/mendel/bom/electronics_assembly.txt
@@ -1,11 +1,11 @@
 electronics_assembly:
 Vitamins:
-  4 CS03010    M3 cap screw x 10
-  4 CS03016    M3 cap screw x 16
-  1 KY240W12L  PSU e.g. KY240W12L
-  1 SANGUINOL  Electronics e.g. Sanguinolou
-  8 WA3075     Washer M3 x 7 x 0.5
-  8 WS3075     Star washer M3 x 7 x 0.5
+  4 M3 cap screw x 10mm
+  4 M3 cap screw x 16mm
+  1 PSU e.g. KY240W12L
+  1 Electronics e.g. Sanguinolou
+  8 Washer M3 x 7mm x 0.5mm
+  8 Star washer M3 x 7mm x 0.5mm
 
 Printed:
   4 pcb_spacer.stl
diff --git a/mendel/bom/frame_assembly.txt b/mendel/bom/frame_assembly.txt
index 101e390..c5d5a51 100644
--- a/mendel/bom/frame_assembly.txt
+++ b/mendel/bom/frame_assembly.txt
@@ -1,14 +1,14 @@
 frame_assembly:
 Vitamins:
-  1 AC10468432 Acrylic sheet 468 x 432 x 10
-  2 AC6170324  Acrylic sheet 170 x 324 x 6
-  1 AC6468324  Acrylic sheet 468 x 324 x 6
-  1 PP527320   Polypropylene strip 320mm x 27mm x 0.5mm
-  1 PP529275   Polypropylene strip 275mm x 29mm x 0.5mm
- 28 PS04012    M4 pan screw x 12
- 11 PS04016    M4 pan screw x 16
- 39 WA4099     Washer M4 x 9 x 0.9
- 30 WS4099     Star washer M4 x 9 x 0.9
+  1 Acrylic sheet 468mm x 432mm x 10mm
+  2 Acrylic sheet 170mm x 324mm x 6mm
+  1 Acrylic sheet 468mm x 324mm x 6mm
+  1 Polypropylene strip 320mm x 27mm x 0.5mm
+  1 Polypropylene strip 275mm x 29mm x 0.5mm
+ 28 M4 pan screw x 12mm
+ 11 M4 pan screw x 16mm
+ 39 Washer M4 x 9mm x 0.9mm
+ 30 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   2 cable_clip_AB.stl
diff --git a/mendel/bom/wades_assembly.txt b/mendel/bom/wades_assembly.txt
index 0b11666..7990518 100644
--- a/mendel/bom/wades_assembly.txt
+++ b/mendel/bom/wades_assembly.txt
@@ -1,23 +1,23 @@
 wades_assembly:
 Vitamins:
-  3 BB608      Ball bearing 608 8 x 22 x 7
-  2 CS03030    M3 cap screw x 30
-  1 GB0306     M3 grub screw x 6
-  2 HX04020    M4 hex screw x 20
-  2 HX04050    M4 hex screw x 50
-  1 HX08060    M8 hex screw x 60
-  1 NEMA17475  NEMA17 x 47.5 stepper motor
-  1 NUTM3      Nut M3
-  2 NUTM4      Nut M4
-  1 NUTM8      Nut M8
-  3 PS0308     M3 pan screw x 8
-  1 RD822      Smooth rod 8 x 22
-  1 SPR127510  Spring 12 x 0.75 x 10
-  2 SPR710010  Spring 7 x 1 x 10
-  3 WA3075     Washer M3 x 7 x 0.5
-  2 WA4099     Washer M4 x 9 x 0.9
-  1 WA801615   Washer M8 x 16 x 1.5
-  3 WS3075     Star washer M3 x 7 x 0.5
+  3 Ball bearing 608 8mm x 22mm x 7mm
+  2 M3 cap screw x 30mm
+  1 M3 grub screw x 6mm
+  2 M4 hex screw x 20mm
+  2 M4 hex screw x 50mm
+  1 M8 hex screw x 60mm
+  1 NEMA17 x 47.5mm stepper motor
+  1 Nut M3
+  2 Nut M4
+  1 Nut M8
+  3 M3 pan screw x 8mm
+  1 Smooth rod 8mm x 22mm
+  1 Spring 12mm OD x 0.75mm gauge x 10mm length
+  2 Spring 7mm OD x 1mm gauge x 10mm length
+  3 Washer M3 x 7mm x 0.5mm
+  2 Washer M4 x 9mm x 0.9mm
+  1 Washer M8 x 16mm x 1.5mm
+  3 Star washer M3 x 7mm x 0.5mm
 
 Printed:
   1 wades_big_gear.stl
diff --git a/mendel/bom/x_axis_assembly.txt b/mendel/bom/x_axis_assembly.txt
index 005d67c..0b67197 100644
--- a/mendel/bom/x_axis_assembly.txt
+++ b/mendel/bom/x_axis_assembly.txt
@@ -1,8 +1,8 @@
 x_axis_assembly:
 Vitamins:
-  1 BT56866    Belt T5 x 6 x 866
-  1 PP517402   Polypropylene strip 402mm x 17mm x 0.5mm
-  2 RD8382     Smooth rod 8 x 382
+  1 Belt T5 x 6mm x 866mm
+  1 Polypropylene strip 402mm x 17mm x 0.5mm
+  2 Smooth rod 8mm x 382mm
 
 Printed:
 
diff --git a/mendel/bom/x_carriage_assembly.txt b/mendel/bom/x_carriage_assembly.txt
index b374bb3..a21b2b3 100644
--- a/mendel/bom/x_carriage_assembly.txt
+++ b/mendel/bom/x_carriage_assembly.txt
@@ -1,13 +1,13 @@
 x_carriage_assembly:
 Vitamins:
-  1 CS03020    M3 cap screw x 20
-  2 CS03025    M3 cap screw x 25
-  3 LM8UU      LM8UU linear bearing
-  1 NUTM3      Nut M3
-  2 NYLOCM3    Nyloc nut M3
-  2 WA3075     Washer M3 x 7 x 0.5
-  2 WING04     Wingnut M4
-  3 ZT0087     Ziptie 87
+  1 M3 cap screw x 20mm
+  2 M3 cap screw x 25mm
+  3 LM8UU linear bearing
+  1 Nut M3
+  2 Nyloc nut M3
+  2 Washer M3 x 7mm x 0.5mm
+  2 Wingnut M4
+  3 Ziptie 87mm min length
 
 Printed:
   1 x_belt_clamp.stl
diff --git a/mendel/bom/x_idler_assembly.txt b/mendel/bom/x_idler_assembly.txt
index 2728aba..b4b5019 100644
--- a/mendel/bom/x_idler_assembly.txt
+++ b/mendel/bom/x_idler_assembly.txt
@@ -1,15 +1,15 @@
 x_idler_assembly:
 Vitamins:
-  1 BB624      Ball bearing 624 4 x 13 x 5
-  1 CS04040    M4 cap screw x 40
-  2 HX03016    M3 hex screw x 16
-  2 LM8UU      LM8UU linear bearing
-  1 NUTM8      Nut M8
-  2 NYLOCM3    Nyloc nut M3
-  1 NYLOCM4    Nyloc nut M4
-  2 WA3075     Washer M3 x 7 x 0.5
-  2 WA4099     Washer M4 x 9 x 0.9
-  2 WA502014   Washer M5 x 20 x 1.4
+  1 Ball bearing 624 4mm x 13mm x 5mm
+  1 M4 cap screw x 40mm
+  2 M3 hex screw x 16mm
+  2 LM8UU linear bearing
+  1 Nut M8
+  2 Nyloc nut M3
+  1 Nyloc nut M4
+  2 Washer M3 x 7mm x 0.5mm
+  2 Washer M4 x 9mm x 0.9mm
+  2 Washer M5 x 20mm x 1.4mm
 
 Printed:
   1 x_idler_bracket.stl
diff --git a/mendel/bom/x_motor_assembly.txt b/mendel/bom/x_motor_assembly.txt
index 48ab344..b2df0bd 100644
--- a/mendel/bom/x_motor_assembly.txt
+++ b/mendel/bom/x_motor_assembly.txt
@@ -1,19 +1,19 @@
 x_motor_assembly:
 Vitamins:
-  2 CS03016    M3 cap screw x 16
-  1 GB0306     M3 grub screw x 6
-  4 HX03016    M3 hex screw x 16
-  2 LM8UU      LM8UU linear bearing
-  1 NEMA17475  NEMA17 x 47.5 stepper motor
-  1 NUTM3      Nut M3
-  1 NUTM8      Nut M8
-  6 NYLOCM3    Nyloc nut M3
-  3 PS0308     M3 pan screw x 8
-  2 PSW0213    No2 pan wood screw x 13
-  1 SMMICRO    Microswitch
-  2 WA2555     Washer M2.5 x 5 x 0.5
-  9 WA3075     Washer M3 x 7 x 0.5
-  3 WS3075     Star washer M3 x 7 x 0.5
+  2 M3 cap screw x 16mm
+  1 M3 grub screw x 6mm
+  4 M3 hex screw x 16mm
+  2 LM8UU linear bearing
+  1 NEMA17 x 47.5mm stepper motor
+  1 Nut M3
+  1 Nut M8
+  6 Nyloc nut M3
+  3 M3 pan screw x 8mm
+  2 No2 pan wood screw x 13mm
+  1 Microswitch
+  2 Washer M2.5 x 5mm x 0.5mm
+  9 Washer M3 x 7mm x 0.5mm
+  3 Star washer M3 x 7mm x 0.5mm
 
 Printed:
   1 pulley.stl
diff --git a/mendel/bom/y_axis_assembly.txt b/mendel/bom/y_axis_assembly.txt
index 84bcdbd..7710433 100644
--- a/mendel/bom/y_axis_assembly.txt
+++ b/mendel/bom/y_axis_assembly.txt
@@ -1,17 +1,17 @@
 y_axis_assembly:
 Vitamins:
-  1 BT56674    Belt T5 x 6 x 674
-  4 CS03016    M3 cap screw x 16
-  4 NYLOCM3    Nyloc nut M3
-  8 PS04016    M4 pan screw x 16
-  2 PSW0213    No2 pan wood screw x 13
-  1 RD8270     Smooth rod 8 x 270
-  1 RD8428     Smooth rod 8 x 428
-  1 SMMICRO    Microswitch
-  2 WA2555     Washer M2.5 x 5 x 0.5
-  4 WA3075     Washer M3 x 7 x 0.5
-  8 WA4099     Washer M4 x 9 x 0.9
-  8 WS4099     Star washer M4 x 9 x 0.9
+  1 Belt T5 x 6mm x 674mm
+  4 M3 cap screw x 16mm
+  4 Nyloc nut M3
+  8 M4 pan screw x 16mm
+  2 No2 pan wood screw x 13mm
+  1 Smooth rod 8mm x 270mm
+  1 Smooth rod 8mm x 428mm
+  1 Microswitch
+  2 Washer M2.5 x 5mm x 0.5mm
+  4 Washer M3 x 7mm x 0.5mm
+  8 Washer M4 x 9mm x 0.9mm
+  8 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   3 y_bar_clamp.stl
diff --git a/mendel/bom/y_carriage_assembly.txt b/mendel/bom/y_carriage_assembly.txt
index ded2dbd..257895a 100644
--- a/mendel/bom/y_carriage_assembly.txt
+++ b/mendel/bom/y_carriage_assembly.txt
@@ -1,14 +1,14 @@
 y_carriage_assembly:
 Vitamins:
-  1 AC6224224  Acrylic sheet 224 x 224 x 6
-  5 AF150234   Aluminium foil tape 50 x 234 x 0.05
-  1 CB6200224  Corrugated cardboard 200 x 224 x 6
- 14 CS03016    M3 cap screw x 16
-  2 CS03025    M3 cap screw x 25
-  3 LM8UU      LM8UU linear bearing
- 16 NYLOCM3    Nyloc nut M3
- 24 WA3075     Washer M3 x 7 x 0.5
-  3 ZT0087     Ziptie 87
+  1 Acrylic sheet 224mm x 224mm x 6mm
+  5 Aluminium foil tape 50mm x 234mm x 0.05mm
+  1 Corrugated cardboard 200mm x 224mm x 6mm
+ 14 M3 cap screw x 16mm
+  2 M3 cap screw x 25mm
+  3 LM8UU linear bearing
+ 16 Nyloc nut M3
+ 24 Washer M3 x 7mm x 0.5mm
+  3 Ziptie 87mm min length
 
 Printed:
   2 ribbon_clamp_22_33.stl
diff --git a/mendel/bom/y_idler_assembly.txt b/mendel/bom/y_idler_assembly.txt
index 5c8c4c4..baa4d81 100644
--- a/mendel/bom/y_idler_assembly.txt
+++ b/mendel/bom/y_idler_assembly.txt
@@ -1,12 +1,12 @@
 y_idler_assembly:
 Vitamins:
-  2 BB624      Ball bearing 624 4 x 13 x 5
-  1 CS04040    M4 cap screw x 40
-  1 NYLOCM4    Nyloc nut M4
-  1 PS04016    M4 pan screw x 16
-  5 WA4099     Washer M4 x 9 x 0.9
-  2 WA502014   Washer M5 x 20 x 1.4
-  1 WS4099     Star washer M4 x 9 x 0.9
+  2 Ball bearing 624 4mm x 13mm x 5mm
+  1 M4 cap screw x 40mm
+  1 Nyloc nut M4
+  1 M4 pan screw x 16mm
+  5 Washer M4 x 9mm x 0.9mm
+  2 Washer M5 x 20mm x 1.4mm
+  1 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 y_idler_bracket.stl
diff --git a/mendel/bom/y_motor_assembly.txt b/mendel/bom/y_motor_assembly.txt
index d15c4f7..d397ca1 100644
--- a/mendel/bom/y_motor_assembly.txt
+++ b/mendel/bom/y_motor_assembly.txt
@@ -1,14 +1,14 @@
 y_motor_assembly:
 Vitamins:
-  1 GB0306     M3 grub screw x 6
-  1 NEMA17475  NEMA17 x 47.5 stepper motor
-  1 NUTM3      Nut M3
-  4 PS0308     M3 pan screw x 8
-  4 PS04016    M4 pan screw x 16
-  4 WA3075     Washer M3 x 7 x 0.5
-  4 WA4099     Washer M4 x 9 x 0.9
-  4 WS3075     Star washer M3 x 7 x 0.5
-  4 WS4099     Star washer M4 x 9 x 0.9
+  1 M3 grub screw x 6mm
+  1 NEMA17 x 47.5mm stepper motor
+  1 Nut M3
+  4 M3 pan screw x 8mm
+  4 M4 pan screw x 16mm
+  4 Washer M3 x 7mm x 0.5mm
+  4 Washer M4 x 9mm x 0.9mm
+  4 Star washer M3 x 7mm x 0.5mm
+  4 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 pulley.stl
diff --git a/mendel/bom/z_axis_assembly.txt b/mendel/bom/z_axis_assembly.txt
index 891f761..dd07f8d 100644
--- a/mendel/bom/z_axis_assembly.txt
+++ b/mendel/bom/z_axis_assembly.txt
@@ -1,16 +1,16 @@
 z_axis_assembly:
 Vitamins:
-  2 CS03016    M3 cap screw x 16
-  2 NYLOCM3    Nyloc nut M3
-  4 PS04012    M4 pan screw x 12
-  2 PSW0213    No2 pan wood screw x 13
-  2 RD8275     Smooth rod 8 x 275
-  1 SMMICRO    Microswitch
-  2 ST8211     Threaded rod 8 x 211
-  2 WA2555     Washer M2.5 x 5 x 0.5
-  2 WA3075     Washer M3 x 7 x 0.5
-  4 WA4099     Washer M4 x 9 x 0.9
-  4 WS4099     Star washer M4 x 9 x 0.9
+  2 M3 cap screw x 16mm
+  2 Nyloc nut M3
+  4 M4 pan screw x 12mm
+  2 No2 pan wood screw x 13mm
+  2 Smooth rod 8mm x 275mm
+  1 Microswitch
+  2 Threaded rod M8 x 211mm
+  2 Washer M2.5 x 5mm x 0.5mm
+  2 Washer M3 x 7mm x 0.5mm
+  4 Washer M4 x 9mm x 0.9mm
+  4 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 z_bar_clamp.stl
diff --git a/mendel/bom/z_limit_switch_assembly.txt b/mendel/bom/z_limit_switch_assembly.txt
index 2ea50b2..4458586 100644
--- a/mendel/bom/z_limit_switch_assembly.txt
+++ b/mendel/bom/z_limit_switch_assembly.txt
@@ -1,15 +1,15 @@
 z_limit_switch_assembly:
 Vitamins:
-  1 HX03016    M3 hex screw x 16
-  1 NYLOCM3    Nyloc nut M3
-  2 PS04012    M4 pan screw x 12
-  2 PSW0213    No2 pan wood screw x 13
-  1 SMMICRO    Microswitch
-  2 WA2555     Washer M2.5 x 5 x 0.5
-  1 WA3075     Washer M3 x 7 x 0.5
-  2 WA4099     Washer M4 x 9 x 0.9
-  2 WR301015   Rubber washer M3 x 10 x 1.5
-  2 WS4099     Star washer M4 x 9 x 0.9
+  1 M3 hex screw x 16mm
+  1 Nyloc nut M3
+  2 M4 pan screw x 12mm
+  2 No2 pan wood screw x 13mm
+  1 Microswitch
+  2 Washer M2.5 x 5mm x 0.5mm
+  1 Washer M3 x 7mm x 0.5mm
+  2 Washer M4 x 9mm x 0.9mm
+  2 Rubber washer M3 x 10mm x 1.5mm
+  2 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 z_limit_switch_bracket.stl
diff --git a/mendel/bom/z_motor_assembly.txt b/mendel/bom/z_motor_assembly.txt
index 959e03b..ffc933c 100644
--- a/mendel/bom/z_motor_assembly.txt
+++ b/mendel/bom/z_motor_assembly.txt
@@ -1,16 +1,16 @@
 z_motor_assemblies:
 Vitamins:
-  2 CS03016    M3 cap screw x 16
-  8 CS03020    M3 cap screw x 20
-  2 NEMA17475  NEMA17 x 47.5 stepper motor
- 10 NYLOCM3    Nyloc nut M3
-  8 PS0308     M3 pan screw x 8
-  4 PS04012    M4 pan screw x 12
-  2 TB7516     Tubing OD 7 ID 5 x 16
- 18 WA3075     Washer M3 x 7 x 0.5
-  4 WA4099     Washer M4 x 9 x 0.9
-  8 WS3075     Star washer M3 x 7 x 0.5
-  4 WS4099     Star washer M4 x 9 x 0.9
+  2 M3 cap screw x 16mm
+  8 M3 cap screw x 20mm
+  2 NEMA17 x 47.5mm stepper motor
+ 10 Nyloc nut M3
+  8 M3 pan screw x 8mm
+  4 M4 pan screw x 12mm
+  2 Tubing OD 7mm ID 5mm x 16mm
+ 18 Washer M3 x 7mm x 0.5mm
+  4 Washer M4 x 9mm x 0.9mm
+  8 Star washer M3 x 7mm x 0.5mm
+  4 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   4 z_coupling.stl
diff --git a/scad/bed.scad b/scad/bed.scad
index 3efa1fb..f3e46bd 100644
--- a/scad/bed.scad
+++ b/scad/bed.scad
@@ -30,7 +30,7 @@ module bed_assembly() {
     }
 
     translate([0, 0, washer_thickness(M3_washer)]) {
-        vitamin(str("BED", bed_width, bed_depth,": PCB bed ", bed_width, " x ", bed_depth));
+        vitamin(str("BED", bed_width, bed_depth,": PCB bed ", bed_width, "mm x ", bed_depth, "mm"));
         translate([0,0, pillar_height(bed_pillars) + pcb_thickness / 2])
             color(bed_color) cube([bed_width, bed_depth, pcb_thickness], center = true);
 
diff --git a/scad/conf/vitamins.scad b/scad/conf/vitamins.scad
index 05ab2ec..b7ff2c8 100644
--- a/scad/conf/vitamins.scad
+++ b/scad/conf/vitamins.scad
@@ -27,20 +27,20 @@ include <../vitamins/electronics.scad>
 
 
 module rod(d , l) {
-    vitamin(str("RD", d, round(l), ": Smooth rod ", d, " x ", round(l)));
+    vitamin(str("RD", d, round(l), ": Smooth rod ", d, "mm x ", round(l), "mm"));
     color(rod_color)
         cylinder(r = d / 2, h = l, center = true);
 }
 
 module studding(d , l) {
-    vitamin(str("ST", d, round(l),": Threaded rod ", d, " x ", round(l)));
+    vitamin(str("ST", d, round(l),": Threaded rod M", d, " x ", round(l), "mm"));
     color(studding_color)
         cylinder(r = d / 2, h = l, center = true);
 }
 
 
 module tubing(od, id, length) {
-    vitamin(str("TB", od, id, length,": Tubing OD ",od, " ID ", id," x ",length));
+    vitamin(str("TB", od, id, length,": Tubing OD ",od, "mm ID ", id,"mm x ",length, "mm"));
     color(tubing_color) render() difference() {
         cylinder(r = od / 2, h = length,    center = true);
         cylinder(r = id / 2, h = length + 1, center = true);
diff --git a/scad/vitamins/ball-bearings.scad b/scad/vitamins/ball-bearings.scad
index 43fc401..82d1f06 100644
--- a/scad/vitamins/ball-bearings.scad
+++ b/scad/vitamins/ball-bearings.scad
@@ -14,7 +14,7 @@ function ball_bearing_diameter(type) = type[1];
 function ball_bearing_width(type) = type[2];
 
 module ball_bearing(type) {
-    vitamin(str("BB",type[3],": Ball bearing ",type[3]," ",type[0], " x ", type[1], " x ", type[2]));
+    vitamin(str("BB",type[3],": Ball bearing ",type[3]," ",type[0], "mm x ", type[1], "mm x ", type[2], "mm"));
     rim = type[1] / 10;
 
     color(bearing_color) render() difference() {
diff --git a/scad/vitamins/belts.scad b/scad/vitamins/belts.scad
index 6fd37e8..e2449e9 100644
--- a/scad/vitamins/belts.scad
+++ b/scad/vitamins/belts.scad
@@ -23,7 +23,7 @@ module belt(type, x1, y1, r1, x2, y2, r2, gap = 0) {
     dy = y2 - y1;
 
     length = pi * (r1 + r2) + 2 * sqrt(dx * dx + dy * dy) - gap;
-    vitamin(str("BT", belt_pitch(type),width, round(length), ": Belt T", belt_pitch(type)," x ", width, " x ", round(length)));
+    vitamin(str("BT", belt_pitch(type),width, round(length), ": Belt T", belt_pitch(type)," x ", width, "mm x ", round(length), "mm"));
 
     color(belt_color)
     linear_extrude(height = width, center = true, convexity = 6) {
diff --git a/scad/vitamins/fans.scad b/scad/vitamins/fans.scad
index 9b9fad0..df08e3e 100644
--- a/scad/vitamins/fans.scad
+++ b/scad/vitamins/fans.scad
@@ -27,7 +27,7 @@ module fan(type) {
     corner_radius = width / 2 - hole_pitch;
     screw = fan_screw(type);
 
-    vitamin(str("FAN", fan_width(type), fan_depth(type), ": Fan ", fan_width(type), " x ", fan_depth(type)));
+    vitamin(str("FAN", fan_width(type), fan_depth(type), ": Fan ", fan_width(type), "mm x ", fan_depth(type), "mm"));
     difference() {
         linear_extrude(height = depth, center = true, convexity = 4)
             difference() {
diff --git a/scad/vitamins/pillars.scad b/scad/vitamins/pillars.scad
index 9ec50ff..49eb9eb 100644
--- a/scad/vitamins/pillars.scad
+++ b/scad/vitamins/pillars.scad
@@ -28,7 +28,7 @@ module pillar(type) {
 module hex_pillar(type) {
     height = pillar_height(type);
 
-    vitamin(str("HP0", type[0], height, " : Hex pillar M", type[0], " x ", height));
+    vitamin(str("HP0", type[0], height, " : Hex pillar M", type[0], " x ", height, "mm"));
     color(pillar_color) render() difference() {
         union() {
             cylinder(h = height, r = type[2] / 2, $fn = 6);
diff --git a/scad/vitamins/screws.scad b/scad/vitamins/screws.scad
index 8897c6e..a86e8d2 100644
--- a/scad/vitamins/screws.scad
+++ b/scad/vitamins/screws.scad
@@ -54,7 +54,7 @@ function screw_head_height(type) = type[2] == hs_cap ? type[4] :
 
 
 module screw(type, length) {
-    vitamin(str(type[0], length,": ",type[1], " x ", length));
+    vitamin(str(type[0], length,": ",type[1], " x ", length, "mm"));
 
     head_type = type[2];
     rad = screw_radius(type) - eta;
diff --git a/scad/vitamins/sheet.scad b/scad/vitamins/sheet.scad
index 60c2a77..3f5bf14 100644
--- a/scad/vitamins/sheet.scad
+++ b/scad/vitamins/sheet.scad
@@ -51,7 +51,7 @@ module corner(r) {
 
 module sheet(type, w, d, corners = [0, 0, 0, 0]) {
     t = sheet_thickness(type);
-    vitamin(str(type[0], ceil(t), round(w), round(d),": ",type[1]," ",  round(w), " x ", round(d), " x ", t));
+    vitamin(str(type[0], ceil(t), round(w), round(d),": ",type[1]," ",  round(w), "mm x ", round(d), "mm x ", t, "mm"));
     color(sheet_colour(type))
         linear_extrude(height = t, center = true)
             hull() {
diff --git a/scad/vitamins/springs.scad b/scad/vitamins/springs.scad
index f33adfd..6ca43d8 100644
--- a/scad/vitamins/springs.scad
+++ b/scad/vitamins/springs.scad
@@ -8,9 +8,14 @@
 // Springs
 //
 
-extruder_spring = [7, 1, 10, 5];
+extruder_spring = [ 7,    1, 10, 5];
 hob_spring      = [12, 0.75, 10, 6];
 
+function spring_od(type)     = type[0];
+function spring_gauge(type)  = type[1];
+function spring_length(type) = type[2];
+function spring_coils(type)  = type[3];
+
 // taken from openscad example 20
 module coil(r1 = 100, r2 = 10, h = 100, twists)
 {
@@ -49,12 +54,14 @@ module coil(r1 = 100, r2 = 10, h = 100, twists)
 }
 
 
-module comp_spring(spring, l = 0) {
-    l = (l == 0) ? spring[2] : l;
+module comp_spring(type, l = 0) {
+    l = (l == 0) ? spring_length(type) : l;
 
-    vitamin(str("SPR",  spring[0], spring[1] * 100, spring[2], ": Spring ", spring[0], " x ", spring[1], " x ", spring[2] ));
+    vitamin(str("SPR", spring_od(type), spring_gauge(type) * 100, type[2],
+                ": Spring ", spring_od(type), "mm OD x ", spring_gauge(type), "mm gauge x ", spring_length(type), "mm length" ));
 
-    color(spring_color) render() coil(r1 = (spring[0] - spring[1])/ 2, r2 = spring[1] / 2, h = l, twists = spring[3]);
+    color(spring_color) render()
+        coil(r1 = (spring_od(type) - spring_gauge(type)) / 2, r2 = spring_gauge(type) / 2, h = l, twists = spring_coils(type));
 
 }
 
diff --git a/scad/vitamins/stepper-motors.scad b/scad/vitamins/stepper-motors.scad
index 20a0bb4..ddc8685 100644
--- a/scad/vitamins/stepper-motors.scad
+++ b/scad/vitamins/stepper-motors.scad
@@ -29,7 +29,7 @@ module NEMA(motor) {
     boss_height = motor[5];
     shaft_rad = motor[6] / 2;
     cap = 8;
-    vitamin(str("NEMA", round(motor[0] / 2.54), length * 10, ": NEMA", round(motor[0] / 2.54), " x ", length, " stepper motor"));
+    vitamin(str("NEMA", round(motor[0] / 2.54), length * 10, ": NEMA", round(motor[0] / 2.54), " x ", length, "mm stepper motor"));
     union() {
         color(stepper_body_color) render()                                                     // black laminations
             translate([0,0, -length / 2])
diff --git a/scad/vitamins/washers.scad b/scad/vitamins/washers.scad
index d381c4b..eb96c17 100644
--- a/scad/vitamins/washers.scad
+++ b/scad/vitamins/washers.scad
@@ -24,9 +24,9 @@ function washer_color(type) = washer_soft(type) ? soft_washer_color : hard_washe
 
 module washer(type) {
     if(washer_soft(type))
-        vitamin(str("WR", type[0] * 10, type[1], type[2] * 10, ": Rubber washer M",type[0], " x ", type[1], " x ", type[2]));
+        vitamin(str("WR", type[0] * 10, type[1], type[2] * 10, ": Rubber washer M",type[0], " x ", type[1], "mm x ", type[2], "mm"));
     else
-        vitamin(str("WA", type[0] * 10, type[1], type[2] * 10, ": Washer M",type[0], " x ", type[1], " x ", type[2]));
+        vitamin(str("WA", type[0] * 10, type[1], type[2] * 10, ": Washer M",type[0], " x ", type[1], "mm x ", type[2], "mm"));
     color(washer_color(type))  render() difference() {
         cylinder(r = washer_diameter(type) / 2, h = washer_thickness(type));
         cylinder(r = type[0] / 2, h = 2 * washer_thickness(type) + 1, center = true);
@@ -38,7 +38,7 @@ module star_washer(type) {
     rad = washer_diameter(type) / 2;
     inner = (hole + rad) / 2;
     spoke  = rad - hole;
-    vitamin(str("WS", type[0] * 10, type[1], type[2] * 10, ": Star washer M",type[0], " x ", type[1], " x ", type[2]));
+    vitamin(str("WS", type[0] * 10, type[1], type[2] * 10, ": Star washer M",type[0], " x ", type[1], "mm x ", type[2], "mm"));
     color(star_washer_color) render() difference() {
         cylinder(r = rad, h = washer_thickness(type));
         cylinder(r = hole, h = 2 * washer_thickness(type) + 1, center = true);
diff --git a/scad/vitamins/ziptie.scad b/scad/vitamins/ziptie.scad
index 4174a8b..de85f8b 100644
--- a/scad/vitamins/ziptie.scad
+++ b/scad/vitamins/ziptie.scad
@@ -18,7 +18,7 @@ module ziptie(type, r)
 {
     latch = type[2];
     length = ceil(2 * PI * r + type[4] + latch[2] + 1);
-    vitamin(str("ZT00", length, ": Ziptie ",length));
+    vitamin(str("ZT00", length, ": Ziptie ", length, "mm min length"));
 
     angle = asin((latch[0] / 2) / r) - asin(ziptie_thickness(type) / latch[0]);
     color(type[3]) render() union() {
diff --git a/sturdy/bom/D_connector_assembly.txt b/sturdy/bom/D_connector_assembly.txt
index 2e8260d..332dc68 100644
--- a/sturdy/bom/D_connector_assembly.txt
+++ b/sturdy/bom/D_connector_assembly.txt
@@ -1,15 +1,15 @@
 D_connector_assembly:
 Vitamins:
-  2 CS03016    M3 cap screw x 16
-  2 CS03020    M3 cap screw x 20
-  2 CS03045    M3 cap screw x 45
-  1 DTYPEP9    9 way D plug
-  1 DTYPES9    9 way D socket
-  2 NUTM3      Nut M3
-  2 NYLOCM3    Nyloc nut M3
-  4 PSW0213    No2 pan wood screw x 13
-  4 WA2555     Washer M2.5 x 5 x 0.5
-  8 WA3075     Washer M3 x 7 x 0.5
+  2 M3 cap screw x 16mm
+  2 M3 cap screw x 20mm
+  2 M3 cap screw x 45mm
+  1 9 way D plug
+  1 9 way D socket
+  2 Nut M3
+  2 Nyloc nut M3
+  4 No2 pan wood screw x 13mm
+  4 Washer M2.5 x 5mm x 0.5mm
+  8 Washer M3 x 7mm x 0.5mm
 
 Printed:
   1 d_motor_bracket.stl
diff --git a/sturdy/bom/bed_assembly.txt b/sturdy/bom/bed_assembly.txt
index 7969c16..691bcf3 100644
--- a/sturdy/bom/bed_assembly.txt
+++ b/sturdy/bom/bed_assembly.txt
@@ -1,11 +1,11 @@
 bed_assembly:
 Vitamins:
-  4 BD0019     19mm bulldog clip
-  1 BED214214  PCB bed 214 x 214
-  4 CS03010    M3 cap screw x 10
-  1 GL2214202  Glass sheet 214 x 202 x 2
-  4 HP0320     Hex pillar M3 x 20
-  2 WA3075     Washer M3 x 7 x 0.5
+  4 19mm bulldog clip
+  1 PCB bed 214mm x 214mm
+  4 M3 cap screw x 10mm
+  1 Glass sheet 214mm x 202mm x 2mm
+  4 Hex pillar M3 x 20mm
+  2 Washer M3 x 7mm x 0.5mm
 
 Printed:
 
diff --git a/sturdy/bom/bed_fan_assembly.txt b/sturdy/bom/bed_fan_assembly.txt
index 508d91f..107beb3 100644
--- a/sturdy/bom/bed_fan_assembly.txt
+++ b/sturdy/bom/bed_fan_assembly.txt
@@ -1,9 +1,9 @@
 bed_fan_assembly:
 Vitamins:
-  4 CS04025    M4 cap screw x 25
-  1 FAN8038    Fan 80 x 38
-  4 NYLOCM4    Nyloc nut M4
-  4 WA4099     Washer M4 x 9 x 0.9
+  4 M4 cap screw x 25mm
+  1 Fan 80mm x 38mm
+  4 Nyloc nut M4
+  4 Washer M4 x 9mm x 0.9mm
 
 Printed:
   1 fan_guard.stl
diff --git a/sturdy/bom/bom.txt b/sturdy/bom/bom.txt
index 0751f8c..c89d3e5 100644
--- a/sturdy/bom/bom.txt
+++ b/sturdy/bom/bom.txt
@@ -1,132 +1,132 @@
-                                                                z   
-                                                                    
-                                                                l   
-                D        e                                      i   
-                         l              x           y           m   
-                c        e                                      i   
-                o        c              c           c           t   
-                n     b  t     m        a  x  x     a  y  y        z
-                n     e  r     a     x  r        y  r        z  s   
-                e     d  o  f  c  w     r  i  m     r  i  m     w  m
-                c        n  r  h  a  a  i  d  o  a  i  d  o  a  i  o
-                t  b  f  i  a  i  d  x  a  l  t  x  a  l  t  x  t  t
-                o  e  a  c  m  n  e  i  g  e  o  i  g  e  o  i  c  o
-                r  d  n  s  e  e  s  s  e  r  r  s  e  r  r  s  h  r
 Vitamins:
-  5 AF150234                                        5                Aluminium foil tape 50 x 234 x 0.05
-  3 BB608                         3                                  Ball bearing 608 8 x 22 x 7
-  3 BB624                                  1           2             Ball bearing 624 4 x 13 x 5
-  4 BD0019         4                                                 19mm bulldog clip
-  1 BED214214      1                                                 PCB bed 214 x 214
-  1 BT56709                                      1                   Belt T5 x 6 x 709
-  1 BT56902                          1                               Belt T5 x 6 x 902
-  1 CB6200224                                       1                Corrugated cardboard 200 x 224 x 6
-  4 CS03010        4                                                 M3 cap screw x 10
- 20 CS03016     2        8                    2     8                M3 cap screw x 16
- 11 CS03020     2                       1                          8 M3 cap screw x 20
-  2 CS03025                             2                            M3 cap screw x 25
-  2 CS03030                       2                                  M3 cap screw x 30
-  2 CS03045     2                                                    M3 cap screw x 45
-  6 CS04016                                         6                M4 cap screw x 16
-  8 CS04020                                      4           2     2 M4 cap screw x 20
-  6 CS04025           4                             2                M4 cap screw x 25
-  2 CS04040                                1           1             M4 cap screw x 40
-  1 DB3224224                                       1                Dibond sheet 224 x 224 x 3
-  1 DTYPEP9     1                                                    9 way D plug
-  1 DTYPES9     1                                                    9 way D socket
-  1 FAN8038           1                                              Fan 80 x 38
-  3 GB0306                        1           1           1          M3 grub screw x 6
-  1 GL2214202      1                                                 Glass sheet 214 x 202 x 2
-  4 HP0320         4                                                 Hex pillar M3 x 20
-  3 HX03016                                   2                 1    M3 hex screw x 16
-  4 HX04016                                2  2                      M4 hex screw x 16
-  2 HX04020                       2                                  M4 hex screw x 20
-  2 HX04050                       2                                  M4 hex screw x 50
-  1 HX08060                       1                                  M8 hex screw x 60
-  1 KY240W12L            1                                           PSU e.g. KY240W12L
- 10 LM10UU                              3  2  2     3                LM10UU linear bearing
-  2 MD12169330              2                                        MDF sheet 169 x 330 x 12
-  1 MD12486330              1                                        MDF sheet 486 x 330 x 12
-  1 MD12486450              1                                        MDF sheet 486 x 450 x 12
-  5 NEMA17475                     1           1           1        2 NEMA17 x 47.5 stepper motor
-  6 NUTM3       2                 1     1     1           1          Nut M3
-  2 NUTM4                         2                                  Nut M4
-  3 NUTM8                         1        1  1                      Nut M8
- 25 NYLOCM3     2                       2     4     8           1  8 Nyloc nut M3
- 26 NYLOCM4           4                    3  2  4  8  1     2     2 Nyloc nut M4
-  1 PP517416                         1                               Polypropylene strip 416mm x 17mm x 0.5mm
-  1 PP527354                1                                        Polypropylene strip 354mm x 27mm x 0.5mm
-  1 PP529284                1                                        Polypropylene strip 284mm x 29mm x 0.5mm
- 18 PS0308                        3           3           4        8 M3 pan screw x 8
- 12 PSW0213     4                             2  2           2  2    No2 pan wood screw x 13
- 62 PSW0616                39                    8     1  4  4  2  4 No6 pan wood screw x 16
-  2 RD10281                                                  2       Smooth rod 10 x 281
-  1 RD10293                                      1                   Smooth rod 10 x 293
-  2 RD10400                          2                               Smooth rod 10 x 400
-  1 RD10446                                      1                   Smooth rod 10 x 446
-  1 RD822                         1                                  Smooth rod 8 x 22
-  1 SANGUINOL            1                                           Electronics e.g. Sanguinolou
-  4 SMMICRO                                   1  1           1  1    Microswitch
-  1 SPR127510                     1                                  Spring 12 x 0.75 x 10
-  2 SPR710010                     2                                  Spring 7 x 1 x 10
-  2 ST8219                                                   2       Threaded rod 8 x 219
-  2 TB7516                                                         2 Tubing OD 7 ID 5 x 16
- 12 WA2555      4                             2  2           2  2    Washer M2.5 x 5 x 0.5
- 59 WA3075      8  2     8        3     2     7     8     4     1 16 Washer M3 x 7 x 0.5
-102 WA4099            4    39     2        4  2 12 16  5  4  6  2  6 Washer M4 x 9 x 0.9
-  4 WA502014                               2           2             Washer M5 x 20 x 1.4
-  1 WA801615                      1                                  Washer M8 x 16 x 1.5
-  2 WING04                              2                            Wingnut M4
-  2 WR301015                                                    2    Rubber washer M3 x 10 x 1.5
- 26 WS3075               8        3           3           4        8 Star washer M3 x 7 x 0.5
- 53 WS4099                 30                    8     1  4  4  2  4 Star washer M4 x 9 x 0.9
-  6 ZT00100                             3           3                Ziptie 100
+                                                 Z   
+                                                     
+                                                 l   
+ D        E                                      i   
+          l              X           Y           m   
+ c        e                                      i   
+ o        c              c           c           t   
+ n     B  t     M        a  X  X     a  Y  Y        Z
+ n     e  r     a     X  r        Y  r        Z  s   
+ e     d  o  F  c  W     r  i  m     r  i  m     w  m
+ c        n  r  h  a  a  i  d  o  a  i  d  o  a  i  o
+ t  B  f  i  a  i  d  x  a  l  t  x  a  l  t  x  t  t
+ o  e  a  c  m  n  e  i  g  e  o  i  g  e  o  i  c  o
+ r  d  n  s  e  e  s  s  e  r  r  s  e  r  r  s  h  r
+  |  |  |  |  |  |  |  |  |  |  |  | 5|  |  |  |  |  |  5 Aluminium foil tape 50mm x 234mm x 0.05mm
+  |  |  |  |  |  | 3|  |  |  |  |  |  |  |  |  |  |  |  3 Ball bearing 608 8mm x 22mm x 7mm
+  |  |  |  |  |  |  |  |  | 1|  |  |  | 2|  |  |  |  |  3 Ball bearing 624 4mm x 13mm x 5mm
+  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 19mm bulldog clip
+  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 PCB bed 214mm x 214mm
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Belt T5 x 6mm x 709mm
+  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  1 Belt T5 x 6mm x 902mm
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 Corrugated cardboard 200mm x 224mm x 6mm
+  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 M3 cap screw x 10mm
+ 2|  |  | 8|  |  |  |  |  |  | 2|  | 8|  |  |  |  |  | 20 M3 cap screw x 16mm
+ 2|  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  | 8| 11 M3 cap screw x 20mm
+  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  2 M3 cap screw x 25mm
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 M3 cap screw x 30mm
+ 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  2 M3 cap screw x 45mm
+  |  |  |  |  |  |  |  |  |  |  |  | 6|  |  |  |  |  |  6 M4 cap screw x 16mm
+  |  |  |  |  |  |  |  |  |  |  | 4|  |  |  | 2|  | 2|  8 M4 cap screw x 20mm
+  |  | 4|  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  6 M4 cap screw x 25mm
+  |  |  |  |  |  |  |  |  | 1|  |  |  | 1|  |  |  |  |  2 M4 cap screw x 40mm
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 Dibond sheet 224mm x 224mm x 3mm
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 9 way D plug
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 9 way D socket
+  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Fan 80mm x 38mm
+  |  |  |  |  |  | 1|  |  |  | 1|  |  |  | 1|  |  |  |  3 M3 grub screw x 6mm
+  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Glass sheet 214mm x 202mm x 2mm
+  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 Hex pillar M3 x 20mm
+  |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  | 1|  |  3 M3 hex screw x 16mm
+  |  |  |  |  |  |  |  |  | 2| 2|  |  |  |  |  |  |  |  4 M4 hex screw x 16mm
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 M4 hex screw x 20mm
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 M4 hex screw x 50mm
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 M8 hex screw x 60mm
+  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 PSU e.g. KY240W12L
+  |  |  |  |  |  |  |  | 3| 2| 2|  | 3|  |  |  |  |  | 10 LM10UU linear bearing
+  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  2 MDF sheet 169mm x 330mm x 12mm
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 MDF sheet 486mm x 330mm x 12mm
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 MDF sheet 486mm x 450mm x 12mm
+  |  |  |  |  |  | 1|  |  |  | 1|  |  |  | 1|  |  | 2|  5 NEMA17 x 47.5mm stepper motor
+ 2|  |  |  |  |  | 1|  | 1|  | 1|  |  |  | 1|  |  |  |  6 Nut M3
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 Nut M4
+  |  |  |  |  |  | 1|  |  | 1| 1|  |  |  |  |  |  |  |  3 Nut M8
+ 2|  |  |  |  |  |  |  | 2|  | 4|  | 8|  |  |  | 1| 8| 25 Nyloc nut M3
+  |  | 4|  |  |  |  |  |  | 3| 2| 4| 8| 1|  | 2|  | 2| 26 Nyloc nut M4
+  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  1 Polypropylene strip 416mm x 17mm x 0.5mm
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Polypropylene strip 354mm x 27mm x 0.5mm
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Polypropylene strip 284mm x 29mm x 0.5mm
+  |  |  |  |  |  | 3|  |  |  | 3|  |  |  | 4|  |  | 8| 18 M3 pan screw x 8mm
+ 4|  |  |  |  |  |  |  |  |  | 2| 2|  |  |  | 2| 2|  | 12 No2 pan wood screw x 13mm
+  |  |  |  |39|  |  |  |  |  |  | 8|  | 1| 4| 4| 2| 4| 62 No6 pan wood screw x 16mm
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  2 Smooth rod 10mm x 281mm
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Smooth rod 10mm x 293mm
+  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  2 Smooth rod 10mm x 400mm
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 Smooth rod 10mm x 446mm
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 Smooth rod 8mm x 22mm
+  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 Electronics e.g. Sanguinolou
+  |  |  |  |  |  |  |  |  |  | 1| 1|  |  |  | 1| 1|  |  4 Microswitch
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 Spring 12mm OD x 0.75mm gauge x 10mm length
+  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  2 Spring 7mm OD x 1mm gauge x 10mm length
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  2 Threaded rod M8 x 219mm
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  2 Tubing OD 7mm ID 5mm x 16mm
+ 4|  |  |  |  |  |  |  |  |  | 2| 2|  |  |  | 2| 2|  | 12 Washer M2.5 x 5mm x 0.5mm
+ 8| 2|  | 8|  |  | 3|  | 2|  | 7|  | 8|  | 4|  | 1|16| 59 Washer M3 x 7mm x 0.5mm
+  |  | 4|  |39|  | 2|  |  | 4| 2|12|16| 5| 4| 6| 2| 6|102 Washer M4 x 9mm x 0.9mm
+  |  |  |  |  |  |  |  |  | 2|  |  |  | 2|  |  |  |  |  4 Washer M5 x 20mm x 1.4mm
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 Washer M8 x 16mm x 1.5mm
+  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  2 Wingnut M4
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  2 Rubber washer M3 x 10mm x 1.5mm
+  |  |  | 8|  |  | 3|  |  |  | 3|  |  |  | 4|  |  | 8| 26 Star washer M3 x 7mm x 0.5mm
+  |  |  |  |30|  |  |  |  |  |  | 8|  | 1| 4| 4| 2| 4| 53 Star washer M4 x 9mm x 0.9mm
+  |  |  |  |  |  |  |  | 3|  |  |  | 3|  |  |  |  |  |  6 Ziptie 100mm min length
 
 Printed:
-  2                         2                                        cable_clip_AB.stl
-  2                         2                                        cable_clip_AD.stl
-  1                         1                                        cable_clip_CA.stl
-  1             1                                                    d_motor_bracket.stl
-  1             1                                                    d_motor_bracket_lid.stl
-  1             1                                                    d_shell.stl
-  1             1                                                    d_shell_lid.stl
-  1                   1                                              fan_guard.stl
- 10                        10                                        fixing_block.stl
-  4                      4                                           pcb_spacer.stl
-  2                                           1           1          pulley.stl
-  2             1                             1                      ribbon_clamp_12_33.stl
-  1                                           1                      ribbon_clamp_20_33.stl
-  1                         1                                        ribbon_clamp_20_40.stl
-  1                         1                                        ribbon_clamp_22_40.stl
-  2                                                 2                ribbon_clamp_22_44.stl
-  1                               1                                  wades_big_gear.stl
-  1                               1                                  wades_block.stl
-  1                               1                                  wades_gear_spacer.stl
-  1                               1                                  wades_idler_block.stl
-  1                               1                                  wades_small_gear.stl
-  1                                     1                            x_belt_clamp.stl
-  1                                     1                            x_belt_grip.stl
-  1                                     1                            x_belt_tensioner.stl
-  1                                     1                            x_carriage.stl
-  1                                        1                         x_idler_bracket.stl
-  1                                           1                      x_motor_bracket.stl
-  3                                              3                   y_bar_clamp.stl
-  1                                              1                   y_bar_clamp_switch.stl
-  2                                                 2                y_bearing_mount.stl
-  1                                                 1                y_bearing_mount_switch.stl
-  1                                                 1                y_belt_anchor.stl
-  1                                                 1                y_belt_anchor_toothed.stl
-  1                                                 1                y_belt_clip.stl
-  1                                                 1                y_belt_clip_toothed.stl
-  1                                                    1             y_idler_bracket.stl
-  1                                                       1          y_motor_bracket.stl
-  1                                                          1       z_bar_clamp.stl
-  1                                                          1       z_bar_clamp_switch.stl
-  4                                                                4 z_coupling.stl
-  1                                                             1    z_limit_switch_bracket.stl
-  1                                                                1 z_motor_bracket_lhs.stl
-  1                                                                1 z_motor_bracket_rhs.stl
-  2                                                          2       z_screw_pointer.stl
+  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  2 cable_clip_AB.stl
+  |  |  |  | 2|  |  |  |  |  |  |  |  |  |  |  |  |  |  2 cable_clip_AD.stl
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 cable_clip_CA.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_motor_bracket.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_motor_bracket_lid.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_shell.stl
+ 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 d_shell_lid.stl
+  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  1 fan_guard.stl
+  |  |  |  |10|  |  |  |  |  |  |  |  |  |  |  |  |  | 10 fixing_block.stl
+  |  |  | 4|  |  |  |  |  |  |  |  |  |  |  |  |  |  |  4 pcb_spacer.stl
+  |  |  |  |  |  |  |  |  |  | 1|  |  |  | 1|  |  |  |  2 pulley.stl
+ 1|  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  2 ribbon_clamp_12_33.stl
+  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  1 ribbon_clamp_20_33.stl
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 ribbon_clamp_20_40.stl
+  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  |  |  1 ribbon_clamp_22_40.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  2 ribbon_clamp_22_44.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_big_gear.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_block.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_gear_spacer.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_idler_block.stl
+  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  |  |  1 wades_small_gear.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_belt_clamp.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_belt_grip.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_belt_tensioner.stl
+  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  |  1 x_carriage.stl
+  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  |  1 x_idler_bracket.stl
+  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  |  1 x_motor_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  | 3|  |  |  |  |  |  |  3 y_bar_clamp.stl
+  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  |  1 y_bar_clamp_switch.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  |  |  |  2 y_bearing_mount.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_bearing_mount_switch.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_anchor.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_anchor_toothed.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_clip.stl
+  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  |  1 y_belt_clip_toothed.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  |  1 y_idler_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  |  1 y_motor_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  1 z_bar_clamp.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  |  1 z_bar_clamp_switch.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 4|  4 z_coupling.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  |  1 z_limit_switch_bracket.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  1 z_motor_bracket_lhs.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 1|  1 z_motor_bracket_rhs.stl
+  |  |  |  |  |  |  |  |  |  |  |  |  |  |  | 2|  |  |  2 z_screw_pointer.stl
 
 Sub-assemblies:
   1 D_connector_assembly
diff --git a/sturdy/bom/electronics_assembly.txt b/sturdy/bom/electronics_assembly.txt
index 4128d27..b6a1a03 100644
--- a/sturdy/bom/electronics_assembly.txt
+++ b/sturdy/bom/electronics_assembly.txt
@@ -1,10 +1,10 @@
 electronics_assembly:
 Vitamins:
-  8 CS03016    M3 cap screw x 16
-  1 KY240W12L  PSU e.g. KY240W12L
-  1 SANGUINOL  Electronics e.g. Sanguinolou
-  8 WA3075     Washer M3 x 7 x 0.5
-  8 WS3075     Star washer M3 x 7 x 0.5
+  8 M3 cap screw x 16mm
+  1 PSU e.g. KY240W12L
+  1 Electronics e.g. Sanguinolou
+  8 Washer M3 x 7mm x 0.5mm
+  8 Star washer M3 x 7mm x 0.5mm
 
 Printed:
   4 pcb_spacer.stl
diff --git a/sturdy/bom/frame_assembly.txt b/sturdy/bom/frame_assembly.txt
index 23ea0fb..049db9a 100644
--- a/sturdy/bom/frame_assembly.txt
+++ b/sturdy/bom/frame_assembly.txt
@@ -1,13 +1,13 @@
 frame_assembly:
 Vitamins:
-  2 MD12169330 MDF sheet 169 x 330 x 12
-  1 MD12486330 MDF sheet 486 x 330 x 12
-  1 MD12486450 MDF sheet 486 x 450 x 12
-  1 PP527354   Polypropylene strip 354mm x 27mm x 0.5mm
-  1 PP529284   Polypropylene strip 284mm x 29mm x 0.5mm
- 39 PSW0616    No6 pan wood screw x 16
- 39 WA4099     Washer M4 x 9 x 0.9
- 30 WS4099     Star washer M4 x 9 x 0.9
+  2 MDF sheet 169mm x 330mm x 12mm
+  1 MDF sheet 486mm x 330mm x 12mm
+  1 MDF sheet 486mm x 450mm x 12mm
+  1 Polypropylene strip 354mm x 27mm x 0.5mm
+  1 Polypropylene strip 284mm x 29mm x 0.5mm
+ 39 No6 pan wood screw x 16mm
+ 39 Washer M4 x 9mm x 0.9mm
+ 30 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   2 cable_clip_AB.stl
diff --git a/sturdy/bom/wades_assembly.txt b/sturdy/bom/wades_assembly.txt
index 0b11666..7990518 100644
--- a/sturdy/bom/wades_assembly.txt
+++ b/sturdy/bom/wades_assembly.txt
@@ -1,23 +1,23 @@
 wades_assembly:
 Vitamins:
-  3 BB608      Ball bearing 608 8 x 22 x 7
-  2 CS03030    M3 cap screw x 30
-  1 GB0306     M3 grub screw x 6
-  2 HX04020    M4 hex screw x 20
-  2 HX04050    M4 hex screw x 50
-  1 HX08060    M8 hex screw x 60
-  1 NEMA17475  NEMA17 x 47.5 stepper motor
-  1 NUTM3      Nut M3
-  2 NUTM4      Nut M4
-  1 NUTM8      Nut M8
-  3 PS0308     M3 pan screw x 8
-  1 RD822      Smooth rod 8 x 22
-  1 SPR127510  Spring 12 x 0.75 x 10
-  2 SPR710010  Spring 7 x 1 x 10
-  3 WA3075     Washer M3 x 7 x 0.5
-  2 WA4099     Washer M4 x 9 x 0.9
-  1 WA801615   Washer M8 x 16 x 1.5
-  3 WS3075     Star washer M3 x 7 x 0.5
+  3 Ball bearing 608 8mm x 22mm x 7mm
+  2 M3 cap screw x 30mm
+  1 M3 grub screw x 6mm
+  2 M4 hex screw x 20mm
+  2 M4 hex screw x 50mm
+  1 M8 hex screw x 60mm
+  1 NEMA17 x 47.5mm stepper motor
+  1 Nut M3
+  2 Nut M4
+  1 Nut M8
+  3 M3 pan screw x 8mm
+  1 Smooth rod 8mm x 22mm
+  1 Spring 12mm OD x 0.75mm gauge x 10mm length
+  2 Spring 7mm OD x 1mm gauge x 10mm length
+  3 Washer M3 x 7mm x 0.5mm
+  2 Washer M4 x 9mm x 0.9mm
+  1 Washer M8 x 16mm x 1.5mm
+  3 Star washer M3 x 7mm x 0.5mm
 
 Printed:
   1 wades_big_gear.stl
diff --git a/sturdy/bom/x_axis_assembly.txt b/sturdy/bom/x_axis_assembly.txt
index 21851ca..aa86022 100644
--- a/sturdy/bom/x_axis_assembly.txt
+++ b/sturdy/bom/x_axis_assembly.txt
@@ -1,8 +1,8 @@
 x_axis_assembly:
 Vitamins:
-  1 BT56902    Belt T5 x 6 x 902
-  1 PP517416   Polypropylene strip 416mm x 17mm x 0.5mm
-  2 RD10400    Smooth rod 10 x 400
+  1 Belt T5 x 6mm x 902mm
+  1 Polypropylene strip 416mm x 17mm x 0.5mm
+  2 Smooth rod 10mm x 400mm
 
 Printed:
 
diff --git a/sturdy/bom/x_carriage_assembly.txt b/sturdy/bom/x_carriage_assembly.txt
index 7f88210..4f15008 100644
--- a/sturdy/bom/x_carriage_assembly.txt
+++ b/sturdy/bom/x_carriage_assembly.txt
@@ -1,13 +1,13 @@
 x_carriage_assembly:
 Vitamins:
-  1 CS03020    M3 cap screw x 20
-  2 CS03025    M3 cap screw x 25
-  3 LM10UU     LM10UU linear bearing
-  1 NUTM3      Nut M3
-  2 NYLOCM3    Nyloc nut M3
-  2 WA3075     Washer M3 x 7 x 0.5
-  2 WING04     Wingnut M4
-  3 ZT00100    Ziptie 100
+  1 M3 cap screw x 20mm
+  2 M3 cap screw x 25mm
+  3 LM10UU linear bearing
+  1 Nut M3
+  2 Nyloc nut M3
+  2 Washer M3 x 7mm x 0.5mm
+  2 Wingnut M4
+  3 Ziptie 100mm min length
 
 Printed:
   1 x_belt_clamp.stl
diff --git a/sturdy/bom/x_idler_assembly.txt b/sturdy/bom/x_idler_assembly.txt
index a519f78..f821b5c 100644
--- a/sturdy/bom/x_idler_assembly.txt
+++ b/sturdy/bom/x_idler_assembly.txt
@@ -1,13 +1,13 @@
 x_idler_assembly:
 Vitamins:
-  1 BB624      Ball bearing 624 4 x 13 x 5
-  1 CS04040    M4 cap screw x 40
-  2 HX04016    M4 hex screw x 16
-  2 LM10UU     LM10UU linear bearing
-  1 NUTM8      Nut M8
-  3 NYLOCM4    Nyloc nut M4
-  4 WA4099     Washer M4 x 9 x 0.9
-  2 WA502014   Washer M5 x 20 x 1.4
+  1 Ball bearing 624 4mm x 13mm x 5mm
+  1 M4 cap screw x 40mm
+  2 M4 hex screw x 16mm
+  2 LM10UU linear bearing
+  1 Nut M8
+  3 Nyloc nut M4
+  4 Washer M4 x 9mm x 0.9mm
+  2 Washer M5 x 20mm x 1.4mm
 
 Printed:
   1 x_idler_bracket.stl
diff --git a/sturdy/bom/x_motor_assembly.txt b/sturdy/bom/x_motor_assembly.txt
index a69e2a0..48412c9 100644
--- a/sturdy/bom/x_motor_assembly.txt
+++ b/sturdy/bom/x_motor_assembly.txt
@@ -1,22 +1,22 @@
 x_motor_assembly:
 Vitamins:
-  2 CS03016    M3 cap screw x 16
-  1 GB0306     M3 grub screw x 6
-  2 HX03016    M3 hex screw x 16
-  2 HX04016    M4 hex screw x 16
-  2 LM10UU     LM10UU linear bearing
-  1 NEMA17475  NEMA17 x 47.5 stepper motor
-  1 NUTM3      Nut M3
-  1 NUTM8      Nut M8
-  4 NYLOCM3    Nyloc nut M3
-  2 NYLOCM4    Nyloc nut M4
-  3 PS0308     M3 pan screw x 8
-  2 PSW0213    No2 pan wood screw x 13
-  1 SMMICRO    Microswitch
-  2 WA2555     Washer M2.5 x 5 x 0.5
-  7 WA3075     Washer M3 x 7 x 0.5
-  2 WA4099     Washer M4 x 9 x 0.9
-  3 WS3075     Star washer M3 x 7 x 0.5
+  2 M3 cap screw x 16mm
+  1 M3 grub screw x 6mm
+  2 M3 hex screw x 16mm
+  2 M4 hex screw x 16mm
+  2 LM10UU linear bearing
+  1 NEMA17 x 47.5mm stepper motor
+  1 Nut M3
+  1 Nut M8
+  4 Nyloc nut M3
+  2 Nyloc nut M4
+  3 M3 pan screw x 8mm
+  2 No2 pan wood screw x 13mm
+  1 Microswitch
+  2 Washer M2.5 x 5mm x 0.5mm
+  7 Washer M3 x 7mm x 0.5mm
+  2 Washer M4 x 9mm x 0.9mm
+  3 Star washer M3 x 7mm x 0.5mm
 
 Printed:
   1 pulley.stl
diff --git a/sturdy/bom/y_axis_assembly.txt b/sturdy/bom/y_axis_assembly.txt
index c532d9c..d04f4ec 100644
--- a/sturdy/bom/y_axis_assembly.txt
+++ b/sturdy/bom/y_axis_assembly.txt
@@ -1,16 +1,16 @@
 y_axis_assembly:
 Vitamins:
-  1 BT56709    Belt T5 x 6 x 709
-  4 CS04020    M4 cap screw x 20
-  4 NYLOCM4    Nyloc nut M4
-  2 PSW0213    No2 pan wood screw x 13
-  8 PSW0616    No6 pan wood screw x 16
-  1 RD10293    Smooth rod 10 x 293
-  1 RD10446    Smooth rod 10 x 446
-  1 SMMICRO    Microswitch
-  2 WA2555     Washer M2.5 x 5 x 0.5
- 12 WA4099     Washer M4 x 9 x 0.9
-  8 WS4099     Star washer M4 x 9 x 0.9
+  1 Belt T5 x 6mm x 709mm
+  4 M4 cap screw x 20mm
+  4 Nyloc nut M4
+  2 No2 pan wood screw x 13mm
+  8 No6 pan wood screw x 16mm
+  1 Smooth rod 10mm x 293mm
+  1 Smooth rod 10mm x 446mm
+  1 Microswitch
+  2 Washer M2.5 x 5mm x 0.5mm
+ 12 Washer M4 x 9mm x 0.9mm
+  8 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   3 y_bar_clamp.stl
diff --git a/sturdy/bom/y_carriage_assembly.txt b/sturdy/bom/y_carriage_assembly.txt
index 4df9a53..c309e65 100644
--- a/sturdy/bom/y_carriage_assembly.txt
+++ b/sturdy/bom/y_carriage_assembly.txt
@@ -1,17 +1,17 @@
 y_carriage_assembly:
 Vitamins:
-  5 AF150234   Aluminium foil tape 50 x 234 x 0.05
-  1 CB6200224  Corrugated cardboard 200 x 224 x 6
-  8 CS03016    M3 cap screw x 16
-  6 CS04016    M4 cap screw x 16
-  2 CS04025    M4 cap screw x 25
-  1 DB3224224  Dibond sheet 224 x 224 x 3
-  3 LM10UU     LM10UU linear bearing
-  8 NYLOCM3    Nyloc nut M3
-  8 NYLOCM4    Nyloc nut M4
-  8 WA3075     Washer M3 x 7 x 0.5
- 16 WA4099     Washer M4 x 9 x 0.9
-  3 ZT00100    Ziptie 100
+  5 Aluminium foil tape 50mm x 234mm x 0.05mm
+  1 Corrugated cardboard 200mm x 224mm x 6mm
+  8 M3 cap screw x 16mm
+  6 M4 cap screw x 16mm
+  2 M4 cap screw x 25mm
+  1 Dibond sheet 224mm x 224mm x 3mm
+  3 LM10UU linear bearing
+  8 Nyloc nut M3
+  8 Nyloc nut M4
+  8 Washer M3 x 7mm x 0.5mm
+ 16 Washer M4 x 9mm x 0.9mm
+  3 Ziptie 100mm min length
 
 Printed:
   2 ribbon_clamp_22_44.stl
diff --git a/sturdy/bom/y_idler_assembly.txt b/sturdy/bom/y_idler_assembly.txt
index 950e7e8..9ac39c1 100644
--- a/sturdy/bom/y_idler_assembly.txt
+++ b/sturdy/bom/y_idler_assembly.txt
@@ -1,12 +1,12 @@
 y_idler_assembly:
 Vitamins:
-  2 BB624      Ball bearing 624 4 x 13 x 5
-  1 CS04040    M4 cap screw x 40
-  1 NYLOCM4    Nyloc nut M4
-  1 PSW0616    No6 pan wood screw x 16
-  5 WA4099     Washer M4 x 9 x 0.9
-  2 WA502014   Washer M5 x 20 x 1.4
-  1 WS4099     Star washer M4 x 9 x 0.9
+  2 Ball bearing 624 4mm x 13mm x 5mm
+  1 M4 cap screw x 40mm
+  1 Nyloc nut M4
+  1 No6 pan wood screw x 16mm
+  5 Washer M4 x 9mm x 0.9mm
+  2 Washer M5 x 20mm x 1.4mm
+  1 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 y_idler_bracket.stl
diff --git a/sturdy/bom/y_motor_assembly.txt b/sturdy/bom/y_motor_assembly.txt
index 7a16522..cc9108b 100644
--- a/sturdy/bom/y_motor_assembly.txt
+++ b/sturdy/bom/y_motor_assembly.txt
@@ -1,14 +1,14 @@
 y_motor_assembly:
 Vitamins:
-  1 GB0306     M3 grub screw x 6
-  1 NEMA17475  NEMA17 x 47.5 stepper motor
-  1 NUTM3      Nut M3
-  4 PS0308     M3 pan screw x 8
-  4 PSW0616    No6 pan wood screw x 16
-  4 WA3075     Washer M3 x 7 x 0.5
-  4 WA4099     Washer M4 x 9 x 0.9
-  4 WS3075     Star washer M3 x 7 x 0.5
-  4 WS4099     Star washer M4 x 9 x 0.9
+  1 M3 grub screw x 6mm
+  1 NEMA17 x 47.5mm stepper motor
+  1 Nut M3
+  4 M3 pan screw x 8mm
+  4 No6 pan wood screw x 16mm
+  4 Washer M3 x 7mm x 0.5mm
+  4 Washer M4 x 9mm x 0.9mm
+  4 Star washer M3 x 7mm x 0.5mm
+  4 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 pulley.stl
diff --git a/sturdy/bom/z_axis_assembly.txt b/sturdy/bom/z_axis_assembly.txt
index 7f402bf..c44faf7 100644
--- a/sturdy/bom/z_axis_assembly.txt
+++ b/sturdy/bom/z_axis_assembly.txt
@@ -1,15 +1,15 @@
 z_axis_assembly:
 Vitamins:
-  2 CS04020    M4 cap screw x 20
-  2 NYLOCM4    Nyloc nut M4
-  2 PSW0213    No2 pan wood screw x 13
-  4 PSW0616    No6 pan wood screw x 16
-  2 RD10281    Smooth rod 10 x 281
-  1 SMMICRO    Microswitch
-  2 ST8219     Threaded rod 8 x 219
-  2 WA2555     Washer M2.5 x 5 x 0.5
-  6 WA4099     Washer M4 x 9 x 0.9
-  4 WS4099     Star washer M4 x 9 x 0.9
+  2 M4 cap screw x 20mm
+  2 Nyloc nut M4
+  2 No2 pan wood screw x 13mm
+  4 No6 pan wood screw x 16mm
+  2 Smooth rod 10mm x 281mm
+  1 Microswitch
+  2 Threaded rod M8 x 219mm
+  2 Washer M2.5 x 5mm x 0.5mm
+  6 Washer M4 x 9mm x 0.9mm
+  4 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 z_bar_clamp.stl
diff --git a/sturdy/bom/z_limit_switch_assembly.txt b/sturdy/bom/z_limit_switch_assembly.txt
index 75e41cb..28e1f5e 100644
--- a/sturdy/bom/z_limit_switch_assembly.txt
+++ b/sturdy/bom/z_limit_switch_assembly.txt
@@ -1,15 +1,15 @@
 z_limit_switch_assembly:
 Vitamins:
-  1 HX03016    M3 hex screw x 16
-  1 NYLOCM3    Nyloc nut M3
-  2 PSW0213    No2 pan wood screw x 13
-  2 PSW0616    No6 pan wood screw x 16
-  1 SMMICRO    Microswitch
-  2 WA2555     Washer M2.5 x 5 x 0.5
-  1 WA3075     Washer M3 x 7 x 0.5
-  2 WA4099     Washer M4 x 9 x 0.9
-  2 WR301015   Rubber washer M3 x 10 x 1.5
-  2 WS4099     Star washer M4 x 9 x 0.9
+  1 M3 hex screw x 16mm
+  1 Nyloc nut M3
+  2 No2 pan wood screw x 13mm
+  2 No6 pan wood screw x 16mm
+  1 Microswitch
+  2 Washer M2.5 x 5mm x 0.5mm
+  1 Washer M3 x 7mm x 0.5mm
+  2 Washer M4 x 9mm x 0.9mm
+  2 Rubber washer M3 x 10mm x 1.5mm
+  2 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   1 z_limit_switch_bracket.stl
diff --git a/sturdy/bom/z_motor_assembly.txt b/sturdy/bom/z_motor_assembly.txt
index 09f89e9..d2861d5 100644
--- a/sturdy/bom/z_motor_assembly.txt
+++ b/sturdy/bom/z_motor_assembly.txt
@@ -1,17 +1,17 @@
 z_motor_assemblies:
 Vitamins:
-  8 CS03020    M3 cap screw x 20
-  2 CS04020    M4 cap screw x 20
-  2 NEMA17475  NEMA17 x 47.5 stepper motor
-  8 NYLOCM3    Nyloc nut M3
-  2 NYLOCM4    Nyloc nut M4
-  8 PS0308     M3 pan screw x 8
-  4 PSW0616    No6 pan wood screw x 16
-  2 TB7516     Tubing OD 7 ID 5 x 16
- 16 WA3075     Washer M3 x 7 x 0.5
-  6 WA4099     Washer M4 x 9 x 0.9
-  8 WS3075     Star washer M3 x 7 x 0.5
-  4 WS4099     Star washer M4 x 9 x 0.9
+  8 M3 cap screw x 20mm
+  2 M4 cap screw x 20mm
+  2 NEMA17 x 47.5mm stepper motor
+  8 Nyloc nut M3
+  2 Nyloc nut M4
+  8 M3 pan screw x 8mm
+  4 No6 pan wood screw x 16mm
+  2 Tubing OD 7mm ID 5mm x 16mm
+ 16 Washer M3 x 7mm x 0.5mm
+  6 Washer M4 x 9mm x 0.9mm
+  8 Star washer M3 x 7mm x 0.5mm
+  4 Star washer M4 x 9mm x 0.9mm
 
 Printed:
   4 z_coupling.stl