Add some more explicit TODO's and proof sketches