Got survey working with refactored spatialsurvey code.