Added some TODO’s