THINK-216-ADM

Update to use new survey object