Added numbers to the TODOs for better task tracking.