More work on the Launcher