diff --git a/CAD Files/10-24 Insert.SLDPRT b/CAD Files/10-24 Insert.SLDPRT
index 44ecde1..eb284f0 100644
Binary files a/CAD Files/10-24 Insert.SLDPRT and b/CAD Files/10-24 Insert.SLDPRT differ
diff --git a/CAD Files/8579K12 - Delrin Rod.SLDPRT b/CAD Files/8579K12 - Delrin Rod.SLDPRT
deleted file mode 100644
index fbce58c..0000000
Binary files a/CAD Files/8579K12 - Delrin Rod.SLDPRT and /dev/null differ
diff --git a/CAD Files/Belt1.SLDPRT b/CAD Files/Belt1.SLDPRT
index f2055b5..6714c68 100644
Binary files a/CAD Files/Belt1.SLDPRT and b/CAD Files/Belt1.SLDPRT differ
diff --git a/CAD Files/CableClamp.SLDPRT b/CAD Files/CableClamp.SLDPRT
new file mode 100644
index 0000000..adc6432
Binary files /dev/null and b/CAD Files/CableClamp.SLDPRT differ
diff --git a/CAD Files/Carriage.SLDASM b/CAD Files/Carriage.SLDASM
index 171611d..93dca1b 100644
Binary files a/CAD Files/Carriage.SLDASM and b/CAD Files/Carriage.SLDASM differ
diff --git a/CAD Files/CarriagePlateHorizontal.SLDPRT b/CAD Files/CarriagePlateHorizontal.SLDPRT
deleted file mode 100644
index f598a14..0000000
Binary files a/CAD Files/CarriagePlateHorizontal.SLDPRT and /dev/null differ
diff --git a/CAD Files/CarriageSlide3.SLDPRT b/CAD Files/CarriageSlide3.SLDPRT
deleted file mode 100644
index e69de29..0000000
diff --git a/CAD Files/CarrierSupport.SLDPRT b/CAD Files/CarrierSupport.SLDPRT
new file mode 100644
index 0000000..08d4520
Binary files /dev/null and b/CAD Files/CarrierSupport.SLDPRT differ
diff --git a/CAD Files/Delrin Slide.SLDPRT b/CAD Files/Delrin Slide.SLDPRT
deleted file mode 100644
index ade5983..0000000
Binary files a/CAD Files/Delrin Slide.SLDPRT and /dev/null differ
diff --git a/CAD Files/GantryMount.SLDPRT b/CAD Files/GantryMount.SLDPRT
index 34f09cf..f3f3163 100644
Binary files a/CAD Files/GantryMount.SLDPRT and b/CAD Files/GantryMount.SLDPRT differ
diff --git a/CAD Files/LimitSwitch.SLDPRT b/CAD Files/LimitSwitch.SLDPRT
index 5deacf9..bf8cd19 100644
Binary files a/CAD Files/LimitSwitch.SLDPRT and b/CAD Files/LimitSwitch.SLDPRT differ
diff --git a/CAD Files/O-Ring Tensioner.SLDPRT b/CAD Files/O-Ring Tensioner.SLDPRT
deleted file mode 100644
index 4b8dc33..0000000
Binary files a/CAD Files/O-Ring Tensioner.SLDPRT and /dev/null differ
diff --git a/CAD Files/O-ring.SLDPRT b/CAD Files/O-ring.SLDPRT
deleted file mode 100644
index 08f6df1..0000000
Binary files a/CAD Files/O-ring.SLDPRT and /dev/null differ
diff --git a/CAD Files/RearPulleyMount.SLDPRT b/CAD Files/RearPulleyMount.SLDPRT
index f948da8..ee9ca07 100644
Binary files a/CAD Files/RearPulleyMount.SLDPRT and b/CAD Files/RearPulleyMount.SLDPRT differ
diff --git a/CAD Files/RollerJig.SLDPRT b/CAD Files/RollerJig.SLDPRT
deleted file mode 100644
index ebea4dc..0000000
Binary files a/CAD Files/RollerJig.SLDPRT and /dev/null differ
diff --git a/CAD Files/RollerJigAssembly.SLDASM b/CAD Files/RollerJigAssembly.SLDASM
deleted file mode 100644
index 1750940..0000000
Binary files a/CAD Files/RollerJigAssembly.SLDASM and /dev/null differ
diff --git a/CAD Files/STLs/CableClamp.STL b/CAD Files/STLs/CableClamp.STL
new file mode 100644
index 0000000..fbfea33
Binary files /dev/null and b/CAD Files/STLs/CableClamp.STL differ
diff --git a/CAD Files/STLs/CarrierSupport.STL b/CAD Files/STLs/CarrierSupport.STL
new file mode 100644
index 0000000..eaacb10
Binary files /dev/null and b/CAD Files/STLs/CarrierSupport.STL differ
diff --git a/CAD Files/STLs/RearPulleyMount.STL b/CAD Files/STLs/RearPulleyMount.STL
index 501dadf..a8437f1 100644
Binary files a/CAD Files/STLs/RearPulleyMount.STL and b/CAD Files/STLs/RearPulleyMount.STL differ
diff --git a/CAD Files/STLs/SwitchMount2.STL b/CAD Files/STLs/SwitchMount2.STL
new file mode 100644
index 0000000..a0b151c
Binary files /dev/null and b/CAD Files/STLs/SwitchMount2.STL differ
diff --git a/CAD Files/StepperEnclosure.SLDPRT b/CAD Files/StepperEnclosure.SLDPRT
index 2e2dbf8..49112f3 100644
Binary files a/CAD Files/StepperEnclosure.SLDPRT and b/CAD Files/StepperEnclosure.SLDPRT differ
diff --git a/CAD Files/SwitchMount.SLDPRT b/CAD Files/SwitchMount.SLDPRT
index 9f21a17..a6f3fc9 100644
Binary files a/CAD Files/SwitchMount.SLDPRT and b/CAD Files/SwitchMount.SLDPRT differ
diff --git a/CAD Files/SwitchMount2.SLDPRT b/CAD Files/SwitchMount2.SLDPRT
new file mode 100644
index 0000000..705460e
Binary files /dev/null and b/CAD Files/SwitchMount2.SLDPRT differ
diff --git a/CAD Files/Top Level Assembly.SLDASM b/CAD Files/Top Level Assembly.SLDASM
index 02b19d3..72c1bf8 100644
Binary files a/CAD Files/Top Level Assembly.SLDASM and b/CAD Files/Top Level Assembly.SLDASM differ
diff --git a/Marlin Firmware/Marlin/Configuration.h b/Marlin Firmware/Marlin/Configuration.h
index 3d6a96b..7fcb349 100644
--- a/Marlin Firmware/Marlin/Configuration.h	
+++ b/Marlin Firmware/Marlin/Configuration.h	
@@ -143,7 +143,7 @@
 #endif
 
 // Name displayed in the LCD "Ready" message and Info menu
-#define CUSTOM_MACHINE_NAME "Drawbot CoreXY"
+#define CUSTOM_MACHINE_NAME "Drawbot CoreYX"
 
 // Printer's unique ID, used by some programs to differentiate between machines.
 // Choose your own or use a service like https://www.uuidgenerator.net/version4
@@ -192,7 +192,7 @@
 
 // This defines the number of extruders
 // :[0, 1, 2, 3, 4, 5, 6, 7, 8]
-#define EXTRUDERS 1
+#define EXTRUDERS 0
 
 // Generally expected filament diameter (1.75, 2.85, 3.0, ...). Used for Volumetric, Filament Width Sensor, etc.
 #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75
@@ -460,7 +460,7 @@
  *   998 : Dummy Table that ALWAYS reads 25°C or the temperature defined below.
  *   999 : Dummy Table that ALWAYS reads 100°C or the temperature defined below.
  */
-#define TEMP_SENSOR_0 1
+#define TEMP_SENSOR_0 0
 #define TEMP_SENSOR_1 0
 #define TEMP_SENSOR_2 0
 #define TEMP_SENSOR_3 0
@@ -728,10 +728,10 @@
 
 // Enable one of the options below for CoreXY, CoreXZ, or CoreYZ kinematics,
 // either in the usual order or reversed
-#define COREXY
+//#define COREXY
 //#define COREXZ
 //#define COREYZ
-//#define COREYX
+#define COREYX
 //#define COREZX
 //#define COREZY
 //#define MARKFORGED_XY  // MarkForged. See https://reprap.org/forum/read.php?152,504042
@@ -746,13 +746,13 @@
 // Almost all printers will be using one per axis. Probes will use one or more of the
 // extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
 #define USE_XMIN_PLUG
-#define USE_YMIN_PLUG
+//#define USE_YMIN_PLUG
 #define USE_ZMIN_PLUG
 //#define USE_IMIN_PLUG
 //#define USE_JMIN_PLUG
 //#define USE_KMIN_PLUG
 //#define USE_XMAX_PLUG
-//#define USE_YMAX_PLUG
+#define USE_YMAX_PLUG
 //#define USE_ZMAX_PLUG
 //#define USE_IMAX_PLUG
 //#define USE_JMAX_PLUG
@@ -840,7 +840,7 @@
 //#define I_DRIVER_TYPE  A4988
 //#define J_DRIVER_TYPE  A4988
 //#define K_DRIVER_TYPE  A4988
-#define E0_DRIVER_TYPE A4988
+//#define E0_DRIVER_TYPE A4988
 //#define E1_DRIVER_TYPE A4988
 //#define E2_DRIVER_TYPE A4988
 //#define E3_DRIVER_TYPE A4988
@@ -895,14 +895,14 @@
  * Override with M92
  *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
  */
-#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400, 80}
+#define DEFAULT_AXIS_STEPS_PER_UNIT   { 80, 80, 400}
 
 /**
  * Default Max Feed Rate (mm/s)
  * Override with M203
  *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
  */
-#define DEFAULT_MAX_FEEDRATE          { 300, 300, 5, 50}
+#define DEFAULT_MAX_FEEDRATE          { 300, 300, 5}
 
 //#define LIMITED_MAX_FR_EDITING        // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
 #if ENABLED(LIMITED_MAX_FR_EDITING)
@@ -915,11 +915,11 @@
  * Override with M201
  *                                      X, Y, Z [, I [, J [, K]]], E0 [, E1[, E2...]]
  */
-#define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100, 50}
+#define DEFAULT_MAX_ACCELERATION      { 3000, 3000, 100}
 
 //#define LIMITED_MAX_ACCEL_EDITING     // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
 #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
-  #define MAX_ACCEL_EDIT_VALUES       { 6000, 6000, 200, 20000 } // ...or, set your own edit limits
+  #define MAX_ACCEL_EDIT_VALUES       { 6000, 6000, 200} // ...or, set your own edit limits
 #endif
 
 /**
@@ -998,7 +998,7 @@
  * The probe replaces the Z-MIN endstop and is used for Z homing.
  * (Automatically enables USE_PROBE_FOR_Z_HOMING.)
  */
-#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+//#define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
 
 // Force the use of the probe for Z-axis homing
 //#define USE_PROBE_FOR_Z_HOMING
@@ -1157,10 +1157,10 @@
 #define XY_PROBE_FEEDRATE (133*60)
 
 // Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
-#define Z_PROBE_FEEDRATE_FAST (4*60)
+//#define Z_PROBE_FEEDRATE_FAST (4*60)
 
 // Feedrate (mm/min) for the "accurate" probe of each point
-#define Z_PROBE_FEEDRATE_SLOW (Z_PROBE_FEEDRATE_FAST / 2)
+//#define Z_PROBE_FEEDRATE_SLOW (Z_PROBE_FEEDRATE_FAST / 2)
 
 /**
  * Probe Activation Switch
@@ -1215,16 +1215,16 @@
  * Example: `M851 Z-5` with a CLEARANCE of 4  =>  9mm from bed to nozzle.
  *     But: `M851 Z+1` with a CLEARANCE of 2  =>  2mm from bed to nozzle.
  */
-#define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
-#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
-#define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
+//#define Z_CLEARANCE_DEPLOY_PROBE   10 // Z Clearance for Deploy/Stow
+//#define Z_CLEARANCE_BETWEEN_PROBES  5 // Z Clearance between probe points
+//#define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
 //#define Z_AFTER_PROBING           5 // Z position after probing is done
 
-#define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
+//#define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
 
 // For M851 give a range for adjusting the Z probe offset
-#define Z_PROBE_OFFSET_RANGE_MIN -20
-#define Z_PROBE_OFFSET_RANGE_MAX 20
+//#define Z_PROBE_OFFSET_RANGE_MIN -20
+//#define Z_PROBE_OFFSET_RANGE_MAX 20
 
 // Enable the M48 repeatability test to test probe accuracy
 //#define Z_MIN_PROBE_REPEATABILITY_TEST
@@ -1264,7 +1264,7 @@
 #define X_ENABLE_ON 0
 #define Y_ENABLE_ON 0
 #define Z_ENABLE_ON 0
-#define E_ENABLE_ON 0 // For all extruders
+//#define E_ENABLE_ON 0 // For all extruders
 //#define I_ENABLE_ON 0
 //#define J_ENABLE_ON 0
 //#define K_ENABLE_ON 0
@@ -1283,8 +1283,8 @@
 
 // @section extruder
 
-#define DISABLE_E false             // Disable the extruder when not stepping
-#define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
+//#define DISABLE_E false             // Disable the extruder when not stepping
+//#define DISABLE_INACTIVE_EXTRUDER   // Keep only the active extruder enabled
 
 // @section machine
 
@@ -1328,7 +1328,7 @@
 // Direction of endstops when homing; 1=MAX, -1=MIN
 // :[-1,1]
 #define X_HOME_DIR -1
-#define Y_HOME_DIR -1
+#define Y_HOME_DIR 1
 #define Z_HOME_DIR -1
 //#define I_HOME_DIR -1
 //#define J_HOME_DIR -1
@@ -1337,8 +1337,8 @@
 // @section machine
 
 // The size of the printable area
-#define X_BED_SIZE 1000
-#define Y_BED_SIZE 1000
+#define X_BED_SIZE 711
+#define Y_BED_SIZE 927
 
 // Travel limits (mm) after homing, corresponding to endstop positions.
 #define X_MIN_POS 0
@@ -1346,7 +1346,7 @@
 #define Z_MIN_POS 0
 #define X_MAX_POS X_BED_SIZE
 #define Y_MAX_POS Y_BED_SIZE
-#define Z_MAX_POS 200
+#define Z_MAX_POS 0
 //#define I_MIN_POS 0
 //#define I_MAX_POS 50
 //#define J_MIN_POS 0
@@ -1792,7 +1792,7 @@
  *   M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
  *   M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
  */
-//#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
+#define EEPROM_SETTINGS     // Persistent storage with M500 and M501
 //#define DISABLE_M503        // Saves ~2700 bytes of PROGMEM. Disable for release!
 #define EEPROM_CHITCHAT       // Give feedback on EEPROM commands. Disable to save PROGMEM.
 #define EEPROM_BOOT_SILENT    // Keep M503 quiet and only give errors during first load
@@ -1825,17 +1825,17 @@
 //
 // Preheat Constants - Up to 5 are supported without changes
 //
-#define PREHEAT_1_LABEL       "PLA"
-#define PREHEAT_1_TEMP_HOTEND 180
-#define PREHEAT_1_TEMP_BED     70
-#define PREHEAT_1_TEMP_CHAMBER 35
-#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
+//#define PREHEAT_1_LABEL       "PLA"
+//#define PREHEAT_1_TEMP_HOTEND 180
+//#define PREHEAT_1_TEMP_BED     70
+//#define PREHEAT_1_TEMP_CHAMBER 35
+//#define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
 
-#define PREHEAT_2_LABEL       "ABS"
-#define PREHEAT_2_TEMP_HOTEND 240
-#define PREHEAT_2_TEMP_BED    110
-#define PREHEAT_2_TEMP_CHAMBER 35
-#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
+//#define PREHEAT_2_LABEL       "ABS"
+//#define PREHEAT_2_TEMP_HOTEND 240
+//#define PREHEAT_2_TEMP_BED    110
+//#define PREHEAT_2_TEMP_CHAMBER 35
+//#define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
 
 /**
  * Nozzle Park
diff --git a/Marlin Firmware/Marlin/Configuration_adv.h b/Marlin Firmware/Marlin/Configuration_adv.h
index 8de88b9..d544e0e 100644
--- a/Marlin Firmware/Marlin/Configuration_adv.h	
+++ b/Marlin Firmware/Marlin/Configuration_adv.h	
@@ -926,7 +926,8 @@
 
 // @section motion
 
-#define AXIS_RELATIVE_MODES { false, false, false, false }
+//#define AXIS_RELATIVE_MODES { false, false, false, false }
+#define AXIS_RELATIVE_MODES { false, false, false}
 
 // Add a Duplicate option for well-separated conjoined nozzles
 //#define MULTI_NOZZLE_DUPLICATION
@@ -1164,7 +1165,7 @@
 // @section lcd
 
 #if EITHER(IS_ULTIPANEL, EXTENSIBLE_UI)
-  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
+  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60} // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
   #define FINE_MANUAL_MOVE 0.025    // (mm) Smallest manual move (< 0.1mm) applying to Z on most machines
   #if IS_ULTIPANEL
     #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"