added more thoughts to TODO