Added support for executors

This pull request is a work in progress.

----

TODO: Describe pull request.