add some other TODO items I was not tracking here