Start of copying over the executor implementation