[WIP] Feature/runner

Line is too long. [140/130]