diff --git a/usr/local/bin/hotspot b/usr/local/bin/hotspot
index d534997..8ec8b7a 100755
--- a/usr/local/bin/hotspot
+++ b/usr/local/bin/hotspot
@@ -1,13 +1,26 @@
-#!/bin/bash
+#!/bin/sh -e
 
-cat /home/pi/pivilion/config/dhcpcd.deny.wlan0 > /etc/dhcpcd.conf
+echo "Checking for required packages and installing if missing"
+sudo apt update
+if [ $(dpkg-query -W -f='${Status}' apache2 2>/dev/null | grep -c "ok installed") -eq 0 ];
+then
+ sudo apt -y install hostapd dnsmasq apache2 php
+fi
+echo "Configuring components..."
+sudo cp -f /home/pi/pivilion/config/hostapd.hotspot /etc/hostapd/hostapd.conf
+sudo cp -f /home/pi/pivilion/config/dnsmasq.hotspot /etc/dnsmasq/dnsmasq.conf
+sudo cp -rf /home/pi/pivilion/config/html /var/www/
+sudo chown -R www-data:www-data /var/www/html
+sudo chown root:www-data /var/www/html/.htaccess
+sudo cp -f rc.hotspot /etc/rc.local
+sudo cp -f override.hotspot /etc/apache2/conf-available/override.conf
+sudo a2enconf override
+sudo a2enmod rewrite
 
-sudo bash -c 'cat /home/pi/pivilion/config/interfaces.hotspot > /etc/network/interfaces'
+echo "Backing up wireless network configuration..."
+sudo mv /etc/wpa_supplicant/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.bak
 
-sudo update-rc.d dnsmasq enable
+echo "Captive portal enabled. Reboot to execute."
 
-sudo bash -c 'cat /home/pi/pivilion/config/rc.local.hotspot > /etc/rc.local'
-
-echo "Your Rpi will reboot in hotspot mode"!
-
-sudo bash -c 'echo "hotspot" > /home/pi/pivilion/mode'
\ No newline at end of file
+sudo bash -c 'echo "hotspot" > /home/pi/pivilion/mode'
+exit 0