more database work
Merge pull request #1 from ahurley/master

database work