Design rough draft of initial database setup.
Merge branches 'master' and 'database_work'