DB working
Refactor survey structur