Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Why put this here instead of further down where it's actually used?