18 add database

Merging with master for now to work on issue #65 
Fixes #18