WIP on runners rewrite