Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Why not just check if the taskIds match, rather than checking if they contain these magic strings?