diff --git a/printer.cfg b/printer.cfg
index ff653a9..3bf5ecf 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -25,8 +25,8 @@
 canbus_uuid: 970febd72165
 
 [include ebb36.cfg]
-[include klicky-probe.cfg]
-[include klicky-quad-gantry-level.cfg]
+#[include klicky-probe.cfg]
+#[include klicky-quad-gantry-level.cfg]
 [include fluidd.cfg]
 [include stealthburner_leds.cfg]
 [include bedfans.cfg]
@@ -278,15 +278,16 @@ resistance3: 1228.0
 timeout: 1800
 
 # Klicky probe replaces this!
-# [safe_z_home]
-# ##  XY Location of the Z Endstop Switch
-# ##  Update -10,-10 to the XY coordinates of your endstop pin 
-# ##  (such as 157,305) after going through Z Endstop Pin
-# ##  Location Definition step.
-# home_xy_position:232,350
-# speed:100
-# z_hop:10
-# z_hop_speed:10
+[safe_z_home]
+##  XY Location of the Z Endstop Switch
+##  Update -10,-10 to the XY coordinates of your endstop pin 
+##  (such as 157,305) after going through Z Endstop Pin
+##  Location Definition step.
+#home_xy_position:232,350
+home_xy_position: 175,175
+speed:100
+z_hop:10
+z_hop_speed:10
 
 
 ##  Use QUAD_GANTRY_LEVEL to level a gantry.
@@ -380,20 +381,20 @@ sensor_type: temperature_mcu
 #####################################################################
 
 
-
-[probe]
-pin: ebb36:PB8
-x_offset: 0
-y_offset: 19.75
-#z_offset: 5.930
-# below is default, trying -0.365 measured, if +0.365, it's 6.785
-# z_offset: 6.42
-speed: 5
-samples: 3
-samples_result: median
-sample_retract_dist: 2.0
-samples_tolerance: 0.01
-samples_tolerance_retries: 4
+# pre-cartographer
+# [probe]
+# pin: ebb36:PB9
+# x_offset: 0
+# y_offset: 19.75
+# #z_offset: 5.930
+# # below is default, trying -0.365 measured, if +0.365, it's 6.785
+# # z_offset: 6.42
+# speed: 5
+# samples: 3
+# samples_result: median
+# sample_retract_dist: 2.0
+# samples_tolerance: 0.01
+# samples_tolerance_retries: 4
 
 [bed_mesh]
 speed: 120
@@ -412,6 +413,62 @@ shaper_freq_x: 91.4
 shaper_freq_y: 70.0
 shaper_type: 3hump_ei
 
+[cartographer]
+canbus_uuid: 506fcd528089
+#   Path to the serial port for the Cartographer device. Typically has the form
+#   /dev/serial/by-id/usb-cartographer_cartographer_...
+#   
+#   If you are using the CAN Bus version, replace serial: with canbus_uuid: and add the UUID.
+#   Example: canbus_uuid: 1283as878a9sd
+#
+speed: 40.
+#   Z probing dive speed.
+lift_speed: 5.0
+#   Z probing lift speed.
+backlash_comp: 0.5
+#   Backlash compensation distance for removing Z backlash before measuring
+#   the sensor response.
+# 
+#   Offsets are measured from the centre of your coil, to the tip of your nozzle 
+#   on a level axis. It is vital that this is accurate. 
+#
+x_offset: 0.0
+#   X offset of cartographer from the nozzle.
+y_offset: 21.1
+#   Y offset of cartographer from the nozzle.
+trigger_distance: 2.0
+#   cartographer trigger distance for homing.
+trigger_dive_threshold: 1.5
+#   Threshold for range vs dive mode probing. Beyond `trigger_distance +
+#   trigger_dive_threshold` a dive will be used.
+trigger_hysteresis: 0.006
+#   Hysteresis on trigger threshold for untriggering, as a percentage of the
+#   trigger threshold.
+cal_nozzle_z: 0.1
+#   Expected nozzle offset after completing manual Z offset calibration.
+cal_floor: 0.1
+#   Minimum z bound on sensor response measurement.
+cal_ceil: 5.0
+#   Maximum z bound on sensor response measurement.
+cal_speed: 1.0
+#   Speed while measuring response curve.
+cal_move_speed: 10.0
+#   Speed while moving to position for response curve measurement.
+default_model_name: default
+#   Name of default cartographer model to load.
+mesh_main_direction: x
+#   Primary travel direction during mesh measurement.
+#mesh_overscan: -1
+#   Distance to use for direction changes at mesh line ends. Omit this setting
+#   and a default will be calculated from line spacing and available travel.
+mesh_cluster_size: 1
+#   Radius of mesh grid point clusters.
+mesh_runs: 2
+#   Number of passes to make during mesh scan.
+
+[force_move]
+enable_force_move: True
+
 #*# <---------------------- SAVE_CONFIG ---------------------->
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#
@@ -421,13 +478,13 @@ shaper_type: 3hump_ei
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  0.017678, 0.028928, 0.045178, 0.055178, 0.056428, 0.042678, 0.036428
-#*# 	  0.046428, 0.018928, 0.045178, 0.017678, 0.051428, 0.046428, 0.038928
-#*# 	  0.027678, 0.015178, 0.035178, 0.003928, 0.012678, 0.005178, 0.002678
-#*# 	  0.015178, 0.003928, 0.011428, -0.002322, 0.017678, 0.012678, 0.015178
-#*# 	  0.011428, 0.020178, 0.027678, 0.040178, 0.047678, 0.032678, 0.037678
-#*# 	  0.040178, 0.037678, 0.022678, 0.016428, 0.052678, 0.052678, 0.045178
-#*# 	  0.007678, 0.043928, 0.085178, 0.095178, 0.101428, 0.100178, 0.045178
+#*# 	  0.030923, 0.042173, 0.055923, 0.058423, 0.057173, 0.050923, 0.052173
+#*# 	  0.057173, 0.037173, 0.052173, 0.032173, 0.059673, 0.054673, 0.054673
+#*# 	  0.039673, 0.029673, 0.032173, 0.009673, 0.023423, 0.019673, 0.020923
+#*# 	  0.008423, -0.000327, 0.017173, -0.001577, 0.015923, 0.022173, 0.027173
+#*# 	  0.004673, 0.017173, 0.020923, 0.027173, 0.037173, 0.028423, 0.038423
+#*# 	  0.033423, 0.040923, 0.024673, 0.024673, 0.048423, 0.059673, 0.052173
+#*# 	  0.003423, 0.037173, 0.084673, 0.093423, 0.102173, 0.079673, 0.038423
 #*# x_count = 7
 #*# y_count = 7
 #*# mesh_x_pps = 3
@@ -440,7 +497,7 @@ shaper_type: 3hump_ei
 #*# max_y = 309.97999999999996
 #*#
 #*# [probe]
-#*# z_offset = 7.625
+#*# z_offset = 7.600
 #*#
 #*# [skew_correction calilantern_skew_profile]
 #*# xy_skew = 0.008146115207013459