Adds launching stuff
Merged