finished with the TODOs