Commit for the weekend, need to fix the boolean updates of tasks