Updated TODO with Aleksandra's requests.