Continue to implement database for data models
Post-merge commit