Rework the output use exec
Final rework to clean up the run class