diff --git a/.larbs.sh.swp b/.larbs.sh.swp
deleted file mode 100644
index 1d0edc9..0000000
Binary files a/.larbs.sh.swp and /dev/null differ
diff --git a/larbs.sh b/larbs.sh
index a598971..534d3cf 100755
--- a/larbs.sh
+++ b/larbs.sh
@@ -19,6 +19,7 @@ done
 
 chmod 777 .name
 NAME=$(cat /.name)
+rm /.name
 useradd -m -g wheel -s /bin/bash $NAME
 
 echo "$NAME:$(cat .pass1)" | chpasswd
@@ -106,11 +107,12 @@ done
 #Packages I may later add:
 #pacman --noconfirm --needed -S projectm-pulseaudio
 
+cd /tmp
+blue Changin working directory to /tmp/...
 blue Downloading next portion of the script \(larbs_user.sh\)...
-chmod 777 /
-curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/larbs_user.sh > /home/$NAME/larbs_user.sh && blue Running larbs_user.sh script as $NAME...
-sudo -u $NAME bash /home/$NAME/larbs_user.sh || red Error when running larbs_user.sh...
-rm -f /home/$NAME/larbs_user.sh
+curl https://raw.githubusercontent.com/LukeSmithxyz/larbs/master/larbs_user.sh > /tmp/larbs_user.sh && blue Running larbs_user.sh script as $NAME...
+sudo -u $NAME bash /tmp/larbs_user.sh || red Error when running larbs_user.sh...
+rm -f /tmp/larbs_user.sh
 
 printf "${BLUE}Enabling Network Manager...\n${NC}"
 systemctl enable NetworkManager
diff --git a/larbs_user.sh b/larbs_user.sh
index 3413ce2..69ad780 100755
--- a/larbs_user.sh
+++ b/larbs_user.sh
@@ -3,17 +3,7 @@
 blue() { printf "\033[0;34m $* \033[0m\n" ;}
 red() { printf "\033[0;31m $* \033[0m\n" ;}
 
-NAME=$(cat /.name)
-rm -f .name
-pwd
-pwd
-pwd
-blue Changing directory to /home/$NAME...
-pwd
-pwd
-pwd
-
-cd /home/$NAME
+NAME=$(whoami)
 
 blue Activating Pulseaudio if not already active...
 pulseaudio --start && blue Pulseaudio enabled...
@@ -42,8 +32,6 @@ fi
 done
 }
 
-blue Changing directory to /home/$NAME...
-cd /home/$NAME || red Could not cd to /home/$NAME. Does user and home directory exist?
 
 blue Installing AUR programs...
 blue \(This may take some time.\)