Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Attribute this TODO to yourself or remove it before we merge.