solving TODOs