Add database.
Add index, add database.
Merge pull request #1 from mixolidia/master

consolidating