diff --git a/CONFIG.sh b/CONFIG.sh
index c902a3d..5e25d4a 100755
--- a/CONFIG.sh
+++ b/CONFIG.sh
@@ -21,18 +21,20 @@ SYSTEM_RELEASE=""
 # $RELEASE is the version of Ubuntu/Debian you intend to build an ISO for.
 # Some options:  xenal, bionic, disco, focal
 # Versions: xenal (16.0.4), bionic (18.04), disco (19.04), focal (20.04)
-RELEASE=""
+RELEASE="focal"
+
 
 # $ARCH is the target processor architecture.
 # For old 32 bit x86 systems use i386.
 # For newer 64-bit x86 systems (also known as x64, x86_64, Intel 64, and AMD64) use amd64.
-ARCH=""
+ARCH="amd64"
 
 # the name of your distro and ISO
-OS_NAME=""
+OS_NAME="Sol-OS"
+OS_VER="1.00"
 
 # The user of the live boot
-LIVE_USER=""
+LIVE_USER="earth"
 
 
 
@@ -44,7 +46,8 @@ echo "Base Dir: " $(pwd) "\n";
 
 # Make work structure
 mkdir -p "${CHROOT_PTH}"
-mkdir -p image/{casper,isolinux,install}
+mkdir -p image/{casper,isolinux,install,boot,.disk}
+touch image/ubuntu
 
 
 
diff --git a/cleanup.sh b/cleanup.sh
new file mode 100755
index 0000000..c4a60ce
--- /dev/null
+++ b/cleanup.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+. CONFIG.sh
+
+# set -o xtrace       ## To debug scripts
+# set -o errexit      ## To exit on error
+# set -o errunset     ## To exit if a variable is referenced but not set
+
+
+function main() {
+    sudo rm -rf image/ work/
+}
+main $@;
diff --git a/start.sh b/start.sh
index b3d9d42..104f55e 100755
--- a/start.sh
+++ b/start.sh
@@ -8,6 +8,7 @@
 . CONFIG.sh
 
 function main() {
+    clear;
     if [[ $(sanity_check) -eq 1 ]]; then echo "\nExiting..."; return; fi
 
     # First setup the debootstrap env...
@@ -20,7 +21,6 @@ function main() {
 
 
 function sanity_check() {
-    clear;
     # Check for debootstrap command and then install from downloaded deb if not present.
     # We could install from current apt but I want the user and myself to be fully aware
     # of what they are chosing. IE, we could just run the install command themselves...
@@ -56,7 +56,7 @@ function sanity_check() {
                 "Going to run :\n" \
                 "\tapt-get install xserver-xephyr syslinux squashfs-tools genisoimage netpbm syslinux-utils -y"
         sleep 2
-        apt-get install xserver-xephyr syslinux squashfs-tools genisoimage netpbm syslinux-utils -y
+        sudo apt-get install xserver-xephyr syslinux squashfs-tools genisoimage netpbm syslinux-utils -y
     fi
 
     if [[ "${ARCH}" == "" ]] || [[ "${RELEASE}" == "" ]]; then
diff --git a/step_3_create_CD.sh b/step_3_create_CD.sh
index 2f7a3f7..0c0f8d4 100755
--- a/step_3_create_CD.sh
+++ b/step_3_create_CD.sh
@@ -8,18 +8,18 @@
 
 
 function main() {
-    # echo "Moving ISO linux parts..."
-    # move_iso_linux_parts;
-    # echo "Creating manifest..."
-    # create_manifest;
-    # echo "Squashing chroot filesystem..."
-    # compress_chroot;
-    # echo "Creating diskdefines data..."
-    # diskdefines;
-    # echo "Creating recognition info..."
-    # remix_recognition;
-    # echo "Creating MD5 data..."
-    # md5_cal;
+    echo "Moving ISO linux parts..."
+    move_iso_linux_parts;
+    echo "Creating manifest..."
+    create_manifest;
+    echo "Squashing chroot filesystem..."
+    compress_chroot;
+    echo "Creating diskdefines data..."
+    diskdefines;
+    echo "Creating recognition info..."
+    remix_recognition;
+    echo "Creating MD5 data..."
+    md5_cal;
     echo "Creating the ISO file..."
     create_iso;
 }
@@ -81,9 +81,6 @@ EOF
 }
 
 function remix_recognition() {
-    touch image/ubuntu
-    mkdir image/.disk/
-
     touch image/.disk/base_installable
     echo "full_cd/single" > image/.disk/cd_type
     echo "${OS_NAME} ${OS_VER}" > image/.disk/info