Organize TODO and add some tasks