Restructuring to allow setup commands to run in between installs.