Added TODOs to the main TODO list