WIP on runner refactor part5