Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Maybe add a comment explaining why you disabled this?