Survey infrastructure 800

Survey infrastructure