adding TODO's