Fixed todos.
Added th idea