Add multiple executors

Refactoring / clean up
Adding executors instead of framework messages
Whoa! Delete the data? Why not recover it?