db scripts, and enable mapping once tested