TODO updates; move this paragraph a little.