Lots of DB work
fixed conflicts