WIP on runner refactor part4