more TODO\'s