Continued build-out of basic database structure