moved tasks out of main file