worked on TODOs