Merge "add all those great comments from the other file." into nyc-dev