adding TODO's for Jesse