Large Batch Changes

See Google Doc for info.