Created branch for new database structure.