spliting out the rest of the tasks to new files