some refactoring and prep for multi command line installs