Merging in the prototype survey and enabling the extra validation on Sur...

...vey model