Temporary changes for ongoing work

Adding task executor and scheduler until we have defaults.