Updated the list of todos with the requirements coming from the OC
meeting.