Feature/executor

review.