wip
.
Merge pull request #2 from deferpanic/dbstuff

wip