Working on finalizing tasks