UPDATED TODO list and categorised