Added database stuff
fixed conflicts