Add stuff from the google doc to the spec