Added some todo items as comments