Major mods to setup script.  Will be renamed setup.sh