initial checkin
added databse stuff
mreged