Working on fixing the launcher