Initial database setup
Merged with Jordan