diff --git a/.gitignore b/.gitignore
index 9067ca8..2fd738b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,6 @@
 **/etc/systemd/system/multi-user.target.wants/openvpn@*
 **/etc/ssh
 **/home
-**/root
 **ssl/
 !**ssl/.keepme
 !**ssl/openssl.cnf
diff --git a/extra/pre-build.d/i686/root/pre-build.arch.sh b/extra/pre-build.d/i686/root/pre-build.arch.sh
new file mode 100755
index 0000000..b0a39d9
--- /dev/null
+++ b/extra/pre-build.d/i686/root/pre-build.arch.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+# Put any arch-specific tasks here. They will be run after /root/pre-build.sh.
diff --git a/extra/pre-build.d/root/packages.both.FULL b/extra/pre-build.d/root/packages.both.FULL
new file mode 100644
index 0000000..32723aa
--- /dev/null
+++ b/extra/pre-build.d/root/packages.both.FULL
@@ -0,0 +1,335 @@
+# Commented lines are supported (via a preceding # only).
+# Packages from the AUR can be specified.
+# We need to install all X drivers.
+abs
+acpi
+#acpidump
+#afflib
+aircrack-ng
+apr
+apr-util
+arj
+asciidoc
+atop
+autopsy
+autossh
+backuppc
+#bacula ## TODO: grab all the bacula packages in here
+beep
+bin86
+bind-tools
+binutils
+bluez-utils
+bonnie++ ## TODO: ugh. apacman has a new "regex mode"... that you can't disable. https://github.com/oshazard/apacman/issues/79
+boxbackup-client
+boxbackup-server
+bozocrack-git
+bridge-utils
+burp-backup-git
+btrfs-progs
+cabextract
+cdrtools
+cdw
+cfv
+chapcrack-git
+chntpw
+cifs-utils
+ckermit
+clamav
+clonezilla
+cmospwd
+colordiff
+cowpatty
+cpio
+cpuburn
+cpupower
+crackpkcs12
+cryptcat
+cryptsetup
+csync2
+customizepkg-scripting
+dar
+dcfldd
+ddrescue
+dd_rescue
+dd_rhelp
+debianutils
+debootstrap
+#dialog #giving a weird dependency issue
+diffutils
+djohn
+dmidecode
+dnssec-anchors
+dnstracer
+#dnsutils #replaced by bind-tools, https://www.archlinux.org/packages/extra/x86_64/bind-tools/
+dos2unix
+dropbear
+dstat
+dump
+dumpet
+duplicity
+dvd+rw-tools
+e2fsprogs
+easy-rsa
+ecryptfs-utils
+ed
+elfutils
+#elilo-efi
+elinks
+etc-update
+ethtool
+exfat-utils
+ext3grep
+extundelete
+f2fs-tools
+fang
+fbset
+fcgi
+fcgiwrap
+fcrackzip
+fdupes
+file
+findmyhash
+findutils
+firefox
+flac
+flashrom
+foremost
+fsarchiver
+fuse
+gd
+git
+gnu-efi-libs
+gnu-netcat
+gpart
+gparted
+gperftools
+gpm
+gptfdisk
+gst-libav
+gst-plugins-ugly
+hashcat
+hashdeep
+hddtemp
+hdparm
+hexcurse
+hexedit
+hfsprogs
+hfsutils
+htop
+httping
+hwdetect
+hwinfo
+hydra
+idnkit
+ifenslave
+iftop
+inetutils
+iotop
+iozone
+ipcalc
+iperf
+iperf3
+ipsec-tools
+iptraf-ng
+ipython
+irssi
+iso-codes
+isomaster
+jasper
+jfsutils
+#john-mpi
+john
+keyutils
+kismet-allplugins
+lftp
+links
+#logkeys-git # requires a /dev/input, which apparently isn't included in the chroots
+lm_sensors
+lrzsz
+lshw
+#lsiutil # giving intermittent errors when trying to fetch source
+lsof
+lsscsi
+#lxde # apacman currently doesn't like package groups, so...
+gpicview
+lxappearance
+lxappearance-obconf
+lxde-common
+lxde-icon-theme
+lxdm
+lxinput
+lxlauncher
+lxmusic
+lxpanel
+lxrandr
+lxsession
+lxtask
+lxterminal
+openbox
+pcmanfm
+# end lxde
+lynx
+#lzip
+macchanger
+#magicrescue # no longer maintained, upstream down
+mbr
+mbuffer
+mcelog
+mdadm
+mdcrack
+# superseded by storcli
+#megaraid-cli
+memtester
+mfoc
+minicom
+#mondo # mindi-busybox fails to build 09.23.2016
+mtd-utils
+mtr
+mtree
+multipath-tools
+myrescue
+nbd
+ncftp
+ncompress
+ncrack
+net-snmp
+netselect
+nettle
+networkmanager-pptp
+nginx-devel
+ngrep
+nmap
+nmon
+ntfs-3g
+ntfsfixboot
+#nwipe #broken since they moved to github(?)
+nwipe-git
+obnam
+open-iscsi
+openipmi
+ophcrack
+os-prober
+p7zip
+pack
+par2cmdline
+partclone
+partclone-utils
+parted
+partimage
+pax-utils
+pciutils
+pcmciautils
+pdfcrack
+perf
+php
+php-fpm
+php-gd
+php-mcrypt
+phrasendrescher
+pigz
+pkgfile
+pkgtools
+ppp
+pptpclient
+procinfo-ng
+procps-ng
+progsreiserfs
+psmisc
+pwgen
+pixz
+pyrit
+python2-gnuplot
+python2-pyx
+rarcrack
+rcracki_mt
+rdiff-backup
+read-edid
+reaver-wps-fork-t6x-git
+rename
+rfkill
+rp-pppoe
+rpcbind
+rpmextract
+rp-pppoe
+rsnapshot
+rygel
+safecopy
+samba
+scalpel-git
+scapy
+screen
+scrounge-ntfs
+scrub
+scsiadd
+sdparm
+setserial
+sg3_utils
+sharutils
+sipcalc
+sipcrack
+smartmontools
+smbclient
+s-nail
+socat
+#star ## do people even USE tape backups anymore?
+storcli
+strace
+stress
+sucrack
+symlinks
+sysstat
+tcpdump
+tcpslice
+tcptraceroute
+testdisk
+tftp-hpa
+thin-provisioning-tools
+thttpd
+tmon
+tmux
+tre
+truecrack-git
+truecrypt
+tor
+udftools
+#udpcast
+unace
+unison
+unrar
+unshield
+unzip
+usb_modeswitch
+usbip
+usbutils
+vim-a
+vim-bufexplorer
+vim-indent-object
+vim-minibufexpl
+vim-nerdtree
+vim-syntastic
+vim-workspace
+vlc
+vncrack
+vnstat
+vpnc
+weplab
+#whdd #currently depends on dialog, which is broke as shit
+whois
+wifite-mod-pixiewps-git
+wipe
+wireshark-cli
+wpscrack
+wput
+x11vnc
+xfburn
+xfsdump
+xfsprogs
+xmlto
+xorg
+xorg-drivers
+xorg-xinit
+xterm
+zerofree
+zip
+zsh
diff --git a/extra/pre-build.d/root/packages.both.SMALL b/extra/pre-build.d/root/packages.both.SMALL
new file mode 100644
index 0000000..c17ef9e
--- /dev/null
+++ b/extra/pre-build.d/root/packages.both.SMALL
@@ -0,0 +1,4 @@
+# Commented lines are supported (via a preceding # only).
+# Packages from the AUR can be specified.
+# We need to install all X drivers.
+mtree
diff --git a/extra/pre-build.d/x86_64/root/pre-build.arch.sh b/extra/pre-build.d/x86_64/root/pre-build.arch.sh
new file mode 100755
index 0000000..b0a39d9
--- /dev/null
+++ b/extra/pre-build.d/x86_64/root/pre-build.arch.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+# Put any arch-specific tasks here. They will be run after /root/pre-build.sh.
diff --git a/extra/templates/pre-build.d/root/VARS.txt.j2 b/extra/templates/pre-build.d/root/VARS.txt.j2
new file mode 100644
index 0000000..0c4b8d1
--- /dev/null
+++ b/extra/templates/pre-build.d/root/VARS.txt.j2
@@ -0,0 +1,11 @@
+export DISTNAME='{{ bdisk['name']|upper }}'
+export UXNAME='{{ bdisk['name']|lower }}'
+export PNAME='{{ bdisk['name'] }}'
+export DISTPUB='{{ bdisk['dev'] }}'
+export DISTDESC='{{ bdisk['desc'] }}'
+export REGUSR='{{ user['username']|lower }}'
+export USERCOMMENT='{{ user['name'] }}'
+export REGUSR_PASS='{{ user['password'] }}'
+export ROOT_PASS='{{ bdisk['root_password'] }}'
+export SIGKEY='{{ mygpgkey }}'
+