Got db running
merge