Initial refactor of runner
Clean up info on emits