Continued extracting Tasks into library. Started sorting tasks