In conjunction with the pull request on the launcher, should address cvlfab 682 702 and 703