refactor the launching code
Merge branch 'master' into devoncarew_launch_refactor
more refactoring
merge to master
Merge pull request #2116 from devoncarew/devoncarew_launch_refactor

Devoncarew launch refactor