Moving things out of the install.sh