Added some additional TODO items