Move to zsh functions