Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Reference the issue number for more info?