Close #5: Change the way tasks are stored