Initial commit for reverting to modal task execution