Added TODOs to comments