diff --git a/env/.local/scripts/shorten-url b/env/.local/scripts/shorten-url
index d058d41..3ae33b4 100755
--- a/env/.local/scripts/shorten-url
+++ b/env/.local/scripts/shorten-url
@@ -4,18 +4,41 @@ set -e
 set -o nounset
 set -o pipefail
 
+# Global variables
 SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
 THIS_FILE=${BASH_SOURCE[0]}
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
-LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
+LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"} && export LOG_FILE
 
+# Local variables
 declare -a args
 no_spin_flag="0"
+create_flag="0"
+
+usage() {
+	cat <<EOF
+FIX ME!!!
+EOF
+}
 
 # Logging utility function, use in place of echo.
+#
+# This gets exported for subcommands to use.
 log() {
 	logging log --source "$THIS_FILE" "$@"
+} && export -f log
+
+create() {
+	script="$SCRIPTS/utils/shorten-url/create"
+	export THIS="${THIS} create"
+
+	if [[ $no_spin_flag == "1" ]]; then
+		bash -c "$script ${args[*]}"
+	else
+		title="Generating short url..."
+		gum spin --show-output --title="$title" -- bash -c "$script ${args[*]}"
+	fi
 }
 
 ################################################################################
@@ -29,17 +52,20 @@ setup-logging "$LOG_FILE" "$LOG_LABEL"
 while [[ $# -gt 0 ]]; do
 	if [[ $1 == "--no-spin" ]]; then
 		no_spin_flag="1"
+	elif [[ $1 == "create" ]]; then
+		create_flag="1"
+	elif [[ $1 == "-h" ]] || [[ $1 == "--help" ]]; then
+		no_spin_flag="1"
+		args+=("$1")
 	else
 		args+=("$1")
 	fi
 	shift
 done
 
-script="$SCRIPTS/utils/shorten-url/create"
-
-if [[ $no_spin_flag == "1" ]]; then
-	bash -c "$script ${args[*]}"
+if [[ $create_flag == "1" ]]; then
+	create
 else
-	title="Generating short url..."
-	gum spin --show-output --title="$title" -- bash -c "$script ${args[*]}"
+	# If we made it here, no subcommands were executed.
+	usage
 fi
diff --git a/env/.local/scripts/utils/shorten-url/create b/env/.local/scripts/utils/shorten-url/create
index 50efae6..5a5e3a6 100755
--- a/env/.local/scripts/utils/shorten-url/create
+++ b/env/.local/scripts/utils/shorten-url/create
@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 SCRIPTS=${SCRIPTS:-$HOME/.local/scripts}
-THIS_FILE=${BASH_SOURCE[0]}
+THIS_FILE=${BASH_SOURCE[0]} && export THIS_FILE
 LOG_LABEL=$(basename "$THIS_FILE")
 THIS=${THIS:-$LOG_LABEL}
 LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
@@ -13,26 +13,32 @@ LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"}
 # Setup environment
 source "$SCRIPTS/utils/shorten-url/env"
 
-declare url shortCode
 declare -a tags
+url=""
 shortCode=""
+expire=""
 
 usage() {
 	cat <<EOF
-FIX ME!!!
+$THIS FIX ME!!!
 EOF
 }
 
-# Logging utility function, use in place of echo.
-log() {
-	logging log --source "$THIS_FILE" "$@"
-}
-
 generate_json() {
 	local tagsJson
 	tagsJson=$(printf '%s\n' "${tags[@]}" | jq -R . | jq -s .)
-	jq -n --arg longUrl "$url" --arg shortCode "$shortCode" --argjson tags "$tagsJson" \
-		'{longUrl: $longUrl, shortCode: $shortCode, tags: $tags, findIfExists: true}'
+	log "Generating json data..."
+	if [[ -n $expire ]]; then
+		expire="$(date --iso-8601=seconds -d "+ $expire")"
+		log "Set valid until date: $expire"
+		# NB: 'validUntil' can not be set to an empty string, or it immediately expires the link.
+		jq -n --arg longUrl "$url" --arg shortCode "$shortCode" --argjson tags "$tagsJson" \
+			--arg validUntil "$expire" \
+			'{longUrl: $longUrl, shortCode: $shortCode, tags: $tags, findIfExists: true, validUntil: $validUntil}'
+	else
+		jq -n --arg longUrl "$url" --arg shortCode "$shortCode" --argjson tags "$tagsJson" \
+			'{longUrl: $longUrl, shortCode: $shortCode, tags: $tags, findIfExists: true}'
+	fi
 }
 
 create_url() {
@@ -44,7 +50,7 @@ create_url() {
 
 	json="$(generate_json)"
 
-	log "Creating url with json: $json"
+	log "Creating url: '$url' with json: $json"
 
 	curl "$BASE_URL/short-urls" \
 		--request 'POST' \
@@ -63,6 +69,8 @@ create_url() {
 source "$SCRIPTS/hypr/logging"
 setup-logging "$LOG_FILE" "$LOG_LABEL"
 
+log "Creating url with args: $*"
+
 while [[ $# -gt 0 ]]; do
 	if [[ $1 == "-h" ]] || [[ $1 == "--help" ]]; then
 		usage && exit 0
@@ -72,6 +80,10 @@ while [[ $# -gt 0 ]]; do
 	elif [[ $1 == "-t" ]] || [[ $1 == "--tag" ]]; then
 		shift
 		tags+=("$1")
+	elif [[ $1 == "-e" ]] || [[ $1 == "--expire" ]]; then
+		shift
+		expire="$1 $2"
+		shift
 	else
 		url="$1"
 	fi