First new commit on a document. Attempting to fix Database class for new
set-up.