Added some TODO's in inline list