Using the full db setup code.
Updated to use the full db setup.

Merge branch 'master' of https://github.com/lcaballero/snb-1