some restructuring to make a runner