Adding tasks to the list, and removing some obsolete code