WIP on executor - up to the clone step