Add some stuff from shared google doc