Final TODOs completed