diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 0e6efbc..328d43c 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -16,6 +16,8 @@ gcode:
     M140 S0 ; turn off power to the bed, interference with probe?
     SET_GCODE_OFFSET Z=0.0 ; Reset the G-Code Z offset so we can set it manually later. we don't care if move=1|0 because we're about to home anyway.
     G28 Z ; Heatsoaked, validate that z
+    G90 ; ensure absolute positioning (how would it be something else?!
+    G1 Z10 F3000
     QUAD_GANTRY_LEVEL
     STATUS_MESHING
     BED_MESH_CALIBRATE
@@ -25,7 +27,7 @@ gcode:
     CLEAN_NOZZLE
     G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed
     G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position
-    SET_GCODE_OFFSET Z_ADJUST=-0.45 MOVE=1 ; This is how we will permanently save the Z offset without having to care about type of probe.
+    #SET_GCODE_OFFSET Z_ADJUST=-0.45 MOVE=1 ; This is how we will permanently save the Z offset without having to care about type of probe.
     G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line
     G1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little
     G1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line
@@ -330,68 +332,80 @@ gcode:
     G1 E-{unload_distance} F{max_velocity} # fast-unload
     RESTORE_GCODE_STATE NAME=unload_state
 
-# [gcode_macro _SAFE_X_HOME]
-# ; This macro is to ensure that we're not at y=home when X is homed.
-# gcode:
-#   {% if 'Y' in printer.toolhead.homed_axes %}
-#   G91
-#   G0 Y-20 F50000
-#   G90
-#   {% else %}
-#   G90
-#   SET_KINEMATIC_POSITION Y=20
-#   G0 Y0 F50000
-#   G28 X
-#   {% endif %}
+[gcode_macro _SAFE_X_HOME]
+; This macro is to ensure that we're not at y=home when X is homed.
+gcode:
+  {% if 'Y' in printer.toolhead.homed_axes %}
+  G91
+  G0 Y-20 F50000
+  G90
+  {% else %}
+  G90
+  SET_KINEMATIC_POSITION Y=20
+  G0 Y0 F50000
+  G28 X
+  {% endif %}
 
-# [gcode_macro _SAFE_Z_HOME_LIFT]
-# ; Lift the Z no matter what (replicate z-hop from [safe_z_home]
-# gcode:
-#   {% if 'Z' in printer.toolhead.homed_axes %}
-#   G91
-#   G0 Z10 F1000
-#   G90
-#   {% else %}
-#   G90
-#   SET_KINEMATIC_POSITION Z=0
-#   G0 Z10 F1000
-#   {% endif %}
+[gcode_macro _SAFE_Z_HOME_LIFT]
+; Lift the Z no matter what (replicate z-hop from [safe_z_home]
+gcode:
+  {% if 'Z' in printer.toolhead.homed_axes %}
+  G91
+  G0 Z10 F1000
+  G90
+  {% else %}
+  G90
+  SET_KINEMATIC_POSITION Z=0
+  G0 Z10 F1000
+  {% endif %}
 
-# [gcode_macro _SAFE_Z_HOME]
-# ; this macro recreates the save_z_home setup center the toolhead before z home.
-# gcode:
-#   {% if not 'X' in printer.toolhead.homed_axes %}
-#   _SAFE_X_HOME
-#   {% endif %}
-#   {% if not 'Y' in printer.toolhead.homed_axes %}
-#   G28 Y
-#   {% endif %}
-#   G0 X175 Y175 F50000
-#   G28 Z
+[gcode_macro _SAFE_Z_HOME]
+; this macro recreates the save_z_home setup center the toolhead before z home.
+gcode:
+  {% if not 'X' in printer.toolhead.homed_axes %}
+  _SAFE_X_HOME
+  {% endif %}
+  {% if not 'Y' in printer.toolhead.homed_axes %}
+  G28 Y
+  {% endif %}
+  G0 X175 Y175 F50000
+  G4 P200 ;Wait 200ms
+  SET_TMC_CURRENT STEPPER=stepper_z CURRENT=0.4
+  SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT=0.4
+  SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT=0.4
+  SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT=0.4
+  G28 Z
+  {% set run_current = printer.configfile.config['tmc2209 stepper_z'].run_current | float %}
+  SET_TMC_CURRENT STEPPER=stepper_z CURRENT={run_current}
+  SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={run_current}
+  SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT={run_current}
+  SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT={run_current}
+  SET_KINEMATIC_POSITION Z=0
+  G0 Z10 F3000
 
-# [homing_override]
-# ; The ebb36 mount often catches on the drag chain at the back of the printer.
-# ; This ensures that if X is asked to be homed, first Y is homed and then y is
-# ; moved away from the back of the printer and then homed.
-# axes: xyz
-# gcode:
-#   #z hop no matter what
-#   _SAFE_Z_HOME_LIFT
-#   {% if not 'Z' in params and not 'Y' in params and 'X' in params %} # Home X
-#   _SAFE_X_HOME
-#   {% elif not 'Z' in params and not 'X' in params and 'Y' in params %} #Home Y
-#   G28 Y
-#   {% elif not 'Z' in params and 'X' in params and 'Y' in params %} #Home X+Y
-#   _SAFE_X_HOME
-#   G28 Y
-#   {% elif 'Z' in params and not 'X' in params and not 'Y' in params %} # Home Z
-#   _SAFE_Z_HOME
-#   {% else %} #Home X+Y+Z
-#   _SAFE_X_HOME
-#   G28 Y
-#   _SAFE_Z_HOME
-#   {% endif %}
+[homing_override]
+; The ebb36 mount often catches on the drag chain at the back of the printer.
+; This ensures that if X is asked to be homed, first Y is homed and then y is
+; moved away from the back of the printer and then homed.
+axes: xyz
+gcode:
+   #z hop no matter what
+   _SAFE_Z_HOME_LIFT
+   {% if not 'Z' in params and not 'Y' in params and 'X' in params %} # Home X
+   _SAFE_X_HOME
+   {% elif not 'Z' in params and not 'X' in params and 'Y' in params %} #Home Y
+   G28 Y
+   {% elif not 'Z' in params and 'X' in params and 'Y' in params %} #Home X+Y
+   _SAFE_X_HOME
+   G28 Y
+   {% elif 'Z' in params and not 'X' in params and not 'Y' in params %} # Home Z
+   _SAFE_Z_HOME
+   {% else %} #Home X+Y+Z
+   _SAFE_X_HOME
+   G28 Y
+   _SAFE_Z_HOME
+   {% endif %}
 
 
 [mmu_led_effect mmu_purple_slow]
-layers:       breathing 1.0 0 top (1,0,1)
\ No newline at end of file
+layers:       breathing 1.0 0 top (1,0,1)
diff --git a/printer.cfg b/printer.cfg
index 338d21a..9ecefad 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -36,7 +36,7 @@ canbus_uuid: 970febd72165
 [include fluidd.cfg]
 [include stealthburner_leds.cfg]
 [include bedfans.cfg]
-[include eddy_macros.cfg]
+#[include eddy_macros.cfg]
 [include martyn_macros.cfg]
 [include shaketune.cfg]
 
@@ -118,16 +118,16 @@ enable_pin: !PG5
 rotation_distance: 40
 gear_ratio: 80:16
 microsteps: 32
-#endstop_pin: PG10
-endstop_pin:probe:z_virtual_endstop
+#endstop_pin: probe:z_virtual_endstop
+endstop_pin: !ebb36:PB7
 ##  Z-position of nozzle (in mm) to z-endstop trigger point relative to print surface (Z0)
 ##  (+) value = endstop above Z0, (-) value = endstop below
 ##  Increasing position_endstop brings nozzle closer to the bed
 ##  After you run Z_ENDSTOP_CALIBRATE, position_endstop will be stored at the very end of your config
-#position_endstop: -0.5
+position_endstop: 0
 position_max: 310
 position_min: -10
-homing_speed: 15
+homing_speed: 5
 second_homing_speed: 3
 homing_retract_dist: 3
 
@@ -288,16 +288,16 @@ gcode_id: chamber_th
 timeout: 1800
 
 # Need to work out how eddy interferes with magic home
-[safe_z_home]
+#[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
+#home_xy_position: 175,175
+#speed:100
+#z_hop:10
+#z_hop_speed:10
 
 
 ##  Use QUAD_GANTRY_LEVEL to level a gantry.
@@ -391,25 +391,32 @@ sensor_type: temperature_mcu
 #   Macros
 #####################################################################
 
-
-# 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
+#[probe] ## Other parameters in config.cfg
+#pin: !ebb36:PB7
+#x_offset: 0.0
+#y_offset: 0.0
+#z_offset: 0.0
+#speed: 5.0 #   Speed (in mm/s) of the Z axis when probing. The default is 5mm/s.
+#samples: 2
+#sample_retract_dist: 3.0
+#samples_tolerance_retries: 1
+#lift_speed: 10
+#activate_gcode:
+#    G4 P200 ;Wait 200ms
+#    SET_TMC_CURRENT STEPPER=stepper_z CURRENT=0.4
+#    SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT=0.4
+#    SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT=0.4
+#    SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT=0.4
+#deactivate_gcode:
+#    {% set run_current = printer.configfile.config['tmc2209 stepper_z'].run_current | float %}
+#    SET_TMC_CURRENT STEPPER=stepper_z CURRENT={run_current}
+#    SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={run_current}
+#    SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT={run_current}
+#    SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT={run_current}
 
 [bed_mesh]
 speed: 200
-horizontal_move_z: 2
+horizontal_move_z: 3
 mesh_min: 35, 35
 mesh_max: 310, 310
 zero_reference_position: 175, 175
@@ -439,36 +446,35 @@ sensor_type: Generic 3950
 sensor_pin: eddy:gpio26
 horizontal_move_z: 2
 
+[gcode_macro PROBE_EDDY_CURRENT_CALIBRATE_AUTO]
+gcode:
+  BED_MESH_CLEAR
+  G28 X Y
+  G90 # Abs positioning
+  G1 X{ printer.toolhead.axis_maximum.x/2 } Y{ printer.toolhead.axis_maximum.y/2 } F6000
+  {% if 'z' not in printer.toolhead.homed_axes %}
+    SET_KINEMATIC_POSITION Z={ printer.toolhead.axis_maximum.z-1 } # Allows the user to work it down until it touches.
+  {% endif %}
+  PROBE_EDDY_CURRENT_CALIBRATE {rawparams}
+
 [force_move]
 enable_force_move: True
 
-# Let's not yet...
-#[filament_motion_sensor encoder_sensor]
-#switch_pin: PG12
-#detection_length: 2.88
-#extruder: extruder
-#pause_on_runout: False
-#runout_gcode:
-#  PAUSE # [pause_resume] is required in printer.cfg
-#  M117 Filament encoder runout
-#insert_gcode:
-#  M117 Filament encoder inserted
-
 #*# <---------------------- SAVE_CONFIG ---------------------->
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  -0.009752, -0.002567, -0.002418, 0.024205, 0.023133, 0.034214, 0.043152, 0.023689, 0.019876
-#*# 	  -0.010467, 0.005144, 0.009298, 0.020234, 0.017335, 0.019320, 0.050222, 0.023133, 0.012251
-#*# 	  -0.015067, -0.008072, 0.008400, 0.001699, 0.002224, 0.006005, 0.032586, 0.017454, 0.006868
-#*# 	  -0.032029, -0.022778, -0.015593, -0.005487, 0.000614, 0.001551, 0.017335, -0.000508, -0.004438
-#*# 	  -0.049611, -0.034939, -0.013534, -0.020047, -0.000172, -0.003281, 0.009074, -0.003953, -0.016267
-#*# 	  -0.037046, -0.016647, -0.014397, -0.011667, 0.001699, 0.004956, 0.013322, -0.001182, -0.004289
-#*# 	  -0.023830, -0.015781, 0.013680, -0.001369, 0.004619, 0.011852, 0.026403, 0.009747, -0.001706
-#*# 	  -0.027613, -0.002580, 0.005144, 0.008737, 0.005144, 0.027502, 0.034771, 0.019320, 0.017335
-#*# 	  -0.020910, -0.010278, 0.004807, 0.005144, 0.003946, 0.018764, 0.027145, 0.012608, 0.006342
+#*# 	  -0.013814, 0.002245, 0.005321, 0.037976, 0.048046, 0.060540, 0.070946, 0.056286, 0.060975
+#*# 	  -0.001514, -0.003904, 0.018992, 0.015656, 0.024350, 0.037976, 0.057306, 0.054291, 0.038143
+#*# 	  -0.032466, -0.007290, 0.009769, 0.005321, 0.029468, 0.034263, 0.062378, 0.049342, 0.044221
+#*# 	  -0.041181, -0.025479, -0.007925, -0.000403, 0.004208, 0.031030, 0.042659, 0.031605, 0.029899
+#*# 	  -0.059714, -0.035092, -0.003052, -0.006128, -0.000229, 0.008656, 0.032592, 0.019419, 0.030166
+#*# 	  -0.062837, -0.016463, -0.010738, 0.004044, -0.000826, 0.024083, 0.047180, 0.033722, 0.040834
+#*# 	  -0.040349, -0.016038, 0.003360, 0.008820, 0.014120, 0.031030, 0.053163, 0.038785, 0.043882
+#*# 	  -0.027854, -0.012273, 0.009507, 0.015658, 0.020269, 0.042397, 0.052996, 0.039967, 0.049342
+#*# 	  -0.021443, -0.001939, 0.002669, 0.013694, 0.017621, 0.031032, 0.048044, 0.044225, 0.041100
 #*# x_count = 9
 #*# y_count = 9
 #*# mesh_x_pps = 9