diff --git a/run.sh b/run.sh
index b00ab57..5a36d86 100755
--- a/run.sh
+++ b/run.sh
@@ -1,35 +1,55 @@
 DEV_USB=$1
 MOUNT_NAME=priv
 MOUNT_DIR=/media/michael/priv
-LOC=0
 
-echo "Locking db..."
-cryptsetup luksOpen $DEV_USB $MOUNT_NAME ||	\
-	echo "Issue unlocking db... quitting"	&&\
+error(){
+	echo $1
 	exit 1
+}
+
+
+clear
+
+echo "Unlocking db..."
+cryptsetup luksOpen $DEV_USB $MOUNT_NAME 	||\
+	error "Issue unlocking db... quitting..."
 
 
 echo "Mounting db..."
-mkdir $MOUNT_DIR
 rm -rf $MOUNT_DIR
-mount /dev/mapper/$MOUNT_NAME $MOUNT_DIR ||	\
-	echo "Issue mounting db... quiting..."	&&\
-	exit 1
+mkdir $MOUNT_DIR				&&\
+mount /dev/mapper/$MOUNT_NAME $MOUNT_DIR 	||\
+	error "Issue mounting db... quitting..."
 
+
+echo "Making link..."
 rm -rf ./data.link
-ln -s "$MOUNT_DIR/notes" ./data.link
+ln -s "$MOUNT_DIR/notes" ./data.link 		||\
+	error "Issue mounting db... quitting..."
+
 
 echo "Starting container..."
-docker run --name priv --rm -it -v `pwd`/data.link/:/notes `docker build -q .`
+docker run --name priv --rm -it -v `pwd`/data.link/:/notes `docker build -q .` ||\
+	error "Issue making docker container... quitting..."
+
 
 echo "Unmounting db..."
-umount -f "$MOUNT_DIR"
-rm -rf $MOUNT_DIR
+umount -f "$MOUNT_DIR"				&&\
+rm -rf $MOUNT_DIR				||\
+	error "Issue unmounting and deleting mountpoint... quitting..."
+
 
 echo "Removing link..."
 rm -rf ./data.link
+	error "Issue deleting link... quitting..."
+
 
 echo "Locking db..."
-cryptsetup luksClose /dev/mapper/$MOUNT_NAME
+cryptsetup luksClose /dev/mapper/$MOUNT_NAME	||\
+	error "Issue locking db... quitting..."
+
+
+echo "Exiting gracefully..."
+exit 0
+
 
-echo "Exiting..."