TODO list for Ryanna's part