updated todo for v2 rewrite