Update to use new survey object
Merge pull request #33 from CruGlobal/surveyFix-ADM

THINK-216-ADM