Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Ok, will have look into how it's done in some other projects.  It seems the grace period is pretty short in this case which is why it works.  Added a TODO.