Work on core survey functionality