mostly working executor
Lots of fixes