move everything back into the thor task file