diff --git a/setup.sh b/setup.sh
index 0fd0763..b049645 100644
--- a/setup.sh
+++ b/setup.sh
@@ -4,6 +4,12 @@ echo "-----------------------------------"
 echo "Written by: Patrick McDonagh"
 echo "Sit back and relax... I'll take over from here"
 
+cd ..
+installLoc="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+echo $installLoc
+cd $installLoc/setup
+
+
 echo "Setting up SSH Key"
 mkdir ~/.ssh
 cat henryPumpDev.pub  >> ~/.ssh/authorized_keys
@@ -15,7 +21,7 @@ echo "Setting up networking"
 sudo mv interfaces /etc/network/interfaces
 sudo apt-get update
 sudo apt-get -y upgrade
-sudo apt-get -y install unzip cmake mysql-client python-dev htop nginx libmysqlclient-dev avahi-daemon screen mysql-server g++ gcc curl
+sudo apt-get -y install unzip cmake python-dev htop nginx avahi-daemon screen g++ gcc curl sqlite3
 
 echo "Setting up USB Drive"
 sudo mkdir /mnt/usb
@@ -26,21 +32,31 @@ echo "Adding entry for USB in /etc/fstab"
 sudo sh -c "echo '/dev/sda1       /mnt/usb      ext4    defaults        0       0'>>/etc/fstab"
 echo "Mounting all drives"
 sudo mount -a
-echo "Configuring MySQL to use the USB drive"
-cd /mnt/usb
-sudo mkdir mysql
-sudo su
-cp -Rv /var/lib/mysql/* /mnt/usb/mysql/
-chown -R mysql:mysql /mnt/usb/mysql
-exit
-cd ~/setup
-sudo service mysql stop
-sudo sed 's:/var/lib/mysql:/mnt/usb/mysql:g' /etc/mysql/my.cnf
-sudo service mysql restart
 sudo chmod 777 /mnt/usb
 sudo chmod 777 /mnt/usb/*
 
 
+# echo "Configuring MySQL to use the USB drive"
+# sudo apt-get install mysql-server mysql-client libmysqlclient-dev
+# cd /mnt/usb
+# sudo mkdir mysql
+# sudo su
+# cp -Rv /var/lib/mysql/* /mnt/usb/mysql/
+# chown -R mysql:mysql /mnt/usb/mysql
+# exit
+# cd $installLoc/setup
+# sudo service mysql stop
+# sudo sed 's:/var/lib/mysql:/mnt/usb/mysql:g' /etc/mysql/my.cnf
+# sudo service mysql restart
+
+
+# echo "Configuring MySQL"
+# sudo mv my.cnf /etc/mysql/my.cnf
+# sudo service mysql restart
+# mysql --user="root" --password="henrypump" --execute="source WellDataEmpty.sql"
+# mysql --user="root" --password="henrypump" --execute="source setupUsers.sql"
+
+
 echo "installing TuxEip"
 wget  https://github.com/leicht/TuxPLC/archive/master.zip
 unzip master.zip
@@ -53,15 +69,11 @@ ar -x libtuxeip.a
 gcc -shared *.o -o libtuxeip.so
 sudo cp libtuxeip.so /usr/lib/
 
-cd ~/setup
+cd $installLoc/setup
 #sudo wget -O /etc/apt/sources.list.d/repository.pi3g.com.list http://repository.pi3g.com/sources.list
 #wget -O - http://repository.pi3g.com/pubkey | sudo apt-key add -
 
-echo "Configuring MySQL"
-# sudo mv my.cnf /etc/mysql/my.cnf
-# sudo service mysql restart
-mysql --user="root" --password="henrypump" --execute="source WellDataEmpty.sql"
-mysql --user="root" --password="henrypump" --execute="source setupUsers.sql"
+
 
 echo "Configuring nginx"
 sudo mv default /etc/nginx/sites-enabled/default
@@ -79,26 +91,28 @@ sudo npm install -g coffee-script pm2
 
 echo "Configuring Auto-start scripts"
 sudo chmod 777 loggers
-sudo chmod 777 website
-# sudo chmod 777 usbMount
 sudo mv loggers /etc/init.d/
-# sudo mv website /etc/init.d/
-# sudo mv usbMount /etc/init.d/
-# sudo update-rc.d usbMount defaults
 sudo update-rc.d loggers defaults
+
+# NO LONGER USING WEBSITE SINCE SWITCHING TO PM2
+# sudo chmod 777 website
+# sudo mv website /etc/init.d/
 # sudo update-rc.d website defaults
 
 echo "Installing pip - Python Package Manager"
 wget https://bootstrap.pypa.io/get-pip.py
 sudo python get-pip.py
-sudo pip install mysql requests boto3 pycomm
+sudo pip install mysql requests pycomm
 
 echo "Setting up POConsole software"
-mkdir ~/src
-mkdir ~/.aws
-cp config ~/.aws/
+mkdir $installLoc/src
+cd $installLoc/src
+git clone http://patrickjmcd@bitbucket.poconsole.net/scm/poconsole/datalogger.git
+git clone http://patrickjmcd@bitbucket.poconsole.net/scm/poconsole/www.git
+git clone http://patrickjmcd@bitbucket.poconsole.net/scm/poconsole/filemanager.git
 
-cd ~/setup
+cd $installLoc/src/www
+npm install
 
 # echo "Setting up Wifi Access Point and DHCP Server"
 # sudo apt-get install -y hostapd isc-dhcp-server
@@ -117,17 +131,9 @@ cd ~/setup
 # sudo service hostapd start
 # sudo service isc-dhcp-server start
 
-cd ~/src
-git clone http://patrickjmcd@gateway.poconsole.io:7990/scm/poconsole/datalogger.git
-git clone http://patrickjmcd@gateway.poconsole.io:7990/scm/poconsole/www.git
-git clone http://patrickjmcd@gateway.poconsole.io:7990/scm/poconsole/filemanager.git
-
-cd ~/src/www
-npm install
-
 echo "Setup Complete!"
 
-cd ~
+cd $installLoc
 mv setup .setup
 sudo userdel pi