created database model
some work on database
merged;