Issue #113

Completed DB loading