diff --git a/autocommit.sh b/autocommit.sh
index fcb146e..5d6a8f3 100755
--- a/autocommit.sh
+++ b/autocommit.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#cd $HOME/printer_data/config
+pushd $HOME/printer_data/config
 if [ -n "$(git status --porcelain)" ]; then
 	git add .
 	git commit -m "Automatic commit of config from $(date -I)"
@@ -8,3 +8,4 @@ if [ -n "$(git status --porcelain)" ]; then
 else
 	Nothing new to save to git
 fi
+popd
diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index ab7f5a8..39a94c8 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -282,3 +282,30 @@ verbose: True
 description: Backs up config directory GitHub
 gcode:
     RUN_SHELL_COMMAND CMD=backup_cfg
+
+; For KlipperScreen
+[gcode_macro LOAD_FILAMENT]
+variable_load_distance:  50
+variable_purge_distance:  25
+gcode:
+    {% set speed = params.SPEED|default(300) %}
+    {% set max_velocity = printer.configfile.settings['extruder'].max_extrude_only_velocity  * 60 %}
+    SAVE_GCODE_STATE NAME=load_state
+    G91
+    G92 E0
+    G1 E{load_distance} F{max_velocity} # fast-load
+    G1 E{purge_distance} F{speed} # purge
+    RESTORE_GCODE_STATE NAME=load_state
+
+[gcode_macro UNLOAD_FILAMENT]
+variable_unload_distance:  50
+variable_purge_distance:  25
+gcode:
+    {% set speed = params.SPEED|default(300) %}
+    {% set max_velocity = printer.configfile.settings['extruder'].max_extrude_only_velocity  * 60 %}
+    SAVE_GCODE_STATE NAME=unload_state
+    G91
+    G92 E0
+    G1 E{purge_distance} F{speed} # purge
+    G1 E-{unload_distance} F{max_velocity} # fast-unload
+    RESTORE_GCODE_STATE NAME=unload_state
\ No newline at end of file