diff --git a/1.disks.sh b/1.disks.sh
index 39d25f8..93ba3d3 100755
--- a/1.disks.sh
+++ b/1.disks.sh
@@ -8,7 +8,16 @@ sgdisk -n 2:0:+$_SWAP_SIZE -t 2:8200 -c 2:"SWAP" /dev/$_SYS_DEV
 sgdisk -n 3:0:0 -t 3:8309 -c 3:"LUKS-Data" /dev/$_SYS_DEV
 sgdisk -p /dev/$_SYS_DEV
 
+sgdisk --zap-all /dev/${_HEADER_DEV}
+sgdisk -n 1:0:+16M -t 1:8309 -c 1:"LUKS-Header" /dev/${_HEADER_DEV}
+sync
+
+#HEADER_PART=/dev/${_HEADER_DEV}1
+wipefs -a ${_HEADER_DEV}1
+
 #dd if=/dev/zero of=/dev/$_HEADER_DEV bs=512 count=32768 status=progress
-echo -n "$_LUKS_PASS" | cryptsetup luksFormat --type luks2 --batch-mode --key-file - --header /dev/$_HEADER_DEV /dev/${_SYS_DEV}3
-echo -n "$_LUKS_PASS" | cryptsetup open /dev/${_SYS_DEV}3 --header /dev/$_HEADER_DEV --key-file - cryptroot
+echo -n "$_LUKS_PASS" | cryptsetup luksFormat --type luks2 --batch-mode --key-file - --header /dev/${_HEADER_DEV}1 /dev/${_SYS_DEV}3
+echo -n "$_LUKS_PASS" | cryptsetup open /dev/${_SYS_DEV}3 --header /dev/${_HEADER_DEV}1 --key-file - cryptroot
+LUKS_UUID=$(cryptsetup luksUUID /dev/${_SYS_DEV}3 --header /dev/${_HEADER_DEV}1)
+echo "LUKS UUID: $LUKS_UUID"
 ls /dev/mapper/cryptroot
diff --git a/2.0.fs-init copy.sh b/2.0.fs-init copy.sh
new file mode 100755
index 0000000..3d34f22
--- /dev/null
+++ b/2.0.fs-init copy.sh	
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+source .env
+
+mkfs.btrfs -f -L arch /dev/mapper/cryptroot
+mkfs.fat -f -F 32 /dev/${_SYS_DEV}1
+
+mount /dev/mapper/cryptroot /mnt
+cd /mnt
+btrfs subvolume create @
+btrfs subvolume create @home
+btrfs subvolume create @snapshots
+btrfs subvolume create @var
+btrfs subvolume create @var_log
+btrfs subvolume create @var_cache
+cd /
+umount /mnt
+
+mount -o defaults,noatime,compress=zstd,ssd,space_cache=v2,autodefrag,subvol=@ /dev/mapper/cryptroot /mnt
+mkdir -p /mnt/{home,var,tmp,boot,snapshots}
+mount -o defaults,noatime,compress=zstd,ssd,space_cache=v2,autodefrag,subvol=@home /dev/mapper/cryptroot /mnt/home
+mount -o defaults,noatime,compress=zstd,space_cache=v2,subvol=@snapshots /dev/mapper/cryptroot /mnt/snapshots
+mount -o defaults,noatime,space_cache=v2,subvol=@var /dev/mapper/cryptroot /mnt/var
+mkdir -p /mnt/var/{log,cache}
+mount -o defaults,noatime,space_cache=v2,nodatacow,subvol=@var_log /dev/mapper/cryptroot /mnt/var/log
+mount -o defaults,noatime,space_cache=v2,nodatacow,subvol=@var_cache /dev/mapper/cryptroot /mnt/var/cache
+mount -o fmask=0077,dmask=0077 /dev/${_SYS_DEV}1 /mnt/boot
+
+mkswap /dev/${_SYS_DEV}2
+swapon /dev/${_SYS_DEV}2
diff --git a/ALL b/ALL
new file mode 100644
index 0000000..e69de29
diff --git a/prompts b/prompts
new file mode 100644
index 0000000..e69de29