Implement the executor
Fix CS