Initial changes with starting db
Some recent changes