database work
database work 2
Merge pull request #2 from acstache/master

Pull request by will on 4/10