diff --git a/onos-setup-lxc.sh b/onos-setup-lxc.sh
index e5471a0..14110f4 100644
--- a/onos-setup-lxc.sh
+++ b/onos-setup-lxc.sh
@@ -27,6 +27,10 @@
 	sudo -u $name ssh -o "StrictHostKeyChecking no" sdn@10.0.3.11 ls
 	sudo -u $name ssh -o "StrictHostKeyChecking no" sdn@10.0.3.12 ls
 	sudo -u $name ssh -o "StrictHostKeyChecking no" sdn@10.0.3.13 ls
+	
+	sudo mkdir -p /home/$name/.wireshark/plugins
+	sudo cp /home/mininet/openflow.lua /home/$name/.wireshark/plugins
+	sudo chown -R $name:$name /home/$name/.wireshark
 }
 
 # ------------- Set up desktop environment -------------
@@ -74,6 +78,9 @@
 echo "wireshark-common wireshark-common/install-setuid boolean true" | sudo debconf-set-selections 
 sudo dpkg-reconfigure -f noninteractive wireshark-common
 
+# Get the wireshark dissector handy
+wget -O /home/mininet/openflow.lua "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=openflow.lua"
+
 # -------------- Install ONOS ----------------
 
 echo "Installing ONOS"
@@ -146,6 +153,35 @@
 sudo sh -c "echo manual >> /var/lib/lxc/onos2/rootfs/etc/init/onos.override"
 sudo sh -c "echo manual >> /var/lib/lxc/onos3/rootfs/etc/init/onos.override"
 
+# ------------- Create reset scripts -------------
+
+cat << EOF >> ${USER_HOME}/reset-to-1.sh
+#!/bin/bash
+export ONOS_ROOT=/home/mininet/onos
+. ${ONOS_ROOT}/tools/dev/bash_profile
+. ${ONOS_ROOT}/tools/build/envDefaults
+
+cell 3node
+onos-service --cell stop
+cell 1node
+onos-package
+onos-install -f $OC1
+EOF
+
+cat << EOF >> ${USER_HOME}/reset-to-3.sh
+#!/bin/bash
+export ONOS_ROOT=/home/mininet/onos
+. ${ONOS_ROOT}/tools/dev/bash_profile
+. ${ONOS_ROOT}/tools/build/envDefaults
+
+cell 3node
+onos-service --cell stop
+onos-package
+onos-install -f $OC1
+onos-install -f $OC2
+onos-install -f $OC3
+EOF
+
 # ------------- Set up each tutorial -------------
 
 create_user tutorial1 "Basic ONOS Tutorial"
@@ -155,14 +191,19 @@
 sudo -u tutorial1 -H sh -c 'cp tutorial1-setup-lxc.sh ~/ && cd ~/ && sh tutorial1-setup-lxc.sh'
 
 create_user sdnip "SDN-IP Tutorial"
+
+SDNIP_URL='https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/new-onos-tutorial;f=sdnip-setup-lxc.sh'
+wget -O sdnip-setup-lxc.sh $SDNIP_URL
+sudo -u ${SDN_IP_USER} -H sh -c 'cp sdnip-setup-lxc.sh ~/ && cd ~/ && sh sdnip-setup-lxc.sh'
+
 create_user distributed "Distributed Tutorial"
 create_user optical "Optical Tutorial"
 
 # ------------- Zero Unused Blocks -------------
 #TODO investigate zerofree
-#echo "Zeroing unused blocks"
-#sync
-#dd if=/dev/zero of=tmp-zeros
-#sync
-#rm tmp-zeros
-#sync
+echo "Zeroing unused blocks"
+sync
+dd if=/dev/zero of=tmp-zeros
+sync
+rm tmp-zeros
+sync
diff --git a/sdnip-setup-lxc.sh b/sdnip-setup-lxc.sh
new file mode 100644
index 0000000..782e9ea
--- /dev/null
+++ b/sdnip-setup-lxc.sh
@@ -0,0 +1,81 @@
+#!/bin/bash
+
+export USER=sdnip
+
+echo "Creating SDN-IP tutorial"
+
+#--------------- Copy SDNIP code to home -----
+
+cp -r /home/mininet/onos/tools/tutorials/sdnip /home/sdnip/
+cp -r /home/sdnip/sdnip/configs/addresses.json /home/mininet/onos/tools/package/config
+cp -r /home/sdnip/sdnip/configs/sdnip.json /home/mininet/onos/tools/package/config
+
+DESKTOP=/home/${USER}/Desktop
+
+mkdir -p ${DESKTOP}
+
+cat > ${DESKTOP}/ONOS << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=ONOS
+Name[en_US]=ONOS
+Icon=konsole
+Exec=/usr/bin/lxterminal -e '/home/mininet/apache-karaf-3.0.2/bin/client -u karaf -h 10.0.3.11'
+Comment[en_US]=
+EOF
+
+cat > "${DESKTOP}/SDN-IP Mininet" << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=SDN-IP Mininet
+Name[en_US]=SDN-IP Mininet
+Icon=konsole
+Exec=/usr/bin/lxterminal -e 'sudo mn --custom /home/sdnip/sdnip/tutorial.py --topo sdnip --controller remote,10.0.3.11 --nolistenport'
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/Tutorial << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=SDN-IP Tutorial
+Name[en_US]=SDN-IP Tutorial
+Icon=internet-web-browser
+Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/SDN-IP+Tutorial
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/GUI << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=ONOS GUI
+Name[en_US]=ONOS GUI
+Icon=internet-web-browser
+Exec=/usr/bin/chromium-browser http://10.0.3.11:8181/onos/ui/index.html#topo
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/Wireshark << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Wireshark
+Name[en_US]=Wireshark
+Icon=wireshark
+Exec=/usr/bin/wireshark
+Comment[en_US]=
+EOF
+
+cat > ${DESKTOP}/Reset << EOF
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Reset
+Name[en_US]=Reset
+Icon=konsole
+Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e '/bin/bash -c /home/mininet/reset-to-1.sh'
+Comment[en_US]=
+EOF
diff --git a/tutorial1-setup-lxc.sh b/tutorial1-setup-lxc.sh
index 4c48bcd..5392095 100644
--- a/tutorial1-setup-lxc.sh
+++ b/tutorial1-setup-lxc.sh
@@ -2,14 +2,11 @@
 
 export USER=tutorial1
 
-#create_user $USER "Basic ONOS Tutorial"
-
-#sudo su - $USER
+echo "Creating tutorial1"
 
 DESKTOP=/home/${USER}/Desktop
 
 mkdir -p ${DESKTOP}
-#sudo chown -R $USER:$USER $DESKTOP
 
 cat > ${DESKTOP}/ONOS << EOF
 [Desktop Entry]
@@ -18,10 +15,9 @@
 Name=ONOS
 Name[en_US]=ONOS
 Icon=konsole
-Exec=/usr/bin/lxterminal -e '/opt/onos/apache-karaf-3.0.2/bin/client -u karaf -h 10.0.3.11'
+Exec=/usr/bin/lxterminal -e '/home/mininet/apache-karaf-3.0.2/bin/client -u karaf -h 10.0.3.11'
 Comment[en_US]=
 EOF
-#sudo chown $USER:$USER ${DESKTOP}/ONOS
 
 cat > ${DESKTOP}/Mininet << EOF
 [Desktop Entry]
@@ -30,10 +26,9 @@
 Name=Mininet
 Name[en_US]=Mininet
 Icon=konsole
-Exec=/usr/bin/lxterminal -e 'sudo mn --custom /home/mininet/onos/tools/test/topos/tower.py --topo tower --controller remote --mac'
+Exec=/usr/bin/lxterminal -e 'sudo mn --custom /home/mininet/onos/tools/test/topos/tower.py --topo tower --controller,10.0.3.11 remote --mac'
 Comment[en_US]=
 EOF
-#sudo chown $USER:$USER ${DESKTOP}/Mininet
 
 cat > ${DESKTOP}/Tutorial << EOF
 [Desktop Entry]
@@ -45,7 +40,6 @@
 Exec=/usr/bin/chromium-browser https://wiki.onosproject.org/display/ONOS/Basic+ONOS+Tutorial
 Comment[en_US]=
 EOF
-#sudo chown $USER:$USER ${DESKTOP}/Tutorial
 
 cat > ${DESKTOP}/GUI << EOF
 [Desktop Entry]
@@ -54,10 +48,9 @@
 Name=ONOS GUI
 Name[en_US]=ONOS GUI
 Icon=internet-web-browser
-Exec=/usr/bin/chromium-browser http://localhost:8181/onos/ui/index.html#topo
+Exec=/usr/bin/chromium-browser http://10.0.3.11:8181/onos/ui/index.html#topo
 Comment[en_US]=
 EOF
-#sudo chown $USER:$USER ${DESKTOP}/GUI
 
 cat > ${DESKTOP}/Wireshark << EOF
 [Desktop Entry]
@@ -69,7 +62,6 @@
 Exec=/usr/bin/wireshark
 Comment[en_US]=
 EOF
-#sudo chown $USER:$USER ${DESKTOP}/Wireshark
 
 cat > ${DESKTOP}/Reset << EOF
 [Desktop Entry]
@@ -78,20 +70,8 @@
 Name=Reset
 Name[en_US]=Reset
 Icon=konsole
-Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e 'sudo service onos restart'
+Exec=/usr/bin/lxterminal -t 'Resetting; please wait' -e '/bin/bash -c /home/mininet/reset-to-1.sh'
 Comment[en_US]=
 EOF
-#sudo chown $USER:$USER ${DESKTOP}/Reset
 
-#sudo chown -R $USER:$USER $DESKTOP
-
-
-# Make sure the 3 node cluster is not running
-#cell 3node
-#onos-service --cell stop
-
-#cell 1node
-#onos-group install -f
-
-#exit