WIP: CornHusker/add-db #6

Draft
CornHusker wants to merge 2 commits from CornHusker/add-db into cswimr/add-src

2 commits