Reverted previous change, started work on moving launch and setup code into a separate file.