diff --git a/setup/Setup-shell-4-containers/fastfetch-linux-amd64.deb.1 b/setup/Setup-shell-4-containers/fastfetch-linux-amd64.deb.1
new file mode 100644
index 0000000..8b6c679
Binary files /dev/null and b/setup/Setup-shell-4-containers/fastfetch-linux-amd64.deb.1 differ
diff --git a/setup/autoformat.sh b/setup/autoformat.sh
index d52ae5a..33498d9 100755
--- a/setup/autoformat.sh
+++ b/setup/autoformat.sh
@@ -6,19 +6,21 @@ read blockdevtemp
 blockdev = ""
 if [ "$blockdevtemp" != 'm' ]; then 
 
+	echo "Partitioning with default layout"
+	echo 'Layout: 4Gb efi partition \n       20Gb swap\n       Rest btrfs root'
         (
             
         echo g
         echo n
         echo 1
 
-        echo +1G
+        echo +4G
 
 
         echo n
         echo 2
 
-        echo +10G
+        echo +20G
 
 
 
@@ -46,6 +48,4 @@ if [ "$blockdev" == "" ]; then
     $blockdev = $blockdevnew
 fi
 
-fdisk "$blockdev"
-
 echo "Formatting Complete"
diff --git a/setup/live-install.sh b/setup/live-install.sh
index 0dd1e26..1bf7088 100755
--- a/setup/live-install.sh
+++ b/setup/live-install.sh
@@ -2,140 +2,64 @@
 echo "testing uplink..."
 ping -c4 8.8.8.8 || (echo "!!!ERROR NO UPLINK - ABORTING!!!" && exit)
 echo "Starting base Installer..."
-echo "is the clock correct? - if not abort with CTRL+C"
 timedatectl
-timedatecheckwaitercount=0
-echo "sleeping for 20s"
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
+echo "is the clock correct? - if not abort with CTRL+C"
+read
 
-#this is hard coded for assurance that the wait wont be skipped
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
-
-
-echo $timedatecheckwaitercount 
-sleep 1s
-let "timedatecheckwaitercount=timedatecheckwaitercount+1"
+#timedatecheckwaitercount=0
+#echo "sleeping for 20s"
+#for (( i = 0; i < 20; i++ )); do
+#	
+#    echo $timedatecheckwaitercount s
+#    sleep 1s
+#    let "timedatecheckwaitercount=timedatecheckwaitercount+1"
+#done
 
 echo "Continuing..."
 
+echo -n "Enter blockdev to install on or m for manual partitioning: " 
+read blockdev
+
 #autoformat.sh
 
+echo "creating filesystems..."
+
 mkfs.fat "$blockdev"p1
 mkswap "$blockdev"p2
 mkfs.btrfs "$blockdev"p3
+
 mount "$blockdev"p3 /mnt/
+
 btrfs subvolume create /mnt/@
 btrfs subvolume create /mnt/@home
+btrfs subvolume create /mnt/@var
+btrfs subvolume create /mnt/@etc
 
-mkdir /mnt/@/efi
 umount /mnt
 
+echo "Finished creating Filesystems!"
+
+echo "mounting filesystems..."
+
 mount -o compress=zstd,subvol=@ "$blockdev"p3 /mnt
 mkdir -p /mnt/home
-mount -o compress=zstd,subvol=@home "$blockdev"p3 /mnt/home
+mkdir /mnt/efi
+mkdir /mnt/var
+mkdir /mnt/etc
 
+mount -o compress=zstd,subvol=@home "$blockdev"p3 /mnt/home
+mount -o compress=zstd,subvol=@var "$blockdev"p3 /mnt/var
+mount -o compress=zstd,subvol=@var "$blockdev"p3 /mnt/etc
 mount "$blockdev"p1 /mnt/efi
 
-
-
-
 swapon "$blockdev"p2 
+echo "Finished Mounting!"
 
-# pacstrap -K /mnt base linux linux-firmware
+# The Big Pacstrap(on)
+echo "running Pacstrap base install..."
 pacstrap -K /mnt base base-devel linux linux-firmware git btrfs-progs grub efibootmgr grub-btrfs inotify-tools timeshift vim networkmanager pipewire pipewire-alsa pipewire-pulse pipewire-jack wireplumber reflector zsh zsh-completions zsh-autosuggestions openssh man sudo
 
+echo "generating fstab from current configuration"
 # Fetch the disk mounting points as they are now ( we mounted everything before ) and generate instructions to let the system know how to mount the various disks automatically
 genfstab -U /mnt >> /mnt/etc/fstab
 
@@ -144,7 +68,10 @@ cat /mnt/etc/fstab
 
 cp ~/Dotfiles/setup/chroot-install.sh /mnt/
 
+echo "chrooting into new installation. Please execute /chroot-install.sh in the new installation."
 arch-chroot /mnt
 
+echo "unmount and reboot now?"
+read
 umount -R /mnt
 reboot