Minor Cleanup.
Mostly committing just as a progress update; DB implementation is now fully functional.