Merge "Update the drawer to match the specs" into nyc-car-dev