Refactor and runner implementation (WIP)