Launcher changes

Here goes everything... I might hassle @paytengiles to review since he's waiting on webhooks which is waiting on this :)