diff --git a/README.md b/README.md
index 078dbef..44651b9 100644
--- a/README.md
+++ b/README.md
@@ -157,32 +157,18 @@ You will be pasting/typing these commands into the Mainsail/Fluidd console.
 2. Do a `G34`; mechanical gantry calibration. After the controlled collision against the beam at the top, there will be a 10 second pause for you to verify that both sides of the gantry are pressed up against the `stoppers` at the top. You will hear a succession of beeps.
    1. Figure out your `Z` `position_max` by baby stepping your way up to the beam. The range is 250 to 261 from what I've seen, could be even higher for you. Adjust `position_max`, if necessary. I can go all the way to 258, however, I would not print anything higher than 257.
 3. PID tune the bed, but first move the printhead to the center. Ideally, all PID tuning should occur at the temperatures that you print most at.
-   1. `G28`
-   2. `G90`
-   3. `G1 X111 Y111 Z40 F6000`
-   4. `PID_CALIBRATE HEATER=heater_bed TARGET=70`
-   5. `SAVE_CONFIG` (once completed)
+   1. `PID_TEST_BED`
+   2. `SAVE_CONFIG` (once completed)
 4. PID tune the extruder while part cooling fan runs at 25%.
-   1. `G28`
-   2. `G90`
-   3. `G1 X111 Y111 Z10 F6000`
-   4. `M106 S64`
-   5. `PID_CALIBRATE HEATER=extruder TARGET=245`
-   6. `SAVE_CONFIG` (once completed)
+   1. `PID_TEST_HOTEND`
+   2. `SAVE_CONFIG` (once completed)
 5. Adjust `z_offset`. Make sure your nozzle if very clean. Do the [Paper test](https://www.klipper3d.org/Bed_Level.html?h=probe_calibrate#the-paper-test).
-   1. `SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET=60`
-   2. `SET_HEATER_TEMPERATURE HEATER=extruder TARGET=180`
-   3. Proceed to next steps after both temperatures have been reached.
-   4. `G28`
-   5. `PROBE_CALIBRATE`
-   6. `SAVE_CONFIG` (once completed)
+   1. `DO_PROBE_CALIBRATE`
+   2. Follow `z_offset` setup in Mainsail/Fluidd.
+   3. `SAVE_CONFIG` (once completed)
 6. Create a bed mesh.
-   1. `SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET=60`
-   2. `SET_HEATER_TEMPERATURE HEATER=extruder TARGET=180`
-   3. Proceed to next steps after both temperatures have been reached.
-   4. `G28`
-   5. `BED_MESH_CALIBRATE`
-   6. `SAVE_CONFIG` (once completed)
+   1. `DO_CREATE_MESH`
+   2. `SAVE_CONFIG` (once completed)
 
 If you've made it here, then your printer has been Klipperized, and is ready to print!
 
diff --git a/cfgs/CALIBRATION.cfg b/cfgs/CALIBRATION.cfg
new file mode 100644
index 0000000..ddae194
--- /dev/null
+++ b/cfgs/CALIBRATION.cfg
@@ -0,0 +1,39 @@
+[gcode_macro PID_TEST_BED]
+gcode:
+  G28
+  G90
+  G1 X111 Y111 Z40 F6000
+  PID_CALIBRATE HEATER=heater_bed TARGET=70
+
+[gcode_macro PID_TEST_HOTEND]
+gcode:
+  G28
+  G90
+  G1 X111 Y111 Z10 F6000
+  M106 S64
+  PID_CALIBRATE HEATER=extruder TARGET=245
+
+# TODO test this
+[gcode_macro PID_TEST_ALL]
+gcode:
+  PID_TEST_BED
+  PID_TEST_HOTEND
+  SAVE_CONFIG
+
+[gcode_macro DO_PROBE_CALIBRATE]
+gcode:
+  SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET=60
+  SET_HEATER_TEMPERATURE HEATER=extruder TARGET=180
+  TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM=60
+  TEMPERATURE_WAIT SENSOR=extruder MINIMUM=180
+  G28
+  PROBE_CALIBRATE
+
+[gcode_macro DO_CREATE_MESH]
+gcode:
+  SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET=60
+  SET_HEATER_TEMPERATURE HEATER=extruder TARGET=180
+  TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM=60
+  TEMPERATURE_WAIT SENSOR=extruder MINIMUM=180
+  G28
+  BED_MESH_CALIBRATE
\ No newline at end of file
diff --git a/printer.cfg b/printer.cfg
index a72b668..bd391d2 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -7,6 +7,7 @@
 [include ./cfgs/misc-macros.cfg]
 [include ./cfgs/PARKING.cfg]
 [include ./cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg]
+[include ./cfgs/CALIBRATION.cfg]
 
 # NOTE Uncomment the ONE of the following lines if you're using an adxl345
 # [include ./cfgs/adxl-rp2040.cfg]