Improving with TODO and Projects dependencies;