slight model changes
merge with master
model merged
merged master with  new_Db
completed backend