Refactor new install.rb -- better organized now