Updated the safe to work, still needs the gui