diff --git a/setup/autoformat.sh b/setup/autoformat.sh
new file mode 100755
index 0000000..ce2d7f3
--- /dev/null
+++ b/setup/autoformat.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+echo "running lsblk..."
+lsblk
+echo -n "Enter blockdev to install on or m for manual partitioning: " 
+read blockdevtemp
+blockdev = ""
+if [ "$blockdevtemp" != 'm' ]; then 
+
+    echo '''
+
+    g
+    n
+    1
+    
+    +1G
+    
+
+    n
+    2
+    
+    +10G
+
+
+
+
+    n
+    3
+    1
+    
+
+
+
+
+    w
+    ''' | fdisk $blockdevtemp
+    
+    $blockdev=$blockdevtemp
+fi
+
+if [ "$blockdev" == "" ]; then
+    echo -n "Enter blockdev to install on: " 
+    read blockdevnew
+    $blockdev = $blockdevnew
+fi
+
+fdisk "$blockdev"
+
+echo "Formatting Complete"
diff --git a/setup/live-install.sh b/setup/live-install.sh
index 99ba6b5..89996f6 100755
--- a/setup/live-install.sh
+++ b/setup/live-install.sh
@@ -110,53 +110,7 @@ let "timedatecheckwaitercount=timedatecheckwaitercount+1"
 
 echo "Continuing..."
 
-echo "running lsblk..."
-lsblk
-echo -n "Enter blockdev to install on or m for manual partitioning: " 
-read blockdevtemp
-blockdev = ""
-if [ "$blockdevtemp" != 'm' ]; then 
-
-    echo '''
-
-    g
-    n
-    1
-    
-    +1G
-    
-
-    n
-    2
-    
-    +10G
-
-
-
-
-    n
-    3
-    1
-    
-
-
-
-
-    w
-    ''' | fdisk $blockdevtemp
-    
-    $blockdev=$blockdevtemp
-fi
-
-if [ "$blockdev" == "" ]; then
-    echo -n "Enter blockdev to install on: " 
-    read blockdevnew
-    $blockdev = $blockdevnew
-fi
-
-fdisk "$blockdev"
-
-echo "Formatting Complete"
+#autoformat.sh
 
 mkfs.fat "$blockdev"p1
 mkswap "$blockdev"p2