Added basic database/models
Fix merge conflict