Cross off more TODO's.