Added some todo tasks