DB was implemented
Merge branch 'model'