Working on fixing the task list