TODO's reflect recent ideas