Updated TODO after morning meeting with group.