Need to fix the way executor shutdowns
Need to fix the way executor shutdowns