More nips tucks and total rewrite of Launcher()