adding to the view
Merge branch 'master' into Colin-Dev
updated gui launcher
preparing for future
Merge branch 'Colin-Dev'