Added some TODO's