Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
I wouldn't mind seeing these wrap a little nicer