Merge "update TODOs" into nyc-car-dev