Added some todo's in the list